From 2066f7951cc4f0b23ddff5abfd2ad2ea4ee90fff Mon Sep 17 00:00:00 2001
From: Rafael Tsuha <rafael.tsuha@usp.br>
Date: Fri, 4 Oct 2019 18:34:29 +0000
Subject: match.pd (sinh (x) / cosh (x)): New simplification rule.

        * match.pd (sinh (x) / cosh (x)): New simplification rule.

        * gcc.dg/sinhovercosh-1.c: New test.

From-SVN: r276595
---
 gcc/ChangeLog                         |  4 ++++
 gcc/match.pd                          |  5 ++++
 gcc/testsuite/ChangeLog               |  4 ++++
 gcc/testsuite/gcc.dg/sinhovercosh-1.c | 45 +++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/sinhovercosh-1.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a013d86..6da73b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-04  Rafael Tsuha  <rafael.tsuha@usp.br>
+
+        * match.pd (sinh (x) / cosh (x)): New simplification rule.
+
 2019-10-04  Martin Jambor  <mjambor@suse.cz>
 
 	* tree-ssa-forwprop.c (simplify_builtin_call): Set gimple call
diff --git a/gcc/match.pd b/gcc/match.pd
index 23ce3768..9bd5f3e 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -4922,6 +4922,11 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
   (rdiv (SIN:s @0) (COS:s @0))
    (TAN @0))
 
+ /* Simplify sinh(x) / cosh(x) -> tanh(x). */
+ (simplify
+  (rdiv (SINH:s @0) (COSH:s @0))
+   (TANH @0))
+
  /* Simplify cos(x) / sin(x) -> 1 / tan(x). */
  (simplify
   (rdiv (COS:s @0) (SIN:s @0))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 68ca51e..4248c81 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-04  Rafael Tsuha  <rafael.tsuha@usp.br>
+
+        * gcc.dg/sinhovercosh-1.c: New test.
+
 2019-10-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/c11-builtins-1.c, gcc.dg/c2x-builtins-1.c,
diff --git a/gcc/testsuite/gcc.dg/sinhovercosh-1.c b/gcc/testsuite/gcc.dg/sinhovercosh-1.c
new file mode 100644
index 0000000..7e51072
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/sinhovercosh-1.c
@@ -0,0 +1,45 @@
+/* { dg-do compile } */
+/* { dg-options "-Ofast -fdump-tree-optimized" } */
+
+extern float sinhf (float);
+extern float coshf (float);
+extern float tanhf (float);
+extern float sqrtf (float);
+extern double sinh (double);
+extern double cosh (double);
+extern double sqrt (double);
+extern double tanh (double);
+extern long double sinhl (long double);
+extern long double coshl (long double);
+extern long double tanhl (long double);
+extern long double sqrtl (long double);
+
+double __attribute__ ((noinline))
+sinhovercosh_ (double x)
+{
+  return sinh (x) / cosh (x);
+}
+
+float __attribute__ ((noinline))
+sinhfovercoshf_(float x)
+{
+  return sinhf (x) / coshf (x);
+}
+
+long double __attribute__ ((noinline))
+sinhlovercoshl_ (long double x)
+{
+  return sinhl (x) / coshl (x);
+}
+
+/* There must be no calls to sinh, cosh, or atanh */
+/* {dg-final { scan-tree-dump-not "sinh " "optimized" } } */
+/* {dg-final { scan-tree-dump-not "cosh " "optimized" } } */
+/* {dg-final { scan-tree-dump-not "sinfh " "optimized" } } */
+/* {dg-final { scan-tree-dump-not "cosfh " "optimized" } } */
+/* {dg-final { scan-tree-dump-not "sinlh " "optimized" } } */
+/* {dg-final { scan-tree-dump-not "coslh " "optimized" } } */
+/* {dg-final { scan-tree-dump-times "tanh " "1" "optimized" }} */
+/* {dg-final { scan-tree-dump-times "tanhl " "1" "optimized" }} */
+/* {dg-final { scan-tree-dump-times "tanhf " "1" "optimized" }} */
+
-- 
cgit v1.1


From 9af0d5ef3b14a9b3e4b0cb6aaaaba44ea722fb06 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Fri, 4 Oct 2019 21:10:39 +0200
Subject: * ipa-inline.c (inline_insns_single, inline_insns_auto): Fix typo.

From-SVN: r276597
---
 gcc/ChangeLog    | 4 ++++
 gcc/ipa-inline.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6da73b6..3c96497 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-04  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-inline.c (inline_insns_single, inline_insns_auto): Fix typo.
+
 2019-10-04  Rafael Tsuha  <rafael.tsuha@usp.br>
 
         * match.pd (sinh (x) / cosh (x)): New simplification rule.
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 725e675..2801cb9 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -396,7 +396,7 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
 static int
 inline_insns_single (cgraph_node *n, bool hint)
 {
-  if (opt_for_fn (n->decl, optimize >= 3))
+  if (opt_for_fn (n->decl, optimize) >= 3)
     {
       if (hint)
 	return PARAM_VALUE (PARAM_MAX_INLINE_INSNS_SINGLE)
@@ -418,7 +418,7 @@ inline_insns_single (cgraph_node *n, bool hint)
 static int
 inline_insns_auto (cgraph_node *n, bool hint)
 {
-  if (opt_for_fn (n->decl, optimize >= 3))
+  if (opt_for_fn (n->decl, optimize) >= 3)
     {
       if (hint)
 	return PARAM_VALUE (PARAM_MAX_INLINE_INSNS_AUTO)
-- 
cgit v1.1


From 0e8879cb36eca17e7b1ff8f2124bbc5ec3c6dc91 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Fri, 4 Oct 2019 21:21:21 +0000
Subject: PR fortran.91959

2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran.91959
	* fortran/decl.c (variable_decl): Re-arrange code for matching %FILL.

2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran.91959
	* gfortran.dg/pr91959.f90: New test.

From-SVN: r276601
---
 gcc/fortran/ChangeLog                 |  5 +++
 gcc/fortran/decl.c                    | 60 +++++++++++++++++++----------------
 gcc/testsuite/ChangeLog               |  5 +++
 gcc/testsuite/gfortran.dg/pr91959.f90 |  9 ++++++
 4 files changed, 52 insertions(+), 27 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr91959.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 196b40b..dc1e19a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran.91959
+	* fortran/decl.c (variable_decl): Re-arrange code for matching %FILL.
+
 2019-10-04  Tobias Burnus  <tobias@codesourcery.com>
 
 	* error (error_print, gfc_format_decoder): Fix off-by one issue with %C.
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 96b6f3f..d439906 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -2441,6 +2441,7 @@ variable_decl (int elem)
   match m;
   bool t;
   gfc_symbol *sym;
+  char c;
 
   initializer = NULL;
   as = NULL;
@@ -2454,40 +2455,45 @@ variable_decl (int elem)
      name to be '%FILL' which gives it an anonymous (inaccessible) name.  */
   m = MATCH_NO;
   gfc_gobble_whitespace ();
-  if (gfc_peek_ascii_char () == '%')
+  c = gfc_peek_ascii_char ();
+  if (c == '%')
     {
-      gfc_next_ascii_char ();
+      gfc_next_ascii_char ();	/* Burn % character.  */
       m = gfc_match ("fill");
-    }
-
-  if (m != MATCH_YES)
-    {
-      m = gfc_match_name (name);
-      if (m != MATCH_YES)
-	goto cleanup;
-    }
-
-  else
-    {
-      m = MATCH_ERROR;
-      if (gfc_current_state () != COMP_STRUCTURE)
+      if (m == MATCH_YES)
 	{
-	  if (flag_dec_structure)
-	    gfc_error ("%qs not allowed outside STRUCTURE at %C", "%FILL");
-	  else
-	    gfc_error ("%qs at %C is a DEC extension, enable with "
+	  if (gfc_current_state () != COMP_STRUCTURE)
+	    {
+	      if (flag_dec_structure)
+		gfc_error ("%qs not allowed outside STRUCTURE at %C", "%FILL");
+	      else
+		gfc_error ("%qs at %C is a DEC extension, enable with "
 		       "%<-fdec-structure%>", "%FILL");
-	  goto cleanup;
-	}
+	      m = MATCH_ERROR;
+	      goto cleanup;
+	    }
+
+	  if (attr_seen)
+	    {
+	      gfc_error ("%qs entity cannot have attributes at %C", "%FILL");
+	      m = MATCH_ERROR;
+	      goto cleanup;
+	    }
 
-      if (attr_seen)
+	  /* %FILL components are given invalid fortran names.  */
+	  snprintf (name, GFC_MAX_SYMBOL_LEN + 1, "%%FILL%u", fill_id++);
+	}
+      else
 	{
-	  gfc_error ("%qs entity cannot have attributes at %C", "%FILL");
-	  goto cleanup;
+	  gfc_error ("Invalid character %qc in variable name at %C", c);
+	  return MATCH_ERROR;
 	}
-
-      /* %FILL components are given invalid fortran names.  */
-      snprintf (name, GFC_MAX_SYMBOL_LEN + 1, "%%FILL%u", fill_id++);
+    }
+  else
+    {
+      m = gfc_match_name (name);
+      if (m != MATCH_YES)
+	goto cleanup;
     }
 
   var_locus = gfc_current_locus;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4248c81..f9eefad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran.91959
+	* gfortran.dg/pr91959.f90: New test.
+
 2019-10-04  Rafael Tsuha  <rafael.tsuha@usp.br>
 
         * gcc.dg/sinhovercosh-1.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/pr91959.f90 b/gcc/testsuite/gfortran.dg/pr91959.f90
new file mode 100644
index 0000000..788b413
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr91959.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/91959
+! Code contributed by Gerhard Steinmetz
+program p
+   implicit none
+   integer :: %a  ! { dg-error "Invalid character" }
+   a = 1          ! { dg-error "has no IMPLICIT type" }
+   print *, a 
+end
-- 
cgit v1.1


From 28a5fa54aa47877b6d254430adbf3ca0377beeaa Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Fri, 4 Oct 2019 21:26:27 +0000
Subject: builtins.c (compute_objsize): Add an argument.

gcc/ChangeLog:

	* builtins.c (compute_objsize): Add an argument.
	* tree-object-size.c (addr_object_size): Same.
	(compute_builtin_object_size): Same.
	* tree-object-size.h (compute_builtin_object): Same.

gcc/testsuite/ChangeLog:

	* gcc.dg/Wstringop-overflow-17.c: New test.

From-SVN: r276602
---
 gcc/ChangeLog                                |  7 ++++++
 gcc/builtins.c                               |  2 +-
 gcc/testsuite/ChangeLog                      |  4 ++++
 gcc/testsuite/gcc.dg/Wstringop-overflow-17.c | 20 +++++++++++++++++
 gcc/tree-object-size.c                       | 33 +++++++++++++++++++---------
 gcc/tree-object-size.h                       |  3 ++-
 6 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/Wstringop-overflow-17.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c96497..6a1c17c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-04  Martin Sebor  <msebor@redhat.com>
+
+	* builtins.c (compute_objsize): Add an argument.
+	* tree-object-size.c (addr_object_size): Same.
+	(compute_builtin_object_size): Same.
+	* tree-object-size.h (compute_builtin_object): Same.
+
 2019-10-04  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-inline.c (inline_insns_single, inline_insns_auto): Fix typo.
diff --git a/gcc/builtins.c b/gcc/builtins.c
index fa17afd..a1dc83c 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3587,7 +3587,7 @@ compute_objsize (tree dest, int ostype, tree *pdecl /* = NULL */)
   /* Only the two least significant bits are meaningful.  */
   ostype &= 3;
 
-  if (compute_builtin_object_size (dest, ostype, &size))
+  if (compute_builtin_object_size (dest, ostype, &size, pdecl))
     return build_int_cst (sizetype, size);
 
   if (TREE_CODE (dest) == SSA_NAME)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f9eefad..9a5adf7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-04  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/Wstringop-overflow-17.c: New test.
+
 2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran.91959
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c
new file mode 100644
index 0000000..de22c98
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c
@@ -0,0 +1,20 @@
+/* Test to verify that -Wstringop-overflow mentions the referenced object
+   i.
+   { dg-do compile }
+   { dg-options "-O2 -Wall" } */
+
+static void copy_n (char *d, const char *s, int n)
+{
+  while (n--)
+    *d++ = *s++;
+  *d = 0;           // { dg-warning "writing 1 byte into a region of size 0" }
+}
+
+void sink (void*);
+
+void call_copy_n (const char *s)
+{
+  char a[3];        // { dg-message "destination object declared here" }
+  copy_n (a, "1234567", 7);
+  sink (a);
+}
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index f9ad7e8..db9b569 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -54,7 +54,8 @@ static const unsigned HOST_WIDE_INT unknown[4] = {
 
 static tree compute_object_offset (const_tree, const_tree);
 static bool addr_object_size (struct object_size_info *,
-			      const_tree, int, unsigned HOST_WIDE_INT *);
+			      const_tree, int, unsigned HOST_WIDE_INT *,
+			      tree * = NULL);
 static unsigned HOST_WIDE_INT alloc_object_size (const gcall *, int);
 static tree pass_through_call (const gcall *);
 static void collect_object_sizes_for (struct object_size_info *, tree);
@@ -172,10 +173,15 @@ compute_object_offset (const_tree expr, const_tree var)
 
 static bool
 addr_object_size (struct object_size_info *osi, const_tree ptr,
-		  int object_size_type, unsigned HOST_WIDE_INT *psize)
+		  int object_size_type, unsigned HOST_WIDE_INT *psize,
+		  tree *pdecl /* = NULL */)
 {
   tree pt_var, pt_var_size = NULL_TREE, var_size, bytes;
 
+  tree dummy;
+  if (!pdecl)
+    pdecl = &dummy;
+
   gcc_assert (TREE_CODE (ptr) == ADDR_EXPR);
 
   /* Set to unknown and overwrite just before returning if the size
@@ -195,7 +201,7 @@ addr_object_size (struct object_size_info *osi, const_tree ptr,
 	  || TREE_CODE (TREE_OPERAND (pt_var, 0)) != SSA_NAME)
 	{
 	  compute_builtin_object_size (TREE_OPERAND (pt_var, 0),
-				       object_size_type & ~1, &sz);
+				       object_size_type & ~1, &sz, pdecl);
 	}
       else
 	{
@@ -232,7 +238,10 @@ addr_object_size (struct object_size_info *osi, const_tree ptr,
 	   && DECL_P (pt_var)
 	   && tree_fits_uhwi_p (DECL_SIZE_UNIT (pt_var))
 	   && tree_to_uhwi (DECL_SIZE_UNIT (pt_var)) < offset_limit)
-    pt_var_size = DECL_SIZE_UNIT (pt_var);
+    {
+      *pdecl = pt_var;
+      pt_var_size = DECL_SIZE_UNIT (pt_var);
+    }
   else if (pt_var
 	   && TREE_CODE (pt_var) == STRING_CST
 	   && TYPE_SIZE_UNIT (TREE_TYPE (pt_var))
@@ -478,13 +487,16 @@ pass_through_call (const gcall *call)
 
 
 /* Compute __builtin_object_size value for PTR and set *PSIZE to
-   the resulting value.  OBJECT_SIZE_TYPE is the second argument
-   to __builtin_object_size.  Return true on success and false
-   when the object size could not be determined.  */
+   the resulting value.  If the declared object is known and PDECL
+   is nonnull, sets *PDECL to the object's DECL.  OBJECT_SIZE_TYPE
+   is the second argument   to __builtin_object_size.
+   Returns true on success and false when the object size could not
+   be determined.  */
 
 bool
 compute_builtin_object_size (tree ptr, int object_size_type,
-			     unsigned HOST_WIDE_INT *psize)
+			     unsigned HOST_WIDE_INT *psize,
+			     tree *pdecl /* = NULL */)
 {
   gcc_assert (object_size_type >= 0 && object_size_type <= 3);
 
@@ -496,7 +508,7 @@ compute_builtin_object_size (tree ptr, int object_size_type,
     init_offset_limit ();
 
   if (TREE_CODE (ptr) == ADDR_EXPR)
-    return addr_object_size (NULL, ptr, object_size_type, psize);
+    return addr_object_size (NULL, ptr, object_size_type, psize, pdecl);
 
   if (TREE_CODE (ptr) != SSA_NAME
       || !POINTER_TYPE_P (TREE_TYPE (ptr)))
@@ -520,7 +532,8 @@ compute_builtin_object_size (tree ptr, int object_size_type,
 	      ptr = gimple_assign_rhs1 (def);
 
 	      if (tree_fits_shwi_p (offset)
-		  && compute_builtin_object_size (ptr, object_size_type, psize))
+		  && compute_builtin_object_size (ptr, object_size_type,
+						  psize, pdecl))
 		{
 		  /* Return zero when the offset is out of bounds.  */
 		  unsigned HOST_WIDE_INT off = tree_to_shwi (offset);
diff --git a/gcc/tree-object-size.h b/gcc/tree-object-size.h
index 420af3e..65528b3 100644
--- a/gcc/tree-object-size.h
+++ b/gcc/tree-object-size.h
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 extern void init_object_sizes (void);
 extern void fini_object_sizes (void);
-extern bool compute_builtin_object_size (tree, int, unsigned HOST_WIDE_INT *);
+extern bool compute_builtin_object_size (tree, int, unsigned HOST_WIDE_INT *,
+					 tree * = NULL);
 
 #endif  // GCC_TREE_OBJECT_SIZE_H
-- 
cgit v1.1


From daa94de24b9afdf21c636532e53561aa3713910b Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Fri, 4 Oct 2019 21:29:41 +0000
Subject: PR middle-end/91977 - missing -Wstringop-overflow on memcpy into a
 pointer plus offset

gcc/ChangeLog:

	PR middle-end/91977
	* tree-ssa-strlen.c (count_nonzero_bytes): Handle assignments with
	MEM_REF right operand.  Avoid failing for MEM_REF assignments from
	uninitialized objects.

gcc/testsuite/ChangeLog:

	PR middle-end/91977
	* gcc.dg/Wstringop-overflow-18.c: New test.

From-SVN: r276603
---
 gcc/ChangeLog                                |   7 +
 gcc/testsuite/ChangeLog                      |   5 +
 gcc/testsuite/gcc.dg/Warray-bounds-18.c      |   2 +-
 gcc/testsuite/gcc.dg/Wstringop-overflow-18.c | 239 +++++++++++++++++++++++++++
 gcc/tree-ssa-strlen.c                        |  75 +++++----
 5 files changed, 297 insertions(+), 31 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/Wstringop-overflow-18.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6a1c17c..18b4f89 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-04  Martin Sebor  <msebor@redhat.com>
 
+	PR middle-end/91977
+	* tree-ssa-strlen.c (count_nonzero_bytes): Handle assignments with
+	MEM_REF right operand.  Avoid failing for MEM_REF assignments from
+	uninitialized objects.
+
+2019-10-04  Martin Sebor  <msebor@redhat.com>
+
 	* builtins.c (compute_objsize): Add an argument.
 	* tree-object-size.c (addr_object_size): Same.
 	(compute_builtin_object_size): Same.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a5adf7..d8987ca 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-04  Martin Sebor  <msebor@redhat.com>
 
+	PR middle-end/91977
+	* gcc.dg/Wstringop-overflow-18.c: New test.
+
+2019-10-04  Martin Sebor  <msebor@redhat.com>
+
 	* gcc.dg/Wstringop-overflow-17.c: New test.
 
 2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
diff --git a/gcc/testsuite/gcc.dg/Warray-bounds-18.c b/gcc/testsuite/gcc.dg/Warray-bounds-18.c
index 888fb80..092363a 100644
--- a/gcc/testsuite/gcc.dg/Warray-bounds-18.c
+++ b/gcc/testsuite/gcc.dg/Warray-bounds-18.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -Warray-bounds" } */
+/* { dg-options "-O2 -Warray-bounds -Wno-stringop-overflow" } */
 
 typedef struct
 {
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-18.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-18.c
new file mode 100644
index 0000000..7866b58
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-18.c
@@ -0,0 +1,239 @@
+/* PR middle-end/91977 - missing -Wstringop-overflow on memcpy into
+   a pointer plus offset
+   { dg-do compile }
+   { dg-options "-O2 -Wall -Wno-array-bounds -ftrack-macro-expansion=0" } */
+
+#define NOIPA          __attribute__ ((noipa))
+#define CONCAT(a, b)   a ## b
+#define CAT(a, b)      CONCAT (a, b)
+
+#define S3 "123"
+#define S4 "1234"
+
+char a1[1], a2[2], a3[3], a4[4], a5[5], a6[6], a7[7], a8[8];
+char b1[1], b2[2], b3[3], b4[4], b5[5], b6[6], b7[7], b8[8];
+
+#define T(dst, src, off, n)					\
+  NOIPA void CAT (test_on_line_, __LINE__) (const void *s)	\
+  {								\
+    __builtin_memcpy (dst + off, src, n);			\
+  } typedef void dummy_type
+
+T (a4, s, 0, 1);
+T (a4, s, 1, 1);
+T (a4, s, 2, 1);
+T (a4, s, 3, 1);
+T (a4, s, 4, 1);    // { dg-warning "writing 1 byte into a region of size 0" }
+
+T (a4, s, 0, 2);
+T (a4, s, 1, 2);
+T (a4, s, 2, 2);
+T (a4, s, 3, 2);    // { dg-warning "writing 2 bytes into a region of size 1" }
+T (a4, s, 4, 2);    // { dg-warning "writing 2 bytes into a region of size 0" }
+
+T (a4, s, 0, 3);
+T (a4, s, 1, 3);
+T (a4, s, 2, 3);    // { dg-warning "writing 3 bytes into a region of size 2" }
+T (a4, s, 3, 3);    // { dg-warning "writing 3 bytes into a region of size 1" }
+T (a4, s, 4, 3);    // { dg-warning "writing 3 bytes into a region of size 0" }
+
+T (a4, s, 0, 4);
+T (a4, s, 1, 4);    // { dg-warning "writing 4 bytes into a region of size 3" }
+T (a4, s, 2, 4);    // { dg-warning "writing 4 bytes into a region of size 2" }
+T (a4, s, 3, 4);    // { dg-warning "writing 4 bytes into a region of size 1" }
+T (a4, s, 4, 4);    // { dg-warning "writing 4 bytes into a region of size 0" }
+
+T (a7, s, 3, 3);
+T (a7, s, 4, 3);
+T (a7, s, 5, 3);    // { dg-warning "writing 3 bytes into a region of size 2" }
+T (a7, s, 6, 3);    // { dg-warning "writing 3 bytes into a region of size 1" }
+T (a7, s, 7, 3);    // { dg-warning "writing 3 bytes into a region of size 0" }
+
+T (a7, s, 3, 4);
+T (a7, s, 4, 4);    // { dg-warning "writing 4 bytes into a region of size 3" }
+T (a7, s, 5, 4);    // { dg-warning "writing 4 bytes into a region of size 2" }
+T (a7, s, 6, 4);    // { dg-warning "writing 4 bytes into a region of size 1" }
+T (a7, s, 7, 4);    // { dg-warning "writing 4 bytes into a region of size 0" }
+
+T (a7, s, 1, 6);
+T (a7, s, 2, 6);    // { dg-warning "writing 6 bytes into a region of size 5" }
+T (a7, s, 3, 6);    // { dg-warning "writing 6 bytes into a region of size 4" }
+T (a7, s, 4, 6);    // { dg-warning "writing 6 bytes into a region of size 3" }
+T (a7, s, 5, 6);    // { dg-warning "writing 6 bytes into a region of size 2" }
+T (a7, s, 6, 6);    // { dg-warning "writing 6 bytes into a region of size 1" }
+T (a7, s, 7, 6);    // { dg-warning "writing 6 bytes into a region of size 0" }
+
+T (a8, s, 1, 7);
+T (a8, s, 2, 7);    // { dg-warning "writing 7 bytes into a region of size 6" }
+T (a8, s, 3, 7);    // { dg-warning "writing 7 bytes into a region of size 5" }
+T (a8, s, 4, 7);    // { dg-warning "writing 7 bytes into a region of size 4" }
+T (a8, s, 5, 7);    // { dg-warning "writing 7 bytes into a region of size 3" }
+T (a8, s, 6, 7);    // { dg-warning "writing 7 bytes into a region of size 2" }
+T (a8, s, 7, 7);    // { dg-warning "writing 7 bytes into a region of size 1" }
+T (a8, s, 8, 7);    // { dg-warning "writing 7 bytes into a region of size 0" }
+
+#undef T
+#define T(dst, src, off, n)					\
+  NOIPA void CAT (test_on_line_, __LINE__) (const void *s)	\
+  {								\
+    char *d = dst + off;					\
+    __builtin_memcpy (d, src, n);				\
+  } typedef void dummy_type
+
+T (a4, s, 0, 1);
+T (a4, s, 1, 1);
+T (a4, s, 2, 1);
+T (a4, s, 3, 1);
+T (a4, s, 4, 1);    // { dg-warning "writing 1 byte into a region of size 0" }
+
+T (a4, s, 0, 2);
+T (a4, s, 1, 2);
+T (a4, s, 2, 2);
+T (a4, s, 3, 2);    // { dg-warning "writing 2 bytes into a region of size 1" }
+T (a4, s, 4, 2);    // { dg-warning "writing 2 bytes into a region of size 0" }
+
+T (a4, s, 0, 3);
+T (a4, s, 1, 3);
+T (a4, s, 2, 3);    // { dg-warning "writing 3 bytes into a region of size 2" }
+T (a4, s, 3, 3);    // { dg-warning "writing 3 bytes into a region of size 1" }
+T (a4, s, 4, 3);    // { dg-warning "writing 3 bytes into a region of size 0" }
+
+T (a4, s, 0, 4);
+T (a4, s, 1, 4);    // { dg-warning "writing 4 bytes into a region of size 3" }
+T (a4, s, 2, 4);    // { dg-warning "writing 4 bytes into a region of size 2" }
+T (a4, s, 3, 4);    // { dg-warning "writing 4 bytes into a region of size 1" }
+T (a4, s, 4, 4);    // { dg-warning "writing 4 bytes into a region of size 0" }
+
+T (a7, s, 3, 3);
+T (a7, s, 4, 3);
+T (a7, s, 5, 3);    // { dg-warning "writing 3 bytes into a region of size 2" }
+T (a7, s, 6, 3);    // { dg-warning "writing 3 bytes into a region of size 1" }
+T (a7, s, 7, 3);    // { dg-warning "writing 3 bytes into a region of size 0" }
+
+T (a7, s, 3, 4);
+T (a7, s, 4, 4);    // { dg-warning "writing 4 bytes into a region of size 3" }
+T (a7, s, 5, 4);    // { dg-warning "writing 4 bytes into a region of size 2" }
+T (a7, s, 6, 4);    // { dg-warning "writing 4 bytes into a region of size 1" }
+T (a7, s, 7, 4);    // { dg-warning "writing 4 bytes into a region of size 0" }
+
+T (a7, s, 1, 6);
+T (a7, s, 2, 6);    // { dg-warning "writing 6 bytes into a region of size 5" }
+T (a7, s, 3, 6);    // { dg-warning "writing 6 bytes into a region of size 4" }
+T (a7, s, 4, 6);    // { dg-warning "writing 6 bytes into a region of size 3" }
+T (a7, s, 5, 6);    // { dg-warning "writing 6 bytes into a region of size 2" }
+T (a7, s, 6, 6);    // { dg-warning "writing 6 bytes into a region of size 1" }
+T (a7, s, 7, 6);    // { dg-warning "writing 6 bytes into a region of size 0" }
+
+#undef T
+#define T(dst, src, init, off, n)			\
+  NOIPA void CAT (test_on_line_, __LINE__) (void)	\
+  {							\
+    __builtin_strcpy (src, init);			\
+    char *d = dst + off;				\
+    __builtin_memcpy (d, src, n);			\
+  } typedef void dummy_type
+
+
+T (a6, b6, S4, 0, 4);
+T (a6, b6, S4, 1, 4);
+T (a6, b6, S4, 2, 4);
+T (a6, b6, S4, 3, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a6, b6, S4, 4, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a6, b6, S4, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a6, b6, S4, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a7, b7, S4, 0, 4);
+T (a7, b7, S4, 1, 4);
+T (a7, b7, S4, 2, 4);
+T (a7, b7, S4, 3, 4);
+T (a7, b7, S4, 4, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a7, b7, S4, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a7, b7, S4, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a7, b7, S4, 7, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a8, b4, S3, 0, 4);
+T (a8, b4, S3, 1, 4);
+T (a8, b4, S3, 2, 4);
+T (a8, b4, S3, 3, 4);
+T (a8, b4, S3, 4, 4);
+T (a8, b4, S3, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a8, b4, S3, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a8, b4, S3, 7, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a8, b4, S3, 8, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a8, b8, S3, 0, 4);
+T (a8, b8, S3, 1, 4);
+T (a8, b8, S3, 2, 4);
+T (a8, b8, S3, 3, 4);
+T (a8, b8, S3, 4, 4);
+T (a8, b8, S3, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a8, b8, S3, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a8, b8, S3, 7, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a8, b8, S3, 8, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a8, b8, S4, 0, 4);
+T (a8, b8, S4, 1, 4);
+T (a8, b8, S4, 2, 4);
+T (a8, b8, S4, 3, 4);
+T (a8, b8, S4, 4, 4);
+T (a8, b8, S4, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a8, b8, S4, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a8, b8, S4, 7, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a8, b8, S4, 8, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a8, b8, S4, 0, 5);
+T (a8, b8, S4, 1, 5);
+T (a8, b8, S4, 2, 5);
+T (a8, b8, S4, 3, 5);
+T (a8, b8, S4, 4, 5);   // { dg-warning "writing 5 bytes into a region of size 4" } */
+T (a8, b8, S4, 5, 5);   // { dg-warning "writing 5 bytes into a region of size 3" } */
+T (a8, b8, S4, 6, 5);   // { dg-warning "writing 5 bytes into a region of size 2" } */
+T (a8, b8, S4, 7, 5);   // { dg-warning "writing 5 bytes into a region of size 1" } */
+T (a8, b8, S4, 8, 5);   // { dg-warning "writing 5 bytes into a region of size 0" } */
+
+T (a8, b8, S4, 0, 6);
+T (a8, b8, S4, 1, 6);
+T (a8, b8, S4, 2, 6);
+T (a8, b8, S4, 3, 6);   // { dg-warning "writing 6 bytes into a region of size 5" } */
+T (a8, b8, S4, 4, 6);   // { dg-warning "writing 6 bytes into a region of size 4" } */
+T (a8, b8, S4, 5, 6);   // { dg-warning "writing 6 bytes into a region of size 3" } */
+T (a8, b8, S4, 6, 6);   // { dg-warning "writing 6 bytes into a region of size 2" } */
+T (a8, b8, S4, 7, 6);   // { dg-warning "writing 6 bytes into a region of size 1" } */
+T (a8, b8, S4, 8, 6);   // { dg-warning "writing 6 bytes into a region of size 0" } */
+
+
+#undef T
+#define T(dst, init, off, n)				\
+  NOIPA void CAT (test_on_line_, __LINE__) (char *src)	\
+  {							\
+    __builtin_strcpy (src, init);			\
+    char *d = dst + off;				\
+    __builtin_memcpy (d, src, n);			\
+  } typedef void dummy_type
+
+T (a6, S4, 0, 4);
+T (a6, S4, 1, 4);
+T (a6, S4, 2, 4);
+T (a6, S4, 3, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a6, S4, 4, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a6, S4, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a6, S4, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a7, S4, 0, 4);
+T (a7, S4, 1, 4);
+T (a7, S4, 2, 4);
+T (a7, S4, 3, 4);
+T (a7, S4, 4, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a7, S4, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a7, S4, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a7, S4, 7, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
+
+T (a8, S3, 0, 4);
+T (a8, S3, 1, 4);
+T (a8, S3, 2, 4);
+T (a8, S3, 3, 4);
+T (a8, S3, 4, 4);
+T (a8, S3, 5, 4);   // { dg-warning "writing 4 bytes into a region of size 3" } */
+T (a8, S3, 6, 4);   // { dg-warning "writing 4 bytes into a region of size 2" } */
+T (a8, S3, 7, 4);   // { dg-warning "writing 4 bytes into a region of size 1" } */
+T (a8, S3, 8, 4);   // { dg-warning "writing 4 bytes into a region of size 0" } */
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index c82bc7c..d68df19 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -3801,40 +3801,44 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
       tree type = TREE_TYPE (exp);
       if (TREE_CODE (type) == INTEGER_TYPE
 	  && TYPE_MODE (type) == TYPE_MODE (char_type_node)
-	  && TYPE_PRECISION (type) == TYPE_PRECISION (char_type_node))
+	  && TYPE_PRECISION (type) == TYPE_PRECISION (char_type_node)
+	  && tree_expr_nonzero_p (exp))
 	{
-	  /* Determine if the character EXP is known to be non-zero
-	     (even if its exact value is not known) and if so, recurse
-	     once to set the range, etc.  */
-	  if (tree_expr_nonzero_p (exp))
-	    return count_nonzero_bytes (build_int_cst (type, 1),
-					offset, nbytes, lenrange,
-					nulterm, allnul, allnonnul, snlim);
-	  /* Don't know whether EXP is or isn't nonzero.  */
-	  return false;
+	  /* If the character EXP is known to be non-zero (even if its
+	     exact value is not known) recurse once to set the range
+	     for an arbitrary constant.  */
+	  exp = build_int_cst (type, 1);
+	  return count_nonzero_bytes (exp, offset, 1, lenrange,
+				      nulterm, allnul, allnonnul, snlim);
 	}
 
       gimple *stmt = SSA_NAME_DEF_STMT (exp);
-      if (gimple_code (stmt) != GIMPLE_PHI)
-	return false;
-
-      /* Avoid processing an SSA_NAME that has already been visited
-	 or if an SSA_NAME limit has been reached.  Indicate success
-	 if the former and failure if the latter.  */
-      if (int res = snlim.next_ssa_name (exp))
-	return res > 0;
-
-      /* Determine the minimum and maximum from the PHI arguments.  */
-      unsigned int n = gimple_phi_num_args (stmt);
-      for (unsigned i = 0; i != n; i++)
+      if (gimple_assign_single_p (stmt))
 	{
-	  tree def = gimple_phi_arg_def (stmt, i);
-	  if (!count_nonzero_bytes (def, offset, nbytes, lenrange, nulterm,
-				    allnul, allnonnul, snlim))
+	  exp = gimple_assign_rhs1 (stmt);
+	  if (TREE_CODE (exp) != MEM_REF)
 	    return false;
 	}
+      else if (gimple_code (stmt) == GIMPLE_PHI)
+	{
+	  /* Avoid processing an SSA_NAME that has already been visited
+	     or if an SSA_NAME limit has been reached.  Indicate success
+	     if the former and failure if the latter.  */
+	  if (int res = snlim.next_ssa_name (exp))
+	    return res > 0;
+
+	  /* Determine the minimum and maximum from the PHI arguments.  */
+	  unsigned int n = gimple_phi_num_args (stmt);
+	  for (unsigned i = 0; i != n; i++)
+	    {
+	      tree def = gimple_phi_arg_def (stmt, i);
+	      if (!count_nonzero_bytes (def, offset, nbytes, lenrange, nulterm,
+					allnul, allnonnul, snlim))
+		return false;
+	    }
 
-      return true;
+	  return true;
+	}
     }
 
   if (TREE_CODE (exp) == MEM_REF)
@@ -3897,14 +3901,25 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
       prep = reinterpret_cast <char *>(buf);
       /* Try to extract the representation of the constant object
 	 or expression starting from the offset.  */
-      nbytes = native_encode_expr (exp, buf, sizeof buf, offset);
-      if (!nbytes)
-	return false;
+      unsigned repsize = native_encode_expr (exp, buf, sizeof buf, offset);
+      if (repsize < nbytes)
+	{
+	  /* This should only happen when REPSIZE is zero because EXP
+	     doesn't denote an object with a known initializer, except
+	     perhaps when the reference reads past its end.  */
+	  lenrange[0] = 0;
+	  prep = NULL;
+	}
+      else
+	nbytes = repsize;
     }
 
+  if (!nbytes)
+    return false;
+
   /* Compute the number of leading nonzero bytes in the representation
      and update the minimum and maximum.  */
-  unsigned n = strnlen (prep, nbytes);
+  unsigned n = prep ? strnlen (prep, nbytes) : nbytes;
 
   if (n < lenrange[0])
     lenrange[0] = n;
-- 
cgit v1.1


From 843f104d5bc6d1f9b4b3f56c3a4e4278e608827f Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 4 Oct 2019 22:56:14 +0100
Subject: Add strftime format checking support for C2x %OB and %Ob (bug 82752).

C2x adds strftime %OB and %Ob formats, for alternative forms of month
names (for mainly Slavic languages where a month name on its own is
declined differently from a month name together with a date within
that month).  This patch adds corresponding format checking support.
(glibc support for these formats was added in glibc 2.27.)

Bootstrapped with no regressions on x86_64-pc-linux-gnu.

	PR c/82752
gcc/c-family:
	* c-format.c (C_STD_VER): Handle C2x.
	(C_STD_NAME): Likewise.
	(strftime_flag_specs): Add 'O' modifier with 'p' flag.
	(time_char_table): Use separate entry for 'B' and 'b', with 'O'
	modifier allowed and 'p' flag.
	* c-format.h (enum format_std_version): Add STD_C2X.
	(struct format_char_info): Mention 'p' in comment on flags2.

gcc/testsuite:
	* gcc.dg/format/c2x-strftime-1.c: New test.

From-SVN: r276605
---
 gcc/c-family/ChangeLog                       | 11 +++++++++++
 gcc/c-family/c-format.c                      | 16 +++++++++++-----
 gcc/c-family/c-format.h                      |  2 ++
 gcc/testsuite/ChangeLog                      |  5 +++++
 gcc/testsuite/gcc.dg/format/c2x-strftime-1.c | 15 +++++++++++++++
 5 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/format/c2x-strftime-1.c

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0eade3c..1ebc4d9 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-04  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/82752
+	* c-format.c (C_STD_VER): Handle C2x.
+	(C_STD_NAME): Likewise.
+	(strftime_flag_specs): Add 'O' modifier with 'p' flag.
+	(time_char_table): Use separate entry for 'B' and 'b', with 'O'
+	modifier allowed and 'p' flag.
+	* c-format.h (enum format_std_version): Add STD_C2X.
+	(struct format_char_info): Mention 'p' in comment on flags2.
+
 2019-10-01  David Malcolm  <dmalcolm@redhat.com>
 
 	* c-opts.c (c_diagnostic_finalizer): Temporarily clear prefix when
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 91bae3d..3c291ca 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -404,9 +404,11 @@ decode_format_attr (const_tree fntype, tree atname, tree args,
 /* The C standard version we are checking formats against when pedantic.  */
 #define C_STD_VER		((int) (c_dialect_cxx ()		   \
 				 ? CPLUSPLUS_STD_VER			   \
-				 : (flag_isoc99				   \
-				    ? STD_C99				   \
-				    : (flag_isoc94 ? STD_C94 : STD_C89))))
+				 : (flag_isoc2x				   \
+				    ? STD_C2X				   \
+				    : (flag_isoc99			   \
+				       ? STD_C99			   \
+				       : (flag_isoc94 ? STD_C94 : STD_C89)))))
 /* The name to give to the standard version we are warning about when
    pedantic.  FEATURE_VER is the version in which the feature warned out
    appeared, which is higher than C_STD_VER.  */
@@ -415,7 +417,9 @@ decode_format_attr (const_tree fntype, tree atname, tree args,
 				    : "ISO C++11")		\
 				 : ((FEATURE_VER) == STD_EXT	\
 				    ? "ISO C"			\
-				    : "ISO C90"))
+				    : ((FEATURE_VER) == STD_C2X	\
+				       ? "ISO C17"		\
+				       : "ISO C90")))
 /* Adjust a C standard version, which may be STD_C9L, to account for
    -Wno-long-long.  Returns other standard versions unchanged.  */
 #define ADJ_STD(VER)		((int) ((VER) == STD_C9L		      \
@@ -653,6 +657,7 @@ static const format_flag_spec strftime_flag_specs[] =
   { 'E', 0,   0, 0, N_("'E' modifier"), N_("the 'E' strftime modifier"),      STD_C99 },
   { 'O', 0,   0, 0, N_("'O' modifier"), N_("the 'O' strftime modifier"),      STD_C99 },
   { 'O', 'o', 0, 0, NULL,               N_("the 'O' modifier"),               STD_EXT },
+  { 'O', 'p', 0, 0, NULL,               N_("the 'O' modifier"),               STD_C2X },
   { 0, 0, 0, 0, NULL, NULL, STD_C89 }
 };
 
@@ -887,7 +892,8 @@ static const format_char_info scan_char_table[] =
 static const format_char_info time_char_table[] =
 {
   /* C89 conversion specifiers.  */
-  { "ABZab",		0, STD_C89, NOLENGTHS, "^#",     "",   NULL },
+  { "AZa",		0, STD_C89, NOLENGTHS, "^#",     "",   NULL },
+  { "Bb",		0, STD_C89, NOLENGTHS, "O^#",    "p",  NULL },
   { "cx",		0, STD_C89, NOLENGTHS, "E",      "3",  NULL },
   { "HIMSUWdmw",	0, STD_C89, NOLENGTHS, "-_0Ow",  "",   NULL },
   { "j",		0, STD_C89, NOLENGTHS, "-_0Ow",  "o",  NULL },
diff --git a/gcc/c-family/c-format.h b/gcc/c-family/c-format.h
index 6aa68df..15a3153 100644
--- a/gcc/c-family/c-format.h
+++ b/gcc/c-family/c-format.h
@@ -48,6 +48,7 @@ enum format_std_version
   STD_C94,
   STD_C9L, /* C99, but treat as C89 if -Wno-long-long.  */
   STD_C99,
+  STD_C2X,
   STD_EXT
 };
 
@@ -149,6 +150,7 @@ struct format_char_info
      two digit year formats, "3" for strftime formats giving two digit
      years in some locales, "4" for "2" which becomes "3" with an "E" modifier,
      "o" if use of strftime "O" is a GNU extension beyond C99,
+     "p" if use of strftime "O" is a C2x feature,
      "W" if the argument is a pointer which is dereferenced and written into,
      "R" if the argument is a pointer which is dereferenced and read from,
      "i" for printf integer formats where the '0' flag is ignored with
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d8987ca..4624521 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-04  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/82752
+	* gcc.dg/format/c2x-strftime-1.c: New test.
+
 2019-10-04  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/91977
diff --git a/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c b/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
new file mode 100644
index 0000000..c6e7619
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
@@ -0,0 +1,15 @@
+/* Test for strftime formats.  Formats using C2x features.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -pedantic -Wformat" } */
+
+#include "format.h"
+
+void
+foo (char *s, size_t m, const struct tm *tp)
+{
+  strftime (s, m, "%Ob", tp);
+  strftime (s, m, "%OB", tp);
+  /* It's not clear that %h equivalence to %b means %Oh is equivalent
+     to %Ob; here we expect %Oh to be diagnosed.  */
+  strftime (s, m, "%Oh", tp); /* { dg-warning "flag|modifier" "bad %Oh" } */
+}
-- 
cgit v1.1


From 30648d02155fd2cf5e15c9741f08ed08554fa3d6 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Sat, 5 Oct 2019 00:16:20 +0000
Subject: Daily bump.

From-SVN: r276618
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index cd0a63a..4d531d0 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191004
+20191005
-- 
cgit v1.1


From 0043b5280e6f571819d8764d76594a7a20467d00 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 5 Oct 2019 09:36:09 +0200
Subject: re PR tree-optimization/91734 (gcc skip an if statement  with "-O1
 -ffast-math")

	PR tree-optimization/91734
	* generic-match-head.c: Include fold-const-call.h.
	* match.pd (sqrt(x) cmp c): Check the boundary value and
	in case inexact computation of c*c affects comparison of the boundary,
	turn LT_EXPR into LE_EXPR, GE_EXPR into GT_EXPR, LE_EXPR into LT_EXPR
	or GT_EXPR into GE_EXPR.  Punt for sqrt comparisons against NaN and
	for -frounding-math.  For c2, try the next smaller or larger floating
	point constant depending on comparison code and if it has the same
	sqrt as c2, use it instead of c2.

	* gcc.dg/pr91734.c: New test.

From-SVN: r276621
---
 gcc/ChangeLog                  |  12 ++++
 gcc/generic-match-head.c       |   1 +
 gcc/match.pd                   | 145 ++++++++++++++++++++++++++++-------------
 gcc/testsuite/ChangeLog        |   5 ++
 gcc/testsuite/gcc.dg/pr91734.c |  97 +++++++++++++++++++++++++++
 5 files changed, 213 insertions(+), 47 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/pr91734.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18b4f89..171d554 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91734
+	* generic-match-head.c: Include fold-const-call.h.
+	* match.pd (sqrt(x) cmp c): Check the boundary value and
+	in case inexact computation of c*c affects comparison of the boundary,
+	turn LT_EXPR into LE_EXPR, GE_EXPR into GT_EXPR, LE_EXPR into LT_EXPR
+	or GT_EXPR into GE_EXPR.  Punt for sqrt comparisons against NaN and
+	for -frounding-math.  For c2, try the next smaller or larger floating
+	point constant depending on comparison code and if it has the same
+	sqrt as c2, use it instead of c2.
+
 2019-10-04  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/91977
diff --git a/gcc/generic-match-head.c b/gcc/generic-match-head.c
index b54e035..fdc6039 100644
--- a/gcc/generic-match-head.c
+++ b/gcc/generic-match-head.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "cgraph.h"
 #include "vec-perm-indices.h"
 #include "fold-const.h"
+#include "fold-const-call.h"
 #include "stor-layout.h"
 #include "tree-dfa.h"
 #include "builtins.h"
diff --git a/gcc/match.pd b/gcc/match.pd
index 9bd5f3e..e3ac06c 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -3726,8 +3726,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
      (cmp { tem; } @1)))))
 
  /* Fold comparisons against built-in math functions.  */
- (if (flag_unsafe_math_optimizations
-      && ! flag_errno_math)
+ (if (flag_unsafe_math_optimizations && ! flag_errno_math)
   (for sq (SQRT)
    (simplify
     (cmp (sq @0) REAL_CST@1)
@@ -3762,56 +3761,108 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
 	  if x is negative or NaN.  Due to -funsafe-math-optimizations,
 	  the results for other x follow from natural arithmetic.  */
        (cmp @0 @1)))
-     (if (cmp == GT_EXPR || cmp == GE_EXPR)
+     (if ((cmp == LT_EXPR
+	   || cmp == LE_EXPR
+	   || cmp == GT_EXPR
+	   || cmp == GE_EXPR)
+	  && !REAL_VALUE_ISNAN (TREE_REAL_CST (@1))
+	  /* Give up for -frounding-math.  */
+	  && !HONOR_SIGN_DEPENDENT_ROUNDING (TREE_TYPE (@0)))
       (with
        {
-         REAL_VALUE_TYPE c2;
+	 REAL_VALUE_TYPE c2;
+	 enum tree_code ncmp = cmp;
+	 const real_format *fmt
+	   = REAL_MODE_FORMAT (TYPE_MODE (TREE_TYPE (@0)));
 	 real_arithmetic (&c2, MULT_EXPR,
 			  &TREE_REAL_CST (@1), &TREE_REAL_CST (@1));
-	 real_convert (&c2, TYPE_MODE (TREE_TYPE (@0)), &c2);
-       }
-       (if (REAL_VALUE_ISINF (c2))
-	/* sqrt(x) > y is x == +Inf, when y is very large.  */
-	(if (HONOR_INFINITIES (@0))
-	 (eq @0 { build_real (TREE_TYPE (@0), c2); })
-	 { constant_boolean_node (false, type); })
-	/* sqrt(x) > c is the same as x > c*c.  */
-	(cmp @0 { build_real (TREE_TYPE (@0), c2); }))))
-     (if (cmp == LT_EXPR || cmp == LE_EXPR)
-      (with
-       {
-       	 REAL_VALUE_TYPE c2;
-	 real_arithmetic (&c2, MULT_EXPR,
-			  &TREE_REAL_CST (@1), &TREE_REAL_CST (@1));
-	 real_convert (&c2, TYPE_MODE (TREE_TYPE (@0)), &c2);
+	 real_convert (&c2, fmt, &c2);
+	 /* See PR91734: if c2 is inexact and sqrt(c2) < c (or sqrt(c2) >= c),
+	    then change LT_EXPR into LE_EXPR or GE_EXPR into GT_EXPR.  */
+	 if (!REAL_VALUE_ISINF (c2))
+	   {
+	     tree c3 = fold_const_call (CFN_SQRT, TREE_TYPE (@0),
+					build_real (TREE_TYPE (@0), c2));
+	     if (c3 == NULL_TREE || TREE_CODE (c3) != REAL_CST)
+	       ncmp = ERROR_MARK;
+	     else if ((cmp == LT_EXPR || cmp == GE_EXPR)
+		      && real_less (&TREE_REAL_CST (c3), &TREE_REAL_CST (@1)))
+	       ncmp = cmp == LT_EXPR ? LE_EXPR : GT_EXPR;
+	     else if ((cmp == LE_EXPR || cmp == GT_EXPR)
+		      && real_less (&TREE_REAL_CST (@1), &TREE_REAL_CST (c3)))
+	       ncmp = cmp == LE_EXPR ? LT_EXPR : GE_EXPR;
+	     else
+	       {
+		 /* With rounding to even, sqrt of up to 3 different values
+		    gives the same normal result, so in some cases c2 needs
+		    to be adjusted.  */
+		 REAL_VALUE_TYPE c2alt, tow;
+		 if (cmp == LT_EXPR || cmp == GE_EXPR)
+		   tow = dconst0;
+		 else
+		   real_inf (&tow);
+		 real_nextafter (&c2alt, fmt, &c2, &tow);
+		 real_convert (&c2alt, fmt, &c2alt);
+		 if (REAL_VALUE_ISINF (c2alt))
+		   ncmp = ERROR_MARK;
+		 else
+		   {
+		     c3 = fold_const_call (CFN_SQRT, TREE_TYPE (@0),
+					   build_real (TREE_TYPE (@0), c2alt));
+		     if (c3 == NULL_TREE || TREE_CODE (c3) != REAL_CST)
+		       ncmp = ERROR_MARK;
+		     else if (real_equal (&TREE_REAL_CST (c3),
+					  &TREE_REAL_CST (@1)))
+		       c2 = c2alt;
+		   }
+	       }
+	   }
        }
-       (if (REAL_VALUE_ISINF (c2))
-        (switch
-	 /* sqrt(x) < y is always true, when y is a very large
-	    value and we don't care about NaNs or Infinities.  */
-	 (if (! HONOR_NANS (@0) && ! HONOR_INFINITIES (@0))
-	  { constant_boolean_node (true, type); })
-	 /* sqrt(x) < y is x != +Inf when y is very large and we
-	    don't care about NaNs.  */
-	 (if (! HONOR_NANS (@0))
-	  (ne @0 { build_real (TREE_TYPE (@0), c2); }))
-	 /* sqrt(x) < y is x >= 0 when y is very large and we
-	    don't care about Infinities.  */
-	 (if (! HONOR_INFINITIES (@0))
-	  (ge @0 { build_real (TREE_TYPE (@0), dconst0); }))
-	 /* sqrt(x) < y is x >= 0 && x != +Inf, when y is large.  */
-	 (if (GENERIC)
-	  (truth_andif
-	   (ge @0 { build_real (TREE_TYPE (@0), dconst0); })
-	   (ne @0 { build_real (TREE_TYPE (@0), c2); }))))
-	/* sqrt(x) < c is the same as x < c*c, if we ignore NaNs.  */
-	(if (! HONOR_NANS (@0))
-	 (cmp @0 { build_real (TREE_TYPE (@0), c2); })
-	 /* sqrt(x) < c is the same as x >= 0 && x < c*c.  */
-	 (if (GENERIC)
-	  (truth_andif
-	   (ge @0 { build_real (TREE_TYPE (@0), dconst0); })
-	   (cmp @0 { build_real (TREE_TYPE (@0), c2); })))))))))
+       (if (cmp == GT_EXPR || cmp == GE_EXPR)
+	(if (REAL_VALUE_ISINF (c2))
+	 /* sqrt(x) > y is x == +Inf, when y is very large.  */
+	 (if (HONOR_INFINITIES (@0))
+	  (eq @0 { build_real (TREE_TYPE (@0), c2); })
+	  { constant_boolean_node (false, type); })
+	 /* sqrt(x) > c is the same as x > c*c.  */
+	 (if (ncmp != ERROR_MARK)
+	  (if (ncmp == GE_EXPR)
+	   (ge @0 { build_real (TREE_TYPE (@0), c2); })
+	   (gt @0 { build_real (TREE_TYPE (@0), c2); }))))
+	/* else if (cmp == LT_EXPR || cmp == LE_EXPR)  */
+	(if (REAL_VALUE_ISINF (c2))
+	 (switch
+	  /* sqrt(x) < y is always true, when y is a very large
+	     value and we don't care about NaNs or Infinities.  */
+	  (if (! HONOR_NANS (@0) && ! HONOR_INFINITIES (@0))
+	   { constant_boolean_node (true, type); })
+	  /* sqrt(x) < y is x != +Inf when y is very large and we
+	     don't care about NaNs.  */
+	  (if (! HONOR_NANS (@0))
+	   (ne @0 { build_real (TREE_TYPE (@0), c2); }))
+	  /* sqrt(x) < y is x >= 0 when y is very large and we
+	     don't care about Infinities.  */
+	  (if (! HONOR_INFINITIES (@0))
+	   (ge @0 { build_real (TREE_TYPE (@0), dconst0); }))
+	  /* sqrt(x) < y is x >= 0 && x != +Inf, when y is large.  */
+	  (if (GENERIC)
+	   (truth_andif
+	    (ge @0 { build_real (TREE_TYPE (@0), dconst0); })
+	    (ne @0 { build_real (TREE_TYPE (@0), c2); }))))
+	 /* sqrt(x) < c is the same as x < c*c, if we ignore NaNs.  */
+	 (if (ncmp != ERROR_MARK && ! HONOR_NANS (@0))
+	  (if (ncmp == LT_EXPR)
+	   (lt @0 { build_real (TREE_TYPE (@0), c2); })
+	   (le @0 { build_real (TREE_TYPE (@0), c2); }))
+	  /* sqrt(x) < c is the same as x >= 0 && x < c*c.  */
+	  (if (ncmp != ERROR_MARK && GENERIC)
+	   (if (ncmp == LT_EXPR)
+	    (truth_andif
+	     (ge @0 { build_real (TREE_TYPE (@0), dconst0); })
+	     (lt @0 { build_real (TREE_TYPE (@0), c2); }))
+	    (truth_andif
+	     (ge @0 { build_real (TREE_TYPE (@0), dconst0); })
+	     (le @0 { build_real (TREE_TYPE (@0), c2); })))))))))))
    /* Transform sqrt(x) cmp sqrt(y) -> x cmp y.  */
    (simplify
     (cmp (sq @0) (sq @1))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4624521..10ba0d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91734
+	* gcc.dg/pr91734.c: New test.
+
 2019-10-04  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/82752
diff --git a/gcc/testsuite/gcc.dg/pr91734.c b/gcc/testsuite/gcc.dg/pr91734.c
new file mode 100644
index 0000000..1cc3e40
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr91734.c
@@ -0,0 +1,97 @@
+/* PR tree-optimization/91734 */
+/* { dg-do run } */
+/* { dg-add-options ieee } */
+/* { dg-additional-options "-O2 -std=gnu99" } */
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f1 (float x)
+{
+  return __builtin_sqrtf (x) < __FLT_MIN__;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f2 (float x)
+{
+  return __builtin_sqrtf (x) < 0x1.2dd3d0p-65f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f3 (float x)
+{
+  return __builtin_sqrtf (x) >= 0x1.2dd3d0p-65f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f4 (float x)
+{
+  return __builtin_sqrtf (x) >= 0x1.5642e6p+54f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f5 (float x)
+{
+  return __builtin_sqrtf (x) > 0x1.5642e6p+54f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f6 (float x)
+{
+  return __builtin_sqrtf (x) < 0x1.4da1cp-19f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f7 (float x)
+{
+  return __builtin_sqrtf (x) <= 0x1.4da1cp-19f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f8 (float x)
+{
+  return __builtin_sqrtf (x) < 0x1.50cb62p-65f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f9 (float x)
+{
+  return __builtin_sqrtf (x) <= 0x1.4fc00cp-73f;
+}
+
+__attribute__((noipa, optimize ("Ofast"))) int
+f10 (float x)
+{
+  return __builtin_sqrtf (x) < 0x1.001002p+0f;
+}
+
+int
+main ()
+{
+  if (__FLT_RADIX__ != 2
+      || __FLT_MANT_DIG__ != 24
+      || __FLT_MIN_EXP__ != -125
+      || __FLT_MAX_EXP__ != 128
+      || __FLT_HAS_DENORM__ != 1
+      || __FLT_HAS_INFINITY__ != 1)
+    return 0;
+  if (!f1 (0.0f) || f1 (0x1.0p-149f))
+    __builtin_abort ();
+  if (!f2 (0x1.63dbc0p-130f))
+    __builtin_abort ();
+  if (f3 (0x1.63dbc0p-130f))
+    __builtin_abort ();
+  if (!f4 (0x1.c996d0p+108f) || !f4 (0x1.c996cep+108f) || f4 (0x1.c996ccp+108f))
+    __builtin_abort ();
+  if (f5 (0x1.c996d0p+108f) || f5 (0x1.c996d2p+108f) || !f5 (0x1.c996d4p+108f))
+    __builtin_abort ();
+  if (!f6 (0x1.b2ce3p-38f) || f6 (0x1.b2ce32p-38f) || f6 (0x1.b2ce34p-38f))
+    __builtin_abort ();
+  if (!f7 (0x1.b2ce3p-38f) || !f7 (0x1.b2ce34p-38f) || !f7 (0x1.b2ce36p-38f) || f7 (0x1.b2ce38p-38f))
+    __builtin_abort ();
+  if (!f8 (0x1.bb166p-130f) || !f8 (0x1.bb168p-130f) || f8 (0x1.bb16ap-130f) || f8 (0x1.bb16cp-130f))
+    __builtin_abort ();
+  if (!f9 (0x1.8p-146f) || !f9 (0x1.ap-146f) || f9 (0x1.cp-146f) || f9 (0x1.ep-146f))
+    __builtin_abort ();
+  if (f10 (0x1.002004p+0f))
+    __builtin_abort ();
+  return 0;
+}
-- 
cgit v1.1


From 8e007055dd1374ca4c44406a4ead172be0dfa3a8 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 5 Oct 2019 09:38:21 +0200
Subject: PR c++/91369 - Implement P0784R7: constexpr new

	PR c++/91369 - Implement P0784R7: constexpr new
c-family/
	* c-cppbuiltin.c (c_cpp_builtins): Predefine
	__cpp_constexpr_dynamic_alloc=201907 for -std=c++2a.
cp/
	* cp-tree.h (enum cp_tree_index): Add CPTI_HEAP_UNINIT_IDENTIFIER,
	CPTI_HEAP_IDENTIFIER and CPTI_HEAP_DELETED_IDENTIFIER.
	(heap_uninit_identifier, heap_identifier, heap_deleted_identifier):
	Define.
	(type_has_constexpr_destructor, build_new_constexpr_heap_type,
	cxx_constant_dtor): Declare.
	* class.c (type_maybe_constexpr_default_constructor): Make static.
	(type_maybe_constexpr_destructor, type_has_constexpr_destructor): New
	functions.
	(finalize_literal_type_property): For c++2a, don't clear
	CLASSTYPE_LITERAL_P for types without trivial destructors unless they
	have non-constexpr destructors.
	(explain_non_literal_class): For c++2a, complain about non-constexpr
	destructors rather than about non-trivial destructors.
	* constexpr.c: Include stor-layout.h.
	(struct constexpr_global_ctx): New type.
	(struct constexpr_ctx): Add global field, remove values and
	constexpr_ops_count.
	(cxx_replaceable_global_alloc_fn): New inline function.
	(cxx_eval_call_expression): For c++2a allow calls to replaceable
	global allocation functions, for new return address of a heap uninit
	var, for delete record its deletion.  Change ctx->values->{get,put} to
	ctx->global->values.{get,put}.
	(non_const_var_error): Add auto_diagnostic_group sentinel.  Emit
	special diagnostics for heap variables.
	(cxx_eval_store_expression): Change ctx->values->{get,put} to
	ctx->global->values.{get,put}.
	(cxx_eval_loop_expr): Initialize jump_target if NULL.  Change
	new_ctx.values->remove to ctx->global->values.remove.
	(cxx_eval_constant_expression): Change *ctx->constexpr_ops_count
	to ctx->global->constexpr_ops_count.  Change ctx->values->{get,put} to
	ctx->global->values.{get,put}.
	<case NOP_EXPR>: Formatting fix.  On cast of replaceable global
	allocation function to some pointer type, adjust the type of
	the heap variable and change name from heap_uninit_identifier
	to heap_identifier.
	(find_heap_var_refs): New function.
	(cxx_eval_outermost_constant_expr): Add constexpr_dtor argument,
	handle evaluation of constexpr dtors and add tracking of heap
	variables.  Use tf_no_cleanup for get_target_expr_with_sfinae.
	(cxx_constant_value): Adjust cxx_eval_outermost_constant_expr caller.
	(cxx_constant_dtor): New function.
	(maybe_constant_value, fold_non_dependent_expr_template,
	maybe_constant_init_1): Adjust cxx_eval_outermost_constant_expr
	callers.
	(potential_constant_expression_1): Ignore clobbers.  Allow
	COND_EXPR_IS_VEC_DELETE for c++2a.
	* decl.c (initialize_predefined_identifiers): Add heap identifiers.
	(decl_maybe_constant_destruction): New function.
	(cp_finish_decl): Don't clear TREE_READONLY for constexpr variables
	with non-trivial, but constexpr destructors.
	(register_dtor_fn): For constexpr variables with constexpr non-trivial
	destructors call cxx_maybe_build_cleanup instead of adding destructor
	calls at runtime.
	(expand_static_init): For constexpr variables with constexpr
	non-trivial destructors call cxx_maybe_build_cleanup.
	(grokdeclarator): Allow constexpr destructors for c++2a.  Formatting
	fix.
	(cxx_maybe_build_cleanup): For constexpr variables with constexpr
	non-trivial destructors call cxx_constant_dtor instead of adding
	destructor calls at runtime.
	* init.c: Include stor-layout.h.
	(build_new_constexpr_heap_type, maybe_wrap_new_for_constexpr): New
	functions.
	(build_new_1): For c++2a and new[], add cast around the alloc call
	to help constexpr evaluation figure out the type of the heap storage.
	(build_vec_delete_1): Set DECL_INITIAL of tbase and emit a DECL_EXPR
	for it instead of initializing an uninitialized variable.
	* method.c: Include intl.h.
	(SFK_CTOR_P, SFK_DTOR_P, SFK_ASSIGN_P, SFK_COPY_P, SFK_MOVE_P): Move
	definitions earlier.
	(process_subob_fn): Add sfk argument, adjust non-constexpr call
	diagnostics based on it.
	(walk_field_subobs): Formatting fixes.  Adjust process_subob_fn caller.
	(synthesized_method_base_walk): Likewise.
	(synthesized_method_walk): Set *constexpr_p to true for dtors in c++2a.
	Fix up DR number in comment.
	(implicitly_declare_fn): Formatting fix.
	* typeck2.c (store_init_value): Don't call cp_fully_fold_init on
	initializers of automatic non-constexpr variables in constexpr
	functions.
testsuite/
	* g++.dg/cpp0x/constexpr-delete2.C: Adjust expected diagnostics for
	c++2a.
	* g++.dg/cpp0x/locations1.C: Only expect constexpr ~S() diagnostics
	in c++17_down, adjust expected wording.
	* g++.dg/cpp1y/constexpr-new.C: Only expect diagnostics in c++17_down.
	* g++.dg/cpp2a/constexpr-dtor1.C: New test.
	* g++.dg/cpp2a/constexpr-dtor2.C: New test.
	* g++.dg/cpp2a/constexpr-dtor3.C: New test.
	* g++.dg/cpp2a/constexpr-new1.C: New test.
	* g++.dg/cpp2a/constexpr-new2.C: New test.
	* g++.dg/cpp2a/constexpr-new3.C: New test.
	* g++.dg/cpp2a/constexpr-new4.C: New test.
	* g++.dg/cpp2a/feat-cxx2a.C: Add __cpp_constinit and
	__cpp_constexpr_dynamic_alloc tests.  Tweak __cpp_* tests for c++2a
	features to use style like older features, including #ifdef test.
	* g++.dg/ext/is_literal_type3.C: New test.

From-SVN: r276622
---
 gcc/c-family/ChangeLog                         |   6 +
 gcc/c-family/c-cppbuiltin.c                    |   1 +
 gcc/cp/ChangeLog                               |  85 +++++++
 gcc/cp/class.c                                 |  44 +++-
 gcc/cp/constexpr.c                             | 340 ++++++++++++++++++++-----
 gcc/cp/cp-tree.h                               |   9 +
 gcc/cp/decl.c                                  |  52 +++-
 gcc/cp/init.c                                  |  97 ++++++-
 gcc/cp/method.c                                |  69 ++---
 gcc/cp/typeck2.c                               |   8 +-
 gcc/testsuite/ChangeLog                        |  18 ++
 gcc/testsuite/g++.dg/cpp0x/constexpr-delete2.C |   3 +-
 gcc/testsuite/g++.dg/cpp0x/locations1.C        |   2 +-
 gcc/testsuite/g++.dg/cpp1y/constexpr-new.C     |   2 +-
 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor1.C   |   9 +
 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor2.C   |  66 +++++
 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C   | 185 ++++++++++++++
 gcc/testsuite/g++.dg/cpp2a/constexpr-new1.C    |  39 +++
 gcc/testsuite/g++.dg/cpp2a/constexpr-new2.C    |  21 ++
 gcc/testsuite/g++.dg/cpp2a/constexpr-new3.C    |  73 ++++++
 gcc/testsuite/g++.dg/cpp2a/constexpr-new4.C    |  29 +++
 gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C        |  32 ++-
 gcc/testsuite/g++.dg/ext/is_literal_type3.C    |  26 ++
 23 files changed, 1082 insertions(+), 134 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-new1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-new2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-new3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/constexpr-new4.C
 create mode 100644 gcc/testsuite/g++.dg/ext/is_literal_type3.C

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 1ebc4d9..7deaff0 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91369 - Implement P0784R7: constexpr new
+	* c-cppbuiltin.c (c_cpp_builtins): Predefine
+	__cpp_constexpr_dynamic_alloc=201907 for -std=c++2a.
+
 2019-10-04  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/82752
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index fc68bc4..9e0ce42 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -989,6 +989,7 @@ c_cpp_builtins (cpp_reader *pfile)
 	  cpp_define (pfile, "__cpp_constinit=201907");
 	  cpp_define (pfile, "__cpp_nontype_template_parameter_class=201806");
 	  cpp_define (pfile, "__cpp_impl_destroying_delete=201806");
+	  cpp_define (pfile, "__cpp_constexpr_dynamic_alloc=201907");
 	}
       if (flag_concepts)
 	cpp_define (pfile, "__cpp_concepts=201507");
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e705bcc..b40825e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,88 @@
+2019-10-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91369 - Implement P0784R7: constexpr new
+	* cp-tree.h (enum cp_tree_index): Add CPTI_HEAP_UNINIT_IDENTIFIER,
+	CPTI_HEAP_IDENTIFIER and CPTI_HEAP_DELETED_IDENTIFIER.
+	(heap_uninit_identifier, heap_identifier, heap_deleted_identifier):
+	Define.
+	(type_has_constexpr_destructor, build_new_constexpr_heap_type,
+	cxx_constant_dtor): Declare.
+	* class.c (type_maybe_constexpr_default_constructor): Make static.
+	(type_maybe_constexpr_destructor, type_has_constexpr_destructor): New
+	functions.
+	(finalize_literal_type_property): For c++2a, don't clear
+	CLASSTYPE_LITERAL_P for types without trivial destructors unless they
+	have non-constexpr destructors.
+	(explain_non_literal_class): For c++2a, complain about non-constexpr
+	destructors rather than about non-trivial destructors.
+	* constexpr.c: Include stor-layout.h.
+	(struct constexpr_global_ctx): New type.
+	(struct constexpr_ctx): Add global field, remove values and
+	constexpr_ops_count.
+	(cxx_replaceable_global_alloc_fn): New inline function.
+	(cxx_eval_call_expression): For c++2a allow calls to replaceable
+	global allocation functions, for new return address of a heap uninit
+	var, for delete record its deletion.  Change ctx->values->{get,put} to
+	ctx->global->values.{get,put}.
+	(non_const_var_error): Add auto_diagnostic_group sentinel.  Emit
+	special diagnostics for heap variables.
+	(cxx_eval_store_expression): Change ctx->values->{get,put} to
+	ctx->global->values.{get,put}.
+	(cxx_eval_loop_expr): Initialize jump_target if NULL.  Change
+	new_ctx.values->remove to ctx->global->values.remove.
+	(cxx_eval_constant_expression): Change *ctx->constexpr_ops_count
+	to ctx->global->constexpr_ops_count.  Change ctx->values->{get,put} to
+	ctx->global->values.{get,put}.
+	<case NOP_EXPR>: Formatting fix.  On cast of replaceable global
+	allocation function to some pointer type, adjust the type of
+	the heap variable and change name from heap_uninit_identifier
+	to heap_identifier.
+	(find_heap_var_refs): New function.
+	(cxx_eval_outermost_constant_expr): Add constexpr_dtor argument,
+	handle evaluation of constexpr dtors and add tracking of heap
+	variables.  Use tf_no_cleanup for get_target_expr_with_sfinae.
+	(cxx_constant_value): Adjust cxx_eval_outermost_constant_expr caller.
+	(cxx_constant_dtor): New function.
+	(maybe_constant_value, fold_non_dependent_expr_template,
+	maybe_constant_init_1): Adjust cxx_eval_outermost_constant_expr
+	callers.
+	(potential_constant_expression_1): Ignore clobbers.  Allow
+	COND_EXPR_IS_VEC_DELETE for c++2a.
+	* decl.c (initialize_predefined_identifiers): Add heap identifiers.
+	(decl_maybe_constant_destruction): New function.
+	(cp_finish_decl): Don't clear TREE_READONLY for constexpr variables
+	with non-trivial, but constexpr destructors.
+	(register_dtor_fn): For constexpr variables with constexpr non-trivial
+	destructors call cxx_maybe_build_cleanup instead of adding destructor
+	calls at runtime.
+	(expand_static_init): For constexpr variables with constexpr
+	non-trivial destructors call cxx_maybe_build_cleanup.
+	(grokdeclarator): Allow constexpr destructors for c++2a.  Formatting
+	fix.
+	(cxx_maybe_build_cleanup): For constexpr variables with constexpr
+	non-trivial destructors call cxx_constant_dtor instead of adding
+	destructor calls at runtime.
+	* init.c: Include stor-layout.h.
+	(build_new_constexpr_heap_type, maybe_wrap_new_for_constexpr): New
+	functions.
+	(build_new_1): For c++2a and new[], add cast around the alloc call
+	to help constexpr evaluation figure out the type of the heap storage.
+	(build_vec_delete_1): Set DECL_INITIAL of tbase and emit a DECL_EXPR
+	for it instead of initializing an uninitialized variable.
+	* method.c: Include intl.h.
+	(SFK_CTOR_P, SFK_DTOR_P, SFK_ASSIGN_P, SFK_COPY_P, SFK_MOVE_P): Move
+	definitions earlier.
+	(process_subob_fn): Add sfk argument, adjust non-constexpr call
+	diagnostics based on it.
+	(walk_field_subobs): Formatting fixes.  Adjust process_subob_fn caller.
+	(synthesized_method_base_walk): Likewise.
+	(synthesized_method_walk): Set *constexpr_p to true for dtors in c++2a.
+	Fix up DR number in comment.
+	(implicitly_declare_fn): Formatting fix.
+	* typeck2.c (store_init_value): Don't call cp_fully_fold_init on
+	initializers of automatic non-constexpr variables in constexpr
+	functions.
+
 2019-10-04  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/71504
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 3838f76..4abcfaf 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -206,6 +206,7 @@ static int empty_base_at_nonzero_offset_p (tree, tree, splay_tree);
 static tree end_of_base (tree);
 static tree get_vcall_index (tree, tree);
 static bool type_maybe_constexpr_default_constructor (tree);
+static bool type_maybe_constexpr_destructor (tree);
 static bool field_poverlapping_p (tree);
 
 /* Return a COND_EXPR that executes TRUE_STMT if this execution of the
@@ -5242,7 +5243,7 @@ type_has_constexpr_default_constructor (tree t)
    without forcing a lazy declaration (which might cause undesired
    instantiations).  */
 
-bool
+static bool
 type_maybe_constexpr_default_constructor (tree t)
 {
   if (CLASS_TYPE_P (t) && CLASSTYPE_LAZY_DEFAULT_CTOR (t)
@@ -5252,6 +5253,34 @@ type_maybe_constexpr_default_constructor (tree t)
   return type_has_constexpr_default_constructor (t);
 }
 
+/* Returns true iff class T has a constexpr destructor.  */
+
+bool
+type_has_constexpr_destructor (tree t)
+{
+  tree fns;
+
+  if (CLASSTYPE_LAZY_DESTRUCTOR (t))
+    /* Non-trivial, we need to check subobject destructors.  */
+    lazily_declare_fn (sfk_destructor, t);
+  fns = CLASSTYPE_DESTRUCTOR (t);
+  return (fns && DECL_DECLARED_CONSTEXPR_P (fns));
+}
+
+/* Returns true iff class T has a constexpr destructor or has an
+   implicitly declared destructor that we can't tell if it's constexpr
+   without forcing a lazy declaration (which might cause undesired
+   instantiations).  */
+
+static bool
+type_maybe_constexpr_destructor (tree t)
+{
+  if (CLASS_TYPE_P (t) && CLASSTYPE_LAZY_DESTRUCTOR (t))
+    /* Assume it's constexpr.  */
+    return true;
+  return type_has_constexpr_destructor (t);
+}
+
 /* Returns true iff class TYPE has a virtual destructor.  */
 
 bool
@@ -5503,8 +5532,11 @@ finalize_literal_type_property (tree t)
 {
   tree fn;
 
-  if (cxx_dialect < cxx11
-      || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t))
+  if (cxx_dialect < cxx11)
+    CLASSTYPE_LITERAL_P (t) = false;
+  else if (CLASSTYPE_LITERAL_P (t)
+	   && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t)
+	   && (cxx_dialect < cxx2a || !type_maybe_constexpr_destructor (t)))
     CLASSTYPE_LITERAL_P (t) = false;
   else if (CLASSTYPE_LITERAL_P (t) && LAMBDA_TYPE_P (t))
     CLASSTYPE_LITERAL_P (t) = (cxx_dialect >= cxx17);
@@ -5558,8 +5590,12 @@ explain_non_literal_class (tree t)
     inform (UNKNOWN_LOCATION,
 	    "  %qT is a closure type, which is only literal in "
 	    "C++17 and later", t);
-  else if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t))
+  else if (cxx_dialect < cxx2a && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t))
     inform (UNKNOWN_LOCATION, "  %q+T has a non-trivial destructor", t);
+  else if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t)
+	   && !type_maybe_constexpr_destructor (t))
+    inform (UNKNOWN_LOCATION, "  %q+T does not have %<constexpr%> destructor",
+	    t);
   else if (CLASSTYPE_NON_AGGREGATE (t)
 	   && !TYPE_HAS_TRIVIAL_DFLT (t)
 	   && !LAMBDA_TYPE_P (t)
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 2dc57f1..f50cc04 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -34,6 +34,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "timevar.h"
 #include "fold-const-call.h"
+#include "stor-layout.h"
 
 static bool verify_constant (tree, bool, bool *, bool *);
 #define VERIFY_CONSTANT(X)						\
@@ -1006,17 +1007,35 @@ enum constexpr_switch_state {
   css_default_processing
 };
 
+/* The constexpr expansion context part which needs one instance per
+   cxx_eval_outermost_constant_expr invocation.  VALUES is a map of values of
+   variables initialized within the expression.  */
+
+struct constexpr_global_ctx {
+  /* Values for any temporaries or local variables within the
+     constant-expression. */
+  hash_map<tree,tree> values;
+  /* Number of cxx_eval_constant_expression calls (except skipped ones,
+     on simple constants or location wrappers) encountered during current
+     cxx_eval_outermost_constant_expr call.  */
+  HOST_WIDE_INT constexpr_ops_count;
+  /* Heap VAR_DECLs created during the evaluation of the outermost constant
+     expression.  */
+  auto_vec<tree, 16> heap_vars;
+  /* Constructor.  */
+  constexpr_global_ctx () : constexpr_ops_count (0) {}
+};
+
 /* The constexpr expansion context.  CALL is the current function
    expansion, CTOR is the current aggregate initializer, OBJECT is the
-   object being initialized by CTOR, either a VAR_DECL or a _REF.  VALUES
-   is a map of values of variables initialized within the expression.  */
+   object being initialized by CTOR, either a VAR_DECL or a _REF.    */
 
 struct constexpr_ctx {
+  /* The part of the context that needs to be unique to the whole
+     cxx_eval_outermost_constant_expr invocation.  */
+  constexpr_global_ctx *global;
   /* The innermost call we're evaluating.  */
   constexpr_call *call;
-  /* Values for any temporaries or local variables within the
-     constant-expression. */
-  hash_map<tree,tree> *values;
   /* SAVE_EXPRs that we've seen within the current LOOP_EXPR.  NULL if we
      aren't inside a loop.  */
   vec<tree> *save_exprs;
@@ -1027,10 +1046,6 @@ struct constexpr_ctx {
   tree object;
   /* If inside SWITCH_EXPR.  */
   constexpr_switch_state *css_state;
-  /* Number of cxx_eval_constant_expression calls (except skipped ones,
-     on simple constants or location wrappers) encountered during current
-     cxx_eval_outermost_constant_expr call.  */
-  HOST_WIDE_INT *constexpr_ops_count;
 
   /* Whether we should error on a non-constant expression or fail quietly.  */
   bool quiet;
@@ -1578,6 +1593,17 @@ modifying_const_object_error (tree expr, tree obj)
   inform (location_of (obj), "originally declared %<const%> here");
 }
 
+/* Return true if FNDECL is a replaceable global allocation function that
+   should be useable during constant expression evaluation.  */
+
+static inline bool
+cxx_replaceable_global_alloc_fn (tree fndecl)
+{
+  return (cxx_dialect >= cxx2a
+	  && IDENTIFIER_NEWDEL_OP_P (DECL_NAME (fndecl))
+	  && CP_DECL_CONTEXT (fndecl) == global_namespace);
+}
+
 /* Subroutine of cxx_eval_constant_expression.
    Evaluate the call expression tree T in the context of OLD_CALL expression
    evaluation.  */
@@ -1656,6 +1682,62 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 					   lval, non_constant_p, overflow_p);
   if (!DECL_DECLARED_CONSTEXPR_P (fun))
     {
+      if (cxx_replaceable_global_alloc_fn (fun))
+	{
+	  const int nargs = call_expr_nargs (t);
+	  tree arg0 = NULL_TREE;
+	  for (int i = 0; i < nargs; ++i)
+	    {
+	      tree arg = CALL_EXPR_ARG (t, i);
+	      arg = cxx_eval_constant_expression (ctx, arg, false,
+						  non_constant_p, overflow_p);
+	      VERIFY_CONSTANT (arg);
+	      if (i == 0)
+		arg0 = arg;
+	    }
+	  gcc_assert (arg0);
+	  if (IDENTIFIER_NEW_OP_P (DECL_NAME (fun)))
+	    {
+	      tree type = build_array_type_nelts (char_type_node,
+						  tree_to_uhwi (arg0));
+	      tree var = build_decl (loc, VAR_DECL, heap_uninit_identifier,
+				     type);
+	      DECL_ARTIFICIAL (var) = 1;
+	      TREE_STATIC (var) = 1;
+	      ctx->global->heap_vars.safe_push (var);
+	      ctx->global->values.put (var, NULL_TREE);
+	      return fold_convert (ptr_type_node, build_address (var));
+	    }
+	  else
+	    {
+	      STRIP_NOPS (arg0);
+	      if (TREE_CODE (arg0) == ADDR_EXPR
+		  && VAR_P (TREE_OPERAND (arg0, 0)))
+		{
+		  tree var = TREE_OPERAND (arg0, 0);
+		  if (DECL_NAME (var) == heap_uninit_identifier
+		      || DECL_NAME (var) == heap_identifier)
+		    {
+		      DECL_NAME (var) = heap_deleted_identifier;
+		      ctx->global->values.remove (var);
+		      return void_node;
+		    }
+		  else if (DECL_NAME (var) == heap_deleted_identifier)
+		    {
+		      if (!ctx->quiet)
+			error_at (loc, "deallocation of already deallocated "
+				       "storage");
+		      *non_constant_p = true;
+		      return t;
+		    }
+		}
+	      if (!ctx->quiet)
+		error_at (loc, "deallocation of storage that was "
+			       "not previously allocated");
+	      *non_constant_p = true;
+	      return t;
+	    }
+	}
       if (!ctx->quiet)
 	{
 	  if (!lambda_static_thunk_p (fun))
@@ -1675,7 +1757,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
       new_ctx.object = AGGR_INIT_EXPR_SLOT (t);
       tree ctor = new_ctx.ctor = build_constructor (DECL_CONTEXT (fun), NULL);
       CONSTRUCTOR_NO_CLEARING (ctor) = true;
-      ctx->values->put (new_ctx.object, ctor);
+      ctx->global->values.put (new_ctx.object, ctor);
       ctx = &new_ctx;
     }
 
@@ -1877,7 +1959,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 	      arg = unshare_constructor (arg);
 	      if (TREE_CODE (arg) == CONSTRUCTOR)
 		vec_safe_push (ctors, arg);
-	      ctx->values->put (remapped, arg);
+	      ctx->global->values.put (remapped, arg);
 	      remapped = DECL_CHAIN (remapped);
 	    }
 	  /* Add the RESULT_DECL to the values map, too.  */
@@ -1887,11 +1969,11 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 	      slot = AGGR_INIT_EXPR_SLOT (t);
 	      tree addr = build_address (slot);
 	      addr = build_nop (TREE_TYPE (res), addr);
-	      ctx->values->put (res, addr);
-	      ctx->values->put (slot, NULL_TREE);
+	      ctx->global->values.put (res, addr);
+	      ctx->global->values.put (slot, NULL_TREE);
 	    }
 	  else
-	    ctx->values->put (res, NULL_TREE);
+	    ctx->global->values.put (res, NULL_TREE);
 
 	  /* Track the callee's evaluated SAVE_EXPRs so that we can forget
 	     their values after the call.  */
@@ -1916,7 +1998,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 	    result = void_node;
 	  else
 	    {
-	      result = *ctx->values->get (slot ? slot : res);
+	      result = *ctx->global->values.get (slot ? slot : res);
 	      if (result == NULL_TREE && !*non_constant_p)
 		{
 		  if (!ctx->quiet)
@@ -1934,8 +2016,8 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 	      && CLASS_TYPE_P (TREE_TYPE (new_obj))
 	      && CP_TYPE_CONST_P (TREE_TYPE (new_obj)))
 	    {
-	      /* Subobjects might not be stored in ctx->values but we can
-		 get its CONSTRUCTOR by evaluating *this.  */
+	      /* Subobjects might not be stored in ctx->global->values but we
+		 can get its CONSTRUCTOR by evaluating *this.  */
 	      tree e = cxx_eval_constant_expression (ctx, new_obj,
 						     /*lval*/false,
 						     non_constant_p,
@@ -1947,17 +2029,17 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
 	  unsigned int i;
 	  tree save_expr;
 	  FOR_EACH_VEC_ELT (save_exprs, i, save_expr)
-	    ctx_with_save_exprs.values->remove (save_expr);
+	    ctx->global->values.remove (save_expr);
 
 	  /* Remove the parms/result from the values map.  Is it worth
 	     bothering to do this when the map itself is only live for
 	     one constexpr evaluation?  If so, maybe also clear out
 	     other vars from call, maybe in BIND_EXPR handling?  */
-	  ctx->values->remove (res);
+	  ctx->global->values.remove (res);
 	  if (slot)
-	    ctx->values->remove (slot);
+	    ctx->global->values.remove (slot);
 	  for (tree parm = parms; parm; parm = TREE_CHAIN (parm))
-	    ctx->values->remove (parm);
+	    ctx->global->values.remove (parm);
 
 	  /* Free any parameter CONSTRUCTORs we aren't returning directly.  */
 	  while (!ctors->is_empty ())
@@ -3077,7 +3159,7 @@ verify_ctor_sanity (const constexpr_ctx *ctx, tree type)
 			  (TREE_TYPE (type), TREE_TYPE (otype)))));
     }
   gcc_assert (!ctx->object || !DECL_P (ctx->object)
-	      || *(ctx->values->get (ctx->object)) == ctx->ctor);
+	      || *(ctx->global->values.get (ctx->object)) == ctx->ctor);
 }
 
 /* Subroutine of cxx_eval_constant_expression.
@@ -3610,7 +3692,23 @@ cxx_eval_indirect_ref (const constexpr_ctx *ctx, tree t,
 static void
 non_const_var_error (tree r)
 {
+  auto_diagnostic_group d;
   tree type = TREE_TYPE (r);
+  if (DECL_NAME (r) == heap_uninit_identifier
+      || DECL_NAME (r) == heap_identifier)
+    {
+      error ("the content of uninitialized storage is not usable "
+	     "in a constant expression");
+      inform (DECL_SOURCE_LOCATION (r), "allocated here");
+      return;
+    }
+  if (DECL_NAME (r) == heap_deleted_identifier)
+    {
+      error ("use of allocated storage after deallocation in a "
+	     "constant expression");
+      inform (DECL_SOURCE_LOCATION (r), "allocated here");
+      return;
+    }
   error ("the value of %qD is not usable in a constant "
 	 "expression", r);
   /* Avoid error cascade.  */
@@ -3854,7 +3952,7 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t,
        DECL_NAME to handle TARGET_EXPR temporaries, which are fair game.  */
     valp = NULL;
   else if (DECL_P (object))
-    valp = ctx->values->get (object);
+    valp = ctx->global->values.get (object);
   else
     valp = NULL;
   if (!valp)
@@ -4056,7 +4154,7 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t,
 					   non_constant_p, overflow_p);
       if (ctors->is_empty())
 	/* The hash table might have moved since the get earlier.  */
-	valp = ctx->values->get (object);
+	valp = ctx->global->values.get (object);
     }
 
   /* Don't share a CONSTRUCTOR that might be changed later.  */
@@ -4332,6 +4430,12 @@ cxx_eval_loop_expr (const constexpr_ctx *ctx, tree t,
 		    tree *jump_target)
 {
   constexpr_ctx new_ctx = *ctx;
+  tree local_target;
+  if (!jump_target)
+    {
+      local_target = NULL_TREE;
+      jump_target = &local_target;
+    }
 
   tree body, cond = NULL_TREE, expr = NULL_TREE;
   int count = 0;
@@ -4410,7 +4514,7 @@ cxx_eval_loop_expr (const constexpr_ctx *ctx, tree t,
       unsigned int i;
       tree save_expr;
       FOR_EACH_VEC_ELT (save_exprs, i, save_expr)
-	new_ctx.values->remove (save_expr);
+	ctx->global->values.remove (save_expr);
       save_exprs.truncate (0);
 
       if (++count >= constexpr_loop_limit)
@@ -4434,7 +4538,7 @@ cxx_eval_loop_expr (const constexpr_ctx *ctx, tree t,
   unsigned int i;
   tree save_expr;
   FOR_EACH_VEC_ELT (save_exprs, i, save_expr)
-    new_ctx.values->remove (save_expr);
+    ctx->global->values.remove (save_expr);
 
   return NULL_TREE;
 }
@@ -4586,14 +4690,14 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
     }
 
   /* Avoid excessively long constexpr evaluations.  */
-  if (++*ctx->constexpr_ops_count >= constexpr_ops_limit)
+  if (++ctx->global->constexpr_ops_count >= constexpr_ops_limit)
     {
       if (!ctx->quiet)
 	error_at (cp_expr_loc_or_input_loc (t),
 		  "%<constexpr%> evaluation operation count exceeds limit of "
 		  "%wd (use %<-fconstexpr-ops-limit=%> to increase the limit)",
 		  constexpr_ops_limit);
-      *ctx->constexpr_ops_count = INTTYPE_MINIMUM (HOST_WIDE_INT);
+      ctx->global->constexpr_ops_count = INTTYPE_MINIMUM (HOST_WIDE_INT);
       *non_constant_p = true;
       return t;
     }
@@ -4610,7 +4714,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
       /* We ask for an rvalue for the RESULT_DECL when indirecting
 	 through an invisible reference, or in named return value
 	 optimization.  */
-      if (tree *p = ctx->values->get (t))
+      if (tree *p = ctx->global->values.get (t))
 	return *p;
       else
 	{
@@ -4666,7 +4770,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	  && TREE_CODE (TARGET_EXPR_INITIAL (r)) == CONSTRUCTOR)
 	r = TARGET_EXPR_INITIAL (r);
       if (VAR_P (r))
-	if (tree *p = ctx->values->get (r))
+	if (tree *p = ctx->global->values.get (r))
 	  if (*p != NULL_TREE)
 	    r = *p;
       if (DECL_P (r))
@@ -4693,7 +4797,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
     case PARM_DECL:
       if (lval && !TYPE_REF_P (TREE_TYPE (t)))
 	/* glvalue use.  */;
-      else if (tree *p = ctx->values->get (r))
+      else if (tree *p = ctx->global->values.get (r))
 	r = *p;
       else if (lval)
 	/* Defer in case this is only used for its type.  */;
@@ -4735,7 +4839,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	    new_ctx.object = r;
 	    new_ctx.ctor = build_constructor (TREE_TYPE (r), NULL);
 	    CONSTRUCTOR_NO_CLEARING (new_ctx.ctor) = true;
-	    new_ctx.values->put (r, new_ctx.ctor);
+	    ctx->global->values.put (r, new_ctx.ctor);
 	    ctx = &new_ctx;
 	  }
 
@@ -4751,12 +4855,12 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	    if (CLASS_TYPE_P (TREE_TYPE (r))
 		&& CP_TYPE_CONST_P (TREE_TYPE (r)))
 	      TREE_READONLY (init) = true;
-	    ctx->values->put (r, init);
+	    ctx->global->values.put (r, init);
 	  }
 	else if (ctx == &new_ctx)
 	  /* We gave it a CONSTRUCTOR above.  */;
 	else
-	  ctx->values->put (r, NULL_TREE);
+	  ctx->global->values.put (r, NULL_TREE);
       }
       break;
 
@@ -4782,7 +4886,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	  new_ctx.ctor = build_constructor (TREE_TYPE (t), NULL);
 	  CONSTRUCTOR_NO_CLEARING (new_ctx.ctor) = true;
 	  new_ctx.object = TARGET_EXPR_SLOT (t);
-	  ctx->values->put (new_ctx.object, new_ctx.ctor);
+	  ctx->global->values.put (new_ctx.object, new_ctx.ctor);
 	  ctx = &new_ctx;
 	}
       /* Pass false for 'lval' because this indicates
@@ -4797,7 +4901,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	{
 	  tree slot = TARGET_EXPR_SLOT (t);
 	  r = unshare_constructor (r);
-	  ctx->values->put (slot, r);
+	  ctx->global->values.put (slot, r);
 	  return slot;
 	}
       break;
@@ -4837,13 +4941,13 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 
     case SAVE_EXPR:
       /* Avoid evaluating a SAVE_EXPR more than once.  */
-      if (tree *p = ctx->values->get (t))
+      if (tree *p = ctx->global->values.get (t))
 	r = *p;
       else
 	{
 	  r = cxx_eval_constant_expression (ctx, TREE_OPERAND (t, 0), false,
 					    non_constant_p, overflow_p);
-	  ctx->values->put (t, r);
+	  ctx->global->values.put (t, r);
 	  if (ctx->save_exprs)
 	    ctx->save_exprs->safe_push (t);
 	}
@@ -5177,8 +5281,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	if (VOID_TYPE_P (type))
 	  return void_node;
 
-	if (TREE_CODE (op) == PTRMEM_CST
-	    && !TYPE_PTRMEM_P (type))
+	if (TREE_CODE (op) == PTRMEM_CST && !TYPE_PTRMEM_P (type))
 	  op = cplus_expand_constant (op);
 
 	if (TREE_CODE (op) == PTRMEM_CST && tcode == NOP_EXPR)
@@ -5232,6 +5335,34 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 	      }
 	  }
 
+	if (INDIRECT_TYPE_P (type)
+	    && TREE_CODE (op) == NOP_EXPR
+	    && TREE_TYPE (op) == ptr_type_node
+	    && TREE_CODE (TREE_OPERAND (op, 0)) == ADDR_EXPR
+	    && VAR_P (TREE_OPERAND (TREE_OPERAND (op, 0), 0))
+	    && DECL_NAME (TREE_OPERAND (TREE_OPERAND (op, 0),
+					0)) == heap_uninit_identifier)
+	  {
+	    tree var = TREE_OPERAND (TREE_OPERAND (op, 0), 0);
+	    tree var_size = TYPE_SIZE_UNIT (TREE_TYPE (var));
+	    tree elt_type = TREE_TYPE (type);
+	    tree cookie_size = NULL_TREE;
+	    if (TREE_CODE (elt_type) == RECORD_TYPE
+		&& TYPE_NAME (elt_type) == heap_identifier)
+	      {
+		tree fld1 = TYPE_FIELDS (elt_type);
+		tree fld2 = DECL_CHAIN (fld1);
+		elt_type = TREE_TYPE (TREE_TYPE (fld2));
+		cookie_size = TYPE_SIZE_UNIT (TREE_TYPE (fld1));
+	      }
+	    DECL_NAME (var) = heap_identifier;
+	    TREE_TYPE (var)
+	      = build_new_constexpr_heap_type (elt_type, cookie_size,
+					       var_size);
+	    TREE_TYPE (TREE_OPERAND (op, 0))
+	      = build_pointer_type (TREE_TYPE (var));
+	  }
+
 	if (op == oldop && tcode != UNARY_PLUS_EXPR)
 	  /* We didn't fold at the top so we could check for ptr-int
 	     conversion.  */
@@ -5473,6 +5604,7 @@ instantiate_cx_fn_r (tree *tp, int *walk_subtrees, void */*data*/)
 
   return NULL_TREE;
 }
+
 static void
 instantiate_constexpr_fns (tree t)
 {
@@ -5481,34 +5613,58 @@ instantiate_constexpr_fns (tree t)
   input_location = loc;
 }
 
+/* Look for heap variables in the expression *TP.  */
+
+static tree
+find_heap_var_refs (tree *tp, int *walk_subtrees, void */*data*/)
+{
+  if (VAR_P (*tp)
+      && (DECL_NAME (*tp) == heap_uninit_identifier
+	  || DECL_NAME (*tp) == heap_identifier
+	  || DECL_NAME (*tp) == heap_deleted_identifier))
+    return *tp;
+
+  if (TYPE_P (*tp))
+    *walk_subtrees = 0;
+  return NULL_TREE;
+}
+
 /* ALLOW_NON_CONSTANT is false if T is required to be a constant expression.
    STRICT has the same sense as for constant_value_1: true if we only allow
    conforming C++ constant expressions, or false if we want a constant value
    even if it doesn't conform.
    MANIFESTLY_CONST_EVAL is true if T is manifestly const-evaluated as
-   per P0595 even when ALLOW_NON_CONSTANT is true.  */
+   per P0595 even when ALLOW_NON_CONSTANT is true.
+   CONSTEXPR_DTOR is true when evaluating the dtor of a constexpr variable.
+   OBJECT must be non-NULL in that case.  */
 
 static tree
 cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 				  bool strict = true,
 				  bool manifestly_const_eval = false,
+				  bool constexpr_dtor = false,
 				  tree object = NULL_TREE)
 {
   auto_timevar time (TV_CONSTEXPR);
 
   bool non_constant_p = false;
   bool overflow_p = false;
-  hash_map<tree,tree> map;
-  HOST_WIDE_INT constexpr_ctx_count = 0;
 
-  constexpr_ctx ctx = { NULL, &map, NULL, NULL, NULL, NULL,
-			&constexpr_ctx_count, allow_non_constant, strict,
+  constexpr_global_ctx global_ctx;
+  constexpr_ctx ctx = { &global_ctx, NULL, NULL, NULL, NULL, NULL,
+			allow_non_constant, strict,
 			manifestly_const_eval || !allow_non_constant };
 
   tree type = initialized_type (t);
   tree r = t;
   if (VOID_TYPE_P (type))
-    return t;
+    {
+      if (constexpr_dtor)
+	/* Used for destructors of array elements.  */
+	type = TREE_TYPE (object);
+      else
+	return t;
+    }
   if (AGGREGATE_TYPE_P (type) || VECTOR_TYPE_P (type))
     {
       /* In C++14 an NSDMI can participate in aggregate initialization,
@@ -5518,8 +5674,22 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 	 update ctx.values for the VAR_DECL.  We use the same strategy
 	 for C++11 constexpr constructors that refer to the object being
 	 initialized.  */
-      ctx.ctor = build_constructor (type, NULL);
-      CONSTRUCTOR_NO_CLEARING (ctx.ctor) = true;
+      if (constexpr_dtor)
+	{
+	  gcc_assert (object && VAR_P (object));
+	  gcc_assert (DECL_DECLARED_CONSTEXPR_P (object));
+	  gcc_assert (DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (object));
+	  ctx.ctor = unshare_expr (DECL_INITIAL (object));
+	  TREE_READONLY (ctx.ctor) = false;
+	  /* Temporarily force decl_really_constant_value to return false
+	     for it, we want to use ctx.ctor for the current value instead.  */
+	  DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (object) = false;
+	}
+      else
+	{
+	  ctx.ctor = build_constructor (type, NULL);
+	  CONSTRUCTOR_NO_CLEARING (ctx.ctor) = true;
+	}
       if (!object)
 	{
 	  if (TREE_CODE (t) == TARGET_EXPR)
@@ -5532,7 +5702,7 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 	gcc_assert (same_type_ignoring_top_level_qualifiers_p
 		    (type, TREE_TYPE (object)));
       if (object && DECL_P (object))
-	map.put (object, ctx.ctor);
+	global_ctx.values.put (object, ctx.ctor);
       if (TREE_CODE (r) == TARGET_EXPR)
 	/* Avoid creating another CONSTRUCTOR when we expand the
 	   TARGET_EXPR.  */
@@ -5543,13 +5713,15 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
   r = cxx_eval_constant_expression (&ctx, r,
 				    false, &non_constant_p, &overflow_p);
 
-  verify_constant (r, allow_non_constant, &non_constant_p, &overflow_p);
+  if (!constexpr_dtor)
+    verify_constant (r, allow_non_constant, &non_constant_p, &overflow_p);
+  else
+    DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (object) = true;
 
   /* Mutable logic is a bit tricky: we want to allow initialization of
      constexpr variables with mutable members, but we can't copy those
      members to another constexpr variable.  */
-  if (TREE_CODE (r) == CONSTRUCTOR
-      && CONSTRUCTOR_MUTABLE_POISON (r))
+  if (TREE_CODE (r) == CONSTRUCTOR && CONSTRUCTOR_MUTABLE_POISON (r))
     {
       if (!allow_non_constant)
 	error ("%qE is not a constant expression because it refers to "
@@ -5557,8 +5729,7 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
       non_constant_p = true;
     }
 
-  if (TREE_CODE (r) == CONSTRUCTOR
-      && CONSTRUCTOR_NO_CLEARING (r))
+  if (TREE_CODE (r) == CONSTRUCTOR && CONSTRUCTOR_NO_CLEARING (r))
     {
       if (!allow_non_constant)
 	error ("%qE is not a constant expression because it refers to "
@@ -5567,6 +5738,32 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
       non_constant_p = true;
     }
 
+  if (!global_ctx.heap_vars.is_empty ())
+    {
+      tree heap_var = cp_walk_tree_without_duplicates (&r, find_heap_var_refs,
+						       NULL);
+      unsigned int i;
+      if (heap_var)
+	{
+	  if (!allow_non_constant && !non_constant_p)
+	    error_at (DECL_SOURCE_LOCATION (heap_var),
+		      "%qE is not a constant expression because it refers to "
+		      "a result of %<operator new%>", t);
+	  r = t;
+	  non_constant_p = true;
+	}
+      FOR_EACH_VEC_ELT (global_ctx.heap_vars, i, heap_var)
+	if (DECL_NAME (heap_var) != heap_deleted_identifier)
+	  {
+	    if (!allow_non_constant && !non_constant_p)
+	      error_at (DECL_SOURCE_LOCATION (heap_var),
+			"%qE is not a constant expression because allocated "
+			"storage has not been deallocated", t);
+	    r = t;
+	    non_constant_p = true;
+	  }
+    }
+
   /* Technically we should check this for all subexpressions, but that
      runs into problems with our internal representation of pointer
      subtraction and the 5.19 rules are still in flux.  */
@@ -5592,6 +5789,8 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 
   if (non_constant_p && !allow_non_constant)
     return error_mark_node;
+  else if (constexpr_dtor)
+    return r;
   else if (non_constant_p && TREE_CONSTANT (r))
     {
       /* If __builtin_is_constant_evaluated () was evaluated to true
@@ -5599,7 +5798,7 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 	 punt.  */
       if (manifestly_const_eval)
 	return cxx_eval_outermost_constant_expr (t, true, strict,
-						 false, object);
+						 false, false, object);
       /* This isn't actually constant, so unset TREE_CONSTANT.
 	 Don't clear TREE_CONSTANT on ADDR_EXPR, as the middle-end requires
 	 it to be set if it is invariant address, even when it is not
@@ -5627,7 +5826,7 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 	return t;
       else if (TREE_CODE (t) != CONSTRUCTOR)
 	{
-	  r = get_target_expr (r);
+	  r = get_target_expr_sfinae (r, tf_warning_or_error | tf_no_cleanup);
 	  TREE_CONSTANT (r) = true;
 	}
     }
@@ -5642,7 +5841,16 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 tree
 cxx_constant_value (tree t, tree decl)
 {
-  return cxx_eval_outermost_constant_expr (t, false, true, true, decl);
+  return cxx_eval_outermost_constant_expr (t, false, true, true, false, decl);
+}
+
+/* Like cxx_constant_value, but used for evaluation of constexpr destructors
+   of constexpr variables.  The actual initializer of DECL is not modified.  */
+
+void
+cxx_constant_dtor (tree t, tree decl)
+{
+  cxx_eval_outermost_constant_expr (t, false, true, true, true, decl);
 }
 
 /* Helper routine for fold_simple function.  Either return simplified
@@ -5746,14 +5954,14 @@ maybe_constant_value (tree t, tree decl, bool manifestly_const_eval)
     return t;
 
   if (manifestly_const_eval)
-    return cxx_eval_outermost_constant_expr (t, true, true, true, decl);
+    return cxx_eval_outermost_constant_expr (t, true, true, true, false, decl);
 
   if (cv_cache == NULL)
     cv_cache = hash_map<tree, tree>::create_ggc (101);
   if (tree *cached = cv_cache->get (t))
     return *cached;
 
-  r = cxx_eval_outermost_constant_expr (t, true, true, false, decl);
+  r = cxx_eval_outermost_constant_expr (t, true, true, false, false, decl);
   gcc_checking_assert (r == t
 		       || CONVERT_EXPR_P (t)
 		       || TREE_CODE (t) == VIEW_CONVERT_EXPR
@@ -5815,7 +6023,7 @@ fold_non_dependent_expr_template (tree t, tsubst_flags_t complain,
 
       tree r = cxx_eval_outermost_constant_expr (t, true, true,
 						 manifestly_const_eval,
-						 NULL_TREE);
+						 false, NULL_TREE);
       /* cp_tree_equal looks through NOPs, so allow them.  */
       gcc_checking_assert (r == t
 			   || CONVERT_EXPR_P (t)
@@ -5919,7 +6127,7 @@ maybe_constant_init_1 (tree t, tree decl, bool allow_non_constant,
   else
     t = cxx_eval_outermost_constant_expr (t, allow_non_constant,
 					  /*strict*/false,
-					  manifestly_const_eval, decl);
+					  manifestly_const_eval, false, decl);
   if (TREE_CODE (t) == TARGET_EXPR)
     {
       tree init = TARGET_EXPR_INITIAL (t);
@@ -6213,7 +6421,10 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
 		if (!DECL_DECLARED_CONSTEXPR_P (fun)
 		    /* Allow any built-in function; if the expansion
 		       isn't constant, we'll deal with that then.  */
-		    && !fndecl_built_in_p (fun))
+		    && !fndecl_built_in_p (fun)
+		    /* In C++2a, replaceable global allocation functions
+		       are constant expressions.  */
+		    && !cxx_replaceable_global_alloc_fn (fun))
 		  {
 		    if (flags & tf_error)
 		      {
@@ -6442,6 +6653,9 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
 	goto fail;
       if (!RECUR (TREE_OPERAND (t, 0), any))
 	return false;
+      /* Just ignore clobbers.  */
+      if (TREE_CLOBBER_P (TREE_OPERAND (t, 1)))
+	return true;
       if (!RECUR (TREE_OPERAND (t, 1), rval))
 	return false;
       return true;
@@ -6911,7 +7125,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
      return true;
 
     case COND_EXPR:
-      if (COND_EXPR_IS_VEC_DELETE (t))
+      if (COND_EXPR_IS_VEC_DELETE (t) && cxx_dialect < cxx2a)
 	{
 	  if (flags & tf_error)
 	    error_at (loc, "%<delete[]%> is not a constant expression");
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index be1a44e..b82b580 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -172,6 +172,9 @@ enum cp_tree_index
     CPTI_VALUE_IDENTIFIER,
     CPTI_FUN_IDENTIFIER,
     CPTI_CLOSURE_IDENTIFIER,
+    CPTI_HEAP_UNINIT_IDENTIFIER,
+    CPTI_HEAP_IDENTIFIER,
+    CPTI_HEAP_DELETED_IDENTIFIER,
 
     CPTI_LANG_NAME_C,
     CPTI_LANG_NAME_CPLUSPLUS,
@@ -310,6 +313,9 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX];
 #define value_identifier		cp_global_trees[CPTI_VALUE_IDENTIFIER]
 #define fun_identifier			cp_global_trees[CPTI_FUN_IDENTIFIER]
 #define closure_identifier		cp_global_trees[CPTI_CLOSURE_IDENTIFIER]
+#define heap_uninit_identifier		cp_global_trees[CPTI_HEAP_UNINIT_IDENTIFIER]
+#define heap_identifier			cp_global_trees[CPTI_HEAP_IDENTIFIER]
+#define heap_deleted_identifier		cp_global_trees[CPTI_HEAP_DELETED_IDENTIFIER]
 #define lang_name_c			cp_global_trees[CPTI_LANG_NAME_C]
 #define lang_name_cplusplus		cp_global_trees[CPTI_LANG_NAME_CPLUSPLUS]
 
@@ -6342,6 +6348,7 @@ extern bool vbase_has_user_provided_move_assign (tree);
 extern tree default_init_uninitialized_part (tree);
 extern bool trivial_default_constructor_is_constexpr (tree);
 extern bool type_has_constexpr_default_constructor (tree);
+extern bool type_has_constexpr_destructor	(tree);
 extern bool type_has_virtual_destructor		(tree);
 extern bool classtype_has_move_assign_or_move_ctor_p (tree, bool user_declared);
 extern bool classtype_has_non_deleted_move_ctor (tree);
@@ -6648,6 +6655,7 @@ extern tree build_offset_ref			(tree, tree, bool,
 extern tree throw_bad_array_new_length		(void);
 extern bool type_has_new_extended_alignment	(tree);
 extern unsigned malloc_alignment		(void);
+extern tree build_new_constexpr_heap_type	(tree, tree, tree);
 extern tree build_new				(vec<tree, va_gc> **, tree, tree,
 						 vec<tree, va_gc> **, int,
                                                  tsubst_flags_t);
@@ -7747,6 +7755,7 @@ extern bool require_constant_expression (tree);
 extern bool require_rvalue_constant_expression (tree);
 extern bool require_potential_rvalue_constant_expression (tree);
 extern tree cxx_constant_value			(tree, tree = NULL_TREE);
+extern void cxx_constant_dtor			(tree, tree);
 extern tree cxx_constant_init			(tree, tree = NULL_TREE);
 extern tree maybe_constant_value		(tree, tree = NULL_TREE, bool = false);
 extern tree maybe_constant_init			(tree, tree = NULL_TREE, bool = false);
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d6cca65..ea9a001 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4146,6 +4146,9 @@ initialize_predefined_identifiers (void)
     {"value", &value_identifier, cik_normal},
     {"_FUN", &fun_identifier, cik_normal},
     {"__closure", &closure_identifier, cik_normal},
+    {"heap uninit", &heap_uninit_identifier, cik_normal},
+    {"heap ", &heap_identifier, cik_normal},
+    {"heap deleted", &heap_deleted_identifier, cik_normal},
     {NULL, NULL, cik_normal}
   };
 
@@ -7006,6 +7009,19 @@ notice_forced_label_r (tree *tp, int *walk_subtrees, void *)
   return NULL_TREE;
 }
 
+/* Return true if DECL has either a trivial destructor, or for C++2A
+   is constexpr and has a constexpr destructor.  */
+
+static bool
+decl_maybe_constant_destruction (tree decl, tree type)
+{
+  return (TYPE_HAS_TRIVIAL_DESTRUCTOR (type)
+	  || (cxx_dialect >= cxx2a
+	      && VAR_P (decl)
+	      && DECL_DECLARED_CONSTEXPR_P (decl)
+	      && type_has_constexpr_destructor (strip_array_types (type))));
+}
+
 /* Finish processing of a declaration;
    install its line number and initial value.
    If the length of an array type is not known before,
@@ -7430,7 +7446,7 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
 	    TREE_READONLY (decl) = 1;
 
 	  /* Likewise if it needs destruction.  */
-	  if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type))
+	  if (!decl_maybe_constant_destruction (decl, type))
 	    TREE_READONLY (decl) = 0;
 	}
 
@@ -8312,6 +8328,13 @@ register_dtor_fn (tree decl)
   if (TYPE_HAS_TRIVIAL_DESTRUCTOR (type))
     return void_node;
 
+  if (decl_maybe_constant_destruction (decl, type)
+      && DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl))
+    {
+      cxx_maybe_build_cleanup (decl, tf_warning_or_error);
+      return void_node;
+    }
+
   /* If we're using "__cxa_atexit" (or "__cxa_thread_atexit" or
      "__aeabi_atexit"), and DECL is a class object, we can just pass the
      destructor to "__cxa_atexit"; we don't have to build a temporary
@@ -8429,7 +8452,7 @@ expand_static_init (tree decl, tree init)
   gcc_assert (TREE_STATIC (decl));
 
   /* Some variables require no dynamic initialization.  */
-  if (TYPE_HAS_TRIVIAL_DESTRUCTOR (TREE_TYPE (decl)))
+  if (decl_maybe_constant_destruction (decl, TREE_TYPE (decl)))
     {
       /* Make sure the destructor is callable.  */
       cxx_maybe_build_cleanup (decl, tf_warning_or_error);
@@ -12697,12 +12720,13 @@ grokdeclarator (const cp_declarator *declarator,
 			      "a destructor cannot be %<concept%>");
                     return error_mark_node;
                   }
-                if (constexpr_p)
-                  {
-                    error_at (declspecs->locations[ds_constexpr],
-			      "a destructor cannot be %<constexpr%>");
-                    return error_mark_node;
-                  }
+		if (constexpr_p && cxx_dialect < cxx2a)
+		  {
+		    error_at (declspecs->locations[ds_constexpr],
+			      "%<constexpr%> destructors only available"
+			      " with %<-std=c++2a%> or %<-std=gnu++2a%>");
+		    return error_mark_node;
+		  }
 	      }
 	    else if (sfk == sfk_constructor && friendp && !ctype)
 	      {
@@ -12739,10 +12763,11 @@ grokdeclarator (const cp_declarator *declarator,
 	      }
 
 	    /* Tell grokfndecl if it needs to set TREE_PUBLIC on the node.  */
-	    function_context = (ctype != NULL_TREE) ?
-	      decl_function_context (TYPE_MAIN_DECL (ctype)) : NULL_TREE;
-	    publicp = (! friendp || ! staticp)
-	      && function_context == NULL_TREE;
+	    function_context
+	      = (ctype != NULL_TREE
+		 ? decl_function_context (TYPE_MAIN_DECL (ctype)) : NULL_TREE);
+	    publicp = ((! friendp || ! staticp)
+		       && function_context == NULL_TREE);
 
 	    decl = grokfndecl (ctype, type,
 			       TREE_CODE (unqualified_id) != TEMPLATE_ID_EXPR
@@ -16742,6 +16767,9 @@ cxx_maybe_build_cleanup (tree decl, tsubst_flags_t complain)
 	cleanup = error_mark_node;
       else if (TYPE_HAS_TRIVIAL_DESTRUCTOR (type))
 	/* Discard the call.  */;
+      else if (decl_maybe_constant_destruction (decl, type)
+	       && DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl))
+	cxx_constant_dtor (call, decl);
       else if (cleanup)
 	cleanup = cp_build_compound_expr (cleanup, call, complain);
       else
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 857f360..1c51e26 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "stringpool.h"
 #include "attribs.h"
 #include "asan.h"
+#include "stor-layout.h"
 
 static bool begin_init_stmts (tree *, tree *);
 static tree finish_init_stmts (bool, tree, tree);
@@ -2860,6 +2861,82 @@ std_placement_new_fn_p (tree alloc_fn)
   return false;
 }
 
+/* For element type ELT_TYPE, return the appropriate type of the heap object
+   containing such element(s).  COOKIE_SIZE is NULL or the size of cookie
+   in bytes.  FULL_SIZE is NULL if it is unknown how big the heap allocation
+   will be, otherwise size of the heap object.  If COOKIE_SIZE is NULL,
+   return array type ELT_TYPE[FULL_SIZE / sizeof(ELT_TYPE)], otherwise return
+   struct { size_t[COOKIE_SIZE/sizeof(size_t)]; ELT_TYPE[N]; }
+   where N is nothing (flexible array member) if FULL_SIZE is NULL, otherwise
+   it is computed such that the size of the struct fits into FULL_SIZE.  */
+
+tree
+build_new_constexpr_heap_type (tree elt_type, tree cookie_size, tree full_size)
+{
+  gcc_assert (cookie_size == NULL_TREE || tree_fits_uhwi_p (cookie_size));
+  gcc_assert (full_size == NULL_TREE || tree_fits_uhwi_p (full_size));
+  unsigned HOST_WIDE_INT csz = cookie_size ? tree_to_uhwi (cookie_size) : 0;
+  tree itype2 = NULL_TREE;
+  if (full_size)
+    {
+      unsigned HOST_WIDE_INT fsz = tree_to_uhwi (full_size);
+      gcc_assert (fsz >= csz);
+      fsz -= csz;
+      fsz /= int_size_in_bytes (elt_type);
+      itype2 = build_index_type (size_int (fsz - 1));
+      if (!cookie_size)
+	return build_cplus_array_type (elt_type, itype2);
+    }
+  else
+    gcc_assert (cookie_size);
+  csz /= int_size_in_bytes (sizetype);
+  tree itype1 = build_index_type (size_int (csz - 1));
+  tree atype1 = build_cplus_array_type (sizetype, itype1);
+  tree atype2 = build_cplus_array_type (elt_type, itype2);
+  tree rtype = cxx_make_type (RECORD_TYPE);
+  TYPE_NAME (rtype) = heap_identifier;
+  tree fld1 = build_decl (UNKNOWN_LOCATION, FIELD_DECL, NULL_TREE, atype1);
+  tree fld2 = build_decl (UNKNOWN_LOCATION, FIELD_DECL, NULL_TREE, atype2);
+  DECL_FIELD_CONTEXT (fld1) = rtype;
+  DECL_FIELD_CONTEXT (fld2) = rtype;
+  DECL_ARTIFICIAL (fld1) = true;
+  DECL_ARTIFICIAL (fld2) = true;
+  TYPE_FIELDS (rtype) = fld1;
+  DECL_CHAIN (fld1) = fld2;
+  layout_type (rtype);
+  return rtype;
+}
+
+/* Help the constexpr code to find the right type for the heap variable
+   by adding a NOP_EXPR around ALLOC_CALL if needed for cookie_size.
+   Return ALLOC_CALL or ALLOC_CALL cast to a pointer to
+   struct { size_t[cookie_size/sizeof(size_t)]; elt_type[]; }.  */
+
+static tree
+maybe_wrap_new_for_constexpr (tree alloc_call, tree elt_type, tree cookie_size)
+{
+  if (cxx_dialect < cxx2a)
+    return alloc_call;
+
+  if (current_function_decl != NULL_TREE
+      && !DECL_DECLARED_CONSTEXPR_P (current_function_decl))
+    return alloc_call;
+  
+  tree call_expr = extract_call_expr (alloc_call);
+  if (call_expr == error_mark_node)
+    return alloc_call;
+
+  tree alloc_call_fndecl = cp_get_callee_fndecl_nofold (call_expr);
+  if (alloc_call_fndecl == NULL_TREE
+      || !IDENTIFIER_NEW_OP_P (DECL_NAME (alloc_call_fndecl))
+      || CP_DECL_CONTEXT (alloc_call_fndecl) != global_namespace)
+    return alloc_call;
+
+  tree rtype = build_new_constexpr_heap_type (elt_type, cookie_size,
+					      NULL_TREE);
+  return build_nop (build_pointer_type (rtype), alloc_call);
+}
+
 /* Generate code for a new-expression, including calling the "operator
    new" function, initializing the object, and, if an exception occurs
    during construction, cleaning up.  The arguments are as for
@@ -3327,6 +3404,10 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts,
 	}
     }
 
+  if (cookie_size)
+    alloc_call = maybe_wrap_new_for_constexpr (alloc_call, elt_type,
+					       cookie_size);
+
   /* In the simple case, we can stop now.  */
   pointer_type = build_pointer_type (type);
   if (!cookie_size && !is_initialized)
@@ -3902,17 +3983,11 @@ build_vec_delete_1 (tree base, tree maxindex, tree type,
 			     fold_convert (sizetype, maxindex));
 
   tbase = create_temporary_var (ptype);
-  tbase_init
-    = cp_build_modify_expr (input_location, tbase, NOP_EXPR,
-			    fold_build_pointer_plus_loc (input_location,
-							 fold_convert (ptype,
-								       base),
-							 virtual_size),
-			    complain);
-  if (tbase_init == error_mark_node)
-    return error_mark_node;
-  controller = build3 (BIND_EXPR, void_type_node, tbase,
-		       NULL_TREE, NULL_TREE);
+  DECL_INITIAL (tbase)
+    = fold_build_pointer_plus_loc (input_location, fold_convert (ptype, base),
+				   virtual_size);
+  tbase_init = build_stmt (input_location, DECL_EXPR, tbase);
+  controller = build3 (BIND_EXPR, void_type_node, tbase, NULL_TREE, NULL_TREE);
   TREE_SIDE_EFFECTS (controller) = 1;
 
   body = build1 (EXIT_EXPR, void_type_node,
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 53fa85b..01bf534 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -30,6 +30,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "cgraph.h"
 #include "varasm.h"
 #include "toplev.h"
+#include "intl.h"
 #include "common/common-target.h"
 
 static void do_build_copy_assign (tree);
@@ -1237,12 +1238,24 @@ is_xible (enum tree_code code, tree to, tree from)
   return !!expr;
 }
 
+/* Categorize various special_function_kinds.  */
+#define SFK_CTOR_P(sfk) \
+  ((sfk) >= sfk_constructor && (sfk) <= sfk_move_constructor)
+#define SFK_DTOR_P(sfk) \
+  ((sfk) == sfk_destructor || (sfk) == sfk_virtual_destructor)
+#define SFK_ASSIGN_P(sfk) \
+  ((sfk) == sfk_copy_assignment || (sfk) == sfk_move_assignment)
+#define SFK_COPY_P(sfk) \
+  ((sfk) == sfk_copy_constructor || (sfk) == sfk_copy_assignment)
+#define SFK_MOVE_P(sfk) \
+  ((sfk) == sfk_move_constructor || (sfk) == sfk_move_assignment)
+
 /* Subroutine of synthesized_method_walk.  Update SPEC_P, TRIVIAL_P and
    DELETED_P or give an error message MSG with argument ARG.  */
 
 static void
-process_subob_fn (tree fn, tree *spec_p, bool *trivial_p,
-		  bool *deleted_p, bool *constexpr_p,
+process_subob_fn (tree fn, special_function_kind sfk, tree *spec_p,
+		  bool *trivial_p, bool *deleted_p, bool *constexpr_p,
 		  bool diag, tree arg, bool dtor_from_ctor = false)
 {
   if (!fn || fn == error_mark_node)
@@ -1283,24 +1296,15 @@ process_subob_fn (tree fn, tree *spec_p, bool *trivial_p,
       if (diag)
 	{
 	  inform (DECL_SOURCE_LOCATION (fn),
-		  "defaulted constructor calls non-%<constexpr%> %qD", fn);
+		  SFK_DTOR_P (sfk)
+		  ? G_("defaulted destructor calls non-%<constexpr%> %qD")
+		  : G_("defaulted constructor calls non-%<constexpr%> %qD"),
+		  fn);
 	  explain_invalid_constexpr_fn (fn);
 	}
     }
 }
 
-/* Categorize various special_function_kinds.  */
-#define SFK_CTOR_P(sfk) \
-  ((sfk) >= sfk_constructor && (sfk) <= sfk_move_constructor)
-#define SFK_DTOR_P(sfk) \
-  ((sfk) == sfk_destructor || (sfk) == sfk_virtual_destructor)
-#define SFK_ASSIGN_P(sfk) \
-  ((sfk) == sfk_copy_assignment || (sfk) == sfk_move_assignment)
-#define SFK_COPY_P(sfk) \
-  ((sfk) == sfk_copy_constructor || (sfk) == sfk_copy_assignment)
-#define SFK_MOVE_P(sfk) \
-  ((sfk) == sfk_move_constructor || (sfk) == sfk_move_assignment)
-
 /* Subroutine of synthesized_method_walk to allow recursion into anonymous
    aggregates.  If DTOR_FROM_CTOR is true, we're walking subobject destructors
    called from a synthesized constructor, in which case we don't consider
@@ -1318,8 +1322,7 @@ walk_field_subobs (tree fields, special_function_kind sfk, tree fnname,
     {
       tree mem_type, argtype, rval;
 
-      if (TREE_CODE (field) != FIELD_DECL
-	  || DECL_ARTIFICIAL (field))
+      if (TREE_CODE (field) != FIELD_DECL || DECL_ARTIFICIAL (field))
 	continue;
 
       /* Variant members only affect deletedness.  In particular, they don't
@@ -1457,7 +1460,7 @@ walk_field_subobs (tree fields, special_function_kind sfk, tree fnname,
 
       rval = locate_fn_flags (mem_type, fnname, argtype, flags, complain);
 
-      process_subob_fn (rval, spec_p, trivial_p, deleted_p,
+      process_subob_fn (rval, sfk, spec_p, trivial_p, deleted_p,
 			constexpr_p, diag, field, dtor_from_ctor);
     }
 }
@@ -1510,23 +1513,23 @@ synthesized_method_base_walk (tree binfo, tree base_binfo,
       && DECL_CONTEXT (*inheriting_ctor) == DECL_CONTEXT (rval))
     *inheriting_ctor = DECL_CLONED_FUNCTION (rval);
 
-  process_subob_fn (rval, spec_p, trivial_p, deleted_p,
+  process_subob_fn (rval, sfk, spec_p, trivial_p, deleted_p,
 		    constexpr_p, diag, BINFO_TYPE (base_binfo));
-  if (SFK_CTOR_P (sfk) &&
-      (!BINFO_VIRTUAL_P (base_binfo)
-       || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (BINFO_TYPE (base_binfo))))
+  if (SFK_CTOR_P (sfk)
+      && (!BINFO_VIRTUAL_P (base_binfo)
+	  || TYPE_HAS_NONTRIVIAL_DESTRUCTOR (BINFO_TYPE (base_binfo))))
     {
       /* In a constructor we also need to check the subobject
 	 destructors for cleanup of partially constructed objects.  */
       tree dtor = locate_fn_flags (base_binfo, complete_dtor_identifier,
 				   NULL_TREE, flags,
 				   diag ? tf_warning_or_error : tf_none);
-	  /* Note that we don't pass down trivial_p; the subobject
-	     destructors don't affect triviality of the constructor.  Nor
-	     do they affect constexpr-ness (a constant expression doesn't
-	     throw) or exception-specification (a throw from one of the
-	     dtors would be a double-fault).  */
-      process_subob_fn (dtor, NULL, NULL, deleted_p, NULL, false,
+      /* Note that we don't pass down trivial_p; the subobject
+	 destructors don't affect triviality of the constructor.  Nor
+	 do they affect constexpr-ness (a constant expression doesn't
+	 throw) or exception-specification (a throw from one of the
+	 dtors would be a double-fault).  */
+      process_subob_fn (dtor, sfk, NULL, NULL, deleted_p, NULL, false,
 			BINFO_TYPE (base_binfo), /*dtor_from_ctor*/true);
     }
 
@@ -1608,7 +1611,8 @@ synthesized_method_walk (tree ctype, special_function_kind sfk, bool const_p,
 	member is a constexpr function.  */
   if (constexpr_p)
     *constexpr_p = (SFK_CTOR_P (sfk)
-		    || (SFK_ASSIGN_P (sfk) && cxx_dialect >= cxx14));
+		    || (SFK_ASSIGN_P (sfk) && cxx_dialect >= cxx14)
+		    || (SFK_DTOR_P (sfk) && cxx_dialect >= cxx2a));
 
   bool expected_trivial = type_has_trivial_fn (ctype, sfk);
   if (trivial_p)
@@ -1704,8 +1708,8 @@ synthesized_method_walk (tree ctype, special_function_kind sfk, bool const_p,
   else if (vec_safe_is_empty (vbases))
     /* No virtual bases to worry about.  */;
   else if (ABSTRACT_CLASS_TYPE_P (ctype) && cxx_dialect >= cxx14
-	   /* DR 1658 specifis that vbases of abstract classes are
-	      ignored for both ctors and dtors.  Except DR 2338
+	   /* DR 1658 specifies that vbases of abstract classes are
+	      ignored for both ctors and dtors.  Except DR 2336
 	      overrides that skipping when determing the eh-spec of a
 	      virtual destructor.  */
 	   && sfk != sfk_virtual_destructor)
@@ -2046,7 +2050,8 @@ implicitly_declare_fn (special_function_kind kind, tree type,
     constexpr_p = false;
   /* A trivial copy/move constructor is also a constexpr constructor,
      unless the class has virtual bases (7.1.5p4).  */
-  else if (trivial_p && cxx_dialect >= cxx11
+  else if (trivial_p
+	   && cxx_dialect >= cxx11
 	   && (kind == sfk_copy_constructor
 	       || kind == sfk_move_constructor)
 	   && !CLASSTYPE_VBASECLASSES (type))
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index ec0e6a7..54d6b84 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -902,7 +902,13 @@ store_init_value (tree decl, tree init, vec<tree, va_gc>** cleanups, int flags)
 	    value = oldval;
 	}
     }
-  value = cp_fully_fold_init (value);
+  /* Don't fold initializers of automatic variables in constexpr functions,
+     that might fold away something that needs to be diagnosed at constexpr
+     evaluation time.  */
+  if (!current_function_decl
+      || !DECL_DECLARED_CONSTEXPR_P (current_function_decl)
+      || TREE_STATIC (decl))
+    value = cp_fully_fold_init (value);
 
   /* Handle aggregate NSDMI in non-constant initializers, too.  */
   value = replace_placeholders (value, decl);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 10ba0d9..8a0a035 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,23 @@
 2019-10-05  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/91369 - Implement P0784R7: constexpr new
+	* g++.dg/cpp0x/constexpr-delete2.C: Adjust expected diagnostics for
+	c++2a.
+	* g++.dg/cpp0x/locations1.C: Only expect constexpr ~S() diagnostics
+	in c++17_down, adjust expected wording.
+	* g++.dg/cpp1y/constexpr-new.C: Only expect diagnostics in c++17_down.
+	* g++.dg/cpp2a/constexpr-dtor1.C: New test.
+	* g++.dg/cpp2a/constexpr-dtor2.C: New test.
+	* g++.dg/cpp2a/constexpr-dtor3.C: New test.
+	* g++.dg/cpp2a/constexpr-new1.C: New test.
+	* g++.dg/cpp2a/constexpr-new2.C: New test.
+	* g++.dg/cpp2a/constexpr-new3.C: New test.
+	* g++.dg/cpp2a/constexpr-new4.C: New test.
+	* g++.dg/cpp2a/feat-cxx2a.C: Add __cpp_constinit and
+	__cpp_constexpr_dynamic_alloc tests.  Tweak __cpp_* tests for c++2a
+	features to use style like older features, including #ifdef test.
+	* g++.dg/ext/is_literal_type3.C: New test.
+
 	PR tree-optimization/91734
 	* gcc.dg/pr91734.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-delete2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-delete2.C
index 4a453a4..999f9b7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-delete2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-delete2.C
@@ -5,8 +5,9 @@ struct A { ~A(); };
 constexpr int f(int i) { return i; }
 constexpr int g(A* ap)
 {
-  return f((delete[] ap, 42)); // { dg-message "" }
+  return f((delete[] ap, 42)); // { dg-message "" "" { target c++17_down } }
 }
 
 A a;
 constexpr int i = g(&a);	// { dg-error "" }
+				// { dg-message "in 'constexpr' expansion of" "" { target c++2a } .-1 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/locations1.C b/gcc/testsuite/g++.dg/cpp0x/locations1.C
index 6de0368..62a72ea 100644
--- a/gcc/testsuite/g++.dg/cpp0x/locations1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/locations1.C
@@ -11,7 +11,7 @@ struct S
 {
   virtual S();  // { dg-error "3:constructors cannot be declared .virtual." }
   constexpr int s = 1;  // { dg-error "3:non-static data member .s. declared .constexpr." }
-  constexpr ~S();  // { dg-error "3:a destructor cannot be .constexpr." }
+  constexpr ~S();  // { dg-error "3:'constexpr' destructors only available with" "" { target c++17_down } }
 };
 
 typedef constexpr int my_int;  // { dg-error "9:.constexpr. cannot appear in a typedef declaration" }
diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-new.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-new.C
index 9e300b9..90cb425 100644
--- a/gcc/testsuite/g++.dg/cpp1y/constexpr-new.C
+++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-new.C
@@ -4,7 +4,7 @@ constexpr int *f4(bool b) {
   if (b) {
     return nullptr;
   } else {
-    return new int{42}; // { dg-error "call to non-.constexpr." }
+    return new int{42}; // { dg-error "call to non-.constexpr." "" { target c++17_down } }
   }
 }
 static_assert(f4(true) == nullptr, "");
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor1.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor1.C
new file mode 100644
index 0000000..a2ea6bf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor1.C
@@ -0,0 +1,9 @@
+// P0784R7
+// { dg-do compile { target c++11 } }
+
+struct S
+{
+  constexpr S () : s (0) {}
+  constexpr ~S () {}	// { dg-error "'constexpr' destructors only available with" "" { target c++17_down } }
+  int s;
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor2.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor2.C
new file mode 100644
index 0000000..397cfb0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor2.C
@@ -0,0 +1,66 @@
+// P0784R7
+// { dg-do compile { target c++2a } }
+
+struct S
+{
+  constexpr S () : r (4), s (3) { --r; s -= 2; }
+  constexpr ~S () { if (s == 1) s = 0; else asm (""); if (s == 0 && r == 3) r = 0; else asm (""); }
+  int r, s;
+};
+struct T : public S
+{
+  constexpr T () : t (2) {}
+  int t;
+  S u;
+};
+struct U : public S
+{
+  constexpr U (int x) : u (x) {}
+  constexpr ~U () = default;
+  int u;
+  S v;
+};
+
+constexpr S a;
+constexpr T b;
+constexpr U c = 3;
+static_assert (a.s == 1 && a.r == 3);
+static_assert (b.s == 1 && b.r == 3 && b.t == 2 && b.u.s == 1 && b.u.r == 3);
+static_assert (c.s == 1 && c.r == 3 && c.u == 3 && c.v.s == 1 && c.v.r == 3);
+
+void
+foo ()
+{
+  static constexpr S d;
+  static constexpr T e;
+  static constexpr U f = 4;
+  static_assert (d.s == 1 && d.r == 3);
+  static_assert (e.s == 1 && e.r == 3 && e.t == 2 && e.u.s == 1 && e.u.r == 3);
+  static_assert (f.s == 1 && f.r == 3 && f.u == 4 && f.v.s == 1 && f.v.r == 3);
+  if (1)
+    {
+      constexpr S g;
+      constexpr T h;
+      constexpr U i = 5;
+      static_assert (g.s == 1 && g.r == 3);
+      static_assert (h.s == 1 && h.r == 3 && h.t == 2 && h.u.s == 1 && h.u.r == 3);
+      static_assert (i.s == 1 && i.r == 3 && i.u == 5 && i.v.s == 1 && i.v.r == 3);
+    }
+}
+
+constexpr bool
+bar ()
+{
+  S j;
+  T k;
+  U l = 6;
+  if (j.s != 1 || j.r != 3)
+    return false;
+  if (k.s != 1 || k.r != 3 || k.t != 2 || k.u.s != 1 || k.u.r != 3)
+    return false;
+  if (l.s != 1 || l.r != 3 || l.u != 6 || l.v.s != 1 || l.v.r != 3)
+    return false;
+  return true;
+}
+
+static_assert (bar ());
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C
new file mode 100644
index 0000000..dcfa4e6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C
@@ -0,0 +1,185 @@
+// P0784R7
+// { dg-do compile { target c++2a } }
+
+struct S
+{
+  constexpr S () : s (0) {}
+  constexpr ~S () {}
+  int s;
+};
+struct T	// { dg-message "'T' is not literal because" }
+{		// { dg-message "'T' does not have 'constexpr' destructor" "" { target *-*-* } .-1 }
+  constexpr T () : t (0) {}
+  ~T () {}	// { dg-message "defaulted destructor calls non-'constexpr' 'T::~T\\(\\)'" }
+  int t;
+};
+struct U : public S
+{
+  constexpr U () : u (0) {}
+  constexpr ~U () = default;	// { dg-error "explicitly defaulted function 'constexpr U::~U\\(\\)' cannot be declared 'constexpr' because the implicit declaration is not 'constexpr'" }
+  int u;
+  T t;
+};
+struct V : virtual public S
+{
+  V () : v (0) {}
+  constexpr ~V () = default;	// { dg-error "explicitly defaulted function 'constexpr V::~V\\(\\)' cannot be declared 'constexpr' because the implicit declaration is not 'constexpr'" }
+  int v;
+};
+struct W0
+{
+  constexpr W0 () : w (0) {}
+  constexpr W0 (int x) : w (x) {}
+  constexpr ~W0 () { if (w == 5) asm (""); w = 3; }
+  int w;
+};
+struct W1
+{
+  constexpr W1 () : w (0) {}
+  constexpr W1 (int x) : w (x) {}
+  constexpr ~W1 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W2
+{
+  constexpr W2 () : w (0) {}
+  constexpr W2 (int x) : w (x) {}
+  constexpr ~W2 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W3
+{
+  constexpr W3 () : w (0) {}
+  constexpr W3 (int x) : w (x) {}
+  constexpr ~W3 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W4
+{
+  constexpr W4 () : w (0) {}
+  constexpr W4 (int x) : w (x) {}
+  constexpr ~W4 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W5
+{
+  constexpr W5 () : w (0) {}
+  constexpr W5 (int x) : w (x) {}
+  constexpr ~W5 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W6
+{
+  constexpr W6 () : w (0) {}
+  constexpr W6 (int x) : w (x) {}
+  constexpr ~W6 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W7
+{
+  constexpr W7 () : w (0) {}
+  constexpr W7 (int x) : w (x) {}
+  constexpr ~W7 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct W8
+{
+  constexpr W8 () : w (0) {}
+  constexpr W8 (int x) : w (x) {}
+  constexpr ~W8 () { if (w == 5) asm (""); w = 3; }	// { dg-error "inline assembly is not a constant expression" }
+							// { dg-message "only unevaluated inline assembly is allowed in a 'constexpr' function" "" { target *-*-* } .-1 }
+  int w;
+};
+struct X : public T
+{
+  constexpr X () : x (0) {}
+  constexpr ~X () = default;	// { dg-error "explicitly defaulted function 'constexpr X::~X\\(\\)' cannot be declared 'constexpr' because the implicit declaration is not 'constexpr'" }
+  int x;
+};
+constexpr S s;
+constexpr T t;	// { dg-error "the type 'const T' of 'constexpr' variable 't' is not literal" }
+constexpr W0 w1;
+constexpr W0 w2 = 12;
+constexpr W1 w3 = 5;	// { dg-message "in 'constexpr' expansion of" }
+constexpr W0 w4[3] = { 1, 2, 3 };
+constexpr W2 w5[3] = { 4, 5, 6 };	// { dg-message "in 'constexpr' expansion of" }
+
+void
+f1 ()
+{
+  constexpr S s2;
+  constexpr W0 w6;
+  constexpr W0 w7 = 12;
+  constexpr W3 w8 = 5;	// { dg-message "in 'constexpr' expansion of" }
+  constexpr W0 w9[3] = { 1, 2, 3 };
+  constexpr W4 w10[3] = { 4, 5, 6 };	// { dg-message "in 'constexpr' expansion of" }
+}
+
+constexpr int
+f2 ()
+{
+  constexpr S s3;
+  constexpr W0 w11;
+  constexpr W0 w12 = 12;
+  constexpr W5 w13 = 5;	// { dg-message "in 'constexpr' expansion of" }
+  constexpr W0 w14[3] = { 1, 2, 3 };
+  constexpr W6 w15[3] = { 4, 5, 6 };	// { dg-message "in 'constexpr' expansion of" }
+  return 0;
+}
+
+constexpr int
+f3 ()
+{
+  S s3;
+  W0 w11;
+  W0 w12 = 12;
+  W0 w14[3] = { 1, 2, 3 };
+  return 0;
+}
+
+constexpr int x3 = f3 ();
+
+constexpr int
+f4 ()
+{
+  W7 w13 = 5;
+  return 0;
+}
+
+constexpr int x4 = f4 ();	// { dg-message "in 'constexpr' expansion of" }
+
+constexpr int
+f5 ()
+{
+  W8 w15[3] = { 4, 5, 6 };	// { dg-message "in 'constexpr' expansion of" }
+  return 0;
+}
+
+constexpr int x5 = f5 ();	// { dg-message "in 'constexpr' expansion of" }
+
+void
+f6 ()
+{
+  constexpr T t2;	// { dg-error "the type 'const T' of 'constexpr' variable 't2' is not literal" }
+}
+
+constexpr int
+f7 ()
+{
+  constexpr T t3;	// { dg-error "the type 'const T' of 'constexpr' variable 't3' is not literal" }
+  return 0;
+}
+
+constexpr int
+f8 ()
+{
+  T t4;			// { dg-error "variable 't4' of non-literal type 'T' in 'constexpr' function" }
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-new1.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-new1.C
new file mode 100644
index 0000000..873edd4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-new1.C
@@ -0,0 +1,39 @@
+// P0784R7
+// { dg-do compile { target c++2a } }
+
+struct S { constexpr S () : s (5) {} constexpr S (int x) : s (x) {} int s; };
+
+constexpr bool
+foo ()
+{
+  int r = 0;
+  S *p = new S ();
+  p->s += 3;
+  r += p->s;
+  delete p;
+  p = new S (12);
+  p->s = p->s * 2;
+  r += p->s;
+  delete p;
+  int *q = new int;
+  *q = 25;
+  r += *q;
+  delete q;
+  q = new int (1);
+  r += *q;
+  if (!q)
+    return false;
+  delete q;
+  q = new int[5]{1,2,3,4,5};
+  r += q[0] + q[4];
+  delete[] q;
+  q = new int[4];
+  q[0] = 6;
+  q[1] = 7;
+  q[3] = 8;
+  r += q[0] + q[1] + q[3];
+  delete[] q;
+  return r == 5 + 3 + 2 * 12 + 25 + 1 + 1 + 5 + 6 + 7 + 8;
+}
+constexpr bool a = foo ();
+static_assert (a);
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-new2.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-new2.C
new file mode 100644
index 0000000..be54962
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-new2.C
@@ -0,0 +1,21 @@
+// P0784R7
+// { dg-do compile { target c++2a } }
+
+template <int N>
+constexpr bool
+foo (const char (&x)[N])
+{
+  int **p = new int *[N];
+  for (int i = 0; i < N; i++)
+    p[i] = new int (x[i]);
+  for (int i = 0; i < N; i++)
+    if (*p[i] != x[i])
+      return false;
+  for (int i = 0; i < N; ++i)
+    delete p[i];
+  delete[] p;
+  return true;
+}
+
+constexpr bool a = foo ("foobar");
+static_assert (a);
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-new3.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-new3.C
new file mode 100644
index 0000000..3380df7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-new3.C
@@ -0,0 +1,73 @@
+// P0784R7
+// { dg-do compile { target c++2a } }
+
+constexpr int *
+f1 ()
+{
+  return new int (2);		// { dg-error "is not a constant expression because it refers to a result of" }
+}
+
+constexpr auto v1 = f1 ();
+
+constexpr bool
+f2 ()
+{
+  int *p = new int (3);		// { dg-error "is not a constant expression because allocated storage has not been deallocated" }
+  return false;
+}
+
+constexpr auto v2 = f2 ();
+
+constexpr bool
+f3 ()
+{
+  int *p = new int (3);
+  int *q = p;
+  delete p;
+  delete q;			// { dg-error "deallocation of already deallocated storage" }
+  return false;
+}
+
+constexpr auto v3 = f3 ();	// { dg-message "in 'constexpr' expansion of" }
+
+constexpr bool
+f4 (int *p)
+{
+  delete p;			// { dg-error "deallocation of storage that was not previously allocated" }
+  return false;
+}
+
+int q;
+constexpr auto v4 = f4 (&q);	// { dg-message "in 'constexpr' expansion of" }
+
+constexpr bool
+f5 ()
+{
+  int *p = new int;		// { dg-message "allocated here" }
+  return *p == 1;
+}
+
+constexpr auto v5 = f5 ();	// { dg-error "the content of uninitialized storage is not usable in a constant expression" }
+				// { dg-message "in 'constexpr' expansion of" "" { target *-*-* } .-1 }
+
+constexpr bool
+f6 ()
+{
+  int *p = new int (2);		// { dg-message "allocated here" }
+  int *q = p;
+  delete p;
+  return *q == 2;
+}
+
+constexpr auto v6 = f6 ();	// { dg-error "use of allocated storage after deallocation in a constant expression" }
+				// { dg-message "in 'constexpr' expansion of" "" { target *-*-* } .-1  }
+
+constexpr int *
+f7 ()
+{
+  int *p = new int (2);		// { dg-error "is not a constant expression because it refers to a result of" }
+  delete p;
+  return p;
+}
+
+constexpr auto v7 = f7 ();
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-new4.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-new4.C
new file mode 100644
index 0000000..6cac983
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-new4.C
@@ -0,0 +1,29 @@
+// P0784R7
+// { dg-do compile { target c++2a } }
+
+struct S
+{
+  constexpr S () : s (0) { s++; }
+  constexpr S (int x) : s (x) { s += 2; }
+  constexpr ~S () { if (s != 35) asm (""); s = 5; }
+  int s;
+};
+
+constexpr bool
+foo ()
+{
+  S *p = new S (7);
+  if (p->s != 9) return false;
+  p->s = 35;
+  delete p;
+  p = new S[3] { 11, 13, 15 };
+  if (p[0].s != 13 || p[1].s != 15 || p[2].s != 17) return false;
+  p[0].s = 35;
+  p[2].s = 35;
+  p[1].s = 35;
+  delete[] p;
+  return true;
+}
+
+constexpr bool a = foo ();
+static_assert (a);
diff --git a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
index 086109a..2b9cfd0 100644
--- a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
+++ b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
@@ -430,16 +430,34 @@
 
 // C++20 features
 
-#if __cpp_conditional_explicit != 201806
-# error "__cpp_conditional_explicit != 201806"
+#ifndef __cpp_conditional_explicit
+#  error "__cpp_conditional_explicit"
+#elif __cpp_conditional_explicit != 201806
+#  error "__cpp_conditional_explicit != 201806"
 #endif
 
-#if __cpp_nontype_template_parameter_class != 201806
-# error "__cpp_nontype_template_parameter_class != 201806"
+#ifndef __cpp_nontype_template_parameter_class
+#  error "__cpp_nontype_template_parameter_class"
+#elif __cpp_nontype_template_parameter_class != 201806
+#  error "__cpp_nontype_template_parameter_class != 201806"
 #endif
 
-#if __cpp_impl_destroying_delete != 201806
-# error "__cpp_impl_destroying_delete != 201806"
+#ifndef __cpp_impl_destroying_delete
+#  error "__cpp_impl_destroying_delete"
+#elif __cpp_impl_destroying_delete != 201806
+#  error "__cpp_impl_destroying_delete != 201806"
+#endif
+
+#ifndef __cpp_constinit
+#  error "__cpp_constinit"
+#elif __cpp_constinit != 201907
+#  error "__cpp_constinit != 201907"
+#endif
+
+#ifndef __cpp_constexpr_dynamic_alloc
+#  error "__cpp_constexpr_dynamic_alloc"
+#elif __cpp_constexpr_dynamic_alloc != 201907
+#  error "__cpp_constexpr_dynamic_alloc != 201907"
 #endif
 
 #ifdef __has_cpp_attribute
@@ -484,8 +502,6 @@
 #  error "__has_cpp_attribute"
 #endif
 
-// C++2A features:
-
 #ifndef __cpp_char8_t
 #  error "__cpp_char8_t"
 #elif __cpp_char8_t != 201811
diff --git a/gcc/testsuite/g++.dg/ext/is_literal_type3.C b/gcc/testsuite/g++.dg/ext/is_literal_type3.C
new file mode 100644
index 0000000..22d8494
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_literal_type3.C
@@ -0,0 +1,26 @@
+// { dg-do compile { target c++11 } }
+
+struct S {
+  constexpr S () : n{} { }
+  ~S () { n = 1; }
+  int n;
+};
+
+static_assert(!__is_literal_type(S), "");
+
+#ifdef __cpp_constexpr_dynamic_alloc
+struct T {
+  constexpr T () : n{} { }
+  constexpr ~T () { n = 1; }
+  int n;
+};
+
+static_assert(__is_literal_type(T), "");
+
+struct U : public T {
+  constexpr U () : u{} { }
+  int u;
+};
+
+static_assert(__is_literal_type(U), "");
+#endif
-- 
cgit v1.1


From d56cbcc0a2ae508afbbc1c3d6a6b925971ff2d6e Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sat, 5 Oct 2019 08:05:44 +0000
Subject: [Darwin] Amend section for constants with reloactions.

Darwin's linker doesn't like text section relocations (they require special
enabling).  At least, the Fortran FE seems to generate cases where the
initialiser for a pointer constant can need a relocation.  We can handle
this by special-casing SECCAT_RODATA when the relocation is present by
placing the constant in the .const_data section.

gcc/ChangeLog:

2019-10-05  Iain Sandoe  <iain@sandoe.co.uk>

	PR target/59888
	* config/darwin.c (darwin_rodata_section): Add relocation flag,
	choose const_data section for constants with relocations.
	(machopic_select_section): Pass relocation flag to
	darwin_rodata_section ().

From-SVN: r276623
---
 gcc/ChangeLog       | 8 ++++++++
 gcc/config/darwin.c | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 171d554..e855712 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-05  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/59888
+	* config/darwin.c (darwin_rodata_section): Add relocation flag,
+	choose const_data section for constants with relocations.
+	(machopic_select_section): Pass relocation flag to
+	darwin_rodata_section ().
+
 2019-10-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/91734
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 3a1be5a..2fb9c56 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1251,12 +1251,13 @@ darwin_mark_decl_preserved (const char *name)
 }
 
 static section *
-darwin_rodata_section (int use_coal, bool zsize)
+darwin_rodata_section (int use_coal, bool zsize, int reloc)
 {
   return (use_coal
 	  ? darwin_sections[const_coal_section]
 	  : (zsize ? darwin_sections[zobj_const_section]
-		   : darwin_sections[const_section]));
+		   : reloc ? darwin_sections[const_data_section]
+			   : darwin_sections[const_section]));
 }
 
 static section *
@@ -1549,7 +1550,7 @@ machopic_select_section (tree decl,
 
     case SECCAT_RODATA:
     case SECCAT_SRODATA:
-      base_section = darwin_rodata_section (use_coal, zsize);
+      base_section = darwin_rodata_section (use_coal, zsize, reloc);
       break;
 
     case SECCAT_RODATA_MERGE_STR:
-- 
cgit v1.1


From 980f185ce3ba6d532530ce0f23bfb6e30320fd8a Mon Sep 17 00:00:00 2001
From: Paul Thomas <pault@gcc.gnu.org>
Date: Sat, 5 Oct 2019 08:17:55 +0000
Subject: re PR fortran/91926 (assumed rank optional)

2019-10-05  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/91926
	* trans-expr.c (gfc_conv_gfc_desc_to_cfi_desc): Correct the
	assignment of the attribute field to account correctly for an
	assumed shape dummy. Assign separately to the gfc and cfi
	descriptors since the atribute can be different. Add btanch to
	correctly handle missing optional dummies.

2019-10-05  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/91926
	* gfortran.dg/ISO_Fortran_binding_13.f90 : New test.
	* gfortran.dg/ISO_Fortran_binding_13.c : Additional source.
	* gfortran.dg/ISO_Fortran_binding_14.f90 : New test.

2019-10-05  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/91926
	* runtime/ISO_Fortran_binding.c (cfi_desc_to_gfc_desc): Do not
	modify the bounds and offset for CFI_other.

From-SVN: r276624
---
 gcc/fortran/ChangeLog                              | 11 ++++-
 gcc/fortran/trans-expr.c                           | 48 +++++++++++++++++++---
 gcc/testsuite/ChangeLog                            |  7 ++++
 gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.c | 12 ++++++
 .../gfortran.dg/ISO_Fortran_binding_13.f90         | 39 ++++++++++++++++++
 .../gfortran.dg/ISO_Fortran_binding_14.f90         | 41 ++++++++++++++++++
 6 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.c
 create mode 100644 gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.f90
 create mode 100644 gcc/testsuite/gfortran.dg/ISO_Fortran_binding_14.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dc1e19a..2da44e0 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-05  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91926
+	* trans-expr.c (gfc_conv_gfc_desc_to_cfi_desc): Correct the
+	assignment of the attribute field to account correctly for an
+	assumed shape dummy. Assign separately to the gfc and cfi
+	descriptors since the atribute can be different. Add btanch to
+	correctly handle missing optional dummies.
+
 2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran.91959
@@ -65,7 +74,7 @@
 	character types are possible it can get the character length from
 	gfc_expr for character literals.
 	(gfc_dummy_typename): New functionfor gfc_typespec *, if no character
-	length is present the character type is assumed and the appropriate 
+	length is present the character type is assumed and the appropriate
 	string is return otherwise it calls gfc_typename for gfc_typespec *.
 	(gfc_typespec): for character types construct the type name with length
 	and kind (if it is not default kind).
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 61db4e3..965ab77 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -5202,7 +5202,9 @@ gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
   tree gfc_desc_ptr;
   tree type;
   tree cond;
+  tree desc_attr;
   int attribute;
+  int cfi_attribute;
   symbol_attribute attr = gfc_expr_attr (e);
   stmtblock_t block;
 
@@ -5211,12 +5213,20 @@ gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
   attribute = 2;
   if (!e->rank || gfc_get_full_arrayspec_from_expr (e))
     {
-      if (fsym->attr.pointer)
+      if (attr.pointer)
 	attribute = 0;
-      else if (fsym->attr.allocatable)
+      else if (attr.allocatable)
 	attribute = 1;
     }
 
+  /* If the formal argument is assumed shape and neither a pointer nor
+     allocatable, it is unconditionally CFI_attribute_other.  */
+  if (fsym->as->type == AS_ASSUMED_SHAPE
+      && !fsym->attr.pointer && !fsym->attr.allocatable)
+   cfi_attribute = 2;
+  else
+   cfi_attribute = attribute;
+
   if (e->rank != 0)
     {
       parmse->force_no_tmp = 1;
@@ -5283,11 +5293,12 @@ gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
 						    parmse->expr, attr);
     }
 
-  /* Set the CFI attribute field.  */
-  tmp = gfc_conv_descriptor_attribute (parmse->expr);
+  /* Set the CFI attribute field through a temporary value for the
+     gfc attribute.  */
+  desc_attr = gfc_conv_descriptor_attribute (parmse->expr);
   tmp = fold_build2_loc (input_location, MODIFY_EXPR,
-			 void_type_node, tmp,
-			 build_int_cst (TREE_TYPE (tmp), attribute));
+			 void_type_node, desc_attr,
+			 build_int_cst (TREE_TYPE (desc_attr), cfi_attribute));
   gfc_add_expr_to_block (&parmse->pre, tmp);
 
   /* Now pass the gfc_descriptor by reference.  */
@@ -5305,6 +5316,12 @@ gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
 			     gfor_fndecl_gfc_to_cfi, 2, tmp, gfc_desc_ptr);
   gfc_add_expr_to_block (&parmse->pre, tmp);
 
+  /* Now set the gfc descriptor attribute.  */
+  tmp = fold_build2_loc (input_location, MODIFY_EXPR,
+			 void_type_node, desc_attr,
+			 build_int_cst (TREE_TYPE (desc_attr), attribute));
+  gfc_add_expr_to_block (&parmse->pre, tmp);
+
   /* The CFI descriptor is passed to the bind_C procedure.  */
   parmse->expr = cfi_desc_ptr;
 
@@ -5325,6 +5342,25 @@ gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
   tmp = build_call_expr_loc (input_location,
 			     gfor_fndecl_cfi_to_gfc, 2, gfc_desc_ptr, tmp);
   gfc_prepend_expr_to_block (&parmse->post, tmp);
+
+  /* Deal with an optional dummy being passed to an optional formal arg
+     by finishing the pre and post blocks and making their execution
+     conditional on the dummy being present.  */
+  if (fsym->attr.optional && e->expr_type == EXPR_VARIABLE
+      && e->symtree->n.sym->attr.optional)
+    {
+      cond = gfc_conv_expr_present (e->symtree->n.sym);
+      tmp = fold_build2 (MODIFY_EXPR, void_type_node,
+			 cfi_desc_ptr,
+			 build_int_cst (pvoid_type_node, 0));
+      tmp = build3_v (COND_EXPR, cond,
+		      gfc_finish_block (&parmse->pre), tmp);
+      gfc_add_expr_to_block (&parmse->pre, tmp);
+      tmp = build3_v (COND_EXPR, cond,
+		      gfc_finish_block (&parmse->post),
+		      build_empty_stmt (input_location));
+      gfc_add_expr_to_block (&parmse->post, tmp);
+    }
 }
 
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8a0a035..e40a167 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-05  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91926
+	* gfortran.dg/ISO_Fortran_binding_13.f90 : New test.
+	* gfortran.dg/ISO_Fortran_binding_13.c : Additional source.
+	* gfortran.dg/ISO_Fortran_binding_14.f90 : New test.
+
 2019-10-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/91369 - Implement P0784R7: constexpr new
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.c
new file mode 100644
index 0000000..1ac9fc8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.c
@@ -0,0 +1,12 @@
+/* Test the fix for PR91926.  */
+
+/* Contributed by José Rui Faustino de Sousa  <jrfsousa@hotmail.com> */
+
+#include <stdlib.h>
+
+int ifb_echo(void*);
+
+int ifb_echo(void *this)
+{
+  return this == NULL ? 1 : 2;
+}
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.f90 b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.f90
new file mode 100644
index 0000000..132a97c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_13.f90
@@ -0,0 +1,39 @@
+! { dg-do run { target c99_runtime } }
+! { dg-additional-sources ISO_Fortran_binding_13.c }
+!
+! Test the fix for PR91926. The additional source is the main program.
+!
+! Contributed by José Rui Faustino de Sousa  <jrfsousa@hotmail.com>
+!
+program ifb_p
+
+  implicit none
+
+  integer :: i = 42
+
+  interface
+    integer function ifb_echo_aux(this) bind(c, name="ifb_echo")
+      implicit none
+      type(*), dimension(..), & ! removing assumed rank solves segmentation fault
+        optional, intent(in) :: this
+    end function ifb_echo_aux
+  end interface
+
+  if (ifb_echo_aux() .ne. 1) STOP 1  ! worked
+  if (ifb_echo() .ne. 1) stop 2      ! segmentation fault
+  if (ifb_echo_aux(i) .ne. 2) stop 3 ! worked
+  if (ifb_echo(i) .ne. 2) stop 4     ! worked
+
+  stop
+
+contains
+
+  integer function ifb_echo(this)
+    type(*), dimension(..), &
+      optional, intent(in) :: this
+
+    ifb_echo = ifb_echo_aux(this)
+    return
+  end function ifb_echo
+
+end program ifb_p
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_14.f90 b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_14.f90
new file mode 100644
index 0000000..388c543
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_14.f90
@@ -0,0 +1,41 @@
+! { dg-do run }
+!
+! Correct an error in the eveluation of the CFI descriptor attribute for
+! the case where the bind_C formal argument is not an assumed shape array
+! and not allocatable or pointer.
+!
+! Contributed by Gilles Gouaillardet  <gilles@rist.or.jp>
+!
+MODULE FOO
+INTERFACE
+SUBROUTINE dummy(buf) BIND(C, name="sync")
+type(*), dimension(..) :: buf
+END SUBROUTINE
+END INTERFACE
+END MODULE
+
+PROGRAM main
+    USE FOO
+    IMPLICIT NONE
+    integer(8) :: before, after
+
+    INTEGER, parameter :: n = 1
+
+    INTEGER, ALLOCATABLE :: buf(:)
+    INTEGER :: buf2(n)
+    INTEGER :: i
+
+    ALLOCATE(buf(n))
+    before = LOC(buf(1))
+    CALL dummy (buf)
+    after = LOC(buf(1))
+
+    if (before .NE. after) stop 1
+
+    before = LOC(buf2(1))
+    CALL dummy (buf)
+    after = LOC(buf2(1))
+
+    if (before .NE. after) stop 2
+
+END PROGRAM
-- 
cgit v1.1


From 74e4fb1361b89fcca2b713ac79832934a7b3030b Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Sat, 5 Oct 2019 14:27:26 +0000
Subject: re PR fortran/91497 (-Wconversion warns when doing explicit type
 conversion)

2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91497
	* gfortran.dg/pr91497.f90: Run on i?86-*-* and x86_64-*-* only.

From-SVN: r276626
---
 gcc/testsuite/ChangeLog               | 5 +++++
 gcc/testsuite/gfortran.dg/pr91497.f90 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e40a167..255fce5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91497
+	* gfortran.dg/pr91497.f90: Run on i?86-*-* and x86_64-*-* only.
+
 2019-10-05  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/91926
diff --git a/gcc/testsuite/gfortran.dg/pr91497.f90 b/gcc/testsuite/gfortran.dg/pr91497.f90
index aa06a49..d324b3b 100644
--- a/gcc/testsuite/gfortran.dg/pr91497.f90
+++ b/gcc/testsuite/gfortran.dg/pr91497.f90
@@ -1,4 +1,4 @@
-! { dg-do compile }
+! { dg-do compile { target { i?86-*-* x86_64-*-* } } }
 ! { dg-options "-Wall" }
 ! Code contributed by Manfred Schwarb <manfred99 at gmx dot ch>
 ! PR fortran/91497
-- 
cgit v1.1


From 2345fe52da74dac58173489e844647d3a94f4ca8 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Sat, 5 Oct 2019 15:23:26 +0000
Subject: re PR fortran/47054 (Compilation error when cray pointers are
 declared in both host and internal subroutines)

2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/47045
	* decl.c (variable_decl): Do not search parent namespace for symbol.

2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/47045
	* gfortran.dg/pr47054_1.f90: New test
	* gfortran.dg/pr47054_2.f90: Ditto.

From-SVN: r276627
---
 gcc/fortran/ChangeLog                   |     5 +
 gcc/fortran/decl.c                      |     2 +-
 gcc/testsuite/ChangeLog                 | 14167 ++++++++++++++++++++++++++++++
 gcc/testsuite/gfortran.dg/pr47054_1.f90 |    15 +
 gcc/testsuite/gfortran.dg/pr47054_2.f90 |    41 +
 5 files changed, 14229 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr47054_1.f90
 create mode 100644 gcc/testsuite/gfortran.dg/pr47054_2.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2da44e0..84ee818 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/47045
+	* decl.c (variable_decl): Do not search parent namespace for symbol.
+
 2019-10-05  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/91926
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index d439906..9b604c8 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -2682,7 +2682,7 @@ variable_decl (int elem)
       then we want to set the type & bail out.  */
   if (flag_cray_pointer && !gfc_comp_struct (gfc_current_state ()))
     {
-      gfc_find_symbol (name, gfc_current_ns, 1, &sym);
+      gfc_find_symbol (name, gfc_current_ns, 0, &sym);
       if (sym != NULL && sym->attr.cray_pointee)
 	{
 	  m = MATCH_YES;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 255fce5..2397eec 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,14172 @@
 2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/47045
+	* gfortran.dg/pr47054_1.f90: New test
+	* gfortran.dg/pr47054_2.f90: Ditto.
+
+2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91497
+	* gfortran.dg/pr91497.f90: Run on i?86-*-* and x86_64-*-* only.
+
+2019-10-05  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91926
+	* gfortran.dg/ISO_Fortran_binding_13.f90 : New test.
+	* gfortran.dg/ISO_Fortran_binding_13.c : Additional source.
+	* gfortran.dg/ISO_Fortran_binding_14.f90 : New test.
+
+2019-10-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91369 - Implement P0784R7: constexpr new
+	* g++.dg/cpp0x/constexpr-delete2.C: Adjust expected diagnostics for
+	c++2a.
+	* g++.dg/cpp0x/locations1.C: Only expect constexpr ~S() diagnostics
+	in c++17_down, adjust expected wording.
+	* g++.dg/cpp1y/constexpr-new.C: Only expect diagnostics in c++17_down.
+	* g++.dg/cpp2a/constexpr-dtor1.C: New test.
+	* g++.dg/cpp2a/constexpr-dtor2.C: New test.
+	* g++.dg/cpp2a/constexpr-dtor3.C: New test.
+	* g++.dg/cpp2a/constexpr-new1.C: New test.
+	* g++.dg/cpp2a/constexpr-new2.C: New test.
+	* g++.dg/cpp2a/constexpr-new3.C: New test.
+	* g++.dg/cpp2a/constexpr-new4.C: New test.
+	* g++.dg/cpp2a/feat-cxx2a.C: Add __cpp_constinit and
+	__cpp_constexpr_dynamic_alloc tests.  Tweak __cpp_* tests for c++2a
+	features to use style like older features, including #ifdef test.
+	* g++.dg/ext/is_literal_type3.C: New test.
+
+	PR tree-optimization/91734
+	* gcc.dg/pr91734.c: New test.
+
+2019-10-04  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/82752
+	* gcc.dg/format/c2x-strftime-1.c: New test.
+
+2019-10-04  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/91977
+	* gcc.dg/Wstringop-overflow-18.c: New test.
+
+2019-10-04  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/Wstringop-overflow-17.c: New test.
+
+2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran.91959
+	* gfortran.dg/pr91959.f90: New test.
+
+2019-10-04  Rafael Tsuha  <rafael.tsuha@usp.br>
+
+        * gcc.dg/sinhovercosh-1.c: New test.
+
+2019-10-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/c11-builtins-1.c, gcc.dg/c2x-builtins-1.c,
+	gcc.dg/dfp/c2x-builtins-dfp-1.c: New tests.
+
+2019-10-04  Mark Eggleston <mark.eggleston@codethink.com>
+
+	* gfortran.dg/auto_in_equiv_1.f90: Replaced.
+	* gfortran.dg/auto_in_equiv_2.f90: Replaced.
+	* gfortran.dg/auto_in_equiv_3.f90: Deleted.
+
+2019-10-04  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/torture/simd-abi-8.c: Use -mlittle-endian.
+	Check that there are no Q register saves or restores.
+
+2019-10-04  Richard Biener  <rguenther@suse.de>
+
+	* gcc.c-torture/execute/loop-3.c: Fix undefined behavior.
+
+2019-10-04  Yuliang Wang  <yuliang.wang@arm.com>
+
+	* gcc.target/aarch64/sve2/shracc_1.c: Tighten scan-assembler-nots
+	to avoid matching scalar code.
+
+2019-10-04  Tobias Burnus  <tobias@codesourcery.com>
+
+	* gfortran.dg/use_without_only_1.f90: Update column num in dg-warning.
+
+2019-10-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/71504
+	* g++.dg/cpp0x/constexpr-array21.C: New test.
+	* g++.dg/cpp1y/constexpr-array7.C: New test.
+	* g++.dg/cpp1z/constexpr-array1.C: New test.
+
+2019-10-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/71504
+	* g++.dg/cpp0x/constexpr-array20.C: New test.
+
+2019-10-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91974
+	* g++.dg/cpp1z/eval-order5.C: New test.
+
+2019-10-03  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91497
+	* gfortran.dg/pr91497.f90: New test.
+
+2019-10-03  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/tree-ssa/pr61034.C: Add --param max-inline-insns-single-O2=200.
+
+2019-10-03  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
+
+	PR target/91769
+	* gcc.target/mips/pr91769.c: New test.
+
+2019-10-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.dg/cpp0x/gen-attrs-67.C: Expect constructor priorities error
+	on any !init_priority target.
+
+2019-10-03  Thomas Koenig <tkoenig@gcc.gnu.org>
+
+	PR fortran/84487
+	* gfortran.dg/typebound_call_22.f03: xfail.
+
+2019-10-03 Mark Eggleston <mark.eggleston@codethink.com>
+
+	* gfortran.dg/bad_operands.f90: New test.
+	* gfortran.dg/character mismatch.f90: New test.
+	* gfortran.dg/compare_interfaces.f90: New test.
+	* gfortran.dg/hollerith_to_char_parameter_1.f90: New test.
+	* gfortran.dg/hollerith_to_char_parameter_2.f90: New test.
+	* gfortran.dg/widechar_intrinsics_1.f90: Checked for specific character
+	type names instead of "Type of argument".
+	* gfortran.dg/widechar_intrinsics_2.f90: Checked for specific character
+	type names instead of "Type of argument".
+	* gfortran.dg/widechar_intrinsics_3.f90: Checked for specific character
+	type names instead of "Type of argument".
+
+2019-10-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/cr-decimal-dig-2.c: New test.
+	* gcc.dg/limits-width-2.c: New test.  Based on limits-width-1.c.
+	* gcc.dg/stdint-width-2.c: New test.  Based on stdint-width-1.c.
+
+2019-10-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/integral-array-size-1.C: New.
+	* g++.dg/cpp0x/alias-decl-1.C: Test location(s) too.
+	* g++.dg/init/new43.C: Likewise.
+	* g++.dg/lookup/friend12.C: Likewise.
+	* g++.dg/lookup/pr79766.C: Likewise.
+	* g++.dg/lookup/pr84375.C: Likewise.
+	* g++.dg/other/new-size-type.C: Likewise.
+
+2019-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/ext/constexpr-attr-cleanup1.C: New test.
+
+2019-10-02  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/80936
+	* gcc.dg/Wnonnull-2.c: New test.
+	* gcc.dg/Wnonnull-3.c: New test.
+	* gcc.dg/nonnull-3.c: Expect more warnings.
+
+2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91784
+	* gfortran.dg/pr91784.f90: New test.
+
+2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91785
+	* gfortran.dg/pr91785.f90: New test.
+
+2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91942
+	* gfortran.dg/pr91587.f90: Update dg-error regex.
+	* gfortran.dg/pr91942.f90: New test.
+
+2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91943
+	gfortran.dg/pr91943.f90
+
+2019-10-02  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/tree-ssa/pr53844.C: Add -fno-inline-functions --param
+	max-inline-insns-single-O2=200.
+	* gcc.c-torture/execute/builtins/builtins.exp: Add
+	-fno-inline-functions to additional_flags.
+	* gcc.dg/ipa/inline-7.c: Add -fno-inline-functions.
+	* gcc.dg/optimize-bswapsi-5.c: Add -fno-inline-functions.
+	* gcc.dg/tree-ssa/ssa-thread-12.c: Add --param
+	early-inlining-insns-O2=14 -fno-inline-functions; revert previous
+	change.
+	* gcc.dg/winline-3.c: Use --param max-inline-insns-single-O2=1
+	--param inline-min-speedup-O2=100
+	instead of --param max-inline-insns-single=1 --param
+	inline-min-speedup=100
+
+2019-10-02  Alexander Monakov  <amonakov@ispras.ru>
+
+	PR rtl-optimization/87047
+	* gcc.dg/pr87047.c: New test.
+
+2019-10-02  Martin Jambor  <mjambor@suse.cz>
+
+	PR testsuite/91842
+	* gcc.dg/ipa/ipa-sra-19.c: Skip on powerpc.
+
+2019-10-02  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt82.adb: New test.
+	* gnat.dg/opt82_pkg.ads: New helper.
+
+2019-10-02  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/mips/call-clobbered-3.c: Remove skip for -Os.
+	* gcc.target/mips/call-clobbered-4.c: Delete.
+
+2019-10-02  Tobias Burnus  <tobias@codesourcery.com>
+
+	* gfortran.dg/gomp/is_device_ptr-1.f90: New.
+
+2019-10-02  Richard Biener  <rguenther@suse.de>
+
+	PR c++/91606
+	* g++.dg/torture/pr91606.C: New testcase.
+
+2019-10-02  Tobias Burnus  <tobias@codesourcery.com>
+
+	* gfortran.dg/goacc/asyncwait-1.f95: Handle new error message.
+	* gfortran.dg/goacc/asyncwait-2.f95: Likewise.
+	* gfortran.dg/goacc/asyncwait-3.f95: Likewise.
+	* gfortran.dg/goacc/asyncwait-4.f95: Likewise.
+	* gfortran.dg/goacc/default-2.f: Likewise.
+	* gfortran.dg/goacc/enter-exit-data.f95: Likewise.
+	* gfortran.dg/goacc/if.f95: Likewise.
+	* gfortran.dg/goacc/list.f95: Likewise.
+	* gfortran.dg/goacc/literal.f95: Likewise.
+	* gfortran.dg/goacc/loop-2-kernels-tile.f95: Likewise.
+	* gfortran.dg/goacc/loop-2-parallel-tile.f95: Likewise.
+	* gfortran.dg/goacc/loop-7.f95: Likewise.
+	* gfortran.dg/goacc/parallel-kernels-clauses.f95: Likewise.
+	* gfortran.dg/goacc/routine-6.f90: Likewise.
+	* gfortran.dg/goacc/several-directives.f95: Likewise.
+	* gfortran.dg/goacc/sie.f95: Likewise.
+	* gfortran.dg/goacc/tile-1.f90: Likewise.
+	* gfortran.dg/goacc/update-if_present-2.f90: Likewise.
+	* gfortran.dg/gomp/declare-simd-1.f90: Likewise.
+	* gfortran.dg/gomp/pr29759.f90: Likewise.
+
+2019-10-02  Tobias Burnus  <tobias@codesourcery.com>
+
+	* libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90: New.
+
+2019-10-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91940
+	* gcc.dg/vect/vect-bswap16.c: Add -msse4 on x86, run on all targets,
+	expect vectorized 1 loops message on both vect_bswap and sse4_runtime
+	targets.
+	* gcc.dg/vect/vect-bswap16a.c: New test.
+
+2019-10-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/asm-scope-1.c, gcc.dg/cpp/c11-scope-1.c,
+	gcc.dg/cpp/c17-scope-1.c, gcc.dg/cpp/c2x-scope-1.c,
+	gcc.dg/cpp/c2x-scope-2.c, gcc.dg/cpp/c90-scope-1.c,
+	gcc.dg/cpp/c94-scope-1.c, gcc.dg/cpp/c99-scope-1.c,
+	gcc.dg/cpp/gnu11-scope-1.c, gcc.dg/cpp/gnu17-scope-1.c,
+	gcc.dg/cpp/gnu89-scope-1.c, gcc.dg/cpp/gnu99-scope-1.c: New tests.
+
+2019-10-01  David Malcolm  <dmalcolm@redhat.com>
+
+	* gcc.dg/plugin/diagnostic_group_plugin.c (test_begin_group_cb):
+	Clear the prefix before emitting the "END GROUP" line.
+	* gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
+	(custom_diagnostic_finalizer): Temporarily clear prefix when
+	calling diagnostic_show_locus, rather than destroying it
+	afterwards.
+
+2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-10.c: New testcase.
+	* gcc.dg/tree-ssa/alias-access-path-11.c: New testcase.
+
+2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/lto/odr-6_0.C: New testcase.
+	* g++.dg/lto/odr-6_1.c: New testcase.
+
+2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/tree-ssa/ssa-thread-12.c: Fix warning introduced by my
+	previous change.
+
+2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/tree-ssa/pr61034.C: Set early-inlining-insns-O2=14.
+	* g++.dg/tree-ssa/pr8781.C: Likewise.
+	* g++.dg/warn/Wstringop-truncation-1.C: Likewise.
+	* gcc.dg/ipa/pr63416.c: likewise.
+	* gcc.dg/vect/pr66142.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-thread-12.c: Mark compure_idf inline.
+
+2019-10-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91925
+	* g++.dg/conversion/packed2.C: New test.
+
+2019-10-01  Bill Schmidt  <wschmdit@linux.ibm.com>
+
+	* gcc.target/powerpc/pr91275.c: New.
+
+2019-10-01  Alexandre Oliva <oliva@adacore.com>
+
+	* gcc.dg/torture/pr41094.c: Introduce intermediate variable.
+
+	PR debug/91507
+	* gcc.dg/debug/dwarf2/array-0.c: New.
+	* gcc.dg/debug/dwarf2/array-1.c: New.
+	* gcc.dg/debug/dwarf2/array-2.c: New.
+	* gcc.dg/debug/dwarf2/array-3.c: New.
+	* g++.dg/debug/dwarf2/array-0.C: New.
+	* g++.dg/debug/dwarf2/array-1.C: New.
+	* g++.dg/debug/dwarf2/array-2.C: New.  Based on libstdc++-v3's
+	src/c++98/pool_allocator.cc:__pool_alloc_base::_S_heap_size.
+	* g++.dg/debug/dwarf2/array-3.C: New.  Based on
+	gcc's config/i386/i386-features.c:xlogue_layout::s_instances.
+	* g++.dg/debug/dwarf2/array-4.C: New.
+
+2019-10-01  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/diag-aka-1.c (T): Turn into a pointer typedef.
+	(foo): Update accordingly.
+	* gcc.dg/diag-aka-4.c: New test.
+
+2019-10-01  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/diag-aka-3.c: New test.
+	* gcc.target/aarch64/diag_aka_1.c: New test.
+	* g++.dg/diagnostic/aka4.C: New test.
+
+2019-10-01  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/torture/simd-abi-10.c: New test.
+	* gcc.target/aarch64/torture/simd-abi-11.c: Likewise.
+
+2019-09-30  Yuliang Wang  <yuliang.wang@arm.com>
+
+	* gcc.dg/vect/vect-sdiv-pow2-1.c: New test.
+	* gcc.target/aarch64/sve/asrdiv_1.c: As above.
+	* lib/target-supports.exp (check_effective_target_vect_sdiv_pow2_si):
+	Return true for AArch64 with SVE.
+
+2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/torture/simd-abi-9.c: New test.
+
+2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/torture/simd-abi-8.c: New test.
+
+2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/Wincompatible-pointer-types-1.c (f1): Expect only one
+	space between the comma and "...".
+
+2019-09-30  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/91853
+	* gcc.dg/ipa/pr91853.c: New test.
+
+2019-09-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/91931
+	* gcc.target/i386/pr91931.c: New test.
+
+2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91641
+	* gfortran.dg/pr91641.f90: New test.
+
+2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91714
+	* gfortran.dg/dec_type_print_3.f90: Update dg-error regex.
+	* gfortran.dg/pr91714.f90: New test.
+
+2019-09-29  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91726
+	* gfortran.dg/coarray_poly_9.f90 : New test.
+
+2019-09-29  Kewen Lin  <linkw@gcc.gnu.org>
+
+	* gcc.target/powerpc/conv-vectorize-1.c: New test.
+	* gcc.target/powerpc/conv-vectorize-2.c: New test.
+
+2019-09-28  Steven G. Kargl  <kargl@gcc.ngu.org>
+
+	PR fortran/91802
+	* gfortran.dg/pr91802.f90: New test.
+
+2019-09-28  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91864
+	* gcc/testsuite/gfortran.dg/pr91864.f90
+
+2019-09-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91889 - follow-up fix for DR 2352.
+	* g++.dg/cpp0x/ref-bind3.C: Add dg-error.
+	* g++.dg/cpp0x/ref-bind4.C: New test.
+	* g++.dg/cpp0x/ref-bind5.C: New test.
+	* g++.dg/cpp0x/ref-bind6.C: New test.
+	* g++.old-deja/g++.pt/spec35.C: Revert earlier change.
+
+	PR c++/91921 - stray warning with -Woverloaded-virtual.
+	* g++.dg/warn/Woverloaded-2.C: New.
+	* g++.dg/warn/Woverloaded-2.h: New.
+	* g++.dg/warn/pr61945.C: Turn dg-warning into dg-message.
+	* g++.old-deja/g++.mike/warn6.C: Likewise.
+	* g++.old-deja/g++.warn/virt1.C: Likewise.
+
+	PR c++/91923 - failure-to-SFINAE with class type NTTP in C++17.
+	* g++.dg/cpp0x/nontype5.C: New test.
+
+2019-09-28  Alan Modra  <amodra@gmail.com>
+
+	PR testsuite/91676
+	PR rtl-optimization/91656
+	* gcc.dg/torture/pr91656-1.c: Correct for big and pdp endian.
+	* gcc.dg/torture/pr91656-2.c: Likewise.
+	* gcc.dg/torture/pr91656-3.c: Likewise.
+
+2019-09-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88203
+	* c-c++-common/gomp/pr88203-1.c: New test.
+	* c-c++-common/gomp/pr88203-2.c: New test.
+	* c-c++-common/gomp/pr88203-3.c: New test.
+
+	PR middle-end/91920
+	* c-c++-common/gomp/pr91920.c: New test.
+
+	PR target/91919
+	* gcc.c-torture/compile/pr91919.c: New test.
+
+2019-09-27  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* gfortran.dg/associate_48.f90: Fix a dg directive.
+	* gfortran.dg/auto_in_equiv_1.f90: Ditto.
+	* gfortran.dg/auto_in_equiv_2.f90: Ditto.
+	* gfortran.dg/lto/pr87689_0.f: Ditto.
+
+2019-09-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91885
+	* gcc.dg/pr91885.c (__int64_t): Change from long to long long.
+	(__uint64_t): Change from unsigned long to unsigned long long.
+
+2019-09-27  Yuliang Wang  <yuliang.wang@arm.com>
+
+	* gcc.target/aarch64/sve2/shracc_1.c: New test.
+
+2019-09-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.dg/cpp/ucs.c: Add test for new warning and adjust.
+	* gcc.dg/cpp/utf8-5byte-1.c: Add -w to the options.
+	* gcc.dg/attr-alias-5.c: Likewise.
+	* g++.dg/cpp/ucn-1.C: Add test for new warning.
+	* g++.dg/cpp2a/ucn1.C: New test.
+
+2019-09-26  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* gcc.target/xtensa/pr91880.c: New test case.
+	* gcc.target/xtensa/xtensa.exp: New test suite.
+
+2019-09-26  Will Schmidt <will_schmidt@vnet.ibm.com>
+
+	* gcc.target/powerpc/pure-builtin-redundant-load.c:  New.
+
+2019-09-26  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/91897
+	* gcc.target/i386/pr91897.c: New testcase.
+
+2019-09-26  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91914
+	* gcc.dg/strlenopt-79.c: New test.
+
+2019-09-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/arm/acle/simd32.c: Update test.
+
+2019-09-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_simd32_ok_nocache): New procedure.
+	(check_effective_target_arm_simd32_ok): Likewise.
+	(add_options_for_arm_simd32): Likewise.
+	* gcc.target/arm/acle/simd32.c: New test.
+
+2019-09-26  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/arm/fp16-compile-alt-3.c: Expect (__fp16) -2.0
+	to be written as a negative short rather than a positive one.
+	* gcc.target/arm/fp16-compile-ieee-3.c: Likewise.
+
+2019-09-26  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/91885
+	* gcc.dg/pr91885.c: New test.
+
+2019-09-25  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91877 - ICE with converting member of packed struct.
+	* g++.dg/conversion/packed1.C: New test.
+
+2019-09-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91896
+	* gcc.dg/torture/pr91896.c: New testcase.
+
+2019-09-25  Martin Liska  <mliska@suse.cz>
+
+	* gcc.target/s390/pr91014.c: Move to ...
+	* gcc.dg/pr91014.c: ... this.
+
+2019-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/redeclaration-1.C: New.
+	* g++.dg/lookup/extern-c-hidden.C: Test location(s) too.
+	* g++.dg/lookup/extern-c-redecl.C: Likewise.
+	* g++.dg/lookup/extern-c-redecl6.C: Likewise.
+	* g++.old-deja/g++.other/using9.C: Likewise.
+
+2019-09-23  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91570
+	* gcc.dg/pr91570.c: New test.
+
+2019-09-24  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91868 - improve -Wshadow location.
+	* g++.dg/warn/Wshadow-16.C: New test.
+
+	PR c++/91845 - ICE with invalid pointer-to-member.
+	* g++.dg/cpp1y/pr91845.C: New test.
+
+2019-09-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/nosplit-di-const-volatile_1.c: New test.
+
+2019-09-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91866
+	* gcc.dg/tree-ssa/pr91866.c: New test.
+
+2019-09-24  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/91831
+	* g++.dg/ipa/pr91831.C: New test.
+
+2019-09-24  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/91832
+	* gcc.dg/ipa/pr91832.c: New test.
+
+2019-09-24  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/torture/20190924-1.c: New testcase.
+
+2019-09-23  Maciej W. Rozycki  <macro@wdc.com>
+
+	* lib/gnat.exp (gnat_target_compile): Pass the `ada' option to
+	`target_compile'.
+
+2019-09-23  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/pr68724.C: Check location(s) too.
+	* g++.dg/cpp0x/variadic38.C: Likewise.
+	* g++.dg/cpp1z/nontype2.C: Likewise.
+	* g++.dg/parse/explicit1.C: Likewise.
+	* g++.dg/template/crash11.C: Likewise.
+	* g++.dg/template/non-dependent8.C: Likewise.
+	* g++.dg/template/nontype-array1.C: Likewise.
+	* g++.dg/template/nontype3.C: Likewise.
+	* g++.dg/template/nontype8.C: Likewise.
+	* g++.dg/template/partial5.C: Likewise.
+	* g++.dg/template/spec33.C: Likewise.
+	* g++.old-deja/g++.pt/memtemp64.C: Likewise.
+	* g++.old-deja/g++.pt/spec20.C: Likewise.
+	* g++.old-deja/g++.pt/spec21.C: Likewise.
+	* g++.old-deja/g++.robertl/eb103.C: Likewise.
+
+2019-09-23  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_vfp_ok_nocache): New.
+	(check_effective_target_arm_vfp_ok): Rewrite.
+	(add_options_for_arm_vfp): New.
+	(add_options_for_sqrt_insn): Add options for arm.
+	* gcc.target/arm/attr-neon-builtin-fail2.c: Use dg-add-options.
+	* gcc.target/arm/short-vfp-1.c: Likewise.
+
+2019-09-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91844 - Implement CWG 2352, Similar types and reference binding.
+	* g++.dg/cpp0x/pr33930.C: Add dg-error.
+	* g++.dg/cpp0x/ref-bind1.C: New test.
+	* g++.dg/cpp0x/ref-bind2.C: New test.
+	* g++.dg/cpp0x/ref-bind3.C: New test.
+	* g++.old-deja/g++.pt/spec35.C: Remove dg-error.
+
+2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.dg/ucnid-5-utf8.c: Skip unless ucn is supported.
+
+2019-09-23  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91729
+	* gfortran.dg/select_rank_2.f90 : Add two more errors in foo2.
+	* gfortran.dg/select_rank_3.f90 : New test.
+
+2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gnat.dg/system_info1.adb: Sort dg-do target list.
+	Add *-*-solaris2.*.
+
+2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/compile_time1.ads: New test.
+	* gnat.dg/specs/compile_time1_pkg.ads: New helper.
+
+2019-09-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91819 - ICE with operator++ and enum.
+	* g++.dg/other/operator4.C: New test.
+
+2019-09-21  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/91830
+	* gcc/testsuite/gcc.dg/Warray-bounds-47.c: New test.
+
+2019-09-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/30277
+	* g++.dg/expr/bitfield14.C (struct S): Use signed long long instead
+	of signed long.
+	(foo): Use long long instead of long.
+
+2019-09-21  Marek Polacek  <polacek@redhat.com>
+
+	DR 2345 - Jumping across initializers in init-statements and conditions.
+	* g++.dg/cpp1z/init-statement10.C: New test.
+
+2019-09-21  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/cond_convert_1.c: Remove XFAILs.
+	* gcc.target/aarch64/sve/cond_convert_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
+
+2019-09-20  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/naked-1.c: Alter options to use non-
+	PIC codegen for m32 Darwin.
+
+2019-09-20  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/78260
+	* gfortran.dg/goacc/parameter.f95: Change
+	dg-error as it is now detected earlier.
+	* gfortran.dg/goacc/pr85701.f90: Modify to
+	use a separate result variable.
+	* gfortran.dg/goacc/pr78260.f90: New.
+	* gfortran.dg/goacc/pr78260-2.f90: New.
+	* gfortran.dg/gomp/pr78260.f90: New.
+	* gfortran.dg/gomp/pr78260-2.f90: New.
+	* gfortran.dg/gomp/pr78260-3.f90: New.
+
+2019-09-20  Olivier Hainque  <hainque@adacore.com>
+
+	* gnat.dg/system_info1.adb: Restrict to *-*-linux* and *-*-mingw*.
+
+2019-09-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.dg/pr91269.c: New test.
+
+2019-09-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.dg/typedef-var-1.c: New test.
+	* gcc.dg/typedef-var-2.c: Likewise.
+
+2019-09-20  Martin Jambor  <mjambor@suse.cz>
+
+	* g++.dg/ipa/pr81248.C: Adjust dg-options and dump-scan.
+	* gcc.dg/ipa/ipa-sra-1.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-10.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-11.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-3.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-4.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-5.c: Likewise.
+	* gcc.dg/ipa/ipacost-2.c: Disable ipa-sra.
+	* gcc.dg/ipa/ipcp-agg-9.c: Likewise.
+	* gcc.dg/ipa/pr78121.c: Adjust scan pattern.
+	* gcc.dg/ipa/vrp1.c: Likewise.
+	* gcc.dg/ipa/vrp2.c: Likewise.
+	* gcc.dg/ipa/vrp3.c: Likewise.
+	* gcc.dg/ipa/vrp7.c: Likewise.
+	* gcc.dg/ipa/vrp8.c: Likewise.
+	* gcc.dg/noreorder.c: use noipa attribute instead of noinline.
+	* gcc.dg/ipa/20040703-wpa.c: New test.
+	* gcc.dg/ipa/ipa-sra-12.c: New test.
+	* gcc.dg/ipa/ipa-sra-13.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-14.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-15.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-16.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-17.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-18.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-19.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-20.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-21.c: Likewise.
+	* gcc.dg/ipa/ipa-sra-22.c: Likewise.
+	* gcc.dg/sso/ipa-sra-1.c: Likewise.
+	* g++.dg/ipa/ipa-sra-2.C: Likewise.
+	* g++.dg/ipa/ipa-sra-3.C: Likewise.
+	* gcc.dg/tree-ssa/ipa-cp-1.c: Make return value used.
+	* g++.dg/ipa/devirt-19.C: Add missing return, add -fipa-cp-clone
+	option.
+	* g++.dg/lto/devirt-19_0.C: Add -fipa-cp-clone option.
+	* gcc.dg/ipa/ipa-sra-2.c: Removed.
+	* gcc.dg/ipa/ipa-sra-6.c: Likewise.
+
+2019-09-19  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/91631
+	* /c-c++-common/Warray-bounds-3.c: Correct expected offsets.
+	* /c-c++-common/Warray-bounds-4.c: Same.
+	* gcc.dg/Warray-bounds-39.c: Remove xfails.
+	* gcc.dg/Warray-bounds-45.c: New test.
+	* gcc.dg/Warray-bounds-46.c: New test.
+
+2019-09-19  Lewis Hyatt  <lhyatt@gmail.com>
+
+	PR c/67224
+	* c-c++-common/cpp/ucnid-2011-1-utf8.c: New test.
+	* g++.dg/cpp/ucnid-1-utf8.C: New test.
+	* g++.dg/cpp/ucnid-2-utf8.C: New test.
+	* g++.dg/cpp/ucnid-3-utf8.C: New test.
+	* g++.dg/cpp/ucnid-4-utf8.C: New test.
+	* g++.dg/other/ucnid-1-utf8.C: New test.
+	* gcc.dg/cpp/ucnid-1-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-10-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-11-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-12-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-13-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-14-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-15-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-2-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-3-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-4-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-6-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-7-utf8.c: New test.
+	* gcc.dg/cpp/ucnid-9-utf8.c: New test.
+	* gcc.dg/ucnid-1-utf8.c: New test.
+	* gcc.dg/ucnid-10-utf8.c: New test.
+	* gcc.dg/ucnid-11-utf8.c: New test.
+	* gcc.dg/ucnid-12-utf8.c: New test.
+	* gcc.dg/ucnid-13-utf8.c: New test.
+	* gcc.dg/ucnid-14-utf8.c: New test.
+	* gcc.dg/ucnid-15-utf8.c: New test.
+	* gcc.dg/ucnid-16-utf8.c: New test.
+	* gcc.dg/ucnid-2-utf8.c: New test.
+	* gcc.dg/ucnid-3-utf8.c: New test.
+	* gcc.dg/ucnid-4-utf8.c: New test.
+	* gcc.dg/ucnid-5-utf8.c: New test.
+	* gcc.dg/ucnid-6-utf8.c: New test.
+	* gcc.dg/ucnid-7-utf8.c: New test.
+	* gcc.dg/ucnid-8-utf8.c: New test.
+	* gcc.dg/ucnid-9-utf8.c: New test.
+
+2019-09-19  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/pr89313.c: Test for __POWERPC__ in addition to
+	__powerpc__ in register name selection.
+
+2019-09-19  Richard Henderson  <richard.henderson@linaro.org>
+
+	* gcc.target/aarch64/atomic-op-acq_rel.c: Use -mno-outline-atomics.
+	* gcc.target/aarch64/atomic-comp-swap-release-acquire.c: Likewise.
+	* gcc.target/aarch64/atomic-op-acquire.c: Likewise.
+	* gcc.target/aarch64/atomic-op-char.c: Likewise.
+	* gcc.target/aarch64/atomic-op-consume.c: Likewise.
+	* gcc.target/aarch64/atomic-op-imm.c: Likewise.
+	* gcc.target/aarch64/atomic-op-int.c: Likewise.
+	* gcc.target/aarch64/atomic-op-long.c: Likewise.
+	* gcc.target/aarch64/atomic-op-relaxed.c: Likewise.
+	* gcc.target/aarch64/atomic-op-release.c: Likewise.
+	* gcc.target/aarch64/atomic-op-seq_cst.c: Likewise.
+	* gcc.target/aarch64/atomic-op-short.c: Likewise.
+	* gcc.target/aarch64/atomic_cmp_exchange_zero_reg_1.c: Likewise.
+	* gcc.target/aarch64/atomic_cmp_exchange_zero_strong_1.c: Likewise.
+	* gcc.target/aarch64/sync-comp-swap.c: Likewise.
+	* gcc.target/aarch64/sync-op-acquire.c: Likewise.
+	* gcc.target/aarch64/sync-op-full.c: Likewise.
+
+2019-09-19  Feng Xue  <fxue@os.amperecomputing.com>
+
+	* gcc.dg/ipa/pr91089.c: Add a new function and pattern.
+
+2019-09-19  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91812
+	* gcc.dg/torture/pr91812.c: New testcase.
+
+2019-09-19  Tom Tromey  <tromey@adacore.com>
+
+	* gnat.dg/bias1.adb: New testcase.
+
+2019-09-19  Steve Baird  <baird@adacore.com>
+
+	* gnat.dg/annotation1.adb: New testcase.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/inline21.adb, gnat.dg/inline21_g.ads,
+	gnat.dg/inline21_h.adb, gnat.dg/inline21_h.ads,
+	gnat.dg/inline21_q.ads: New testcase.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/inline20.adb, gnat.dg/inline20_g.adb,
+	gnat.dg/inline20_g.ads, gnat.dg/inline20_h.ads,
+	gnat.dg/inline20_i.ads, gnat.dg/inline20_q-io.ads,
+	gnat.dg/inline20_q.ads, gnat.dg/inline20_r.ads: New testcase.
+
+2019-09-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/generic2-child.ads, gnat.dg/generic2-io_any.adb,
+	gnat.dg/generic2-io_any.ads, gnat.dg/generic2.ads: New testcase.
+
+2019-09-19  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/global2.adb, gnat.dg/global2.ads: New testcase.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/access9.adb: New testcase.
+
+2019-09-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate14.adb, gnat.dg/predicate14.ads: New
+	testcase.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/generic_inst13.adb,
+	gnat.dg/generic_inst13_pkg-nested_g.ads,
+	gnat.dg/generic_inst13_pkg-ops_g.ads,
+	gnat.dg/generic_inst13_pkg.ads: New testcase.
+
+2019-09-19  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/concat3.adb: New testcase.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/pack26.adb: New testcase.
+
+2019-09-19  Hongtao Liu <hongtao.liu@intel.com>
+
+	PR target/87007
+	* gcc.target/i386/pr87007-3.c: New test.
+
+2019-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/90878
+	* gcc.target/i386/pr90878.c: New test.
+
+2019-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/91446
+	* gcc.target/i386/pr91446.c: New test.
+
+2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/warn31.adb, gnat.dg/warn31.ads: New testcase.
+
+2019-09-18  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/fixedpnt8.adb: New testcase.
+
+2019-09-18  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/discr58.adb: New testcase.
+
+2019-09-18  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/warn30.adb, gnat.dg/warn30.ads: New testcase.
+
+2019-09-18  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/access8.adb, gnat.dg/access8_pkg.adb,
+	gnat.dg/access8_pkg.ads: New testcase.
+
+2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/aggr28.adb: New testcase.
+
+2019-09-18  Steve Baird  <baird@adacore.com>
+
+	* gnat.dg/ai12_0086_example.adb: New testcase.
+
+2019-09-18  Nicolas Roche  <roche@adacore.com>
+
+	* gnat.dg/float_value2.adb: New testcase.
+
+2019-09-18  Vadim Godunko  <godunko@adacore.com>
+
+	* gnat.dg/expect4.adb: New testcase.
+
+2019-09-18  Steve Baird  <baird@adacore.com>
+
+	* gnat.dg/ghost7.adb, gnat.dg/ghost7.ads: New testcase.
+
+2019-09-18  Olivier Hainque  <hainque@adacore.com>
+
+	* gnat.dg/system_info1.adb: New testcase.
+
+2019-09-18  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/containers1.adb, gnat.dg/containers1.ads: New
+	testcase.
+
+2019-09-18  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/i386/pr82361-1.c (f1, f2, f3, f4, f5, f6): Force
+	"c" to be in %rax and "d" to be in %rdx.
+	* gcc.target/i386/pr82361-2.c: Expect 4 instances of "movl\t%edx".
+
+2019-19-17  Christophe Lyon  <christophe.lyon@st.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_arch_FUNC_ok): Add v4t_arm, v4t_thumb,
+	v5t_arm, v5t_thumb, v5te_arm, v5te_thumb, v6_arm, v6_thumb,
+	v6k_arm, v6k_thumb, v6z_arm, v6z_thumb.
+	Add -mfloat-abi=softfp to v4t, v5t, v5te, v6, v6k, v6z.
+	Remove early exit for -marm.
+	* gcc.target/arm/armv6-unaligned-load-ice.c: Add arm_arch
+	effective-target.
+	* gcc.target/arm/attr-unaligned-load-ice.c: Likewise.
+	* gcc.target/arm/ftest-armv4-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv4t-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv4t-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv5t-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv5t-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv5te-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv5te-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv6-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv6-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv6k-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv6k-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv6m-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv6t2-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv6t2-thumb.c: Likewise.
+	* gcc.target/arm/ftest-armv6z-arm.c: Likewise.
+	* gcc.target/arm/ftest-armv6z-thumb.c: Likewise.
+	* gcc.target/arm/g2.c: Likewise.
+	* gcc.target/arm/macro_defs1.c: Likewise.
+	* gcc.target/arm/pr59858.c: Likewise.
+	* gcc.target/arm/pr65647-2.c: Likewise.
+	* gcc.target/arm/pr79058.c: Likewise.
+	* gcc.target/arm/pr83712.c: Likewise.
+	* gcc.target/arm/pragma_arch_switch_2.c: Likewise.
+	* gcc.target/arm/scd42-1.c: Likewise.
+	* gcc.target/arm/scd42-2.c: Likewise.
+	* gcc.target/arm/scd42-3.c: Likewise.
+	* gcc.c-torture/compile/pr82096.c: Fix arm_arch effective-target.
+	* gcc.target/arm/attr_arm-err.c: Likewise.
+	* gcc.target/arm/di-longlong64-sync-withldrexd.c: Likewise.
+
+2019-09-17  Feng Xue  <fxue@os.amperecomputing.com>
+
+	PR ipa/91089
+	* gcc.dg/ipa/pr91089.c: New test.
+
+2019-09-17  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91588
+	* gfortran.dg/associate_49.f90 : New test.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/fixedpnt7.adb: New testcase.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/multfixed.adb: New testcase.
+
+2019-09-17  Vadim Godunko  <godunko@adacore.com>
+
+	* gnat.dg/expect3.adb: New testcase.
+
+2019-09-17  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate13.adb, gnat.dg/predicate13.ads: New
+	testcase.
+
+2019-09-17  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/limited4.adb: New testcase.
+
+2019-09-17  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/pack25.adb: New testcase.
+
+2019-09-16  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/ext/int128-6.C: New.
+	* c-c++-common/pr68107.c: Test location(s).
+	* g++.dg/other/large-size-array.C: Likewise.
+	* g++.dg/template/dtor2.C: Likewise.
+	* g++.dg/template/error9.C: Likewise.
+	* g++.dg/tls/diag-2.C: Likewise.
+	* g++.dg/tls/diag-4.C: Likewise.
+	* g++.dg/tls/diag-5.C: Likewise.
+	* g++.old-deja/g++.pt/memtemp71.C: Likewise.
+
+2019-09-16  Li Jia He  <helijia@linux.ibm.com>
+	    Qi Feng  <ffengqi@linux.ibm.com>
+
+	PR middle-end/88784
+	* gcc.dg/pr88784-1.c: New testcase.
+	* gcc.dg/pr88784-2.c: New testcase.
+	* gcc.dg/pr88784-3.c: New testcase.
+	* gcc.dg/pr88784-4.c: New testcase.
+	* gcc.dg/pr88784-5.c: New testcase.
+	* gcc.dg/pr88784-6.c: New testcase.
+	* gcc.dg/pr88784-7.c: New testcase.
+	* gcc.dg/pr88784-8.c: New testcase.
+	* gcc.dg/pr88784-9.c: New testcase.
+	* gcc.dg/pr88784-10.c: New testcase.
+	* gcc.dg/pr88784-11.c: New testcase.
+	* gcc.dg/pr88784-12.c: New testcase.
+
+2019-09-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91756
+	PR tree-optimization/87132
+	* gcc.dg/tree-ssa/ssa-fre-81.c: New testcase.
+
+2019-09-15  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91740 - ICE with constexpr call and ?: in ARRAY_REF.
+	* g++.dg/cpp1y/var-templ63.C: New test.
+
+2019-09-15  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_neon_fp16_hw)
+	(check_effective_target_arm_fp16_hw): Use check_runtime
+	instead of check_runtime_nocache.
+
+2019-09-15  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91727
+	* gfortran.dg/pr91727.f90: New test.
+
+2019-09-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91550
+	* gfortran.dg/do_subscript_6.f90: New test.
+
+2019-09-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91556
+	* gfortran.dg/warn_argument_mismatch_1.f90: Remove.
+
+2019-09-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91557
+	PR fortran/91556
+	* gfortran.dg/argument_checking_20.f90: New test.
+	* gfortran.dg/argument_checking_21.f90: New test.
+	* gfortran.dg/argument_checking_22.f90: New test.
+	* gfortran.dg/argument_checking_23.f90: New test.
+	* gfortran.dg/warn_unused_dummy_argument_5.f90: New test.
+	* gfortran.dg/bessel_3.f90: Add pattern for type mismatch.
+	* gfortran.dg/g77/20010519-1.f: Adjust dg-warning messages to new
+	handling.
+	* gfortran.dg/pr24823.f: Likewise.
+	* gfortran.dg/pr39937.f: Likewise.
+
+2019-09-14  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR testsuite/83889
+	* g++.dg/vect/pr87914.cc: Remove explicit dg-do run.
+
+2019-09-14  Kewen Lin  <linkw@gcc.gnu.org>
+
+	PR middle-end/80791
+	* gcc.dg/tree-ssa/ivopts-3.c: Adjust for doloop change.
+	* gcc.dg/tree-ssa/ivopts-lt.c: Likewise.
+	* gcc.dg/tree-ssa/pr32044.c: Likewise.
+
+2019-09-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91566
+	* gfortran.dg/pr91566.f90:
+
+2019-09-13  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR fortran/91716
+	* gfortran.dg/pr91716.f90: New test.
+
+2019-09-13  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91717
+	* gfortran.dg/dependency_55.f90 : New test.
+
+2019-09-12  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR tree-optimization/89386
+	* gcc.target/i386/pr89386.c: New test.
+	* gcc.target/i386/pr89386-1.c: Ditto.
+
+2019-09-12  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91750
+	* gcc.dg/vect/pr91750.c: New testcase.
+
+2019-09-12  Yuliang Wang  <yuliang.wang@arm.com>
+
+	PR tree-optimization/89386
+	* testsuite/gcc.target/aarch64/sve2/mulhrs_1.c: New test.
+	* testsuite/gcc.dg/vect/vect-mulhrs-1.c: As above.
+	* testsuite/gcc.dg/vect/vect-mulhrs-2.c: As above.
+	* testsuite/gcc.dg/vect/vect-mulhrs-3.c: As above.
+	* testsuite/gcc.dg/vect/vect-mulhrs-4.c: As above.
+	* doc/sourcebuild.texi (vect_mulhrs_hi): Document new target selector.
+	* testsuite/lib/target-supports.exp
+	(check_effective_target_vect_mulhrs_hi): Return true for AArch64
+	with SVE2.
+
+2019-09-11  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR testsuite/83889
+	* gcc.dg/vect/pr81740-2.c: Remove explicit dg-do run.
+	* gcc.dg/vect/pr88598-1.c: Likewise.
+	* gcc.dg/vect/pr88598-2.c: Likewise.
+	* gcc.dg/vect/pr88598-3.c: Likewise.
+	* gcc.dg/vect/pr88598-4.c: Likewise.
+	* gcc.dg/vect/pr88598-5.c: Likewise.
+	* gcc.dg/vect/pr88598-6.c: Likewise.
+	* gcc.dg/vect/pr89440.c: Likewise.
+	* gcc.dg/vect/pr90018.c: Likewise.
+	* gcc.dg/vect/pr91293-1.c: Likewise.
+	* gcc.dg/vect/pr91293-2.c: Likewise.
+	* gcc.dg/vect/pr91293-3.c: Likewise.
+
+2019-09-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91553
+	* gfortran.dg/pr91553.f90: New test.
+
+2019-09-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91642
+	* gfortran.dg/pr91642.f90: New test.
+
+2019-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89435
+	PR rtl-optimization/89795
+	PR rtl-optimization/91720
+	* gcc.dg/pr89435.c: New test.
+	* gcc.dg/pr89795.c: New test.
+	* gcc.dg/pr91720.c: New test.
+
+2019-09-11  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90387
+	* gcc.dg/Warray-bounds-44.c: New testcase.
+
+2019-09-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.target/sparc/20161111-1.c: XFAIL redundant zero-extension test.
+
+2019-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91723
+	* gcc.dg/vect/vect-fma-3.c: New test.
+
+	PR middle-end/91725
+	* gcc.c-torture/compile/pr91725.c: New test.
+
+2019-09-11  Richard Biener  <rguenther@suse.de>
+
+	Revert
+	2019-09-09  Barnaby Wilks  <barnaby.wilks@arm.com>
+
+	* gcc.dg/fold-binary-math-casts.c: New test.
+
+2019-09-10  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91673 - ICE with noexcept in alias-declaration.
+	* g++.dg/cpp1z/using7.C: New test.
+	* g++.dg/cpp1z/using8.C: New test.
+
+2019-09-10  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91705 - constexpr evaluation rejects ++/-- on floats.
+	* g++.dg/cpp1y/constexpr-incr2.C: New test.
+
+2019-09-10  David Edelsohn  <dje.gcc@gmail.com>
+
+	* gfortran.dg/default_format_1.f90: Remove XFAIL AIX.
+	* gfortran.dg/default_format_denormal_1.f90: Same.
+
+2019-09-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91680
+	* gcc.dg/tree-ssa/pr91680.c: New test.
+	* g++.dg/torture/pr91680.C: New test.
+
+2019-09-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/enum29.C: Test location(s) too.
+	* g++.dg/cpp0x/lambda/lambda-ice10.C: Likewise.
+	* g++.dg/cpp2a/constinit3.C: Likewise.
+	* g++.dg/ext/desig4.C: Likewise.
+	* g++.dg/ext/label10.C: Likewise.
+	* g++.old-deja/g++.other/dtor3.C: Likewise.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+
+	* lib/target-supports.exp (check_effective_target_static): Disable
+	for ARM FDPIC target.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+
+	* gcc.target/arm/pr43698.c (bswap_32): Rename as my_bswap_32.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+
+	* g++.dg/cpp0x/noexcept03.C: Add pie_enabled.
+	* g++.dg/ipa/devirt-c-7.C: Likewise.
+	* g++.dg/ipa/ivinline-1.C: Likewise.
+	* g++.dg/ipa/ivinline-2.C: Likewise.
+	* g++.dg/ipa/ivinline-3.C: Likewise.
+	* g++.dg/ipa/ivinline-4.C: Likewise.
+	* g++.dg/ipa/ivinline-5.C: Likewise.
+	* g++.dg/ipa/ivinline-7.C: Likewise.
+	* g++.dg/ipa/ivinline-8.C: Likewise.
+	* g++.dg/ipa/ivinline-9.C: Likewise.
+	* g++.dg/tls/pr79288.C: Likewise.
+	* gcc.dg/addr_equal-1.c: Likewise.
+	* gcc.dg/const-1.c: Likewise.
+	* gcc.dg/ipa/pure-const-1.c: Likewise.
+	* gcc.dg/noreturn-8.c: Likewise.
+	* gcc.dg/pr33826.c: Likewise.
+	* gcc.dg/torture/ipa-pta-1.c: Likewise.
+	* gcc.dg/tree-ssa/alias-2.c: Likewise.
+	* gcc.dg/tree-ssa/ipa-split-5.c: Likewise.
+	* gcc.dg/tree-ssa/loadpre6.c: Likewise.
+	* gcc.dg/uninit-19.c: Likewise.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+
+	* g++.dg/abi/forced.C: Add *-*-uclinux*.
+	* g++.dg/abi/guard2.C: Likewise.
+	* g++.dg/ext/cleanup-10.C: Likewise.
+	* g++.dg/ext/cleanup-11.C: Likewise.
+	* g++.dg/ext/cleanup-8.C: Likewise.
+	* g++.dg/ext/cleanup-9.C: Likewise.
+	* g++.dg/ext/sync-4.C: Likewise.
+	* g++.dg/ipa/comdat.C: Likewise.
+	* gcc.dg/20041106-1.c: Likewise.
+	* gcc.dg/cleanup-10.c: Likewise.
+	* gcc.dg/cleanup-11.c: Likewise.
+	* gcc.dg/cleanup-8.c: Likewise.
+	* gcc.dg/cleanup-9.c: Likewise.
+	* gcc.dg/fdata-sections-1.c: Likewise.
+	* gcc.dg/fdata-sections-2.c: Likewise.
+	* gcc.dg/pr39323-1.c: Likewise.
+	* gcc.dg/pr39323-2.c: Likewise.
+	* gcc.dg/pr39323-3.c: Likewise.
+	* gcc.dg/pr65780-1.c: Likewise.
+	* gcc.dg/pr65780-2.c: Likewise.
+	* gcc.dg/pr67338.c: Likewise.
+	* gcc.dg/pr78185.c: Likewise.
+	* gcc.dg/pr83100-1.c: Likewise.
+	* gcc.dg/pr83100-4.c: Likewise.
+	* gcc.dg/strlenopt-12g.c: Likewise.
+	* gcc.dg/strlenopt-14g.c: Likewise.
+	* gcc.dg/strlenopt-14gf.c: Likewise.
+	* gcc.dg/strlenopt-16g.c: Likewise.
+	* gcc.dg/strlenopt-17g.c: Likewise.
+	* gcc.dg/strlenopt-18g.c: Likewise.
+	* gcc.dg/strlenopt-1f.c: Likewise.
+	* gcc.dg/strlenopt-22g.c: Likewise.
+	* gcc.dg/strlenopt-2f.c: Likewise.
+	* gcc.dg/strlenopt-31g.c: Likewise.
+	* gcc.dg/strlenopt-33g.c: Likewise.
+	* gcc.dg/strlenopt-4g.c: Likewise.
+	* gcc.dg/strlenopt-4gf.c: Likewise.
+	* gcc.dg/strncmp-2.c: Likewise.
+	* gcc.dg/struct-ret-3.c: Likewise.
+	* gcc.dg/torture/pr69760.c: Likewise.
+	* gcc.target/arm/div64-unwinding.c: Likewise.
+	* gcc.target/arm/stack-checking.c: Likewise.
+	* gcc.target/arm/synchronize.c: Likewise.
+	* gcc.target/arm/pr66912.c: Add arm*-*-uclinuxfdpiceabi.
+	* lib/target-supports.exp (check_effective_target_pie): Likewise.
+	(check_effective_target_sync_long_long_runtime): Likewise.
+	(check_effective_target_sync_int_long): Likewise.
+	(check_effective_target_sync_char_short): Likewise.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+
+	* gcc.target/arm/eliminate.c: Accept only nonpic targets.
+	* g++.dg/other/anon5.C: Likewise.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+	Mickaël Guêné <mickael.guene@st.com>
+
+	* gcc.target/arm/interrupt-1.c: Add scan-assembler pattern for
+	arm*-*-uclinuxfdpiceabi.
+	* gcc.target/arm/interrupt-2.c: Likewise.
+	* gcc.target/arm/pr70830.c: Likewise.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+	Mickaël Guêné <mickael.guene@st.com>
+
+	* gcc.dg/20020312-2.c: Skip on arm*-*-uclinuxfdpiceabi.
+	* gcc.target/arm/20051215-1.c: Likewise.
+	* gcc.target/arm/mmx-1.c: Likewise.
+	* gcc.target/arm/pr19599.c: Likewise.
+	* gcc.target/arm/pr40887.c: Likewise.
+	* gcc.target/arm/pr61948.c: Likewise.
+	* gcc.target/arm/pr77933-1.c: Likewise.
+	* gcc.target/arm/pr77933-2.c: Likewise.
+	* gcc.target/arm/sibcall-1.c: Likewise.
+	* gcc.target/arm/data-rel-2.c: Likewise.
+	* gcc.target/arm/data-rel-3.c: Likewise.
+	* gcc.target/arm/tail-long-call: Likewise.
+	* gcc.target/arm/tlscall.c: Likewise.
+	* gcc.target/arm/vfp-longcall-apcs: Likewise.
+	* gcc.target/arm/ivopts-2.c: Skip object-size test on
+	arm*-*-uclinuxfdpiceabi.
+	* gcc.target/arm/ivopts-3.c: Likewise.
+	* gcc.target/arm/ivopts-4.c: Likewise.
+	* gcc.target/arm/ivopts-5.c: Likewise.
+	* gcc.target/arm/pr43597.c: Likewise.
+	* gcc.target/arm/pr43920-2.c: Likewise.
+	* gcc.target/arm/pr45701-1.c: Skip scan-assembler on
+	arm*-*-uclinuxfdpiceabi.
+	* gcc.target/arm/pr45701-2.c: Likewise.
+	* gcc.target/arm/stack-red-zone.c: Likewise.
+
+2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
+	Mickaël Guêné <mickael.guene@st.com>
+
+	* gcc.target/arm/fp16-aapcs-2.c: Adjust scan-assembler-times.
+	* gcc.target/arm/fp16-aapcs-4.c: Likewise.
+
+2019-09-09  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/84374 - diagnose invalid uses of decltype(auto).
+	* g++.dg/cpp1y/auto-fn57.C: New test.
+
+2019-09-09  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/rlwinm-0.c: Adjust expected instruction counts.
+	* gcc.target/powerpc/rlwinm-1.c: Ditto.
+	* gcc.target/powerpc/rlwinm-2.c: Ditto.
+
+2019-09-09  Barnaby Wilks  <barnaby.wilks@arm.com>
+
+	* gcc.dg/fold-binary-math-casts.c: New test.
+
+2019-09-09  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/87853
+	* gcc.target/i386/pr87853.c: New test.
+
+	PR target/91704
+	* gcc.target/i386/pr91704.c: New test.
+
+2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+	* gcc.dg/builtins-config.h: eBPF doesn't support C99 standard
+	functions.
+	* gcc.c-torture/compile/20101217-1.c: Add a function prototype for
+	printf.
+	* gcc.c-torture/compile/20000211-1.c: Skip if target bpf-*-*.
+	* gcc.c-torture/compile/poor.c: Likewise.
+	* gcc.c-torture/compile/pr25311.c: Likewise.
+	* gcc.c-torture/compile/pr39928-1.c: Likewise.
+	* gcc.c-torture/compile/pr70061.c: Likewise.
+	* gcc.c-torture/compile/920501-7.c: Likewise.
+	* gcc.c-torture/compile/20000403-1.c: Likewise.
+	* gcc.c-torture/compile/20001226-1.c: Likewise.
+	* gcc.c-torture/compile/20030903-1.c: Likewise.
+	* gcc.c-torture/compile/20031125-1.c: Likewise.
+	* gcc.c-torture/compile/20040101-1.c: Likewise.
+	* gcc.c-torture/compile/20040317-2.c: Likewise.
+	* gcc.c-torture/compile/20040726-1.c: Likewise.
+	* gcc.c-torture/compile/20051216-1.c: Likewise.
+	* gcc.c-torture/compile/900313-1.c: Likewise.
+	* gcc.c-torture/compile/920625-1.c: Likewise.
+	* gcc.c-torture/compile/930421-1.c: Likewise.
+	* gcc.c-torture/compile/930623-1.c: Likewise.
+	* gcc.c-torture/compile/961004-1.c: Likewise.
+	* gcc.c-torture/compile/980504-1.c: Likewise.
+	* gcc.c-torture/compile/980816-1.c: Likewise.
+	* gcc.c-torture/compile/990625-1.c: Likewise.
+	* gcc.c-torture/compile/DFcmp.c: Likewise.
+	* gcc.c-torture/compile/HIcmp.c: Likewise.
+	* gcc.c-torture/compile/HIset.c: Likewise.
+	* gcc.c-torture/compile/QIcmp.c: Likewise.
+	* gcc.c-torture/compile/QIset.c: Likewise.
+	* gcc.c-torture/compile/SFset.c: Likewise.
+	* gcc.c-torture/compile/SIcmp.c: Likewise.
+	* gcc.c-torture/compile/SIset.c: Likewise.
+	* gcc.c-torture/compile/UHIcmp.c: Likewise.
+	* gcc.c-torture/compile/UQIcmp.c: Likewise.
+	* gcc.c-torture/compile/USIcmp.c: Likewise.
+	* gcc.c-torture/compile/consec.c: Likewise.
+	* gcc.c-torture/compile/limits-fndefn.c: Likewise.
+	* gcc.c-torture/compile/lll.c: Likewise.
+	* gcc.c-torture/compile/parms.c: Likewise.
+	* gcc.c-torture/compile/pass.c: Likewise.
+	* gcc.c-torture/compile/pp.c: Likewise.
+	* gcc.c-torture/compile/pr32399.c: Likewise.
+	* gcc.c-torture/compile/pr34091.c: Likewise.
+	* gcc.c-torture/compile/pr34688.c: Likewise.
+	* gcc.c-torture/compile/pr37258.c: Likewise.
+	* gcc.c-torture/compile/pr37327.c: Likewise.
+	* gcc.c-torture/compile/pr37381.c: Likewise.
+	* gcc.c-torture/compile/pr37669-2.c: Likewise.
+	* gcc.c-torture/compile/pr37669.c: Likewise.
+	* gcc.c-torture/compile/pr37742-3.c: Likewise.
+	* gcc.c-torture/compile/pr44063.c: Likewise.
+	* gcc.c-torture/compile/pr48596.c: Likewise.
+	* gcc.c-torture/compile/pr51856.c: Likewise.
+	* gcc.c-torture/compile/pr54428.c: Likewise.
+	* gcc.c-torture/compile/pr54713-1.c: Likewise.
+	* gcc.c-torture/compile/pr54713-2.c: Likewise.
+	* gcc.c-torture/compile/pr54713-3.c: Likewise.
+	* gcc.c-torture/compile/pr55921.c: Likewise.
+	* gcc.c-torture/compile/pr70240.c: Likewise.
+	* gcc.c-torture/compile/pr70355.c: Likewise.
+	* gcc.c-torture/compile/pr82052.c: Likewise.
+	* gcc.c-torture/compile/pr83487.c: Likewise.
+	* gcc.c-torture/compile/pr86122.c: Likewise.
+	* gcc.c-torture/compile/pret-arg.c: Likewise.
+	* gcc.c-torture/compile/regs-arg-size.c: Likewise.
+	* gcc.c-torture/compile/structret.c: Likewise.
+	* gcc.c-torture/compile/uuarg.c: Likewise.
+	* gcc.dg/20001009-1.c: Likewise.
+	* gcc.dg/20020418-1.c: Likewise.
+	* gcc.dg/20020426-2.c: Likewise.
+	* gcc.dg/20020430-1.c: Likewise.
+	* gcc.dg/20040306-1.c: Likewise.
+	* gcc.dg/20040622-2.c: Likewise.
+	* gcc.dg/20050603-2.c: Likewise.
+	* gcc.dg/20050629-1.c: Likewise.
+	* gcc.dg/20061026.c: Likewise.
+	* gcc.dg/Warray-bounds-3.c: Likewise.
+	* gcc.dg/Warray-bounds-30.c: Likewise.
+	* gcc.dg/Wframe-larger-than-2.c: Likewise.
+	* gcc.dg/Wframe-larger-than.c: Likewise.
+	* gcc.dg/Wrestrict-11.c: Likewise.
+	* gcc.c-torture/compile/20000804-1.c: Likewise.
+
+2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+	* lib/target-supports.exp (check_effective_target_trampolines):
+	Adapt to eBPF.
+	(check_effective_target_indirect_jumps): Likewise.
+	(check_effective_target_nonlocal_goto): Likewise.
+	(check_effective_target_global_constructor): Likewise.
+	(check_effective_target_return_address): Likewise.
+
+2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+	* gcc.target/bpf/bpf.exp: New file.
+	* gcc.target/bpf/builtin-load.c: Likewise.
+	* cc.target/bpf/constant-calls.c: Likewise.
+	* gcc.target/bpf/diag-funargs.c: Likewise.
+	* gcc.target/bpf/diag-funargs-2.c: Likewise.
+	* gcc.target/bpf/diag-funargs-3.c: Likewise.
+	* gcc.target/bpf/diag-indcalls.c: Likewise.
+	* gcc.target/bpf/helper-bind.c: Likewise.
+	* cc.target/bpf/helper-bpf-redirect.c: Likewise.
+	* gcc.target/bpf/helper-clone-redirect.c: Likewise.
+	* gcc.target/bpf/helper-csum-diff.c: Likewise.
+	* gcc.target/bpf/helper-csum-update.c: Likewise.
+	* gcc.target/bpf/helper-current-task-under-cgroup.c: Likewise.
+	* gcc.target/bpf/helper-fib-lookup.c: Likewise.
+	* gcc.target/bpf/helper-get-cgroup-classid.c: Likewise.
+	* gcc.target/bpf/helper-get-current-cgroup-id.c: Likewise.
+	* gcc.target/bpf/helper-get-current-comm.c: Likewise.
+	* gcc.target/bpf/helper-get-current-pid-tgid.c: Likewise.
+	* gcc.target/bpf/helper-get-current-task.c: Likewise.
+	* gcc.target/bpf/helper-get-current-uid-gid.c: Likewise.
+	* gcc.target/bpf/helper-get-hash-recalc.c: Likewise.
+	* gcc.target/bpf/helper-get-listener-sock.c: Likewise.
+	* gcc.target/bpf/helper-get-local-storage.c: Likewise.
+	* gcc.target/bpf/helper-get-numa-node-id.c: Likewise.
+	* gcc.target/bpf/helper-get-prandom-u32.c: Likewise.
+	* gcc.target/bpf/helper-get-route-realm.c: Likewise.
+	* gcc.target/bpf/helper-get-smp-processor-id.c: Likewise.
+	* gcc.target/bpf/helper-get-socket-cookie.c: Likewise.
+	* gcc.target/bpf/helper-get-socket-uid.c: Likewise.
+	* gcc.target/bpf/helper-getsockopt.c: Likewise.
+	* gcc.target/bpf/helper-get-stack.c: Likewise.
+	* gcc.target/bpf/helper-get-stackid.c: Likewise.
+	* gcc.target/bpf/helper-ktime-get-ns.c: Likewise.
+	* gcc.target/bpf/helper-l3-csum-replace.c: Likewise.
+	* gcc.target/bpf/helper-l4-csum-replace.c: Likewise.
+	* gcc.target/bpf/helper-lwt-push-encap.c: Likewise.
+	* gcc.target/bpf/helper-lwt-seg6-action.c: Likewise.
+	* gcc.target/bpf/helper-lwt-seg6-adjust-srh.c: Likewise.
+	* gcc.target/bpf/helper-lwt-seg6-store-bytes.c: Likewise.
+	* gcc.target/bpf/helper-map-delete-elem.c: Likewise.
+	* gcc.target/bpf/helper-map-lookup-elem.c: Likewise.
+	* gcc.target/bpf/helper-map-peek-elem.c: Likewise.
+	* gcc.target/bpf/helper-map-pop-elem.c: Likewise.
+	* gcc.target/bpf/helper-map-push-elem.c: Likewise.
+	* gcc.target/bpf/helper-map-update-elem.c: Likewise.
+	* gcc.target/bpf/helper-msg-apply-bytes.c: Likewise.
+	* gcc.target/bpf/helper-msg-cork-bytes.c: Likewise.
+	* gcc.target/bpf/helper-msg-pop-data.c: Likewise.
+	* gcc.target/bpf/helper-msg-pull-data.c: Likewise.
+	* gcc.target/bpf/helper-msg-push-data.c: Likewise.
+	* gcc.target/bpf/helper-msg-redirect-hash.c: Likewise.
+	* gcc.target/bpf/helper-msg-redirect-map.c: Likewise.
+	* gcc.target/bpf/helper-override-return.c: Likewise.
+	* gcc.target/bpf/helper-perf-event-output.c: Likewise.
+	* gcc.target/bpf/helper-perf-event-read.c: Likewise.
+	* gcc.target/bpf/helper-perf-event-read-value.c: Likewise.
+	* gcc.target/bpf/helper-perf-prog-read-value.c: Likewise.
+	* gcc.target/bpf/helper-probe-read.c: Likewise.
+	* gcc.target/bpf/helper-probe-read-str.c: Likewise.
+	* gcc.target/bpf/helper-probe-write-user.c: Likewise.
+	* gcc.target/bpf/helper-rc-keydown.c: Likewise.
+	* gcc.target/bpf/helper-rc-pointer-rel.c: Likewise.
+	* gcc.target/bpf/helper-rc-repeat.c: Likewise.
+	* gcc.target/bpf/helper-redirect-map.c: Likewise.
+	* gcc.target/bpf/helper-set-hash.c: Likewise.
+	* gcc.target/bpf/helper-set-hash-invalid.c: Likewise.
+	* gcc.target/bpf/helper-setsockopt.c: Likewise.
+	* gcc.target/bpf/helper-skb-adjust-room.c: Likewise.
+	* gcc.target/bpf/helper-skb-cgroup-id.c: Likewise.
+	* gcc.target/bpf/helper-skb-change-head.c: Likewise.
+	* gcc.target/bpf/helper-skb-change-proto.c: Likewise.
+	* gcc.target/bpf/helper-skb-change-tail.c: Likewise.
+	* gcc.target/bpf/helper-skb-change-type.c: Likewise.
+	* gcc.target/bpf/helper-skb-ecn-set-ce.c: Likewise.
+	* gcc.target/bpf/helper-skb-get-tunnel-key.c: Likewise.
+	* gcc.target/bpf/helper-skb-get-tunnel-opt.c: Likewise.
+	* gcc.target/bpf/helper-skb-get-xfrm-state.c: Likewise.
+	* gcc.target/bpf/helper-skb-load-bytes.c: Likewise.
+	* gcc.target/bpf/helper-skb-load-bytes-relative.c: Likewise.
+	* gcc.target/bpf/helper-skb-pull-data.c: Likewise.
+	* gcc.target/bpf/helper-skb-set-tunnel-key.c: Likewise.
+	* gcc.target/bpf/helper-skb-set-tunnel-opt.c: Likewise.
+	* gcc.target/bpf/helper-skb-store-bytes.c: Likewise.
+	* gcc.target/bpf/helper-skb-under-cgroup.c: Likewise.
+	* gcc.target/bpf/helper-skb-vlan-pop.c: Likewise.
+	* gcc.target/bpf/helper-skb-vlan-push.c: Likewise.
+	* gcc.target/bpf/helper-skc-lookup-tcp.c: Likewise.
+	* gcc.target/bpf/helper-sk-fullsock.c: Likewise.
+	* gcc.target/bpf/helper-sk-lookup-tcp.c: Likewise.
+	* gcc.target/bpf/helper-sk-lookup-upd.c: Likewise.
+	* gcc.target/bpf/helper-sk-redirect-hash.c: Likewise.
+	* gcc.target/bpf/helper-sk-redirect-map.c: Likewise.
+	* gcc.target/bpf/helper-sk-release.c: Likewise.
+	* gcc.target/bpf/helper-sk-select-reuseport.c: Likewise.
+	* gcc.target/bpf/helper-sk-storage-delete.c: Likewise.
+	* gcc.target/bpf/helper-sk-storage-get.c: Likewise.
+	* gcc.target/bpf/helper-sock-hash-update.c: Likewise.
+	* gcc.target/bpf/helper-sock-map-update.c: Likewise.
+	* gcc.target/bpf/helper-sock-ops-cb-flags-set.c: Likewise.
+	* gcc.target/bpf/helper-spin-lock.c: Likewise.
+	* gcc.target/bpf/helper-spin-unlock.c: Likewise.
+	* gcc.target/bpf/helper-strtol.c: Likewise.
+	* gcc.target/bpf/helper-strtoul.c: Likewise.
+	* gcc.target/bpf/helper-sysctl-get-current-value.c: Likewise.
+	* gcc.target/bpf/helper-sysctl-get-name.c: Likewise.
+	* gcc.target/bpf/helper-sysctl-get-new-value.c: Likewise.
+	* gcc.target/bpf/helper-sysctl-set-new-value.c: Likewise.
+	* gcc.target/bpf/helper-tail-call.c: Likewise.
+	* gcc.target/bpf/helper-tcp-check-syncookie.c: Likewise.
+	* gcc.target/bpf/helper-tcp-sock.c: Likewise.
+	* gcc.target/bpf/helper-trace-printk.c: Likewise.
+	* gcc.target/bpf/helper-xdp-adjust-head.c: Likewise.
+	* gcc.target/bpf/helper-xdp-adjust-meta.c: Likewise.
+	* gcc.target/bpf/helper-xdp-adjust-tail.c: Likewise.
+	* gcc.target/bpf/skb-ancestor-cgroup-id.c: Likewise.
+	* gcc.target/bpf/sync-fetch-and-add.c: Likewise.
+
+2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+	* lib/target-supports.exp (check_effective_target_indirect_calls):
+	New proc.
+	* gcc.c-torture/compile/20010102-1.c: Annotate with
+	dg-require-effective-target indirect_calls.
+	* gcc.c-torture/compile/20010107-1.c: Likewise.
+	* gcc.c-torture/compile/20011109-1.c: Likewise.
+	* gcc.c-torture/compile/20011218-1.c: Likewise.
+	* gcc.c-torture/compile/20011229-1.c: Likewise.
+	* gcc.c-torture/compile/20020129-1.c: Likewise.
+	* gcc.c-torture/compile/20020320-1.c: Likewise.
+	* gcc.c-torture/compile/20020706-1.c: Likewise.
+	* gcc.c-torture/compile/20020706-2.c: Likewise.
+	* gcc.c-torture/compile/20021205-1.c: Likewise.
+	* gcc.c-torture/compile/20030921-1.c: Likewise.
+	* gcc.c-torture/compile/20031023-1.c: Likewise.
+	* gcc.c-torture/compile/20031023-2.c: Likewise.
+	* gcc.c-torture/compile/20031023-3.c: Likewise.
+	* gcc.c-torture/compile/20031023-4.c: Likewise.
+	* gcc.c-torture/compile/20040614-1.c: Likewise.
+	* gcc.c-torture/compile/20040909-1.c: Likewise.
+	* gcc.c-torture/compile/20050122-1.c: Likewise.
+	* gcc.c-torture/compile/20050202-1.c: Likewise.
+	* gcc.c-torture/compile/20060208-1.c: Likewise.
+	* gcc.c-torture/compile/20081108-1.c: Likewise.
+	* gcc.c-torture/compile/20150327.c: Likewise.
+	* gcc.c-torture/compile/920428-2.c: Likewise.
+	* gcc.c-torture/compile/920928-5.c: Likewise.
+	* gcc.c-torture/compile/930117-1.c: Likewise.
+	* gcc.c-torture/compile/930607-1.c: Likewise.
+	* gcc.c-torture/compile/991213-2.c: Likewise.
+	* gcc.c-torture/compile/callind.c: Likewise.
+	* gcc.c-torture/compile/calls-void.c: Likewise.
+	* gcc.c-torture/compile/calls.c: Likewise.
+	* gcc.c-torture/compile/pr21840.c: Likewise.
+	* gcc.c-torture/compile/pr32139.c: Likewise.
+	* gcc.c-torture/compile/pr35607.c: Likewise.
+	* gcc.c-torture/compile/pr37433-1.c: Likewise.
+	* gcc.c-torture/compile/pr37433.c: Likewise.
+	* gcc.c-torture/compile/pr39941.c: Likewise.
+	* gcc.c-torture/compile/pr40080.c: Likewise.
+	* gcc.c-torture/compile/pr43635.c: Likewise.
+	* gcc.c-torture/compile/pr43791.c: Likewise.
+	* gcc.c-torture/compile/pr43845.c: Likewise.
+	* gcc.c-torture/compile/pr44043.c: Likewise.
+	* gcc.c-torture/compile/pr51694.c: Likewise.
+	* gcc.c-torture/compile/pr77754-2.c: Likewise.
+	* gcc.c-torture/compile/pr77754-3.c: Likewise.
+	* gcc.c-torture/compile/pr77754-4.c: Likewise.
+	* gcc.c-torture/compile/pr89663-2.c: Likewise.
+	* gcc.c-torture/compile/pta-1.c: Likewise.
+	* gcc.c-torture/compile/stack-check-1.c: Likewise.
+	* gcc.dg/Walloc-size-larger-than-18.c: Likewise.
+
+2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+	* gcc.c-torture/compile/20000609-1.c: Annotate with
+	dg-require-stack-size.
+	* gcc.c-torture/compile/20000804-1.c: Likewise.
+	* gcc.c-torture/compile/20020304-1.c: Likewise.
+	* gcc.c-torture/compile/20020604-1.c: Likewise.
+	* gcc.c-torture/compile/20021015-1.c: Likewise.
+	* gcc.c-torture/compile/20050303-1.c: Likewise.
+	* gcc.c-torture/compile/20060421-1.c: Likewise.
+	* gcc.c-torture/compile/20071207-1.c: Likewise.
+	* gcc.c-torture/compile/20080903-1.c: Likewise.
+	* gcc.c-torture/compile/20121027-1.c: Likewise.
+	* gcc.c-torture/compile/20151204.c: Likewise.
+	* gcc.c-torture/compile/920501-12.c: Likewise.
+	* gcc.c-torture/compile/920501-4.c: Likewise.
+	* gcc.c-torture/compile/920723-1.c: Likewise.
+	* gcc.c-torture/compile/921202-1.c: Likewise.
+	* gcc.c-torture/compile/931003-1.c: Likewise.
+	* gcc.c-torture/compile/931004-1.c: Likewise.
+	* gcc.c-torture/compile/950719-1.c: Likewise.
+	* gcc.c-torture/compile/951222-1.c: Likewise.
+	* gcc.c-torture/compile/990517-1.c: Likewise.
+	* gcc.c-torture/compile/bcopy.c: Likewise.
+	* gcc.c-torture/compile/pr23929.c: Likewise.
+	* gcc.c-torture/compile/pr25310.c: Likewise.
+	* gcc.c-torture/compile/pr34458.c: Likewise.
+	* gcc.c-torture/compile/pr39937.c: Likewise.
+	* gcc.c-torture/compile/pr41181.c: Likewise.
+	* gcc.c-torture/compile/pr41634.c: Likewise.
+	* gcc.c-torture/compile/pr43415.c: Likewise.
+	* gcc.c-torture/compile/pr43417.c: Likewise.
+	* gcc.c-torture/compile/pr44788.c: Likewise.
+	* gcc.c-torture/compile/sound.c: Likewise.
+
+2019-09-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* gcc.target/arm/pr91684.c: Use effective-target arm_prefer_ldrd_strd.
+
+2019-09-07  David Edelsohn  <dje.gcc@gmail.com>
+
+	* g++.dg/cpp2a/decomp2.C: Add TLS options.
+	* gcc.target/powerpc/pr88233.c: Limit to lp64.
+
+2019-09-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91665
+	* gcc.dg/vect/pr91665.c: New test.
+
+2019-09-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR target/91684
+	* gcc.target/arm/pr91684.c: New test.
+
+2019-09-06  Ian Lance Taylor  <iant@golang.org>
+
+	* go.test/test/fixedbugs/bug369.go: Update to match libgo update
+	to Go 1.13beta1.
+
+2019-09-06  David Edelsohn  <dje.gcc@gmail.com>
+
+	* gcc.dg/torture/inf-compare-1.c: Skip AIX.
+	* gcc.dg/torture/inf-compare-2.c: Skip AIX.
+	* gcc.dg/torture/inf-compare-3.c: Skip AIX.
+	* gcc.dg/torture/inf-compare-4.c: Skip AIX.
+	* gcc.dg/torture/pr52451.c: Skip AIX.
+	* gcc.dg/torture/pr68264.c: Skip AIX
+	* gcc.dg/torture/pr91323.c: Skip AIX.
+
+	* g++.dg/warn/Warray-bounds-4.C: Skip AIX.
+	* g++.dg/warn/Warray-bounds-8.C: Skip AIX.
+	* g++.dg/opt/flifetime-dse2.C: XFAIL AIX.
+	* g++.dg/opt/flifetime-dse4.C: XFAIL AIX.
+
+2019-09-06  Caroline Tice  <cmtice@google.com>
+
+	PR testsuite/91670
+	* g++.dg/ubsan/pr59415.C: Disable LTO, since test uses
+	-fvtable-verify, and the two options are no longer allowed
+	together.
+
+2019-09-06  Nathan Sidwell  <nathan@acm.org>
+
+	* c-c++-common/cpp/line-1.c: New.
+
+2019-09-06  Martin Liska  <mliska@suse.cz>
+
+	PR c++/91125
+	* g++.dg/parse/repo1.C: Remove.
+	* g++.dg/rtti/repo1.C: Remove.
+	* g++.dg/template/repo1.C: Remove.
+	* g++.dg/template/repo10.C: Remove.
+	* g++.dg/template/repo11.C: Remove.
+	* g++.dg/template/repo2.C: Remove.
+	* g++.dg/template/repo3.C: Remove.
+	* g++.dg/template/repo4.C: Remove.
+	* g++.dg/template/repo5.C: Remove.
+	* g++.dg/template/repo6.C: Remove.
+	* g++.dg/template/repo7.C: Remove.
+	* g++.dg/template/repo8.C: Remove.
+	* g++.dg/template/repo9.C: Remove.
+	* g++.old-deja/g++.pt/instantiate4.C: Remove.
+	* g++.old-deja/g++.pt/instantiate6.C: Remove.
+	* g++.old-deja/g++.pt/repo1.C: Remove.
+	* g++.old-deja/g++.pt/repo2.C: Remove.
+	* g++.old-deja/g++.pt/repo3.C: Remove.
+	* g++.old-deja/g++.pt/repo4.C: Remove.
+	* lib/g++.exp: Remove removal of repo files.
+	* lib/gcc-dg.exp: Likewise.
+	* lib/obj-c++.exp: Likewise.
+
+2019-09-05  Jakub Jelinek  <jakub@redhat.com>
+	    Jim Wilson  <jimw@sifive.com>
+
+	PR target/91635
+	* gcc.c-torture/execute/pr91635.c: New test.
+	* gcc.target/riscv/shift-shift-4.c: New test.
+	* gcc.target/riscv/shift-shift-5.c: New test.
+
+2019-09-05  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/91496
+	* gfortran.dg/directive_unroll_5.f90: Adjust error message.
+
+2019-09-05  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91660
+	* gfortran.dg/pdt_4.f03: Fix invalid code.
+        * gfortran.dg/pr91660_1.f90: New test.
+	* gfortran.dg/pr91660_2.f90: Ditto.
+
+2019-09-05  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91644 - ICE with constinit in function template.
+	* g++.dg/cpp2a/constinit13.C: New test.
+
+2019-09-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91001
+	PR middle-end/91105
+	PR middle-end/91106
+	* gcc.c-torture/compile/pr91001.c: New test.
+
+2019-09-05  Richard Biener  <rguenther@suse.de>
+
+	PR rtl-optimization/91656
+	* gcc.dg/torture/pr91656-1.c: New testcase.
+	* gcc.dg/torture/pr91656-2.c: Likewise.
+	* gcc.dg/torture/pr91656-3.c: Likewise.
+
+2019-09-05  Nathan Sidwell  <nathan@acm.org>
+
+	PR preprocessor/91639
+	* c-c++-common/cpp/pr91639.c: New.
+	* c-c++-common/cpp/pr91639-one.h: New.
+	* c-c++-common/cpp/pr91639-two.h: New.
+
+2019-09-05  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR middle-end/91577
+	* gfortran.dg/pr91577.f90: New test, taken from temporary_1.f90.
+
+2019-09-04  Steven G. Kargl  <kargl@gcvc.gnu.org>
+
+	PR fortran/91650
+	* gfortran.dg/pr91650_1.f90: New test.
+	* gfortran.dg/pr91650_2.f90: Ditto.
+
+2019-09-04  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/cpp0x/initlist-deduce.C: Don't use -fdeduce-init-list.  Remove
+	dg-warning.  Add dg-error.
+
+2019-09-04  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR c/78736
+	* gcc.dg/Wenum-conversion.c: New test-case.
+
+2019-09-03  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/data-attributes-2.c: New test.
+	* gcc.target/msp430/function-attributes-4.c: Update dg-warning
+	strings.
+	* gcc.target/msp430/region-attribute-misuse.c: Likewise.
+
+2019-09-03  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+	PR tree-optimization/91504
+	gcc.dg/tree-ssa/pr91504.c: New test.
+
+2019-09-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/91604
+	* gcc.target/i386/pr91604.c: New test.
+
+2019-09-03  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* lib/compat.exp: Remove references to spu.
+	* lib/fortran-torture.exp: Likewise.
+	* lib/gcc-dg.exp: Likewise.
+	* lib/gfortran.exp: Likewise.
+	* lib/target-supports.exp: Likewise.
+	* lib/target-utils.exp: Likewise.
+
+	* c-c++-common/torture/complex-sign-add.c: Remove references to spu.
+	* c-c++-common/torture/complex-sign-mixed-add.c: Likewise.
+	* c-c++-common/torture/complex-sign-mixed-div.c: Likewise.
+	* c-c++-common/torture/complex-sign-mixed-mul.c: Likewise.
+	* c-c++-common/torture/complex-sign-mixed-sub.c: Likewise.
+	* c-c++-common/torture/complex-sign-mul-minus-one.c: Likewise.
+	* c-c++-common/torture/complex-sign-mul-one.c: Likewise.
+	* c-c++-common/torture/complex-sign-mul.c: Likewise.
+	* c-c++-common/torture/complex-sign-sub.c: Likewise.
+
+	* g++.dg/opt/temp1.C: Remove references to spu.
+	* g++.dg/opt/vt1.C: Likewise.
+	* g++.dg/torture/type-generic-1.C: Likewise.
+	* g++.dg/warn/pr30551-2.C: Likewise.
+	* g++.dg/warn/pr30551.C: Likewise.
+	* g++.old-deja/g++.jason/thunk2.C: Likewise.
+	* g++.old-deja/g++.other/comdat5.C: Likewise.
+	* g++.old-deja/g++.other/local-alloc1.C: Likewise.
+
+	* gcc.c-torture/compile/20001226-1.c: Remove references to spu.
+	* gcc.c-torture/execute/20030222-1.c: Likewise.
+	* gcc.c-torture/execute/20031003-1.c: Likewise.
+	* gcc.c-torture/execute/20101011-1.c: Likewise.
+	* gcc.c-torture/execute/conversion.c: Likewise.
+	* gcc.c-torture/execute/ieee/compare-fp-4.x: Likewise.
+	* gcc.c-torture/execute/ieee/fp-cmp-2.x: Likewise.
+	* gcc.c-torture/execute/ieee/inf-1.c: Likewise.
+	* gcc.c-torture/execute/ieee/inf-2.c: Likewise.
+	* gcc.c-torture/execute/ieee/mul-subnormal-single-1.x: Likewise.
+	* gcc.c-torture/execute/ieee/rbug.c: Likewise.
+	* gcc.c-torture/execute/pr39228.c: Likewise.
+	* gcc.c-torture/execute/ieee/20010114-2.x: Remove file.
+	* gcc.c-torture/execute/ieee/20030331-1.x: Remove file.
+	* gcc.c-torture/execute/ieee/920518-1.x: Remove file.
+	* gcc.c-torture/execute/ieee/compare-fp-1.x: Remove file.
+	* gcc.c-torture/execute/ieee/fp-cmp-4f.x: Remove file.
+	* gcc.c-torture/execute/ieee/fp-cmp-8f.x: Remove file.
+
+	* gcc.dg/20020312-2.c: Remove references to spu.
+	* gcc.dg/20030702-1.c: Likewise.
+	* gcc.dg/and-1.c: Likewise.
+	* gcc.dg/builtin-inf-1.c: Likewise.
+	* gcc.dg/builtins-1.c: Likewise.
+	* gcc.dg/builtins-43.c: Likewise.
+	* gcc.dg/builtins-44.c: Likewise.
+	* gcc.dg/builtins-45.c: Likewise.
+	* gcc.dg/float-range-1.c: Likewise.
+	* gcc.dg/float-range-3.c: Likewise.
+	* gcc.dg/float-range-4.c: Likewise.
+	* gcc.dg/float-range-5.c: Likewise.
+	* gcc.dg/fold-overflow-1.c: Likewise.
+	* gcc.dg/format/ms_unnamed-1.c: Likewise.
+	* gcc.dg/format/unnamed-1.c: Likewise.
+	* gcc.dg/hex-round-1.c: Likewise.
+	* gcc.dg/hex-round-2.c: Likewise.
+	* gcc.dg/lower-subreg-1.c: Likewise.
+	* gcc.dg/nrv3.c: Likewise.
+	* gcc.dg/pr15784-3.c: Likewise.
+	* gcc.dg/pr27095.c: Likewise.
+	* gcc.dg/pr28243.c: Likewise.
+	* gcc.dg/pr28796-2.c: Likewise.
+	* gcc.dg/pr30551-3.c: Likewise.
+	* gcc.dg/pr30551-6.c: Likewise.
+	* gcc.dg/pr30551.c: Likewise.
+	* gcc.dg/pr70317.c: Likewise.
+	* gcc.dg/sms-1.c: Likewise.
+	* gcc.dg/sms-2.c: Likewise.
+	* gcc.dg/sms-3.c: Likewise.
+	* gcc.dg/sms-4.c: Likewise.
+	* gcc.dg/sms-5.c: Likewise.
+	* gcc.dg/sms-6.c: Likewise.
+	* gcc.dg/sms-7.c: Likewise.
+	* gcc.dg/stack-usage-1.c: Likewise.
+	* gcc.dg/strlenopt-73.c: Likewise.
+	* gcc.dg/titype-1.c: Likewise.
+	* gcc.dg/tls/thr-cse-1.c: Likewise.
+	* gcc.dg/torture/builtin-attr-1.c: Likewise.
+	* gcc.dg/torture/builtin-complex-1.c: Likewise.
+	* gcc.dg/torture/builtin-cproj-1.c: Likewise.
+	* gcc.dg/torture/builtin-frexp-1.c: Likewise.
+	* gcc.dg/torture/builtin-ldexp-1.c: Likewise.
+	* gcc.dg/torture/builtin-logb-1.c: Likewise.
+	* gcc.dg/torture/builtin-math-2.c: Likewise.
+	* gcc.dg/torture/builtin-math-5.c: Likewise.
+	* gcc.dg/torture/builtin-modf-1.c: Likewise.
+	* gcc.dg/torture/fp-int-convert.h: Likewise.
+	* gcc.dg/torture/pr25947-1.c: Likewise.
+	* gcc.dg/torture/type-generic-1.c: Likewise.
+	* gcc.dg/tree-ssa/20040204-1.c: Likewise.
+	* gcc.dg/tree-ssa/ivopts-1.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-3.c: Likewise.
+	* gcc.dg/tree-ssa/vector-6.c: Likewise.
+	* gcc.dg/uninit-C-O0.c: Likewise.
+	* gcc.dg/uninit-C.c: Likewise.
+	* gcc.dg/vect/no-math-errno-slp-32.c: Likewise.
+	* gcc.dg/vect/no-math-errno-vect-pow-1.c: Likewise.
+	* gcc.dg/vect/vect-float-extend-1.c: Likewise.
+	* gcc.dg/vect/vect-float-truncate-1.c: Likewise.
+	* gcc.dg/vect/vect.exp: Likewise.
+	* gcc.gd/vect/costmodel/spu/: Remove directory.
+
+	* gcc.target/spu/: Remove directory.
+
+	* gfortran.dg/bessel_6.f90: Remove references to spu.
+	* gfortran.dg/bessel_7.f90: Likewise.
+	* gfortran.dg/char4_iunit_1.f03: Likewise.
+	* gfortran.dg/chmod_1.f90: Likewise.
+	* gfortran.dg/chmod_2.f90: Likewise.
+	* gfortran.dg/chmod_3.f90: Likewise.
+	* gfortran.dg/default_format_1.f90: Likewise.
+	* gfortran.dg/default_format_denormal_1.f90: Likewise.
+	* gfortran.dg/erf_2.F90: Likewise.
+	* gfortran.dg/erf_3.F90: Likewise.
+	* gfortran.dg/init_flag_10.f90: Likewise.
+	* gfortran.dg/init_flag_3.f90: Likewise.
+	* gfortran.dg/int_conv_2.f90: Likewise.
+	* gfortran.dg/integer_exponentiation_3.F90: Likewise.
+	* gfortran.dg/integer_exponentiation_5.F90: Likewise.
+	* gfortran.dg/isnan_1.f90: Likewise.
+	* gfortran.dg/isnan_2.f90: Likewise.
+	* gfortran.dg/maxloc_2.f90: Likewise.
+	* gfortran.dg/maxlocval_2.f90: Likewise.
+	* gfortran.dg/maxlocval_4.f90: Likewise.
+	* gfortran.dg/minloc_1.f90: Likewise.
+	* gfortran.dg/minlocval_1.f90: Likewise.
+	* gfortran.dg/minlocval_4.f90: Likewise.
+	* gfortran.dg/module_nan.f90: Likewise.
+	* gfortran.dg/namelist_42.f90: Likewise.
+	* gfortran.dg/namelist_43.f90: Likewise.
+	* gfortran.dg/nan_1.f90: Likewise.
+	* gfortran.dg/nan_2.f90: Likewise.
+	* gfortran.dg/nan_3.f90: Likewise.
+	* gfortran.dg/nan_4.f90: Likewise.
+	* gfortran.dg/nan_5.f90: Likewise.
+	* gfortran.dg/nan_6.f90: Likewise.
+	* gfortran.dg/nearest_1.f90: Likewise.
+	* gfortran.dg/nearest_3.f90: Likewise.
+	* gfortran.dg/open_errors.f90: Likewise.
+	* gfortran.dg/pr20257.f90: Likewise.
+	* gfortran.dg/read_infnan_1.f90: Likewise.
+	* gfortran.dg/real_const_3.f90: Likewise.
+	* gfortran.dg/realloc_on_assign_2.f03: Likewise.
+	* gfortran.dg/reassoc_4.f: Likewise.
+	* gfortran.dg/scalar_mask_2.f90: Likewise.
+	* gfortran.dg/scratch_1.f90: Likewise.
+	* gfortran.dg/stat_1.f90: Likewise.
+	* gfortran.dg/stat_2.f90: Likewise.
+	* gfortran.dg/transfer_simplify_1.f90: Likewise.
+	* gfortran.dg/typebound_operator_9.f03: Likewise.
+
+	* gfortran.fortran-torture/execute/intrinsic_nearest.x: Remove
+	references to spu.
+	* gfortran.fortran-torture/execute/intrinsic_set_exponent.x: Likewise.
+	* gfortran.fortran-torture/execute/nan_inf_fmt.x: Likewise.
+	* gfortran.fortran-torture/execute/getarg_1.x: Remove file.
+
+2019-09-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR middle-end/91603
+	* gcc.target/arm/pr91603.c: New test.
+
+2019-09-03  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* gcc.target/s390/sigfpe-eh.c: New test.
+
+2019-09-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/acle/jcvt_1.c: New test.
+
+2019-09-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/acle/rintnzx_1.c: New test.
+	* gcc.target/aarch64/simd/vrndnzx_1.c: Likewise.
+
+2019-09-03  Jakub Jelinek  <jakub@redhat.com>
+	    Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91597
+	* gcc.c-torture/execute/pr91597.c: New test.
+
+2019-09-03  Alexandre Oliva <oliva@adacore.com>
+
+	* gcc.target/i386/20020616-1.c: Preserve full register across
+	main.
+
+2019-09-02  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91589
+	* gfortran.dg/pr91589.f90 : New test.
+
+2019-09-02  Steven G. Kargl  <kargl@gc.gnu.org>
+
+	PR fortran/91552
+	* gfortran.dg/pr91552.f90: New test.
+
+2019-09-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR middle-end/91605
+	* g++.target/i386/pr91605.C: New test.
+
+2019-09-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91632
+	* gcc.c-torture/execute/pr91632.c: New test.
+
+2019-09-02  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.dg/tree-ssa/slsr-42.c: New test.
+
+2019-09-02  Martin Liska  <mliska@suse.cz>
+
+	PR c++/91155
+	* g++.dg/torture/pr91155.C: New test.
+
+2019-09-01  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91129 - wrong error with binary op in template argument.
+	* g++.dg/cpp1y/nontype1.C: New test.
+
+2019-09-01  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.c-torture/compile/20190827-1.c: Add dg-requires-alias.
+
+2019-09-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.c-torture/execute/20190901-1.c: New test.
+
+	* lib/target-supports.exp (check_effective_target_pthread): Add
+	#include <pthread.h> directive to the test.
+
+2019-09-01  Paul Thomas  <pault@gcc.gnu.org>
+
+	* gfortran.dg/select_rank_1.f90 : New test.
+	* gfortran.dg/select_rank_2.f90 : New test.
+
+2019-09-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91623
+	* gcc.target/i386/pr91623.c: New test.
+
+	PR lto/91572
+	* g++.dg/lto/pr91572_0.C: New test.
+
+2019-08-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91587
+	* gfortran.dg/pr91587.f90: New test.
+
+2019-08-30  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/91599
+	* gcc.dg/Wstringop-overflow-16.c: New test.
+
+	PR middle-end/91584
+	* gfortran.dg/char_array_constructor_4.f90: New test.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/pack24.adb: New test.
+
+2019-08-30  Jeff Law  <law@redhat.com>
+
+	* gcc.target/mips/r10k-cache-barrier-9.c: Suppress warnings.
+
+2019-08-30  Martin Jambor  <mjambor@suse.cz>
+
+	tree-optimization/91579
+	* gcc.dg/tree-ssa/pr91579.c: New test.
+
+2019-08-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/91560
+	* gcc.dg/torture/vshuf-8.inc: Add two further permutations.
+
+	PR tree-optimization/91351
+	* g++.dg/opt/pr91351.C: New test.
+
+2019-08-29  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/spellcheck-typenames.C: Adjust expected locations.
+	* g++.dg/cpp0x/pr84676.C: Check locations.
+	* g++.dg/other/pr88187.C: Likewise.
+	* g++.dg/parse/crash13.C: Likewise.
+	* g++.dg/parse/crash46.C: Likewise.
+	* g++.dg/parse/template28.C: Likewise.
+	* g++.dg/parse/typename4.C: Likewise.
+
+2019-08-29  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91568
+	* gfortran.dg/pr91568.f: New testcase.
+
+2019-08-28  Marek Polacek  <polacek@redhat.com>
+
+	Implement P1152R4: Deprecating some uses of volatile.
+	PR c++/91361
+	* c-c++-common/Wbool-operation-1.c: Use -Wno-volatile in C++.
+	* c-c++-common/gomp/atomic-1.c: Likewise.
+	* c-c++-common/gomp/atomic-9.c: Likewise.
+	* c-c++-common/gomp/depend-iterator-1.c: Likewise.
+	* c-c++-common/gomp/loop-1.c: Adjust warning location for C++.
+	* c-c++-common/gomp/order-3.c: Likewise.
+	* c-c++-common/pr69733.c: Use -Wno-volatile in C++.
+	* c-c++-common/spec-barrier-2.c: Likewise.
+	* c-c++-common/tm/pr54893.c: Likewise.
+	* g++.dg/cpp0x/pr65327.C: Add dg-warning.
+	* g++.dg/cpp0x/rv-conv2.C: Likewise.
+	* g++.dg/cpp0x/rv1n.C: Likewise.
+	* g++.dg/cpp0x/rv1p.C: Likewise.
+	* g++.dg/cpp0x/rv2n.C: Likewise.
+	* g++.dg/cpp0x/rv2p.C: Likewise.
+	* g++.dg/cpp0x/rv3n.C: Likewise.
+	* g++.dg/cpp0x/rv3p.C: Likewise.
+	* g++.dg/cpp0x/rv4n.C: Likewise.
+	* g++.dg/cpp0x/rv4p.C: Likewise.
+	* g++.dg/cpp0x/rv5n.C: Likewise.
+	* g++.dg/cpp0x/rv5p.C: Likewise.
+	* g++.dg/cpp0x/rv6n.C: Likewise.
+	* g++.dg/cpp0x/rv6p.C: Likewise.
+	* g++.dg/cpp0x/rv7n.C: Likewise.
+	* g++.dg/cpp0x/rv7p.C: Likewise.
+	* g++.dg/cpp0x/rv8p.C: Likewise.
+	* g++.dg/cpp0x/trailing14.C: Use -Wno-volatile.
+	* g++.dg/cpp1y/new1.C: Add dg-warning.
+	* g++.dg/cpp2a/volatile1.C: New test.
+	* g++.dg/cpp2a/volatile2.C: New test.
+	* g++.dg/cpp2a/volatile3.C: New test.
+	* g++.dg/cpp2a/volatile4.C: New test.
+	* g++.dg/expr/bool3.C: Add dg-warning.
+	* g++.dg/expr/bool4.C: Likewise.
+	* g++.dg/expr/cond9.C: Likewise.
+	* g++.dg/ext/vector25.C: Likewise.
+	* g++.dg/gomp/depend-iterator-1.C: Use -Wno-volatile.
+	* g++.dg/inherit/covariant21.C: Add dg-warning.
+	* g++.dg/init/ref18.C: Likewise.
+	* g++.dg/ipa/pr63838.C: Likewise.
+	* g++.dg/overload/rvalue2.C: Likewise.
+	* g++.dg/parse/semicolon4.C: Likewise.
+	* g++.dg/warn/Wreturn-type-4.C: Likewise.
+	* g++.dg/warn/pr36069.C: Likewise.
+	* g++.old-deja/g++.mike/p9506.C: Likewise.
+	* g++.old-deja/g++.other/volatile1.C: Likewise.
+
+2019-08-28  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91551
+	* gfortran.dg/allocated_3.f90
+
+2019-08-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91360 - Implement C++20 P1143R2: constinit.
+	* g++.dg/cpp2a/constinit1.C: New test.
+	* g++.dg/cpp2a/constinit2.C: New test.
+	* g++.dg/cpp2a/constinit3.C: New test.
+	* g++.dg/cpp2a/constinit4.C: New test.
+	* g++.dg/cpp2a/constinit5.C: New test.
+	* g++.dg/cpp2a/constinit6.C: New test.
+	* g++.dg/cpp2a/constinit7.C: New test.
+	* g++.dg/cpp2a/constinit8.C: New test.
+	* g++.dg/cpp2a/constinit9.C: New test.
+	* g++.dg/cpp2a/constinit10.C: New test.
+	* g++.dg/cpp2a/constinit11.C: New test.
+	* g++.dg/cpp2a/constinit12.C: New test.
+
+2019-08-28  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91565
+	* gfortran.dg/pr91565.f90: New test.
+
+2019-08-28  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91564
+	* gfortran.dg/pr91564.f90: New test.
+
+2019-08-28  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91457
+	* c-c++-common/Wstringop-overflow-2.c: New test.
+	* g++.dg/warn/Warray-bounds-8.C: New test.
+	* g++.dg/warn/Wstringop-overflow-3.C: New test.
+	* gcc.dg/Wstringop-overflow-15.c: New test.
+
+2019-08-16  Martin Liska  <mliska@suse.cz>
+
+	PR c++/90613
+	* g++.dg/lookup/using61.C: New.
+
+2019-08-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR middle-end/89544
+	* gcc.target/arm/unaligned-argument-3.c: New test.
+
+2019-08-27  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/81676 - bogus -Wunused warnings in constexpr if.
+	* g++.dg/cpp1z/constexpr-if31.C: New test.
+	* g++.dg/cpp1z/constexpr-if32.C: New test.
+
+	PR c++/91428 - warn about std::is_constant_evaluated in if constexpr.
+	* g++.dg/cpp2a/is-constant-evaluated9.C: New test.
+
+2019-08-27  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91567
+	* gcc.dg/tree-ssa/builtin-snprintf-6.c: Xfail a subset of assertions
+	on targets other than x86_64 to work around PR 83543.
+	* gcc.dg/tree-ssa/builtin-sprintf-warn-22.c: New test.
+
+2019-08-27  Jeff Law  <law@redhat.com>
+
+	* gcc.c-torture/compile/20190827-1.c: New test.
+
+2019-08-27  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/91496
+	* gfortran.dg/pr91496.f90: New testcase.
+
+2019-08-27  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/sse4_1-round-roundeven-1.c (dg-options):
+	Add -mfpmath=sse.
+	* gcc.target/i386/sse4_1-round-roundeven-2.c (dg-options): Ditto.
+
+2019-08-27  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/91528
+	* gcc.target/i386/pr91528.c: New test.
+
+2019-08-27  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/83431
+	PR testsuite/91562
+	* gcc.dg/strlenopt-8.c: Adjust pass/dump name.
+
+2019-08-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91415
+	* g++.dg/warn/sequence-pt-4.C: New test.
+
+2019-08-27  Robin Dapp  <rdapp@linux.ibm.com>
+
+	PR testsuite/91549
+	* gcc.dg/wrapped-binop-simplify.c: Test only on x86, s390 with lp64.
+
+2019-08-26  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91390
+	PR fortran/91473
+	* gfortran.dg/used_before_typed_4.f90: Change warning to error.
+	* gfortran.dg/argument_checking_20.f90: New test.
+
+2019-08-26  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91545 - ICE in constexpr store evaluation.
+	* g++.dg/cpp0x/pr91545.C: New test.
+
+2019-08-26  Tejas Joshi  <tejasjoshi9673@gmail.com>
+
+	* gcc.target/i386/sse4_1-round-roundeven-1.c: New test.
+	* gcc.target/i386/sse4_1-round-roundeven-2.c: New test.
+
+2019-08-26  Tejas Joshi  <tejasjoshi9673@gmail.com>
+
+	* gcc.dg/torture/builtin-round-roundeven.c: New test.
+	* gcc.dg/torture/builtin-round-roundevenf128.c: Likewise.
+
+2019-08-26  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.dg/tree-ssa/copy-headers-5.c: Do not run vrp pass.
+	* gcc.dg/tree-ssa/copy-headers-7.c: Do not run vrp pass.
+	* gcc.dg/tree-ssa/loop-15.c: Remove XFAIL.
+	* gcc.dg/tree-ssa/pr23744.c: Change search pattern.
+	* gcc.dg/wrapped-binop-simplify.c: New test.
+
+2019-08-26  Kito Cheng  <kito.cheng@sifive.com>
+
+	* gcc.target/riscv/li.c: New test.
+
+2019-08-24  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/inherit/virtual14.C: New.
+
+2019-08-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91390
+	PR fortran/91519
+	* gfortran.dg/bessel_3.f90: Add type mismatch errors.
+	* gfortran.dg/coarray_7.f90: Rename subroutines to avoid
+	additional errors.
+	* gfortran.dg/g77/20010519-1.f: Add -std=legacy. Remove
+	warnings for ASSIGN. Add warnings for type mismatch.
+	* gfortran.dg/goacc/acc_on_device-1.f95: Add -std=legacy.
+	Add catch-all warning.
+	* gfortran.dg/internal_pack_9.f90: Rename subroutine to
+	avoid type error.
+	* gfortran.dg/internal_pack_9.f90: Add -std=legacy. Add
+	warnings for type mismatch.
+	* gfortran.dg/pr39937.f: Add -std=legacy and type warnings. Move
+	here from
+	* gfortran.fortran-torture/compile/pr39937.f: Move to gfortran.dg.
+
+2019-08-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/conversion/simd4.C: Test all the locations.
+
+2019-08-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91521 - wrong error with operator->.
+	* g++.dg/parse/operator8.C: New test.
+
+2019-08-23  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/91481
+	* gcc.target/powerpc/darn-3.c: New testcase.
+
+2019-08-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/79817 - attribute deprecated on namespace.
+	* g++.dg/cpp0x/attributes-namespace1.C: New test.
+	* g++.dg/cpp0x/attributes-namespace2.C: New test.
+	* g++.dg/cpp0x/attributes-namespace3.C: New test.
+	* g++.dg/cpp0x/attributes-namespace4.C: New test.
+	* g++.dg/cpp0x/attributes-namespace5.C: New test.
+	* g++.dg/cpp1z/namespace-attribs.C: Adjust.
+	* g++.dg/cpp1z/namespace-attribs2.C: Adjust.
+
+2019-08-23  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
+
+	* gcc.target/mips/get-fcsr-3.c: New test.
+
+2019-08-23  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/83431
+	* gcc.dg/strlenopt-63.c: New test.
+	* gcc.dg/pr79538.c: Adjust text of expected warning.
+	* gcc.dg/pr81292-1.c: Adjust pass name.
+	* gcc.dg/pr81292-2.c: Same.
+	* gcc.dg/pr81703.c: Same.
+	* gcc.dg/strcmpopt_2.c: Same.
+	* gcc.dg/strcmpopt_3.c: Same.
+	* gcc.dg/strcmpopt_4.c: Same.
+	* gcc.dg/strlenopt-1.c: Same.
+	* gcc.dg/strlenopt-10.c: Same.
+	* gcc.dg/strlenopt-11.c: Same.
+	* gcc.dg/strlenopt-13.c: Same.
+	* gcc.dg/strlenopt-14g.c: Same.
+	* gcc.dg/strlenopt-14gf.c: Same.
+	* gcc.dg/strlenopt-15.c: Same.
+	* gcc.dg/strlenopt-16g.c: Same.
+	* gcc.dg/strlenopt-17g.c: Same.
+	* gcc.dg/strlenopt-18g.c: Same.
+	* gcc.dg/strlenopt-19.c: Same.
+	* gcc.dg/strlenopt-1f.c: Same.
+	* gcc.dg/strlenopt-2.c: Same.
+	* gcc.dg/strlenopt-20.c: Same.
+	* gcc.dg/strlenopt-21.c: Same.
+	* gcc.dg/strlenopt-22.c: Same.
+	* gcc.dg/strlenopt-22g.c: Same.
+	* gcc.dg/strlenopt-24.c: Same.
+	* gcc.dg/strlenopt-25.c: Same.
+	* gcc.dg/strlenopt-26.c: Same.
+	* gcc.dg/strlenopt-27.c: Same.
+	* gcc.dg/strlenopt-28.c: Same.
+	* gcc.dg/strlenopt-29.c: Same.
+	* gcc.dg/strlenopt-2f.c: Same.
+	* gcc.dg/strlenopt-3.c: Same.
+	* gcc.dg/strlenopt-30.c: Same.
+	* gcc.dg/strlenopt-31g.c: Same.
+	* gcc.dg/strlenopt-32.c: Same.
+	* gcc.dg/strlenopt-33.c: Same.
+	* gcc.dg/strlenopt-33g.c: Same.
+	* gcc.dg/strlenopt-34.c: Same.
+	* gcc.dg/strlenopt-35.c: Same.
+	* gcc.dg/strlenopt-4.c: Same.
+	* gcc.dg/strlenopt-48.c: Same.
+	* gcc.dg/strlenopt-49.c: Same.
+	* gcc.dg/strlenopt-4g.c: Same.
+	* gcc.dg/strlenopt-4gf.c: Same.
+	* gcc.dg/strlenopt-5.c: Same.
+	* gcc.dg/strlenopt-50.c: Same.
+	* gcc.dg/strlenopt-51.c: Same.
+	* gcc.dg/strlenopt-52.c: Same.
+	* gcc.dg/strlenopt-53.c: Same.
+	* gcc.dg/strlenopt-54.c: Same.
+	* gcc.dg/strlenopt-55.c: Same.
+	* gcc.dg/strlenopt-56.c: Same.
+	* gcc.dg/strlenopt-6.c: Same.
+	* gcc.dg/strlenopt-61.c: Same.
+	* gcc.dg/strlenopt-7.c: Same.
+	* gcc.dg/strlenopt-8.c: Same.
+	* gcc.dg/strlenopt-9.c: Same.
+	* gcc.dg/strlenopt.h (snprintf, snprintf): Declare.
+	* gcc.dg/tree-ssa/builtin-snprintf-6.c: New test.
+	* gcc.dg/tree-ssa/builtin-snprintf-7.c: New test.
+	* gcc.dg/tree-ssa/builtin-snprintf-8.c: New test.
+	* gcc.dg/tree-ssa/builtin-snprintf-9.c: New test.
+	* gcc.dg/tree-ssa/builtin-sprintf-warn-21.c: New test.
+	* gcc.dg/tree-ssa/dump-4.c: New test.
+	* gcc.dg/tree-ssa/pr83501.c: Adjust pass name.
+
+2019-08-23  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/Warray-bounds-36.c: Make functions static to avoid failures
+	with -fpic.
+	* gcc.dg/Warray-bounds-41.c: Same.
+	* gcc.dg/pr78973.c: Same.
+	* gcc.dg/pr78973-2.c: Same.
+
+2019-08-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91304 - prefix attributes ignored in condition.
+	* g++.dg/cpp0x/gen-attrs-70.C: New test.
+
+2019-08-22  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/91490
+	* c-c++-common/Warray-bounds-7.c: New test.
+	* gcc.dg/Warray-bounds-39.c: Expect either -Warray-bounds or
+	-Wstringop-overflow.
+	* gcc.dg/strlenopt-78.c: New test.
+
+2019-08-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.target/i386/minmax-4.c: Add -mno-stackrealign to dg-options.
+	* gcc.target/i386/minmax-5.c: Likewise.
+	* gcc.target/i386/minmax-6.c: Likewise.
+	* gcc.target/i386/minmax-7.c: Likewise.
+	* gcc.target/i386/pr91154.c: Likewise.
+
+2019-08-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* c-c++-common/dump-ada-spec-15.c: Check that the parameters are named.
+
+2019-08-22  Kyrylo Tkachov <kyrylo.tkachov@arm.com>
+
+	* gcc.target/arm/acle/crc_hf_1.c: New test.
+
+2019-08-22  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* gcc.target/arm/neon-extend-1.c: Remove test.
+	* gcc.target/arm/neon-extend-2.c: Remove test.
+
+2019-08-22  Sylvia Taylor  <sylvia.taylor@arm.com>
+
+	* gcc.target/aarch64/advsimd-intrinsics/vld1x4.c: New test.
+	* gcc.target/aarch64/advsimd-intrinsics/vst1x4.c: New test.
+
+2019-08-22  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+	    Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR target/88839
+	* gcc.target/aarch64/sve/sel_1.c: New test.
+	* gcc.target/aarch64/sve/sel_2.c: Likewise.
+	* gcc.target/aarch64/sve/sel_3.c: Likewise.
+	* gcc.target/aarch64/sve/sel_4.c: Likewise.
+	* gcc.target/aarch64/sve/sel_5.c: Likewise.
+	* gcc.target/aarch64/sve/sel_6.c: Likewise.
+
+2019-08-21  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR c++/91505
+	* g++.target/i386/crc32-4.C: New test.
+
+2019-08-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91482
+	* gcc.dg/tree-ssa/pr91482.c: New testcase.
+
+2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* c-c++-common/dump-ada-spec-15.c: New test.
+
+2019-08-21  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/arm/cmse/cmse-9.c: Add quotes to expected
+	warning messages.
+
+2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/prot9.adb, gnat.dg/prot9_gen.ads,
+	gnat.dg/prot9_pkg1.ads, gnat.dg/prot9_pkg2.ads: New testcase.
+
+2019-08-21  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/implicit_param.adb, gnat.dg/implicit_param_pkg.ads:
+	New testcase.
+
+2019-08-20  Martin Sebor  <msebor@redhat.com>
+
+	PR testsuite/91458
+	* g++.dg/tree-ssa/ssa-dse-1.C: Use the same search pattern
+	unconditionally (correcting r272199, PR middle-end/90676).
+	* gcc.dg/tree-prof/stringop-2.c: Same.
+
+2019-08-20  Ian Lance Taylor  <iant@golang.org>
+
+	* go.test/test/fixedbugs/bug073.go: Update for language changes.
+
+2019-08-20  Matthew Beliveau  <mbelivea@redhat.com>
+
+	* gcc.dg/tree-ssa/redundant-assign-zero-1.c: New test.
+	* gcc.dg/tree-ssa/redundant-assign-zero-2.c: New test.
+
+2019-08-20  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/37242
+	* gcc.dg/tree-ssa/ssa-fre-80.c: New testcase.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/storage_size1.adb: New testcase.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/loop_entry2.adb: New testcase.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/tagged5.adb, gnat.dg/tagged5.ads: New testcase.
+
+2019-08-20  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/type_conv2.adb, gnat.dg/type_conv2.ads: New testcase.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/unchecked_convert14.adb: New testcase.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/object_size1.adb: New testcase.
+
+2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.c-torture/execute/20190820-1.c: New test.
+
+2019-08-20  Richard Biener  <rguenther@suse.de>
+
+	PR target/91498
+	* gcc.target/i386/minmax-7.c: New testcase.
+
+2019-08-20  Lili Cui  <lili.cui@intel.com>
+
+	* gcc.target/i386/funcspec-56.inc: Handle new march.
+	* g++.target/i386/mv16.C: Handle new march
+
+2019-08-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR middle-end/89544
+	* gcc.target/arm/unaligned-argument-1.c: New test.
+	* gcc.target/arm/unaligned-argument-2.c: New test.
+
+2019-08-19  Joel Hutton  <Joel.Hutton@arm.com>
+
+	* gcc.target/aarch64/fmul_scvtf_1.c: New test.
+
+2019-08-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91264 - detect modifying const objects in constexpr.
+	* g++.dg/cpp1y/constexpr-tracking-const1.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const2.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const3.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const4.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const5.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const6.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const7.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const8.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const9.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const10.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const11.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const12.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const13.C: New test.
+	* g++.dg/cpp1y/constexpr-tracking-const14.C: New test.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/elab8.adb, gnat.dg/elab8_gen.adb,
+	gnat.dg/elab8_gen.ads, gnat.dg/elab8_pkg.adb,
+	gnat.dg/elab8_pkg.ads: New testcase.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/warn29.adb, gnat.dg/warn29.ads: New testcase.
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/expr_func9.adb: New testcase.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/valid_scalars2.adb: New testcase.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/generic_inst12.adb, gnat.dg/generic_inst12_pkg1.adb,
+	gnat.dg/generic_inst12_pkg1.ads,
+	gnat.dg/generic_inst12_pkg2.ads: New testcase.
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/warn28.adb, gnat.dg/warn28.ads: New testcase.
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/rep_clause9.adb: New testcase.
+
+2019-08-19  Olivier Hainque  <hainque@adacore.com>
+
+	* gnat.dg/openacc1.adb: New testcase.
+
+2019-08-19  Kito Cheng  <kito.cheng@sifive.com>
+
+	PR target/91441
+	* gcc.target/riscv/pr91441.c: New.
+
+2019-08-18  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91485
+	* gfortran.dg/pr91485.f90: New test.
+
+2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/82992
+	* gfortran.dg/pr71649.f90: Adjust error messages.
+	* gfortran.dg/use_15.f90: Ditto.
+	* gfortran.dg/use_rename_8.f90: Ditto.
+
+2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/78739
+	* fortran.dg/pr78739.f90: New test.
+
+2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/78719
+	* gfortran.dg/pr78719_1.f90: New test.
+	* gfortran.dg/pr78719_2.f90: Ditto.
+	* gfortran.dg/pr78719_3.f90: Ditto.
+
+2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91471
+	* gfortran.dg/pr91471.f90: New test.
+
+2019-08-16  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/85827
+	* g++.dg/cpp1z/constexpr-if29.C: New test.
+
+2019-08-16  Jeff Law  <law@redhat.com>
+
+	* gcc.target/sh/pr54236-6.c: Use -fno-tree-forwprop.
+
+2019-08-16  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/struct-ret-1.c: Enable on all targets.
+
+2019-08-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt81.ad[sb]: New test.
+
+2019-08-16  Martin Sebor  <msebor@redhat.com>
+
+	PR testsuite/91458
+	* g++.dg/tree-ssa/pr19807.C: Use the same search pattern
+	unconditionally (correcting r272199, PR middle-end/90676).
+
+2019-08-16  Richard Biener  <rguenther@suse.de>
+
+	PR target/91469
+	* gcc.target/i386/pr91469-1.c: New testcase.
+	* gcc.target/i386/pr91469-2.c: Likewise.
+
+2019-08-16  Mark Eggleston <mark.eggleston@codethink.com>
+
+	* gfortran.dg/auto_in_equiv_1.f90: New test.
+	* gfortran.dg/auto_in_equiv_2.f90: New test.
+	* gfortran.dg/auto_in_equiv_3.f90: New test.
+
+2019-08-16  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/forwprop-31.c: Adjust.
+
+2019-08-16  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/91447
+	* g++.dg/ipa/ipa-icf-4.C: Add -missed for target that
+	don't have aliases.
+
+2019-08-16  Alexandre Oliva <oliva@adacore.com>
+
+	* gcc.target/i386/pr85044.c: Require support for trampolines.
+
+	* gcc.target/i386/asm-4.c: Use amd64 natural addressing mode
+	on all __LP64__ targets.
+
+	* gcc.target/arc/interrupt-6.c: Use __builtin_alloca, require
+	effective target support for alloca, drop include of alloca.h.
+	* gcc.target/i386/pr80969-3.c: Likewise.
+	* gcc.target/sparc/setjmp-1.c: Likewise.
+	* gcc.target/x86_64/abi/ms-sysv/gen.cc: Likewise.
+	* gcc.target/x86_64/abi/ms-sysv/ms-sysv.c: Likewise.
+
+	* gcc.misc-tests/options.exp: Match /ld and -ld besides
+	/collect2.
+
+2019-08-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91443
+	* gfortran.dg/argument_checking_19.f90: New test.
+	* gfortran.dg/altreturn_10.f90: Change dg-warning to dg-error.
+	* gfortran.dg/dec_union_11.f90: Add -std=legacy.
+	* gfortran.dg/hollerith8.f90: Likewise. Remove warning for
+	Hollerith constant.
+	* gfortran.dg/integer_exponentiation_2.f90: New subroutine gee_i8;
+	use it to avoid type mismatches.
+	* gfortran.dg/pr41011.f: Add -std=legacy.
+	* gfortran.dg/whole_file_1.f90: Change warnings to errors.
+	* gfortran.dg/whole_file_2.f90: Likewise.
+
+2019-08-15  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91445
+	* gcc.dg/torture/pr91445.c: New testcase.
+
+2019-08-15  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/pr80170.c: Adjust to use __SIZETYPE__.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/loop_add_4.c: Expect 10 INCWs and
+	INCDs rather than 8.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/revb_1.c: Restrict to little-endian targets.
+	Avoid including stdint.h.
+	* gcc.target/aarch64/sve/revh_1.c: Likewise.
+	* gcc.target/aarch64/sve/revw_1.c: Likewise.
+	* gcc.target/aarch64/sve/revb_2.c: New big-endian test.
+	* gcc.target/aarch64/sve/revh_2.c: Likewise.
+	* gcc.target/aarch64/sve/revw_2.c: Likewise.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_mla_5.c: Allow FMAD as well as FMLA
+	and FMSB as well as FMLS.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/ext_2.c: Expect a MOVPRFX.
+	* gcc.target/aarch64/sve/ext_3.c: New test.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* gcc.target/aarch64/sve/shift_1.c: Accept reversed shifts.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_mla_1.c: New test.
+	* gcc.target/aarch64/sve/cond_mla_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_5.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_5_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_6.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_6_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_7.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_7_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_8.c: Likewise.
+	* gcc.target/aarch64/sve/cond_mla_8_run.c: Likewise.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_fadd_1.c: New test.
+	* gcc.target/aarch64/sve/cond_fadd_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fadd_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fadd_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fadd_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fadd_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fadd_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fadd_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_1.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fsubr_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_1.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmaxnm_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_1.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fminnm_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_1.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fmul_4_run.c: Likewise.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_fabd_1.c: New test.
+	* gcc.target/aarch64/sve/cond_fabd_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_5.c: Likewise.
+	* gcc.target/aarch64/sve/cond_fabd_5_run.c: Likewise.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_abd_1.c: New test.
+	* gcc.target/aarch64/sve/cond_abd_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_5.c: Likewise.
+	* gcc.target/aarch64/sve/cond_abd_5_run.c: Likewise.
+
+2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
+	    Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_shift_1.c: New test.
+	* gcc.target/aarch64/sve/cond_shift_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_5.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_5_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_6.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_6_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_7.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_7_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_8.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_8_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_9.c: Likewise.
+	* gcc.target/aarch64/sve/cond_shift_9_run.c: Likewise.
+
+2019-08-14  Martin Sebor  <msebor@redhat.com>
+
+	PR testsuite/91449
+	* gcc.dg/strlenopt-73.c: Restrict 128-bit tests to i386.
+
+2019-08-14  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR c++/91436
+	* g++.dg/lookup/missing-std-include-5.C: Limit test to C++14 and up.
+	* g++.dg/lookup/missing-std-include-6.C: Don't check make_unique in
+	test that runs for C++11.
+	* g++.dg/lookup/missing-std-include-8.C: Check make_unique here.
+
+2019-08-14  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.c-torture/execute/noinit-attribute.c: Fix typo.
+
+2019-08-14  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91294
+	* gcc.dg/strlenopt-44.c: Adjust tested result.
+	* gcc.dg/strlenopt-70.c: Avoid exercising unimplemnted optimization.
+	* gcc.dg/strlenopt-73.c: New test.
+	* gcc.dg/strlenopt-74.c: New test.
+	* gcc.dg/strlenopt-75.c: New test.
+	* gcc.dg/strlenopt-76.c: New test.
+	* gcc.dg/strlenopt-77.c: New test.
+
+2019-08-14  Jakub Jelinek  <jakub@redhat.com>
+	    Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91391 - bogus -Wcomma-subscript warning.
+	* g++.dg/cpp2a/comma5.C: New test.
+
+2019-08-14  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* lib/target-supports.exp (check_effective_target_noinit): New
+	proc.
+	* gcc.c-torture/execute/noinit-attribute.c: New test.
+
+2019-08-14  Richard Biener  <rguenther@suse.de>
+
+	PR target/91154
+	* gcc.target/i386/pr91154.c: New testcase.
+	* gcc.target/i386/minmax-3.c: Likewise.
+	* gcc.target/i386/minmax-4.c: Likewise.
+	* gcc.target/i386/minmax-5.c: Likewise.
+	* gcc.target/i386/minmax-6.c: Likewise.
+	* gcc.target/i386/minmax-1.c: Add -mno-stv.
+	* gcc.target/i386/minmax-2.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_logical_1.c: New test.
+	* gcc.target/aarch64/sve/cond_logical_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_5.c: Likewise.
+	* gcc.target/aarch64/sve/cond_logical_5_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/cond_uxt_1.c: New test.
+	* gcc.target/aarch64/sve/cond_uxt_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_uxt_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_uxt_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_uxt_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_uxt_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_uxt_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_uxt_4_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/cond_convert_1.c: New test.
+	* gcc.target/aarch64/sve/cond_convert_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_5.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_5_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_6.c: Likewise.
+	* gcc.target/aarch64/sve/cond_convert_6_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_unary_1.c: Add tests for
+	floating-point types.
+	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_4.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/cond_unary_1.c: New test.
+	* gcc.target/aarch64/sve/cond_unary_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_4_run.c: Likewise.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/alignment15.adb: New testcase.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/warn27.adb: New testcase.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/inline19.adb, gnat.dg/inline19.ads: New testcase.
+
+2019-08-14  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/equal11.adb, gnat.dg/equal11_interface.ads,
+	gnat.dg/equal11_record.adb, gnat.dg/equal11_record.ads: New
+	testcase.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/discr57.adb: New testcase.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/generic_inst11.adb, gnat.dg/generic_inst11_pkg.adb,
+	gnat.dg/generic_inst11_pkg.ads: New testcase.
+
+2019-08-14  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/assert2.adb, gnat.dg/assert2.ads: New testcase.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/inline18.adb, gnat.dg/inline18.ads,
+	gnat.dg/inline18_gen1-inner_g.ads, gnat.dg/inline18_gen1.adb,
+	gnat.dg/inline18_gen1.ads, gnat.dg/inline18_gen2.adb,
+	gnat.dg/inline18_gen2.ads, gnat.dg/inline18_gen3.adb,
+	gnat.dg/inline18_gen3.ads, gnat.dg/inline18_pkg1.adb,
+	gnat.dg/inline18_pkg1.ads, gnat.dg/inline18_pkg2-child.ads,
+	gnat.dg/inline18_pkg2.ads: New testcase.
+
+2019-08-14  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate12.adb, gnat.dg/predicate12.ads: New
+	testcase.
+
+2019-08-14  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/task5.adb: New testcase.
+
+2019-08-14  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/91419
+	* lib/target-supports.exp (natural_alignment_32): Amend target
+	list based on BIGGEST_ALIGNMENT.
+	(natural_alignment_64): Targets not natural_alignment_32 cannot
+	be natural_alignment_64.
+	* gcc.dg/tree-ssa/pr91091-2.c: XFAIL for !natural_alignment_32.
+	* gcc.dg/tree-ssa/ssa-fre-77.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-61.c: Require natural_alignment_32.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/vcond_21.c: New test.
+	* gcc.target/aarch64/sve/vcond_21_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* g++.target/aarch64/sve/dup_sel_1.C: New test.
+	* g++.target/aarch64/sve/dup_sel_2.C: Likewise.
+	* g++.target/aarch64/sve/dup_sel_3.C: Likewise.
+	* g++.target/aarch64/sve/dup_sel_4.C: Likewise.
+	* g++.target/aarch64/sve/dup_sel_5.C: Likewise.
+	* g++.target/aarch64/sve/dup_sel_6.C: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/sve/vcond_18.c: New test.
+	* gcc.target/aarch64/sve/vcond_18_run.c: Likewise.
+	* gcc.target/aarch64/sve/vcond_19.c: Likewise.
+	* gcc.target/aarch64/sve/vcond_19_run.c: Likewise.
+	* gcc.target/aarch64/sve/vcond_20.c: Likewise.
+	* gcc.target/aarch64/sve/vcond_20_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/fmaxnm_1.c: New test.
+	* gcc.target/aarch64/sve/fminnm_1.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/smax_1.c: New test.
+	* gcc.target/aarch64/sve/smin_1.c: Likewise.
+	* gcc.target/aarch64/sve/umax_1.c: Likewise.
+	* gcc.target/aarch64/sve/umin_1.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/cnot_1.c: New test.
+	* gcc.target/aarch64/sve/cond_cnot_1.c: Likewise.
+	* gcc.target/aarch64/sve/cond_cnot_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_cnot_2.c: Likewise.
+	* gcc.target/aarch64/sve/cond_cnot_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/cond_cnot_3.c: Likewise.
+	* gcc.target/aarch64/sve/cond_cnot_3_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/vect-clz.c: Force SVE off.
+	* gcc.target/aarch64/sve/clrsb_1.c: New test.
+	* gcc.target/aarch64/sve/clrsb_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/clz_1.c: Likewise.
+	* gcc.target/aarch64/sve/clz_1_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/adr_1.c: New test.
+	* gcc.target/aarch64/sve/adr_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/adr_2.c: Likewise.
+	* gcc.target/aarch64/sve/adr_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/adr_3.c: Likewise.
+	* gcc.target/aarch64/sve/adr_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/adr_4.c: Likewise.
+	* gcc.target/aarch64/sve/adr_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/adr_5.c: Likewise.
+	* gcc.target/aarch64/sve/adr_5_run.c: Likewise.
+
+2019-08-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/conversion/simd4.C: Test locations.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/peel_ind_1.c: Look for an inverted .B VL1.
+	* gcc.target/aarch64/sve/peel_ind_2.c: Likewise .S VL7.
+
+2019-08-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/parse/typedef9.C: Test locations too.
+
+2019-08-14  Martin Liska  <mliska@suse.cz>
+
+	* c-c++-common/asan/memcmp-1.c: There's a new function in the
+	stack-trace on the top.  So shift expected output in stack
+	trace.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/vcond_17.c: New test.
+	* gcc.target/aarch64/sve/vcond_17_run.c: Likewise.
+
+2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/spill_4.c: Expect all ptrues to be .Bs.
+	* gcc.target/aarch64/sve/single_1.c: Likewise.
+	* gcc.target/aarch64/sve/single_2.c: Likewise.
+	* gcc.target/aarch64/sve/single_3.c: Likewise.
+	* gcc.target/aarch64/sve/single_4.c: Likewise.
+
+2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/87991
+	* gfortran.dg/pr87991.f90: New test.
+
+2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/spill_2.c: Increase iteration counts
+	beyond the range of a PTRUE.
+	* gcc.target/aarch64/sve/while_6.c: New test.
+	* gcc.target/aarch64/sve/while_7.c: Likewise.
+	* gcc.target/aarch64/sve/while_8.c: Likewise.
+	* gcc.target/aarch64/sve/while_9.c: Likewise.
+	* gcc.target/aarch64/sve/while_10.c: Likewise.
+
+2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/88072
+	* gfortran.dg/unlimited_polymorphic_28.f90: Fix error message.  Left
+	out of previous commit!
+
+2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/88072
+	* gfortran.dg/pr88072.f90: New test.
+	* gfortran.dg/unlimited_polymorphic_28.f90: Fix error message.
+
+2019-08-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* obj-c++.dg/stubify-1.mm: Rename symbol stub option.
+	* obj-c++.dg/stubify-2.mm: Likewise.
+	* objc.dg/stubify-1.m: Likewise.
+	* objc.dg/stubify-2.m: Likewise.
+
+2013-08-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90563
+	* gfortran.dg/do_subsript_5.f90: New test.
+
+2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/89647
+	* gfortran.dg/pr89647.f90: New test.
+
+2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/87993
+	* gfortran.dg/pr87993.f90: New test.
+
+2019-08-13  Martin Sebor  <msebor@redhat.com>
+
+	PR c/80619
+	* gcc.dg/format/pr80619.c: New test.
+
+2019-08-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90473 - wrong code with nullptr in default argument.
+	* g++.dg/cpp0x/nullptr42.C: New test.
+
+2019-08-13  Olivier Hainque  <hainque@adacore.com>
+
+	* gnat.dg/casesi.ad[bs], test_casesi.adb: New test.
+
+2019-08-13  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR target/81800
+	* gcc.target/aarch64/no-inline-lrint_3.c: New test.
+
+2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/init_2.c: Expect ld1rd to be used
+	instead of a full vector load.
+	* gcc.target/aarch64/sve/init_4.c: Likewise.
+	* gcc.target/aarch64/sve/ld1r_2.c: Remove constants that no longer
+	need to be loaded from memory.
+	* gcc.target/aarch64/sve/slp_2.c: Expect the same output for
+	big and little endian.
+	* gcc.target/aarch64/sve/slp_3.c: Likewise.  Expect 3 of the
+	doubles to be moved via integer registers rather than loaded
+	from memory.
+	* gcc.target/aarch64/sve/slp_4.c: Likewise but for 4 doubles.
+	* gcc.target/aarch64/sve/spill_4.c: Expect 16-bit constants to be
+	loaded via an integer register rather than from memory.
+	* gcc.target/aarch64/sve/const_1.c: New test.
+	* gcc.target/aarch64/sve/const_2.c: Likewise.
+	* gcc.target/aarch64/sve/const_3.c: Likewise.
+
+2019-08-13  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/msp430.exp (msp430_device_permutations_runtest):
+	Handle csv-* and bad-devices-* tests.
+	* gcc.target/msp430/devices/README: Document how bad-devices-* tests
+	work.
+	* gcc.target/msp430/devices/bad-devices-1.c: New test.
+	* gcc.target/msp430/devices/bad-devices-2.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-3.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-4.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-5.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-6.c: Likewise.
+	* gcc.target/msp430/devices/csv-device-order.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_00.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_01.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_02.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_04.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_08.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_10.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_11.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_12.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_14.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_18.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_20.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_21.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_22.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_24.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_28.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430fr5969.c: Likewise.
+	* gcc.target/msp430/devices/hard-foo.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-1.csv: New test support file.
+	* gcc.target/msp430/devices/bad-devices-2.csv: Likewise.
+	* gcc.target/msp430/devices/bad-devices-3.csv: Likewise.
+	* gcc.target/msp430/devices/bad-devices-4.csv: Likewise.
+	* gcc.target/msp430/devices/bad-devices-5.csv: Likewise.
+	* gcc.target/msp430/devices/bad-devices-6.csv: Likewise.
+	* gcc.target/msp430/devices/devices.csv: Likewise.
+
+2019-08-13  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/msp430.exp
+	(check_effective_target_msp430_430_selected): New.
+	(check_effective_target_msp430_430x_selected): New.
+	(check_effective_target_msp430_mlarge_selected): New.
+	(check_effective_target_msp430_hwmul_not_none): New.
+	(check_effective_target_msp430_hwmul_not_16bit): New.
+	(check_effective_target_msp430_hwmul_not_32bit): New.
+	(check_effective_target_msp430_hwmul_not_f5): New.
+	(msp430_get_opts): New.
+	(msp430_device_permutations_runtest): New.
+	* gcc.target/msp430/devices/README: New file.
+	* gcc.target/msp430/devices-main.c: New test.
+	* gcc.target/msp430/devices/hard-cc430f5123.c: Likewise.
+	* gcc.target/msp430/devices/hard-foo.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430afe253.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430cg4616.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430f4783.c: Likewise.
+	* gcc.target/msp430/devices/hard-rf430frl154h_rom.c: Likewise.
+
+2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/asm-x-constraint-1.c: New test.
+	* gcc.target/aarch64/asm-y-constraint-1.c: Likewise.
+
+2019-08-13  Janne Blomqvist  <jb@gcc.gnu.org>
+
+        PR fortran/91414
+        * gfortran.dg/random_seed_1.f90: Update to match new seed size.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/discr56.adb, gnat.dg/discr56.ads,
+	gnat.dg/discr56_pkg1.adb, gnat.dg/discr56_pkg1.ads,
+	gnat.dg/discr56_pkg2.ads: New testcase.
+
+2019-08-13  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/tagged4.adb: New testcase.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/generic_inst10.adb, gnat.dg/generic_inst10_pkg.ads:
+	New testcase.
+
+2019-08-13  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/tagged3.adb, gnat.dg/tagged3_pkg.adb,
+	gnat.dg/tagged3_pkg.ads: New testcase.
+
+2019-08-13  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/aggr27.adb: New testcase.
+
+2019-08-13  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/aggr26.adb: New testcase.
+
+2019-08-13  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/allocator2.adb, gnat.dg/allocator2.ads: New testcase.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/generic_inst9.adb, gnat.dg/generic_inst9.ads,
+	gnat.dg/generic_inst9_pkg1-operator.ads,
+	gnat.dg/generic_inst9_pkg1.ads, gnat.dg/generic_inst9_pkg2.adb,
+	gnat.dg/generic_inst9_pkg2.ads: New testcase.
+
+2019-08-13  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/anon3.adb, gnat.dg/anon3.ads: New testcase.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/generic_inst8.adb, gnat.dg/generic_inst8.ads,
+	gnat.dg/generic_inst8_g.adb, gnat.dg/generic_inst8_g.ads: New
+	testcase.
+
+2019-08-13  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/tag2.adb, gnat.dg/tag2_pkg.ads: New testcase.
+
+2019-08-13  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/tree-prof/ic-misattribution-1.c: Use -fdump-ipa-profile-node.
+
+2019-08-12  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/91424
+	* gfortran.dg/do_subscript_3.f90: New test.
+	* gfortran.dg/do_subscript_4.f90: New test.
+	* gfortran.dg/pr70754.f90: Use indices that to not overflow.
+
+2019-08-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/83250
+	PR target/91340
+	* gcc.target/i386/avx-typecast-1.c: New test.
+	* gcc.target/i386/avx-typecast-2.c: New test.
+	* gcc.target/i386/avx512f-typecast-2.c: New test.
+
+2019-08-12  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/null_check.adb: New testcase.
+
+2019-08-12  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/renaming15.adb: New testcase.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/slice10.adb: New testcase.
+
+2019-08-12  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/generic_inst7.adb, gnat.dg/generic_inst7_pkg.adb,
+	gnat.dg/generic_inst7_pkg.ads, gnat.dg/generic_inst7_types.ads:
+	New testcase.
+
+2019-08-12  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/equal10.adb, gnat.dg/equal10.ads: New testcase.
+
+2019-08-12  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/suppress_initialization2.adb,
+	gnat.dg/suppress_initialization2.ads: New testcase.
+
+2019-08-12  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/no_caching.adb, gnat.dg/no_caching.ads: New testcase.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/range_check7.adb: New testcase.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/range_check6.adb: New testcase.
+
+2019-08-11  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/90601
+	* gdc.dg/pr90601.d: New test.
+
+2019-08-10  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/boz_8.f90: Adjust error messages.
+	* gfortran.dg/nan_4.f90: Ditto.
+	* gfortran.dg/boz_1.f90: Add -fallow-invalid-boz to dg-options,
+	and test for warnings.
+	* gfortran.dg/boz_3.f90: Ditto.
+	* gfortran.dg/boz_4.f90: Ditto.
+	* gfortran.dg/dec_structure_6.f90: Ditto.
+	* gfortran.dg/ibits.f90: Ditto.
+
+2019-08-10  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/91238
+	* gdc.dg/pr91238.d: New test.
+
+2019-08-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/declare-target-2.c: Don't expect error for
+	declare target with clauses in between declare target without clauses
+	and end declare target.
+	* c-c++-common/gomp/declare-target-4.c: New test.
+
+	PR target/91408
+	* gcc.target/i386/pr91408.c: New test.
+
+2019-08-09  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/vec_rotate-1.c: Rename to ...
+	* gcc.target/powerpc/vec-rotate-1.c: ... this.  Add -maltivec option.
+	* gcc.target/powerpc/vec_rotate-2.c: Rename to ...
+	* gcc.target/powerpc/vec-rotate-2.c: ... this.
+	* gcc.target/powerpc/vec_rotate-3.c: Rename to ...
+	* gcc.target/powerpc/vec-rotate-3.c: ... this.  Add -maltivec option.
+	* gcc.target/powerpc/vec_rotate-4.c: Rename to ...
+	* gcc.target/powerpc/vec-rotate-4.c: ... this.
+
+2019-08-09  Sam Tebbs  <sam.tebbs@arm.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_v8_4a_bkey_directive): New proc.
+	* g++.target/aarch64/return_address_sign_b_exception.C,
+	return_address_sign_ab_exception.C: Add dg-require-effective-target
+	checks.
+
+2019-08-09  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR middle-end/90313
+	* g++.dg/torture/pr90313.cc: New test.
+
+2019-08-09  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/lto/devirt-19_0.C: Add -flto=auto.
+
+2019-08-09  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/spellcheck-options-21.c: New test.
+
+2019-08-09  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/ipa/ipa-icf-2.C: Add -optimized to -fdump-ipa-icf.
+	* g++.dg/ipa/ipa-icf-3.C: Likewise.
+	* g++.dg/ipa/ipa-icf-4.C: Likewise.
+	* g++.dg/ipa/ipa-icf-6.C: Likewise.
+	* gcc.dg/ipa/ipa-icf-1.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-10.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-11.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-12.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-13.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-16.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-18.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-2.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-20.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-21.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-23.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-25.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-26.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-27.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-3.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-35.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-36.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-37.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-38.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-39.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-5.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-7.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-8.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-merge-1.c: Likewise.
+	* gcc.dg/ipa/pr64307.c: Likewise.
+	* gcc.dg/ipa/pr90555.c: Likewise.
+
+2019-08-09  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/tree-prof/indir-call-prof.C: Add -optimize
+	to -fdump-ipa-profile.
+	* g++.dg/tree-prof/morefunc.C: Likewise.
+	* g++.dg/tree-prof/reorder.C: Likewise.
+	* gcc.dg/tree-prof/ic-misattribution-1.c: Likewise.
+	* gcc.dg/tree-prof/indir-call-prof.c: Likewise.
+	* gcc.dg/tree-prof/stringop-1.c: Likewise.
+	* gcc.dg/tree-prof/stringop-2.c: Likewise.
+	* gcc.dg/tree-prof/val-prof-1.c: Likewise.
+	* gcc.dg/tree-prof/val-prof-2.c: Likewise.
+	* gcc.dg/tree-prof/val-prof-3.c: Likewise.
+	* gcc.dg/tree-prof/val-prof-4.c: Likewise.
+	* gcc.dg/tree-prof/val-prof-5.c: Likewise.
+	* gcc.dg/tree-prof/val-prof-7.c: Likewise.
+
+2019-08-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/if-4.c: New test.
+	* c-c++-common/gomp/clause-dups-1.c: New test.
+
+	PR c/91401
+	* c-c++-common/gomp/pr91401-1.c: New test.
+	* c-c++-common/gomp/pr91401-2.c: New test.
+
+2019-08-09  Alexandre Oliva  <oliva@adacore.com>
+
+	* gcc.target/i386/sse2-mul-1.c: Use rand.  Drop fallback.
+	* gcc.target/i386/sse4_1-blendps-2.c: Likewise.
+	* gcc.target/i386/sse4_1-blendps.c: Likewise.
+	* gcc.target/i386/xop-vshift-1.c: Likewise.
+	* gcc.target/powerpc/direct-move.h: Likewise.
+
+2019-08-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/enum20.C: Test location(s) too.
+	* g++.dg/other/friend3.C: Likewise.
+	* g++.dg/parse/dtor5.C: Likewise.
+	* g++.dg/parse/friend7.C: Likewise.
+	* g++.dg/template/error22.C: Likewise.
+	* g++.old-deja/g++.brendan/err-msg5.C: Likewise.
+
+2019-08-08  Jim Wilson  <jimw@sifive.com>
+
+	PR target/91229
+	* gcc.target/riscv/flattened-struct-abi-1.c: New test.
+	* gcc.target/riscv/flattened-struct-abi-2.c: New test.
+
+2019-08-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/79520
+	* g++.dg/cpp1y/constexpr-79520.C: New test.
+
+2019-08-08  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/pr79983.c (enum E): Don't allow an error about nested
+	definitions.
+	* gcc.dg/enum-redef-1.c: New test.
+
+2019-08-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87519 - bogus warning with -Wsign-conversion.
+	* g++.dg/warn/Wsign-conversion-5.C: New test.
+
+	* g++.dg/cpp2a/inline-asm3.C: New test.
+
+2019-08-07  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91359
+	* pr91359_2.f: Fix missing hyphen in dg-do
+	* pr91359_1.f: Ditto.  Remove RESULT variable to test actual fix!
+
+2019-08-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/67533
+	* g++.dg/tls/thread_local-ice5.C: New test.
+
+2019-08-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/init_13.c: New test.
+
+2019-08-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/init_12.c: Expect w1 to be moved into
+	a temporary FPR.
+
+2019-08-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/clastb_8.c: New test.
+
+2019-08-07  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/91385
+	* gcc.target/i386/pr91385.c: New test.
+
+2019-08-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/81429 - wrong parsing of constructor with C++11 attribute.
+	* g++.dg/cpp0x/gen-attrs-68.C: New test.
+	* g++.dg/cpp0x/gen-attrs-69.C: New test.
+
+2019-08-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91346 - Implement P1668R1, allow unevaluated asm in constexpr.
+	* g++.dg/cpp2a/inline-asm1.C: New test.
+	* g++.dg/cpp2a/inline-asm2.C: New test.
+	* g++.dg/cpp1y/constexpr-neg1.C: Adjust dg-error.
+
+2019-08-07  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	PR fortran/53796
+	* gfortran.dg/inquire_recl_f2018.f90: Test for unconnected unit
+	with inquire via filename.
+
+2019-08-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/target-data-1.c (foo): Use use_device_addr clause
+	instead of use_device_ptr clause where required by OpenMP 5.0, add
+	further tests for both use_device_ptr and use_device_addr clauses.
+
+2019-08-07  Kewen Lin  <linkw@gcc.gnu.org>
+
+	* gcc.target/powerpc/vec_rotate-1.c: New test.
+	* gcc.target/powerpc/vec_rotate-2.c: New test.
+	* gcc.target/powerpc/vec_rotate-3.c: New test.
+	* gcc.target/powerpc/vec_rotate-4.c: New test.
+
+2019-08-07  Alexandre Oliva  <oliva@adacore.com>
+
+	* gcc.target/i386/math_m_pi.h: New.
+	* gcc.target/i386/sse4_1-round.h: Use it.
+	* gcc.target/i386/pr73350.c: Likewise.
+	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Likewise.
+	* gcc.target/i386/avx512f-vfixupimmps-2.c: Likewise.
+	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Likewise.
+	* gcc.target/i386/avx512f-vfixupimmss-2.c: Likewise.
+	* gcc.target/i386/avx512f-vfixupimmss-2.c: Likewise.
+	* gcc.target/i386/avx-ceil-sfix-2-vec.c: Likewise.  Drop
+	dg-skip-if "no M_PI".
+	* gcc.target/i386/avx-cvt-2-vec.c: Likewise.
+	* gcc.target/i386/avx-floor-sfix-2-vec.c: Likewise.
+	* gcc.target/i386/avx-rint-sfix-2-vec.c: Likewise.
+	* gcc.target/i386/avx-round-sfix-2-vec.c: Likewise.
+	* gcc.target/i386/avx512f-ceil-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-ceil-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-ceilf-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-ceilf-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-floor-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-floor-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-floorf-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-floorf-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-rint-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-rintf-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-round-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-roundf-sfix-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-trunc-vec-1.c: Likewise.
+	* gcc.target/i386/avx512f-truncf-vec-1.c: Likewise.
+	* gcc.target/i386/sse2-cvt-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-ceil-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-ceil-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-ceilf-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-ceilf-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-floor-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-floor-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-floorf-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-floorf-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-rint-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-rint-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-rintf-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-rintf-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-round-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-round-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-roundf-sfix-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-roundf-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-roundsd-4.c: Likewise.
+	* gcc.target/i386/sse4_1-roundss-4.c: Likewise.
+	* gcc.target/i386/sse4_1-trunc-vec.c: Likewise.
+	* gcc.target/i386/sse4_1-truncf-vec.c: Likewise.
+
+2019-08-06  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91359
+	* gfortran.dg/pr91359_1.f: New test.
+	* gfortran.dg/pr91359_2.f: Ditto.
+
+2019-08-06  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/42546
+	* gfortran.dg/allocated_1.f90: New test.
+	* gfortran.dg/allocated_2.f90: Ditto.
+
+2019-08-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.target/i386/avx512vp2intersect-2intersect-1b.c (AVX512F):
+	Remove.
+	(AVX512VP2INTERSECT): Define.
+	* gcc.target/i386/avx512vp2intersect-2intersectvl-1b.c (AVX512F):
+	Remove.
+	(AVX512VP2INTERSECT): Define.
+
+2019-08-06  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/desig1.C: Check location too.
+
+2019-08-05  Marek Polacek  <polacek@redhat.com>
+
+	DR 2413 - typename in conversion-function-ids.
+	* g++.dg/cpp2a/typename17.C: New test.
+
+2019-08-05  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/50476
+	* gcc.dg/uninit-pr50476.c: New test.
+
+	PR c++/60517
+	* g++.dg/pr60517.C: New test.
+
+2019-08-02  Tom Honermann  <tom@honermann.net>
+
+	PR c++/88095
+	* g++.dg/cpp2a/udlit-class-nttp-ctad.C: New test.
+	* g++.dg/cpp2a/udlit-class-nttp-ctad-neg.C: New test.
+	* g++.dg/cpp2a/udlit-class-nttp-ctad-neg2.C: New test.
+	* g++.dg/cpp2a/udlit-class-nttp.C: New test.
+	* g++.dg/cpp2a/udlit-class-nttp-neg.C: New test.
+	* g++.dg/cpp2a/udlit-class-nttp-neg2.C: New test.
+
+2019-08-05  Steven g. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91372
+	* gfortran.dg/pr91372.f90: New test.
+
+2019-08-05  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91338 - Implement P1161R3: Deprecate a[b,c].
+	* g++.dg/cpp2a/comma1.C: New test.
+	* g++.dg/cpp2a/comma2.C: New test.
+	* g++.dg/cpp2a/comma3.C: New test.
+	* g++.dg/cpp2a/comma4.C: New test.
+
+2019-08-05  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/mask_load_1.c: New test.
+
+2019-08-05  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/pr80993.c: Add cleanup-saved-temps to final
+	actions.
+
+2019-08-05  Martin Liska  <mliska@suse.cz>
+
+	PR c++/91334
+	* g++.dg/torture/pr91334.C: New test.
+
+2019-08-05  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/91169
+	* gnat.dg/array37.adb: New testcase.
+
+2019-08-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/91341
+	* gcc.target/i386/avx-loadu2-m128-1.c: New test.
+	* gcc.target/i386/avx-loadu2-m128-2.c: New test.
+	* gcc.target/i386/avx-loadu2-m128d-1.c: New test.
+	* gcc.target/i386/avx-loadu2-m128d-2.c: New test.
+	* gcc.target/i386/avx-loadu2-m128i-1.c: New test.
+	* gcc.target/i386/avx-loadu2-m128i-2.c: New test.
+	* gcc.target/i386/avx-storeu2-m128-1.c: New test.
+	* gcc.target/i386/avx-storeu2-m128-2.c: New test.
+	* gcc.target/i386/avx-storeu2-m128d-1.c: New test.
+	* gcc.target/i386/avx-storeu2-m128d-2.c: New test.
+	* gcc.target/i386/avx-storeu2-m128i-1.c: New test.
+	* gcc.target/i386/avx-storeu2-m128i-2.c: New test.
+
+2019-08-05  Kito Cheng  <kito.cheng@sifive.com>
+
+	* gcc.target/riscv/promote-type-for-libcall.c: New.
+
+2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90985
+	* gfortran.dg/pr90985.f90: New test.
+
+2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90986
+	* gfortran.dg/equiv_10.f90: New test.
+
+2019-08-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/56428
+	* g++.dg/cpp0x/nontype4.C: New test.
+
+2019-08-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/53009
+	* g++.dg/cpp0x/nontype3.C: New test.
+
+2019-08-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/77575
+	* g++.dg/cpp0x/nontype2.C: New test.
+
+2019-08-02  Steve Ellcey  <sellcey@marvell.com>
+
+	* gcc.target/aarch64/simd_pcs_attribute.c: New test.
+	* gcc.target/aarch64/simd_pcs_attribute-2.c: Ditto.
+	* gcc.target/aarch64/simd_pcs_attribute-3.c: Ditto.
+
+2019-08-02  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/91201
+	* gcc.target/i386/sse4_1-pr91201.c: New test.
+
+2019-08-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91230 - wrong error with __PRETTY_FUNCTION__ and generic lambda.
+	* g++.dg/cpp1y/lambda-generic-pretty1.C: New test.
+
+2019-08-02  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/91323
+	* gcc.dg/torture/pr91323.c: New test.
+
+2019-08-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp1z/nodiscard6.C: New.
+
+2019-08-02  Senthil Kumar Selvaraj  <senthilkumar.selvaraj@microchip.com>
+
+	* gcc.dg/torture/ssa-fre-5.c: Add dg-require-effective-target int32.
+	* gcc.dg/torture/ssa-fre-7.c: Likewise.
+
+2019-08-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91201
+	* gcc.target/i386/sse2-pr91201-3.c: New test.
+	* gcc.target/i386/sse2-pr91201-4.c: New test.
+	* gcc.target/i386/sse2-pr91201-5.c: New test.
+	* gcc.target/i386/sse2-pr91201-6.c: New test.
+
+2019-08-02  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/cpp1y/new2.C: New test.
+
+2019-08-02  Senthil Kumar Selvaraj  <senthilkumar.selvaraj@microchip.com>
+
+	* gcc.dg/torture/ssa-fre-6.c: Add dg-require-effective-target int32.
+
+2019-08-02  Kito Cheng  <kito.cheng@sifive.com>
+
+	* g++.dg/lto/pr87906_0.C: Add dg-require-effective-target shared check.
+
+2019-08-01  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/90947
+	* c-c++-common/array-1.c: New test.
+	* g++.dg/abi/mangle73.C: New test.
+	* g++.dg/cpp2a/nontype-class23.C: New test.
+	* g++.dg/init/array53.C: New test.
+
+2019-08-01  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/85693
+	* gcc.target/i386/pr85693-1.c: New test.
+
+2019-08-01  Matthew Beliveau  <mbelivea@redhat.com>
+
+	PR c++/90590
+	* c-c++-common/pr90590-1.c: New test.
+	* c-c++-common/pr90590-1.h: New test.
+	* c-c++-common/pr90590-2.c: New test.
+	* c-c++-common/pr90590-2.h: New test.
+
+2019-08-01  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90805 - detect narrowing in case values.
+	* c-c++-common/pr89888.c: Update expected dg-error.
+	* g++.dg/cpp0x/Wnarrowing17.C: New test.
+	* g++.dg/cpp0x/enum28.C: Update expected dg-error.
+
+2019-08-01  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* g++.dg/lto/pr89330_0.C: Add effective-target shared.
+
+2019-08-01  Kito Cheng  <kito.cheng@sifive.com>
+
+	* gcc.target/riscv/attribute-10.c: Fix testcase on rv64.
+
+2019-07-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/delete1.C: New.
+
+2019-07-31  Maxim Blinov  <maxim.blinov@embecosm.com>
+
+	* gcc.target/riscv/attribute-10.c: New test.
+
+2019-07-31  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91280
+	* g++.dg/torture/pr91280.C: New testcase.
+
+2019-07-31  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91293
+	* gcc.dg/vect/pr91293-1.c: New testcase.
+	* gcc.dg/vect/pr91293-2.c: Likewise.
+	* gcc.dg/vect/pr91293-3.c: Likewise.
+
+2019-07-31  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91201
+	* gcc.target/i386/sse2-pr91201-2.c: New test.
+
+2019-07-31  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91178
+	* gcc.dg/torture/pr91178-2.c: New testcase.
+
+2019-07-31  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91201
+	* gcc.target/i386/sse2-pr91201.c: New test.
+	* gcc.target/i386/avx2-pr91201.c: New test.
+	* gcc.target/i386/avx512bw-pr91201.c: New test.
+
+2019-07-31  Sudakshina Das  <sudi.das@arm.com>
+
+	* gcc.target/aarch64/acle/tme.c: New test.
+	* gcc.target/aarch64/pragma_cpp_predefs_2.c: New test.
+
+2019-07-31  Joel Hutton  <Joel.Hutton@arm.com>
+
+	* gcc.target/arm/cmse/cmse-17.c: New test.
+
+2019-07-30  Martin Sebor  <msebor@redhat.com>
+
+	PR testsuite/91258
+	* g++.dg/ubsan/vla-1.C: Suppress a valid warning.
+
+2019-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91296
+	* gfortran.dg/pr91296.f90: New test.
+
+2019-07-30  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/91270
+	* g++.dg/torture/pr91270.C: New test.
+
+2019-07-30  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/vect/vect-cond-arith-7.c: New test.
+
+2019-07-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91282
+	* gcc.dg/type-convert-var.c: Add -fexcess-precision=fast to
+	dg-additional-options.
+
+	PR middle-end/91216
+	* gcc.dg/gomp/pr91216.c: New test.
+
+	PR target/91150
+	* gcc.target/i386/avx512bw-pr91150.c: New test.
+
+2019-07-29  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/pr78818-data-region.c: Add -mlarge to dg-options.
+	* gcc.target/msp430/region-misuse-code.c: New test.
+	* gcc.target/msp430/region-misuse-data.c: Likewise.
+	* gcc.target/msp430/region-misuse-code-data.c: Likewise.
+	* gcc.target/msp430/region-attribute-misuse.c: Likewise.
+
+2019-07-29  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	PR target/70320
+	* gcc.target/msp430/asm-register-names-lower-case.c: New test.
+	* gcc.target/msp430/asm-register-names-upper-case.c: Likewise.
+
+2019-07-29  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/cpp1y/new1.C (test_unused): Add new case that causes
+	ICE.
+
+2019-07-29  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91267
+	* gcc.dg/torture/pr91267.c: New testcase.
+
+2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* c-c++-common/guality/Og-dce-1.c: New test.
+	* c-c++-common/guality/Og-dce-2.c: Likewise.
+	* c-c++-common/guality/Og-dce-3.c: Likewise.
+
+2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* c-c++-common/guality/Og-global-dse-1.c: New test.
+
+2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* c-c++-common/guality/Og-static-wo-1.c: New test.
+	* g++.dg/guality/guality.exp: Separate the c-c++-common tests into
+	"Og" and "general" tests.  Run the latter at -O0 and -Og only.
+	* gcc.dg/guality/guality.exp: Likewise.
+
+2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* lib/scanasm.exp (parse_function_bodies, check_function_body)
+	(check-function-bodies): New procedures.
+	* gcc.target/aarch64/sve/init_1.c: Use check-function-bodies
+	instead of scan-assembler.
+	* gcc.target/aarch64/sve/init_2.c: Likewise.
+	* gcc.target/aarch64/sve/init_3.c: Likewise.
+	* gcc.target/aarch64/sve/init_4.c: Likewise.
+	* gcc.target/aarch64/sve/init_5.c: Likewise.
+	* gcc.target/aarch64/sve/init_6.c: Likewise.
+	* gcc.target/aarch64/sve/init_7.c: Likewise.
+	* gcc.target/aarch64/sve/init_8.c: Likewise.
+	* gcc.target/aarch64/sve/init_9.c: Likewise.
+	* gcc.target/aarch64/sve/init_10.c: Likewise.
+	* gcc.target/aarch64/sve/init_11.c: Likewise.
+	* gcc.target/aarch64/sve/init_12.c: Likewise.
+
+2019-07-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.dg/lto/pr89330_0.C (dg-lto-options): Add -fPIC.
+	Require fpic support.
+
+2019-07-27  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/bmi2-bzhi64-1a.c: Add options to enable altivec
+	and vsx.
+
+2019-07-26  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* lib/scanasm.exp (object-size): Handle Darwin's size command.
+
+2018-07-26  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.dg/type-convert-var.c: New test.
+
+2019-07-26  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/89330
+	* g++.dg/lto/pr89330_[01].C: New test.
+	* g++.dg/tree-prof/devirt.C: Added -fno-profile-values to dg-options.
+
+2019-07-25  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91183
+	PR tree-optimization/86688
+	* gcc.dg/Wstringop-overflow-14.c: Disable for stricly aligned targets.
+	* gcc.dg/strlenopt-70.c: Fix bugs.
+	* gcc.dg/strlenopt-71.c: Same.
+	* gcc.dg/strlenopt-72.c: Same.
+
+2019-07-25  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/91223
+	* gcc.target/i386/pr91223.c: New test.
+
+2019-07-25  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR gcov-profile/91087
+	* g++.dg/gcov/pr16855.C: Xfail the count lines for the DTORs and the
+	"final" line for the failure summaries.  Adjust source layout so that
+	dejagnu xfail expressions work.
+
+2019-07-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/65819
+	* gfortran.dg/dependency_54.f90: New test.
+
+2019-07-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/case_optimization3.ad[sb]: New test.
+
+2019-07-25  Martin Liska  <mliska@suse.cz>
+	    Dominik Infuhr  <dominik.infuehr@theobroma-systems.com>
+
+	PR c++/23383
+	* g++.dg/cpp1y/new1.C: New test.
+
+2019-07-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR testsuite/91245
+	* gnat.dg/float_value1.adb: Only run on x86.
+
+2019-07-24  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91183
+	PR tree-optimization/86688
+	* c-c++-common/ubsan/object-size-9.c: Disable warnings.
+	* gcc.dg/Wstringop-overflow-14.c: New test.
+	* gcc.dg/attr-nonstring-2.c: Remove xfails.
+	* gcc.dg/strlenopt-70.c: New test.
+	* gcc.dg/strlenopt-71.c: New test.
+	* gcc.dg/strlenopt-72.c: New test.
+	* gcc.dg/strlenopt-8.c: Remove xfails.
+
+2019-07-24  Martin Sebor  <msebor@redhat.com>
+
+	PR driver/80545
+	* gcc.misc-tests/help.exp: Add tests.
+	* lib/options.exp: Handle C++.
+
+2019-07-24  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	* gcc.target/arc/arc.exp (check_effective_target_accregs): New
+	predicate.
+	* gcc.target/arc/builtin_special.c: Update test/
+	* gcc.target/arc/interrupt-1.c: Likewise.
+	* gcc.target/arc/interrupt-10.c: New test.
+	* gcc.target/arc/interrupt-11.c: Likewise.
+	* gcc.target/arc/interrupt-12.c: Likewise.
+
+2019-07-24  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/addsub-signed-overflow-1.c: New test.
+	* gcc.target/s390/addsub-signed-overflow-2.c: New test.
+	* gcc.target/s390/mul-signed-overflow-1.c: New test.
+	* gcc.target/s390/mul-signed-overflow-2.c: New test.
+
+2019-07-24  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR middle-end/91166
+	* gcc.target/aarch64/sve/pr91166.c: New test.
+
+2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/54072
+	* gfortran.dg/illegal_boz_arg_1.f90: New tests.
+
+2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/achar_5.f90: Fix for new BOZ handling.
+	* arithmetic_overflow_1.f90: Ditto.
+	* gfortran.dg/boz_11.f90: Ditto.
+	* gfortran.dg/boz_12.f90: Ditto.
+	* gfortran.dg/boz_4.f90: Ditto.
+	* gfortran.dg/boz_5.f90: Ditto.
+	* gfortran.dg/boz_6.f90: Ditto.
+	* gfortran.dg/boz_7.f90: Ditto.
+	* gfortran.dg/boz_8.f90: Ditto.
+	* gfortran.dg/dec_structure_6.f90: Ditto.
+	* gfortran.dg/dec_union_1.f90: Ditto.
+	* gfortran.dg/dec_union_2.f90: Ditto.
+	* gfortran.dg/dec_union_5.f90: Ditto.
+	* gfortran.dg/dshift_3.f90: Ditto.
+	* gfortran.dg/gnu_logical_2.f90: Ditto.
+	* gfortran.dg/int_conv_1.f90: Ditto.
+	* gfortran.dg/ishft_1.f90: Ditto.
+	* gfortran.dg/nan_4.f90: Ditto.
+	* gfortran.dg/no_range_check_3.f90: Ditto.
+	* gfortran.dg/pr16433.f: Ditto.
+	* gfortran.dg/pr44491.f90: Ditto.
+	* gfortran.dg/pr58027.f90: Ditto.
+	* gfortran.dg/pr81509_2.f90: Ditto.
+	* gfortran.dg/unf_io_convert_1.f90: Ditto.
+	* gfortran.dg/unf_io_convert_2.f90: Ditto.
+	* gfortran.fortran-torture/execute/intrinsic_fraction_exponent.f90:
+	Ditto.
+	* gfortran.fortran-torture/execute/intrinsic_mvbits.f90: Ditto.
+	* gfortran.fortran-torture/execute/intrinsic_nearest.f90: Ditto.
+	* gfortran.fortran-torture/execute/seq_io.f90: Ditto.
+	* gfortran.dg/gnu_logical_1.F: Delete test.
+	* gfortran.dg/merge_bits_3.f90: New test.
+	* gfortran.dg/merge_bits_3.f90: Ditto.
+	* gfortran.dg/boz_int.f90: Ditto.
+	* gfortran.dg/boz_bge.f90: Ditto.
+	* gfortran.dg/boz_complex_1.f90: Ditto.
+	* gfortran.dg/boz_complex_2.f90: Ditto.
+	* gfortran.dg/boz_complex_3.f90: Ditto.
+	* gfortran.dg/boz_dble.f90: Ditto.
+	* gfortran.dg/boz_dshift_1.f90: Ditto.
+	* gfortran.dg/boz_dshift_2.f90: Ditto.
+	* gfortran.dg/boz_float_1.f90: Ditto.
+	* gfortran.dg/boz_float_2.f90: Ditto.
+	* gfortran.dg/boz_float_3.f90: Ditto.
+	* gfortran.dg/boz_iand_1.f90: Ditto.
+	* gfortran.dg/boz_iand_2.f90: Ditto.
+
+2019-07-23  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/86061
+	* gcc.dg/tree-ssa/pr86061.c: New test.
+
+2019-07-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/83518
+	* gcc.dg/tree-ssa/ssa-fre-79.c: New testcase.
+
+2019-07-23  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/task4.adb: New testcase.
+
+2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/range_check5.adb: New testcase.
+
+2019-07-23  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/iter5.adb: Add an expected error.
+	* gnat.dg/iter6.adb: New testcase.
+
+2019-07-23  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/ghost6.adb, gnat.dg/ghost6_pkg.ads: New testcase.
+
+2019-07-22  Sylvia Taylor  <sylvia.taylor@arm.com>
+
+	* gcc.target/aarch64/simd/ssra.c: New test.
+	* gcc.target/aarch64/simd/usra.c: New test.
+
+2019-07-22  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/isr-push-pop-main.c: New test.
+	* gcc.target/msp430/isr-push-pop-isr-430.c: Likewise.
+	* gcc.target/msp430/isr-push-pop-isr-430x.c: Likewise.
+	* gcc.target/msp430/isr-push-pop-leaf-isr-430.c: Likewise.
+	* gcc.target/msp430/isr-push-pop-leaf-isr-430x.c: Likewise.
+
+2019-07-22  Andrea Corallo  <andrea.corallo@arm.com>
+
+	* jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c:
+	New testcase.
+	* jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c:
+	Adjust error message.
+
+2019-07-22  Paul A. Clarke  <pc@us.ibm.com>
+
+	* gcc.target/powerpc/sse4_1-check.h: New.
+	* gcc.target/powerpc/sse4_1-pblendvb.c: New.
+	* gcc.target/powerpc/sse4_1-pblendw.c: New.
+	* gcc.target/powerpc/sse4_1-pblendw-2.c: New.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/fixedpnt6.adb: New testcase.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/warn26.adb: New testcase.
+
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/class_wide5.adb: New testcase.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/opt80.adb: New testcase.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/warn25.adb: New testcase.
+
+2019-07-22  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/warn24.adb: New testcase.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/inline17.adb, gnat.dg/inline17_pkg1.adb,
+	gnat.dg/inline17_pkg1.ads, gnat.dg/inline17_pkg2.ads,
+	gnat.dg/inline17_pkg3.adb, gnat.dg/inline17_pkg3.ads: New
+	testcase.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/iter5.adb, gnat.dg/iter5_pkg.ads: New testcase.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/enum_val1.adb: New testcase.
+
+2019-07-22  Nicolas Roche  <roche@adacore.com>
+
+	* gnat.dg/float_value1.adb: New testcase.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/encode_string1.adb, gnat.dg/encode_string1_pkg.adb,
+	gnat.dg/encode_string1_pkg.ads: New testcase.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/warn23.adb: New testcase.
+
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/cpp_constructor2.adb: New testcase.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/warn22.adb: New testcase.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/loop_invariant1.adb, gnat.dg/loop_invariant1.ads: New
+	testcase.
+
+2019-07-22  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91221
+	* g++.dg/pr91221.C: New testcase.
+
+2019-07-22  Martin Liska  <mliska@suse.cz>
+
+	PR driver/91172
+	* gcc.dg/pr91172.c: New test.
+
+2019-07-22  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	* gcc.target/arc/tls-2.c: New test.
+	* gcc.target/arc/tls-3.c: Likewise.
+
+2019-07-21  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/67853
+	* g++.dg/cpp0x/decltype72.C: New test.
+
+2019-07-22  Stafford Horne  <shorne@gmail.com>
+
+	* gcc.target/or1k/ror-4.c: New file.
+	* gcc.target/or1k/shftimm-1.c: Update test from rotate to shift
+	as the shftimm option no longer controls rotate.
+
+2019-07-22  Stafford Horne  <shorne@gmail.com>
+
+	PR target/90362
+	* gcc.target/or1k/div-mul-3.c: New test.
+
+2019-07-22  Stafford Horne  <shorne@gmail.com>
+
+	PR target/90363
+	* gcc.target/or1k/swap-1.c: New test.
+	* gcc.target/or1k/swap-2.c: New test.
+
+2019-07-20  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/volatile-mem.c: New testcase.
+
+2019-07-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/91204
+	* gcc.c-torture/compile/pr91204.c: New test.
+
+	* c-c++-common/gomp/cancel-1.c: Adjust expected diagnostic wording.
+	* c-c++-common/gomp/clauses-1.c (foo, baz, bar): Add order(concurrent)
+	clause where allowed.  Add combined constructs with loop with all
+	possible clauses.
+	(qux): New function.
+	* c-c++-common/gomp/loop-1.c: New test.
+	* c-c++-common/gomp/loop-2.c: New test.
+	* c-c++-common/gomp/loop-3.c: New test.
+	* c-c++-common/gomp/loop-4.c: New test.
+	* c-c++-common/gomp/loop-5.c: New test.
+	* c-c++-common/gomp/order-3.c: Adjust expected diagnostic wording.
+	* c-c++-common/gomp/simd-setjmp-1.c: New test.
+	* c-c++-common/gomp/teams-2.c: Adjust expected diagnostic wording.
+
+	* gcc.dg/vect/vect-simd-16.c: New test.
+
+2019-07-19  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/86061
+	* gcc.dg/tree-ssa/ssa-dse-37.c: New test.
+	* gcc.dg/tree-ssa/ssa-dse-38.c: New test.
+
+2019-07-19  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91211
+	* gcc.dg/torture/pr91211.c: New testcase.
+
+2019-07-19  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91200
+	* gcc.dg/torture/pr91200.c: New testcase.
+
+2019-07-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91190
+	* gcc.c-torture/compile/pr91190.c: New test.
+
+2019-07-19  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91207
+	* gcc.dg/torture/pr91207.c: New testcase.
+
+2019-07-18  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/91188
+	* gcc.target/i386/pr91188-1a.c: New test.
+	* gcc.target/i386/pr91188-1b.c: Ditto.
+	* gcc.target/i386/pr91188-1c.c: Ditto.
+	* gcc.target/i386/pr91188-2a.c: Ditto.
+	* gcc.target/i386/pr91188-2b.c: Ditto.
+	* gcc.target/i386/pr91188-2c.c: Ditto.
+
+2019-07-18  Sylvia Taylor  <sylvia.taylor@arm.com>
+
+	PR target/90317
+	* gcc.target/arm/crypto-vsha1cq_u32.c (foo): Change return type to
+	uint32_t.
+	(GET_LANE, TEST_SHA1C_VEC_SELECT): New.
+	* gcc.target/arm/crypto-vsha1h_u32.c (foo): Change return type to
+	uint32_t.
+	(GET_LANE, TEST_SHA1H_VEC_SELECT): New.
+	* gcc.target/arm/crypto-vsha1mq_u32.c (foo): Change return type to
+	uint32_t.
+	(GET_LANE, TEST_SHA1M_VEC_SELECT): New.
+	* gcc.target/arm/crypto-vsha1pq_u32.c (foo): Change return type to
+	uint32_t.
+	(GET_LANE, TEST_SHA1P_VEC_SELECT): New.
+
+2019-07-18  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/lto/alias-5_0.C: New testcase.
+	* g++.dg/lto/alias-5_1.C: New.
+	* g++.dg/lto/alias-5_2.c: New.
+
+2019-07-18  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/91137
+	* gcc.c-torture/execute/pr91137.c: New test.
+
+2019-07-18  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* c-c++-common/pr53633-2.c: New test.
+
+2019-07-17  Alexandre Oliva  <oliva@adacore.com>
+
+	PR middle-end/81824
+	* g++.dg/Wmissing-attributes-1.C: New.  Some of its fragments
+	are from Martin Sebor.
+
+2019-07-17  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90455
+	* g++.dg/cpp0x/nsdmi-list6.C: New test.
+
+2019-07-17  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/lto/alias-4_0.C
+
+2019-07-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91178
+	* gcc.dg/torture/pr91178.c: New testcase.
+
+2019-07-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91180
+	* gcc.dg/torture/pr91180.c: New testcase.
+
+2019-07-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91157
+	* gcc.target/i386/avx512f-pr91157.c: New test.
+	* gcc.target/i386/avx512bw-pr91157.c: New test.
+
+2019-07-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91181
+	* gcc.dg/pr91181.c: New testcase.
+
+2019-07-16  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/90903
+	* gfortran.dg/check_bits_1.f90: New testcase.
+
+2019-07-16  Jeff Law  <law@redhat.com>
+
+	PR rtl-optimization/91173
+	* g++.dg/pr91173.C: New test.
+
+2019-07-16  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR target/89190
+	* gcc.target/arm/pr89190.c: New test.
+
+2019-07-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/91164
+	* g++.dg/opt/pr91164.C: New test.
+
+2019-07-16  Jan Hubicka  <jh@suse.cz>
+
+	* g++.dg/lto/alias-1_0.C: Use -O3.
+	* g++.dg/lto/alias-2_0.C: Use -O3.
+	* g++.dg/lto/alias-3_0.C: Add loop to enable inlining with
+	-fno-use-linker-plugin.
+	* g++.dg/lto/alias-3_1.C: Remove dg-lto-do and dg-lto-options.
+
+2019-07-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.dg/tree-ssa/pr84512.c: Don't xfail scan-tree-dump on
+	sparcv9.
+
+2019-07-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.dg/autopar/pr91162.c: Require int128 support.
+
+2019-07-15  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/91162
+	* gcc.dg/autopar/pr91162.c: New testcase.
+
+2019-07-15  Kewen Lin  <linkw@gcc.gnu.org>
+
+	PR tree-optimization/88497
+	* gcc.dg/tree-ssa/pr88497-1.c: New test.
+	* gcc.dg/tree-ssa/pr88497-2.c: Likewise.
+	* gcc.dg/tree-ssa/pr88497-3.c: Likewise.
+	* gcc.dg/tree-ssa/pr88497-4.c: Likewise.
+	* gcc.dg/tree-ssa/pr88497-5.c: Likewise.
+	* gcc.dg/tree-ssa/pr88497-6.c: Likewise.
+	* gcc.dg/tree-ssa/pr88497-7.c: Likewise.
+
+2019-07-14  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/87233
+	* gfortran.dg/initialization_14.f90: Modify to now pass by
+	removing two dg-error commands. Added comments.
+	* gfortran.dg/initialization_30.f90: New test that includes the
+	two tests removed above with the 'dg-options -std=f95'.
+
+2019-07-14  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.dg/tree-ssa/pr84512.c (dg-final): Remove XFAIL on alpha*-*-*.
+
+2019-07-14  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/91148
+	* gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Adjust.
+	* gcc.target/powerpc/byte-in-set-2.c: Adjust.
+	* gcc.target/powerpc/cmpb-3.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-all-nez-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-any-eqz-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xl-len-13.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xst-len-12.c: Adjust.
+
+2019-07-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/stabs-attrib-vect-darwin.c: Require stabs
+	support.
+
+2019-07-13  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/91148
+	* gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-exp-1.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-exp-4.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-sig-1.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-extract-sig-4.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-1.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-10.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-4.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-7.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-test-data-class-11.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-test-data-class-6.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-test-data-class-7.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-test-neg-2.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-test-neg-3.c: Adjust.
+	* gcc.target/powerpc/bfp/scalar-test-neg-5.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-extract-exp-2.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-extract-exp-3.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-extract-sig-2.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-extract-sig-3.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-insert-exp-2.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-insert-exp-3.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-insert-exp-6.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-insert-exp-7.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-test-data-class-2.c: Adjust.
+	* gcc.target/powerpc/bfp/vec-test-data-class-3.c: Adjust.
+	* gcc.target/powerpc/byte-in-either-range-1.c: Adjust.
+	* gcc.target/powerpc/byte-in-range-1.c: Adjust.
+	* gcc.target/powerpc/byte-in-set-1.c: Adjust.
+	* gcc.target/powerpc/byte-in-set-2.c: Adjust.
+	* gcc.target/powerpc/cmpb-3.c: Adjust.
+	* gcc.target/powerpc/crypto-builtin-2.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-1.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-11.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-16.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-21.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-26.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-31.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-36.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-41.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-46.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-51.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-56.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-6.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-61.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-66.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-71.c: Adjust.
+	* gcc.target/powerpc/dfp/dtstsfi-76.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-all-nez-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-any-eqz-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-cmpnez-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xl-len-12.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xl-len-13.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xlx-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xrx-7.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xst-len-12.c: Adjust.
+	* gcc.target/powerpc/vsu/vec-xst-len-13.c: Adjust.
+
+2019-07-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/91149
+	* c-c++-common/gomp/reduction-task-3.c: New test.
+
+	* c-c++-common/gomp/order-3.c: New test.
+	* c-c++-common/gomp/order-4.c: New test.
+
+2019-07-12  Bill Seurer  <seurer@linux.vnet.ibm.com>
+
+	* gcc.dg/tree-ssa/vector-7.c: Fix typo.
+
+2019-07-12  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/pr57438-2.c: Remove.
+
+2019-07-12  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/Warray-bounds-43.c: New test.
+
+2019-07-12  Jan Hubicka  <jh@suse.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-9.c: New testcase.
+
+2019-07-08  Jiangning Liu  <jiangning.liu@amperecomputing.com>
+
+	PR tree-optimization/89430
+	* gcc.dg/tree-ssa/pr89430-1.c: New test.
+	* gcc.dg/tree-ssa/pr89430-2.c: New test.
+	* gcc.dg/tree-ssa/pr89430-3.c: New test.
+	* gcc.dg/tree-ssa/pr89430-4.c: New test.
+	* gcc.dg/tree-ssa/pr89430-5.c: New test.
+	* gcc.dg/tree-ssa/pr89430-6.c: New test.
+
+2019-07-12  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91145
+	* gcc.dg/torture/pr91145.c: New testcase.
+
+2019-07-12  Alexandre Oliva  <oliva@adacore.com>
+
+	* gcc.dg/gimplefe-44.c: New.
+	* gcc.dg/gimplefe-43.c: New.
+
+2019-07-12  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/vector-7.c: New testcase.
+
+2019-07-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/order-1.c: New test.
+	* c-c++-common/gomp/order-2.c: New test.
+
+2019-07-11  Sunil K Pandey  <sunil.k.pandey@intel.com>
+
+	PR target/90980
+	* gcc.target/i386/pr90980-1.c: New test.
+	* gcc.target/i386/pr90980-2.c: Likewise.
+	* gcc.target/i386/pr90980-3.c: Likewise.
+
+2019-07-11  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/loop_entry1.adb: New testcase.
+
+2019-07-11  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/prot8.adb, gnat.dg/prot8.ads: New testcase.
+
+2019-07-11  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/unreferenced2.adb: New testcase.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/self_ref1.adb: New testcase.
+
+2019-07-11  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate11.adb: New testcase.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/equal9.adb: New testcase.
+
+2019-07-11  Thomas Quinot  <quinot@adacore.com>
+
+	* gnat.dg/scos1.adb: New testcase.
+
+2019-07-11  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/access7.adb: New testcase.
+
+2019-07-11  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/warn21.adb, gnat.dg/warn21.ads: New testcase.
+
+2019-07-11  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/91131
+	* gcc.target/i386/pr91131.c: New testcase.
+
+2019-07-10  Martin Sebor  <msebor@redhat.com>
+
+	PR testsuite/91132
+	* gcc.dg/strlenopt-67.c: Removed second copy of test.
+
+2019-07-10  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR target/91102
+	* gcc.target/aarch64/pr91102.c: New test.
+
+2019-07-10  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91126
+	* gcc.dg/torture/pr91126.c: New testcase.
+
+2019-07-10  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/torture/ssa-fre-5.c: New testcase.
+	* gcc.dg/torture/ssa-fre-6.c: Likewise.
+	* gcc.dg/torture/ssa-fre-7.c: Likewise.
+
+2019-07-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/modular5.adb: New testcase.
+
+2019-07-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/limited3.adb, gnat.dg/limited3_pkg.adb,
+	gnat.dg/limited3_pkg.ads: New testcase.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/incomplete7.adb, gnat.dg/incomplete7.ads: New testcase.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/limited2.adb, gnat.dg/limited2_pack_1.adb,
+	gnat.dg/limited2_pack_1.ads, gnat.dg/limited2_pack_2.adb,
+	gnat.dg/limited2_pack_2.ads: New testcase.
+
+2019-07-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/equal8.adb, gnat.dg/equal8.ads,
+	gnat.dg/equal8_pkg.ads: New testcase.
+
+2019-07-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/complex-invalid-1.C: New.
+	* g++.dg/diagnostic/static-cdtor-1.C: Likewise.
+	* g++.dg/cpp1z/has-unique-obj-representations2.C: Test location
+	too.
+	* g++.dg/other/anon-union3.C: Adjust expected location.
+	* g++.dg/parse/error8.C: Likewise.
+
+2019-07-09  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/lto/alias-3_0.C: New file.
+	* g++.dg/lto/alias-3_1.c: New file.
+
+2019-07-09  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90989
+	* gcc.dg/strlenopt-26.c: Exit with test result status.
+	* gcc.dg/strlenopt-67.c: New test.
+
+2019-07-09  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
+
+	* gcc.target/mips/cfgcleanup-jalr1.c: New test.
+	* gcc.target/mips/cfgcleanup-jalr2.c: New test.
+	* gcc.target/mips/cfgcleanup-jalr3.c: New test.
+
+2019-07-09  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91114
+	* gcc.dg/vect/pr91114.c: New testcase.
+
+2019-07-09  Sylvia Taylor  <sylvia.taylor@arm.com>
+
+	* gcc.target/aarch64/crypto-fuse-1.c: Remove.
+	* gcc.target/aarch64/crypto-fuse-2.c: Remove.
+	* gcc.target/aarch64/aes-fuse-1.c: New testcase.
+	* gcc.target/aarch64/aes-fuse-2.c: New testcase.
+
+2019-07-09  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/arm/cmse/bitfield-1.c: Fix address of .gnu.sgstubs
+	section.
+	* gcc.target/arm/cmse/bitfield-2.c: Likewise.
+	* gcc.target/arm/cmse/bitfield-3.c: Likewise.
+	* gcc.target/arm/cmse/struct-1.c: Likewise.
+
+2019-07-09  Sylvia Taylor  <sylvia.taylor@arm.com>
+
+	* gcc.target/arm/aes-fuse-1.c: New.
+	* gcc.target/arm/aes-fuse-2.c: New.
+	* gcc.target/arm/aes_xor_combine.c: New.
+
+2019-07-09  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/predict-17.c: Test loop optimizer assumption
+	about loop iterations.
+
+2019-07-09  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/alias-access-path-1.c: Scan fre1 dump.
+	* gcc.dg/tree-ssa/alias-access-path-2.c: Likewise.
+	* gcc.dg/tree-ssa/alias-access-path-8.c: Likewise.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate10.adb, gnat.dg/predicate10_pkg.adb,
+	gnat.dg/predicate10_pkg.ads: New testcase.
+
+2019-07-09  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/image1.adb: New testcase.
+
+2019-07-09  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/rep_clause8.adb: New testcase.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/equal7.adb, gnat.dg/equal7_pkg.adb,
+	gnat.dg/equal7_pkg.ads: New testcase.
+
+2019-07-09  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/range_check3.adb, gnat.dg/range_check3_pkg.adb,
+	gnat.dg/range_check3_pkg.ads: New testcase.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/generic_inst5.adb, gnat.dg/generic_inst6.adb,
+	gnat.dg/generic_inst6_g1-c.adb, gnat.dg/generic_inst6_g1-c.ads,
+	gnat.dg/generic_inst6_g1.ads, gnat.dg/generic_inst6_i1.ads,
+	gnat.dg/generic_inst6_i2.ads, gnat.dg/generic_inst6_x.ads: New
+	testcases.
+
+2019-07-08  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/71924
+	PR middle-end/90549
+	* gcc.c-torture/execute/return-addr.c: New test.
+	* gcc.dg/Wreturn-local-addr-2.c: New test.
+	* gcc.dg/Wreturn-local-addr-4.c: New test.
+	* gcc.dg/Wreturn-local-addr-5.c: New test.
+	* gcc.dg/Wreturn-local-addr-6.c: New test.
+	* gcc.dg/Wreturn-local-addr-7.c: New test.
+	* gcc.dg/Wreturn-local-addr-8.c: New test.
+	* gcc.dg/Wreturn-local-addr-9.c: New test.
+	* gcc.dg/Wreturn-local-addr-10.c: New test.
+	* gcc.dg/Walloca-4.c: Handle expected warnings.
+	* gcc.dg/pr41551.c: Same.
+	* gcc.dg/pr59523.c: Same.
+	* gcc.dg/tree-ssa/pr88775-2.c: Same.
+	* gcc.dg/tree-ssa/alias-37.c: Same.
+	* gcc.dg/winline-7.c: Same.
+
+2019-07-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/vect/simd-6.cc: Replace xfail with target x86.
+	* g++.dg/vect/simd-9.cc: Likewise.
+
+	PR c++/91110
+	* g++.dg/gomp/pr91110.C: New test.
+
+2019-07-08  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR rtl-optimization/88233
+	* gcc.target/powerpc/pr88233.c: New testcase.
+
+2019-07-08  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR testsuite/91059
+	PR testsuite/78529
+	* gcc.c-torture/execute/builtins/builtins.exp: Add -fno-ipa-ra.
+
+2019-07-08  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.target/s390/rotate-truncation-mask.c: New test.
+
+2019-07-08  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.target/s390/combine-rotate-modulo.c: New test.
+	* gcc.target/s390/combine-shift-rotate-add-mod.c: New test.
+	* gcc.target/s390/vector/combine-shift-vec.c: New test.
+
+2019-07-08  Joern Rennecke  <joern.rennecke@riscy-ip.com>
+
+	Avoid clash with system header declaration.
+	* gcc.dg/vect/slp-reduc-sad.c (uint32_t): Remove unused declaration.
+
+2019-07-08  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91108
+	* gcc.dg/tree-ssa/ssa-fre-61.c: Adjust back.
+	* gcc.dg/tree-ssa/ssa-fre-78.c: New testcase.
+
+2019-07-08  Jim Wilson  <jimw@sifive.com>
+
+	* gcc.target/riscv/shift-shift-2.c: Add one more test.
+
+2019-07-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/65143
+	* g++.dg/tree-ssa/final2.C: New.
+	* g++.dg/tree-ssa/final3.C: Likewise.
+
+2019-07-08  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/interface10.adb: New testcase.
+
+2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/addr13.adb, gnat.dg/addr13.ads: New testcase.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/entry1.adb, gnat.dg/entry1.ads: New testcase.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/fixed_delete.adb: New testcase.
+
+2019-07-08  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/interface9.adb, gnat.dg/interface9_root-child.ads,
+	gnat.dg/interface9_root.ads: New testcase.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate9.adb: New testcase.
+
+2019-07-08  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/sso16.adb: New testcase.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate8.adb, gnat.dg/predicate8_pkg.adb,
+	gnat.dg/predicate8_pkg.ads: New testcase.
+
+2019-07-08  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/83518
+	* gcc.dg/tree-ssa/ssa-fre-73.c: New testcase.
+	* gcc.dg/tree-ssa/ssa-fre-74.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-75.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-76.c: Likewise.
+	* g++.dg/tree-ssa/pr83518.C: Likewise.
+
+2019-07-08  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/guality/guality.h: Include <sys/prctl.h> on Linux targets.
+	(main): Use PR_SET_PTRACER where available.
+
+2019-07-07  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/91077
+	* gfortran.dg/pointer_array_11.f90 : New test.
+
+2019-07-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/scan-4.c: Don't expect sorry message.
+
+	PR tree-optimization/91096
+	* gcc.dg/vect/vect-simd-10.c (FLT_MIN_VALUE): Define.
+	(bar, main): Use it instead of -__builtin_inff ().
+	* gcc.dg/vect/vect-simd-14.c (FLT_MIN_VALUE): Define.
+	(bar, main): Use it instead of -__builtin_inff ().
+
+2019-07-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/67184 (again)
+	PR c++/69445
+	* g++.dg/other/final4.C: New.
+
+2019-07-04  Marek Polacek  <polacek@redhat.com>
+
+	DR 1813
+	PR c++/83374 - __is_standard_layout wrong for a class with repeated
+	bases.
+	* g++.dg/ext/is_std_layout3.C: New test.
+	* g++.dg/ext/is_std_layout4.C: New test.
+
+2019-07-05  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/ssa-fre-77.c: New testcase.
+
+2019-07-05  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91091
+	* gcc.dg/tree-ssa/pr91091-2.c: New testcase.
+	* gcc.dg/tree-ssa/ssa-fre-70.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-71.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-72.c: Likewise.
+
+2019-07-05  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91091
+	* gcc.dg/tree-ssa/pr91091-1.c: New testcase.
+	* gcc.dg/tree-ssa/ssa-fre-61.c: Adjust.
+
+2019-07-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/pack23.adb, gnat.dg/pack23_pkg.ads: New testcase.
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/task3.adb, gnat.dg/task3.ads, gnat.dg/task3_pkg1.ads,
+	gnat.dg/task3_pkg2.ads: New testcase.
+
+2019-07-05  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/access6.adb: New testcase.
+
+2019-07-05  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/bip_export.adb, gnat.dg/bip_export.ads: New testcase.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/aggr25.adb, gnat.dg/aggr25.ads: New testcase.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate7.adb, gnat.dg/predicate7.ads,
+	gnat.dg/predicate7_pkg.ads: New testcase.
+
+2019-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/78884
+	* gcc.dg/gomp/pr78884.c: New test.
+
+2019-07-04  Andrea Corallo  <andrea.corallo@arm.com>
+
+	* jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c:
+	New testcase.
+
+2019-07-04  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* gcc.dg/tree-ssa/cunroll-15.c: Remove XFAIL on arm.
+
+2019-07-04  Andrea Corallo  <andrea.corallo@arm.com>
+
+	* jit.dg/all-non-failing-tests.h: Add test-accessing-bitfield.c.
+	* jit.dg/test-accessing-bitfield.c: New testcase.
+	* jit.dg/test-error-gcc_jit_context_new_bitfield-invalid-type.c:
+	Likewise.
+	* jit.dg/test-error-gcc_jit_context_new_bitfield-invalid-width.c:
+	Likewise.
+	* jit.dg/test-error-gcc_jit_lvalue_get_address-bitfield.c:
+	Likewise.
+
+2019-07-04  Jan Hubicka  <jh@suse.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-3.c: New testcase.
+	* gcc.dg/tree-ssa/alias-access-path-8.c: New testcase.
+
+2019-07-04  Andrew Stubbs  <ams@codesourcery.com>
+
+	* g++.dg/gomp/unmappable-1.C: New file.
+
+2019-07-04  Javier Miranda  <miranda@adacore.com>
+
+	* gnat.dg/cpp_constructor.adb, gnat.dg/cpp_constructor_fp.ads,
+	gnat.dg/cpp_constructor_useit.ads: New testcase.
+
+2019-07-04  Gary Dismukes  <dismukes@adacore.com>
+
+	* gnat.dg/ghost5.adb, gnat.dg/ghost5.ads,
+	gnat.dg/ghost5_parent.ads: New testcase.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/spark3.adb: New testcase.
+
+2019-07-04  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/tagged2.adb, gnat.dg/tagged2.ads: New testcase.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/equal6.adb, gnat.dg/equal6_types.adb,
+	gnat.dg/equal6_types.ads: New testcase.
+
+2019-07-04  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/allocator.adb: New testcase.
+
+2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/default_initial_condition.adb,
+	gnat.dg/default_initial_condition_pack.adb,
+	gnat.dg/default_initial_condition_pack.ads: New testcase.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/aspect2.adb, gnat.dg/aspect2.ads: New testcase.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* gnat.dg/synchronized2.adb, gnat.dg/synchronized2.ads,
+	gnat.dg/synchronized2_pkg.ads: New testcase.
+
+2019-07-04  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/generic_inst4.adb, gnat.dg/generic_inst4_gen.ads,
+	gnat.dg/generic_inst4_inst.ads, gnat.dg/generic_inst4_typ.ads:
+	New testcase.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/dimensions2.adb, gnat.dg/dimensions2_phys.ads,
+	gnat.dg/dimensions2_real_numbers.ads: New testcase.
+
+2019-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91063
+	* gcc.dg/gomp/pr91063.c: New test.
+
+2019-07-04  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR target/88833
+	* gfortran.dg/pr88833.f90: New test.
+
+2019-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91069
+	* gcc.dg/pr91069.c (v2df): Use 2 * sizeof (double) instead of
+	hardcoded 16 for better portability.
+	(v2di): Change from long vector to long long vector.  Use
+	2 * sizeof (long long) instead of hardcoded 16.
+
+	PR rtl-optimization/90756
+	* gcc.dg/pr90756.c: New test.
+
+2019-07-04  Chenghua Xu  <paul.hua.gm@gmail.com>
+
+	* gcc.target/mips/mips-fmadd.c: Rename to ...
+	* gcc.target/mips/mips-fmadd-o32.c: ... Here; add abi=32.
+	* gcc.target/mips/mips-fmadd-n64.c: New.
+
+2019-07-03  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* gcc.dg/store_merging_27.c: Fix test for Arm.
+	* gcc.dg/store_merging_28.c: Likewise.
+	* gcc.dg/store_merging_29.c: Likewise.
+	* gcc.dg/tree-ssa/dump-6.c: Likewise.
+
+2019-07-03  Mark Wielaard  <mark@klomp.org>
+
+	PR debug/90981
+	* g++.dg/pr90981.C: New test.
+
+2019-07-03  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/91069
+	* gcc.dg/pr91069.c: New testcase.
+
+2019-07-03  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/tree-prof/val-prof-2.c: Update scanned pattern
+	as we do now better.
+
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/debug1.ads: New test.
+
+2019-07-03  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/90892
+	* gcc.dg/pr90892.c: New test.
+
+2019-07-03  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/90899
+	* gcc.target/i386/pr90899.c: New test.
+
+2019-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/91033
+	* gcc.target/i386/pr91033.c: New test.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/task2.adb, gnat.dg/task2_pkg.adb,
+	gnat.dg/task2_pkg.ads: New testcase.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/inline16.adb, gnat.dg/inline16_gen.adb,
+	gnat.dg/inline16_gen.ads, gnat.dg/inline16_types.ads: New
+	testcase.
+
+2019-07-03  Justin Squirek  <squirek@adacore.com>
+
+	* gnat.dg/renaming13.adb, gnat.dg/renaming14.adb: New testcases.
+
+2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/inline15.adb, gnat.dg/inline15_gen.adb,
+	gnat.dg/inline15_gen.ads, gnat.dg/inline15_types.ads: New
+	testcase.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* gnat.dg/warn20.adb, gnat.dg/warn20_pkg.adb,
+	gnat.dg/warn20_pkg.ads: New testcase.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate6.adb, gnat.dg/predicate6.ads: New testcase.
+	* gnat.dg/static_pred1.adb: Remove expected error.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate5.adb, gnat.dg/predicate5.ads: New testcase.
+
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/alignment14.adb: New testcase.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/predicate4.adb, gnat.dg/predicate4_pkg.ads: New
+	testcase.
+
+2019-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/scan-3.c (f1): Don't expect a sorry message.
+	* c-c++-common/gomp/scan-5.c (foo): Likewise.
+
+	* c-c++-common/gomp/scan-5.c: New test.
+
+	* c-c++-common/gomp/lastprivate-conditional-5.c: New test.
+
+2019-07-02  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/90883
+	* g++.dg/tree-ssa/pr90883.c: Add -Os.  Check dse2 for the
+	deleted store on some targets.
+
+2019-07-02  Joern Rennecke  <joern.rennecke@riscy-ip.com>
+
+	PR testsuite/91065
+	* gcc.dg/plugin/start_unit_plugin.c: Register a root tab
+	to reference fake_var.
+
+2019-07-02  qing zhao  <qing.zhao@oracle.com>
+
+	PR preprocessor/90581
+	* c-c++-common/cpp/fmax-include-depth-1a.h: New test.
+	* c-c++-common/cpp/fmax-include-depth-1b.h: New test.
+	* c-c++-common/cpp/fmax-include-depth.c: New test.
+
+2019-07-02  Jan Hubicka  <jh@suse.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-7.c: New testcase.
+
+2019-07-02  Jan Hubicka  <jh@suse.cz>
+
+	* g++.dg/lto/pr90990_0.C: New testcase.
+
+2019-07-02  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/58483
+	* gcc.dg/tree-ssa/ssa-dom-cse-8.c: New testcase.
+
+2019-07-01  Joern Rennecke  <joern.rennecke@riscy-ip.com>
+
+	PR middle-end/66726
+	* gcc.dg/tree-ssa/pr66726-4.c: New testcase.
+
+2019-07-01  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/vector/vec-shift-2.c: New test.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/generic_inst3.adb,
+	gnat.dg/generic_inst3_kafka_lib-topic.ads,
+	gnat.dg/generic_inst3_kafka_lib.ads,
+	gnat.dg/generic_inst3_markets.ads,
+	gnat.dg/generic_inst3_traits-encodables.ads,
+	gnat.dg/generic_inst3_traits.ads: New testcase.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/enum_rep.adb, gnat.dg/enum_rep.ads: New testcase.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/derived_type6.adb, gnat.dg/derived_type6.ads: New
+	testcase.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/weak3.adb, gnat.dg/weak3.ads: New testcase.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* gnat.dg/prot7.adb, gnat.dg/prot7.ads: New testcase.
+
+2019-07-01  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-42.c: New testcase.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/sets1.adb: Update.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/linkedlist.adb: Update.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/dynhash.adb, gnat.dg/dynhash1.adb: Update.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* gnat.dg/freezing1.adb, gnat.dg/freezing1.ads,
+	gnat.dg/freezing1_pack.adb, gnat.dg/freezing1_pack.ads: New
+	testcase.
+
+2019-07-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR lto/91028
+	PR lto/90720
+	* g++.dg/lto/alias-1_0.C: Add loop to make inlining happen with
+	-fno-use-linker-plugin
+	* g++.dg/lto/alias-2_0.C: Likewise.
+
+2019-07-01  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	* g++.dg/cpp0x/gen-attrs-67.C: Add error for darwin.
+
+2019-07-01  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/pr77445-2.c: Adjust.
+
+2019-07-01  Hongtao Liu  <hongtao.liu@intel.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_avx512vp2intersect): New proc.
+	* gcc.target/i386/avx512vp2intersect-2intersect-1b.c: Add
+	dg-require-effective-target avx512vp2intersect.
+	* gcc.target/i386/avx512vp2intersect-2intersectvl-1b.c: Ditto.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/array5.ads: New test.
+	* gnat.dg/specs/array5_pkg1.ads: New helper.
+	* gnat.dg/specs/array5_pkg2.ads: Likewise.
+	* gnat.dg/specs/array5_pkg2-g.ads: Likewise.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/unchecked_convert1.ads: New test.
+	* gnat.dg/specs/unchecked_convert2.ads: Likewise.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/size_clause3.ads: Adjust error message.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/atomic2.ads: Adjust error message.
+	* gnat.dg/specs/clause_on_volatile.ads: Likewise.
+	* gnat.dg/specs/size_clause3.ads: Likewise.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/array35.adb: New test.
+	* gnat.dg/array36.adb: Likewise.
+
+2019-06-28  Jan Beulich  <jbeulich@suse.com>
+
+	* gcc.target/i386/gfni-5.c: New.
+
+2019-06-28  Jan Beulich  <jbeulich@suse.com>
+
+	* gcc.target/i386/cvtpd2pi: New.
+
+2019-06-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91024
+	* g++.dg/warn/Wimplicit-fallthrough-4.C: New test.
+
+	PR tree-optimization/91010
+	* g++.dg/vect/simd-10.cc: New test.
+
+2019-06-27  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90987
+	* match.c (gfc_match_common): Adjust parsing of fixed and free form
+	source code containing, e.g., COMMONI.
+
+2019-06-27  Jan Hubicka  <jh@suse.cz>
+
+	* g++.dg/lto/alias-2_0.C: New testcase.
+	* g++.dg/lto/alias-2_1.C: New testcase.
+
+2019-06-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/90991
+	* gcc.target/i386/avx2-pr90991-1.c: New test.
+	* gcc.target/i386/avx512dq-pr90991-2.c: New test.
+
+2019-06-27  Jan Beulich  <jbeulich@suse.com>
+
+	* gcc.target/i386/gfni-4.c: Pass -msse2.
+
+2019-06-27  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/ssa-fre-69.c: New testcase.
+
+2019-06-27  Jun Ma  <JunMa@linux.alibaba.com>
+
+	PR tree-optimization/89772
+	* gcc.dg/builtin-memchr-4.c: New test.
+
+2019-06-27  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/91014
+	* gcc.target/s390/pr91014.c: New test.
+
+2019-06-27  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/91004
+	* g++.dg/torture/pr34850.C: Fix overly reduced testcase.
+
+2019-06-27  Kewen Lin  <linkw@gcc.gnu.org>
+
+	PR target/62147
+	* gcc.target/powerpc/pr62147.c: New test.
+
+2019-06-26  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/90883
+	* g++.dg/tree-ssa/pr90883.C: New test.
+	* gcc.dg/tree-ssa/ssa-dse-36.c: New test.
+
+2019-06-26  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/89021
+	* lib/target-supports.exp (available_vector_sizes)
+	<[istarget i?86-*-*] || [istarget x86_64-*-*]>: Add
+	64-bit vectors for !ia32.
+
+2019-06-26  Jeff Law  <law@redhat.com>
+
+	* gcc.c-torture/execute/builtins/builtins.exp: Add -fno-tree-dse
+	as DSE compromises several of these tests.
+	* gcc.dg/builtin-stringop-chk-1.c: Similarly.
+	* gcc.dg/memcpy-2.c: Similarly.
+	* gcc.dg/pr40340-1.c: Similarly.
+	* gcc.dg/pr40340-2.c: Similarly.
+	* gcc.dg/pr40340-5.c: Similarly.
+
+2019-06-26  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR Fortran/90988
+	ChangeLog forgotten with revision 272667
+	* gfortran.dg/pr90988_1.f90: New test.
+	* gfortran.dg/pr90988_2.f90: Ditto.
+	* gfortran.dg/pr90988_3.f90: Ditto.
+
+2019-06-26  Nathan Sidwell  <nathan@acm.org>
+
+	* c-c++-common/pr90927.c: New.
+
+2019-06-26  Richard Biener  <rguenther@suse.de>
+
+	PR ipa/90982
+	* g++.dg/torture/pr90982.C: New testcase.
+
+2019-06-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/67184
+	PR c++/69445
+	* g++.dg/other/final3.C: New.
+	* g++.dg/other/final5.C: Likewise.
+
+2019-06-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/90991
+	* gcc.target/i386/avx512dq-pr90991-1.c: New test.
+
+2019-06-26  Li Jia He  <helijia@linux.ibm.com>
+
+	* gcc.target/powerpc/maddld-1.c: New testcase.
+
+2019-06-06  Hongtao Liu  <hongtao.liu@intel.com>
+	    Olga Makhotina  <olga.makhotina@intel.com>
+
+	* gcc.target/i386/avx512-check.h: Handle bit_AVX512VP2INTERSECT.
+	* gcc.target/i386/avx512vp2intersect-2intersect-1a.c: New test.
+	* gcc.target/i386/avx512vp2intersect-2intersect-1b.c: Likewise.
+	* gcc.target/i386/avx512vp2intersect-2intersectvl-1a.c: Likewise.
+	* gcc.target/i386/avx512vp2intersect-2intersectvl-1b.c: Likewise.
+	* gcc.target/i386/sse-12.c: Add -mavx512vp2intersect.
+	* gcc.target/i386/sse-13.c: Likewsie.
+	* gcc.target/i386/sse-14.c: Likewise.
+	* gcc.target/i386/sse-22.c: Likewise.
+	* gcc.target/i386/sse-23.c: Likewise.
+	* g++.dg/other/i386-2.C: Likewise.
+	* g++.dg/other/i386-3.C: Likewise.
+
+2019-06-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/90969
+	* g++.dg/ext/vector38.C: New test.
+
+2019-06-25  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/90939
+	* g++.dg/lto/pr90939_[01].C: New test.
+
+2019-06-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90930
+	* gcc.dg/tree-ssa/reassoc-24.c: Adjust.
+	* gcc.dg/tree-ssa/reassoc-25.c: Likewise.
+
+2019-06-25  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	* gcc.target/arc/pr89838.c: New file.
+
+2019-06-25  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/mlarge-pedwarns.c: New test.
+
+2019-06-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/90954
+	* c-c++-common/gomp/pr90954.c: New test.
+
+2019-06-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/safe-indirect-jump-1.c: Skip for Darwin.
+	* gcc.target/powerpc/safe-indirect-jump-7.c: Likewise.
+
+2019-06-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/spec-barr-1.c: Adjust scan assembler regex
+	to recognise Darwin's register names.
+
+2019-06-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/cpp/isysroot-1.c: Use <example.h> as the test header.
+	* gcc.dg/cpp/usr/include/stdio.h: Rename...
+	* gcc.dg/cpp/usr/include/example.h: ... to this.
+
+2019-06-24  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90972
+	* gcc.dg/torture/pr90972.c: New testcase.
+
+2019-06-24  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/Wfloat-equal-1.c: Adjust text of expected diagnostic.
+	* gcc.dg/misc-column.c: Ditto.
+
+2019-06-23  Ian Lance Taylor  <iant@golang.org>
+
+	* go.test/test/blank1.go: Update for diagnostic message changes.
+
+2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/builtins-2.c: Require VSX hardware support.
+
+2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/pr80125.c (foo): Use an unsigned char
+	vector explicitly for the vec_perm.
+
+2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/builtins-1.c: Account for Darwin's use of
+	__USER_LABEL_PREFIX__.
+
+2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/pr71785.c: For Darwin, make test non-PIC,
+	expect the out-of-line GPR restore, and test specifically for
+	absence of branches to local labels.
+
+2019-06-22  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/89782
+	* gfortran.dg/io_constraints_14.f90: New test.
+
+2019-06-22  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/pr64205.c: Require effective target dfp.
+	* gcc.target/powerpc/pr79909.c: Likewise.
+
+2019-06-22  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/powerpc/darwin-bool-1.c: Suppress the pedantic
+	warning about _Bool.
+
+2019-06-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/65707
+	PR c++/89480
+	PR c++/58836
+	* g++.dg/cpp0x/nondeduced5.C: New test.
+	* g++.dg/cpp0x/nondeduced6.C: New test.
+	* g++.dg/cpp0x/nondeduced7.C: New test.
+
+	PR c++/66256
+	* g++.dg/cpp0x/noexcept54.C: New test.
+
+2019-06-22  Jan Hubicka  <jh@suse.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-6.c: New testcase.
+
+2019-06-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/86476 - noexcept-specifier is a complete-class context.
+	PR c++/52869
+	* g++.dg/cpp0x/noexcept45.C: New test.
+	* g++.dg/cpp0x/noexcept46.C: New test.
+	* g++.dg/cpp0x/noexcept47.C: New test.
+	* g++.dg/cpp0x/noexcept48.C: New test.
+	* g++.dg/cpp0x/noexcept49.C: New test.
+	* g++.dg/cpp0x/noexcept50.C: New test.
+	* g++.dg/cpp0x/noexcept51.C: New test.
+	* g++.dg/cpp0x/noexcept52.C: New test.
+	* g++.dg/cpp0x/noexcept53.C: New test.
+	* g++.dg/eh/shadow1.C: Adjust dg-error.
+
+	PR c++/90881 - bogus -Wunused-value in unevaluated context.
+	* g++.dg/cpp0x/Wunused-value1.C: New test.
+
+2019-06-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/auto-storage-1.C: New.
+	* g++.dg/diagnostic/no-type-1.C: Likewise.
+	* g++.dg/diagnostic/no-type-2.C: Likewise.
+	* g++.dg/diagnostic/top-level-auto-1.C: Likewise.
+	* g++.dg/cpp0x/auto9.C: Test some locations too.
+	* g++.dg/cpp1z/register1.C: Likewise.
+	* g++.dg/cpp1z/register2.C: Likewise.
+	* g++.dg/cpp1z/register3.C: Likewise.
+	* g++.dg/other/error34.C: Likewise.
+
+2019-06-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/90909
+	* g++.dg/other/final7.C: New.
+
+2019-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/vect/simd-2.cc: Don't xfail, instead expect vectorization on
+	x86.
+	* g++.dg/vect/simd-5.cc: Likewise.
+
+2019-06-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/90909
+	Revert:
+	2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/67184
+	PR c++/69445
+	* g++.dg/other/final3.C: New.
+	* g++.dg/other/final4.C: Likewise.
+	* g++.dg/other/final5.C: Likewise.
+
+	* g++.dg/other/final6.C: New.
+
+2019-06-21  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/61490 - qualified-id in friend function definition.
+	* g++.dg/diagnostic/friend2.C: New test.
+	* g++.dg/diagnostic/friend3.C: New test.
+
+	PR c++/60223 - ICE with T{} in non-deduced context.
+	* g++.dg/cpp0x/nondeduced1.C: New test.
+	* g++.dg/cpp0x/nondeduced2.C: New test.
+	* g++.dg/cpp0x/nondeduced3.C: New test.
+	* g++.dg/cpp0x/nondeduced4.C: New test.
+
+	PR c++/64235 - missing syntax error with invalid alignas.
+	* g++.dg/parse/alignas1.C: New test.
+
+2019-06-21  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/67884
+	* gfortran.dg/dummy_procedure_8.f90: Remove a test that is ...
+	* gfortran.dg/pr67884.f90: ... covered here.  New test.
+
+2019-06-21  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90490 - fix decltype issues in noexcept-specifier.
+	* g++.dg/cpp0x/noexcept43.C: New test.
+	* g++.dg/cpp0x/noexcept44.C: New test.
+
+2019-06-21  Matthew Beliveau  <mbelivea@redhat.com>
+
+	PR c++/90875 - added -Wswitch-outside-range option
+	* c-c++-common/Wswitch-outside-range-1.c: New test.
+	* c-c++-common/Wswitch-outside-range-2.c: New test.
+	* c-c++-common/Wswitch-outside-range-3.c: New test.
+	* c-c++-common/Wswitch-outside-range-4.c: New test.
+
+2019-06-21  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/51991
+	gfortran.dg/pr51991.f90
+
+2019-06-21  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/90949
+	* gcc.c-torture/execute/pr90949.c: New test.
+
+2019-06-21  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90953 - ICE with -Wmissing-format-attribute.
+	* g++.dg/warn/miss-format-7.C: New test.
+
+2019-06-21  Richard Biener  <rguenther@suse.de>
+
+	PR debug/90914
+	* g++.dg/debug/pr90914.C: New testcase.
+
+2019-06-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90913
+	* gfortran.dg/vect/pr90913.f90: New testcase.
+
+2019-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/vect/vect-simd-12.c: New test.
+	* gcc.dg/vect/vect-simd-13.c: New test.
+	* gcc.dg/vect/vect-simd-14.c: New test.
+	* gcc.dg/vect/vect-simd-15.c: New test.
+	* gcc.target/i386/sse2-vect-simd-12.c: New test.
+	* gcc.target/i386/sse2-vect-simd-13.c: New test.
+	* gcc.target/i386/sse2-vect-simd-14.c: New test.
+	* gcc.target/i386/sse2-vect-simd-15.c: New test.
+	* gcc.target/i386/avx2-vect-simd-12.c: New test.
+	* gcc.target/i386/avx2-vect-simd-13.c: New test.
+	* gcc.target/i386/avx2-vect-simd-14.c: New test.
+	* gcc.target/i386/avx2-vect-simd-15.c: New test.
+	* gcc.target/i386/avx512f-vect-simd-12.c: New test.
+	* gcc.target/i386/avx512f-vect-simd-13.c: New test.
+	* gcc.target/i386/avx512f-vect-simd-14.c: New test.
+	* gcc.target/i386/avx512bw-vect-simd-15.c: New test.
+	* g++.dg/vect/simd-6.cc: New test.
+	* g++.dg/vect/simd-7.cc: New test.
+	* g++.dg/vect/simd-8.cc: New test.
+	* g++.dg/vect/simd-9.cc: New test.
+	* c-c++-common/gomp/scan-2.c: Don't expect any diagnostics.
+
+	PR c++/90950
+	* g++.dg/gomp/lastprivate-1.C: New test.
+
+	* gcc.dg/vect/vect-simd-11.c: New test.
+	* gcc.target/i386/sse2-vect-simd-11.c: New test.
+	* gcc.target/i386/avx2-vect-simd-11.c: New test.
+	* gcc.target/i386/avx512bw-vect-simd-11.c: New test.
+
+2019-06-20  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/79781
+	* g++.dg/ext/goto1.C: New test.
+
+2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/77632
+	* gfortran.dg/pr77632_1.f90: New test.
+
+2019-06-20  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/68265
+	* g++.dg/parse/error62.C: New test.
+
+2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/86587
+	* gfortran.dg/pr86587.f90: New test.
+
+2019-06-20  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* obj-c++.dg/stubify-1.mm: Adjust options and scan-asm checks.
+	* obj-c++.dg/stubify-2.mm: Likewise.
+	* objc.dg/stubify-1.m: Likewise.
+	* objc.dg/stubify-2.m: Likewise.
+
+2019-06-20  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87512
+	* g++.dg/cpp1z/inline-var7.C: New test.
+
+2019-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/54855
+	* gcc.target/i386/pr54855-1.c: New test.
+	* gcc.target/i386/pr54855-2.c: Likewise.
+	* gcc.target/i386/pr54855-3.c: Likewise.
+	* gcc.target/i386/pr54855-4.c: Likewise.
+	* gcc.target/i386/pr54855-5.c: Likewise.
+	* gcc.target/i386/pr54855-6.c: Likewise.
+	* gcc.target/i386/pr54855-7.c: Likewise.
+	* gcc.target/i386/pr54855-8.c: Likewise.
+	* gcc.target/i386/pr54855-9.c: Likewise.
+	* gcc.target/i386/pr54855-10.c: Likewise.
+
+2019-06-20  Jan Hubicka  <jh@suse.cz>
+
+	* gcc.c-torture/execute/alias-access-path-1.c: New testcase.
+
+2019-06-20  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89873
+	* g++.dg/cpp1y/noexcept1.C: New test.
+
+2019-06-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90937
+	* gfortran.dg/external_procedure_4.f90: New test.
+
+2019-06-20  Tom de Vries  <tdevries@suse.de>
+
+	* gcc.dg/pr90866-2.c: Require global_constructor.
+
+2019-06-20  Tom de Vries  <tdevries@suse.de>
+
+	* gcc.c-torture/compile/pr89280.c: Require nonlocal_goto.
+	* gcc.dg/pr88870.c: Same.
+	* gcc.dg/pr90082.c: Same.
+
+2019-06-20  Tom de Vries  <tdevries@suse.de>
+
+	* gcc.dg/pr89737.c: Require indirect_jumps.
+	* gcc.dg/torture/pr87693.c: Same.
+	* gcc.dg/torture/pr89135.c: Same.
+	* gcc.dg/torture/pr90071.c: Same.
+
+2019-06-20  Tom de Vries  <tdevries@suse.de>
+
+	* gcc.c-torture/compile/pr89280.c: Require label_values.
+	* gcc.dg/pr89737.c: Same.
+	* gcc.dg/pr90082.c: Same.
+	* gcc.dg/torture/pr89135.c: Same.
+	* gcc.dg/torture/pr89247.c: Same.
+	* gcc.dg/torture/pr90071.c: Same.
+
+2019-06-20  Tom de Vries  <tdevries@suse.de>
+
+	* gcc.c-torture/compile/pr77754-1.c: Require alloca.
+	* gcc.c-torture/compile/pr77754-2.c: Same.
+	* gcc.c-torture/compile/pr77754-3.c: Same.
+	* gcc.c-torture/compile/pr77754-4.c: Same.
+	* gcc.c-torture/compile/pr77754-5.c: Same.
+	* gcc.c-torture/compile/pr77754-6.c: Same.
+	* gcc.c-torture/compile/pr87110.c: Same.
+	* gcc.c-torture/execute/pr86528.c: Same.
+	* gcc.dg/Walloca-larger-than-2.c: Same.
+	* gcc.dg/Walloca-larger-than.c: Same.
+	* gcc.dg/Warray-bounds-41.c: Same.
+	* gcc.dg/Wrestrict-17.c: Same.
+	* gcc.dg/Wstrict-overflow-27.c: Same.
+	* gcc.dg/Wstringop-truncation-3.c: Same.
+	* gcc.dg/pr78902.c: Same.
+	* gcc.dg/pr87099.c: Same.
+	* gcc.dg/pr87320.c: Same.
+	* gcc.dg/pr89045.c: Same.
+	* gcc.dg/strlenopt-62.c: Same.
+	* gcc.dg/tree-ssa/alias-37.c: Same.
+
+2019-06-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/60364 - noreturn after first decl not diagnosed.
+	* g++.dg/warn/noreturn-8.C: New test.
+	* g++.dg/warn/noreturn-9.C: New test.
+	* g++.dg/warn/noreturn-10.C: New test.
+	* g++.dg/warn/noreturn-11.C: New test.
+
+2019-06-19  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90626
+	* gcc.dg/strlenopt-65.c: New test.
+	* gcc.dg/strlenopt-66.c: New test.
+	* gcc.dg/strlenopt.h (strcmp, strncmp): Declare.
+
+2019-06-19  Martin Sebor  <msebor@redhat.com>
+
+	PR translation/90156
+	* gcc.dg/format/gcc_diag-11.c: Enable.
+
+2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/69499
+	* gfortran.dg/pr69499.f90: New test.
+	* gfortran.dg/module_error_1.f90: Update dg-error string.
+
+2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/69398
+	* gfortran.dg/pr69398.f90: New test.
+
+2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/87907
+	* gfortran.dg/pr87907.f90: New testcase.
+
+2019-06-19  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR middle-end/84521
+	* gcc.c-torture/execute/pr84521.c: New test.
+
+2019-06-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/vect/vect-simd-8.c: If main is defined, don't include
+	tree-vect.h nor call check_vect.
+	* gcc.dg/vect/vect-simd-9.c: Likewise.
+	* gcc.dg/vect/vect-simd-10.c: New test.
+	* gcc.target/i386/sse2-vect-simd-8.c: New test.
+	* gcc.target/i386/sse2-vect-simd-9.c: New test.
+	* gcc.target/i386/sse2-vect-simd-10.c: New test.
+	* gcc.target/i386/avx2-vect-simd-8.c: New test.
+	* gcc.target/i386/avx2-vect-simd-9.c: New test.
+	* gcc.target/i386/avx2-vect-simd-10.c: New test.
+	* gcc.target/i386/avx512f-vect-simd-8.c: New test.
+	* gcc.target/i386/avx512f-vect-simd-9.c: New test.
+	* gcc.target/i386/avx512f-vect-simd-10.c: New test.
+
+	* g++.dg/vect/simd-3.cc: New test.
+	* g++.dg/vect/simd-4.cc: New test.
+	* g++.dg/vect/simd-5.cc: New test.
+
+2019-06-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/ubsan/pr63956.C: Adjust expected diagnostics.
+
+2019-06-19  Jim MacArthur  <jim.macarthur@codethink.co.uk>
+	    Mark Eggleston  <mark.eggleston@codethink.com>
+
+	PR fortran/89103
+	* gfortran.dg/dec_format_empty_item_1.f: New test.
+	* gfortran.dg/dec_format_empty_item_2.f: New test.
+	* gfortran.dg/dec_format_empty_item_3.f: New test.
+
+2019-06-19  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* gcc.target/aarch64/pr88834.c: Move from here...
+	* gcc.target/aarch64/sve/pr88834.c: ...to here.
+
+2019-06-18  Cherry Zhang  <cherryyz@google.com>
+
+	* go.dg/concatstring.go: New test.
+
+2019-06-18  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR fortran/90921
+	* gfortran.dg/goacc/declare-3.f95: Update.
+
+	PR fortran/85221
+	* gfortran.dg/goacc/declare-3.f95: New file.
+
+	PR middle-end/90859
+	* c-c++-common/goacc/firstprivate-mappings-1.c: Update.
+
+	* c-c++-common/goacc/firstprivate-mappings-1.c: New file.
+	* g++.dg/goacc/firstprivate-mappings-1.C: Likewise.
+
+	PR testsuite/90861
+	* c-c++-common/goacc/declare-pr90861.c: New file.
+
+	PR testsuite/90868
+	* c-c++-common/goacc/declare-1.c: Update.
+	* c-c++-common/goacc/declare-2.c: Likewise.
+
+	PR middle-end/90862
+	* c-c++-common/goacc/declare-1.c: Update.
+	* c-c++-common/goacc/declare-2.c: Likewise.
+
+2019-06-18  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/84698
+	* g++.dg/cpp0x/noexcept42.C: New test.
+
+	PR c++/71548
+	* g++.dg/cpp0x/variadic177.C: New test.
+
+2019-06-18  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/struct_vect_18.c: Allow branches to
+	contain dots.
+	* gcc.target/aarch64/sve/struct_vect_19.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_20.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_21.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_22.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_23.c: Likewise.
+	* gcc.target/aarch64/sve/unroll-1.c: Likewise.
+	* gcc.target/aarch64/sve/while_1.c: Check for b.any.
+
+2019-06-18  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/pr81563.c (dg-final): Check that no
+	registers are restored from %esp.
+
+2019-06-18  Richard Biener  <rguenther@suse.de>
+
+	PR debug/90900
+	* gcc.dg/gomp/pr90900.c: New testcase.
+
+2019-06-18  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/pr90866-2.c: Remove a pointless declaration
+	to avoid compilation errors on arm-none-eabi.
+
+2019-06-18  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* gcc.target/aarch64/pcs_attribute-2.c: Remove ifunc usage.
+	* gcc.target/aarch64/pcs_attribute-3.c: New test.
+
+2019-06-18  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+	* gcc.target/aarch64/sve/fadda_1.c: New test.
+
+2019-06-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/vect/vect-simd-8.c: New test.
+	* gcc.dg/vect/vect-simd-9.c: New test.
+	* g++.dg/vect/simd-2.cc: New test.
+	* g++.dg/gomp/scan-1.C: New test.
+
+2019-06-17  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/62055
+	* gcc.target/i386/fnabs.c: New test.
+
+2019-06-17  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/83820 - excessive attribute arguments not detected.
+	* g++.dg/cpp0x/gen-attrs-67.C: New test.
+
+2019-06-17  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/90754
+	* g++.dg/lookup/pr90754.C: New.
+
+2019-06-17  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR middle-end/64242
+	* gcc.c-torture/execute/pr64242.c: Improve test.
+
+2019-06-16  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/mspabi_sllll.c: New test.
+	* gcc.target/msp430/mspabi_srall.c: New test.
+	* gcc.target/msp430/mspabi_srlll.c: New test.
+	* gcc.c-torture/execute/shiftdi-2.c: New test.
+
+2019-06-16  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* lib/target-supports.exp: Add check_effective_target_longlong64.
+
+2019-06-16  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-4.c: New testcase.
+	* gcc.dg/tree-ssa/alias-access-path-5.c: New testcase.
+
+2019-06-15  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/90650
+	* gdc.dg/pr90650a.d: New test.
+	* gdc.dg/pr90650b.d: New test.
+
+2019-06-15  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/dummy_derived_typed.f90: New test.
+
+2019-06-15  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-2.c: New testcase.
+
+2019-06-15  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/ieee/ieee_4.f90: Un-xfail on i?86-*-freebsd.
+
+2019-06-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR objc/90709
+	* obj-c++.dg/proto-lossage-7.mm: Use proxy headers.
+	* obj-c++.dg/strings/const-cfstring-2.mm: Likewise.
+	* obj-c++.dg/strings/const-cfstring-5.mm: Likewise.
+	* obj-c++.dg/strings/const-str-12.mm: Likewise.
+	* obj-c++.dg/syntax-error-1.mm: Likewise.
+	* obj-c++.dg/torture/strings/const-cfstring-1.mm: Likewise.
+	* obj-c++.dg/torture/strings/const-str-10.mm: Likewise.
+	* obj-c++.dg/torture/strings/const-str-11.mm: Likewise.
+	* obj-c++.dg/torture/strings/const-str-9.mm: Likewise.
+	* obj-c++.dg/cxx-ivars-3.mm: Skip on later Darwin, where the 10.4 API
+	in no longer supported, also on m64 where there's no meaning to it.
+	* obj-c++.dg/isa-field-1.mm: Suppress unwanted warning, add comment why.
+	* obj-c++.dg/objc-gc-3.mm: Skip for Darwin > 16, the API use is an error
+	there.
+	* obj-c++.dg/qual-types-1.mm: Prune a spurious l64 warning.
+	* obj-c++.dg/stubify-1.mm: Tidy up after better compiler warnings.
+	* obj-c++.dg/stubify-2.mm: Likewise.
+	* obj-c++.dg/try-catch-1.mm: Likewise.
+	* obj-c++.dg/try-catch-3.mm: Likewise.
+
+2019-06-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR objc/90709
+	* objc.dg/encode-7-next-64bit.m: Use proxy headers.
+	* objc.dg/image-info.m: Likewise.
+	* objc.dg/method-6.m: Likewise.
+	* objc.dg/no-extra-load.m: Likewise.
+	* objc.dg/objc-foreach-4.m: Likewise.
+	* objc.dg/objc-foreach-5.m: Likewise.
+	* objc.dg/proto-lossage-7.m: Likewise.
+	* objc.dg/strings/const-cfstring-2.m: Likewise.
+	* objc.dg/strings/const-cfstring-5.m: Likewise.
+	* objc.dg/strings/const-str-12b.m: Likewise.
+	* objc.dg/symtab-1.m: Likewise.
+	* objc.dg/torture/strings/const-cfstring-1.m: Likewise.
+	* objc.dg/torture/strings/const-str-10.m: Likewise.
+	* objc.dg/torture/strings/const-str-11.m: Likewise.
+	* objc.dg/torture/strings/const-str-9.m: Likewise.
+	* objc.dg/zero-link-1.m: Likewise.
+	* objc.dg/zero-link-2.m: Likewise.
+	* objc.dg/zero-link-3.m: Likewise.
+	* objc.dg/isa-field-1.m: Suppress unwanted warning, add comment why.
+	* objc.dg/headers.m: XFAIL for Darwin14-19.
+	* objc.dg/objc-gc-4.m: Skip for Darwin > 16, the API use is an error
+	there.
+
+2019-06-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR objc/90709
+	* objc-obj-c++-shared/CF-CFString.h: New.
+	* objc-obj-c++-shared/F-NSArray.h: New.
+	* objc-obj-c++-shared/F-NSAutoreleasePool.h: New.
+	* objc-obj-c++-shared/F-NSObject.h: New.
+	* objc-obj-c++-shared/F-NSString.h: New.
+	* objc-obj-c++-shared/F-NSValue.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFArray.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFAvailability.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFBase.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFCharacterSet.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFData.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFDictionary.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFLocale.h: New.
+	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFString.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSArray.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSAutoreleasePool.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSDate.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSEnumerator.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSGeometry.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSObjCRuntime.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSObject.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSRange.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSString.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSValue.h: New.
+	* objc-obj-c++-shared/GNUStep/Foundation/NSZone.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/GNUstep.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSBlocks.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSConfig.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSObjCRuntime.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSVersionMacros.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSArray+GNUstepBase.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSMutableString+GNUstepBase.h:
+	New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSNumber+GNUstepBase.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSObject+GNUstepBase.h: New.
+	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSString+GNUstepBase.h: New.
+
+2019-06-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/90779
+	* c-c++-common/goacc/routine-5.c (func2): Don't expect error for
+	static block scope variable in #pragma acc routine.
+
+2019-06-14  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/integer_exponentiation_4.f90: Update test.
+	* gfortran.dg/integer_exponentiation_5.F90: Ditto.
+	* gfortran.dg/no_range_check_1.f90: Ditto.
+
+2019-06-14  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/90577
+	PR fortran/90578
+	* gfortran.dg/lrshift_1.f90: Adjust testcase.
+	* gfortran.dg/shiftalr_3.f90: New testcase.
+
+2019-06-14  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/89646
+	* gfortran.dg/pr89646.f90: New test.
+
+2019-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR rtl-optimization/90765
+	* gcc.target/i386/pr90765-1.c: New test.
+	* gcc.target/i386/pr90765-2.c: Likewise.
+
+2019-06-14  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90884 - stray note with -Wctor-dtor-privacy.
+	* g++.dg/warn/ctor-dtor-privacy-4.C: New.
+	* g++.dg/warn/ctor-dtor-privacy-4.h: New.
+
+2019-06-14  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/ldist-26.c: Adjust.
+
+2019-06-14  Feng Xue  <fxue@os.amperecomputing.com>
+
+	PR ipa/90401
+	* gcc.dg/ipa/ipcp-agg-10.c: New test.
+
+2019-06-13  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90662
+	* gcc.dg/pr90866-2.c: New test.
+	* gcc.dg/pr90866.c: Ditto.
+
+2019-06-13  Jiufu Guo  <guojiufu@linux.ibm.com>
+	    Lijia He  <helijia@linux.ibm.com>
+
+	PR tree-optimization/77820
+	* gcc.dg/tree-ssa/phi_on_compare-1.c: New testcase.
+	* gcc.dg/tree-ssa/phi_on_compare-2.c: New testcase.
+	* gcc.dg/tree-ssa/phi_on_compare-3.c: New testcase.
+	* gcc.dg/tree-ssa/phi_on_compare-4.c: New testcase.
+	* gcc.dg/tree-ssa/split-path-6.c: Update testcase.
+	* gcc.target/sh/pr51244-20.c: Update testcase.
+
+2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/darwin-minversion-link.c: New test.
+
+2019-06-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/68544
+	* gfortran.dg/pr68544.f90: New test.
+	* gfortran.dg/pr85687.f90: Modify test for new error message.
+
+2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* g++.dg/pr71694.C: Use non-PIC codegen for Darwin m32.
+
+2019-06-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/89344
+	* gfortran.dg/pr89344.f90: New test.
+
+2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/darwin-minversion-1.c: Use compile rather than link/run.
+	* gcc.dg/darwin-minversion-2.c: Likewise.
+
+2019-06-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR target/90871
+	* g++.dg/ext/altivec-15.C: Add dg-error directive.
+
+2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/pr90760.c: Require alias support.
+
+2019-06-13  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR tree-optimization/90869
+	* g++.dg/tree-ssa/alias-access-path-1.C: New testcase.
+
+2019-06-13  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90856
+	* gcc.target/i386/pr90856.c: New testcase.
+
+2019-06-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/tree-ssa/ssa-dse-1.C: Don't match exact number of chars of
+	= {} store.
+	* g++.dg/tree-ssa/pr31146.C: Change -fdump-tree-forwprop to
+	-fdump-tree-forwprop1 in dg-options.  Expect <int[5]> in MEM.
+
+2019-06-13  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/vect-version-1.c: New testcase.
+	* gcc.dg/vect/vect-version-2.c: Likewise.
+
+2019-06-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/variably-modified-type-1.C: New.
+	* g++.dg/cpp0x/alias-decl-1.C: Test the location too.
+	* g++.dg/other/pr84792-1.C: Likewise.
+	* g++.dg/other/pr84792-2.C: Likewise.
+	* g++.dg/parse/error24.C: Likewise.
+	* g++.dg/parse/error32.C: Likewise.
+	* g++.dg/parse/error33.C: Likewise.
+	* g++.dg/parse/saved1.C: Likewise.
+	* g++.dg/template/operator6.C: Likewise.
+	* g++.dg/template/pr61745.C: Likewise.
+	* g++.dg/template/typedef41.C: Likewise.
+	* g++.old-deja/g++.jason/crash10.C: Likewise.
+
+2019-06-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/conflicting-specifiers-1.C: New.
+	* g++.dg/diagnostic/two-or-more-data-types-1.C: Likewise.
+	* g++.dg/parse/error10.C: Adjust location.
+	* g++.dg/parse/pragma2.C: Likewise.
+
+2019-06-13  Feng Xue  <fxue@os.amperecomputing.com>
+
+	PR tree-optimization/89713
+	* g++.dg/tree-ssa/empty-loop.C: New test.
+	* gcc.dg/tree-ssa/dce-2.c: New test.
+	* gcc.dg/const-1.c: Add -fno-finite-loops option.
+	* gcc.dg/graphite/graphite.exp: Likewise.
+	* gcc.dg/loop-unswitch-1.c: Likewise.
+	* gcc.dg/predict-9.c: Likewise.
+	* gcc.dg/pure-2.c: Likewise.
+	* gcc.dg/tree-ssa/20040211-1.c: Likewise.
+	* gcc.dg/tree-ssa/loop-10.c: Likewise.
+	* gcc.dg/tree-ssa/split-path-6.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-thread-12.c: Likewise.
+
+2019-06-13  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	PR target/88838
+	* gcc.target/aarch64/pr88838.c: New test.
+	* gcc.target/aarch64/sve/while_1.c: Adjust.
+
+2019-06-13  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	PR target/88834
+	* gcc.target/aarch64/pr88834.c: New test.
+	* gcc.target/aarch64/sve/struct_vect_1.c: Adjust.
+	* gcc.target/aarch64/sve/struct_vect_14.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_15.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_16.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_17.c: Likewise.
+	* gcc.target/aarch64/sve/struct_vect_7.c: Likewise.
+
+2019-06-12  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87410
+	* g++.dg/cpp1y/pr87410.C: New test.
+
+2019-06-12  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/66999 - 'this' captured by reference.
+	* g++.dg/cpp0x/lambda/lambda-this21.C: New test.
+
+	PR c++/90825 - endless recursion when evaluating sizeof.
+	PR c++/90832 - endless recursion when evaluating sizeof.
+	* g++.dg/cpp0x/constexpr-sizeof2.C: New test.
+	* g++.dg/cpp0x/constexpr-sizeof3.C: New test.
+
+2019-06-12  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/90676
+	* gcc.dg/tree-ssa/pr30375.c: Adjust and simplify expected test
+	output some more.
+	* gcc.dg/tree-ssa/slsr-27.c: Ditto.
+	* gcc.dg/tree-ssa/slsr-28.c: Ditto.
+	* gcc.dg/tree-ssa/slsr-29.c: Ditto.
+	* gcc.dg/tree-ssa/ssa-dse-24.c: Ditto.
+
+2019-06-12  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90736 - bogus error with alignof.
+	* g++.dg/cpp0x/alignof5.C: New test.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* gcc.dg/builtin-apply2.c: Skip for PRU.
+	* gcc.dg/torture/stackalign/builtin-apply-2.c: Ditto.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* g++.old-deja/g++.abi/ptrmem.C: Add PRU to list.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* gcc.dg/tree-ssa/20040204-1.c: XFAIL on pru.
+	* gcc.dg/tree-ssa/reassoc-33.c: Ditto.
+	* gcc.dg/tree-ssa/reassoc-34.c: Ditto.
+	* gcc.dg/tree-ssa/reassoc-35.c: Ditto.
+	* gcc.dg/tree-ssa/reassoc-36.c: Ditto.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* gcc.dg/stack-usage-1.c: Define PRU stack usage.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* gcc.c-torture/execute/20101011-1.c: Define DO_TEST to 0 for PRU.
+	* gcc.dg/20020312-2.c: No PIC register for PRU.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* lib/gcc-dg.exp: Filter unsupported features in PRU's TI ABI mode.
+	* lib/target-utils.exp: Ditto.
+	* lib/target-supports.exp (check_effective_target_function_pointers,
+	check_effective_target_large_return_values): New.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* lib/gcc-dg.exp: Bail on region overflow for tiny targets.
+	* lib/target-utils.exp: Ditto.
+	* lib/target-supports.exp: Declare PRU target as tiny.
+
+2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
+
+	* gcc.target/pru/abi-arg-struct.c: New test.
+	* gcc.target/pru/ashiftrt.c: New test.
+	* gcc.target/pru/builtins-1.c: New test.
+	* gcc.target/pru/builtins-error.c: New test.
+	* gcc.target/pru/clearbit.c: New test.
+	* gcc.target/pru/loop-asm.c: New test.
+	* gcc.target/pru/loop-dowhile.c: New test.
+	* gcc.target/pru/loop-hi-1.c: New test.
+	* gcc.target/pru/loop-hi-2.c: New test.
+	* gcc.target/pru/loop-qi-1.c: New test.
+	* gcc.target/pru/loop-qi-2.c: New test.
+	* gcc.target/pru/loop-short-1.c: New test.
+	* gcc.target/pru/loop-short-2.c: New test.
+	* gcc.target/pru/loop-si-1.c: New test.
+	* gcc.target/pru/loop-si-2.c: New test.
+	* gcc.target/pru/loop-u8_pcrel_overflow.c: New test.
+	* gcc.target/pru/loop-ubyte-1.c: New test.
+	* gcc.target/pru/loop-ubyte-2.c: New test.
+	* gcc.target/pru/lra-framepointer-fragmentation-1.c: New test.
+	* gcc.target/pru/lra-framepointer-fragmentation-2.c: New test.
+	* gcc.target/pru/mabi-ti-1.c: New test.
+	* gcc.target/pru/mabi-ti-2.c: New test.
+	* gcc.target/pru/mabi-ti-3.c: New test.
+	* gcc.target/pru/mabi-ti-4.c: New test.
+	* gcc.target/pru/mabi-ti-5.c: New test.
+	* gcc.target/pru/mabi-ti-6.c: New test.
+	* gcc.target/pru/mabi-ti-7.c: New test.
+	* gcc.target/pru/pr64366.c: New test.
+	* gcc.target/pru/pragma-ctable_entry.c: New test.
+	* gcc.target/pru/pru.exp: New file.
+	* gcc.target/pru/qbbc-1.c: New test.
+	* gcc.target/pru/qbbc-2.c: New test.
+	* gcc.target/pru/qbbc-3.c: New test.
+	* gcc.target/pru/qbbs-1.c: New test.
+	* gcc.target/pru/qbbs-2.c: New test.
+	* gcc.target/pru/setbit.c: New test.
+	* gcc.target/pru/zero_extend-and-hisi.c: New test.
+	* gcc.target/pru/zero_extend-and-qihi.c: New test.
+	* gcc.target/pru/zero_extend-and-qisi.c: New test.
+	* gcc.target/pru/zero_extend-hisi.c: New test.
+	* gcc.target/pru/zero_extend-qihi.c: New test.
+	* gcc.target/pru/zero_extend-qisi.c: New test.
+	* lib/target-supports.exp: Add PRU to feature filters.
+
+2019-06-12  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90002
+	* gfortran.dg/pr90002.f90: New test.
+
+2019-06-12  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/90676
+	* gcc.dg/tree-ssa/dump-6.c: New test.
+	* g++.dg/tree-ssa/pr19807.C: Adjust expected output.
+	* g++.dg/tree-ssa/ssa-dse-1.C: Same.
+	* gcc.dg/store_merging_5.c: Same.
+	* gcc.dg/tree-prof/stringop-2.c: Same.
+	* gcc.dg/tree-ssa/pr30375.c: Same.
+	* gcc.dg/tree-ssa/slsr-27.c: Same.
+	* gcc.dg/tree-ssa/slsr-28.c: Same.
+	* gcc.dg/tree-ssa/slsr-29.c: Same.
+	* gcc.dg/tree-ssa/ssa-dse-24.c: Same.
+
+2019-06-12  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90662
+	* gcc.dg/strlenopt-62.c: New test.
+	* gcc.dg/strlenopt-63.c: New test.
+	* gcc.dg/strlenopt-64.c: New test.
+
+2019-06-12  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>
+
+	* gcc.target/arm/ssadv16qi.c: New test.
+	* gcc.target/arm/usadv16qi.c: Likewise.
+
+2019-06-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/90760
+	* gcc.dg/pr90760.c: New test.
+
+2019-06-11  Faraz Shahbazker  <fshahbazker@wavecomp.com>
+
+	* gcc.target/mips/data-sym-pool.c: Update expected output.
+	* gcc.target/mips/data-sym-multi-pool.c: New test.
+
+2019-06-11  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR testsuite/65364
+	* gcc.dg/uninit-19.c (fn1): Adjust target condition for Darwin.
+	(fn2): Likewise.
+
+2019-06-11  Michael Meissner  <meissner@linux.ibm.com>
+
+	* gcc.target/powerpc/localentry-1.c: Add -mpcrel option.
+	* gcc.target/powerpc/localentry-detect-1.c: Explicitly set and
+	unset -mpcrel in the target pragmas.
+	* gcc.target/powerpc/notoc-direct-1.c: Add -mpcrel option.
+	* gcc.target/powerpc/pcrel-sibcall-1.c: Explicitly set and
+	unset -mpcrel in the target pragmas.
+
+2019-06-11  Marc Glisse  <marc.glisse@inria.fr>
+
+	* gcc.dg/tree-ssa/cmpexactdiv-5.c: New file.
+
+2019-06-11  Matthew Beliveau  <mbelivea@redhat.com>
+
+	PR c++/90449 - add -Winaccessible-base option.
+	* g++.dg/warn/Winaccessible-base-1.C: New file.
+	* g++.dg/warn/Winaccessible-base-2.C: New file.
+	* g++.dg/warn/Winaccessible-virtual-base-1.C: New file.
+	* g++.dg/warn/Winaccessible-virtual-base-2.C: New file.
+
+2019-06-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/90810
+	* g++.dg/ext/vector37.C: New test.
+
+2019-06-10  Matthew Beliveau  <mbelivea@redhat.com>
+
+	PR c++/87250
+	* g++.dg/cpp0x/pr87250.C: New test.
+
+2019-06-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR testsuite/90772
+	* g++.dg/cpp1y/feat-cxx14.C: Use std::size_t instead of size_t.
+	* g++.dg/cpp1z/feat-cxx1z.C: Likewise.
+	* g++.dg/cpp2a/feat-cxx2a.C: Likewise.
+	* g++.dg/cpp1z/pr85569.C: Include <functional>.
+	* g++.dg/tree-ssa/pr80293.C: Include <cstdint>.
+	* g++.dg/tree-ssa/pr69336.C: Include <stdexcept>.
+
+2019-06-10  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR other/90695
+	* g++.dg/cpp0x/noexcept15.C: Remove dependency on library header.
+
+2019-06-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/scan-1.c: New test.
+	* c-c++-common/gomp/scan-2.c: New test.
+	* c-c++-common/gomp/scan-3.c: New test.
+	* c-c++-common/gomp/scan-4.c: New test.
+
+2019-06-10  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/no_profile_instrument_function-attr-1.c: Fix
+	function name.
+
+2019-06-10  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	* gcc.target/arc/jumptables.c: Update test.
+
+2019-06-10  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	* gcc.target/arc/and-cnst-size.c: New test.
+	* gcc.target/arc/mov-cnst-size.c: Likewise.
+	* gcc.target/arc/or-cnst-size.c: Likewise.
+	* gcc.target/arc/store-merge-1.c: Update test.
+	* gcc.target/arc/arc700-stld-hazard.c: Likewise.
+	* gcc.target/arc/cmem-1.c: Likewise.
+	* gcc.target/arc/cmem-2.c: Likewise.
+	* gcc.target/arc/cmem-3.c: Likewise.
+	* gcc.target/arc/cmem-4.c: Likewise.
+	* gcc.target/arc/cmem-5.c: Likewise.
+	* gcc.target/arc/cmem-6.c: Likewise.
+	* gcc.target/arc/loop-4.c: Likewise.
+	* gcc.target/arc/movh_cl-1.c: Likewise.
+	* gcc.target/arc/sdata-3.c: Likewise.
+
+2019-06-10  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/ipa/pr68035.c: Update scanned pattern.
+
+2019-06-10  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/attr-copy-6.c: Require alias support.
+
+2019-06-09  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/65175
+	* g++.dg/cpp0x/alias-decl-69.C: New test.
+
+	PR c++/60366
+	* g++.dg/cpp0x/lambda/lambda-ice32.C: New test.
+
+019-06-09  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/89365
+	* gfortran.dg/assumed_rank_bounds_3.f90 : New test.
+
+2019-06-08  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/90786
+	* gfortran.dg/proc_ptr_51.f90 : New test.
+
+2019-06-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/52269
+	* g++.dg/cpp0x/constexpr-decltype4.C: New test.
+
+2019-06-08  Thomas Koenig  <tkoenig@gcc.gnu.org>
+	    Tomáš Trnka  <trnka@scm.com>
+
+	PR fortran/90744
+	* gfortran.dg/deferred_character_33.f90: New test.
+	* gfortran.dg/deferred_character_33a.f90: New test.
+
+2019-06-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/77548
+	* g++.dg/other/pr77548.C: New test.
+
+	PR c++/72845
+	* g++.dg/cpp0x/noexcept41.C: New test.
+
+2019-06-08  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* gcc.target/aarch64/sve/init_1.c: Remove options
+	-O2 -fno-schedule-insns and instead pass -O.
+	Update assembly in comments.
+	* gcc.target/aarch64/sve/init_2.c: Likewise.
+	* gcc.target/aarch64/sve/init_3.c: Likewise.
+	* gcc.target/aarch64/sve/init_4.c: Likewise.
+	* gcc.target/aarch64/sve/init_5.c: Likewise and additionally
+	adjust dg-scan.
+	* gcc.target/aarch64/sve/init_6.c: Likewise.
+	* gcc.target/aarch64/sve/init_7.c: Likewise.
+	* gcc.target/aarch64/sve/init_8.c: Likewise.
+	* gcc.target/aarch64/sve/init_9.c: Likewise.
+	* gcc.target/aarch64/sve/init_10.c: Likewise.
+	* gcc.target/aarch64/sve/init_11.c: Likewise.
+	* gcc.target/aarch64/sve/init_12.c: Likewise.
+
+2019-06-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/77747
+	* g++.dg/cpp0x/inh-ctor33.C: New test.
+
+	PR c++/77967
+	* g++.dg/cpp0x/alias-decl-68.C: New test.
+
+	PR c++/77771
+	* g++.dg/cpp0x/constexpr-77771.C: New test.
+
+2019-06-07  John David Anglin  <danglin@gcc.gnu.org>
+
+	* lib/scanasm.exp (dg-function-on-line): Add pattern for hppa*-*-linux*.
+
+2019-06-07  Mark Eggleston  <mark.eggleston@codethink.com>
+
+	PR fortran/89100
+	* gfortran.dg/fmt_f_default_field_width_3.f90: Modify dg-error
+	to allow use when kind=16 is not supported.
+	* gfortran.dg/fmt_g_default_field_width_3.f90: Modify dg-error
+	to allow use when kind=16 is not supported.
+
+2019-06-07  Richard Biener  <rguenther@suse.de>
+
+	PR debug/90574
+	* gcc.misc-tests/gcov-pr90574-1.c: New testcase.
+	* gcc.misc-tests/gcov-pr90574-2.c: Likewise.
+
+2019-06-07  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/lto/alias-access-path-2.0.c: New testcase.
+
+2019-06-07  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/78902
+	* c-c++-common/asan/alloca_loop_unpoisoning.c: Use result
+	of __builtin_alloca.
+	* c-c++-common/asan/pr88619.c: Likewise.
+	* g++.dg/overload/using2.C: Likewise for malloc.
+	* gcc.dg/attr-alloc_size-5.c: Add new dg-warning.
+	* gcc.dg/nonnull-3.c: Use result of __builtin_strdup.
+	* gcc.dg/pr43643.c: Likewise.
+	* gcc.dg/pr59717.c: Likewise for calloc.
+	* gcc.dg/torture/pr71816.c: Likewise.
+	* gcc.dg/tree-ssa/pr78886.c: Likewise.
+	* gcc.dg/tree-ssa/pr79697.c: Likewise.
+	* gcc.dg/pr78902.c: New test.
+
+2019-06-06  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* g++.dg/cpp0x/alignas4.C: Amend test to check for zerofill syntax
+	on Darwin.
+
+2019-06-06  Martin Jambor  <mjambor@suse.cz>
+
+	* gcc.dg/tree-ssa/alias-access-path-1.c: Remove -fno-tree-sra option.
+	* gcc.dg/tree-ssa/ssa-dse-26.c: Disable FRE.
+	* gnat.dg/opt39.adb: Adjust scan dump.
+
+2019-06-06  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/size-optimized-shifts.c: New test.
+
+2019-06-06  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/emulate-slli.c: New test.
+	* gcc.target/msp430/emulate-srai.c: New test.
+	* gcc.target/msp430/emulate-srli.c: New test.
+
+2019-06-06  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/87954
+	* gcc.dg/pr87954.c: New test.
+
+2019-06-06  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/alias-37.c: New testcase.
+	* gcc.dg/torture/20190604-1.c: Likewise.
+	* gcc.dg/tree-ssa/pta-callused.c: Adjust.
+
+2019-06-06  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	* gcc.target/arc/tmac-1.c: Reoreder dg-directives.
+	* gcc.target/arc/tmac-2.c: Likewise.
+
+2019-06-05  Martin Sebor  <msebor@redhat.com>
+
+	PR c/90737
+	* c-c++-common/Wreturn-local-addr.c: New test.
+	* g++.dg/warn/Wreturn-local-addr-6.C: New test.
+
+2019-06-05  Hongtao Liu  <hongtao.liu@intel.com>
+
+	* gcc.target/i386/avx512dq-vfpclasspd-1.c: Adjust scan assember
+	for {x,y,z} suffix.
+	* gcc.target/i386/avx512dq-vfpclassps-1.c: Ditto.
+
+2019-06-05  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/format/gcc_diag-11.c: Skip until -Wformat-diag has
+	been committed.
+
+2019-06-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/return-type-invalid-1.C: New.
+	* g++.old-deja/g++.brendan/crash16.C: Adjust.
+	* g++.old-deja/g++.law/ctors5.C: Likewise.
+
+2019-06-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/other/friend4.C: Test locations too.
+	* g++.dg/other/friend5.C: Likewise.
+	* g++.dg/other/friend7.C: Likewise.
+
+2019-06-05  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* g++.target/powerpc/undef-bool-3.C: Add -maltivec to dg-options.
+
+2019-06-05  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/weak/weak-19.c: New test.
+
+2019-06-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/discr6.ads: New test.
+
+2019-06-05  Sam Tebbs  <sam.tebbs@arm.com>
+
+	* gcc.target/aarch64/return_address_sign_b_1.c: New file.
+	* gcc.target/aarch64/return_address_sign_b_2.c: New file.
+	* gcc.target/aarch64/return_address_sign_b_3.c: New file.
+	* gcc.target/aarch64/return_address_sign_builtin.c: New file.
+	* g++.target/aarch64/return_address_sign_ab_exception.C: New file.
+	* g++.target/aarch64/return_address_sign_b_exception.C: New file.
+
+2019-06-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/90733
+	* gcc.dg/pr90733.c: New test.
+
+2019-06-05  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/90726
+	* gcc.dg/pr90726.c: Enable IVOPTs.
+
+2019-06-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/vect/simd-1.cc: New test.
+
+2019-06-05  Hongtao Liu  <hongtao.liu@intel.com>
+
+	PR target/89803
+	* gcc.target/i386/avx-1.c (__builtin_ia32_fpclasssss,
+	__builtin_ia32_fpclasssd): Removed.
+	(__builtin_ia32_fpclassss_mask, __builtin_ia32_fpclasssd_mask): Define.
+	* gcc.target/i386/sse-13.c (__builtin_ia32_fpclasssss,
+	__builtin_ia32_fpclasssd): Removed.
+	(__builtin_ia32_fpclassss_mask, __builtin_ia32_fpclasssd_mask): Define.
+	* gcc.target/i386/sse-23.c (__builtin_ia32_fpclasssss,
+	__builtin_ia32_fpclasssd): Removed.
+	(__builtin_ia32_fpclassss_mask, __builtin_ia32_fpclasssd_mask): Define.
+	* gcc.target/i386/avx512dq-vfpclassss-2.c: New.
+	* gcc.target/i386/avx512dq-vfpclasssd-2.c: New.
+	* gcc.target/i386/avx512dq-vfpclassss-1.c (avx512f_test):
+	Add test for _mm_mask_fpclass_ss_mask.
+	* gcc.target/i386/avx512dq-vfpclasssd-1.c (avx512f_test):
+	Add test for _mm_mask_fpclass_sd_mask.
+
+2019-06-04  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/direct-move-double1.c (VSX_REG_ATTR): Delete.
+	* gcc.target/powerpc/direct-move-double2.c: Ditto.
+	* gcc.target/powerpc/direct-move-float1.c: Ditto.
+	* gcc.target/powerpc/direct-move-float2.c: Ditto.
+	* gcc.target/powerpc/direct-move-vint1.c: Ditto.
+	* gcc.target/powerpc/direct-move-vint2.c: Ditto.
+
+2019-06-04  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/direct-move-float1.c: Use "wa" instead of "ww"
+	constraint.
+
+2019-06-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/concepts/pr60573.C: Test locations too.
+	* g++.dg/cpp0x/deleted13.C: Likewise.
+	* g++.dg/parse/error29.C: Likewise.
+	* g++.dg/parse/qualified4.C: Likewise.
+	* g++.dg/template/crash96.C Likewise.
+	* g++.old-deja/g++.brendan/crash22.C Likewise.
+	* g++.old-deja/g++.brendan/crash23.C Likewise.
+	* g++.old-deja/g++.law/visibility10.C Likewise.
+	* g++.old-deja/g++.other/decl5.C: Likewise.
+
+2019-06-04  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	PR target/78263
+	* g++.target/powerpc: New directory.
+	* g++.target/powerpc/powerpc.exp: New test driver.
+	* g++.target/powerpc/undef-bool-3.C: New.
+
+2019-06-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
+	a sorry_at on any of the clauses.
+
+2019-06-04  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/90726
+	* gcc.dg/pr90726.c: New testcase.
+
+2019-06-04  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90738
+	* gcc.dg/torture/pr90738.c: New testcase.
+
+	Revert
+	2019-06-03  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/alias-access-path-1.c: Scan fre1.
+
+2019-06-04  Martin Liska  <mliska@suse.cz>
+
+	* c-c++-common/goacc/acc-icf.c: Change scanned pattern.
+	* gfortran.dg/goacc/pr78027.f90: Likewise.
+
+2019-06-03  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/mmfpgpr.c: Delete.
+
+2019-06-03  David Edelsohn  <dje.gcc@gmail.com>
+
+	* gcc.dg/debug/enum-1.c: Add -fno-eliminate-unused-debug-symbols
+	on AIX.
+	* g++.dg/debug/enum-1.C: Same.
+
+2019-06-03  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR middle-end/64242
+	* gcc.c-torture/execute/pr64242.c: Update test.
+
+2019-06-03  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* gcc.target/aarch64/pcs_attribute-2.c: New test.
+	* gcc.target/aarch64/torture/simd-abi-4.c: Check .variant_pcs support.
+	* lib/target-supports.exp (check_effective_target_aarch64_variant_pcs):
+	New.
+
+2019-06-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/ssadv16qi.c: Add +nodotprod to pragma.
+	* gcc.target/aarch64/usadv16qi.c: Likewise.
+	* gcc.target/aarch64/ssadv16qi-dotprod.c: New test.
+	* gcc.target/aarch64/usadv16qi-dotprod.c: Likewise.
+
+2019-06-03  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* lib/target-supports.exp (add_options_for_aarch64_sve): New procedure.
+	(aarch64_sve_hw_bits): Call add_options_for_aarch64_sve.
+	(check_effective_target_aarch64_sve_hw): Likewise.
+
+2019-06-03  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/alias-access-path-1.c: Scan fre1.
+
+2019-06-03  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90716
+	* gcc.dg/guality/pr90716.c: New testcase.
+
+2019-06-03  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR target/88837
+	* gcc.target/aarch64/sve/init_1.c: New test.
+	* gcc.target/aarch64/sve/init_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_2.c: Likewise.
+	* gcc.target/aarch64/sve/init_2_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_3.c: Likewise.
+	* gcc.target/aarch64/sve/init_3_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_4.c: Likewise.
+	* gcc.target/aarch64/sve/init_4_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_5.c: Likewise.
+	* gcc.target/aarch64/sve/init_5_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_6.c: Likewise.
+	* gcc.target/aarch64/sve/init_6_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_7.c: Likewise.
+	* gcc.target/aarch64/sve/init_7_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_8.c: Likewise.
+	* gcc.target/aarch64/sve/init_8_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_9.c: Likewise.
+	* gcc.target/aarch64/sve/init_9_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_10.c: Likewise.
+	* gcc.target/aarch64/sve/init_10_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_11.c: Likewise.
+	* gcc.target/aarch64/sve/init_11_run.c: Likewise.
+	* gcc.target/aarch64/sve/init_12.c: Likewise.
+	* gcc.target/aarch64/sve/init_12_run.c: Likewise.
+
+2019-06-03  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+
+	PR tree-optimization/90681
+	* gfortran.dg/vect/pr90681.f: New test.
+
+2019-06-03  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/90713
+	* gcc.dg/gimplefe-40.c: Add -maltivec for powerpc.
+
+2019-06-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90539
+	* gfortran.dg/internal_pack_24.f90: New test.
+
+2019-06-01  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/90698
+	* gcc.target/i386/pr49866.c: XFAIL for Darwin.
+	* gcc.target/i386/pr63538.c: Likewise.
+	* gcc.target/i386/pr61599-1.c: Skip for Darwin.
+
+2019-06-01  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/90694
+	* gcc.dg/tree-ssa/dump-5.c: New test.
+
+2019-05-31  Jan Hubicka  <jh@suse.cz>
+
+	* g++.dg/lto/alias-1_0.C: New testcase.
+	* g++.dg/lto/alias-1_1.C: New testcase.
+
+2019-05-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89355
+	* gcc.target/i386/cet-label-3.c: New test.
+	* gcc.target/i386/cet-label-4.c: Likewise.
+	* gcc.target/i386/cet-label-5.c: Likewise.
+
+2019-05-31  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
+
+	* gcc.target/mips/msa-fmadd.c: New.
+
+2019-05-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
+	a sorry on lastprivate conditional on simd construct.
+	* gcc.dg/vect/vect-simd-6.c: New test.
+	* gcc.dg/vect/vect-simd-7.c: New test.
+
+	* gcc.dg/vect/vect-simd-5.c: New test.
+
+2019-05-31  Xiong Hu Luo  <luoxhu@linux.ibm.com>
+
+	PR c/43673
+	* gcc.dg/format-dfp-printf-1.c: New test.
+	* gcc.dg/format-dfp-scanf-1.c: Likewise.
+
+2019-05-31  Marc Glisse  <marc.glisse@inria.fr>
+
+	* g++.dg/tree-ssa/cprop-vcond.C: New file.
+
+2019-05-31  Marc Glisse  <marc.glisse@inria.fr>
+
+	* gcc.dg/tree-ssa/cmpexactdiv-3.c: New file.
+	* gcc.dg/tree-ssa/cmpexactdiv-4.c: New file.
+	* gcc.dg/Walloca-13.c: Xfail.
+
+2019-05-31  Bill Schmidt  <wschmidt@linux.ibm.com>
+	    Michael Meissner  <meissner@linux.ibm.com>
+
+	* gcc.target/powerpc/cpu-future.c: Require powerpc_future_ok.
+	* gcc.target/powerpc/localentry-1.c: Likewise.
+	* gcc.target/powerpc/localentry-direct-1.c: Likewise.
+	* gcc.target/powerpc/notoc-direct-1.c: Likewise.
+	* gcc.target/powerpc/pcrel-sibcall-1.c: Likewise.
+	* lib/target-supports.exp (check_powerpc_future_hw_available): New.
+	(check_effective_target_powerpc_future_ok): New.
+
+2019-05-31  Thomas De Schampheleire  <thomas.de_schampheleire@nokia.com>
+
+	PR debug/86964
+	* g++.dg/debug/dwarf2/fesd-any.C: Use
+	-fno-eliminate-unused-debug-symbols.
+	* g++.dg/debug/dwarf2/fesd-baseonly.C: Likewise.
+	* g++.dg/debug/dwarf2/fesd-none.C: Likewise.
+	* g++.dg/debug/dwarf2/fesd-reduced.C: Likewise.
+	* g++.dg/debug/dwarf2/fesd-sys.C: Likewise.
+	* g++.dg/debug/dwarf2/inline-var-1.C: Likewise.
+	* g++.dg/debug/enum-2.C: Likewise.
+	* gcc.dg/debug/dwarf2/fesd-any.c: Likewise.
+	* gcc.dg/debug/dwarf2/fesd-baseonly.c: Likewise.
+	* gcc.dg/debug/dwarf2/fesd-none.c: Likewise.
+	* gcc.dg/debug/dwarf2/fesd-reduced.c: Likewise.
+	* gcc.dg/debug/dwarf2/fesd-sys.c: Likewise.
+
+2019-05-31  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90671
+	* gcc.dg/torture/pr90671.c: New test.
+
+2019-05-31  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* g++.dg/cpp0x/pr84497.C: Require alias support.
+
+2019-05-31  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/falign-functions-3.c: Adjust align syntax
+	and label for Darwin.
+	* gcc.target/i386/attr-aligned-2.c: Adjust align syntax for
+	Darwin.
+
+2019-05-30  Sylvia Taylor  <sylvia.taylor@arm.com>
+
+	* gcc.target/aarch64/sve/fabd_1.c: New.
+
+2019-05-30  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr86257.c: Require native TLS support.
+	* gcc.target/i386/stack-prot-sym.c: Likewise.
+
+2019-05-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/alias-decl-18.C: Test location too.
+	* g++.dg/cpp0x/udlit-nofunc-neg.C: Likewise.
+	* g++.dg/parse/crash59.C: Likewise.
+	* g++.dg/parse/error38.C: Likewise.
+	* g++.dg/parse/error39.C: Likewise.
+	* g++.dg/template/crash31.C: Likewise.
+	* g++.dg/template/operator8.C: Likewise.
+	* g++.dg/template/operator9.C: Likewise.
+
+2019-05-29  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/notoc-direct-1.c: New.
+	* gcc.target/powerpc/pcrel-sibcall-1.c: New.
+
+2019-05-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/90598
+	* g++.dg/cpp0x/pr90598.C: New test.
+
+2019-05-29  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90539
+	* gfortran.dg/internal_pack_21.f90: Adjust scan patterns.
+	* gfortran.dg/internal_pack_22.f90: New test.
+	* gfortran.dg/internal_pack_23.f90: New test.
+
+2019-05-29  Jan Hubicka  <hubicka@ucw.cz>
+
+	* tree-ssa/alias-access-spath-1.c: new testcase.
+
+2019-05-29  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/89875
+	* g++.dg/cpp0x/decltype-pr66548.C: Remove xfail.
+	* g++.dg/template/sizeof-template-argument.C: Adjust expected error.
+
+2019-05-29  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+
+	* gcc.target/aarch64/sve2/aarch64-sve2.exp: New file, regression
+	driver for AArch64 SVE2.
+	* gcc.target/aarch64/sve2/average_1.c: New test.
+	* lib/target-supports.exp (check_effective_target_aarch64_sve2): New
+	helper.
+	(check_effective_target_aarch64_sve1_only): Likewise.
+	(check_effective_target_aarch64_sve2_hw): Likewise.
+	(check_effective_target_vect_avg_qi): Check for SVE1 only.
+
+2019-05-29  Sam Tebbs  <sam.tebbs@arm.com>
+
+	* gcc.target/aarch64/return_address_sign_b_1.c: New file.
+	* gcc.target/aarch64/return_address_sign_b_2.c: New file.
+	* gcc.target/aarch64/return_address_sign_b_3.c: New file.
+	* gcc.target/aarch64/return_address_sign_b_exception.c: New file.
+	* gcc.target/aarch64/return_address_sign_ab_exception.c: New file.
+	* gcc.target/aarch64/return_address_sign_builtin.c: New file
+
+2019-05-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
+	sorry on lastprivate conditional on parallel for.
+	* c-c++-common/gomp/lastprivate-conditional-3.c (foo): Add tests for
+	lastprivate conditional warnings on parallel for constructs.
+	* c-c++-common/gomp/lastprivate-conditional-4.c: New test.
+
+	PR c/90628
+	* c-c++-common/builtin-arith-overflow-3.c: New test.
+
+	P1091R3 - Extending structured bindings to be more like var decls
+	P1381R1 - Reference capture of structured bindings
+	* g++.dg/cpp1z/decomp3.C (test): For static, expect only warning
+	instead of error and only for c++17_down.  Add a thread_local test.
+	(z2): Add a __thread test.
+	* g++.dg/cpp2a/decomp1.C: New test.
+	* g++.dg/cpp2a/decomp1-aux.cc: New file.
+	* g++.dg/cpp2a/decomp2.C: New test.
+	* g++.dg/cpp2a/decomp3.C: New test.
+
+2019-05-29  Martin Liska  <mliska@suse.cz>
+
+	PR testsuite/90657
+	* gcc.dg/ipa/pr90555.c: Remove duplicite dg-compile.
+
+2019-05-28  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/localentry-detect-1.c: New file.
+
+2019-05-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90548 - ICE with generic lambda and empty pack.
+	* g++.dg/cpp1y/lambda-generic-90548.C: New test.
+
+2019-05-28  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+
+	* gcc.target/aarch64/sve/mask_load_slp_1.c: New test for SLP
+	vectorized masked loads.
+
+2019-05-28  Jeff Law  <law@redhat.com>
+
+	* gcc.target/sh/pr50749-qihisi-predec-3.c: Disable
+	loop distribution.
+
+2019-05-28  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/p9-dimode1.c: Don't restrict to -m64.  Check for
+	all mtvsr*, not just mtvsrd.  Use "wa" instead of "wi" constraints.
+	* gcc.target/powerpc/p9-dimode2.c: Ditto.
+
+2019-05-28  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/90555
+	* gcc.dg/ipa/pr90555.c: New test.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/machine_attr1.ad[sb]: New test.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt79.ad[sb]: New test.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/discr5.ads: New test.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/prefetch1.ad[sb]: New test.
+
+2019-05-27  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr22076.c: Adjust options to
+	match codegen expected by the scan-asms.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/array4.ads: New test.
+
+2019-05-27  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	PR tree-optimization/88440
+	* gcc.target/aarch64/sve/index_offset_1.c: Add
+	-fno-tree-loop-distribute-patterns.
+	* gcc.target/aarch64/sve/single_1.c: Likewise.
+	* gcc.target/aarch64/sve/single_2.c: Likewise.
+	* gcc.target/aarch64/sve/single_3.c: Likewise.
+	* gcc.target/aarch64/sve/single_4.c: Likewise.
+	* gcc.target/aarch64/sve/vec_init_1.c: Likewise.
+	* gcc.target/aarch64/vect-fmovd-zero.c: Likewise.
+	* gcc.target/aarch64/vect-fmovf-zero.c: Likewise.
+	* gcc.target/arm/ivopts.c: Likewise.
+
+2019-05-27  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90637
+	* gcc.dg/gomp/pr90637.c: New testcase.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/expect2.adb: New test.
+	* gnat.dg/expect2_pkg.ads: New helper.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/aliased2.adb: New test.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/limited_with7.ad[sb]: New test.
+	* gnat.dg/limited_with7_pkg.ads: New helper.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/unchecked_convert13.adb: New test.
+
+2019-05-27  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/90615
+	* gcc.dg/vect/costmodel/ppc/costmodel-vect-31b.c: Add
+	-fno-tree-loop-distribute-patterns.
+	* gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c: Likewise.
+	* gcc.dg/vect/costmodel/ppc/costmodel-vect-76a.c: Likewise.
+	* gcc.dg/vect/costmodel/ppc/costmodel-vect-76b.c: Likewise.
+	* gcc.dg/vect/costmodel/ppc/costmodel-vect-76c.c: Likewise.
+	* gcc.target/powerpc/vsx-vectorize-1.c: Likewise.
+
+2019-05-26  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr39013-1.c: Adjust scan-asms for PIE to
+	account for PIC code on Darwin.
+	* gcc.target/i386/pr39013-2.c: Likewise.
+	* gcc.target/i386/pr64317.c: Likewise.
+
+2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr59874-3.c: Use the spelling of popcnt
+	expected for Darwin.
+
+2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr89261.c: Test that the alignment required
+	by the test correctly produces the expected error on Darwin.
+
+2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr82659-3.c: Require alias support.
+
+2019-05-25  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90572 - wrong disambiguation in friend declaration.
+	* g++.dg/cpp2a/typename16.C: New test.
+	* g++.dg/parse/friend13.C: New test.
+
+2019-05-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
+	sorry for omp for.
+	* c-c++-common/gomp/lastprivate-conditional-3.c: New test.
+
+2019-05-24  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/90607
+	* gcc.dg/pr53265.c: Amend for new expected diagnostic.
+
+2019-05-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90106
+	PR testsuite/90517
+	* gcc.dg/cdce1.c: Don't scan-assembler, instead -fdump-tree-optimized
+	and scan-tree-dump for tail call.
+	* gcc.dg/cdce2.c: Likewise.
+
+2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pconfig-1.c: Scan for the string in the generated
+	code, not in comments or miscellaneous directives.
+	* gcc.target/i386/pr18041-1.c: Likewise.
+	* gcc.target/i386/pr18041-2.c: Likewise.
+	* gcc.target/i386/wbinvd-1.c: Likewise.
+	* gcc.target/i386/wbnoinvd-1.c: Likewise.
+	* gcc.target/i386/pr66819-3.c: Specifically, check that there is no
+	call to "bar".
+	* gcc.target/i386/pr66819-4.c: Likewise.
+	* gcc.target/i386/pr82662.c
+	* gcc.target/i386/ptwrite2.c: Make the checks look for the specific
+	destination register, don't try the m32 test on m64 targets.
+
+2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/pr67985-2.c: Adjust label checks for
+	Darwin.
+	* gcc.target/i386/pr77881.c: Likewise.
+
+2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/falign-functions-2.c: Skip for Darwin.
+	* gcc.target/i386/pr70738-7.c: Likewise.
+	* gcc.target/i386/pr24414.c: Likewise.
+
+2019-05-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* lib/target-supports.exp (check_effective_target_mfentry): New.
+	* gcc.target/i386/fentry-override.c: Require effective target mfentry.
+	* gcc.target/i386/fentry.c: Likewise.
+	* gcc.target/i386/fentryname1.c: Likewise.
+	* gcc.target/i386/fentryname2.c: Likewise.
+	* gcc.target/i386/fentryname3.c: Likewise.
+	* gcc.target/i386/nop-mcount.c: Likewise.
+	* gcc.target/i386/pr82699-2.c: Likewise.
+	* gcc.target/i386/pr82699-4.c: Likewise.
+	* gcc.target/i386/pr82699-5.c: Likewise.
+	* gcc.target/i386/pr82699-6.c: Likewise.
+	* gcc.target/i386/returninst1.c: Likewise.
+	* gcc.target/i386/returninst2.c: Likewise.
+	* gcc.target/i386/returninst3.c : Likewise.
+
+2019-05-23  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/localentry-1.c: New file.
+
+2019-05-23  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/90552
+	* gcc.target/i386/pr90552.c: New test.
+
+2019-05-23  Mark Eggleston  <mark.eggleston@codethink.com>
+
+	* gfortran.dg/fmt_f_default_field_width_1.f90: Hide REAL(16) behind
+	__GFC_REAL_16__.  Add -cpp to dg-options.
+	* gfortran.dg/fmt_f_default_field_width_2.f90: Ditto.
+	* gfortran.dg/fmt_f_default_field_width_3.f90: Ditto.
+	* gfortran.dg/fmt_g_default_field_width_1.f90: Ditto.
+	* gfortran.dg/fmt_g_default_field_width_2.f90: Ditto.
+	* gfortran.dg/fmt_g_default_field_width_3.f90: Ditto.
+
+2019-05-23  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/cpu-future.c: New test.
+
+2019-05-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88440
+	* gcc.dg/tree-ssa/ldist-37.c: New testcase.
+	* gcc.dg/tree-ssa/ldist-38.c: Likewise.
+	* gcc.dg/vect/vect.exp: Add -fno-tree-loop-distribute-patterns.
+	* gcc.dg/tree-ssa/ldist-37.c: Adjust.
+	* gcc.dg/tree-ssa/ldist-38.c: Likewise.
+	* g++.dg/tree-ssa/pr78847.C: Likewise.
+	* gcc.dg/autopar/pr39500-1.c: Likewise.
+	* gcc.dg/autopar/reduc-1char.c: Likewise.
+	* gcc.dg/autopar/reduc-7.c: Likewise.
+	* gcc.dg/tree-ssa/ivopts-lt-2.c: Likewise.
+	* gcc.dg/tree-ssa/ivopts-lt.c: Likewise.
+	* gcc.dg/tree-ssa/predcom-dse-1.c: Likewise.
+	* gcc.dg/tree-ssa/predcom-dse-2.c: Likewise.
+	* gcc.dg/tree-ssa/predcom-dse-3.c: Likewise.
+	* gcc.dg/tree-ssa/predcom-dse-4.c: Likewise.
+	* gcc.dg/tree-ssa/prefetch-7.c: Likewise.
+	* gcc.dg/tree-ssa/prefetch-8.c: Likewise.
+	* gcc.dg/tree-ssa/prefetch-9.c: Likewise.
+	* gcc.dg/tree-ssa/scev-11.c: Likewise.
+	* gcc.dg/vect/costmodel/i386/costmodel-vect-31.c: Likewise.
+	* gcc.dg/vect/costmodel/i386/costmodel-vect-33.c: Likewise.
+	* gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c: Likewise.
+	* gcc.dg/vect/costmodel/x86_64/costmodel-vect-33.c: Likewise.
+	* gcc.target/i386/pr30970.c: Likewise.
+	* gcc.target/i386/vect-double-1.c: Likewise.
+	* gcc.target/i386/vect-double-2.c: Likewise.
+	* gcc.dg/tree-ssa/gen-vect-2.c: Likewise.
+	* gcc.dg/tree-ssa/gen-vect-26.c: Likewise.
+	* gcc.dg/tree-ssa/gen-vect-28.c: Likewise.
+	* gcc.dg/tree-ssa/gen-vect-32.c: Likewise.
+	* gfortran.dg/vect/vect-5.f90: Likewise.
+	* gfortran.dg/vect/vect-8.f90: Likewise.
+
+2019-05-23  Martin Liska  <mliska@suse.cz>
+
+	PR sanitizer/90570
+	* g++.dg/asan/pr90570.C: New test.
+
+2019-05-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt78.ad[sb]: New test.
+
+2019-05-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR rtl-optimisation/64895
+	* gcc.target/i386/fuse-caller-save-rec.c: Remove XFAILs.
+	* gcc.target/i386/fuse-caller-save.c: Likewise.
+	* gcc.target/i386/fuse-caller-save-xmm.c: Adjust tests for
+	PIC cases, remove XFAILs.
+
+2019-05-23  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR middle-end/90510
+	* brig.dg/test/gimple/packed.hsail: Adjust.
+
+2019-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/cpp2a/is-constant-evaluated8.C: New test.
+
+2019-05-23  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gfortran.dg/dec_io_1.f90, gfortran.dg/dtio_1.f90,
+	gfortran.dg/dtio_12.f90, gfortran.dg/fmt_en.f90,
+	gfortran.dg/namelist_89.f90: Gate test on effective_target
+	fd_truncate.
+
+2019-05-22  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/90462
+	* g++.dg/pr90462.C: New test.
+
+2019-05-22  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/cpp1y/udlit-char-template-neg.C: Expect the error on a
+	different line.  Check the column number too.
+
+2019-05-22  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/vect-signbitf.c (dg-final): Improve
+	scan-assembler-not string to avoid false matching on 32bit targets.
+
+2019-05-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/88483
+	* gcc.target/i386/stackalign/pr88483-1.c: New test.
+	* gcc.target/i386/stackalign/pr88483-2.c: Likewise.
+
+2019-05-22  Andrew Stubbs  <ams@codesourcery.com>
+
+	* gfortran.dg/coarray_lock_7.f90: Fix output patterns.
+
+2019-05-22  Mark Eggleston  <mark.eggleston@codethink.com>
+
+	PR fortran/89100
+	* gfortran.dg/fmt_f_default_field_width_1.f90: New test.
+	* gfortran.dg/fmt_f_default_field_width_2.f90: New test.
+	* gfortran.dg/fmt_f_default_field_width_3.f90: New test.
+	* gfortran.dg/fmt_g_default_field_width_1.f90: New test.
+	* gfortran.dg/fmt_g_default_field_width_2.f90: New test.
+	* gfortran.dg/fmt_g_default_field_width_3.f90: New test.
+	* gfortran.dg/fmt_i_default_field_width_1.f90: New test.
+	* gfortran.dg/fmt_i_default_field_width_2.f90: New test.
+	* gfortran.dg/fmt_i_default_field_width_3.f90: New test.
+
+2019-05-22  Martin Liska  <mliska@suse.cz>
+
+	PR testsuite/90564
+	* gcc.target/powerpc/pr80315-1.c: Remove usage of quotes.
+	* gcc.target/powerpc/pr80315-2.c: Likewise.
+	* gcc.target/powerpc/pr80315-3.c: Likewise.
+	* gcc.target/powerpc/pr80315-4.c: Likewise.
+
+2019-05-22  Martin Liska  <mliska@suse.cz>
+
+	PR testsuite/90564
+	* gcc.target/powerpc/pr80315-1.c: Add one extra \ to escape brackets.
+	* gcc.target/powerpc/pr80315-2.c: Likewise.
+	* gcc.target/powerpc/pr80315-3.c: Likewise.
+	* gcc.target/powerpc/pr80315-4.c: Likewise.
+
+2019-05-22  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR testsuite/27221
+	* g++.dg/ext/alignof2.C: XFAIL for 32bit Darwin.
+
+2019-05-22  Martin Liska  <mliska@suse.cz>
+
+	PR lto/90500
+	* gcc.target/i386/pr90500-1.c: Make the test-case valid now.
+
+2019-05-22  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/ssa-lim-13.c: New testcase.
+
+2019-05-22  Alan Modra  <amodra@gmail.com>
+
+	* gcc.target/powerpc/ppc32-abi-dfp-1.c: Don't use
+	power mnemonics.
+	* gcc.dg/vect/O3-pr70130.c: Disable default options
+	added by check_vect_support_and_set_flags.
+	* gcc.dg/vect/pr48765.c: Likewise.
+	* gfortran.dg/vect/pr45714-b.f: Likewise.
+
+2019-05-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR middle-end/90553
+	* gcc.dg/torture/pr90553.c: New test.
+
+2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/udlit-tmpl-arg-neg2.C: Check locations too.
+	* g++.dg/cpp0x/udlit-tmpl-parms-neg.C: Likewise.
+
+2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/67184
+	PR c++/69445
+	* g++.dg/other/final3.C: New.
+	* g++.dg/other/final4.C: Likewise.
+	* g++.dg/other/final5.C: Likewise.
+
+2019-05-21  Marek Polacek  <polacek@redhat.com>
+
+	DR 1940 - static_assert in anonymous unions.
+	* g++.dg/DRs/dr1940.C: New test.
+
+2019-05-21  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/90547
+	* gcc.target/i386/pr90547.c: New test.
+
+2019-05-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.dg/Wattribute-alias.c: Pass emtpy arg to dg-require-ifunc.
+
+	* gcc.c-torture/execute/20030125-1.c: Pass emtpy arg to dg-require-weak.
+
+	* gcc.dg/torture/ftrapv-2.c: Pass empty arg to dg-require-fork.
+
+	* gcc.target/i386/pr84723-1.c: Remove dg-require-ifunc.
+	* gcc.target/i386/pr84723-2.c: Likewise.
+	* gcc.target/i386/pr84723-3.c: Likewise.
+	* gcc.target/i386/pr84723-4.c: Likewise.
+	* gcc.target/i386/pr84723-5.c: Likewise.
+
+2019-05-21  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR testsuite/67958
+	* gcc.target/i386/pr32219-1.c: Adjust scan-asms for Darwin, comment
+	the differences.
+	* gcc.target/i386/pr32219-2.c: Likewise.
+	* gcc.target/i386/pr32219-3.c: Likewise.
+	* gcc.target/i386/pr32219-4.c: Likewise.
+	* gcc.target/i386/pr32219-5.c: Likewise.
+	* gcc.target/i386/pr32219-6.c: Likewise.
+	* gcc.target/i386/pr32219-7.c: Likewise.
+	* gcc.target/i386/pr32219-8.c: Likewise.
+
+2019-05-21  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/63891
+	* gcc.dg/darwin-weakimport-3.c: Adjust options and explain
+	the reasons.
+
+2019-05-21  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/vect-signbitf.c: New test.
+
+2019-05-21  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/lookup/using53.C: Adjust diagnostic.
+
+2019-05-21  Alan Modra  <amodra@gmail.com>
+
+	PR target/90545
+	* gcc.target/powerpc/fold-vec-splats-floatdouble.c: Correct comments
+	and rename functions to suit parameters.
+
+2019-05-21  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/90510
+	* gcc.target/i386/pr90510.c: New testcase.
+
+2019-05-21  Martin Liska  <mliska@suse.cz>
+
+	* gcc.target/i386/pr90500-1.c: Add missing '""'.
+	* gcc.target/i386/pr90500-2.c: Likewise.
+
+2019-05-21  Vladislav Ivanishin  <vlad@ispras.ru>
+
+	* gcc.dg/uninit-28-gimple.c: New test.
+	* gcc.dg/uninit-29-gimple.c: New test.
+	* gcc.dg/uninit-30-gimple.c: New test.
+	* gcc.dg/uninit-31-gimple.c: New test.
+
+2019-05-21  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/pr90263.c: Add -O2.
+
+2019-05-21  Martin Liska  <mliska@suse.cz>
+
+	* gcc.target/powerpc/ppc64-abi-warn-1.c: Wrap a type.
+	* gcc.target/powerpc/pr80315-1.c: Use new interval format.
+	* gcc.target/powerpc/pr80315-2.c: Likewise.
+	* gcc.target/powerpc/pr80315-3.c: Likewise.
+	* gcc.target/powerpc/pr80315-4.c: Likewise.
+	* gcc.target/powerpc/warn-lvsl-lvsr.c: Wrap builtin names.
+
+2019-05-21  Martin Liska  <mliska@suse.cz>
+
+	PR testsuite/90551
+	* pr90263.c: Move from gcc.c-torture/compile
+	into gcc.dg.
+
+2019-05-20  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR testsuite/90503
+	* gcc.target/i386/pr22076.c (dg-options): Add -mno-sse2.
+	Remove -flax-vector-conversions.
+	(dg-additional-options): Remove.
+	(test): Change to void.  Declare m0 and m1 as __m64 and
+	cast initializer in a proper way.  Do not return result.
+	(dg-final): Scan for 2 instances of movq.
+
+2019-05-20  Marek Polacek  <polacek@redhat.com>
+
+	CWG 2094 - volatile scalars are trivially copyable.
+	PR c++/85679
+	* g++.dg/ext/is_trivially_constructible1.C: Change the expected result
+	for volatile int.
+	* g++.dg/ext/is_trivially_copyable.C: New test.
+
+2019-05-20  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/ext/utf8-2.C: Accept both "char" and "char8_t" in aka.
+
+	* g++.dg/cpp2a/nontype-class17.C: New test.
+
+	* g++.dg/lookup/strong-using2.C: New test.
+
+2019-05-20  Jeff Law  <law@redhat.com>
+
+	* gcc.dg/Wtype-limits-Wextra.c: Adjust expected output after
+	recent diagnostic cleanups.
+
+2019-05-20  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	PR tree-optimization/90106
+	* gcc.dg/cdce3.c: Add hard_float effective target.
+
+2019-05-20  Marc Glisse  <marc.glisse@inria.fr>
+
+	* gcc.dg/torture/pta-ptrarith-3.c: Relax the matched pattern.
+
+2019-05-20  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR testsuite/58321
+	* gcc.target/i386/memcpy-strategy-3.c: Adjust count for Darwin and
+	add a comment as to the reason for the difference.
+	* gcc.target/i386/memset-strategy-1.c: Likewise.
+
+2019-05-20  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR c++/90532 Ensure __is_constructible(T[]) is false
+	* g++.dg/ext/90532.C: New test.
+
+2019-05-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/i386/avx512f-simd-1.c: New test.
+
+2019-05-20  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/aarch64/target_attr_10.c: Add quotes to expected
+	error message.
+	* gcc.target/arm/attr-neon-builtin-fail.c: Likewise.
+
+2019-05-20  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/90263
+	* gcc.c-torture/compile/pr90263.c: New test.
+	* lib/target-supports.exp: Add check_effective_target_glibc.
+
+2019-05-20  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/90518
+	* gcc.dg/gimplefe-40.c: Restrict to targets with appropriate
+	vector support.
+	* gcc.dg/gimplefe-41.c: Likewise.
+
+2019-05-19  Andrew Pinski  <apinski@marvell.com>
+
+	PR pch/81721
+	* g++.dg/pch/operator-1.C: New testcase.
+	* g++.dg/pch/operator-1.Hs: New file.
+
+2019-05-19  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/90498
+	* gfortran.dg/associate_48.f90 : New test.
+
+2019-05-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/78290
+	* gfortran.dg/pr78290.f90: New test.
+
+2019-05-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/88821
+	* gfortran.dg/alloc_comp_auto_array_3.f90: Add -O0 to dg-options
+	to make sure the test for internal_pack is retained.
+	* gfortran.dg/assumed_type_2.f90: Split compile and run time
+	tests into this and
+	* gfortran.dg/assumed_type_2a.f90: New file.
+	* gfortran.dg/c_loc_test_22.f90: Likewise.
+	* gfortran.dg/contiguous_3.f90: Likewise.
+	* gfortran.dg/internal_pack_11.f90: Likewise.
+	* gfortran.dg/internal_pack_12.f90: Likewise.
+	* gfortran.dg/internal_pack_16.f90: Likewise.
+	* gfortran.dg/internal_pack_17.f90: Likewise.
+	* gfortran.dg/internal_pack_18.f90: Likewise.
+	* gfortran.dg/internal_pack_4.f90: Likewise.
+	* gfortran.dg/internal_pack_5.f90: Add -O0 to dg-options
+	to make sure the test for internal_pack is retained.
+	* gfortran.dg/internal_pack_6.f90: Split compile and run time
+	tests into this and
+	* gfortran.dg/internal_pack_6a.f90: New file.
+	* gfortran.dg/internal_pack_8.f90: Likewise.
+	* gfortran.dg/missing_optional_dummy_6: Split compile and run time
+	tests into this and
+	* gfortran.dg/missing_optional_dummy_6a.f90: New file.
+	* gfortran.dg/no_arg_check_2.f90: Split compile and run time tests
+	into this and
+	* gfortran.dg/no_arg_check_2a.f90: New file.
+	* gfortran.dg/typebound_assignment_5.f90: Split compile and run time
+	tests into this and
+	* gfortran.dg/typebound_assignment_5a.f90: New file.
+	* gfortran.dg/typebound_assignment_6.f90: Split compile and run time
+	tests into this and
+	* gfortran.dg/typebound_assignment_6a.f90: New file.
+	* gfortran.dg/internal_pack_19.f90: New file.
+	* gfortran.dg/internal_pack_20.f90: New file.
+	* gfortran.dg/internal_pack_21.f90: New file.
+
+2019-05-18  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* objc.dg/instancetype-0.m: New.
+
+2019-05-17  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/gcc_diag-11.c: Remove accidentally committed test.
+
+	* g++.dg/overload/conv-op1.C: Adjust text of expected messages.
+	* g++.dg/ubsan/pr63956.C: Same.
+	* g++.old-deja/g++.pt/assign1.C: Same.
+
+2019-05-17  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR testsuite/89433
+	* c-c++-common/goacc/routine-5.c: Update.
+	* c-c++-common/goacc/routine-level-of-parallelism-1.c: Likewise.
+	* c-c++-common/goacc/routine-level-of-parallelism-2.c: New file.
+
+	PR testsuite/89433
+	* c-c++-common/goacc/routine-2.c: Update, and move some test
+	into...
+	* c-c++-common/goacc/routine-level-of-parallelism-1.c: ... this
+	new file.
+
+	PR testsuite/89433
+	* c-c++-common/goacc/classify-routine.c: Update.
+	* gfortran.dg/goacc/classify-routine.f95: Likewise.
+
+2019-05-16  Martin Sebor  <msebor@redhat.com>
+
+	* c-c++-common/Wbool-operation-1.c: Adjust text of expected diagnostics.
+	* c-c++-common/Wvarargs-2.c: Same.
+	* c-c++-common/Wvarargs.c: Same.
+	* c-c++-common/pr51768.c: Same.
+	* c-c++-common/tm/inline-asm.c: Same.
+	* c-c++-common/tm/safe-1.c: Same.
+	* g++.dg/asm-qual-1.C: Same.
+	* g++.dg/asm-qual-3.C: Same.
+	* g++.dg/conversion/dynamic1.C: Same.
+	* g++.dg/cpp0x/constexpr-89599.C: Same.
+	* g++.dg/cpp0x/constexpr-cast.C: Same.
+	* g++.dg/cpp0x/constexpr-shift1.C: Same.
+	* g++.dg/cpp0x/lambda/lambda-conv11.C: Same.
+	* g++.dg/cpp0x/nullptr04.C: Same.
+	* g++.dg/cpp0x/static_assert12.C: Same.
+	* g++.dg/cpp0x/static_assert8.C: Same.
+	* g++.dg/cpp1y/lambda-conv1.C: Same.
+	* g++.dg/cpp1y/pr79393-3.C: Same.
+	* g++.dg/cpp1y/static_assert1.C: Same.
+	* g++.dg/cpp1z/constexpr-if4.C: Same.
+	* g++.dg/cpp1z/constexpr-if5.C: Same.
+	* g++.dg/cpp1z/constexpr-if9.C: Same.
+	* g++.dg/eh/goto2.C: Same.
+	* g++.dg/eh/goto3.C: Same.
+	* g++.dg/expr/static_cast8.C: Same.
+	* g++.dg/ext/flexary5.C: Same.
+	* g++.dg/ext/utf-array-short-wchar.C: Same.
+	* g++.dg/ext/utf-array.C: Same.
+	* g++.dg/ext/utf8-2.C: Same.
+	* g++.dg/gomp/loop-4.C: Same.
+	* g++.dg/gomp/macro-4.C: Same.
+	* g++.dg/gomp/udr-1.C: Same.
+	* g++.dg/init/initializer-string-too-long.C: Same.
+	* g++.dg/other/offsetof9.C: Same.
+	* g++.dg/ubsan/pr63956.C: Same.
+	* g++.dg/warn/Wbool-operation-1.C: Same.
+	* g++.dg/warn/Wtype-limits-Wextra.C: Same.
+	* g++.dg/warn/Wtype-limits.C: Same.
+	* g++.dg/wrappers/pr88680.C: Same.
+	* g++.old-deja/g++.mike/eh55.C: Same.
+	* gcc.dg/Wsign-compare-1.c: Same.
+	* gcc.dg/Wtype-limits-Wextra.c: Same.
+	* gcc.dg/Wtype-limits.c: Same.
+	* gcc.dg/Wunknownprag.c: Same.
+	* gcc.dg/Wunsuffixed-float-constants-1.c: Same.
+	* gcc.dg/asm-6.c: Same.
+	* gcc.dg/asm-qual-1.c: Same.
+	* gcc.dg/cast-1.c: Same.
+	* gcc.dg/cast-2.c: Same.
+	* gcc.dg/cast-3.c: Same.
+	* gcc.dg/cpp/source_date_epoch-2.c: Same.
+	* gcc.dg/debug/pr85252.c: Same.
+	* gcc.dg/dfp/cast-bad.c: Same.
+	* gcc.dg/format/gcc_diag-1.c: Same.
+	* gcc.dg/format/gcc_diag-11.c: Same.
+	* gcc.dg/gcc_diag-11.c: Same.
+	* gcc.dg/gnu-cond-expr-2.c: Same.
+	* gcc.dg/gnu-cond-expr-3.c: Same.
+	* gcc.dg/gomp/macro-4.c: Same.
+	* gcc.dg/init-bad-1.c: Same.
+	* gcc.dg/init-bad-2.c: Same.
+	* gcc.dg/init-bad-3.c: Same.
+	* gcc.dg/pr27528.c: Same.
+	* gcc.dg/pr48552-1.c: Same.
+	* gcc.dg/pr48552-2.c: Same.
+	* gcc.dg/pr59846.c: Same.
+	* gcc.dg/pr61096-1.c: Same.
+	* gcc.dg/pr8788-1.c: Same.
+	* gcc.dg/pr90082.c: Same.
+	* gcc.dg/simd-2.c: Same.
+	* gcc.dg/spellcheck-params-2.c: Same.
+	* gcc.dg/spellcheck-params.c: Same.
+	* gcc.dg/strlenopt-49.c: Same.
+	* gcc.dg/tm/pr52141.c: Same.
+	* gcc.dg/torture/pr51106-1.c: Same.
+	* gcc.dg/torture/pr51106-2.c: Same.
+	* gcc.dg/utf-array-short-wchar.c: Same.
+	* gcc.dg/utf-array.c: Same.
+	* gcc.dg/utf8-2.c: Same.
+	* gcc.dg/warn-sprintf-no-nul.c: Same.
+	* gcc.target/i386/asm-flag-0.c: Same.
+	* gcc.target/i386/inline_error.c: Same.
+	* gcc.target/i386/pr30848.c: Same.
+	* gcc.target/i386/pr39082-1.c: Same.
+	* gcc.target/i386/pr39678.c: Same.
+	* gcc.target/i386/pr57756.c: Same.
+	* gcc.target/i386/pr68843-1.c: Same.
+	* gcc.target/i386/pr79804.c: Same.
+	* gcc.target/i386/pr82673.c: Same.
+	* obj-c++.dg/class-protocol-1.mm: Same.
+	* obj-c++.dg/exceptions-3.mm: Same.
+	* obj-c++.dg/exceptions-4.mm: Same.
+	* obj-c++.dg/exceptions-5.mm: Same.
+	* obj-c++.dg/exceptions-6.mm: Same.
+	* obj-c++.dg/method-12.mm: Same.
+	* obj-c++.dg/method-13.mm: Same.
+	* obj-c++.dg/method-6.mm: Same.
+	* obj-c++.dg/method-7.mm: Same.
+	* obj-c++.dg/method-9.mm: Same.
+	* obj-c++.dg/method-lookup-1.mm: Same.
+	* obj-c++.dg/proto-lossage-4.mm: Same.
+	* obj-c++.dg/protocol-qualifier-2.mm: Same.
+	* objc.dg/call-super-2.m: Same.
+	* objc.dg/class-protocol-1.m: Same.
+	* objc.dg/desig-init-1.m: Same.
+	* objc.dg/exceptions-3.m: Same.
+	* objc.dg/exceptions-4.m: Same.
+	* objc.dg/exceptions-5.m: Same.
+	* objc.dg/exceptions-6.m: Same.
+	* objc.dg/method-19.m: Same.
+	* objc.dg/method-2.m: Same.
+	* objc.dg/method-5.m: Same.
+	* objc.dg/method-6.m: Same.
+	* objc.dg/method-7.m: Same.
+	* objc.dg/method-lookup-1.m: Same.
+	* objc.dg/proto-hier-1.m: Same.
+	* objc.dg/proto-lossage-4.m: Same.
+
+2019-05-17  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
+
+	* g++.dg/eh/o32-fp.C: New.
+	* gcc.target/mips/dwarfregtable-1.c: New.
+	* gcc.target/mips/dwarfregtable-2.c: New.
+	* gcc.target/mips/dwarfregtable-3.c: New.
+	* gcc.target/mips/dwarfregtable-4.c: New.
+	* gcc.target/mips/dwarfregtable.h: New.
+
+2019-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gcc.target/x86_64/abi/test_varargs-m128.c: New file.
+	* gcc.target/x86_64/abi/avx/test_varargs-m256.c: Likewise.
+	* gcc.target/x86_64/abi/avx512f/test_varargs-m512.c: Likewise.
+
+2019-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/90497
+	* gcc.target/i386/pr90497-1.c: New test.
+	* gcc.target/i386/pr90497-2.c: Likewise.
+
+2019-05-17  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.target/s390/global-array-element-pic.c: Add -march=z900.
+	* gcc.target/s390/global-array-element-pic2.c: New test for z10+.
+
+2019-05-17  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-41.c: New testcase.
+
+2019-05-17  Jun Ma  <JunMa@linux.alibaba.com>
+
+	PR tree-optimization/90106
+	* gcc.dg/cdce3.c: New test.
+
+2019-05-17  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-sldw.c: New test.
+
+2019-05-17  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/90478
+	* gcc.dg/tree-ssa/pr90478-2.c: Remove.
+
+2019-05-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/vect/vect-simd-1.c: New test.
+	* gcc.dg/vect/vect-simd-2.c: New test.
+	* gcc.dg/vect/vect-simd-3.c: New test.
+	* gcc.dg/vect/vect-simd-4.c: New test.
+
+2019-05-16  Martin Liska  <mliska@suse.cz>
+
+	PR lto/90500
+	* gcc.target/i386/pr90500-1.c: New test.
+	* gcc.target/i386/pr90500-2.c: New test.
+
+2019-05-16  Vladislav Ivanishin  <vlad@ispras.ru>
+
+	PR tree-optimization/90394
+	* gcc.dg/uninit-pr90394-1-gimple.c: New test.
+	* gcc.dg/uninit-pr90394.c: New test.
+
+2019-05-16  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/90502
+	* gcc.dg/tree-ssa/vector-6.c: Adjust for half of the
+	transforms happening earlier now.
+
+2019-05-16  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* lib/target-supports.exp (check_effective_target_cet): Add the
+	-fcf-protection flag to the build conditions.
+
+2019-05-16  Jun Ma  <JunMa@linux.alibaba.com>
+
+	PR tree-optimization/90106
+	* gcc.dg/cdce1.c: Check tailcall code generation after cdce pass.
+	* gcc.dg/cdce2.c: Likewise.
+
+2019-05-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90424
+	* g++.target/i386/pr90424-1.C: New testcase.
+	* g++.target/i386/pr90424-2.C: Likewise.
+
+2019-05-16  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-40.c: Amend again.
+
+2019-05-15  Cherry Zhang  <cherryyz@google.com>
+
+	* go.test/test/nilptr2.go: Change use function to actually do
+	something.
+
+2019-05-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/90478
+	* gcc.dg/tree-ssa/pr90478.c: Add empty dg-options.  Use long long type
+	instead of long.
+
+	* c-c++-common/gomp/simd8.c: New test.
+
+2019-05-15  Marek Polacek  <polacek@redhat.com>
+
+	CWG 2096 - constraints on literal unions.
+	* g++.dg/cpp0x/literal-type1.C: New test.
+
+2019-05-15  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	PR fortran/90461
+	* gfortran.dg/open_errors_2.f90: Add -std=f2008, adjust line number.
+	* gfortran.dg/open_errors_3.f90: New test.
+
+2019-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89021
+	* gcc.target/i386/mmx-vals.h: New file.
+	* gcc.target/i386/sse2-mmx-2.c: Likewise.
+	* gcc.target/i386/sse2-mmx-3.c: Likewise.
+	* gcc.target/i386/sse2-mmx-4.c: Likewise.
+	* gcc.target/i386/sse2-mmx-5.c: Likewise.
+	* gcc.target/i386/sse2-mmx-6.c: Likewise.
+	* gcc.target/i386/sse2-mmx-7.c: Likewise.
+	* gcc.target/i386/sse2-mmx-8.c: Likewise.
+	* gcc.target/i386/sse2-mmx-9.c: Likewise.
+	* gcc.target/i386/sse2-mmx-10.c: Likewise.
+	* gcc.target/i386/sse2-mmx-11.c: Likewise.
+	* gcc.target/i386/sse2-mmx-12.c: Likewise.
+	* gcc.target/i386/sse2-mmx-13.c: Likewise.
+	* gcc.target/i386/sse2-mmx-14.c: Likewise.
+	* gcc.target/i386/sse2-mmx-15.c: Likewise.
+	* gcc.target/i386/sse2-mmx-16.c: Likewise.
+	* gcc.target/i386/sse2-mmx-17.c: Likewise.
+	* gcc.target/i386/sse2-mmx-18a.c: Likewise.
+	* gcc.target/i386/sse2-mmx-18b.c: Likewise.
+	* gcc.target/i386/sse2-mmx-18c.c: Likewise.
+	* gcc.target/i386/sse2-mmx-19a.c: Likewise.
+	* gcc.target/i386/sse2-mmx-18b.c: Likewise.
+	* gcc.target/i386/sse2-mmx-19c.c: Likewise.
+	* gcc.target/i386/sse2-mmx-19d.c: Likewise.
+	* gcc.target/i386/sse2-mmx-19e.c: Likewise.
+	* gcc.target/i386/sse2-mmx-20.c: Likewise.
+	* gcc.target/i386/sse2-mmx-21.c: Likewise.
+	* gcc.target/i386/sse2-mmx-22.c: Likewise.
+	* gcc.target/i386/sse2-mmx-cvtpi2ps.c: Likewise.
+	* gcc.target/i386/sse2-mmx-cvtps2pi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-cvttps2pi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-maskmovq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-packssdw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-packsswb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-packuswb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddsb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddsw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddusb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddusw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-paddw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pand.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pandn.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pavgb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pavgw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pcmpeqb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pcmpeqd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pcmpeqw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pcmpgtb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pcmpgtd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pcmpgtw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pextrw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pinsrw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmaddwd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmaxsw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmaxub.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pminsw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pminub.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmovmskb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmulhuw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmulhw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmullw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pmuludq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-por.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psadbw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pshufw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pslld.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pslldi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psllq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psllqi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psllw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psllwi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrad.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psradi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psraw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrawi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrld.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrldi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrlq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrlqi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrlw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psrlwi.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psubb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psubd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psubq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psubusb.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psubusw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-psubw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-punpckhbw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-punpckhdq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-punpckhwd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-punpcklbw.c: Likewise.
+	* gcc.target/i386/sse2-mmx-punpckldq.c: Likewise.
+	* gcc.target/i386/sse2-mmx-punpcklwd.c: Likewise.
+	* gcc.target/i386/sse2-mmx-pxor.c: Likewise.
+
+2019-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89021
+	* config/i386/i386-builtins.c (bdesc_tm): Enable MMX intrinsics
+	with SSE2.
+
+2019-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89021
+	* gcc.target/i386/pr82483-1.c: Error only on ia32.
+	* gcc.target/i386/pr82483-2.c: Likewise.
+
+2019-05-15  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/90478
+	* gcc.dg/tree-ssa/pr90478-2.c: New test.
+	* gcc.dg/tree-ssa/pr90478.c: New test.
+
+2019-05-15  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-40.c: Amend.
+
+2019-05-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* lib/target-supports.exp
+	(check_effective_target_powerpc_p8vector_ok): No support for Darwin.
+	(check_effective_target_powerpc_p9vector_ok): Likewise.
+	(check_effective_target_powerpc_float128_sw_ok): Likewise.
+	(check_effective_target_powerpc_float128_hw_ok): Likewise.
+	(check_effective_target_powerpc_vsx_ok): Likewise.
+	* gcc.target/powerpc/bfp/bfp.exp: Don't try to run this for Darwin.
+	* gcc.target/powerpc/dfp/dfp.exp: Likewise.
+
+2019-05-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/pr87600.h: Add __POWERPC__ as an alternate test
+	for PowerPC platforms.
+
+2019-05-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/82920
+	* g++.dg/cet-notrack-1.C: Adjust scan assembler for Darwin.
+	* gcc.target/i386/cet-notrack-5a.c: Likewise.
+	* gcc.target/i386/cet-notrack-5b.c: Likewise.
+	* gcc.target/i386/cet-notrack-6b.c: Likewise.
+	* gcc.target/i386/cet-notrack-icf-1.c: Likewise.
+	* gcc.target/i386/cet-notrack-icf-2.c: Likewise.
+	* gcc.target/i386/cet-notrack-icf-3.c: Likewise.
+	* gcc.target/i386/cet-notrack-icf-4.c: Likewise.
+	* gcc.target/i386/cet-sjlj-3.c: Likewise.
+	* gcc.target/i386/cet-sjlj-5.c: Likewise.
+
+2019-05-14  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/68918
+	* g++.dg/cpp0x/decltype71.C: New test.
+
+	PR c++/70156
+	* g++.dg/init/static5.C: New test.
+
+2019-05-14  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/82920
+	* gcc.target/i386/cet-sjlj-6b.c: Require effective target x32.
+	* gcc.target/i386/pr52146.c: Likewise.
+	* gcc.target/i386/pr52698.c: Likewise.
+	* gcc.target/i386/pr52857-1.c: Likewise.
+	* gcc.target/i386/pr52857-2.c: Likewise.
+	* gcc.target/i386/pr52876.c: Likewise.
+	* gcc.target/i386/pr53698.c: Likewise.
+	* gcc.target/i386/pr54157.c: Likewise.
+	* gcc.target/i386/pr55049-1.c: Likewise.
+	* gcc.target/i386/pr55093.c: Likewise.
+	* gcc.target/i386/pr55116-1.c: Likewise.
+	* gcc.target/i386/pr55116-2.c: Likewise.
+	* gcc.target/i386/pr55597.c: Likewise.
+	* gcc.target/i386/pr59929.c: Likewise.
+	* gcc.target/i386/pr66470.c: Likewise.
+
+2019-05-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.dg/atomic/c11-atomic-exec-4.c: Simplify triplet to
+	*-*-solaris2*.
+	* gcc.dg/atomic/c11-atomic-exec-5.c: Likewise.
+	* gcc.dg/c99-math-double-1.c: Likewise.
+	* gcc.dg/c99-math-float-1.c: Likewise.
+	* gcc.dg/c99-math-long-double-1.c: Likewise.
+	* gcc.misc-tests/linkage.exp: Simplify triplet to
+	x86_64-*-solaris2*.
+
+	* gcc.target/i386/mcount_pic.c: Remove *-*-solaris2.10* && !gld
+	xfail.
+	* gcc.target/i386/pr63620.c: Likewise.
+
+	* lib/target-supports.exp (check_sse_os_support_available): Remove
+	Solaris 9/x86 workaround.
+
+2019-05-14  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-40.c: New testcase.
+
+2019-05-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR preprocessor/90382
+	* g++.dg/diagnostic/trailing1.C: New test.
+
+2019-05-14  marxin  <mliska@suse.cz>
+
+	PR middle-end/90340
+	* gcc.dg/tree-ssa/pr90340-2.c: Add case-values-threshold
+	param.
+
+2019-05-14  Richard Biener  <rguenther@suse.de>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR tree-optimization/88828
+	* gcc.target/i386/pr88828-1.c: New test.
+	* gcc.target/i386/pr88828-1a.c: Likewise.
+	* gcc.target/i386/pr88828-1b.c: Likewise.
+	* gcc.target/i386/pr88828-1c.c: Likewise.
+	* gcc.target/i386/pr88828-4a.c: Likewise.
+	* gcc.target/i386/pr88828-4b.c: Likewise.
+	* gcc.target/i386/pr88828-5a.c: Likewise.
+	* gcc.target/i386/pr88828-5b.c: Likewise.
+	* gcc.target/i386/pr88828-7.c: Likewise.
+	* gcc.target/i386/pr88828-7a.c: Likewise.
+	* gcc.target/i386/pr88828-7b.c: Likewise.
+	* gcc.target/i386/pr88828-8.c: Likewise.
+	* gcc.target/i386/pr88828-8a.c: Likewise.
+	* gcc.target/i386/pr88828-8b.c: Likewise.
+	* gcc.target/i386/pr88828-9.c: Likewise.
+	* gcc.target/i386/pr88828-9a.c: Likewise.
+	* gcc.target/i386/pr88828-9b.c: Likewise.
+
+2019-05-14  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com\>
+
+	* gcc.target/aarch64/signbitv4sf.c: New test.
+	* gcc.target/aarch64/signbitv2sf.c: New test.
+
+2019-05-13  Jonathan Wakely  <jwakely@redhat.com>
+
+	* g++.dg/cpp0x/Wattributes1.C: Adjust dg-error line number to fix
+	regression, by matching a note on any line.
+	* g++.dg/cpp0x/Wattributes2.C: Add another copy that checks the
+	correct line number is matched without depending on a library header.
+
+2019-05-13  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90402
+	* gcc.dg/torture/pr90402-1.c: New testcase.
+
+2019-05-12  Iain Sandoe  <iain@sandoe.co.uk>
+	    Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR target/82920
+	* gcc.target/i386/indirect-thunk-1.c: Adjust scan-asms for Darwin,
+	do not use -fno-pic on Darwin.
+	* gcc.target/i386/indirect-thunk-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-7.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-8.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+	* gcc.target/i386/indirect-thunk-register-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-register-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-register-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-register-4.c: Likewise.
+	* gcc.target/i386/ret-thunk-1.c: Likewise.
+	* gcc.target/i386/ret-thunk-10.c: Likewise.
+	* gcc.target/i386/ret-thunk-11.c: Likewise.
+	* gcc.target/i386/ret-thunk-12.c: Likewise.
+	* gcc.target/i386/ret-thunk-13.c: Likewise.
+	* gcc.target/i386/ret-thunk-14.c: Likewise.
+	* gcc.target/i386/ret-thunk-15.c: Likewise.
+	* gcc.target/i386/ret-thunk-16.c: Likewise.
+	* gcc.target/i386/ret-thunk-2.c: Likewise.
+	* gcc.target/i386/ret-thunk-22.c: Likewise.
+	* gcc.target/i386/ret-thunk-23.c: Likewise.
+	* gcc.target/i386/ret-thunk-24.c: Likewise.
+	* gcc.target/i386/ret-thunk-3.c: Likewise.
+	* gcc.target/i386/ret-thunk-4.c: Likewise.
+	* gcc.target/i386/ret-thunk-5.c: Likewise.
+	* gcc.target/i386/ret-thunk-6.c: Likewise.
+	* gcc.target/i386/ret-thunk-7.c: Likewise.
+	* gcc.target/i386/ret-thunk-8.c: Likewise.
+	* gcc.target/i386/ret-thunk-9.c: Likewise.
+
+2019-05-11  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR testsuite/81058
+	* gcc.target/i386/avx512bw-vpmovswb-1.c: Use regular data section
+	for variables on Darwin, rather than common.
+	* gcc.target/i386/avx512bw-vpmovuswb-1.c: Likewise.
+	* gcc.target/i386/avx512bw-vpmovwb-1.c: Likewise.
+
+2019-05-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp2a/multiple-deleted-destroying-delete-error-1.C: New.
+	* g++.dg/cpp2a/multiple-deleted-destroying-delete-error-2.C: Likewise.
+
+2019-05-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/61968
+	* gfortran.dg/assumed_type_10.f90: New test case.
+	* gfortran.dg/assumed_type_11.f90: New test case.
+
+2019-05-10  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/x86_64/abi/avx512f/abi-avx512f.exp: Darwin is
+	now tested.
+	* gcc.target/x86_64/abi/avx512f/asm-support-darwin.s: New.
+
+2019-05-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/main1.C: New.
+
+2019-05-10  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/78010 - bogus -Wsuggest-override warning on final function.
+	* g++.dg/warn/Wsuggest-override-2.C: New test.
+
+2019-05-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90385
+	* gfortran.dg/pr90385.f90: New test.
+
+	PR c++/90383
+	* g++.dg/cpp1y/constexpr-90383-1.C: New test.
+	* g++.dg/cpp1y/constexpr-90383-2.C: New test.
+
+2019-05-10  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/90093
+	* gfortran.dg/ISO_Fortran_binding_12.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_12.c: Supplementary code.
+
+	PR fortran/90352
+	* gfortran.dg/iso_c_binding_char_1.f90: New test.
+
+	PR fortran/90355
+	* gfortran.dg/ISO_Fortran_binding_4.f90: Add 'substr' to test
+	the direct passing of substrings as descriptors to bind(C).
+	* gfortran.dg/assign_10.f90: Increase the tree_dump count of
+	'atmp' to account for the setting of the 'span' field.
+	* gfortran.dg/transpose_optimization_2.f90: Ditto.
+
+2019-05-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88709
+	PR tree-optimization/90271
+	* gcc.dg/store_merging_29.c: Allow 4 stores to replace 6 stores on
+	arm*-*-*.
+
+	PR pch/90326
+	* g++.dg/pch/pr90326.C: New test.
+	* g++.dg/pch/pr90326.Hs: New file.
+
+2019-05-10  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/90340
+	* gcc.dg/tree-ssa/pr90340-2.c: New test.
+	* gcc.dg/tree-ssa/pr90340.c: New test.
+
+2019-05-09  Cherry Zhang  <cherryyz@google.com>
+
+	* go.dg/mapstring.go: New test.
+
+2019-05-09  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/90405
+	* gcc.target/arm/pr90405.c: New test.
+
+2019-05-09  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/gimplefe-39.c: New test.
+
+2019-05-09  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/gimplefe-37.c: New test.
+	* gcc.dg/gimplefe-33.c: Likewise.
+
+2019-05-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/90382
+	Revert:
+	2018-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/trailing1.C: New.
+
+2019-05-09  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90395
+	* gcc.dg/torture/pr90395.c: New testcase.
+
+2019-05-08  Cherry Zhang  <cherryyz@google.com>
+
+	* go.dg/cmpstring.go: New test.
+
+2019-05-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/59813
+	PR tree-optimization/89060
+	* gcc.dg/tree-ssa/pr89060.c: New test.
+
+2019-05-08  Mihail Ionescu  <mihail.ionescu@arm.com>
+	    Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/88167
+	* gcc.target/arm/pr88167-1.c: New test.
+	* gcc.target/arm/pr88167-2.c: New test.
+
+2018-05-08  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/90078
+	* g++.dg/tree-ssa/pr90078.C: New test.
+
+2018-05-08  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/90240
+	* gfortran.dg/graphite/pr90240.f: New test.
+
+2019-05-08  Li Jia He  <helijia@linux.ibm.com>
+
+	PR other/90381
+	* gcc.dg/tree-ssa/pr88676-2.c: Add 'target le' option to limit the
+	test case to run on the little endian machine.
+
+2019-05-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90356
+	* gcc.dg/tree-ssa/pr90356-1.c: New test.
+	* gcc.dg/tree-ssa/pr90356-2.c: New test.
+	* gcc.dg/tree-ssa/pr90356-3.c: New test.
+	* gcc.dg/tree-ssa/pr90356-4.c: New test.
+
+2019-05-07  Wei Xiao  <wei3.xiao@intel.com>
+
+	* gcc.target/i386/avx512bf16-vcvtne2ps2bf16-1.c: New test.
+	* gcc.target/i386/avx512bf16-vcvtneps2bf16-1.c: New test.
+	* gcc.target/i386/avx512bf16-vdpbf16ps-1.c: New test.
+	* gcc.target/i386/avx512bf16vl-vcvtne2ps2bf16-1.c: New test.
+	* gcc.target/i386/avx512bf16vl-vcvtneps2bf16-1.c: New test.
+	* gcc.target/i386/avx512bf16vl-vdpbf16ps-1.c: New test.
+	* gcc.target/i386/builtin_target.c: Handle avx512bf16.
+	* gcc.target/i386/sse-12.c: Add -mavx512bf16.
+	* gcc.target/i386/sse-13.c: Ditto.
+	* gcc.target/i386/sse-14.c: Ditto.
+	* gcc.target/i386/sse-22.c: Ditto.
+	* gcc.target/i386/sse-23.c: Ditto.
+	* g++.dg/other/i386-2.C: Ditto.
+	* g++.dg/other/i386-3.C: Ditto.
+
+2019-05-07  Cherry Zhang  <cherryyz@google.com>
+
+	* go.dg/arrayclear.go: New test.
+	* go.dg/mapclear.go: New test.
+
+2019-05-07  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	PR target/89765
+	* gcc.target/powerpc/pr89765-mc.c: New test.
+	* gcc.target/powerpc/vsx-builtin-10c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-10d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-11c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-11d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-12c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-12d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-13c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-13d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-14c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-14d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-15c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-15d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-16c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-16d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-17c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-17d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-18c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-18d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-19c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-19d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-20c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-20d.c: New test.
+	* gcc.target/powerpc/vsx-builtin-9c.c: New test.
+	* gcc.target/powerpc/vsx-builtin-9d.c: New test.
+
+2019-05-07  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+
+	* gcc.target/aarch64/sve/sad_1.c: New test for sum of absolute
+	differences.
+
+2019-05-07  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/asm-7.c: New test.
+	* gcc.target/i386/asm-1.c: Update expected error string.
+	* gcc.target/i386/pr62120.c: Ditto.
+
+2019-05-07  Li Jia He  <helijia@linux.ibm.com>
+
+	* gcc.dg/tree-ssa/pr37508.c: Add the no-ssa-phiopt option to skip phi
+	optimization.
+	* gcc.dg/tree-ssa/pr88676-2.c: New testcase.
+
+2019-05-06  H.J. Lu  <hongjiu.lu@intel.com>
+	    Hongtao Liu  <hongtao.liu@intel.com>
+
+	PR target/89750
+	PR target/86444
+	* gcc.target/i386/avx512f-vcomisd-2.c: New.
+	* gcc.target/i386/avx512f-vcomisd-2.c: Likewise.
+
+2019-05-06  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90290
+	* gfortran.dg/pr90290.f90: New test.
+
+2019-05-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88709
+	PR tree-optimization/90271
+	* gcc.dg/store_merging_26.c: New test.
+	* gcc.dg/store_merging_27.c: New test.
+	* gcc.dg/store_merging_28.c: New test.
+	* gcc.dg/store_merging_29.c: New test.
+
+2019-05-06  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	PR target/89424
+	* gcc.target/powerpc/pr89424-0.c: New test.
+	* gcc.target/powerpc/vsx-builtin-13a.c: Define macro PR89424 to
+	enable testing of newly patched capability.
+	* gcc.target/powerpc/vsx-builtin-13b.c: Likewise.
+	* gcc.target/powerpc/vsx-builtin-20a.c: Likewise.
+	* gcc.target/powerpc/vsx-builtin-20b.c: Likewise.
+
+2019-05-06  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90265 - ICE with generic lambda.
+	* g++.dg/cpp1y/lambda-generic-90265.C: New test.
+
+2019-05-06  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90358
+	* gcc.target/i386/pr90358.c: New testcase.
+
+2019-05-06  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88828
+	* gcc.target/i386/pr88828-0.c: New testcase.
+
+2019-05-06  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90328
+	* gcc.dg/torture/pr90328.c: New testcase.
+
+2019-05-06  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/90331
+	* gcc.dg/pr87314-1.c: Align the substring to open up
+	string merging for targets aligning strings to 8 bytes.
+
+2019-05-06  Martin Liska  <mliska@suse.cz>
+
+	PR sanitizer/90312
+	* gcc.dg/asan/pr87930.c: Run the test only on *linux or *gnu
+	systems.
+	* gcc.dg/tsan/pr88017.c: Likewise.
+
+2019-05-05  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/90344
+	* gfortran.dg/pr90344.f90: New test
+
+2019-05-03  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR tree-optimization/90269
+	* g++.dg/tree-ssa/ldist-1.C: New file.
+
+2019-05-03  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/slp-reduc-sad-2.c: New testcase.
+
+2019-05-03  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89518
+	* gcc.dg/pr89518.c: New testcase.
+
+2019-05-03  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/87314
+	* gcc.dg/pr87314-1.c: New testcase.
+
+2019-05-03  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88963
+	* gcc.dg/tree-ssa/ssa-fre-31.c: Disable forwprop.
+	* gcc.target/i386/pr88963-1.c: New testcase.
+	* gcc.target/i386/pr88963-2.c: Likewise.
+
+2019-05-03  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR target/88809
+	* gcc.target/i386/pr88809.c: Adjust for darwin.
+	* gcc.target/i386/pr88809-2.c: Adjust for i386 and darwin.
+
+2019-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90303
+	* g++.target/i386/pr90303.C: New test.
+
+2019-05-03  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89698
+	* g++.dg/tree-ssa/pr89698.C: New testcase.
+
+2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* g++.dg/ext/instantiate2.C: Remove special-casing for Darwin.
+
+2019-05-02  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89653
+	* g++.dg/vect/pr89653.cc: New testcase.
+
+2019-05-02  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89509
+	* gcc.dg/torture/restrict-8.c: New testcase.
+
+2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/tree-prof/section-attr-1.c: Update scan-asm regex
+	for cold section label.
+	* gcc.dg/tree-prof/section-attr-2.c: Likewise.
+	* gcc.dg/tree-prof/section-attr-3.c: Likewise.
+
+2019-05-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.target/i386/spellcheck-options-5.c: Restrict to Linux and
+	GNU targets.
+
+2019-05-02  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+
+	* gcc.target/aarch64/sve/dot_1.c: New test for dot product.
+
+2019-05-02  Martin Liska  <mliska@suse.cz>
+
+	* gcc.target/i386/funcspec-4.c: Update scanned pattern.
+	* g++.target/i386/pr57362.C: Likewise.
+
+2019-05-02  Martin Liska  <mliska@suse.cz>
+
+	PR target/88809
+	* gcc.target/i386/pr88809.c: New test.
+	* gcc.target/i386/pr88809-2.c: New test.
+
+2019-05-01  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR fortran/60144
+	* gfortran.dg/block_name_2.f90: Adjust dg-error.
+	* gfortran.dg/dec_type_print_3.f90.f90: Likewise.
+	* gfortran.dg/pr60144.f90: New test.
+
+2019-05-01  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/90037
+	* g++.dg/tree-ssa/pr88797.C: New test.
+
+2019-05-01  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/cpp0x/decltype9.C: Adjust expected diagnostics.
+
+2019-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89093
+	* gcc.target/aarch64/return_address_sign_3.c: Remove extra space in
+	target attribute.
+
+2019-04-30  Giuliano Belinassi  <giuliano.belinassi@usp.br>
+
+	* gcc.dg/sinhatanh-2.c: Count the number of functions.
+	* gcc.dg/sinhatanh-3.c: Likewise.
+
+2019-04-30  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/Werror-13.c: Add new tests for it.
+	* gcc.dg/pragma-diag-6.c: Likewise.
+
+2019-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89093
+	* gcc.target/aarch64/pr89093.c: New test.
+	* gcc.target/aarch64/pr63304_1.c: Remove space from target string.
+
+	PR tree-optimization/89475
+	* gcc.dg/tree-ssa/pr89475.c: New test.
+
+2019-04-30  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/90240
+	Revert:
+	2019-04-23  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/90078
+	* g++.dg/tree-ssa/pr90078.C: New test.
+
+2019-04-29  Vladislav Ivanishin  <vlad@ispras.ru>
+
+	* gcc.dg/uninit-25-gimple.c: New test.
+	* gcc.dg/uninit-25.c: New test.
+	* gcc.dg/uninit-26.c: New test.
+	* gcc.dg/uninit-27-gimple.c: New test.
+
+2019-04-29  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90278
+	* gcc.dg/torture/pr90278.c: New testcase.
+
+2019-04-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/90173
+	* g++.dg/cpp1z/class-deduction66.C: Use dg-do compile instead of
+	dg-do run.
+
+2019-04-27  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/89261
+	* gcc.target/i386/pr89261.c: New test.
+
+2019-04-27  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/90258
+	* gcc.dg/completion-5.c: New test.
+	* gcc.target/i386/spellcheck-options-5.c: New test.
+
+2019-04-26  Jim Wilson  <jimw@sifive.com>
+
+	* gcc.target/riscv/load-immediate.c: New.
+
+2019-04-26  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR c++/90243
+	* g++.dg/diagnostic/pr90243.C: New test.
+
+2019-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/90173
+	* g++.dg/cpp1z/class-deduction66.C: New.
+
+2019-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/trailing1.C: New.
+
+2019-04-26  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/alias-16.c: New test.
+
+2019-04-25  Martin Liska  <mliska@suse.cz>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89929
+	* g++.target/i386/mv28.C: New test.
+	* gcc.target/i386/mvc14.c: Likewise.
+	* g++.target/i386/pr57362.C: Updated.
+
+2019-04-24  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/90037
+	* gcc.dg/tree-ssa/20030710-1.c: Update dump file to scan.
+	* gcc.dg/isolate-2.c: Likewise.
+	* gcc.dg/isolate-4.c: Likewise.
+	* gcc.dg/pr19431.c: Accept either ordering of PHI args.
+	* gcc.dg/pr90037.c: New test.
+
+2019-04-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/44648
+	* g++.dg/warn/Wunused-var-35.C: Remove xfail.
+
+2019-04-25  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/90194
+	* g++.dg/torture/pr90194.C: New testcase.
+
+2019-04-24  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90236
+	* g++.dg/cpp1z/nontype-auto16.C: New test.
+
+2019-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/90193
+	* gcc.target/i386/pr90193.c: New test.
+
+2019-04-24  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	PR target/89952
+	* gcc.target/s390/pr89952.c: New test.
+
+2019-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/90187
+	* g++.target/i386/pr90187.C: New test.
+
+2019-04-24  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.test/README.gcc: New file.
+
+2019-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90208
+	* gcc.dg/tsan/pr90208-1.c: New test.
+	* gcc.dg/tsan/pr90208-2.c: New test.
+
+	PR tree-optimization/90211
+	* gcc.dg/autopar/pr90211.c: New test.
+
+2019-04-23  Iain Buclaw  <ibuclaw@gdcproject.org>
+	    Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gdc.dg/link.d: Test if target d_runtime.
+	* gdc.dg/runnable.d: Fix tests to work on BigEndian.
+	* gdc.dg/simd.d: Likewise.
+
+2019-04-23  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.test/fail_compilation/fail2456.d: New test.
+	* gdc.test/fail_compilation/test18312.d: New test.
+	* gdc.test/gdc-test.exp (gdc-convert-args): Handle -betterC.
+
+2018-04-23  Sudakshina Das  <sudi.das@arm.com>
+
+	* gcc.target/aarch64/bti-1.c: Add scan directive for gnu note section
+	for linux targets.
+	* gcc.target/aarch64/va_arg_1.c: Update scan directive to not clash
+	with GNU note section.
+
+2019-04-23  Jeff Law  <law@redhat.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_keeps_null_pointer_checks): Add cr16.
+
+2019-04-23  Roman Zhuykov  <zhroma@ispras.ru>
+
+	PR rtl-optimization/87979
+	* gcc.dg/pr87979.c: New test.
+
+2019-04-23  Roman Zhuykov  <zhroma@ispras.ru>
+
+	PR rtl-optimization/84032
+	* gcc.dg/pr84032.c: New test.
+
+2018-04-23  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/90078
+	* g++.dg/tree-ssa/pr90078.C: New test.
+
+2018-04-23  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/90021
+	* gfortran.dg/pr90021.f90: New test.
+
+2019-04-22  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90166
+	* gfortran.dg/submodule_22.f08: Add additional dg-error comments.
+
+2019-04-22  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/57284
+	* gfortran.dg/class_70.f03
+
+2019-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/90178
+	* gcc.target/i386/pr90178.c: New test.
+
+2019-04-20  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* g++.dg/ipa/pr89009.C: Add dg-require-effective-target fpic.
+
+2019-04-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/89900
+	* g++.dg/cpp0x/pr89900-1.C: New.
+	* g++.dg/cpp0x/pr89900-2.C: Likewise.
+	* g++.dg/cpp0x/pr89900-3.C: Likewise.
+	* g++.dg/cpp0x/pr89900-4.C: Likewise.
+
+2019-04-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/90139
+	* gcc.c-torture/compile/pr90139.c: New test.
+
+	PR c++/90138
+	* g++.dg/template/pr90138.C: New test.
+
+	PR c/89888
+	* c-c++-common/pr89888.c: New test.
+	* g++.dg/torture/pr40335.C: Change dg-bogus into dg-warning.
+	Don't expect -Wswitch-unreachable warning.
+
+	PR c++/90108
+	* c-c++-common/pr90108.c: New test.
+
+2019-04-18  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR middle-end/85164
+	* gcc.dg/pr85164-1.c, gcc.dg/pr85164-2.c: New tests.
+
+2019-04-18  Richard Biener  <rguenther@suse.de>
+
+	PR debug/90131
+	* gcc.dg/guality/pr90131.c: New testcase.
+
+2019-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89325
+	* g++.dg/ext/attrib58.C: New test.
+	* g++.dg/ext/attrib59.C: New test.
+	* g++.dg/ext/attrib60.C: New test.
+
+	PR target/90125
+	* gcc.target/i386/avx512f-vfmsubXXXss-2.c (avx512f_test): Adjust
+	constants to ensure precise result even when not using fma.
+	* gcc.target/i386/avx512f-vfnmaddXXXss-2.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfmaddXXXsd-3.c: New test.
+	* gcc.target/i386/avx512f-vfmaddXXXss-3.c: New test.
+	* gcc.target/i386/avx512f-vfmsubXXXsd-3.c: New test.
+	* gcc.target/i386/avx512f-vfmsubXXXss-3.c: New test.
+	* gcc.target/i386/avx512f-vfnmaddXXXsd-3.c: New test.
+	* gcc.target/i386/avx512f-vfnmaddXXXss-3.c: New test.
+	* gcc.target/i386/avx512f-vfnmsubXXXsd-3.c: New test.
+	* gcc.target/i386/avx512f-vfnmsubXXXss-3.c: New test.
+
+2019-04-17  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/90124 - bogus error with incomplete type in decltype.
+	* g++.dg/cpp0x/decltype70.C: New test.
+
+2019-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/90095
+	* gcc.dg/pr90095-1.c: New test.
+	* gcc.dg/pr90095-2.c: New test.
+
+2019-04-17  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR fortran/90048
+	* gfortran.dg/goacc/private-explicit-kernels-1.f95: New file.
+	* gfortran.dg/goacc/private-explicit-parallel-1.f95: Likewise.
+	* gfortran.dg/goacc/private-explicit-routine-1.f95: Likewise.
+
+	PR fortran/90067
+	PR fortran/90114
+	* gfortran.dg/goacc/private-1.f95: Remove file.
+	* gfortran.dg/goacc/private-2.f95: Likewise.
+	* gfortran.dg/goacc/private-predetermined-kernels-1.f95: New file.
+	* gfortran.dg/goacc/private-predetermined-parallel-1.f95:
+	Likewise.
+	* gfortran.dg/goacc/private-predetermined-routine-1.f95: Likewise.
+
+2019-04-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89093
+	* gcc.target/arm/pr89093-2.c: New test.
+
+2019-04-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/86953
+	* g++.dg/cpp0x/constexpr-86953.C: New test.
+
+2019-04-16  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	* g++.dg/lto/pr89358_0.C: Replace dg-* with dg-lto-*.
+
+2019-04-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR debug/89528
+	* gcc.dg/guality/pr89528.c: New.
+
+	PR rtl-optimization/86438
+	* gcc.dg/torture/pr86438.c: Split up too-wide shift.
+
+2019-04-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/90096
+	* gcc.target/i386/pr90096.c: New test.
+	* gcc.target/i386/pr69255-1.c: Adjust expected diagnostics.
+	* gcc.target/i386/pr69255-2.c: Likewise.
+	* gcc.target/i386/pr69255-3.c: Likewise.
+
+	PR rtl-optimization/90082
+	* gcc.dg/pr90082.c: New test.
+
+	PR tree-optimization/90090
+	* g++.dg/opt/pr90090.C: New test.
+
+2019-04-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/56049
+	* gfortran.dg/pr56049.f90: New testcase.
+
+2019-04-15  Richard Biener  <rguenther@suse.de>
+
+	PR debug/90074
+	* gcc.dg/guality/pr90074.c: New testcase.
+
+2019-04-15  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90071
+	* gcc.dg/torture/pr90071.c: New testcase.
+
+2019-04-15  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR rtl-optimization/89794
+	* gcc.dg/torture/pr89794.c: New testcase.
+
+2019-04-15  Richard Biener  <rguenther@suse.de>
+
+	PR ipa/88936
+	* gcc.dg/torture/pr88936-1.c: New testcase.
+	* gcc.dg/torture/pr88936-2.c: Likewise.
+	* gcc.dg/torture/pr88936-3.c: Likewise.
+
+2019-04-15  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/pr89693
+	* g++.dg/ipa/pr89693.C: New test.
+
+2019-04-15  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR tree-optimization/90020
+	* gcc.dg/torture/pr90020.c: Add linker options for darwin.
+
+2019-04-14  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR lto/89358
+	* g++.dg/lto/pr89358_0.C: New testcase.
+	* g++.dg/lto/pr89358_1.C: New testcase.
+
+2019-04-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/85448
+	* gfortran.dg/bind_c_usage_33.f90: New test and...
+	* gfortran.dg/bind_c_usage_33_c.c: Additional source.
+
+2019-04-14  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/89843
+	* gfortran.dg/ISO_Fortran_binding_4.f90: Modify the value of x
+	in ctg. Test the conversion of the descriptor types in the main
+	program.
+	* gfortran.dg/ISO_Fortran_binding_10.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_10.c: Called by it.
+
+	PR fortran/89846
+	* gfortran.dg/ISO_Fortran_binding_11.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_11.c: Called by it.
+
+	PR fortran/90022
+	* gfortran.dg/ISO_Fortran_binding_1.c: Correct the indexing for
+	the computation of 'ans'. Also, change the expected results for
+	CFI_is_contiguous to comply with standard.
+	* gfortran.dg/ISO_Fortran_binding_1.f90: Correct the expected
+	results for CFI_is_contiguous to comply with standard.
+	* gfortran.dg/ISO_Fortran_binding_9.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_9.c: Called by it.
+
+2019-04-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89093
+	* gcc.target/arm/pr89093.c: New test.
+
+2019-04-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89933
+	* c-c++-common/pr89933.c: New test.
+
+2019-04-12  Martin Sebor  <msebor@redhat.com>
+
+	PR c/88383
+	PR c/89288
+	PR c/89798
+	PR c/89797
+	* c-c++-common/attributes-1.c: Adjust.
+	* c-c++-common/builtin-has-attribute-4.c: Adjust expectations.
+	* c-c++-common/builtin-has-attribute-6.c: New test.
+	* c-c++-common/builtin-has-attribute-7.c: New test.
+	* c-c++-common/pr71574.c: Adjust.
+	* gcc.dg/pr25559.c: Adjust.
+	* gcc.dg/attr-vector_size.c: New test.
+
+2019-04-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89965
+	* gcc.target/i386/pr89965.c: New test.
+
+2019-04-12  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87603 - constexpr functions are no longer noexcept.
+	* g++.dg/cpp0x/constexpr-noexcept.C: Adjust the expected result.
+	* g++.dg/cpp0x/constexpr-noexcept3.C: Likewise.
+	* g++.dg/cpp0x/constexpr-noexcept4.C: Likewise.
+	* g++.dg/cpp0x/constexpr-noexcept8.C: New test.
+	* g++.dg/cpp0x/inh-ctor32.C: Remove dg-message.
+	* g++.dg/cpp1y/constexpr-noexcept1.C: New test.
+
+2019-04-12  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/cpp0x/noexcept30.C: Tweak dg-error.
+	* g++.dg/cpp0x/pr86397-1.C: Likewise.
+	* g++.dg/cpp0x/pr86397-2.C: Likewise.
+
+2019-04-12  Matthew Malcomson  <matthew.malcomson@arm.com>
+
+	* g++.target/arm/arm.exp: Change format of default prune regex.
+	* gcc.target/arm/arm.exp: Change format of default prune regex.
+
+2019-04-12  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/89970
+	* gcc.target/i386/mvc15.c: New test.
+	* gcc.target/i386/mvc3.c: Quote target in error pattern.
+	* gcc.target/i386/mvc4.c: Remove duplicit 'default'.
+
+2019-04-12  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	PR target/87532
+	* gcc.target/powerpc/fold-vec-extract-char.p8.c: Adjust expected
+	instruction counts.
+	* gcc.target/powerpc/fold-vec-extract-int.p8.c: Likewise.
+	* gcc.target/powerpc/fold-vec-extract-short.p8.c: Likewise.
+
+2019-04-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89946
+	* c-c++-common/pr89946.c: New test.
+
+	PR rtl-optimization/90026
+	* g++.dg/opt/pr90026.C: New test.
+
+2018-04-11  Steve Ellcey  <sellcey@marvell.com>
+
+	PR rtl-optimization/87763
+	* gcc.target/aarch64/combine_bfxil.c: Change some bfxil checks
+	to bfi.
+
+2019-04-11  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90020
+	* gcc.dg/torture/pr90020.c: New testcase.
+
+2019-04-11  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90018
+	* gcc.dg/vect/pr90018.c: New testcase.
+
+2018-04-10  Steve Ellcey  <sellcey@marvell.com>
+
+	PR rtl-optimization/87763
+	* gcc.target/aarch64/combine_bfxil.c: Change some bfxil checks
+	to bfi.
+	* gcc.target/aarch64/combine_bfi_2.c: New test.
+
+2019-04-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/90025
+	* gcc.c-torture/execute/pr90025.c: New test.
+
+	PR c++/90010
+	* gcc.dg/pr90010.c: New test.
+
+2019-04-09  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/ifcvt-onecmpl-abs-1.c
+	(dg-options): Use -O2 -fdump-rtl-ce1.
+	(dg-final): Scan ce1 RTL dump instead of asm dump.
+
+2019-04-09  Matthew Malcomson  <matthew.malcomson@arm.com>
+
+	PR target/90024
+	* gcc.dg/torture/neon-immediate-timode.c: New test.
+
+2019-04-09  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89998
+	* gcc.c-torture/compile/pr89998-1.c: New test.
+	* gcc.c-torture/compile/pr89998-2.c: New test.
+
+	PR target/90015
+	* gcc.target/riscv/interrupt-conflict-mode.c (foo): Adjust expected
+	diagnostics.
+
+2019-04-08  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90006
+	* gcc.dg/vect/bb-slp-pr90006.c: New testcase.
+
+2019-04-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89865
+	* gcc.target/i386/pr49095.c: Don't expect any RMW sequences.
+
+	PR rtl-optimization/89865
+	* gcc.target/i386/pr49095.c: Adjust number of expected RMW spots
+	on ia32.
+
+2019-04-01  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/89725
+	* gcc.dg/tree-ssa/pr89725.c: New test.
+
+2019-04-08  Martin Liska  <mliska@suse.cz>
+
+	* gcc.target/riscv/arch-1.c: Fix expected scanned pattern.
+
+2019-04-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/89914
+	* g++.dg/ext/has_nothrow_constructor-3.C: New.
+
+2019-04-07  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/89945
+	* gcc.target/i386/pr89945.c: New test.
+
+2019-04-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/87352
+	* gfortran.dg/finalize_28.f90: Adjust count of __builtin_free.
+	* gfortran.dg/finalize_33.f90: Likewise.
+	* gfortran.dg/finalize_34.f90: New test.
+
+2019-04-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/89981
+	* gfortran.dg/entry_22.f90: New test.
+
+2019-04-05  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87145 - bogus error converting class type in template arg list.
+	* g++.dg/cpp0x/constexpr-conv3.C: New test.
+	* g++.dg/cpp0x/constexpr-conv4.C: New test.
+
+2019-04-05  Martin Sebor  <msebor@redhat.com>
+
+	PR bootstrap/89980
+	* g++.dg/init/array52.C: New test.
+
+2019-04-05  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c/89985
+	* c-c++-common/pr89985.c: New test.
+
+2019-04-05  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	PR c/71598
+	* gcc.dg/torture/pr71598-1.c: dg-prune arm linker messages about
+	size of enums.
+	* gcc.dg/torture/pr71598-2.c: Likewise.
+
+2019-04-05  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89973 - -Waddress-of-packed-member ICE with invalid conversion.
+	* g++.dg/warn/Waddress-of-packed-member2.C: New test.
+
+2019-04-05  Richard Biener  <rguenther@suse.de>
+
+	PR debug/89892
+	PR debug/89905
+	* gcc.dg/guality/pr89892.c: New testcase.
+	* gcc.dg/guality/pr89905.c: Likewise.
+	* gcc.dg/guality/loop-1.c: Likewise.
+
+2019-04-05  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR tree-optimization/89956
+	* gfortran.dg/pr89956.f90: New test.
+
+2019-04-04  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/89974
+	PR c++/89878
+	PR c++/89833
+	PR c++/47488
+	* g++.dg/abi/mangle69.C: New test.
+	* g++.dg/abi/mangle70.C: New test.
+	* g++.dg/abi/mangle71.C: New test.
+	* g++.dg/abi/mangle72.C: New test.
+	* g++.dg/cpp0x/constexpr-array19.C: New test.
+	* g++.dg/cpp2a/nontype-class15.C: New test.
+	* g++.dg/cpp2a/nontype-class16.C: New test.
+	* g++.dg/init/array51.C: New test.
+	* g++.dg/template/nontype29.C: New test.
+
+2019-04-04  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/89957
+	PR middle-end/89911
+	* gcc.dg/Wstringop-overflow-13.c: New test.
+
+2019-04-04  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/89934
+	* gcc.dg/Wrestrict-19.c: New test.
+	* gcc.dg/Wrestrict-5.c: Add comment.  Remove unused code.
+
+2019-04-04  Jeff Law  <law@redhat.com>
+
+	PR rtl-optimization/89399
+	* gcc.c-torture/compile/pr89399.c: New test.
+
+2019-04-04  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89904
+	* gfortran.dg/pr85797.f90: Adjust testcase.
+
+2019-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/65619
+	* g++.dg/template/friend67.C: New.
+
+2019-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/61327
+	* g++.dg/cpp0x/friend4.C: New.
+	* g++.dg/cpp0x/friend5.C: Likewise.
+
+2019-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/56643
+	* g++.dg/cpp0x/noexcept40.C: New.
+
+2019-04-03  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR fortran/68567
+	* gfortran.dg/parameter_array_error_1.f90: New test.
+
+2019-04-03  qing zhao  <qing.zhao@oracle.com>
+
+	PR tree-optimization/89730
+	* gcc.dg/live-patching-4.c: New test.
+
+2019-04-03  Clément Chigot  <clement.chigot@atos.net>
+
+	* lib/go-torture.exp: Only add lto to TORTURE_OPTIONS if it is
+	supported.
+
+2019-04-03  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	PR c/71598
+	* gcc.dg/torture/pr71598-1.c: Skip if short_enums target.
+	* gcc.dg/torture/pr71598-2.c: Skip if not short_enums target.
+
+2019-04-03  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/84101
+	* gcc.target/i386/pr84101.c: New testcase.
+
+2019-04-02  Jeff Law  <law@redhat.com>
+
+	* gcc.target/visium/bit_shift.c: xfail.
+
+2019-04-02  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/89902
+	PR target/89903
+	* gcc.target/i386/pr70799-4.c: Remove.
+	* gcc.target/i386/pr70799-5.c: Remove.
+	* gcc.target/i386/pr89902.c: New test.
+	* gcc.target/i386/pr89903.c: Ditto.
+
+2019-04-02  Andrey Belevantsev  <abel@ispras.ru>
+
+	PR rtl-optimization/84206
+	* gcc.dg/pr84206.c: New test.
+
+2019-04-02  Andrey Belevantsev  <abel@ispras.ru>
+
+	PR rtl-optimization/85876
+	* gcc.dg/pr85876.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-double-compile.c: New test.
+	* gcc.target/s390/zvector/vec-float-compile.c: New test.
+	* gcc.target/s390/zvector/vec-signed-compile.c: New test.
+	* gcc.target/s390/zvector/vec-unsigned-compile.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-search-string-cc-1.c: New test.
+	* gcc.target/s390/zvector/vec-search-string-cc-compile.c: New test.
+	* gcc.target/s390/zvector/vec-search-string-until-zero-cc-1.c: New test.
+	* gcc.target/s390/zvector/vec-search-string-until-zero-cc-compile.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-shift-left-double-by-bit-1.c: New test.
+	* gcc.target/s390/zvector/vec-shift-right-double-by-bit-1.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/replicate-bswap-1.c: New test.
+	* gcc.target/s390/zvector/replicate-bswap-2.c: New test.
+
+2019-04-02  Alexander Monakov  <amonakov@ispras.ru>
+
+	PR testsuite/89916
+	* gcc.dg/pr86928.c: Do not attempt to add -m32.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/bswap-and-replicate-1.c: New test.
+	* gcc.target/s390/zvector/get-element-bswap-1.c: New test.
+	* gcc.target/s390/zvector/get-element-bswap-2.c: New test.
+	* gcc.target/s390/zvector/get-element-bswap-3.c: New test.
+	* gcc.target/s390/zvector/get-element-bswap-4.c: New test.
+	* gcc.target/s390/zvector/set-element-bswap-1.c: New test.
+	* gcc.target/s390/zvector/set-element-bswap-2.c: New test.
+	* gcc.target/s390/zvector/set-element-bswap-3.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-reve-load-byte-z14.c: New test.
+	* gcc.target/s390/zvector/vec-reve-load-byte.c: New test.
+	* gcc.target/s390/zvector/vec-reve-load-halfword-z14.c: New test.
+	* gcc.target/s390/zvector/vec-reve-load-halfword.c: New test.
+	* gcc.target/s390/zvector/vec-reve-store-byte-z14.c: New test.
+	* gcc.target/s390/zvector/vec-reve-store-byte.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-revb-load-double-z14.c: New test.
+	* gcc.target/s390/zvector/vec-revb-load-double.c: New test.
+	* gcc.target/s390/zvector/vec-revb-store-double-z14.c: New test.
+	* gcc.target/s390/zvector/vec-revb-store-double.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/arch13/fp-signedint-convert-1.c: New test.
+	* gcc.target/s390/arch13/fp-unsignedint-convert-1.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/arch13/sel-1.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/arch13/popcount-1.c: New test.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/arch13/bitops-1.c: New test.
+	* gcc.target/s390/arch13/bitops-2.c: New test.
+	* gcc.target/s390/md/andc-splitter-1.c: Add -march=z14 build
+	option and adjust line numbers.
+	* gcc.target/s390/md/andc-splitter-2.c: Likewise.
+
+2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/s390.exp: Run tests in arch13 subdir.
+	* lib/target-supports.exp (check_effective_target_s390_vxe2): New
+	runtime check for the vxe2 hardware feature on IBM Z.
+
+2019-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR testsuite/89907
+	* lib/target-supports.exp (check_avx2_available): Replace
+	avx_available with avx2_available.
+
+2019-04-01  Andrey Belevantsev  <abel@ispras.ru>
+
+	PR rtl-optimization/85412
+	* gcc.dg/pr85412.c: New test.
+
+2019-04-01  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/62207
+	* g++.dg/template/crash130.C: New.
+	* g++.dg/template/crash131.C: Likewise.
+
+2019-04-01  Martin Sebor  <msebor@redhat.com>
+
+	PR c/89685
+	* gcc.dg/attr-copy-8.c: New test.
+	* g++.dg/ext/attr-copy-2.C: New test.
+
+2019-04-01  Andrey Belevantsev  <abel@ispras.ru>
+
+	PR rtl-optimization/86928
+	* gcc.dg/pr86928.c: New test.
+
+2019-04-01  Andrey Belevantsev  <abel@ispras.ru>
+
+	PR rtl-optimization/87273
+	* gcc.dg/pr87273.c: New test.
+
+2019-04-01  Martin Liska  <mliska@suse.cz>
+
+	PR driver/89861
+	* gcc.dg/spellcheck-options-18.c: New test.
+	* gcc.dg/spellcheck-options-19.c: New test.
+	* gcc.dg/spellcheck-options-20.c: New test.
+	* gcc.dg/spellcheck-options-13.c: Adjust expected output.
+	* gcc.dg/completion-2.c: Add one variant with no argument.
+
+2019-04-01  Richard Biener  <rguenther@suse.de>
+
+	PR c/71598
+	* gcc.dg/torture/pr71598-1.c: New testcase.
+	* gcc.dg/torture/pr71598-2.c: Likewise.
+	* gcc.dg/torture/pr71598-3.c: Likewise.
+
+2019-03-31  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89852 - ICE with C++11 functional cast with { }.
+	* g++.dg/cpp0x/initlist115.C: New test.
+
+2019-03-31  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/83515
+	PR fortran/85797
+	* gfortran.dg/pr85797.f90: New test.
+
+2019-03-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.dg/attr-aligned-3.c: Enable on *-*-solaris2.*.
+
+2019-03-30  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.test/gdc-test.exp (gdc-copy-extra): Append copied files to
+	cleanup_extra_files.
+	(dmd2dg): Copy additional files after test is translated.
+	(gdc-do-test): Remove all copied files after test.
+
+2019-03-30  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/89841
+	* gfortran.dg/ISO_Fortran_binding_1.f90: Change the interfaces
+	for c_deallocate, c_allocate and c_assumed_size so that the
+	attributes of the array arguments are correct and are typed.
+	* gfortran.dg/ISO_Fortran_binding_7.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_7.c: Additional source.
+
+	PR fortran/89842
+	* gfortran.dg/ISO_Fortran_binding_8.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_8.c: Additional source.
+
+2019-03-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/89866
+	* gfortran.dg/pointer_intent_8.f90: New test.
+
+2019-03-29  Jim Wilson  <jimw@sifive.com>
+
+	* gcc.target/riscv/predef-1.c: New.
+	* gcc.target/riscv/predef-2.c: New.
+	* gcc.target/riscv/predef-3.c: New.
+	* gcc.target/riscv/predef-4.c: New.
+	* gcc.target/riscv/predef-5.c: New.
+	* gcc.target/riscv/predef-6.c: New.
+	* gcc.target/riscv/predef-7.c: New.
+	* gcc.target/riscv/predef-8.c: New.
+
+2019-03-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89865
+	* gcc.target/i386/pr49095.c: Include in scan-assembler-times patterns
+	the first argument register, so that occassional spills/fills are
+	ignored.
+
+	PR sanitizer/89869
+	* g++.dg/ubsan/vptr-14.C: New test.
+
+	PR c/89872
+	* gcc.dg/tree-ssa/pr89872.c: New test.
+
+2019-03-29  Roman Zhuykov  <zhroma@ispras.ru>
+
+	* gcc.dg/diag-sanity.c: New test.
+
+2019-03-29  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89871
+	* g++.dg/cpp2a/desig14.C: New test.
+
+	PR c++/89876 - ICE with deprecated conversion.
+	* g++.dg/warn/conv5.C: New test.
+
+2019-03-29  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/ipa/ipa-icf-39.c: Prine '***dbgcnt' output.
+	* gcc.dg/pr68766.c: Likewise.
+
+2019-03-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/87485
+	* gcc.dg/pr87485.c: New test.
+
+2019-03-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89621
+	* gfortran.dg/gomp/pr89621.f90: New test.
+
+2019-03-28  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/66548
+	* g++.dg/cpp0x/decltype-pr66548.C: New test.
+
+	PR c++/81506
+	* g++.dg/cpp0x/decltype-pr81506.C: New test.
+
+2019-03-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89612 - ICE with member friend template with noexcept.
+	* g++.dg/cpp0x/noexcept38.C: New test.
+	* g++.dg/cpp0x/noexcept39.C: New test.
+	* g++.dg/cpp1z/noexcept-type21.C: New test.
+
+2019-03-28  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/89848
+	* gcc.target/i386/pr89848.c: New test.
+
+2019-03-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89836 - bool constant expression and explicit conversions.
+	* g++.dg/cpp2a/explicit15.C: New test.
+
+2019-03-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89812
+	* gcc.dg/attr-aligned-3.c: Limit the test to known ELF targets
+	other than AVR.  Add dg-options "".
+
+	PR c++/89785
+	* g++.dg/cpp1y/constexpr-89785-1.C: New test.
+	* g++.dg/cpp1y/constexpr-89785-2.C: New test.
+
+2019-03-27  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/85537
+	* gfortran.dg/dummy_procedure_11.f90: Fix test case.
+	* gfortran.dg/pointer_init_11.f90: New test case.
+
+2019-03-27  Mateusz B  <mateuszb@poczta.onet.pl>
+
+	PR target/85667
+	* gcc.target/i386/pr85667-5.c: New testcase.
+	* gcc.target/i386/pr85667-6.c: New testcase.
+
+2019-03-27  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	PR testsuite/89834
+	* gcc.dg/vect/pr81740-2.c: Require vect_hw_misalign.
+
+2019-03-27  Peter Bergner  <bergner@linux.ibm.com>
+
+	PR rtl-optimization/89313
+	* gcc.dg/pr89313.c: New test.
+
+2019-03-26  Jeff Law  <law@redhat.com>
+
+	PR rtl-optimization/87761
+	PR rtl-optimization/89826
+	* gcc.c-torture/execute/pr89826.c: New test.
+
+2019-03-27  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/torture/20190327-1.c: New testcase.
+
+2019-03-27  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/88247
+	* gfortran.dg/associate_47.f90: New test.
+
+2019-03-27  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89463
+	* gcc.dg/guality/pr89463.c: New testcase.
+
+2019-03-26  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/89827
+	* gcc.target/i386/pr89827.c: New test.
+
+2019-03-26  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.dg/abi/lambda-static-1.C: Handle Solaris as comdat group
+	syntax.
+
+2019-03-26  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/81740
+	* gcc.dg/vect/pr81740-1.c: New testcase.
+	* gcc.dg/vect/pr81740-2.c: Likewise.
+
+2019-03-26  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.test/gdc-test.exp (gdc-do-test): Sort and remove duplicate
+	options in permute args tests.
+
+2019-03-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84598
+	* g++.dg/ext/pr84598.C: New.
+
+2019-03-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89796
+	* g++.dg/gomp/pr89796.C: New test.
+	* gcc.dg/gomp/pr89796.c: New test.
+
+2019-03-25  David Malcolm  <dmalcolm@redhat.com>
+
+	PR rtl-optimization/88347
+	PR rtl-optimization/88423
+	* gcc.c-torture/compile/pr88347.c: New test.
+	* gcc.c-torture/compile/pr88423.c: New test.
+
+2019-03-25  Martin Sebor  <msebor@redhat.com>
+
+	PR c/89812
+	* gcc.dg/attr-aligned-3.c: New test.
+
+2019-03-25  Johan Karlsson  <johan.karlsson@enea.com>
+
+	PR debug/86964
+	* gcc.dg/debug/dwarf2/pr86964.c: New testcase.
+
+2019-03-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84661
+	PR c++/85013
+	* g++.dg/concepts/pr84661.C: New.
+	* g++.dg/torture/pr85013.C: Likewise.
+
+2019-03-25  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89214 - ICE when initializing aggregates with bases.
+	* g++.dg/cpp1z/aggr-base8.C: New test.
+	* g++.dg/cpp1z/aggr-base9.C: New test.
+
+	PR c++/89705 - ICE with reference binding with conversion function.
+	* g++.dg/cpp0x/rv-conv2.C: New test.
+
+2019-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89789
+	* gcc.dg/torture/pr89789.c: New testcase.
+
+2019-03-25  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/abi/lambda-static-1.C: New.
+
+2019-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89802
+	* g++.dg/tree-ssa/pr89802.C: New testcase.
+
+2019-03-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/60702
+	* g++.dg/tls/thread_local11.C: Remove scan-tree-dump-times directives
+	for _ZTH* calls.
+	* g++.dg/tls/thread_local11a.C: New test.
+
+2019-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89790
+	* g++.dg/pr89790.C: New testcase.
+
+2019-03-24  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/pr82281.c: Compile only for ia32 effective target.
+	(dg-options): Remove -m32. Add -msse2 -mtune=znver1.
+	* gcc.target/i386/pr89676.c: Compile only for ia32 effective target.
+	(dg-options): Remove -m32 and -march=i686. Add -mno-stv.
+
+2019-03-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/78865
+	* gfortran.dg/altreturn_10.f90: New test.
+	* gfortran.dg/whole_file_3.f90: Change dg-warning to dg-error.
+
+2019-03-22  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/89676
+	* gcc.target/i386/pr89676.c: New.
+
+2019-03-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/60702
+	* g++.dg/tls/thread_local11.C: New test.
+	* g++.dg/tls/thread_local11.h: New test.
+	* g++.dg/tls/thread_local12a.C: New test.
+	* g++.dg/tls/thread_local12b.C: New test.
+	* g++.dg/tls/thread_local12c.C: New test.
+	* g++.dg/tls/thread_local12d.C: New test.
+	* g++.dg/tls/thread_local12e.C: New test.
+	* g++.dg/tls/thread_local12f.C: New test.
+	* g++.dg/tls/thread_local12g.C: New test.
+	* g++.dg/tls/thread_local12h.C: New test.
+	* g++.dg/tls/thread_local12i.C: New test.
+	* g++.dg/tls/thread_local12j.C: New test.
+	* g++.dg/tls/thread_local12k.C: New test.
+	* g++.dg/tls/thread_local12l.C: New test.
+
+	PR c++/87481
+	* g++.dg/cpp1y/constexpr-87481.C: New test.
+
+2019-03-22  Simon Wright  <simon@pushface.org>
+
+	PR ada/89583
+	* gnat.dg/socket2.adb: New.
+
+2019-03-22  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/mmx-psubd-2.c: Test _m_psubd.
+
+2019-03-22  Hongtao Liu  <hongtao.liu@intel.com>
+
+	PR target/89784
+	* gcc.target/i386/avx512f-vfmaddXXXsd-1.c (avx512f_test): Add tests
+	for _mm_mask{,3,z}_*.
+	* gcc.target/i386/avx512f-vfmaddXXXss-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfmsubXXXsd-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfmsubXXXss-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfnmaddXXXsd-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfnmaddXXXss-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfnmsubXXXsd-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfnmsubXXXss-1.c (avx512f_test): Likewise.
+	* gcc.target/i386/avx512f-vfmaddXXXsd-2.c: New test.
+	* gcc.target/i386/avx512f-vfmaddXXXss-2.c: New test.
+	* gcc.target/i386/avx512f-vfmsubXXXsd-2.c: New test.
+	* gcc.target/i386/avx512f-vfmsubXXXss-2.c: New test.
+	* gcc.target/i386/avx512f-vfnmaddXXXsd-2.c: New test.
+	* gcc.target/i386/avx512f-vfnmaddXXXss-2.c: New test.
+	* gcc.target/i386/avx512f-vfnmsubXXXsd-2.c: New test.
+	* gcc.target/i386/avx512f-vfnmsubXXXss-2.c: New test.
+
+2019-03-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89784
+	* gcc.target/i386/sse-13.c (__builtin_ia32_vfmaddsd3_mask,
+	__builtin_ia32_vfmaddsd3_mask3, __builtin_ia32_vfmaddsd3_maskz,
+	__builtin_ia32_vfmsubsd3_mask3, __builtin_ia32_vfmaddss3_mask,
+	__builtin_ia32_vfmaddss3_mask3, __builtin_ia32_vfmaddss3_maskz,
+	__builtin_ia32_vfmsubss3_mask3): Define.
+	* gcc.target/i386/sse-23.c (__builtin_ia32_vfmaddsd3_mask,
+	__builtin_ia32_vfmaddsd3_mask3, __builtin_ia32_vfmaddsd3_maskz,
+	__builtin_ia32_vfmsubsd3_mask3, __builtin_ia32_vfmaddss3_mask,
+	__builtin_ia32_vfmaddss3_mask3, __builtin_ia32_vfmaddss3_maskz,
+	__builtin_ia32_vfmsubss3_mask3): Define.
+	* gcc.target/i386/avx-1.c (__builtin_ia32_vfmaddsd3_mask,
+	__builtin_ia32_vfmaddsd3_mask3, __builtin_ia32_vfmaddsd3_maskz,
+	__builtin_ia32_vfmsubsd3_mask3, __builtin_ia32_vfmaddss3_mask,
+	__builtin_ia32_vfmaddss3_mask3, __builtin_ia32_vfmaddss3_maskz,
+	__builtin_ia32_vfmsubss3_mask3): Define.
+	* gcc.target/i386/sse-14.c: Add tests for
+	_mm_mask{,3,z}_f{,n}m{add,sub}_round_s{s,d} builtins.
+	* gcc.target/i386/sse-22.c: Likewise.
+
+2019-03-21  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/89350
+	* gcc.dg/Warray-bounds-40.c: Remove an xfail.
+	* gcc.dg/Wstringop-overflow.c: Xfail overly ambitious tests.
+	* gcc.dg/Wstringop-overflow-11.c: New test.
+	* gcc.dg/Wstringop-overflow-12.c: New test.
+	* gcc.dg/pr89350.c: New test.
+	* gcc.dg/pr40340-1.c: Adjust expected warning.
+	* gcc.dg/pr40340-2.c: Same.
+	* gcc.dg/pr40340-4.c: Same.
+	* gcc.dg/pr40340-5.c: Same.
+
+2019-03-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR lto/89692
+	* g++.dg/other/pr89692.C: New test.
+
+	PR c++/89767
+	* g++.dg/cpp1y/lambda-init18.C: New test.
+	* g++.dg/cpp1y/lambda-init19.C: New test.
+	* g++.dg/cpp1y/pr89767.C: New test.
+
+2019-03-21  Thomas Schwinge  <thomas@codesourcery.com>
+	    Cesar Philippidis  <cesar@codesourcery.com>
+
+	PR fortran/72741
+	* gfortran.dg/goacc/routine-external-level-of-parallelism-1.f: New
+	file.
+	* gfortran.dg/goacc/routine-external-level-of-parallelism-2.f:
+	Likewise.
+
+2019-03-21  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR fortran/72741
+	* c-c++-common/goacc/routine-3-extern.c: New file.
+	* c-c++-common/goacc/routine-3.c: Adjust.
+	* c-c++-common/goacc/routine-4-extern.c: New file.
+	* c-c++-common/goacc/routine-4.c: Adjust.
+	* gfortran.dg/goacc/routine-module-3.f90: New file.
+
+	PR fortran/89773
+	* gfortran.dg/goacc/pr89773.f90: New file.
+	* gfortran.dg/goacc/pr77765.f90: Adjust.
+	* gfortran.dg/goacc/routine-6.f90: Adjust, and extend.
+
+	PR fortran/72741
+	* gfortran.dg/goacc/routine-module-mod-1.f90: Update.
+
+	PR fortran/72741
+	* gfortran.dg/goacc/routine-module-1.f90: New file.
+	* gfortran.dg/goacc/routine-module-2.f90: Likewise.
+	* gfortran.dg/goacc/routine-module-mod-1.f90: Likewise.
+
+	* gfortran.dg/goacc/goacc.exp (dg-compile-aux-modules): New proc.
+
+	PR fortran/56408
+	* gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
+	(dg-compile-aux-modules): Fix diagnostic.
+	* gfortran.dg/coarray/caf.exp (dg-compile-aux-modules): Likewise.
+	* gfortran.dg/dg.exp (dg-compile-aux-modules): Likewise.
+
+	PR fortran/56408
+	* gfortran.dg/coarray/caf.exp (dg-compile-aux-modules): Workaround
+	missing nexted dg-test call support in dejaGNU 1.4.4.
+
+	PR fortran/29383
+	* gfortran.dg/ieee/ieee.exp (DEFAULT_FFLAGS): Set the same as in
+	other '*.exp' files.
+
+2019-03-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89779
+	* gcc.dg/torture/pr89779.c: New testcase.
+
+2019-03-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/78645
+	* g++.dg/cpp0x/constexpr-ice20.C: New.
+
+2019-03-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/89571
+	* g++.dg/cpp0x/noexcept37.C: New.
+
+2019-03-21  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/89017
+	* gdc.dg/pr89017.d: New test.
+
+2019-03-20  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/71861
+	* gfortran.dg/interface_abstract_5.f90: New test case.
+
+2019-03-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89775
+	* gcc.target/s390/pr89775-1.c: New test.
+	* gcc.target/s390/pr89775-2.c: New test.
+
+2019-03-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89752
+	* g++.target/aarch64/aarch64.exp: New file.
+	* g++.target/aarch64/pr89752.C: New test.
+
+2019-03-19  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/89688
+	* gcc.dg/strlenopt-61.c: New test.
+	* g++.dg/warn/Wstringop-overflow-2.C: New test.
+
+2019-03-19  Jim Wilson  <jimw@sifive.com>
+
+	PR target/89411
+	* gcc.target/riscv/losum-overflow.c: New test.
+
+2019-03-19  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/89644
+	* gcc.dg/Wstringop-truncation-8.c: New test.
+
+2019-03-19  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/89737
+	* gcc.dg/pr89737.c: New test.
+
+2019-03-19  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR lto/87809
+	PR lto/89335
+	* g++.dg/lto/pr87089_0.C: New testcase.
+	* g++.dg/lto/pr87089_1.C: New testcase.
+	* g++.dg/lto/pr89335_0.C: New testcase.
+
+2019-03-19  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	PR target/89736
+	* gcc.target/powerpc/pr87532-mc.c: Modify dejagnu directives to
+	restrict this test to vsx targets.
+
+2019-03-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89752
+	* g++.dg/ext/asm15.C: Check for particular diagnostic wording.
+	* g++.dg/ext/asm16.C: Likewise.
+	* g++.dg/ext/asm17.C: New test.
+
+2019-03-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* c-c++-common/unroll-7.c: New test.
+
+2019-03-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89726
+	* gcc.target/i386/fpprec-1.c (x): Add 6 new constants.
+	(expect_round, expect_rint, expect_floor, expect_ceil, expect_trunc):
+	Add expected results for them.
+
+	PR c/89734
+	* gcc.dg/pr89734.c: New test.
+
+2019-03-18  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/89720
+	* gcc.dg/Warray-bounds-42.c: New test.
+
+2019-03-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c++/89630
+	* g++.target/i386/pr89630.C: New test.
+
+2019-03-18  Kito Cheng  <kito.cheng@gmail.com>
+
+	* gcc.target/riscv/arch-1.c: Add quotes around march in dg-error.
+
+2019-03-18  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/bswap16.c: Use a pointer instead of a global for
+	the "store" test as well.
+	* gcc.target/powerpc/bswap32.c: Ditto.
+
+2019-03-18  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/bswap16.c: Use a pointer instead of a global for
+	the "store" test as well.
+	* gcc.target/powerpc/bswap32.c: Ditto.
+
+2019-03-18  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/pr18096-1.c: Allow an error message that says
+	"exceeds" instead of just one that talks about "too large".
+
+2019-03-18  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/sve/cost_model_1.c: New test.
+
+2019-03-18  Martin Jambor  <mjambor@suse.cz>
+
+	PR tree-optimization/89546
+	* gcc.dg/tree-ssa/pr89546.c: New test.
+
+2019-03-18  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	PR target/89627
+	* g++.target/riscv/call-with-empty-struct-float.C: New file.
+	* g++.target/riscv/call-with-empty-struct-int.C: New file.
+	* g++.target/riscv/call-with-empty-struct.H: New file.
+	* g++.target/riscv/riscv.exp: New file.
+
+2019-03-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/85014
+	* g++.dg/cpp0x/pr85014.C: New.
+
+2019-03-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/86979
+	* gcc.dg/pr86979.c: New test.
+
+2019-03-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/88008
+	* gfortran.dg/typebound_call_31.f90: New test.
+
+2019-03-03-17  John David Anglin  <danglin@gcc.gnu.org>
+
+	* gcc.dg/compat/pr83487-1_x.c: Use -fno-common option on
+	hppa*-*-hpux*.
+	* gcc.dg/compat/pr83487-1_y.c: Likewise.
+
+	* gfortran.dg/pointer_init_10.f90: Require visibility support.
+	* gfortran.dg/temporary_3.f90: Likewise.
+
+	* gcc.dg/pr88074.c: Require c99_runtime.
+	* gcc.dg/warn-abs-1.c: Likewise.
+	* gfortran.dg/ISO_Fortran_binding_1.f90: Likewise.
+
+	PR testsuite/89666
+	* c-c++-common/builtin-has-attribute-3.c: Define SKIP_ALIAS on
+	hppa*-*-hpux*.
+	* gcc.dg/attr-copy.c: Require alias support.
+	* gcc.dg/ipa/ipa-icf-39.c: Likewise.
+
+2019-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/89724
+	* gfortran.dg/continuation_15.f90: New test.
+	* gfortran.dg/continuation_16.f90: New test.
+
+2019-03-16  John David Anglin  <danglin@gcc.gnu.org>
+
+	* g++.dg/cpp0x/pr84497.C: Restore dg-require-weak.
+
+	PR testsuite/89393
+	* g++.dg/abi/ref-temp1.C: Skip on 32-bit hppa*-*-hpux*.
+	* g++.dg/cpp0x/pr84497.C: Likewise.
+
+	* c-c++-common/builtin-has-attribute-4.c: Skip on 32-bit hppa*-*-hpux*.
+	* gcc.dg/attr-copy-6.c: Likewise.
+	* gcc.dg/pr87793.c: Likewise.
+
+	PR testsuite/89471
+	* gcc.dg/pr84941.c: Skip on hppa*-*-*.
+
+	* gcc.dg/Wattributes-10.c: Add -fno-common option on hppa*-*-hpux*.
+	* gcc.dg/gimplefe-34.c: Likewise.
+	* gcc.dg/compat/pr83487-2_x.c: Use -fno-common option on hppa*-*-hpux*.
+	* gcc.dg/compat/pr83487-2_y.c: Likewise.
+
+	PR testsuite/84174
+	* gcc.dg/Wattributes-6.c: Skip warning check at line 404 on
+	hppa*64*-*-*.
+
+	PR testsuite/83453
+	* c-c++-common/Wattributes.c: Skip a warning check on hppa*64*-*-*.
+
+	* lib/target-supports.exp (check_ascii_locale_available): Remove
+	hppa*-*-hpux*.
+
+2019-03-16  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/84394
+	* gfortran.dg/blockdata_11.f90: New test.
+
+2019-03-15  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/60091
+	* gfortran.dg/pointer_remapping_3.f08: Adjust error messages.
+	* gfortran.dg/pointer_remapping_7.f90: Adjust error message.
+
+2019-03-15  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	PR target/87532
+	* gcc.target/powerpc/fold-vec-extract-char.p8.c: Modify expected
+	instruction selection.
+	* gcc.target/powerpc/fold-vec-extract-int.p8.c: Likewise.
+	* gcc.target/powerpc/fold-vec-extract-short.p8.c: Likewise.
+	* gcc.target/powerpc/pr87532-mc.c: New test.
+	* gcc.target/powerpc/pr87532.c: New test.
+	* gcc.target/powerpc/vec-extract-v16qiu-v2.h: New test.
+	* gcc.target/powerpc/vec-extract-v16qiu-v2a.c: New test.
+	* gcc.target/powerpc/vec-extract-v16qiu-v2b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-10a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-10b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-11a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-11b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-12a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-12b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-13a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-13b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-14a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-14b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-15a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-15b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-16a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-16b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-17a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-17b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-18a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-18b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-19a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-19b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-20a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-20b.c: New test.
+	* gcc.target/powerpc/vsx-builtin-9a.c: New test.
+	* gcc.target/powerpc/vsx-builtin-9b.c: New test.
+
+2019-03-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR c++/88534
+	PR c++/88537
+	* g++.dg/cpp2a/pr88534.C: New.
+	* g++.dg/cpp2a/pr88537.C: New.
+
+2019-03-15  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.target/s390/target-attribute/tattr-1.c (htm0): -mhtm -> '-mhtm'.
+	* gcc.target/s390/target-attribute/tattr-2.c: Likewise.
+	* gcc.target/s390/target-attribute/tattr-3.c (vx0): -mvx -> '-mvx'.
+	* gcc.target/s390/target-attribute/tattr-4.c: Likewise.
+
+2019-03-15  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	PR target/89719
+	* gcc.target/aarch64/spellcheck_4.c: Adjust dg-error string.
+	* gcc.target/aarch64/spellcheck_5.c: Likewise.
+	* gcc.target/aarch64/spellcheck_6.c: Likewise.
+
+2019-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89709
+	* g++.dg/cpp0x/constexpr-89709.C: New test.
+
+	PR debug/89704
+	* gcc.dg/debug/pr89704.c: New test.
+
+2019-03-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89650
+	* g++.target/i386/pr89650.C: New test.
+
+2019-03-14  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-13.c: Adjust.
+	* gcc.dg/gimplefe-14.c: Likewise.
+	* gcc.dg/gimplefe-17.c: Likewise.
+	* gcc.dg/gimplefe-18.c: Likewise.
+	* gcc.dg/gimplefe-7.c: Likewise.
+	* gcc.dg/torture/pr89595.c: Likewise.
+	* gcc.dg/tree-ssa/cunroll-13.c: Likewise.
+	* gcc.dg/tree-ssa/ivopt_mult_1g.c: Likewise.
+	* gcc.dg/tree-ssa/ivopt_mult_2g.c: Likewise.
+	* gcc.dg/tree-ssa/scev-3.c: Likewise.
+	* gcc.dg/tree-ssa/scev-4.c: Likewise.
+	* gcc.dg/tree-ssa/scev-5.c: Likewise.
+	* gcc.dg/vect/vect-cond-arith-2.c: Likewise.
+	* gcc.target/aarch64/sve/loop_add_6.c: Likewise.
+
+2019-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ipa/89684
+	* gcc.target/i386/pr89684.c: New test.
+
+	PR rtl-optimization/89679
+	* gcc.dg/pr89679.c: New test.
+
+2019-03-14  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89710
+	* gcc.dg/torture/pr89710.c: New testcase.
+
+2019-03-14  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89698
+	* g++.dg/torture/pr89698.C: New testcase.
+
+2019-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89703
+	* gcc.c-torture/compile/pr89703-1.c: New test.
+	* gcc.c-torture/compile/pr89703-2.c: New test.
+
+2019-03-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89523
+	* gcc.target/i386/pr89523-1a.c: New test.
+	* gcc.target/i386/pr89523-1b.c: Likewise.
+	* gcc.target/i386/pr89523-2.c: Likewise.
+	* gcc.target/i386/pr89523-3.c: Likewise.
+	* gcc.target/i386/pr89523-4.c: Likewise.
+	* gcc.target/i386/pr89523-5.c: Likewise.
+	* gcc.target/i386/pr89523-6.c: Likewise.
+	* gcc.target/i386/pr89523-7.c: Likewise.
+	* gcc.target/i386/pr89523-8.c: Likewise.
+	* gcc.target/i386/pr89523-9.c: Likewise.
+
+2019-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89512
+	* g++.dg/cpp1y/var-templ61.C: New test.
+
+	PR c++/89652
+	* g++.dg/cpp1y/constexpr-89652.C: New test.
+
+2019-03-13  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/87045
+	* gfortran.dg/pr87045.f90: New test.
+
+2019-03-13  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR target/85860
+	* gcc.target/i386/pr85860.c: New.
+
+2019-03-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89686 - mixing init-capture and simple-capture in lambda.
+	* g++.dg/cpp2a/lambda-pack-init2.C: New test.
+
+	PR c++/89660 - bogus error with -Wredundant-move.
+	* g++.dg/cpp0x/Wredundant-move8.C: New test.
+	* g++.dg/cpp0x/Wredundant-move9.C: New test.
+
+2019-03-13  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/89601
+	* gfortran.dg/pdt_16.f03: Modified to avoid follow-up errors.
+	* gfortran.dg/pdt_30.f90: New test case.
+
+2019-03-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88979 - further P0634 fix for constructors.
+	* g++.dg/cpp2a/typename15.C: New test.
+
+2019-03-13  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/89662
+	* gcc.dg/Warray-bounds-41.c: New test.
+
+2019-03-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/63508
+	* g++.dg/cpp0x/auto53.C: New.
+
+2019-03-13  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89677
+	* gcc.dg/torture/pr89677.c: New testcase.
+
+2019-03-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/85558
+	* g++.dg/other/friend16.C: New.
+	* g++.dg/other/friend17.C: Likewise.
+
+2019-03-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/88588
+	* c-c++-common/gomp/pr88588.c: New test.
+
+2019-03-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/66695
+	PR fortran/77746
+	PR fortran/79485
+	* gfortran.dg/binding_label_tests_30.f90: New test.
+	* gfortran.dg/binding_label_tests_31.f90: New test.
+	* gfortran.dg/binding_label_tests_32.f90: New test.
+	* gfortran.dg/binding_label_tests_33.f90: New test.
+
+2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.dg/pr88957.d: Move to gdc.dg/ubsan.
+	* gdc.dg/ubsan/ubsan.exp: New file.
+	* lib/gdc.exp (gdc_include_flags): Remove unused target variable.
+	Explicitly return flags from procedure.
+
+2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/88957
+	* gdc.dg/pr88957.d: New test.
+	* gdc.dg/simd.d: Add new vector tests.
+
+2019-03-12  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR d/87824
+	* lib/gdc.exp (gdc_include_flags): Find C++ headers by calling
+	libstdc++v3/scripts/testsuite_flags.  Filter out unsupported
+	-nostdinc++ flag.
+
+2019-03-12  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/87673
+	* gfortran.dg/charlen_17.f90: New test.
+
+2019-03-12  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.target/s390/memset-1.c: Adapt test case for new scheduling.
+
+2019-03-12  Martin Liska  <mliska@suse.cz>
+
+	* gfortran.dg/abstract_type_3.f03: Amend test-case scan patterns.
+	* gfortran.dg/binding_label_tests_4.f03: Likewise.
+	* gfortran.dg/c_f_pointer_tests_6.f90: Likewise.
+	* gfortran.dg/c_funloc_tests_6.f90: Likewise.
+	* gfortran.dg/c_loc_tests_17.f90: Likewise.
+	* gfortran.dg/constructor_9.f90: Likewise.
+	* gfortran.dg/dec_structure_8.f90: Likewise.
+	* gfortran.dg/entry_4.f90: Likewise.
+	* gfortran.dg/init_char_with_nonchar_ctr.f90: Likewise.
+	* gfortran.dg/initialization_23.f90: Likewise.
+	* gfortran.dg/logical_assignment_1.f90: Likewise.
+	* gfortran.dg/pr80752.f90: Likewise.
+	* gfortran.dg/pr88116_1.f90: Likewise.
+	* gfortran.dg/pr88467.f90: Likewise.
+	* gfortran.dg/typebound_call_7.f03: Likewise.
+	* gfortran.dg/typebound_generic_1.f03: Likewise.
+	* gfortran.dg/typebound_operator_2.f03: Likewise.
+	* gfortran.dg/typebound_operator_4.f03: Likewise.
+	* gfortran.dg/typebound_proc_9.f03: Likewise.
+	* gfortran.dg/unlimited_polymorphic_2.f03: Likewise.
+
+2019-03-12  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/89363
+	* gfortran.dg/assumed_rank_16.f90: New test.
+
+	PR fortran/89364
+	* gfortran.dg/assumed_rank_17.f90: New test.
+
+2019-03-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89663
+	* gcc.c-torture/compile/pr89663-1.c: New test.
+	* gcc.c-torture/compile/pr89663-2.c: New test.
+
+2019-03-12  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89664
+	* gfortran.dg/pr89664.f90: New testcase.
+
+2019-03-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/89651
+	* gfortran.dg/gomp/pr89651.f90: New test.
+
+	PR middle-end/89655
+	PR bootstrap/89656
+	* gcc.c-torture/compile/pr89655.c: New test.
+
+2019-03-11  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/arm/f16_f64_conv_no_dp.c: Add arm_fp16_ok effective
+	target.
+
+2019-03-11  Martin Liska  <mliska@suse.cz>
+
+	* g++.dg/conversion/simd3.C (foo): Wrap option names
+	with apostrophe character.
+	* g++.dg/cpp1z/decomp3.C (test): Likewise.
+	(test3): Likewise.
+	* g++.dg/cpp1z/decomp4.C (test): Likewise.
+	* g++.dg/cpp1z/decomp44.C (foo): Likewise.
+	* g++.dg/cpp1z/decomp45.C (f): Likewise.
+	* g++.dg/opt/pr34036.C: Likewise.
+	* g++.dg/spellcheck-c++-11-keyword.C: Likewise.
+	* gcc.dg/c90-fordecl-1.c (foo): Likewise.
+	* gcc.dg/cpp/dir-only-4.c: Likewise.
+	* gcc.dg/cpp/dir-only-5.c: Likewise.
+	* gcc.dg/cpp/pr71591.c: Likewise.
+	* gcc.dg/format/opt-1.c: Likewise.
+	* gcc.dg/format/opt-2.c: Likewise.
+	* gcc.dg/format/opt-3.c: Likewise.
+	* gcc.dg/format/opt-4.c: Likewise.
+	* gcc.dg/format/opt-5.c: Likewise.
+	* gcc.dg/format/opt-6.c: Likewise.
+	* gcc.dg/pr22231.c: Likewise.
+	* gcc.dg/pr33007.c: Likewise.
+	* gcc.dg/simd-1.c (hanneke): Likewise.
+	* gcc.dg/simd-5.c: Likewise.
+	* gcc.dg/simd-6.c: Likewise.
+	* gcc.dg/spellcheck-options-14.c: Likewise.
+	* gcc.dg/spellcheck-options-15.c: Likewise.
+	* gcc.dg/spellcheck-options-16.c: Likewise.
+	* gcc.dg/spellcheck-options-17.c: Likewise.
+	* gcc.dg/tree-ssa/pr23109.c: Likewise.
+	* gcc.dg/tree-ssa/recip-5.c: Likewise.
+	* gcc.target/i386/cet-notrack-1a.c (func): Likewise.
+	(__attribute__): Likewise.
+	* gcc.target/i386/cet-notrack-icf-1.c (fn3): Likewise.
+	* gcc.target/i386/cet-notrack-icf-3.c (__attribute__): Likewise.
+	* gcc.target/powerpc/warn-1.c: Likewise.
+	* gcc.target/powerpc/warn-2.c: Likewise.
+
+2019-03-11  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/vec-addc-u128.c: New test.
+
+2019-03-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* c-c++-common/unroll-6.c: New test.
+
+2019-03-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/87571
+	* g++.dg/template/memfriend18.C: New.
+
+2019-03-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gdc.dg/pr89041.d: Mark as compile test.
+
+2019-03-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc.target/i386/indirect-thunk-extern-7.c: Add -fjump-tables to
+	dg-options.
+
+2019-03-10  Martin Jambor  <mjambor@suse.cz>
+
+	PR tree-optimization/85762
+	PR tree-optimization/87008
+	PR tree-optimization/85459
+	* g++.dg/tree-ssa/pr87008.C: New test.
+	* gcc.dg/guality/pr54970.c: Xfail tests querying a[0] everywhere.
+
+2019-03-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/66089
+	* gfortran.dg/assumed_type_2.f90: Adapted tree dumps.
+	* gfortran.dg/no_arg_check_2.f90: Likewise.
+
+2019-03-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89648
+	* g++.dg/cpp0x/lambda/lambda-89648.C: New test.
+
+2019-03-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/66089
+	* gfortran.dg/dependency_53.f90: New test.
+
+2019-03-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/87734
+	* gfortran.dg/public_private_module_10.f90: New test.
+
+2019-03-09  John David Anglin  <dave.anglin@bell.net>
+
+	PR c++/70349
+	* g++.dg/abi/abi-tag18a.C: Skip on 32-bit hppa*-*-hpux*.
+
+	PR middle-end/68733
+	* c-c++-common/gomp/clauses-2.c: Skip on 32-bit hppa*-*-hpux*.
+
+	PR testsuite/89472
+	* gcc.dg/debug/dwarf2/inline5.c: XFAIL one scan-assembler-times check.
+
+2019-03-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/87750
+	* g++.dg/cpp0x/pr87750.C: New.
+
+2019-03-09  John David Anglin  <dave.anglin@bell.net>
+
+	* c-c++-common/ident-0b.c: Also skip on 32-bit hppa*-*-hpux*.
+	* c-c++-common/ident-1a.c: Likewise.
+	* c-c++-common/ident-1b.c: Likewise.
+	* c-c++-common/ident-2b.c: Likewise.
+
+	* g++.dg/tls/pr77285-2.C: Require tls_native support.
+
+	* g++.dg/ext/visibility/lambda1.C: Require visibility.
+
+	PR inline-asm/87010
+	* gcc.dg/torture/20180712-1.c: Skip on hppa*-*-*.
+
+	* gfortran.dg/coarray_data_1.f90: Link against libatomic if target
+	libatomic_available.
+
+2019-03-09  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/89041
+	* gdc.dg/pr89041.d: New test.
+
+2019-03-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/71544
+	* gfortran.dg/c_ptr_tests_19.f90: New test.
+
+2019-03-09  John David Anglin  <dave.anglin@bell.net>
+
+	* gnat.dg/debug11.adb: Skip on 32-bit hppa*-*-hpux*.
+	* gnat.dg/debug12.adb: Likewise.
+
+	* lib/target-supports.exp (check_effective_target_weak_undefined):
+	Return 0 on hppa*-*-hpux*.
+	(check_ascii_locale_available): Likewise.
+
+2019-03-09  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/84504
+	* gfortran.dg/pointer_init_10.f90: New test case.
+
+2019-03-09  John David Anglin  <dave.anglin@bell.net>
+
+	* gfortran.dg/ieee/ieee_9.f90: Fix typo.
+
+2019-03-09  John David Anglin  <dave.anglin@bell.net>
+
+	PR fortran/89639
+	* gfortran.dg/ieee/ieee_9.f90: Skip on hppa*-*-linux*.
+
+2019-03-09  Thomas König  <tkoenig@gcc.gnu.org>
+
+	PR fortran/71203
+	* gfortran.dg/array_simplify_3.f90: New test case.
+
+2019-03-09  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/88568
+	* g++.dg/other/pr88568.C: New test.
+
+	PR rtl-optimization/89634
+	* gcc.c-torture/execute/pr89634.c: New test.
+
+2019-03-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/85870
+	* gcc.dg/lto/pr85870_0.c: Add dg-extra-ld-options with
+	-r -nostdlib -flinker-output=nolto-rel.
+
+2019-03-08  David Malcolm  <dmalcolm@redhat.com>
+
+	PR target/79926
+	* gcc.target/i386/interrupt-387-err-1.c: Update expected message.
+	* gcc.target/i386/interrupt-387-err-2.c: Likewise.
+	* gcc.target/i386/interrupt-mmx-err-1.c: Likewise.
+	* gcc.target/i386/interrupt-mmx-err-2.c: Likewise.
+
+2019-03-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/63540
+	* g++.dg/cpp0x/implicit17.C: New.
+
+2019-03-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/22149
+	* g++.dg/template/access29.C: New.
+
+2019-03-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/82075
+	* g++.dg/cpp1z/decomp49.C: New test.
+
+2019-03-08  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	* gcc.target/arm/f16_f64_conv_no_dp.c: New test.
+
+2019-03-08  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/68924
+	PR target/78782
+	PR target/87558
+	* gcc.target/i386/pr78782.c: New test.
+	* gcc.target/i386/pr87558.c: Ditto.
+
+2019-03-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/85870
+	* gcc.dg/lto/pr85870_0.c: New test.
+	* gcc.dg/lto/pr85870_1.c: New test.
+
+2019-03-08  Martin Liska  <mliska@suse.cz>
+
+	PR target/86952
+	* gcc.target/i386/pr86952.c: New test.
+	* gcc.target/i386/indirect-thunk-7.c: Use jump tables to match
+	scanned pattern.
+	* gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
+
+2019-03-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89585
+	* g++.dg/asm-qual-3.C: Adjust expected diagnostics for toplevel
+	asm volatile.
+
+	PR c++/89599
+	* g++.dg/ubsan/vptr-4.C: Adjust expected diagnostics.
+	* g++.dg/parse/array-size2.C: Likewise.
+	* g++.dg/cpp0x/constexpr-89599.C: New test.
+
+	PR c++/89622
+	* g++.dg/warn/pr89622.C: New test.
+
+2019-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/80003
+	* gcc.target/i386/pr68657.c: Adjust expected diagnostics wording.
+	* gcc.target/i386/interrupt-6.c: Likewise.
+	* g++.target/i386/pr57362.C: Adjust capitalization in dg-prune-output.
+
+2019-03-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84518
+	* g++.dg/cpp0x/lambda/lambda-ice30.C: New.
+	* g++.dg/cpp0x/lambda/lambda-ice31.C: Likewise.
+
+2019-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR translation/79999
+	* c-c++-common/gomp/doacross-1.c: Adjust expected diagnostics.
+	* c-c++-common/gomp/doacross-3.c: New test.
+
+	PR target/89602
+	* gcc.target/i386/avx512f-vmovss-1.c: New test.
+	* gcc.target/i386/avx512f-vmovss-2.c: New test.
+	* gcc.target/i386/avx512f-vmovss-3.c: New test.
+	* gcc.target/i386/avx512f-vmovsd-1.c: New test.
+	* gcc.target/i386/avx512f-vmovsd-2.c: New test.
+	* gcc.target/i386/avx512f-vmovsd-3.c: New test.
+
+2019-03-07  Martin Jambor  <mjambor@suse.cz>
+
+	PR lto/87525
+	* gcc.dg/ipa/ipcp-5.c: New test.
+
+2019-03-07  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/88235
+	* g++.dg/ipa/pr88235.C: New test.
+
+2019-04-07  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89618
+	* gcc.target/i386/pr89618.c: New testcase.
+
+2019-03-07  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89595
+	* gcc.dg/torture/pr89595.c: New testcase.
+
+2019-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89585
+	* g++.dg/asm-qual-3.C: Adjust expected diagnostics.
+
+2019-03-06  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/71203
+	* gfortran.dg/substr_8.f90: New test.
+
+2019-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/87148
+	* g++.dg/ext/flexary34.C: New test.
+
+2019-03-06  Peter Bergner  <bergner@linux.ibm.com>
+
+	PR rtl-optimization/88845
+	* gcc.target/powerpc/pr88845.c: New test.
+
+2019-03-06  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87378 - bogus -Wredundant-move warning.
+	* g++.dg/cpp0x/Wredundant-move1.C (fn4): Drop dg-warning.
+	* g++.dg/cpp0x/Wredundant-move7.C: New test.
+
+2019-03-06  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/89551
+	* gcc.dg/uninit-pred-8_b.c: Force logical-op-non-short-circuit
+	the way that makes the testcase PASS.
+
+2019-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89590
+	* gcc.dg/pr89590.c: New test.
+
+2019-03-05  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR target/89222
+	* gcc.target/arm/pr89222.c: Add new test.
+
+2019-03-05  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89594
+	* gcc.dg/pr89594.c: New testcase.
+
+2019-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89487
+	* gcc.dg/tree-ssa/pr89487.c: Include ../pr87600.h.
+	(caml_interprete): Ifdef the whole body out if REG1 or REG2 macros
+	aren't defined.  Use REG1 instead of "%r15" and REG2 instead of
+	"%r14".
+
+	PR bootstrap/89560
+	* g++.dg/other/pr89560.C: New test.
+
+	PR tree-optimization/89570
+	* gcc.dg/pr89570.c: New test.
+
+	PR tree-optimization/89566
+	* c-c++-common/pr89566.c: New test.
+
+2019-03-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84605
+	* g++.dg/parse/crash69.C: New.
+
+2019-03-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/71446
+	* g++.dg/cpp2a/desig12.C: New test.
+	* g++.dg/cpp2a/desig13.C: New test.
+
+2019-03-04  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88530
+	* gcc.target/aarch64/options_set_10.c: Add native.
+
+2019-03-04  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR tree-optimization/89437
+	* gcc.dg/sinatan-1.c: Fix testcase.
+
+2019-03-04  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89572
+	* gcc.dg/torture/pr89572.c: New testcase.
+
+2018-03-04  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/89487
+	* gcc.dg/tree-ssa/pr89487.c: New test.
+
+2019-03-03  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/77583
+	* gfortran.dg/pr77583.f90: New test.
+
+2019-03-03  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/72714
+	* gfortran.dg/coarray_allocate_11.f90: New test.
+
+2019-03-02  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89516
+	* gfortran.dg/pr89492.f90: Adjust testcase.
+	* gfortran.dg/transfer_check_5.f90: New test.
+
+2019-03-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/71446
+	* g++.dg/cpp2a/desig10.C: New test.
+	* g++.dg/cpp2a/desig11.C: New test.
+	* g++.dg/ext/desig4.C: Expect 4 new errors.
+
+	PR target/89506
+	* gcc.dg/pr89506.c: New test.
+
+2019-03-01  Kito Cheng  <kito.cheng@gmail.com>
+	    Monk Chiang  <sh.chiang04@gmail.com>
+
+	* gcc.target/riscv/attribute-1.c: New.
+	* gcc.target/riscv/attribute-2.c: Likewise.
+	* gcc.target/riscv/attribute-3.c: Likewise.
+	* gcc.target/riscv/attribute-4.c: Likewise.
+	* gcc.target/riscv/attribute-5.c: Likewise.
+	* gcc.target/riscv/attribute-6.c: Likewise.
+	* gcc.target/riscv/attribute-7.c: Likewise.
+	* gcc.target/riscv/attribute-8.c: Likewise.
+	* gcc.target/riscv/attribute-9.c: Likewise.
+
+	* gcc.target/riscv/arch-1.c: New.
+	* gcc.target/riscv/arch-2.c: Likewise.
+	* gcc.target/riscv/arch-3.c: Likewise.
+	* gcc.target/riscv/arch-4.c: Likewise.
+
+2019-03-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89497
+	* g++.dg/tree-prof/devirt.C: Adjust also the ilp32
+	scan-tree-dump-times from dom3 to tracer pass.
+
+2019-03-01  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/ throughout: Delete dg-skip-if "do not override
+	-mcpu".  Use -mdejagnu-cpu= in dg-options instead of -mcpu=.
+
+2019-03-01  Alexander Monakov  <amonakov@ispras.ru>
+
+	PR rtl-optimization/85899
+	* gcc.dg/pr85899.c: New test.
+
+2019-03-01  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89537 - missing location for error with non-static member fn.
+	* g++.dg/diagnostic/member-fn-1.C: New test.
+
+	PR c++/89532 - ICE with incomplete type in decltype.
+	* g++.dg/cpp2a/nontype-class14.C: New test.
+
+2019-03-01  Jakub Jelinek  <jakub@redhat.com>
+
+	Implement P1002R1, Try-catch blocks in constexpr functions
+	PR c++/89513
+	* g++.dg/cpp2a/constexpr-try1.C: New test.
+	* g++.dg/cpp2a/constexpr-try2.C: New test.
+	* g++.dg/cpp2a/constexpr-try3.C: New test.
+	* g++.dg/cpp2a/constexpr-try4.C: New test.
+	* g++.dg/cpp2a/constexpr-try5.C: New test.
+	* g++.dg/cpp0x/constexpr-ctor10.C: Don't expect error for C++2a.
+
+2019-03-01  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR tree-optimization/89535
+	* gfortran.dg/vect/pr89535.f90: New test.
+
+2019-03-01  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89541
+	* gfortran.dg/pr89451.f90: New testcase.
+
+2019-03-01  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89497
+	* gcc.dg/tree-ssa/reassoc-43.c: Avoid false match in regex.
+	* g++.dg/tree-prof/devirt.C: Scan tracer dump for foldings
+	that happen now earlier.
+
+2019-02-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.c-torture/execute/20190228-1.c: New test.
+
+2019-02-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/87068 - missing diagnostic with fallthrough statement.
+	* c-c++-common/Wimplicit-fallthrough-37.c: New test.
+
+2019-02-28  Thomas Schwinge  <thomas@codesourcery.com>
+	    Cesar Philippidis  <cesar@codesourcery.com>
+
+	PR fortran/72741
+	PR fortran/89433
+	* gfortran.dg/goacc/routine-multiple-directives-1.f90: New file.
+	* gfortran.dg/goacc/routine-multiple-directives-2.f90: Likewise.
+
+	PR fortran/72741
+	* gfortran.dg/goacc/routine-multiple-lop-clauses-1.f90: New file.
+
+	PR fortran/72741
+	PR fortran/89433
+	* gfortran.dg/goacc/routine-6.f90: Update
+	* gfortran.dg/goacc/routine-intrinsic-1.f: New file.
+	* gfortran.dg/goacc/routine-intrinsic-2.f: Likewise.
+
+2019-02-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89521
+	* gcc.dg/pr89521-1.c: New test.
+	* gcc.dg/pr89521-2.c: New test.
+
+2019-02-28  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR testsuite/89441
+	* g++.dg/ipa/pr89009.C: Update symbol visibility.
+
+2019-02-28  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88530
+	* gcc.target/aarch64/options_set_10.c: New test.
+
+2019-02-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/89522
+	* g++.dg/cpp1y/lambda-generic-ice10.C: New.
+
+2019-02-28  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89525
+	* gcc.dg/pr89525.c: New test.
+
+	PR c/89520
+	* gcc.dg/pr89520-1.c: New test.
+	* gcc.dg/pr89520-2.c: New test.
+
+2019-02-27  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88857 - ICE with value-initialization of argument in template.
+	* g++.dg/cpp0x/initlist-value4.C: New test.
+
+2019-02-27  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89511 - ICE with using-declaration and unscoped enumerator.
+	* g++.dg/cpp0x/using-enum-3.C: New test.
+
+2019-02-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89280
+	* gcc.dg/torture/pr57147-2.c (SetNaClSwitchExpectations): Add static
+	keyword.
+
+2019-02-27  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/gimplefe-36.c: New testcase.
+
+2019-02-27  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/89488
+	* g++.dg/cpp0x/nsdmi15.C: New.
+
+2019-02-27  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/88987
+	* g++.dg/cpp0x/pr88987.C: New.
+
+2019-02-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89280
+	* gcc.c-torture/compile/pr89280.c: New test.
+	* gcc.dg/torture/pr57147-2.c: Don't expect a setjmp after noreturn
+	function.  Skip the test for -O0.
+
+2018-02-26  Steve Ellcey  <sellcey@marvell.com>
+
+	* gfortran.dg/simd-builtins-1.f90: Update for aarch64*-*-*.
+	* gfortran.dg/simd-builtins-2.f90: Ditto.
+	* gfortran.dg/simd-builtins-6.f90: Ditto.
+	* gfortran.dg/simd-builtins-8.f90: New test.
+	* gfortran.dg/simd-builtins-8.h: New header file.
+
+2019-02-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89507
+	* g++.dg/other/new2.C: New test.
+
+	PR tree-optimization/89500
+	* gcc.dg/pr89500.c: New test.
+	* gcc.dg/Wstringop-overflow-10.c: New test.
+	* gcc.dg/strlenopt-60.c: New test.
+
+2019-02-26  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89492
+	* gfortran.dg/pr89492.f90: New test.
+
+2019-02-26  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/89496
+	* gfortran.dg/altreturn_9_0.f90: New file.
+	* gfortran.dg/altreturn_9_1.f90: New file.
+
+2019-02-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89481
+	* g++.dg/cpp1y/constexpr-89481.C: New test.
+
+2019-02-26  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89505
+	* gcc.dg/torture/pr89505.c: New testcase.
+
+2019-02-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt77.adb: New test.
+	* gnat.dg/opt77_pkg.ad[sb]: New helper.
+
+2019-02-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89474
+	* gcc.target/i386/pr89474.c: New test.
+
+2019-02-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/77754
+	* gcc.c-torture/compile/pr77754-1.c: New test.
+	* gcc.c-torture/compile/pr77754-2.c: New test.
+	* gcc.c-torture/compile/pr77754-3.c: New test.
+	* gcc.c-torture/compile/pr77754-4.c: New test.
+	* gcc.c-torture/compile/pr77754-5.c: New test.
+	* gcc.c-torture/compile/pr77754-6.c: New test.
+
+2019-02-25  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88530
+	* gcc.target/aarch64/options_set_1.c: New test.
+	* gcc.target/aarch64/options_set_2.c: New test.
+	* gcc.target/aarch64/options_set_3.c: New test.
+	* gcc.target/aarch64/options_set_4.c: New test.
+	* gcc.target/aarch64/options_set_5.c: New test.
+	* gcc.target/aarch64/options_set_6.c: New test.
+	* gcc.target/aarch64/options_set_7.c: New test.
+	* gcc.target/aarch64/options_set_8.c: New test.
+	* gcc.target/aarch64/options_set_9.c: New test.
+
+2019-02-25  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.target/arm/simd/fp16fml_high.c (test_vfmlal_high_u32,
+	test_vfmlalq_high_u32, test_vfmlsl_high_u32, test_vfmlslq_high_u32):
+	Rename ....
+	(test_vfmlal_high_f16, test_vfmlalq_high_f16, test_vfmlsl_high_f16,
+	test_vfmlslq_high_f16): ... To this.
+	* gcc.target/arm/simd/fp16fml_lane_high.c (test_vfmlal_lane_high_u32,
+	tets_vfmlsl_lane_high_u32, test_vfmlal_laneq_high_u32,
+	test_vfmlsl_laneq_high_u32, test_vfmlalq_lane_high_u32,
+	test_vfmlslq_lane_high_u32, test_vfmlalq_laneq_high_u32,
+	test_vfmlslq_laneq_high_u32): Rename ...
+	(test_vfmlal_lane_high_f16, tets_vfmlsl_lane_high_f16,
+	test_vfmlal_laneq_high_f16, test_vfmlsl_laneq_high_f16,
+	test_vfmlalq_lane_high_f16, test_vfmlslq_lane_high_f16,
+	test_vfmlalq_laneq_high_f16, test_vfmlslq_laneq_high_f16): ... To this.
+	* gcc.target/arm/simd/fp16fml_lane_low.c (test_vfmlal_lane_low_u32,
+	test_vfmlsl_lane_low_u32, test_vfmlal_laneq_low_u32,
+	test_vfmlsl_laneq_low_u32, test_vfmlalq_lane_low_u32,
+	test_vfmlslq_lane_low_u32, test_vfmlalq_laneq_low_u32,
+	test_vfmlslq_laneq_low_u32): Rename ...
+	(test_vfmlal_lane_low_f16, test_vfmlsl_lane_low_f16,
+	test_vfmlal_laneq_low_f16, test_vfmlsl_laneq_low_f16,
+	test_vfmlalq_lane_low_f16, test_vfmlslq_lane_low_f16,
+	test_vfmlalq_laneq_low_f16, test_vfmlslq_laneq_low_f16): ... To this.
+	* gcc.target/arm/simd/fp16fml_low.c (test_vfmlal_low_u32,
+	test_vfmlalq_low_u32, test_vfmlsl_low_u32, test_vfmlslq_low_u32):
+	Rename ...
+	(test_vfmlal_low_f16, test_vfmlalq_low_f16, test_vfmlsl_low_f16,
+	test_vfmlslq_low_f16): ... To this.
+
+2019-02-25  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.target/aarch64/fp16_fmul_high.h (test_vfmlal_high_u32,
+	test_vfmlalq_high_u32, test_vfmlsl_high_u32, test_vfmlslq_high_u32):
+	Rename ...
+	(test_vfmlal_high_f16, test_vfmlalq_high_f16, test_vfmlsl_high_f16,
+	test_vfmlslq_high_f16): ... To this.
+	* gcc.target/aarch64/fp16_fmul_lane_high.h (test_vfmlal_lane_high_u32,
+	tets_vfmlsl_lane_high_u32, test_vfmlal_laneq_high_u32,
+	test_vfmlsl_laneq_high_u32, test_vfmlalq_lane_high_u32,
+	test_vfmlslq_lane_high_u32, test_vfmlalq_laneq_high_u32,
+	test_vfmlslq_laneq_high_u32): Rename ...
+	(test_vfmlal_lane_high_f16, tets_vfmlsl_lane_high_f16,
+	test_vfmlal_laneq_high_f16, test_vfmlsl_laneq_high_f16,
+	test_vfmlalq_lane_high_f16, test_vfmlslq_lane_high_f16,
+	test_vfmlalq_laneq_high_f16, test_vfmlslq_laneq_high_f16): ... To this.
+	* gcc.target/aarch64/fp16_fmul_lane_low.h (test_vfmlal_lane_low_u32,
+	test_vfmlsl_lane_low_u32, test_vfmlal_laneq_low_u32,
+	test_vfmlsl_laneq_low_u32, test_vfmlalq_lane_low_u32,
+	test_vfmlslq_lane_low_u32, test_vfmlalq_laneq_low_u32,
+	test_vfmlslq_laneq_low_u32): Rename ...
+	(test_vfmlal_lane_low_f16, test_vfmlsl_lane_low_f16,
+	test_vfmlal_laneq_low_f16, test_vfmlsl_laneq_low_f16,
+	test_vfmlalq_lane_low_f16, test_vfmlslq_lane_low_f16,
+	test_vfmlalq_laneq_low_f16, test_vfmlslq_laneq_low_f16): ... To this.
+	* gcc.target/aarch64/fp16_fmul_low.h (test_vfmlal_low_u32,
+	test_vfmlalq_low_u32, test_vfmlsl_low_u32, test_vfmlslq_low_u32):
+	Rename ...
+	(test_vfmlal_low_f16, test_vfmlalq_low_f16, test_vfmlsl_low_f16,
+	test_vfmlslq_low_f16): ... To This.
+	* lib/target-supports.exp
+	(check_effective_target_arm_fp16fml_neon_ok_nocache): Update test.
+
+2019-02-25  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR fortran/89282
+	* gfortran.dg/overload_3.f90: New test.
+
+2019-02-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89285
+	* g++.dg/cpp1y/constexpr-89285-2.C: New test.
+
+2019-02-25  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR libfortran/89274
+	* gfortran.dg/list_directed_large.f90: New test.
+
+2019-02-25  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89434
+	* gcc.c-torture/execute/pr89434.c: New test.
+
+	PR target/89438
+	* gcc.dg/pr89438.c: New test.
+
+2019-02-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84585
+	* g++.dg/cpp0x/pr84585.C: New.
+
+2019-02-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/89174
+	* gfortran.dg/allocate_with_mold_3.f90: New test.
+
+2019-02-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/87007
+	* gcc.target/i386/pr87007-1.c: Compile with -mfpmath=sse.
+	* gcc.target/i386/pr87007-2.c: Likewise.
+
+2019-02-24  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89266
+	PR fortran/88326
+	* gfortran.dg/pr89266.f90: New test.
+	* gfortran.dg/pr88326.f90: New test.
+
+2019-02-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89445
+	* gcc.target/i386/avx512f-pr89445.c: New test.
+
+2019-02-23  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/tree-ssa/builtin-sprintf-10.c: Cast remaining
+	wchar_t to wint_t to avoid a bogus -Wformat warning in
+	ILP32 (bug 77970).
+
+2019-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR testsuite/89476
+	* gfortran.dg/ISO_Fortran_binding_5.c: Include
+	"../../../libgfortran/ISO_Fortran_binding.h".
+	* gfortran.dg/ISO_Fortran_binding_6.c: Likewise.
+
+2019-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR driver/69471
+	* gcc.dg/pr69471-1.c: New test.
+	* gcc.dg/pr69471-2.c: Likewise.
+	* gcc.target/i386/pr69471-3.c: Likewise.
+
+2019-02-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/84387
+	* gfortran.dg/dtio_34.f90: New test.
+
+2019-02-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88294 - ICE with non-constant noexcept-specifier.
+	* g++.dg/cpp0x/noexcept34.C: New test.
+	* g++.dg/cpp0x/noexcept35.C: New test.
+
+	PR c++/89419
+	* g++.dg/cpp1y/lambda-generic-89419.C: New test.
+
+2019-02-23  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/88117
+	* gfortran.dg/deferred_character_32.f90 : New test
+
+2019-02-23  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/89385
+	* gfortran.dg/ISO_Fortran_binding_1.f90 : Correct test for
+	previously incorrect lbound for allocatable expressions. Also
+	correct stop values to avoid repetition.
+	* gfortran.dg/ISO_Fortran_binding_5.f90 : New test
+	* gfortran.dg/ISO_Fortran_binding_5.c : Support previous test.
+
+	PR fortran/89366
+	* gfortran.dg/ISO_Fortran_binding_6.f90 : New test
+	* gfortran.dg/ISO_Fortran_binding_6.c : Support previous test.
+	* gfortran.dg/pr32599.f03 : Set standard to F2008.
+
+2019-02-22  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/89390
+	* g++.dg/diagnostic/pr89390.C: Update expected location of error,
+	renaming to a multicharacter name, so that start != finish.  Add
+	tests for dtor locations.
+
+2019-02-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84676
+	* g++.dg/cpp0x/pr84676.C: New.
+
+2019-02-22  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/tree-ssa/builtin-sprintf-10.c: Cast wchar_t to wint_t
+	to avoid a bogus -Wformat warning in ILP32 (bug 77970).
+
+2019-02-22  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/83057
+	* gfortran.dg/newunit_6.f90: New test.
+
+2019-02-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89420 - ICE with CAST_EXPR in explicit-specifier.
+	* g++.dg/cpp2a/explicit14.C: New test.
+
+2019-02-22  Matthew Malcomson  <matthew.malcomson@arm.com>
+
+	PR target/89324
+	* gcc.dg/rtl/aarch64/subs_adds_sp.c: New test.
+	* gfortran.fortran-torture/compile/pr89324.f90: New test.
+
+2019-02-22  Martin Sebor  <msebor@redhat.com>
+
+	PR c/89425
+	* gcc.dg/Wabsolute-value.c: New test.
+
+	* gcc.dg/Wbuiltin-declaration-mismatch-12.c: New test.
+
+2019-02-22  H.J. Lu  <hongjiu.lu@intel.com>
+	    Hongtao Liu  <hongtao.liu@intel.com>
+	    Sunil K Pandey  <sunil.k.pandey@intel.com>
+
+	PR target/87007
+	* gcc.target/i386/pr87007-1.c: New test.
+	* gcc.target/i386/pr87007-2.c: Likewise.
+
+2019-02-22  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89440
+	* gcc.dg/vect/pr89440.c: New testcase.
+
+2019-02-22  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* lib/target-supports.exp (check_effective_target_offload_nvptx):
+	Remove.
+
+	PR fortran/72741
+	* gfortran.dg/goacc/classify-routine.f95: Adjust.
+
+	* c-c++-common/goacc/routine-5.c: Revert earlier changes.
+	* g++.dg/goacc/template.C: Likewise.
+
+	PR fortran/78027
+	* gfortran.dg/goacc/pr78027.f90: Add 'dg-additional-options "-Wno-hsa"'.
+
+2019-02-22  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/87609
+	* gcc.dg/torture/restrict-7.c: New testcase.
+
+2019-02-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89285
+	* g++.dg/ubsan/vptr-4.C: Expect reinterpret_cast errors.
+	* g++.dg/cpp1y/constexpr-84192.C (f2): Adjust expected diagnostics.
+	* g++.dg/cpp1y/constexpr-70265-2.C (foo): Adjust expected line of
+	diagnostics.
+	* g++.dg/cpp1y/constexpr-89285.C: New test.
+	* g++.dg/cpp0x/constexpr-arith-overflow.C (add, sub, mul): Ifdef out
+	for C++11.
+	(TEST_ADD, TEST_SUB, TEST_MUL): Define to Assert (true) for C++11.
+	* g++.dg/cpp0x/constexpr-arith-overflow2.C: New test.
+
+2019-02-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/87412
+	* gcc.target/i386/indirect-thunk-attr-14.c: Replace
+	-fcf-protection with -fcf-protection=branch.
+	* gcc.target/i386/indirect-thunk-attr-15.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-16.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-8.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-9.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-10.c: Likewise.
+
+2019-02-21  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* gcc.target/arm/pr88850-2.c: Block -mfloat-abi override.
+	* gcc.target/arm/pr88850.c: Use -mfloat-abi=softfp.
+
+2019-02-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/86119
+	* gfortran.dg/warn_conversion_11.f90: New test.
+
+2019-02-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/87412
+	* gcc.target/i386/pr87412-1.c: New file.
+	* gcc.target/i386/pr87412-2.c: Likewise.
+	* gcc.target/i386/pr87412-3.c: Likewise.
+	* gcc.target/i386/pr87412-4.c: Likewise.
+
+2019-02-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89403
+	* g++.dg/cpp0x/pr89403.C: New test.
+
+	PR c++/89405
+	* g++.dg/cpp1z/inline-var5.C: New test.
+
+	PR middle-end/89412
+	* gcc.c-torture/compile/pr89412.c: New test.
+
+2019-02-20  Jakub Jelinek  <jakub@redhat.com>
+	    David Malcolm  <dmalcolm@redhat.com>
+
+	PR middle-end/89091
+	* gcc.dg/torture/pr89091.c: New test.
+
+2019-02-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/88074
+	PR middle-end/89415
+	* gcc.dg/pr88074-2.c: New test.
+
+	PR c++/89336
+	* g++.dg/cpp1y/constexpr-89336-3.C: New test.
+
+2019-02-20  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c/89410
+	* gcc.dg/pr89410-1.c: New test.
+	* gcc.dg/pr89410-2.c: New test.
+
+2019-02-20  Pat Haugen  <pthaugen@us.ibm.com>
+
+	* lib/target-supports.exp (check_effective_target_vect_usad_char):
+	Add PowerPC support.
+	* gcc.dg/vect/slp-reduc-sad.c: Update scan string.
+	* gcc.dg/vect/vect-reduc-sad.c: Likewise.
+
+2019-02-20  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	PR target/86487
+	* gcc.target/arm/pr86487.c: New.
+
+2019-02-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/84536
+	* g++.dg/cpp1y/var-templ60.C: New.
+
+2019-02-20  Li Jia He  <helijia@linux.ibm.com>
+
+	PR target/88100
+	* gcc.target/powerpc/pr88100.c: New testcase.
+
+2019-02-19  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* gcc.target/arm/pr88850.c: Block -mfloat-abi override.
+
+2019-02-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/89384
+	* gfortran.dg/ISO_Fortran_binding_4.f90
+
+2019-02-19  Thomas Schwinge  <thomas@codesourcery.com>
+
+	PR c/87924
+	* c-c++-common/goacc/asyncwait-5.c: Remove XFAILs.
+	* gfortran.dg/goacc/asyncwait-5.f: Likewise.
+
+2019-02-19  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/88074
+	* gcc.dg/pr88074.c: New testcase.
+
+2019-02-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89303
+	* g++.dg/torture/pr89303.C: Move everything from std namespace to my
+	namespace.
+
+	PR c++/89387
+	* g++.dg/cpp0x/lambda/lambda-89387.C: New test.
+
+	PR c++/89391
+	* g++.dg/cpp0x/reinterpret_cast2.C: New test.
+
+	PR c++/89390
+	* g++.dg/diagnostic/pr89390.C: New test.
+
+2019-02-18  Sharon Dvir  <unapologtic@gmail.com>
+
+	* README: Fix typos.
+
+2019-02-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.dg/torture/pr89303.C (bad_weak_ptr): Rename to
+	bad_weak_ptr_.
+
+2019-02-18  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/87689
+	* gfortran.dg/lto/20091028-1_0.f90: Add -Wno-lto-type-mismatch to
+	options.
+	* gfortran.dg/lto/20091028-2_0.f90: Likewise.
+	* gfortran.dg/lto/pr87689_0.f: New file.
+	* gfortran.dg/lto/pr87689_1.f: New file.
+
+2019-02-18  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* g++.dg/wrappers/pr88680.C: Add -fno-short-enums.
+
+2019-02-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gdc.dg/dg.exp: Tabify.
+	* gdc.dg/lto/lto.exp: Likewise.
+	* gdc.test/gdc-test.exp: Likewise.
+	* lib/gdc-dg.exp: Likewise.
+	* lib/gdc.exp: Likewise.
+
+2019-02-18  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89296
+	* gcc.dg/uninit-pr89296.c: New testcase.
+
+2019-02-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89369
+	* gcc.c-torture/execute/pr89369.c: New test.
+	* gcc.target/s390/md/rXsbg_mode_sXl.c (rosbg_si_srl,
+	rxsbg_si_srl): Expect last 3 operands 32,63,62 rather than
+	34,63,62.
+
+2019-02-18  Martin Jambor  <mjambor@suse.cz>
+
+	PR tree-optimization/89209
+	* gcc.dg/tree-ssa/pr89209.c: New test.
+
+2019-02-18  Martin Liska  <mliska@suse.cz>
+
+	* gfortran.dg/simd-builtins-7.f90: New test.
+	* gfortran.dg/simd-builtins-7.h: New test.
+
+2019-02-17  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/88299
+	* gfortran.dg/pr88299.f90: New test.
+
+2019-02-17  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89077
+	* gfortran.dg/transfer_simplify_12.f90: New test.
+
+2019-02-17  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89217 - ICE with list-initialization in range-based for loop.
+	* g++.dg/cpp0x/range-for37.C: New test.
+
+	* g++.old-deja/g++.robertl/eb82.C: Tweak dg-error.
+
+	PR c++/89315
+	* g++.dg/cpp0x/initlist114.C: New test.
+
+	PR c++/89356
+	* g++.dg/abi/mangle68.C: New test.
+	* g++.dg/cpp0x/decltype69.C: New test.
+
+2019-02-16  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/88680
+	* g++.dg/wrappers/pr88680.C: New test.
+
+2019-02-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/71066
+	* gfortran.dg/coarray_data_1.f90: New test.
+
+2019-02-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* c-c++-common/patchable_function_entry-decl.c: Add -fno-pie on SPARC.
+	* c-c++-common/patchable_function_entry-default.c: Likewise.
+	* c-c++-common/patchable_function_entry-definition.c: Likewise.
+
+2019-02-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/66152
+	* gcc.target/i386/pr66152.c: New test.
+
+2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* g++.dg/asan/asan_oob_test.cc: Skip OOB_int on SPARC.
+	* g++.dg/asan/function-argument-3.C: Tweak for 32-bit SPARC.
+
+2019-02-15  Tamar Christina  <tamar.christina@arm.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_neon_softfp_fp16_ok_nocache): Drop non-fpu
+	checking alternative.
+
+2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.target/sparc/struct-ret-check-1.c: Add -fno-pie option.
+
+2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* c-c++-common/patchable_function_entry-decl.c: Do not run on Visium.
+	* c-c++-common/patchable_function_entry-default.c: Likewise.
+	* c-c++-common/patchable_function_entry-definition.c: Likewise.
+	* gcc.dg/tree-ssa/pr84859.c: Add -ftree-cselim switch.
+
+2019-02-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR other/69006
+	PR testsuite/88920
+	* lib/gcc-dg.exp: If llvm_binutils effective target, set
+	allow_blank_lines to 2 during initialization.
+	(dg-allow-blank-lines-in-output): Set allow_blank_lines to 1 only if
+	it was previously zero.
+	(gcc-dg-prune): Don't check for llvm_binutils effective target here.
+	Clear allow_blank_lines afterwards whenever it was 1.
+	* gdc.test/gdc-test.exp (dmd2dg): Don't call
+	dg-allow-blank-lines-in-output here.
+	(gdc-do-test): Set allow_blank_lines to 3 if it is 0 before running
+	the tests and restore it back at the end.
+
+	* c-c++-common/ubsan/opts-1.c: New test.
+	* c-c++-common/ubsan/opts-2.c: New test.
+	* c-c++-common/ubsan/opts-3.c: New test.
+	* c-c++-common/ubsan/opts-4.c: New test.
+
+2019-02-15  Richard Biener  <rguenther@suse.de>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89278
+	* gcc.dg/pr89278.c: New test.
+
+2019-02-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89340
+	* gcc.dg/pr89340.c: New test.
+	* gcc.dg/torture/pr57036-2.c (jpgDecode_convert): Expect a warning
+	that leaf attribute on nested function is useless.
+
+	PR other/89342
+	* gcc.dg/pr89342.c: New test.
+
+2019-02-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89354
+	* gcc.dg/pr89354.c: New test.
+
+2019-02-14  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/ssse3-pabsb.c: Re-enable 64-bit form on AVX targets.
+	* gcc.target/i386/ssse3-pabsd.c: Ditto.
+	* gcc.target/i386/ssse3-pabsw.c: Ditto.
+	* gcc.target/i386/ssse3-palignr.c: Ditto.
+	* gcc.target/i386/ssse3-phaddd.c: Ditto.
+	* gcc.target/i386/ssse3-phaddsw.c: Ditto.
+	* gcc.target/i386/ssse3-phaddw.c: Ditto.
+	* gcc.target/i386/ssse3-phsubd.c: Ditto.
+	* gcc.target/i386/ssse3-phsubsw.c: Ditto.
+	* gcc.target/i386/ssse3-phsubw.c: Ditto.
+	* gcc.target/i386/ssse3-pmaddubsw.c: Ditto.
+	* gcc.target/i386/ssse3-pmulhrsw.c: Ditto.
+	* gcc.target/i386/ssse3-pshufb.c: Ditto.
+	* gcc.target/i386/ssse3-psignb.c: Ditto.
+	* gcc.target/i386/ssse3-psignd.c: Ditto.
+	* gcc.target/i386/ssse3-psignw.c: Ditto.
+
+2018-02-14  Steve Ellcey  <sellcey@marvell.com>
+
+	* gcc.target/aarch64/pcs_attribute.c: New test.
+
+2019-02-14  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/88248
+	* gfortran.dg/pr88248.f90: New test.
+	* gfortran.dg/f2018_obs.f90: Updated test.
+
+2019-02-14  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.target/arm/pr88850.c: change options to additional option.
+
+2019-02-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR d/87864
+	* lib/gdc.exp (gdc_link_flags): Add path to drtbegin.o/drtend.o if
+	present.
+
+2019-02-14  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88850
+	* gcc.target/arm/pr88850-2.c: New test.
+	* lib/target-supports.exp
+	(check_effective_target_arm_neon_softfp_fp16_ok_nocache,
+	check_effective_target_arm_neon_softfp_fp16_ok,
+	add_options_for_arm_neon_softfp_fp16): New.
+
+2019-02-14  Matthew Malcomson  <matthew.malcomson@arm.com>
+
+	* gcc.dg/rtl/arm/ldrd-peepholes.c: Restrict testcase.
+	* lib/target-supports.exp: Add procedure to check for ldrd.
+
+2019-02-14  Cesar Philippidis  <cesar@codesourcery.com>
+
+	PR fortran/72715
+	* gfortran.dg/goacc/loop-3-2.f95: Error on do concurrent loops.
+	* gfortran.dg/goacc/loop-3.f95: Likewise.
+	* gfortran.dg/goacc/pr72715.f90: New test.
+
+2019-02-14  Martin Liska  <mliska@suse.cz>
+
+	PR rtl-optimization/89242
+	* g++.dg/pr89242.C: New test.
+
+2019-02-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89314
+	* gcc.dg/pr89314.c: New test.
+
+	PR middle-end/89284
+	* gcc.dg/ubsan/pr89284.c: New test.
+
+2019-02-13  Ian Lance Taylor  <iant@golang.org>
+
+	* gcc.dg/func-attr-1.c: New test.
+
+2019-02-13  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/sse2-init-v2di-2.c (dg-final): Update scan string.
+
+2019-02-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89297 - ICE with OVERLOAD in template.
+	* g++.dg/cpp0x/initlist113.C: New test.
+
+2019-02-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR c++/86379
+	* g++.dg/cpp0x/pr86379.C: New.
+
+	PR c++/87322
+	* g++.dg/cpp1y/pr87322.C: New.
+	* g++.dg/cpp0x/lambda/lambda-variadic5.C: Test that we
+	instantiate the expected number of lambda functions.
+
+2019-02-13  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/77304
+	* g++.dg/cpp2a/nontype-class13.C: New test.
+
+2019-02-13  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR target/89190
+	* gcc.target/arm/pr89190.c: New test.
+
+2019-02-13  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/89036
+	* g++.dg/concepts/pr89036.C: New test.
+
+2019-02-13  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88847
+	* gcc.target/aarch64/sve/pr88847.c: New test.
+
+2019-02-13  Jonathan Wakely  <jwakely@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89303
+	* g++.dg/torture/pr89303.C: New test.
+
+2019-02-13  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/88986
+	* g++.dg/cpp1z/using4.C: New.
+	* g++.dg/cpp1z/using5.C: Likewise.
+	* g++.dg/cpp1z/using6.C: Likewise.
+
+2019-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89290
+	* gcc.target/i386/pr89290.c: New test.
+
+2019-01-23  Xuepeng Guo  <xuepeng.guo@intel.com>
+
+	* gcc.target/i386/enqcmd.c: New test.
+	* gcc.target/i386/enqcmds.c: Likewise.
+	* g++.dg/other/i386-2.C: Add -menqcmd.
+	* g++.dg/other/i386-3.C: Likewise.
+	* gcc.target/i386/sse-12.c: Likewise.
+	* gcc.target/i386/sse-13.c: Likewise.
+	* gcc.target/i386/sse-14.c: Likewise.
+	* gcc.target/i386/sse-23.c: Likewise.
+
+2019-01-23  Xiong Hu Luo  <luoxhu@linux.vnet.ibm.com>
+
+	* gcc.target/powerpc/crypto-builtin-1.c
+	(crypto1_be, crypto2_be, crypto3_be, crypto4_be, crypto5_be):
+	New testcases.
+
+2019-02-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/89229
+	* gcc.target/i386/pr89229-1.c: New test.
+
+2019-02-12  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	PR target/89233
+	* gcc.target/s390/pr89233.c: New test.
+
+2018-01-12  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/vec-sld-modulo.c: Require p8vector_hw.
+	* gcc.target/powerpc/vec-srad-modulo.c: Likewise.
+	* gcc.target/powerpc/vec-srd-modulo.c: Likewise.
+
+2019-02-12  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89253
+	* gfortran.dg/pr89253.f: New testcase.
+
+2019-02-11  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89212 - ICE converting nullptr to pointer-to-member-function.
+	* g++.dg/cpp0x/nullptr40.C: New test.
+	* g++.dg/cpp0x/nullptr41.C: New test.
+
+2019-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88977
+	* g++.dg/cpp2a/is-constant-evaluated7.C: New test.
+
+2019-02-12  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR tree-optimization/86637
+	* gcc.c-torture/compile/pr86637-2.c: Test pthread and graphite target.
+
+2019-02-11  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/88771
+	* gcc.dg/Wstringop-overflow-8.c: New test.
+	* gcc.dg/Wstringop-overflow-9.c: New test.
+	* gcc.dg/Warray-bounds-40.c: New test.
+	* gcc.dg/builtin-stpncpy.c: Adjust.
+	* gcc.dg/builtin-stringop-chk-4.c: Adjust.
+	* g++.dg/opt/memcpy1.C: Adjust.
+
+2019-02-11  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/87996
+	* c-c++-common/array-5.c: New test.
+	* c-c++-common/pr68107.c: Adjust text of diagnostics.
+	* g++.dg/init/new38.C: Same.
+	* g++.dg/init/new43.C: Same.
+	* g++.dg/init/new44.C: Same.
+	* g++.dg/init/new46.C: Same.
+	* g++.dg/other/large-size-array.C: Same.
+	* g++.dg/other/new-size-type.C: Same.
+	* g++.dg/template/array30.C: Same.
+	* g++.dg/template/array32.C: New test.
+	* g++.dg/template/dependent-name3.C: Adjust.
+	* gcc.dg/large-size-array-3.c: Same.
+	* gcc.dg/large-size-array-5.c: Same.
+	* gcc.dg/large-size-array.c: Same.
+	* g++.old-deja/g++.brendan/array1.C: Same.
+	* g++.old-deja/g++.mike/p6149.C: Same.
+
+2019-02-11  Martin Sebor  <msebor@redhat.com>
+
+	* gcc.dg/tree-prof/inliner-1.c: Correct comments.
+
+2019-02-11  Tamar Christina  <tamar.christina@arm.com>
+
+	PR middle-end/88560
+	* gcc.target/arm/armv8_2-fp16-move-1.c: Update assembler scans.
+	* gcc.target/arm/fp16-aapcs-3.c: Likewise.
+	* gcc.target/arm/fp16-aapcs-1.c: Likewise.
+
+2019-02-11  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	* gcc.target/powerpc/vec-sld-modulo.c: New.
+	* gcc.target/powerpc/vec-srad-modulo.c: New.
+	* gcc.target/powerpc/vec-srd-modulo.c: New.
+
+2019-02-11  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/89009
+	* g++.dg/ipa/pr89009.C: New test.
+
+2019-02-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/71723
+	* gfortran.dg/pointer_init_2.f90: Adjust error messages.
+	* gfortran.dg/pointer_init_6.f90: Likewise.
+	* gfortran.dg/pointer_init_9.f90: New test.
+
+2019-02-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/67679
+	* gfortran.dg/warn_undefined_1.f90: New test.o
+
+2019-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89268
+	* gcc.dg/vect/pr89268.c: New test.
+
+2019-02-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gnat.dg/lto19.adb: Remove dg-excess-errors.
+
+2019-02-09  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89077
+	* gfortran.dg/substr_simplify.f90: New test.
+
+2019-02-09  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/88711
+	* gfortran.dg/pr79966.f90: Xfail everwyhere.
+
+2019-02-09  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/89200
+	* gfortran.dg/array_reference_2.f90 : New test.
+
+2019-02-09  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/89246
+	* gcc.dg/gomp/pr89246-1.c: New test.
+	* gcc.dg/gomp/pr89246-2.c: New test.
+
+2019-02-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88739
+	* gcc.c-torture/execute/pr88739.c: New test.
+
+2019-02-08  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	PR testsuite/89258
+	* gcc.dg/tree-ssa/pr80887.c: Require int32plus.
+
+2019-02-08  Robin Dapp  <rdapp@linux.ibm.com>
+
+	* gcc.target/s390/vector/vec-copysign-execute.c: New test.
+	* gcc.target/s390/vector/vec-copysign.c: New test.
+
+2019-02-08  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89247
+	* gcc.dg/torture/pr89247.c: New testcase.
+
+2019-02-08  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* gcc.target/s390/jump-label.c: New test.
+
+2019-02-08  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/89250
+	* gcc.dg/vect/vect-24.c: Remove XFAIL on vect_condition targets.
+
+2019-02-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/89234
+	* g++.dg/ubsan/pr89234.C: New test.
+
+2019-02-08  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/89223
+	* gcc.dg/torture/pr89223.c: New testcase.
+
+2019-02-07  David Malcolm  <dmalcolm@redhat.com>
+
+	PR tree-optimization/86637
+	PR tree-optimization/89235
+	* gcc.c-torture/compile/pr86637-1.c: New test.
+	* gcc.c-torture/compile/pr86637-2.c: New test.
+	* gcc.c-torture/compile/pr86637-3.c: New test.
+	* gcc.c-torture/compile/pr89235.c: New test.
+
+2019-02-07  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/abd_1.c: New test.
+	* gcc.dg/sabd_1.c: Likewise.
+
+2019-02-07  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR fortran/52789
+	* gfortran.dg/wunused-parameter_2.f90: New test.
+
+2019-02-07  Matthew Malcomson  <matthew.malcomson@arm.com>
+
+	* gcc.dg/rtl/arm/ldrd-peepholes.c: Only run on arm
+
+2019-02-07  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.target/s390/zvector/xl-xst-align-1.c: New test.
+	* gcc.target/s390/zvector/xl-xst-align-2.c: New test.
+
+2019-02-07  Matthew Malcomson  <matthew.malcomson@arm.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR bootstrap/88714
+	* gcc.c-torture/execute/pr88714.c: New test.
+	* gcc.dg/rtl/arm/ldrd-peepholes.c: New test.
+
+2019-02-07  Tamar Christina  <tamar.christina@arm.com>
+
+	PR/target 88850
+	* gcc.target/arm/pr88850.c: New test.
+
+2019-02-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR c++/86218
+	* g++.dg/cpp0x/pr86218.C: New.
+
+2019-02-06  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/89225
+	* gcc.target/powerpc/pr89225.c: New.
+
+2019-02-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt76.adb: New test.
+
+2019-02-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/71860
+	* gfortran.dg/null_10.f90: New test.
+
+2019-02-06  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/71302
+	* g++.dg/cpp0x/Wzero-as-null-pointer-constant-1.C: Add expected
+	column numbers to dg-warning directives where they are correct.
+	* g++.dg/warn/Wzero-as-null-pointer-constant-5.C: Likewise.
+	* g++.dg/warn/Wzero-as-null-pointer-constant-7.C: Likewise.
+	* g++.dg/warn/Wzero-as-null-pointer-constant-8.C: New test.
+
+2019-02-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR debug/87451
+	* gcc.dg/debug/dwarf2/inline5.c: Allow for non-comment before
+	"(DIE (0x[0-9a-f]*) DW_TAG_variable".
+	xfail scan-assembler-not with Solaris as.
+
+2019-02-06  Bill Seurer  <seurer@linux.vnet.ibm.com>
+
+	* gcc.target/powerpc/vsx-vector-6.p7.c: Update instruction
+	counts and target.
+	* gcc.target/powerpc/vsx-vector-6.p8.c: Update instruction
+	counts and target.
+	* gcc.target/powerpc/vsx-vector-6.p9.c: Update instruction
+	counts and target.
+
+2019-02-06  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89182
+	* gfortran.dg/graphite/pr89182.f90: New testcase.
+
+2019-02-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89211
+	* gcc.dg/pr89211.c: New test.
+
+	PR middle-end/89210
+	* c-c++-common/builtin-convertvector-2.c: New test.
+
+2019-02-05  Nikhil Benesch  <nikhil.benesch@gmail.com>
+
+	PR go/89019
+	* lib/go-torture.exp: Test compiling with -flto.
+
+2019-02-06  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/88584
+	* gcc.dg/redecl-18.c: New test.
+
+2019-02-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89187
+	* g++.dg/opt/pr89187.C: New test.
+
+2019-02-05  Andrea Corallo  <andrea.corallo@arm.com>
+
+	* jit.dg/add-driver-options-testlib.c: Add support file for
+	test-add-driver-options.c testcase.
+	* jit.dg/all-non-failing-tests.h: Add note about
+	test-add-driver-options.c
+	* jit.dg/jit.exp (jit-dg-test): Update to support
+	add-driver-options-testlib.c compilation.
+	* jit.dg/test-add-driver-options.c: New testcase.
+
+2019-02-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/11304
+	* gcc.target/i386/call-1.c (set_eax): Add "eax" clobber.
+	* gcc.target/i386/call-2.c: New test.
+
+2019-02-05  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89158 - by-value capture of constexpr variable broken.
+	* g++.dg/cpp0x/lambda/lambda-89158.C: New test.
+
+2019-02-05  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.dg/vect/pr84711.c: Use -Wno-psabi.
+
+2019-02-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/powerpc/vec-extract-sint128-1.c: Require int128 effective
+	target.
+	* gcc.target/powerpc/vec-extract-uint128-1.c: Likewise.
+
+	PR target/89188
+	* g++.dg/opt/pr89188.C: New test.
+
+	PR rtl-optimization/89195
+	* gcc.c-torture/execute/pr89195.c: New test.
+
+2019-02-05  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	* gcc.target/powerpc/vec-extract-slong-1.c: Require p8 execution
+	hardware.
+	* gcc.target/powerpc/vec-extract-schar-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-sint128-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-sshort-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-ulong-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-uchar-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-sint-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-uint128-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-ushort-1.c: Likewise.
+	* gcc.target/powerpc/vec-extract-uint-1.c: Likewise.
+
+2019-02-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89186
+	* g++.dg/ext/vector36.C: New test.
+
+2019-02-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR c++/87770
+	* g++.dg/pr87770.C: New.
+
+2019-02-04  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/89077
+	* gfortran.dg/pr89077.f90: New test.
+
+2019-02-04  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/88985
+	* gcc.dg/ipa/pr88985.c: New test.
+
+2019-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/debug/dwarf2/inline5.c: Handle also @, ; or | comment
+	characters or extra spaces after the comment character.
+
+2019-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/torture/alias-1.C: New test.
+
+2019-02-03  Martin Sebor  <msebor@redhat.com>
+
+	PR c/69661
+	* c-c++-common/Wsequence-point-2.c: New test.
+
+	PR c++/44648
+	* g++.dg/warn/Wunused-var-35.C: New test.
+
+2019-02-03  Richard Biener  <rguenther@suse.de>
+
+	PR debug/87295
+	* g++.dg/debug/dwarf2/pr87295.C: New testcase.
+
+2019-02-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/88298
+	* gfortran.dg/warn_conversion_10.f90: New test.
+
+2019-02-02  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/88393
+	* gfortran.dg/alloc_comp_assign_16.f03 : New test.
+
+2019-02-02  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/88980
+	* gfortran.dg/realloc_on_assign_32.f90 : New test.
+
+2019-02-02  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/88685
+	* gfortran.dg/pointer_array_component_3.f90 : New test.
+
+2019-02-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/87887
+	* gcc.dg/gomp/pr87887-1.c: New test.
+	* gcc.dg/gomp/pr87887-2.c: New test.
+
+2019-02-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/83246
+	PR fortran/89084
+	* gfortran.dg/pr89084.f90: New test.
+	* gfortran.dg/lto/pr89084_0.f90: New test.
+	* gfortran.dg/pr83246.f90: New test.
+
+2019-02-01  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88325 - ICE with invalid out-of-line template member definition.
+	* g++.dg/cpp2a/typename14.C: New test.
+
+2019-02-01  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/88597
+	* gcc.dg/torture/pr88597.c: New testcase.
+
+2019-02-01  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/85497
+	* gcc.dg/graphite/pr85497.c: New testcase.
+
+2019-02-01  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/87451
+	* gcc.dg/debug/dwarf2/inline5.c: Allow more comment variants.
+
+2019-02-01  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89143
+	* gcc.dg/tree-ssa/vrp121.c: New test.
+
+	PR tree-optimization/88107
+	* gcc.dg/gomp/pr88107.c: New test.
+
+	PR c++/87175
+	* g++.dg/ext/attrib57.C: New test.
+
+2018-02-01  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	PR tree-optimization/88932
+	* gfortran.dg/pr88932.f90: New test.
+
+2019-01-31  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88983 - ICE with switch in constexpr function.
+	* g++.dg/cpp1y/constexpr-88983.C: New test.
+
+2019-01-31  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/88669
+	* gfortran.dg/contiguous_9.f90: New test.
+
+2019-01-31  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89083, c++/80864 - ICE with list initialization in template.
+	* g++.dg/cpp0x/initlist107.C: New test.
+	* g++.dg/cpp0x/initlist108.C: New test.
+	* g++.dg/cpp0x/initlist109.C: New test.
+	* g++.dg/cpp0x/initlist110.C: New test.
+	* g++.dg/cpp0x/initlist111.C: New test.
+	* g++.dg/cpp0x/initlist112.C: New test.
+	* g++.dg/init/ptrfn4.C: New test.
+
+2019-01-31  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c/89122
+	* g++.dg/spellcheck-stdlib.C (test_FLT_MAX): New test.
+	* gcc.dg/spellcheck-stdlib.c (test_FLT_MAX): New test.
+
+2019-01-31  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89135
+	* gcc.dg/torture/pr89135.c: New testcase.
+
+2019-01-31  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/89124
+	* c-c++-common/asan/pr89124.c: New test.
+
+2019-01-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/52564
+	* gfortran.dg/print_2.f90: New test.
+
+2019-01-30  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/87246
+	* gcc.target/i386/pr87246.c: New.
+
+2019-01-30  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/89119 - ICE with value-initialization in template.
+	* g++.dg/cpp0x/initlist-value3.C: New test.
+
+2019-01-30  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	* gcc.target/powerpc/vec-extract-schar-1.c: New test.
+	* gcc.target/powerpc/vec-extract-sint-1.c: New test.
+	* gcc.target/powerpc/vec-extract-sint128-1.c: New test.
+	* gcc.target/powerpc/vec-extract-slong-1.c: New test.
+	* gcc.target/powerpc/vec-extract-sshort-1.c: New test.
+	* gcc.target/powerpc/vec-extract-uchar-1.c: New test.
+	* gcc.target/powerpc/vec-extract-uint-1.c: New test.
+	* gcc.target/powerpc/vec-extract-uint128-1.c: New test.
+	* gcc.target/powerpc/vec-extract-ulong-1.c: New test.
+	* gcc.target/powerpc/vec-extract-ushort-1.c: New test.
+
+2019-01-30  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89111
+	* gcc.dg/torture/pr89111.c: New testcase.
+
+2019-01-30  Andrew Stubbs  <ams@codesourcery.com>
+
+	PR testsuite/88920
+	* lib/target-supports.exp: Cache result.
+
+2019-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/89105
+	* g++.target/i386/pr89105.C: New test.
+
+	PR c/89061
+	* gcc.dg/pr89061.c: New test.
+
+2019-01-29  Martin Sebor  <msebor@redhat.com>
+
+	PR c/88956
+	* gcc.dg/Warray-bounds-39.c: New test.
+
+2019-01-29  Marek Polacek  <polacek@redhat.com>
+
+	PR testsuite/89110
+	* g++.dg/other/nontype-1.C: Expect error in all modes.
+	* g++.dg/parse/crash13.C: Likewise.
+	* g++.dg/parse/error36.C: Likewise.
+	* g++.dg/template/error29.C: Likewise.
+
+2019-01-29  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/57048
+	* gfortran.dg/c_funptr_1.f90: New file.
+	* gfortran.dg/c_funptr_1_mod.f90: New file.
+
+2019-01-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/66676
+	PR ipa/89104
+	* gcc.dg/gomp/pr89104.c: New test.
+
+2019-01-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gdc.dg/pr89042a.d: Mark as compile test.
+	* gdc.dg/pr89042b.d: Likewise.
+
+2019-01-29  Richard Biener  <rguenther@suse.de>
+
+	PR debug/87295
+	* g++.dg/lto/pr87295_0.C: New testcase.
+
+2019-01-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/89045
+	* gcc.dg/pr89045.c: New test.
+
+	PR c/86125
+	* gcc.dg/Wbuiltin-declaration-mismatch-7.c: Guard testcase for
+	lp64, ilp32 and llp64 only.
+	(fputs): Use unsigned long long instead of size_t for return type.
+	(vfprintf, vfscanf): Accept arbitrary target specific type for
+	va_list.
+
+2019-01-28  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88358 - name wrongly treated as type.
+	* g++.dg/cpp2a/typename1.C: Add dg-error.
+	* g++.dg/cpp2a/typename13.C: New test.
+	* g++.dg/cpp2a/typename6.C: Make a function name qualified.
+	Add typename.
+
+2019-01-28  Marek Polacek  <polacek@redhat.com>
+
+	* g++.dg/cpp0x/enum37.C: Add dg-error.
+
+2019-01-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* c-c++-common/Waddress-of-packed-member-1.c: Extended test case.
+	* c-c++-common/Waddress-of-packed-member-2.c: New test case.
+
+2019-01-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* gcc.dg/Wattribute-alias.c: Add test for #pragma GCC diagnostic ignored
+	"-Wattribute-alias".
+
+2019-01-27  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR fortran/70696
+	* gfortran.dg/coarray/event_3.f0: Add save attribue to x.
+
+2019-01-27  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88815 - narrowing conversion lost in decltype.
+	PR c++/78244 - narrowing conversion in template not detected.
+	* g++.dg/cpp0x/Wnarrowing15.C: New test.
+	* g++.dg/cpp0x/Wnarrowing16.C: New test.
+	* g++.dg/cpp0x/constexpr-decltype3.C: New test.
+	* g++.dg/cpp1y/Wnarrowing1.C: New test.
+
+	PR c++/89024 - ICE with incomplete enum type.
+	* g++.dg/cpp0x/enum37.C: New test.
+
+2019-01-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt75.adb: New test.
+	* gnat.dg/opt75_pkg.ad[sb]: New helper.
+
+2019-01-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/87214
+	* gcc.target/i386/avx512vl-pr87214-1.c: New test.
+	* gcc.target/i386/avx512vl-pr87214-2.c: New test.
+
+2019-01-26  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/88933
+	* gfortran.dg/gomp/pr88933.f90: New test.
+
+2019-01-26  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/89042
+	* gdc.dg/pr89042a.d: New test.
+	* gdc.dg/pr89042b.d: New test.
+
+2019-01-26  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/57553
+	* gfortran.dg/pr57553.f90: New test.
+
+2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/array34.adb: New test.
+
+2019-01-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR preprocessor/88974
+	* c-c++-common/cpp/pr88974.c: New test.
+
+2019-01-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/88969
+	* g++.dg/cpp2a/destroying-delete2.C: New.
+	* g++.dg/cpp2a/destroying-delete3.C: Likewise.
+
+2019-01-25  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/85780
+	* gfortran.dg/pr85780.f90: Update testcase for error message.
+
+2019-01-25  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/88469
+	* gcc.target/aarch64/aapcs64/test_align-10.c: New test.
+	* gcc.target/aarch64/aapcs64/test_align-11.c: New test.
+	* gcc.target/aarch64/aapcs64/test_align-12.c: New test.
+
+2019-01-25  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR middle-end/89037
+	* gcc.dg/pr89037.c: New test.
+
+2019-01-25  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* lib/target-supports.exp (check_effective_target_fenv): New.
+	* gcc.dg/torture/fp-int-convert-float128-timode-3.c: Add missing
+	fenv effective target.
+	* gcc.dg/torture/fp-int-convert-timode-1.c: Likewise.
+	* gcc.dg/torture/fp-int-convert-timode-2.c: Likewise.
+	* gcc.dg/torture/fp-int-convert-timode-3.c: Likewise.
+	* gcc.dg/torture/fp-int-convert-timode-4.c: Likewise.
+
+2019-01-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/86865
+	* gcc.dg/graphite/pr86865.c: New testcase.
+	* gcc.dg/graphite/pr69728.c: XFAIL.
+	* gcc.dg/graphite/scop-21.c: Likewise.
+
+2019-01-24  Martin Sebor  <msebor@redhat.com>
+
+	PR c/86125
+	PR c/88886
+	PR middle-end/86308
+	* gcc.dg/Wbuiltin-declaration-mismatch-6.c: New test.
+	* gcc.dg/Wbuiltin-declaration-mismatch-7.c: New test.
+	* gcc.dg/Wbuiltin-declaration-mismatch-8.c: New test.
+	* gcc.dg/Wbuiltin-declaration-mismatch-9.c: New test.
+	* gcc.dg/Wbuiltin-declaration-mismatch-10.c: New test.
+	* gcc.dg/builtins-69.c: New test.
+	* gcc.dg/Wint-conversion-2.c: Add expected warning.
+	* gcc.c-torture/execute/eeprof-1.c: Adjust function signatures.
+
+2019-01-24  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR rtl-optimization/88948
+	* gcc.target/i386/pr88948.c: New test.
+
+2019-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/89006
+	* g++.dg/debug/pr89006.C: New test.
+
+	PR middle-end/89015
+	* gcc.dg/gomp/pr89015.c: New test.
+
+	PR c++/88976
+	* c-c++-common/gomp/cancel-2.c: New test.
+	* gcc.dg/gomp/cancel-1.c: New test.
+	* g++.dg/gomp/cancel-1.C: New test.
+	* g++.dg/gomp/cancel-2.C: New test.
+	* g++.dg/gomp/cancel-3.C: New test.
+
+2019-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/89027
+	* gfortran.dg/gomp/pr89027.f90: New test.
+
+2019-01-24  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/88929
+	* gfortran.dg/ISO_Fortran_binding_3.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_3.c: Subsidiary source.
+
+2019-01-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libgcc/88931
+	* gcc.dg/torture/fp-int-convert-timode-1.c: New test.
+	* gcc.dg/torture/fp-int-convert-timode-2.c: Likewise.
+	* gcc.dg/torture/fp-int-convert-timode-3.c: Likewise.
+	* gcc.dg/torture/fp-int-convert-timode-4.c: Likewise.
+
+2019-01-23  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/88998
+	* g++.target/i386/pr88998.c: New test.
+
+2019-01-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88757 - qualified name treated wrongly as type.
+	* g++.dg/cpp0x/dependent2.C: New test.
+	* g++.dg/cpp2a/typename10.C: Remove dg-error.
+	* g++.dg/cpp2a/typename12.C: New test.
+	* g++.dg/template/static30.C: Remove dg-error.
+
+2019-01-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/44715
+	* c-c++-common/pr44715.c: New test.
+
+	PR c++/88984
+	* c-c++-common/pr88984.c: New test.
+
+2019-01-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89008
+	* gcc.dg/torture/pr89008.c: New testcase.
+
+2019-01-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/opt4.ads: New test.
+
+2019-01-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88964
+	* gfortran.dg/pr88964.f90: New test.
+
+2019-01-22  Martin Sebor  <msebor@redhat.com>
+
+	* c-c++-common/Warray-bounds-2.c: Include headers only if they exist.
+	* c-c++-common/Warray-bounds-3.c: Make xfails conditional on target
+	non_strict_align.
+	* c-c++-common/Wrestrict-2.c: Include headers only if they exist.
+	* c-c++-common/Wrestrict.c: Make xfails conditional on target
+	non_strict_align.
+
+2018-01-22  Steve Ellcey  <sellcey@marvell.com>
+
+	* c-c++-common/gomp/pr60823-1.c: Change aarch64-*-* target
+	to aarch64*-*-* target.
+	* c-c++-common/gomp/pr60823-3.c: Ditto.
+	* g++.dg/gomp/declare-simd-1.C: Ditto.
+	* g++.dg/gomp/declare-simd-3.C: Ditto.
+	* g++.dg/gomp/declare-simd-4.C: Ditto.
+	* g++.dg/gomp/declare-simd-7.C: Ditto.
+	* g++.dg/gomp/pr88182.C: Ditto.
+	* gcc.dg/gomp/declare-simd-1.c: Ditto.
+	* gcc.dg/gomp/declare-simd-3.c: Ditto.
+	* gcc.dg/gomp/pr59669-2.c: Ditto.
+	* gcc.dg/gomp/pr87895-1.c: Ditto.
+	* gcc.dg/gomp/simd-clones-2.c: Ditto.
+	* gfortran.dg/gomp/declare-simd-2.f90: Ditto.
+	* gfortran.dg/gomp/pr79154-1.f90: Ditto.
+	* gfortran.dg/gomp/pr83977.f90: Ditto.
+
+2019-01-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/88965
+	* gcc.target/powerpc/pr88965.c: New test.
+
+	PR middle-end/88968
+	* c-c++-common/gomp/atomic-23.c: New test.
+
+2019-01-22  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/88579
+	* gfortran.dg/power_8.f90: New test.
+
+2019-01-22  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* g++.dg/lto/pr87906_0.C: Add dg-require-effective-target fpic.
+	* g++.dg/vec-init-1.C: Likewise.
+	* gcc.dg/pr87793.c: Likewise.
+
+2019-01-22  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* g++.dg/cpp0x/pr86397-1.C: Add -fdelete-null-pointer-checks.
+	* g++.dg/cpp0x/pr86397-2.C: Likewise.
+
+2019-01-22  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/88469
+	* gcc.target/arm/aapcs/bitfield2.c: New test.
+	* gcc.target/arm/aapcs/bitfield3.c: New test.
+
+2019-01-22  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	PR rtl-optimization/87763
+	* gcc.dg/vect/vect-nop-move.c: Fix testcase on AArch64.
+
+2019-01-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/88954
+	* gcc.target/i386/pr88954-1.c: New test.
+	* gcc.target/i386/pr88954-2.c: Likewise.
+
+2019-01-22  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/88469
+	* gcc.target/arm/aapcs/bitfield1.c: New test.
+	* gcc.target/arm/aapcs/overalign_rec1.c: New test.
+	* gcc.target/arm/aapcs/overalign_rec2.c: New test.
+	* gcc.target/arm/aapcs/overalign_rec3.c: New test.
+
+2019-01-22  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* gfortran.dg/array_function_5.f90: Fix a dg directive.
+	* gfortran.dg/block_16.f08: Likewise.
+	* gfortran.dg/dec_structure_14.f90: Likewise.
+	* gfortran.dg/namelist_96.f90: Likewise.
+	* gfortran.dg/newunit_5.f90.f90: Moved to
+	* gfortran.dg/newunit_5.f90: here.
+	* gfortran.dg/pdt_28.f03: Likewise.
+	* gfortran.dg/spread_simplify_1.f90: Likewise.
+
+2019-01-22  Tamar Christina  <tamar.christina@arm.com>
+
+	PR/tree-optimization 88903
+	* gcc.dg/vect/pr88903-1.c: Add explicit &.
+
+2019-01-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/88904
+	* gcc.c-torture/execute/pr88904.c: New test.
+
+	PR target/88905
+	* gcc.dg/pr88905.c: New test.
+
+	PR rtl-optimization/49429
+	PR target/49454
+	PR rtl-optimization/86334
+	PR target/88906
+	* gcc.target/i386/pr86334.c: New test.
+	* gcc.target/i386/pr88906.c: New test.
+
+2019-01-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88949
+	* g++.dg/gomp/pr88949.C: New test.
+
+2019-01-21  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* class_66.f90: Fix a dg directive.
+	* debug/pr35154-stabs.f: Likewise.
+	* dec_d_lines_3.f: Likewise.
+	* dec_d_lines_3.f: Likewise.
+	* dec_structure_12.f90: Likewise.
+	* dec_structure_15.f90: Likewise.
+	* deferred_character_31.f90: Likewise.
+	* dtio_31.f03: Likewise.
+	* dtio_32.f03: Likewise.
+	* extends_11.f03: Likewise.
+	* integer_plus.f90: Likewise.
+	* pdt_25.f03: Likewise.
+	* pr58968.f: Likewise.
+	* pr78259.f90: Likewise.
+	* vect/vect-2.f90: Likewise.
+	* matmul_const.f90: Likewise.
+
+2019-01-21  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/88938
+	* gcc.target/i386/pr88938.c: New test.
+
+2019-01-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/88901
+	* g++.dg/asan/pr88901.C: New test.
+
+2019-01-21  Tamar Christina  <tamar.christina@arm.com>
+
+	* g++.dg/vect/simd-clone-7.cc: Fix assembler scan.
+
+2019-01-21  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR c/88928
+	* c-c++-common/Waddress-of-packed-member-1.c: New test case.
+	* gcc.dg/pr88928.c: New test case.
+
+2019-01-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/utf-array.c: Allow wchar_t to be printed as
+	{long ,short ,}{unsigned ,}int.
+
+2019-01-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88934
+	* gfortran.dg/pr88934.f90: New testcase.
+
+2019-01-20  Ulrich Drepper  <drepper@redhat.com>
+
+	Fix after C++ P0600 implementation.
+	* g++.dg/init/new39.C: Don't just ignore result of new.
+
+2019-01-20  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.dg/runnable.d: Add more tests for comparing complex types.
+
+2019-01-20  Johannes Pfau  <johannespfau@gmail.com>
+
+	* gdc.dg/runnable.d: Add tests for comparing complex types.
+
+2019-01-20  Kewen Lin  <linkw@gcc.gnu.org>
+
+	* gcc.target/powerpc/altivec_vld_vst_addr.c: Remove, split into
+	altivec_vld_vst_addr-1.c and altivec_vld_vst_addr-2.c.
+	* gcc.target/powerpc/altivec_vld_vst_addr-1.c: New test.
+	* gcc.target/powerpc/altivec_vld_vst_addr-2.c: Ditto.
+
+2019-01-18  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR fortran/37835
+	* gfortran.dg/no-automatic.f90: New test.
+
+2019-01-19  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/77960
+	* gfortran.dg/pr77960.f90: New test.
+
+2018-01-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
+	    Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/56789
+	* gfortran.dg/contiguous_3.f90: Make code compilant.  Remove
+	scan-tree tests that fail with patch.
+	* gfortran.dg/contiguous_8.f90: New test.
+
+2019-01-19  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gfortran.dg/loop_versioning_1.f90: Bump the number of identified
+	inner strides.
+	* gfortran.dg/loop_versioning_9.f90: New test.
+	* gfortran.dg/loop_versioning_10.f90: Likewise.
+
+2019-01-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/88902
+	* gfortran.dg/pr88902.f90: New test.
+
+2019-01-18  Martin Sebor  <msebor@redhat.com>
+
+	* c-c++-common/attr-nonstring-3.c: Remove an xfail.
+
+2019-01-18  Ian Lance Taylor  <iant@golang.org>
+
+	* go.go-torture/execute/names-1.go: Stop using debug/xcoff, which
+	is no longer externally visible.
+
+2019-01-18  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/86926
+	* g++.dg/cpp1z/constexpr-lambda23.C: New test.
+
+2019-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR middle-end/88587
+	* g++.target/i386/pr88587.C (dg-do): Add { target ia32 }.
+	(dg-options): Replace -m32 with -fno-pic.
+	* gcc.target/i386/mvc13.c (dg-do): Add { target ia32 }.
+	(dg-options): Remove -m32.
+
+2019-01-18  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88903
+	* gcc.dg/vect/pr88903-1.c: New testcase.
+	* gcc.dg/vect/pr88903-2.c: Likewise.
+
+2019-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c/51628
+	PR c/88664
+	* c-c++-common/pr51628-33.c: New test.
+	* c-c++-common/pr51628-35.c: New test.
+	* c-c++-common/pr88664-1.c: Likewise.
+	* c-c++-common/pr88664-2.c: Likewise.
+	* gcc.dg/pr51628-34.c: Likewise.
+
+2019-01-18  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/88799
+	* gcc.target/arm/multilib.exp (config "aprofile"): Add tests for
+	mp and sec extensions to armv7-a.
+
+2019-01-18  Martin Liska  <mliska@suse.cz>
+
+	* gcc.dg/no_profile_instrument_function-attr-1.c: Update
+	expected function name.
+
+2019-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/86214
+	* g++.dg/opt/pr86214-1.C: New test.
+	* g++.dg/opt/pr86214-2.C: New test.
+
+2019-01-18  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/arm/pr77904.c: Add dg-warning for sp clobber.
+
+2019-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	Reapply:
+	2018-12-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/88489
+	* gcc.target/i386/avx512vl-vfixupimmsd-2.c: New test.
+	* gcc.target/i386/avx512vl-vfixupimmss-2.c: New test.
+
+2019-01-18  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/88587
+	* g++.target/i386/pr88587.C: New test.
+	* gcc.target/i386/mvc13.c: New test.
+
+2018-01-17  Steve Ellcey  <sellcey@cavium.com>
+
+	PR fortran/88898
+	* gfortran.dg/gomp/declare-simd-2.f90: Add aarch64 target specifier to
+	warning checks.
+	* gfortran.dg/gomp/pr79154-1.f90: Ditto.
+	* gfortran.dg/gomp/pr83977.f90: Ditto.
+
+2019-01-17  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/88273
+	* gcc.dg/Warray-bounds-38.c: New test.
+
+2018-01-17  Steve Ellcey  <sellcey@cavium.com>
+
+	* c-c++-common/gomp/pr60823-1.c: Add aarch64 specific
+	warning checks and assembler scans.
+	* c-c++-common/gomp/pr60823-3.c: Ditto.
+	* c-c++-common/gomp/pr63328.c: Ditto.
+	* g++.dg/gomp/declare-simd-1.C: Ditto.
+	* g++.dg/gomp/declare-simd-3.C: Ditto.
+	* g++.dg/gomp/declare-simd-4.C: Ditto.
+	* g++.dg/gomp/declare-simd-7.C: Ditto.
+	* g++.dg/gomp/pr88182.C: Ditto.
+	* g++.dg/vect/simd-clone-7.cc: Ditto.
+	* gcc.dg/gomp/declare-simd-1.c: Ditto.
+	* gcc.dg/gomp/declare-simd-3.c: Ditto.
+	* gcc.dg/gomp/pr59669-2.c: Ditto.
+	* gcc.dg/gomp/pr87895-1.c: Ditto.
+	* gcc.dg/gomp/pr87895-2.c: Ditto.
+	* gcc.dg/gomp/simd-clones-2.c: Ditto.
+	* gfortran.dg/gomp/declare-simd-2.f90: Ditto.
+	* gfortran.dg/gomp/pr79154-1.f90: Ditto.
+	* gfortran.dg/gomp/pr83977.f90: Ditto.
+
+2019-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/auto52.C: Test locations too.
+	* g++.dg/cpp0x/trailing2.C: Likewise.
+	* g++.dg/cpp1y/auto-fn18.C: Likewise.
+	* g++.dg/cpp1y/auto-fn25.C: Likewise.
+	* g++.dg/cpp1y/auto-fn52.C: Likewise.
+	* g++.dg/cpp1y/auto-fn53.C: Likewise.
+	* g++.dg/cpp1y/auto-fn54.C: Likewise.
+
+2019-01-17  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/88699
+	* g++.dg/template/pr88699.C: New test.
+
+2019-01-17  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/88800
+	* c-c++-common/Wrestrict.c: Adjust.
+	* gcc.dg/Warray-bounds-37.c: New test.
+	* gcc.dg/builtin-memcpy-2.c: New test.
+	* gcc.dg/builtin-memcpy.c: New test.
+
+2019-01-17  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88850
+	* gcc.target/arm/pr51968.c: Use neon intrinsics.
+
+2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
+	    Kwok Cheung Yeung  <kcy@codesourcery.com>
+	    Julian Brown  <julian@codesourcery.com>
+	    Tom de Vries  <tom@codesourcery.com>
+
+	* gcc.dg/20020312-2.c: Add amdgcn support.
+	* gcc.dg/Wno-frame-address.c: Disable on amdgcn.
+	* gcc.dg/builtin-apply2.c: Likewise.
+	* gcc.dg/torture/stackalign/builtin-apply-2.c: Likewise.
+	* gcc.dg/gimplefe-28.c: Add dg-add-options for sqrt_insn.
+	* gcc.dg/intermod-1.c: Add -mlocal-symbol-id on amdgcn.
+	* gcc.dg/memcmp-1.c: Increase timeout factor.
+	* gcc.dg/pr59605-2.c: Addd -DMAX_COPY=1025 on amdgcn.
+	* gcc.dg/sibcall-10.c: xfail on amdgcn.
+	* gcc.dg/sibcall-9.c: Likewise.
+	* gcc.dg/tree-ssa/gen-vect-11c.c: Likewise.
+	* gcc.dg/tree-ssa/pr84512.c: Likewise.
+	* gcc.dg/tree-ssa/loop-1.c: Adjust expectations for amdgcn.
+	* gfortran.dg/bind_c_array_params_2.f90: Likewise.
+	* lib/target-supports.exp (check_effective_target_trampolines):
+	Configure amdgcn.
+	(check_profiling_available): Likewise.
+	(check_effective_target_global_constructor): Likewise.
+	(check_effective_target_return_address): Likewise.
+	(check_effective_target_fopenacc): Likewise.
+	(check_effective_target_fopenmp): Likewise.
+	(check_effective_target_vect_int): Likewise.
+	(check_effective_target_vect_intfloat_cvt): Likewise.
+	(check_effective_target_vect_uintfloat_cvt): Likewise.
+	(check_effective_target_vect_floatint_cvt): Likewise.
+	(check_effective_target_vect_floatuint_cvt): Likewise.
+	(check_effective_target_vect_simd_clones): Likewise.
+	(check_effective_target_vect_shift): Likewise.
+	(check_effective_target_whole_vector_shift): Likewise.
+	(check_effective_target_vect_bswap): Likewise.
+	(check_effective_target_vect_shift_char): Likewise.
+	(check_effective_target_vect_long): Likewise.
+	(check_effective_target_vect_float): Likewise.
+	(check_effective_target_vect_double): Likewise.
+	(check_effective_target_vect_perm): Likewise.
+	(check_effective_target_vect_perm_byte): Likewise.
+	(check_effective_target_vect_perm_short): Likewise.
+	(check_effective_target_vect_widen_mult_qi_to_hi): Likewise.
+	(check_effective_target_vect_widen_mult_hi_to_si): Likewise.
+	(check_effective_target_vect_widen_mult_qi_to_hi_pattern): Likewise.
+	(check_effective_target_vect_widen_mult_hi_to_si_pattern): Likewise.
+	(check_effective_target_vect_natural_alignment): Likewise.
+	(check_effective_target_vect_fully_masked): Likewise.
+	(check_effective_target_vect_element_align): Likewise.
+	(check_effective_target_vect_masked_store): Likewise.
+	(check_effective_target_vect_scatter_store): Likewise.
+	(check_effective_target_vect_condition): Likewise.
+	(check_effective_target_vect_cond_mixed): Likewise.
+	(check_effective_target_vect_char_mult): Likewise.
+	(check_effective_target_vect_short_mult): Likewise.
+	(check_effective_target_vect_int_mult): Likewise.
+	(check_effective_target_sqrt_insn): Likewise.
+	(check_effective_target_vect_call_sqrtf): Likewise.
+	(check_effective_target_vect_call_btrunc): Likewise.
+	(check_effective_target_vect_call_btruncf): Likewise.
+	(check_effective_target_vect_call_ceil): Likewise.
+	(check_effective_target_vect_call_floorf): Likewise.
+	(check_effective_target_lto): Likewise.
+	(check_vect_support_and_set_flags): Likewise.
+	(check_effective_target_vect_stridedN): Enable when fully masked is
+	available.
+	(add_options_for_sqrt_insn): New procedure.
+
+2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
+
+	* lib/file-format.exp (gcc_target_object_format): Handle AMD GCN.
+	* lib/gcc-dg.exp (gcc-dg-prune): Ignore blank lines from the LLVM
+	linker.
+	* lib/target-supports.exp (check_effective_target_llvm_binutils): New.
+
+2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
+
+	* gcc.dg/graphite/scop-19.c: Check pie_enabled.
+	* gcc.dg/pic-1.c: Disable on amdgcn.
+	* gcc.dg/pic-2.c: Disable on amdgcn.
+	* gcc.dg/pic-3.c: Disable on amdgcn.
+	* gcc.dg/pic-4.c: Disable on amdgcn.
+	* gcc.dg/pie-3.c: Disable on amdgcn.
+	* gcc.dg/pie-4.c: Disable on amdgcn.
+	* gcc.dg/uninit-19.c: Check pie_enabled.
+	* lib/target-supports.exp (check_effective_target_pie): Add amdgcn.
+
+2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
+	    Kwok Cheung Yeung  <kcy@codesourcery.com>
+	    Julian Brown  <julian@codesourcery.com>
+	    Tom de Vries  <tom@codesourcery.com>
+
+	* c-c++-common/ubsan/pr71512-1.c: Require exceptions.
+	* c-c++-common/ubsan/pr71512-2.c: Require exceptions.
+	* gcc.c-torture/compile/pr34648.c: Require exceptions.
+	* gcc.c-torture/compile/pr41469.c: Require exceptions.
+	* gcc.dg/20111216-1.c: Require exceptions.
+	* gcc.dg/cleanup-10.c: Require exceptions.
+	* gcc.dg/cleanup-11.c: Require exceptions.
+	* gcc.dg/cleanup-12.c: Require exceptions.
+	* gcc.dg/cleanup-13.c: Require exceptions.
+	* gcc.dg/cleanup-5.c: Require exceptions.
+	* gcc.dg/cleanup-8.c: Require exceptions.
+	* gcc.dg/cleanup-9.c: Require exceptions.
+	* gcc.dg/gomp/pr29955.c: Require exceptions.
+	* gcc.dg/lto/pr52097_0.c: Require exceptions.
+	* gcc.dg/nested-func-5.c: Require exceptions.
+	* gcc.dg/pch/except-1.c: Require exceptions.
+	* gcc.dg/pch/valid-2.c: Require exceptions.
+	* gcc.dg/pr41470.c: Require exceptions.
+	* gcc.dg/pr42427.c: Require exceptions.
+	* gcc.dg/pr44545.c: Require exceptions.
+	* gcc.dg/pr47086.c: Require exceptions.
+	* gcc.dg/pr51481.c: Require exceptions.
+	* gcc.dg/pr51644.c: Require exceptions.
+	* gcc.dg/pr52046.c: Require exceptions.
+	* gcc.dg/pr54669.c: Require exceptions.
+	* gcc.dg/pr56424.c: Require exceptions.
+	* gcc.dg/pr64465.c: Require exceptions.
+	* gcc.dg/pr65802.c: Require exceptions.
+	* gcc.dg/pr67563.c: Require exceptions.
+	* gcc.dg/tree-ssa/pr41469-1.c: Require exceptions.
+	* gcc.dg/tree-ssa/ssa-dse-28.c: Require exceptions.
+	* gcc.dg/vect/pr46663.c: Require exceptions.
+	* lib/target-supports.exp (check_effective_target_exceptions): New.
+
+2019-01-17  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/88851
+	* gcc.target/aarch64/stack-check-cfa-3.c: Update test.
+
+2019-01-17  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/86610
+	* g++.dg/cpp0x/pr86610.C: New.
+
+2019-01-17  Wei Xiao  <wei3.xiao@intel.com>
+
+	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Fix the test cases for
+	VFIXUPIMM* intrinsics.
+	* gcc.target/i386/avx512f-vfixupimmps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmss-2.c: Ditto.
+
+2019-01-17  Wei Xiao  <wei3.xiao@intel.com>
+
+	PR target/88794
+	Revert:
+	2018-11-06  Wei Xiao  <wei3.xiao@intel.com>
+
+	* gcc.target/i386/avx-1.c: Update tests for VFIXUPIMM* intrinsics.
+	* gcc.target/i386/avx512f-vfixupimmpd-1.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmps-1.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmsd-1.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmss-1.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmss-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfixupimmpd-1.c: Ditto.
+	* gcc.target/i386/avx512vl-vfixupimmps-1.c: Ditto.
+	* gcc.target/i386/sse-13.c: Ditto.
+	* gcc.target/i386/sse-14.c: Ditto.
+	* gcc.target/i386/sse-22.c: Ditto.
+	* gcc.target/i386/sse-23.c: Ditto.
+	* gcc.target/i386/testimm-10.c: Ditto.
+	* gcc.target/i386/testround-1.c: Ditto.
+
+2019-01-17  Wei Xiao  <wei3.xiao@intel.com>
+
+	PR target/88794
+	Revert:
+	2018-12-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/88489
+	* gcc.target/i386/avx512vl-vfixupimmsd-2.c: New test.
+	* gcc.target/i386/avx512vl-vfixupimmss-2.c: New test.
+
+2019-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/88870
+	* gcc.dg/pr88870.c: New test.
+
+2019-01-17  Kewen Lin  <linkw@gcc.gnu.org>
+
+	* gcc.target/powerpc/altivec_vld_vst_addr.c: New test.
+
+2019-01-17  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR c++/87768
+	* g++.dg/concepts/pr87768.C: New.
+
+	PR c++/86648
+	* gcc.dg/cpp1z/pr86648.C: New.
+
+2019-01-17  Kewen Lin  <linkw@gcc.gnu.org>
+
+	PR target/87306
+	* gcc.dg/vect/bb-slp-pow-1.c: Modify to reflect that the loop is not
+	vectorized on POWER unless hardware misaligned loads are available.
+
+2019-01-16  David Malcolm  <dmalcolm@redhat.com>
+
+	PR target/88861
+	* g++.dg/torture/pr88861.C: New test.
+
+2019-01-16  Tamar Christina  <tamar.christina@arm.com>
+
+	PR debug/88046
+	* g++.dg/lto/pr88046_0.C: Check for shared and fPIC.
+
+2019-01-16  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/other/pr33558.C: Test location too.
+	* g++.dg/other/pr33558-2.C: Likewise.
+	* g++.dg/parse/crash4.C: Likewise.
+	* g++.old-deja/g++.brendan/err-msg11.C: Likewise.
+	* g++.old-deja/g++.mike/p7635.C: Likewise.
+	* g++.old-deja/g++.other/decl6.C: Likewise.
+
+2019-01-16  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/78244 - narrowing conversion in template not detected.
+	* g++.dg/cpp0x/Wnarrowing13.C: New test.
+	* g++.dg/cpp0x/Wnarrowing14.C: New test.
+
+2019-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/51628
+	PR target/88682
+	* c-c++-common/pr51628-10.c (unaligned_int128_t): Add
+	may_alias attribute.
+
+2019-01-15  Nikhil Benesch  <nikhil.benesch@gmail.com>
+
+	* gcc.misc-tests/godump-1.c: Add test case for typedef before
+	struct.
+
+2019-01-15  David Malcolm  <dmalcolm@redhat.com>
+
+	PR c++/88795
+	* g++.dg/template/pr88795.C: New test.
+
+2019-01-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/43136
+	* gfortran.dg/actual_array_substr_3.f90: New test.
+
+2019-01-15  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/81849
+	* gfortran.dg/pr81849.f90: New test.
+
+2019-01-15  Paul Thomas  <pault@gcc.gnu.org>
+
+	* gfortran.dg/ISO_Fortran_binding_2.c: Change reference to
+	ISO_Fortran_binding_2.h.
+
+2019-01-15  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88866
+	* g++.dg/cpp0x/variadic126.C: Tweak dg-error.
+
+2019-01-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR inline-asm/52813
+	* gcc.target/i386/pr52813.c (test1): Turn the diagnostic into a
+	-Wdeprecated warning and expect a following note:.
+
+2019-01-15  Richard Biener  <rguenther@suse.de>
+
+	PR debug/88046
+	* g++.dg/lto/pr88046_0.C: New testcase.
+
+2019-01-15  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88855
+	* gcc.dg/pr88855.c: New testcase.
+
+2019-01-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/typedef-initialized.C: New.
+
+2019-01-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/bitfld3.C: New.
+
+2019-01-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88775
+	* gcc.dg/tree-ssa/pr88775-1.c: New test.
+	* gcc.dg/tree-ssa/pr88775-2.c: New test.
+
+2019-01-14  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88825 - ICE with bogus function return type deduction.
+	* g++.dg/cpp1y/auto-fn55.C: New test.
+
+2019-01-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/cpp1z/feat-cxx1z.C: Add tests for
+	__cpp_guaranteed_copy_elision and __cpp_nontype_template_parameter_auto
+	feature test macros.
+	* g++.dg/cpp2a/feat-cxx2a.C: Likewise.
+
+2019-01-14  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88830 - ICE with abstract class.
+	* g++.dg/other/abstract7.C: New test.
+
+2019-01-14  Martin Sebor  <msebor@redhat.com>
+
+	PR target/88638
+	* gcc.dg/format/attr-8.c: New test.
+	* gcc.dg/darwin-cfstring-format-1.c: Adjust diagnostics.
+	* gcc.dg/format/attr-3.c: Same.
+	* obj-c++.dg/fsf-nsstring-format-1.mm: Same.
+	* objc.dg/fsf-nsstring-format-1.m: Same.
+
+2019-01-14  Martin Liska  <mliska@suse.cz>
+
+	PR gcov-profile/88263
+	* g++.dg/gcov/pr88263-2.C: New test.
+
+2019-01-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/88796
+	* gcc.target/i386/pr88796.c: New test.
+
+2019-01-14  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.dg/asm1.d: New test.
+	* gdc.dg/asm2.d: New test.
+	* gdc.dg/asm3.d: New test.
+	* gdc.dg/asm4.d: New test.
+	* lib/gdc.exp (gdc_init): Set gcc_error_prefix and gcc_warning_prefix.
+
+2019-01-13  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libfortran/88776
+	* gfortran.dg/namelist_96.f90: New test.
+
+2019-01-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/59345
+	* gfortran.dg/internal_pack_18.f90: New test.
+
+2019-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gcc.dg/pr51628-20.c: Updated.
+	* gcc.dg/pr51628-21.c: Likewise.
+	* gcc.dg/pr51628-25.c: Likewise.
+
+2019-01-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/59345
+	* gfortran.dg/internal_pack_17.f90: New test.
+	* gfortran.dg/alloc_comp_auto_array_3.f90: Adjust number of calls
+	to builtin_free.
+
+2019-01-12  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/61765
+	* gfortran.dg/pr61765.f90: New test.
+
+2019-01-12  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/pr62101.C: Test locations too.
+	* g++.dg/inherit/pure1.C: Likewise.
+
+2019-01-12  Paul Thomas  <pault@gcc.gnu.org>
+
+	* gfortran.dg/ISO_Fortran_binding_2.f90: Remove because of
+	reports of ICEs.
+	* gfortran.dg/ISO_Fortran_binding_2.c: Ditto.
+
+2019-01-12  Paul Thomas  <pault@gcc.gnu.org>
+
+	* gfortran.dg/ISO_Fortran_binding_1.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_1.c: Auxilliary file for test.
+	* gfortran.dg/ISO_Fortran_binding_2.f90: New test.
+	* gfortran.dg/ISO_Fortran_binding_2.c: Auxilliary file for test.
+	* gfortran.dg/bind_c_array_params_2.f90: Change search string
+	for dump tree scan.
+
+2019-01-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/35031
+	* gfortran.dg/pr35031.f90: new test.
+
+2019-01-11  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88692, c++/87882 - -Wredundant-move false positive with *this.
+	* g++.dg/cpp0x/Wredundant-move5.C: New test.
+	* g++.dg/cpp0x/Wredundant-move6.C: New test.
+
+2019-01-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/85956
+	PR lto/88733
+	* c-c++-common/gomp/pr85956.c: New test.
+	* g++.dg/gomp/pr88733.C: New test.
+
+2019-01-11  Tobias Burnus  <burnus@net-b.de>
+
+	PR C++/88114
+	* g++.dg/cpp0x/defaulted61.C: New
+	* g++.dg/cpp0x/defaulted62.C: New.
+
+2019-01-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88693
+	* gcc.c-torture/execute/pr88693.c: New test.
+
+2019-01-11  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: Require neon
+	and add options.
+
+2019-01-11  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/88758
+	* g++.dg/lto/pr88758_0.C: New test.
+	* g++.dg/lto/pr88758_1.C: New test.
+
+2019-01-11  Jan Beulich  <jbeulich@suse.com>
+
+	* gcc.target/i386/avx512f-vcvtsd2si-1.c,
+	gcc.target/i386/avx512f-vcvtss2si-1.c,
+	gcc.target/i386/avx512f-vcvttsd2si-1.c,
+	gcc.target/i386/avx512f-vcvttss2si-1.c: Permit l suffix.
+	* gcc.target/i386/avx512f-vcvtsi2ss-1.c,
+	gcc.target/i386/avx512f-vcvtusi2sd-1.c,
+	gcc.target/i386/avx512f-vcvtusi2ss-1.c: Expect l suffix.
+	* gcc.target/i386/avx512f-vcvtusi2sd-2.c,
+	gcc.target/i386/avx512f-vcvtusi2sd64-2.c,
+	gcc.target/i386/avx512f-vcvtusi2ss-2.c,
+	gcc.target/i386/avx512f-vcvtusi2ss64-2.c: Add asm volatile().
+	gcc.target/i386/pr19398.c: Permit l or q suffix.
+
+2019-01-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/88296
+	* gcc.target/i386/pr88296.c: New test.
+
+2019-01-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/extern-initialized.C: New.
+	* g++.dg/ext/dllimport-initialized.C: Likewise.
+
+2019-01-11  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/59345
+	* gfortran.dg/internal_pack_16.f90: New test.
+
+2019-01-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/88785
+	* g++.target/i386/pr88785.C: New test.
+
+2019-01-10  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/87305
+	* gcc.target/aarch64/pr87305.c: New.
+
+2019-01-10  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88792
+	* gcc.dg/torture/pr88792.c: New testcase.
+
+2019-01-10  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/86322
+	* gfortran.dg/pr86322_1.f90: New test.
+	* gfortran.dg/pr86322_2.f90: Ditto.
+	* gfortran.dg/pr86322_3.f90: Ditto.
+
+2019-01-10  Sudakshina Das  <sudi.das@arm.com>
+
+	* gcc.target/aarch64/bti-1.c: Exempt for ilp32.
+	* gcc.target/aarch64/bti-2.c: Likewise.
+	* gcc.target/aarch64/bti-3.c: Likewise.
+
+2019-01-10  Stefan Agner  <stefan@agner.ch>
+
+	PR target/88648
+	* gcc.target/arm/pr88648-asm-syntax-unified.c: Add test to
+	check if -masm-syntax-unified gets applied properly.
+
+2019-01-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/88568
+	* gcc.dg/pr88568.c: New test.
+
+2019-01-10  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.target/aarch64/advsimd-intrinsics/vector-complex.c: Add AArch32 regexpr.
+	* gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: Likewise.
+
+2019-01-10  Tamar Christina  <tamar.christina@arm.com>
+
+	* gcc.target/aarch64/advsimd-intrinsics/vector-complex.c: New test.
+	* gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: New test.
+
+2019-01-10  Tamar Christina  <tamar.christina@arm.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_arm_v8_3a_complex_neon_ok_nocache,
+	check_effective_target_arm_v8_3a_complex_neon_ok,
+	add_options_for_arm_v8_3a_complex_neon,
+	check_effective_target_arm_v8_3a_complex_neon_hw,
+	check_effective_target_vect_complex_rot_N): New.
+
+2019-01-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/88376
+	* gfortran.dg/pr88376.f90: New test.
+
+2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR other/16615
+	* g++.dg/lto/odr-1_1.C: Update diagnostic message patterns to replace
+	"can not" with "cannot".
+	* gfortran.dg/common_15.f90: Likewise.
+	* gfortran.dg/derived_result_2.f90: Likewise.
+	* gfortran.dg/do_check_6.f90: Likewise.
+	* gfortran.dg/namelist_args.f90: Likewise.
+	* gfortran.dg/negative_unit_check.f90: Likewise.
+	* gfortran.dg/pure_formal_3.f90: Likewise.
+	* obj-c++.dg/attributes/method-attribute-2.mm: Likewise.
+	* obj-c++.dg/exceptions-3.mm: Likewise.
+	* obj-c++.dg/exceptions-4.mm: Likewise.
+	* obj-c++.dg/exceptions-5.mm: Likewise.
+	* obj-c++.dg/property/at-property-23.mm: Likewise.
+	* obj-c++.dg/property/dotsyntax-17.mm: Likewise.
+	* obj-c++.dg/property/property-neg-7.mm: Likewise.
+	* objc.dg/attributes/method-attribute-2.m: Likewise.
+	* objc.dg/exceptions-3.m: Likewise.
+	* objc.dg/exceptions-4.m: Likewise.
+	* objc.dg/exceptions-5.m: Likewise.
+	* objc.dg/param-1.m: Likewise.
+	* objc.dg/property/at-property-23.m: Likewise.
+	* objc.dg/property/dotsyntax-17.m: Likewise.
+	* objc.dg/property/property-neg-7.m: Likewise.
+
+2019-01-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/68426
+	* gfortran.dg/spread_simplify_1.f90: New test.
+
+2019-01-09  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* lib/target-supports.exp
+	(check_effective_target_xorsign): Add i?86-*-* and x86_64-*-* targets.
+	* gcc.target/i386/xorsign.c: New test.
+
+2019-01-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.target/sparc/tls-ld-int8.c: New test.
+	* gcc.target/sparc/tls-ld-int16.c: Likewise.
+	* gcc.target/sparc/tls-ld-int32.c: Likewise.
+	* gcc.target/sparc/tls-ld-uint8.c: Likewise.
+	* gcc.target/sparc/tls-ld-uint16.c: Likewise.
+	* gcc.target/sparc/tls-ld-uint32.c: Likewise.
+
+2018-01-09  Sudakshina Das  <sudi.das@arm.com>
+
+	* gcc.target/aarch64/bti-1.c: Update test to not add command line
+	option when configure with bti.
+	* gcc.target/aarch64/bti-2.c: Likewise.
+	* lib/target-supports.exp
+	(check_effective_target_default_branch_protection):
+	Add configure check for --enable-standard-branch-protection.
+
+2018-01-09  Sudakshina Das  <sudi.das@arm.com>
+
+	* gcc.target/aarch64/bti-1.c: New test.
+	* gcc.target/aarch64/bti-2.c: New test.
+	* gcc.target/aarch64/bti-3.c: New test.
+	* lib/target-supports.exp
+	(check_effective_target_aarch64_bti_hw): Add new check for BTI hw.
+
+2018-01-09  Sudakshina Das  <sudi.das@arm.com>
+
+	* gcc.target/aarch64/test_frame_17.c: Update to check for EP0_REGNUM
+	instead of IP0_REGNUM and add test case.
+
+2019-01-09  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
+
+	* gcc.target/aarch64/sve/copysign_1.c: New test for SVE vectorized
+	copysign.
+	* gcc.target/aarch64/sve/copysign_1_run.c: Likewise.
+	* gcc.target/aarch64/sve/xorsign_1.c: New test for SVE vectorized
+	xorsign.
+	* gcc.target/aarch64/sve/xorsign_1_run.c: Likewise.
+
+2019-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/88331
+	* gcc.target/i386/pr88331.c: New test.
+
+2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/constexpr2.C: New.
+	* g++.dg/diagnostic/ref3.C: Likewise.
+
+2019-01-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88538 - braced-init-list in template-argument-list.
+	* g++.dg/cpp2a/nontype-class11.C: New test.
+
+	PR c++/88744
+	* g++.dg/cpp2a/nontype-class12.C: New test.
+
+2019-01-08  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/88457
+	* gcc.target/powerpc/pr88457.c: Remove -m32, -c and -mcpu=e300c3 from
+	dg-options.  Require ppc_cpu_supports_hw effective target instead of
+	powerpc64*-*-*.
+
+2019-01-08  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/88047
+	* gfortran.dg/class_69.f90: New test case.
+
+2019-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/88717
+	* gcc.target/i386/pr88717.c: New test.
+
+2019-01-08  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88548 - this accepted in static member functions.
+	* g++.dg/cpp0x/this1.C: New test.
+
+2019-01-08  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/88753
+	* gcc.dg/tree-ssa/pr88753.c: New test.
+
+2019-01-08  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/86554
+	* gcc.dg/torture/pr86554-1.c: New testcase.
+	* gcc.dg/torture/pr86554-2.c: Likewise.
+
+2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/thread1.C: Tweak expected error #line 13 to
+	cover target variance.
+
+2019-01-08  Richard Biener  <rguenther@suse.de>
+
+	PR fortran/88611
+	* trans-expr.c (gfc_conv_initializer): For ISOCBINDING_NULL_*
+	directly build the expected GENERIC tree.
+
+2019-01-08  Sam Tebbs  <sam.tebbs@arm.com>
+
+	* gcc.target/aarch64/(return_address_sign_1.c,
+	return_address_sign_2.c, return_address_sign_3.c (__attribute__)):
+	Change option to -mbranch-protection.
+	* gcc.target/aarch64/(branch-protection-option.c,
+	branch-protection-option-2.c, branch-protection-attr.c,
+	branch-protection-attr-2.c): New file.
+
+2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/out-of-class-redeclaration.C: New.
+
+2019-01-08  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* c-c++-common/builtin-has-attribute-3.c: Skip tests requiring symbol
+	alias support.
+	* c-c++-common/builtin-has-attribute-4.c: Likewise.
+	Append match for warning that ‘protected’ attribute is not supported.
+
+2019-01-08  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/Wmissing-attributes.c: Require alias support.
+	* gcc.dg/attr-copy-2.c: Likewise.
+	* gcc.dg/attr-copy-5.c: Likewise.
+
+2019-01-08  Jonathan Wakely  <jwakely@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88554
+	* g++.dg/warn/Wreturn-type-11.C: New test.
+
+2019-01-07  David Malcolm  <dmalcolm@redhat.com>
+
+	PR jit/88747
+	* jit.dg/test-sum-of-squares.c (verify_code): Update expected vrp
+	dump to reflect r266077.
+
+2019-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/88701
+	* gcc.dg/pr88701.c: New test.
+
+2019-01-07  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/88720
+	PR c/88726
+	* gcc.dg/inline-40.c, gcc.dg/inline-41.c: New tests.
+
+2019-01-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/constexpr1.C: New.
+	* g++.dg/diagnostic/thread1.C: Likewise.
+
+2019-01-07  Thomas Koenig  <tkoenig@gcc.gnu.org>
+	    Harald Anlauf  <anlauf@gmx.de>
+	    Tobias Burnus  <burnus@gcc.gnu.org>
+
+	* gfortran.dg/is_contiguous_1.f90: New test.
+	* gfortran.dg/is_contiguous_2.f90: New test.
+	* gfortran.dg/is_contiguous_3.f90: New test.
+
+2019-01-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88741 - wrong error with initializer-string.
+	* g++.dg/init/array50.C: New test.
+
+2019-01-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR c++/88261
+	PR c++/69338
+	PR c++/69696
+	PR c++/69697
+	* gcc.dg/array-6.c: Move from here ...
+	* c-c++-common/array-6.c: ... to here and add some more test coverage.
+	* g++.dg/pr69338.C: New test.
+	* g++.dg/pr69697.C: Likewise.
+	* g++.dg/ext/flexary32.C: Likewise.
+	* g++.dg/ext/flexary3.C: Adjust test.
+	* g++.dg/ext/flexary12.C: Likewise.
+	* g++.dg/ext/flexary13.C: Likewise.
+	* g++.dg/ext/flexary15.C: Likewise.
+	* g++.dg/warn/Wplacement-new-size-1.C: Likewise.
+	* g++.dg/warn/Wplacement-new-size-2.C: Likewise.
+	* g++.dg/warn/Wplacement-new-size-6.C: Likewise.
+
+2019-01-07  Richard Earnshaw  <rearnsha@arm.com>
+
+	* gcc.target/aarch64/subs_compare_2.c: Make '#' immediate prefix
+	optional in scan pattern.
+
+2019-01-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR tree-optimization/88598
+	* gcc.dg/vect/pr88598-1.c: New test.
+	* gcc.dg/vect/pr88598-2.c: Likewise.
+	* gcc.dg/vect/pr88598-3.c: Likewise.
+	* gcc.dg/vect/pr88598-4.c: Likewise.
+	* gcc.dg/vect/pr88598-5.c: Likewise.
+	* gcc.dg/vect/pr88598-6.c: Likewise.
+
+2019-01-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR tree-optimization/88598
+	* gcc.dg/pr88598-1.c: New test.
+	* gcc.dg/pr88598-2.c: Likewise.
+	* gcc.dg/pr88598-3.c: Likewise.
+	* gcc.dg/pr88598-4.c: Likewise.
+	* gcc.dg/pr88598-5.c: Likewise.
+
+2019-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/88676
+	* gcc.dg/tree-ssa/pr88676.c: New test.
+	* gcc.dg/pr88676.c: New test.
+	* gcc.dg/tree-ssa/pr15826.c: Just verify there is no goto,
+	allow &.
+
+	PR sanitizer/88619
+	* c-c++-common/asan/pr88619.c: New test.
+
+	PR c++/85052
+	* c-c++-common/builtin-convertvector-1.c: New test.
+	* c-c++-common/torture/builtin-convertvector-1.c: New test.
+	* g++.dg/ext/builtin-convertvector-1.C: New test.
+	* g++.dg/cpp0x/constexpr-builtin4.C: New test.
+
+2018-12-26  Mateusz B  <mateuszb@poczta.onet.pl>
+
+	PR target/88521
+	* gcc.target/i386/pr88521.c: New testcase.
+
+2019-01-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/88658
+	* gfortran.dg/min_max_type_2.f90: New test.
+
+2019-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/88363
+	* c-c++-common/attributes-4.c (falloc_align_int128,
+	falloc_size_int128): Guard with #ifdef __SIZEOF_INT128__.
+
+2019-01-05  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.dg/ipa/ipcp-2.c: Update bounds.
+
+2019-01-05  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	* gcc.dg/plugin/plugindir1.c: Adjust dg-prune-output for Darwin.
+	* gcc.dg/plugin/plugindir2.c: Likewise.
+	* gcc.dg/plugin/plugindir3.c: Likewise.
+	* gcc.dg/plugin/plugindir4.c: Likewise.
+
+2019-01-05  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/88009
+	* gfortran.dg/blockdata_10.f90: New test case.
+
+2019-01-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/82564
+	PR target/88620
+	* gcc.dg/nested-func-12.c: New test.
+	* gcc.c-torture/compile/pr82564.c: New test.
+
+	PR debug/88635
+	* gcc.dg/debug/dwarf2/pr88635.c: New test.
+
+2019-01-05  Dominique d'Humieres  <dominiq@gcc.gnu.org>
+
+	PR target/60563
+	* g++.dg/ext/sync-4.C: Add dg-xfail-run-if for darwin.
+
+2019-01-04  Martin Sebor  <msebor@redhat.com>
+
+	PR c/88546
+	* g++.dg/ext/attr-copy.C: New test.
+	* gcc.dg/attr-copy-4.c: Disable macro expansion tracking.
+	* gcc.dg/attr-copy-6.c: New test.
+	* gcc.dg/attr-copy-7.c: New test.
+
+2019-01-04  Martin Sebor  <msebor@redhat.com>
+
+	PR c/88363
+	* c-c++-common/attributes-4.c: New test.
+
+2019-01-04  Sam Tebbs  <sam.tebbs@arm.com>
+
+	PR gcc/87763
+	* gcc.target/aarch64/combine_bfxil.c: Change scan-assembler-times bfxil
+	count to 18.
+
+2019-01-04  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/48543
+	* gfortran.dg/const_chararacter_merge.f90: Actually remove.
+	* gfortran.dg/merge_char_const.f90: Restore.
+
+2019-01-04  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/88594
+	* gcc.dg/pr88594.c: New test.
+
+2019-01-04  Jan Beulich  <jbeulich@suse.com>
+
+	* gcc.target/i386/avx512bitalg-vpshufbitqmb.c,
+	gcc.target/i386/avx512bw-vpcmpeqb-1.c,
+	gcc.target/i386/avx512bw-vpcmpequb-1.c,
+	gcc.target/i386/avx512bw-vpcmpequw-1.c,
+	gcc.target/i386/avx512bw-vpcmpeqw-1.c,
+	gcc.target/i386/avx512bw-vpcmpgeb-1.c,
+	gcc.target/i386/avx512bw-vpcmpgeub-1.c,
+	gcc.target/i386/avx512bw-vpcmpgeuw-1.c,
+	gcc.target/i386/avx512bw-vpcmpgew-1.c,
+	gcc.target/i386/avx512bw-vpcmpgtb-1.c,
+	gcc.target/i386/avx512bw-vpcmpgtub-1.c,
+	gcc.target/i386/avx512bw-vpcmpgtuw-1.c,
+	gcc.target/i386/avx512bw-vpcmpgtw-1.c,
+	gcc.target/i386/avx512bw-vpcmpleb-1.c,
+	gcc.target/i386/avx512bw-vpcmpleub-1.c,
+	gcc.target/i386/avx512bw-vpcmpleuw-1.c,
+	gcc.target/i386/avx512bw-vpcmplew-1.c,
+	gcc.target/i386/avx512bw-vpcmpltb-1.c,
+	gcc.target/i386/avx512bw-vpcmpltub-1.c,
+	gcc.target/i386/avx512bw-vpcmpltuw-1.c,
+	gcc.target/i386/avx512bw-vpcmpltw-1.c,
+	gcc.target/i386/avx512bw-vpcmpneqb-1.c,
+	gcc.target/i386/avx512bw-vpcmpnequb-1.c,
+	gcc.target/i386/avx512bw-vpcmpnequw-1.c,
+	gcc.target/i386/avx512bw-vpcmpneqw-1.c,
+	gcc.target/i386/avx512bw-vpmovb2m-1.c,
+	gcc.target/i386/avx512bw-vpmovm2b-1.c,
+	gcc.target/i386/avx512bw-vpmovm2w-1.c,
+	gcc.target/i386/avx512bw-vpmovw2m-1.c,
+	gcc.target/i386/avx512bw-vptestmb-1.c,
+	gcc.target/i386/avx512bw-vptestmw-1.c,
+	gcc.target/i386/avx512bw-vptestnmb-1.c,
+	gcc.target/i386/avx512bw-vptestnmw-1.c,
+	gcc.target/i386/avx512cd-vpbroadcastmb2q-1.c,
+	gcc.target/i386/avx512cd-vpbroadcastmw2d-1.c,
+	gcc.target/i386/avx512dq-vfpclasssd-1.c,
+	gcc.target/i386/avx512dq-vfpclassss-1.c,
+	gcc.target/i386/avx512dq-vpmovd2m-1.c,
+	gcc.target/i386/avx512dq-vpmovm2d-1.c,
+	gcc.target/i386/avx512dq-vpmovm2q-1.c,
+	gcc.target/i386/avx512dq-vpmovq2m-1.c,
+	gcc.target/i386/avx512vl-vpbroadcastmb2q-1.c,
+	gcc.target/i386/avx512vl-vpbroadcastmw2d-1.c,
+	gcc.target/i386/avx512vl-vpcmpeqd-1.c,
+	gcc.target/i386/avx512vl-vpcmpeqq-1.c,
+	gcc.target/i386/avx512vl-vpcmpequd-1.c,
+	gcc.target/i386/avx512vl-vpcmpequq-1.c,
+	gcc.target/i386/avx512vl-vpcmpged-1.c,
+	gcc.target/i386/avx512vl-vpcmpgeq-1.c,
+	gcc.target/i386/avx512vl-vpcmpgeud-1.c,
+	gcc.target/i386/avx512vl-vpcmpgeuq-1.c,
+	gcc.target/i386/avx512vl-vpcmpgtd-1.c,
+	gcc.target/i386/avx512vl-vpcmpgtq-1.c,
+	gcc.target/i386/avx512vl-vpcmpgtud-1.c,
+	gcc.target/i386/avx512vl-vpcmpgtuq-1.c,
+	gcc.target/i386/avx512vl-vpcmpled-1.c,
+	gcc.target/i386/avx512vl-vpcmpleq-1.c,
+	gcc.target/i386/avx512vl-vpcmpleud-1.c,
+	gcc.target/i386/avx512vl-vpcmpleuq-1.c,
+	gcc.target/i386/avx512vl-vpcmpltd-1.c,
+	gcc.target/i386/avx512vl-vpcmpltq-1.c,
+	gcc.target/i386/avx512vl-vpcmpltud-1.c,
+	gcc.target/i386/avx512vl-vpcmpltuq-1.c,
+	gcc.target/i386/avx512vl-vpcmpneqd-1.c,
+	gcc.target/i386/avx512vl-vpcmpneqq-1.c,
+	gcc.target/i386/avx512vl-vpcmpnequd-1.c,
+	gcc.target/i386/avx512vl-vpcmpnequq-1.c,
+	gcc.target/i386/avx512vl-vptestmd-1.c,
+	gcc.target/i386/avx512vl-vptestmq-1.c,
+	gcc.target/i386/avx512vl-vptestnmd-1.c,
+	gcc.target/i386/avx512vl-vptestnmq-1.c: Permit %k0 as ordinary
+	operand.
+	* gcc.target/i386/avx512bw-vpcmpb-1.c,
+	gcc.target/i386/avx512bw-vpcmpub-1.c,
+	gcc.target/i386/avx512bw-vpcmpuw-1.c,
+	gcc.target/i386/avx512bw-vpcmpw-1.c,
+	gcc.target/i386/avx512dq-vfpclasspd-1.c,
+	gcc.target/i386/avx512dq-vfpclassps-1.c,
+	gcc.target/i386/avx512f-vcmppd-1.c,
+	gcc.target/i386/avx512f-vcmpps-1.c,
+	gcc.target/i386/avx512f-vcmpsd-1.c,
+	gcc.target/i386/avx512f-vcmpss-1.c,
+	gcc.target/i386/avx512f-vpcmpd-1.c,
+	gcc.target/i386/avx512f-vpcmpq-1.c,
+	gcc.target/i386/avx512f-vpcmpud-1.c,
+	gcc.target/i386/avx512f-vpcmpuq-1.c,
+	gcc.target/i386/avx512f-vptestmd-1.c,
+	gcc.target/i386/avx512f-vptestmq-1.c,
+	gcc.target/i386/avx512f-vptestnmd-1.c,
+	gcc.target/i386/avx512f-vptestnmq-1.c,
+	gcc.target/i386/avx512vl-vcmppd-1.c,
+	gcc.target/i386/avx512vl-vcmpps-1.c,
+	gcc.target/i386/avx512vl-vpcmpd-1.c,
+	gcc.target/i386/avx512vl-vpcmpq-1.c,
+	gcc.target/i386/avx512vl-vpcmpud-1.c,
+	gcc.target/i386/avx512vl-vpcmpuq-1.c: Likewise. Don't permit %k0
+	as mask operand.
+
+2019-01-03  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/88659
+	* gcc.dg/Wstringop-truncation-6.c: New test.
+
+2019-01-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/48543
+	* gfortran.dg/const_chararacter_merge.f90: Remove.
+
+2019-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/88644
+	* gcc.dg/debug/dwarf2/pr88644.c: New test.
+	* gcc.dg/debug/dwarf2/pr80263.c: Remove darwin hack.
+
+2019-01-03  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/pubtypes-2.c: Adjust expected pubtypes length.
+	* gcc.dg/pubtypes-3.c: Likewise.
+	* gcc.dg/pubtypes-4.c: Likewise.
+
+2019-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88636
+	* g++.target/i386/pr88636.C: New test.
+
+2019-01-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp1z/nodiscard3.C: Test locations too.
+
+2019-01-03  Martin Liska  <mliska@suse.cz>
+
+	PR testsuite/88436
+	* gcc.target/powerpc/pr54240.c: Scan phiopt2.
+
+2019-01-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/88612 - ICE with -Waddress-of-packed-member.
+	* g++.dg/warn/Waddress-of-packed-member1.C: New test.
+
+	PR c++/88631 - CTAD failing for value-initialization.
+	* g++.dg/cpp1z/class-deduction59.C: New test.
+
+	PR c++/81486 - CTAD failing with ().
+	* g++.dg/cpp1z/class-deduction60.C: New test.
+	* g++.dg/cpp1z/class-deduction61.C: New test.
+
+2019-01-02  Martin Sebor  <msebor@redhat.com>
+	    Jeff Law  <law@redhat.com>
+
+	* gcc.dg/strlenopt-36.c: Update.
+	* gcc.dg/strlenopt-45.c: Update.
+	* gcc.c-torture/execute/strlen-5.c: New test.
+	* gcc.c-torture/execute/strlen-6.c: New test.
+	* gcc.c-torture/execute/strlen-7.c: New test.
+
+2019-01-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR testsuite/87304
+	* gcc.dg/vect/bb-slp-over-widen-1.c: Expect basic block vectorized
+	messages only on vect_hw_misalign targets.
+
+2019-01-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* gfortran.dg/argument_checking_7.f90: Remove run-on error message.
+	* gfortran.dg/dec_d_lines_3.f: Ditto.
+	* gfortran.dg/dec_structure_24.f90: Ditto.
+	* gfortran.dg/dec_structure_26.f90: Ditto.
+	* gfortran.dg/dec_structure_27.f90: Ditto.
+	* gfortran.dg/dec_type_print_3.f90: Ditto.
+	* gfortran.dg/derived_name_1.f90: Ditto.
+	* gfortran.dg/error_recovery_1.f90: Ditto.
+	* gfortran.dg/gomp/pr29759.f90: Ditto.
+	* gfortran.dg/pr36192.f90: Ditto.
+	* gfortran.dg/pr56007.f90: Ditto.
+	* gfortran.dg/pr56520.f90: Ditto.
+	* gfortran.dg/pr78741.f90: Ditto.
+	* gfortran.dg/print_fmt_2.f90: Ditto.
+	* gfortran.dg/select_type_20.f90: Ditto.
+
+2019-01-02  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/86875
+	* g++.dg/cpp1y/lambda-generic-86875.C: New test.
+
+2019-01-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/48543
+	* gfortran.dg/const_chararacter_merge.f90: New test.
+
+2019-01-02  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR lto/88130
+	* g++.dg/torture/pr88130.C: New testcase.
+
+2019-01-02  Martin Liska  <mliska@suse.cz>
+
+	PR tree-optimization/88650
+	* gfortran.dg/predict-3.f90: New test.
+
+2019-01-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.dg/gcov/pr88263.C: Rename namespace log to logging.
+
+2019-01-02  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88621
+	* gcc.dg/torture/pr88621.c: New testcase.
+
+2019-01-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ipa/88561
+	* g++.dg/tree-prof/devirt.C: Expect _ZThn16 only for lp64 and llp64
+	targets and expect _ZThn8 for ilp32 targets.
+
+2019-01-01  Martin Sebor  <msebor@redhat.com>
+	    Jeff Law  <law@redhat.com>
+
+	* gcc.dg/strlenopt-40.c: Update.
+	* gcc.dg/strlenopt-51.c: Likewise.
+	* gcc.dg/tree-ssa/pr79376.c: Likewise.
+
+	* gcc.dg/strlenopt-40.c: Disable a couple tests.
+	* gcc.dg/strlenopt-48.c: Twiddle test slightly.
+	* gcc.dg/strlenopt-59.c: New test.
+	* gcc.dg/tree-ssa/builtin-snprintf-5.c: New test.
+	* g++.dg/init/strlen.C: New test.
+
+2019-01-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/82743
+	* gfortran.dg/structure_constructor_16.f90: New test.
+
+2019-01-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/ipa/devirt-36.C: Add dg-do-compile.
+	* g++.dg/ipa/devirt-53.C: Fix scan template.
+
+2019-01-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/lto/devirt-13_0.C: Drop broken scan of ssa dump.
+	* g++.dg/lto/devirt-14_0.C: Drop broken scan of ssa dump.
+	* g++.dg/lto/devirt-23_0.C: Add -fdump-ipa-cp.
+
+2019-01-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* g++.dg/tree-prof/devirt.C: Update testcase.
+
+2019-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+	Update copyright years.
+
+Copyright (C) 2019 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
+2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/91497
 	* gfortran.dg/pr91497.f90: Run on i?86-*-* and x86_64-*-* only.
 
diff --git a/gcc/testsuite/gfortran.dg/pr47054_1.f90 b/gcc/testsuite/gfortran.dg/pr47054_1.f90
new file mode 100644
index 0000000..3665edb
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr47054_1.f90
@@ -0,0 +1,15 @@
+! { dg-do compile }
+! { dg-options "-fcray-pointer" }
+! PR fortran/47054
+subroutine host_sub
+   implicit none
+   real xg
+   pointer (paxg, xg)
+   call internal_sub
+   contains 
+      subroutine internal_sub
+         implicit none
+         real xg
+         pointer (paxg, xg)
+      end subroutine internal_sub
+end subroutine host_sub
diff --git a/gcc/testsuite/gfortran.dg/pr47054_2.f90 b/gcc/testsuite/gfortran.dg/pr47054_2.f90
new file mode 100644
index 0000000..3b7c4aaf
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr47054_2.f90
@@ -0,0 +1,41 @@
+! { dg-do compile }
+! { dg-options "-fcray-pointer" }
+! PR fortran/47054
+! Code contributed by Deji Akingunola <deji_aking at yahoo dot ca>
+subroutine host_sub(F_su,F_nk)
+   implicit none
+   
+   integer :: F_nk
+   real,dimension(F_nk) :: F_su
+      integer G_ni, G_nj
+      real*8 G_xg_8, G_yg_8
+      pointer (paxg_8, G_xg_8(G_ni))
+      pointer (payg_8, G_yg_8(G_nj))
+      common / G_p / paxg_8,payg_8
+      common / G / G_ni, G_nj
+   
+   call internal_sub(F_su,F_nk)
+   return
+contains 
+   
+   subroutine internal_sub(F_su,F_nk)
+      implicit none
+      integer G_ni, G_nj
+      real*8 G_xg_8, G_yg_8
+      pointer (paxg_8, G_xg_8(G_ni))
+      pointer (payg_8, G_yg_8(G_nj))
+      common / G_p / paxg_8,payg_8
+      common / G / G_ni, G_nj
+     
+      integer :: F_nk
+      real,dimension(F_nk) :: F_su 
+      integer k,k2
+      
+      k2 = 0
+      do k = 1, F_nk, 2
+         k2 = k2+1
+               F_su(k) = F_su(k) + 1.0
+      enddo
+      return
+   end subroutine internal_sub
+end subroutine host_sub
-- 
cgit v1.1


From 6c291ad828fcb5f01a1d2cb23f6078e9a6f958b9 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Sat, 5 Oct 2019 23:36:46 +0200
Subject: ipa-inline.c: Fix type; compute size rather than self_size for size
 of caller function.

	* ipa-inline.c: Fix type; compute size rather than self_size
	for size of caller function.

From-SVN: r276629
---
 gcc/ChangeLog    | 5 +++++
 gcc/ipa-inline.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e855712..d4e180d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-05  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-inline.c: Fix type; compute size rather than self_size
+	for size of caller function.
+
 2019-10-05  Iain Sandoe  <iain@sandoe.co.uk>
 
 	PR target/59888
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 2801cb9..681801a 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1186,7 +1186,7 @@ edge_badness (struct cgraph_edge *edge, bool dump)
 	     if (need_more_work)
 	       noninline_callee ();
 	   }
-	 Withhout panilizing this case, we usually inline noninline_callee
+	 Withhout penalizing this case, we usually inline noninline_callee
 	 into the inline_caller because overall_growth is small preventing
 	 further inlining of inline_caller.
 
@@ -1243,7 +1243,7 @@ edge_badness (struct cgraph_edge *edge, bool dump)
 	    overall_growth += 256 * 256 - 256;
 	  denominator *= overall_growth;
         }
-      denominator *= ipa_fn_summaries->get (caller)->self_size + growth;
+      denominator *= ipa_fn_summaries->get (caller)->size + growth;
 
       badness = - numerator / denominator;
 
-- 
cgit v1.1


From f24b653c39de27c89a944de264bee5eedfb951d8 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Sat, 5 Oct 2019 22:40:07 +0000
Subject: 2019-0105  Steven G. Kargl  <kargl@gcc.gnu.org>

	In my previous commit, I managed to include a duplicate copy
	of the ChangeLog file.  This commit removes the duplicate
	portion.

From-SVN: r276630
---
 gcc/testsuite/ChangeLog | 14161 ----------------------------------------------
 1 file changed, 14161 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2397eec..2c7d62a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -14164,14164 +14164,3 @@ Copyright (C) 2019 Free Software Foundation, Inc.
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
-
-2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91497
-	* gfortran.dg/pr91497.f90: Run on i?86-*-* and x86_64-*-* only.
-
-2019-10-05  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91926
-	* gfortran.dg/ISO_Fortran_binding_13.f90 : New test.
-	* gfortran.dg/ISO_Fortran_binding_13.c : Additional source.
-	* gfortran.dg/ISO_Fortran_binding_14.f90 : New test.
-
-2019-10-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/91369 - Implement P0784R7: constexpr new
-	* g++.dg/cpp0x/constexpr-delete2.C: Adjust expected diagnostics for
-	c++2a.
-	* g++.dg/cpp0x/locations1.C: Only expect constexpr ~S() diagnostics
-	in c++17_down, adjust expected wording.
-	* g++.dg/cpp1y/constexpr-new.C: Only expect diagnostics in c++17_down.
-	* g++.dg/cpp2a/constexpr-dtor1.C: New test.
-	* g++.dg/cpp2a/constexpr-dtor2.C: New test.
-	* g++.dg/cpp2a/constexpr-dtor3.C: New test.
-	* g++.dg/cpp2a/constexpr-new1.C: New test.
-	* g++.dg/cpp2a/constexpr-new2.C: New test.
-	* g++.dg/cpp2a/constexpr-new3.C: New test.
-	* g++.dg/cpp2a/constexpr-new4.C: New test.
-	* g++.dg/cpp2a/feat-cxx2a.C: Add __cpp_constinit and
-	__cpp_constexpr_dynamic_alloc tests.  Tweak __cpp_* tests for c++2a
-	features to use style like older features, including #ifdef test.
-	* g++.dg/ext/is_literal_type3.C: New test.
-
-	PR tree-optimization/91734
-	* gcc.dg/pr91734.c: New test.
-
-2019-10-04  Joseph Myers  <joseph@codesourcery.com>
-
-	PR c/82752
-	* gcc.dg/format/c2x-strftime-1.c: New test.
-
-2019-10-04  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/91977
-	* gcc.dg/Wstringop-overflow-18.c: New test.
-
-2019-10-04  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/Wstringop-overflow-17.c: New test.
-
-2019-10-04  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran.91959
-	* gfortran.dg/pr91959.f90: New test.
-
-2019-10-04  Rafael Tsuha  <rafael.tsuha@usp.br>
-
-        * gcc.dg/sinhovercosh-1.c: New test.
-
-2019-10-04  Joseph Myers  <joseph@codesourcery.com>
-
-	* gcc.dg/c11-builtins-1.c, gcc.dg/c2x-builtins-1.c,
-	gcc.dg/dfp/c2x-builtins-dfp-1.c: New tests.
-
-2019-10-04  Mark Eggleston <mark.eggleston@codethink.com>
-
-	* gfortran.dg/auto_in_equiv_1.f90: Replaced.
-	* gfortran.dg/auto_in_equiv_2.f90: Replaced.
-	* gfortran.dg/auto_in_equiv_3.f90: Deleted.
-
-2019-10-04  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/torture/simd-abi-8.c: Use -mlittle-endian.
-	Check that there are no Q register saves or restores.
-
-2019-10-04  Richard Biener  <rguenther@suse.de>
-
-	* gcc.c-torture/execute/loop-3.c: Fix undefined behavior.
-
-2019-10-04  Yuliang Wang  <yuliang.wang@arm.com>
-
-	* gcc.target/aarch64/sve2/shracc_1.c: Tighten scan-assembler-nots
-	to avoid matching scalar code.
-
-2019-10-04  Tobias Burnus  <tobias@codesourcery.com>
-
-	* gfortran.dg/use_without_only_1.f90: Update column num in dg-warning.
-
-2019-10-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/71504
-	* g++.dg/cpp0x/constexpr-array21.C: New test.
-	* g++.dg/cpp1y/constexpr-array7.C: New test.
-	* g++.dg/cpp1z/constexpr-array1.C: New test.
-
-2019-10-04  Jason Merrill  <jason@redhat.com>
-
-	PR c++/71504
-	* g++.dg/cpp0x/constexpr-array20.C: New test.
-
-2019-10-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/91974
-	* g++.dg/cpp1z/eval-order5.C: New test.
-
-2019-10-03  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91497
-	* gfortran.dg/pr91497.f90: New test.
-
-2019-10-03  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/tree-ssa/pr61034.C: Add --param max-inline-insns-single-O2=200.
-
-2019-10-03  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
-
-	PR target/91769
-	* gcc.target/mips/pr91769.c: New test.
-
-2019-10-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* g++.dg/cpp0x/gen-attrs-67.C: Expect constructor priorities error
-	on any !init_priority target.
-
-2019-10-03  Thomas Koenig <tkoenig@gcc.gnu.org>
-
-	PR fortran/84487
-	* gfortran.dg/typebound_call_22.f03: xfail.
-
-2019-10-03 Mark Eggleston <mark.eggleston@codethink.com>
-
-	* gfortran.dg/bad_operands.f90: New test.
-	* gfortran.dg/character mismatch.f90: New test.
-	* gfortran.dg/compare_interfaces.f90: New test.
-	* gfortran.dg/hollerith_to_char_parameter_1.f90: New test.
-	* gfortran.dg/hollerith_to_char_parameter_2.f90: New test.
-	* gfortran.dg/widechar_intrinsics_1.f90: Checked for specific character
-	type names instead of "Type of argument".
-	* gfortran.dg/widechar_intrinsics_2.f90: Checked for specific character
-	type names instead of "Type of argument".
-	* gfortran.dg/widechar_intrinsics_3.f90: Checked for specific character
-	type names instead of "Type of argument".
-
-2019-10-02  Joseph Myers  <joseph@codesourcery.com>
-
-	* gcc.dg/cr-decimal-dig-2.c: New test.
-	* gcc.dg/limits-width-2.c: New test.  Based on limits-width-1.c.
-	* gcc.dg/stdint-width-2.c: New test.  Based on stdint-width-1.c.
-
-2019-10-03  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/integral-array-size-1.C: New.
-	* g++.dg/cpp0x/alias-decl-1.C: Test location(s) too.
-	* g++.dg/init/new43.C: Likewise.
-	* g++.dg/lookup/friend12.C: Likewise.
-	* g++.dg/lookup/pr79766.C: Likewise.
-	* g++.dg/lookup/pr84375.C: Likewise.
-	* g++.dg/other/new-size-type.C: Likewise.
-
-2019-10-03  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/ext/constexpr-attr-cleanup1.C: New test.
-
-2019-10-02  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/80936
-	* gcc.dg/Wnonnull-2.c: New test.
-	* gcc.dg/Wnonnull-3.c: New test.
-	* gcc.dg/nonnull-3.c: Expect more warnings.
-
-2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91784
-	* gfortran.dg/pr91784.f90: New test.
-
-2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91785
-	* gfortran.dg/pr91785.f90: New test.
-
-2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91942
-	* gfortran.dg/pr91587.f90: Update dg-error regex.
-	* gfortran.dg/pr91942.f90: New test.
-
-2019-10-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91943
-	gfortran.dg/pr91943.f90
-
-2019-10-02  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/tree-ssa/pr53844.C: Add -fno-inline-functions --param
-	max-inline-insns-single-O2=200.
-	* gcc.c-torture/execute/builtins/builtins.exp: Add
-	-fno-inline-functions to additional_flags.
-	* gcc.dg/ipa/inline-7.c: Add -fno-inline-functions.
-	* gcc.dg/optimize-bswapsi-5.c: Add -fno-inline-functions.
-	* gcc.dg/tree-ssa/ssa-thread-12.c: Add --param
-	early-inlining-insns-O2=14 -fno-inline-functions; revert previous
-	change.
-	* gcc.dg/winline-3.c: Use --param max-inline-insns-single-O2=1
-	--param inline-min-speedup-O2=100
-	instead of --param max-inline-insns-single=1 --param
-	inline-min-speedup=100
-
-2019-10-02  Alexander Monakov  <amonakov@ispras.ru>
-
-	PR rtl-optimization/87047
-	* gcc.dg/pr87047.c: New test.
-
-2019-10-02  Martin Jambor  <mjambor@suse.cz>
-
-	PR testsuite/91842
-	* gcc.dg/ipa/ipa-sra-19.c: Skip on powerpc.
-
-2019-10-02  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt82.adb: New test.
-	* gnat.dg/opt82_pkg.ads: New helper.
-
-2019-10-02  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/mips/call-clobbered-3.c: Remove skip for -Os.
-	* gcc.target/mips/call-clobbered-4.c: Delete.
-
-2019-10-02  Tobias Burnus  <tobias@codesourcery.com>
-
-	* gfortran.dg/gomp/is_device_ptr-1.f90: New.
-
-2019-10-02  Richard Biener  <rguenther@suse.de>
-
-	PR c++/91606
-	* g++.dg/torture/pr91606.C: New testcase.
-
-2019-10-02  Tobias Burnus  <tobias@codesourcery.com>
-
-	* gfortran.dg/goacc/asyncwait-1.f95: Handle new error message.
-	* gfortran.dg/goacc/asyncwait-2.f95: Likewise.
-	* gfortran.dg/goacc/asyncwait-3.f95: Likewise.
-	* gfortran.dg/goacc/asyncwait-4.f95: Likewise.
-	* gfortran.dg/goacc/default-2.f: Likewise.
-	* gfortran.dg/goacc/enter-exit-data.f95: Likewise.
-	* gfortran.dg/goacc/if.f95: Likewise.
-	* gfortran.dg/goacc/list.f95: Likewise.
-	* gfortran.dg/goacc/literal.f95: Likewise.
-	* gfortran.dg/goacc/loop-2-kernels-tile.f95: Likewise.
-	* gfortran.dg/goacc/loop-2-parallel-tile.f95: Likewise.
-	* gfortran.dg/goacc/loop-7.f95: Likewise.
-	* gfortran.dg/goacc/parallel-kernels-clauses.f95: Likewise.
-	* gfortran.dg/goacc/routine-6.f90: Likewise.
-	* gfortran.dg/goacc/several-directives.f95: Likewise.
-	* gfortran.dg/goacc/sie.f95: Likewise.
-	* gfortran.dg/goacc/tile-1.f90: Likewise.
-	* gfortran.dg/goacc/update-if_present-2.f90: Likewise.
-	* gfortran.dg/gomp/declare-simd-1.f90: Likewise.
-	* gfortran.dg/gomp/pr29759.f90: Likewise.
-
-2019-10-02  Tobias Burnus  <tobias@codesourcery.com>
-
-	* libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90: New.
-
-2019-10-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91940
-	* gcc.dg/vect/vect-bswap16.c: Add -msse4 on x86, run on all targets,
-	expect vectorized 1 loops message on both vect_bswap and sse4_runtime
-	targets.
-	* gcc.dg/vect/vect-bswap16a.c: New test.
-
-2019-10-02  Joseph Myers  <joseph@codesourcery.com>
-
-	* gcc.dg/asm-scope-1.c, gcc.dg/cpp/c11-scope-1.c,
-	gcc.dg/cpp/c17-scope-1.c, gcc.dg/cpp/c2x-scope-1.c,
-	gcc.dg/cpp/c2x-scope-2.c, gcc.dg/cpp/c90-scope-1.c,
-	gcc.dg/cpp/c94-scope-1.c, gcc.dg/cpp/c99-scope-1.c,
-	gcc.dg/cpp/gnu11-scope-1.c, gcc.dg/cpp/gnu17-scope-1.c,
-	gcc.dg/cpp/gnu89-scope-1.c, gcc.dg/cpp/gnu99-scope-1.c: New tests.
-
-2019-10-01  David Malcolm  <dmalcolm@redhat.com>
-
-	* gcc.dg/plugin/diagnostic_group_plugin.c (test_begin_group_cb):
-	Clear the prefix before emitting the "END GROUP" line.
-	* gcc.dg/plugin/diagnostic_plugin_test_show_locus.c
-	(custom_diagnostic_finalizer): Temporarily clear prefix when
-	calling diagnostic_show_locus, rather than destroying it
-	afterwards.
-
-2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-10.c: New testcase.
-	* gcc.dg/tree-ssa/alias-access-path-11.c: New testcase.
-
-2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/lto/odr-6_0.C: New testcase.
-	* g++.dg/lto/odr-6_1.c: New testcase.
-
-2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* gcc.dg/tree-ssa/ssa-thread-12.c: Fix warning introduced by my
-	previous change.
-
-2019-10-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/tree-ssa/pr61034.C: Set early-inlining-insns-O2=14.
-	* g++.dg/tree-ssa/pr8781.C: Likewise.
-	* g++.dg/warn/Wstringop-truncation-1.C: Likewise.
-	* gcc.dg/ipa/pr63416.c: likewise.
-	* gcc.dg/vect/pr66142.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-thread-12.c: Mark compure_idf inline.
-
-2019-10-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/91925
-	* g++.dg/conversion/packed2.C: New test.
-
-2019-10-01  Bill Schmidt  <wschmdit@linux.ibm.com>
-
-	* gcc.target/powerpc/pr91275.c: New.
-
-2019-10-01  Alexandre Oliva <oliva@adacore.com>
-
-	* gcc.dg/torture/pr41094.c: Introduce intermediate variable.
-
-	PR debug/91507
-	* gcc.dg/debug/dwarf2/array-0.c: New.
-	* gcc.dg/debug/dwarf2/array-1.c: New.
-	* gcc.dg/debug/dwarf2/array-2.c: New.
-	* gcc.dg/debug/dwarf2/array-3.c: New.
-	* g++.dg/debug/dwarf2/array-0.C: New.
-	* g++.dg/debug/dwarf2/array-1.C: New.
-	* g++.dg/debug/dwarf2/array-2.C: New.  Based on libstdc++-v3's
-	src/c++98/pool_allocator.cc:__pool_alloc_base::_S_heap_size.
-	* g++.dg/debug/dwarf2/array-3.C: New.  Based on
-	gcc's config/i386/i386-features.c:xlogue_layout::s_instances.
-	* g++.dg/debug/dwarf2/array-4.C: New.
-
-2019-10-01  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/diag-aka-1.c (T): Turn into a pointer typedef.
-	(foo): Update accordingly.
-	* gcc.dg/diag-aka-4.c: New test.
-
-2019-10-01  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/diag-aka-3.c: New test.
-	* gcc.target/aarch64/diag_aka_1.c: New test.
-	* g++.dg/diagnostic/aka4.C: New test.
-
-2019-10-01  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/torture/simd-abi-10.c: New test.
-	* gcc.target/aarch64/torture/simd-abi-11.c: Likewise.
-
-2019-09-30  Yuliang Wang  <yuliang.wang@arm.com>
-
-	* gcc.dg/vect/vect-sdiv-pow2-1.c: New test.
-	* gcc.target/aarch64/sve/asrdiv_1.c: As above.
-	* lib/target-supports.exp (check_effective_target_vect_sdiv_pow2_si):
-	Return true for AArch64 with SVE.
-
-2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/torture/simd-abi-9.c: New test.
-
-2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/torture/simd-abi-8.c: New test.
-
-2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/Wincompatible-pointer-types-1.c (f1): Expect only one
-	space between the comma and "...".
-
-2019-09-30  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/91853
-	* gcc.dg/ipa/pr91853.c: New test.
-
-2019-09-30  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/91931
-	* gcc.target/i386/pr91931.c: New test.
-
-2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91641
-	* gfortran.dg/pr91641.f90: New test.
-
-2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91714
-	* gfortran.dg/dec_type_print_3.f90: Update dg-error regex.
-	* gfortran.dg/pr91714.f90: New test.
-
-2019-09-29  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91726
-	* gfortran.dg/coarray_poly_9.f90 : New test.
-
-2019-09-29  Kewen Lin  <linkw@gcc.gnu.org>
-
-	* gcc.target/powerpc/conv-vectorize-1.c: New test.
-	* gcc.target/powerpc/conv-vectorize-2.c: New test.
-
-2019-09-28  Steven G. Kargl  <kargl@gcc.ngu.org>
-
-	PR fortran/91802
-	* gfortran.dg/pr91802.f90: New test.
-
-2019-09-28  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91864
-	* gcc/testsuite/gfortran.dg/pr91864.f90
-
-2019-09-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91889 - follow-up fix for DR 2352.
-	* g++.dg/cpp0x/ref-bind3.C: Add dg-error.
-	* g++.dg/cpp0x/ref-bind4.C: New test.
-	* g++.dg/cpp0x/ref-bind5.C: New test.
-	* g++.dg/cpp0x/ref-bind6.C: New test.
-	* g++.old-deja/g++.pt/spec35.C: Revert earlier change.
-
-	PR c++/91921 - stray warning with -Woverloaded-virtual.
-	* g++.dg/warn/Woverloaded-2.C: New.
-	* g++.dg/warn/Woverloaded-2.h: New.
-	* g++.dg/warn/pr61945.C: Turn dg-warning into dg-message.
-	* g++.old-deja/g++.mike/warn6.C: Likewise.
-	* g++.old-deja/g++.warn/virt1.C: Likewise.
-
-	PR c++/91923 - failure-to-SFINAE with class type NTTP in C++17.
-	* g++.dg/cpp0x/nontype5.C: New test.
-
-2019-09-28  Alan Modra  <amodra@gmail.com>
-
-	PR testsuite/91676
-	PR rtl-optimization/91656
-	* gcc.dg/torture/pr91656-1.c: Correct for big and pdp endian.
-	* gcc.dg/torture/pr91656-2.c: Likewise.
-	* gcc.dg/torture/pr91656-3.c: Likewise.
-
-2019-09-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/88203
-	* c-c++-common/gomp/pr88203-1.c: New test.
-	* c-c++-common/gomp/pr88203-2.c: New test.
-	* c-c++-common/gomp/pr88203-3.c: New test.
-
-	PR middle-end/91920
-	* c-c++-common/gomp/pr91920.c: New test.
-
-	PR target/91919
-	* gcc.c-torture/compile/pr91919.c: New test.
-
-2019-09-27  Manfred Schwarb  <manfred99@gmx.ch>
-
-	* gfortran.dg/associate_48.f90: Fix a dg directive.
-	* gfortran.dg/auto_in_equiv_1.f90: Ditto.
-	* gfortran.dg/auto_in_equiv_2.f90: Ditto.
-	* gfortran.dg/lto/pr87689_0.f: Ditto.
-
-2019-09-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91885
-	* gcc.dg/pr91885.c (__int64_t): Change from long to long long.
-	(__uint64_t): Change from unsigned long to unsigned long long.
-
-2019-09-27  Yuliang Wang  <yuliang.wang@arm.com>
-
-	* gcc.target/aarch64/sve2/shracc_1.c: New test.
-
-2019-09-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.dg/cpp/ucs.c: Add test for new warning and adjust.
-	* gcc.dg/cpp/utf8-5byte-1.c: Add -w to the options.
-	* gcc.dg/attr-alias-5.c: Likewise.
-	* g++.dg/cpp/ucn-1.C: Add test for new warning.
-	* g++.dg/cpp2a/ucn1.C: New test.
-
-2019-09-26  Max Filippov  <jcmvbkbc@gmail.com>
-
-	* gcc.target/xtensa/pr91880.c: New test case.
-	* gcc.target/xtensa/xtensa.exp: New test suite.
-
-2019-09-26  Will Schmidt <will_schmidt@vnet.ibm.com>
-
-	* gcc.target/powerpc/pure-builtin-redundant-load.c:  New.
-
-2019-09-26  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/91897
-	* gcc.target/i386/pr91897.c: New testcase.
-
-2019-09-26  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91914
-	* gcc.dg/strlenopt-79.c: New test.
-
-2019-09-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* gcc.target/arm/acle/simd32.c: Update test.
-
-2019-09-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_simd32_ok_nocache): New procedure.
-	(check_effective_target_arm_simd32_ok): Likewise.
-	(add_options_for_arm_simd32): Likewise.
-	* gcc.target/arm/acle/simd32.c: New test.
-
-2019-09-26  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/arm/fp16-compile-alt-3.c: Expect (__fp16) -2.0
-	to be written as a negative short rather than a positive one.
-	* gcc.target/arm/fp16-compile-ieee-3.c: Likewise.
-
-2019-09-26  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/91885
-	* gcc.dg/pr91885.c: New test.
-
-2019-09-25  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91877 - ICE with converting member of packed struct.
-	* g++.dg/conversion/packed1.C: New test.
-
-2019-09-25  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91896
-	* gcc.dg/torture/pr91896.c: New testcase.
-
-2019-09-25  Martin Liska  <mliska@suse.cz>
-
-	* gcc.target/s390/pr91014.c: Move to ...
-	* gcc.dg/pr91014.c: ... this.
-
-2019-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/redeclaration-1.C: New.
-	* g++.dg/lookup/extern-c-hidden.C: Test location(s) too.
-	* g++.dg/lookup/extern-c-redecl.C: Likewise.
-	* g++.dg/lookup/extern-c-redecl6.C: Likewise.
-	* g++.old-deja/g++.other/using9.C: Likewise.
-
-2019-09-23  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91570
-	* gcc.dg/pr91570.c: New test.
-
-2019-09-24  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91868 - improve -Wshadow location.
-	* g++.dg/warn/Wshadow-16.C: New test.
-
-	PR c++/91845 - ICE with invalid pointer-to-member.
-	* g++.dg/cpp1y/pr91845.C: New test.
-
-2019-09-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* gcc.target/aarch64/nosplit-di-const-volatile_1.c: New test.
-
-2019-09-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91866
-	* gcc.dg/tree-ssa/pr91866.c: New test.
-
-2019-09-24  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/91831
-	* g++.dg/ipa/pr91831.C: New test.
-
-2019-09-24  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/91832
-	* gcc.dg/ipa/pr91832.c: New test.
-
-2019-09-24  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/torture/20190924-1.c: New testcase.
-
-2019-09-23  Maciej W. Rozycki  <macro@wdc.com>
-
-	* lib/gnat.exp (gnat_target_compile): Pass the `ada' option to
-	`target_compile'.
-
-2019-09-23  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/pr68724.C: Check location(s) too.
-	* g++.dg/cpp0x/variadic38.C: Likewise.
-	* g++.dg/cpp1z/nontype2.C: Likewise.
-	* g++.dg/parse/explicit1.C: Likewise.
-	* g++.dg/template/crash11.C: Likewise.
-	* g++.dg/template/non-dependent8.C: Likewise.
-	* g++.dg/template/nontype-array1.C: Likewise.
-	* g++.dg/template/nontype3.C: Likewise.
-	* g++.dg/template/nontype8.C: Likewise.
-	* g++.dg/template/partial5.C: Likewise.
-	* g++.dg/template/spec33.C: Likewise.
-	* g++.old-deja/g++.pt/memtemp64.C: Likewise.
-	* g++.old-deja/g++.pt/spec20.C: Likewise.
-	* g++.old-deja/g++.pt/spec21.C: Likewise.
-	* g++.old-deja/g++.robertl/eb103.C: Likewise.
-
-2019-09-23  Sandra Loosemore  <sandra@codesourcery.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_vfp_ok_nocache): New.
-	(check_effective_target_arm_vfp_ok): Rewrite.
-	(add_options_for_arm_vfp): New.
-	(add_options_for_sqrt_insn): Add options for arm.
-	* gcc.target/arm/attr-neon-builtin-fail2.c: Use dg-add-options.
-	* gcc.target/arm/short-vfp-1.c: Likewise.
-
-2019-09-23  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91844 - Implement CWG 2352, Similar types and reference binding.
-	* g++.dg/cpp0x/pr33930.C: Add dg-error.
-	* g++.dg/cpp0x/ref-bind1.C: New test.
-	* g++.dg/cpp0x/ref-bind2.C: New test.
-	* g++.dg/cpp0x/ref-bind3.C: New test.
-	* g++.old-deja/g++.pt/spec35.C: Remove dg-error.
-
-2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.dg/ucnid-5-utf8.c: Skip unless ucn is supported.
-
-2019-09-23  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91729
-	* gfortran.dg/select_rank_2.f90 : Add two more errors in foo2.
-	* gfortran.dg/select_rank_3.f90 : New test.
-
-2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gnat.dg/system_info1.adb: Sort dg-do target list.
-	Add *-*-solaris2.*.
-
-2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/compile_time1.ads: New test.
-	* gnat.dg/specs/compile_time1_pkg.ads: New helper.
-
-2019-09-22  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91819 - ICE with operator++ and enum.
-	* g++.dg/other/operator4.C: New test.
-
-2019-09-21  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/91830
-	* gcc/testsuite/gcc.dg/Warray-bounds-47.c: New test.
-
-2019-09-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/30277
-	* g++.dg/expr/bitfield14.C (struct S): Use signed long long instead
-	of signed long.
-	(foo): Use long long instead of long.
-
-2019-09-21  Marek Polacek  <polacek@redhat.com>
-
-	DR 2345 - Jumping across initializers in init-statements and conditions.
-	* g++.dg/cpp1z/init-statement10.C: New test.
-
-2019-09-21  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/cond_convert_1.c: Remove XFAILs.
-	* gcc.target/aarch64/sve/cond_convert_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
-
-2019-09-20  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/naked-1.c: Alter options to use non-
-	PIC codegen for m32 Darwin.
-
-2019-09-20  Tobias Burnus  <tobias@codesourcery.com>
-
-	PR fortran/78260
-	* gfortran.dg/goacc/parameter.f95: Change
-	dg-error as it is now detected earlier.
-	* gfortran.dg/goacc/pr85701.f90: Modify to
-	use a separate result variable.
-	* gfortran.dg/goacc/pr78260.f90: New.
-	* gfortran.dg/goacc/pr78260-2.f90: New.
-	* gfortran.dg/gomp/pr78260.f90: New.
-	* gfortran.dg/gomp/pr78260-2.f90: New.
-	* gfortran.dg/gomp/pr78260-3.f90: New.
-
-2019-09-20  Olivier Hainque  <hainque@adacore.com>
-
-	* gnat.dg/system_info1.adb: Restrict to *-*-linux* and *-*-mingw*.
-
-2019-09-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.dg/pr91269.c: New test.
-
-2019-09-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.dg/typedef-var-1.c: New test.
-	* gcc.dg/typedef-var-2.c: Likewise.
-
-2019-09-20  Martin Jambor  <mjambor@suse.cz>
-
-	* g++.dg/ipa/pr81248.C: Adjust dg-options and dump-scan.
-	* gcc.dg/ipa/ipa-sra-1.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-10.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-11.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-3.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-4.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-5.c: Likewise.
-	* gcc.dg/ipa/ipacost-2.c: Disable ipa-sra.
-	* gcc.dg/ipa/ipcp-agg-9.c: Likewise.
-	* gcc.dg/ipa/pr78121.c: Adjust scan pattern.
-	* gcc.dg/ipa/vrp1.c: Likewise.
-	* gcc.dg/ipa/vrp2.c: Likewise.
-	* gcc.dg/ipa/vrp3.c: Likewise.
-	* gcc.dg/ipa/vrp7.c: Likewise.
-	* gcc.dg/ipa/vrp8.c: Likewise.
-	* gcc.dg/noreorder.c: use noipa attribute instead of noinline.
-	* gcc.dg/ipa/20040703-wpa.c: New test.
-	* gcc.dg/ipa/ipa-sra-12.c: New test.
-	* gcc.dg/ipa/ipa-sra-13.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-14.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-15.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-16.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-17.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-18.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-19.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-20.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-21.c: Likewise.
-	* gcc.dg/ipa/ipa-sra-22.c: Likewise.
-	* gcc.dg/sso/ipa-sra-1.c: Likewise.
-	* g++.dg/ipa/ipa-sra-2.C: Likewise.
-	* g++.dg/ipa/ipa-sra-3.C: Likewise.
-	* gcc.dg/tree-ssa/ipa-cp-1.c: Make return value used.
-	* g++.dg/ipa/devirt-19.C: Add missing return, add -fipa-cp-clone
-	option.
-	* g++.dg/lto/devirt-19_0.C: Add -fipa-cp-clone option.
-	* gcc.dg/ipa/ipa-sra-2.c: Removed.
-	* gcc.dg/ipa/ipa-sra-6.c: Likewise.
-
-2019-09-19  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/91631
-	* /c-c++-common/Warray-bounds-3.c: Correct expected offsets.
-	* /c-c++-common/Warray-bounds-4.c: Same.
-	* gcc.dg/Warray-bounds-39.c: Remove xfails.
-	* gcc.dg/Warray-bounds-45.c: New test.
-	* gcc.dg/Warray-bounds-46.c: New test.
-
-2019-09-19  Lewis Hyatt  <lhyatt@gmail.com>
-
-	PR c/67224
-	* c-c++-common/cpp/ucnid-2011-1-utf8.c: New test.
-	* g++.dg/cpp/ucnid-1-utf8.C: New test.
-	* g++.dg/cpp/ucnid-2-utf8.C: New test.
-	* g++.dg/cpp/ucnid-3-utf8.C: New test.
-	* g++.dg/cpp/ucnid-4-utf8.C: New test.
-	* g++.dg/other/ucnid-1-utf8.C: New test.
-	* gcc.dg/cpp/ucnid-1-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-10-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-11-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-12-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-13-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-14-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-15-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-2-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-3-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-4-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-6-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-7-utf8.c: New test.
-	* gcc.dg/cpp/ucnid-9-utf8.c: New test.
-	* gcc.dg/ucnid-1-utf8.c: New test.
-	* gcc.dg/ucnid-10-utf8.c: New test.
-	* gcc.dg/ucnid-11-utf8.c: New test.
-	* gcc.dg/ucnid-12-utf8.c: New test.
-	* gcc.dg/ucnid-13-utf8.c: New test.
-	* gcc.dg/ucnid-14-utf8.c: New test.
-	* gcc.dg/ucnid-15-utf8.c: New test.
-	* gcc.dg/ucnid-16-utf8.c: New test.
-	* gcc.dg/ucnid-2-utf8.c: New test.
-	* gcc.dg/ucnid-3-utf8.c: New test.
-	* gcc.dg/ucnid-4-utf8.c: New test.
-	* gcc.dg/ucnid-5-utf8.c: New test.
-	* gcc.dg/ucnid-6-utf8.c: New test.
-	* gcc.dg/ucnid-7-utf8.c: New test.
-	* gcc.dg/ucnid-8-utf8.c: New test.
-	* gcc.dg/ucnid-9-utf8.c: New test.
-
-2019-09-19  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/pr89313.c: Test for __POWERPC__ in addition to
-	__powerpc__ in register name selection.
-
-2019-09-19  Richard Henderson  <richard.henderson@linaro.org>
-
-	* gcc.target/aarch64/atomic-op-acq_rel.c: Use -mno-outline-atomics.
-	* gcc.target/aarch64/atomic-comp-swap-release-acquire.c: Likewise.
-	* gcc.target/aarch64/atomic-op-acquire.c: Likewise.
-	* gcc.target/aarch64/atomic-op-char.c: Likewise.
-	* gcc.target/aarch64/atomic-op-consume.c: Likewise.
-	* gcc.target/aarch64/atomic-op-imm.c: Likewise.
-	* gcc.target/aarch64/atomic-op-int.c: Likewise.
-	* gcc.target/aarch64/atomic-op-long.c: Likewise.
-	* gcc.target/aarch64/atomic-op-relaxed.c: Likewise.
-	* gcc.target/aarch64/atomic-op-release.c: Likewise.
-	* gcc.target/aarch64/atomic-op-seq_cst.c: Likewise.
-	* gcc.target/aarch64/atomic-op-short.c: Likewise.
-	* gcc.target/aarch64/atomic_cmp_exchange_zero_reg_1.c: Likewise.
-	* gcc.target/aarch64/atomic_cmp_exchange_zero_strong_1.c: Likewise.
-	* gcc.target/aarch64/sync-comp-swap.c: Likewise.
-	* gcc.target/aarch64/sync-op-acquire.c: Likewise.
-	* gcc.target/aarch64/sync-op-full.c: Likewise.
-
-2019-09-19  Feng Xue  <fxue@os.amperecomputing.com>
-
-	* gcc.dg/ipa/pr91089.c: Add a new function and pattern.
-
-2019-09-19  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91812
-	* gcc.dg/torture/pr91812.c: New testcase.
-
-2019-09-19  Tom Tromey  <tromey@adacore.com>
-
-	* gnat.dg/bias1.adb: New testcase.
-
-2019-09-19  Steve Baird  <baird@adacore.com>
-
-	* gnat.dg/annotation1.adb: New testcase.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/inline21.adb, gnat.dg/inline21_g.ads,
-	gnat.dg/inline21_h.adb, gnat.dg/inline21_h.ads,
-	gnat.dg/inline21_q.ads: New testcase.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/inline20.adb, gnat.dg/inline20_g.adb,
-	gnat.dg/inline20_g.ads, gnat.dg/inline20_h.ads,
-	gnat.dg/inline20_i.ads, gnat.dg/inline20_q-io.ads,
-	gnat.dg/inline20_q.ads, gnat.dg/inline20_r.ads: New testcase.
-
-2019-09-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/generic2-child.ads, gnat.dg/generic2-io_any.adb,
-	gnat.dg/generic2-io_any.ads, gnat.dg/generic2.ads: New testcase.
-
-2019-09-19  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/global2.adb, gnat.dg/global2.ads: New testcase.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/access9.adb: New testcase.
-
-2019-09-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate14.adb, gnat.dg/predicate14.ads: New
-	testcase.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/generic_inst13.adb,
-	gnat.dg/generic_inst13_pkg-nested_g.ads,
-	gnat.dg/generic_inst13_pkg-ops_g.ads,
-	gnat.dg/generic_inst13_pkg.ads: New testcase.
-
-2019-09-19  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/concat3.adb: New testcase.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/pack26.adb: New testcase.
-
-2019-09-19  Hongtao Liu <hongtao.liu@intel.com>
-
-	PR target/87007
-	* gcc.target/i386/pr87007-3.c: New test.
-
-2019-09-18  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/90878
-	* gcc.target/i386/pr90878.c: New test.
-
-2019-09-18  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/91446
-	* gcc.target/i386/pr91446.c: New test.
-
-2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/warn31.adb, gnat.dg/warn31.ads: New testcase.
-
-2019-09-18  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/fixedpnt8.adb: New testcase.
-
-2019-09-18  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/discr58.adb: New testcase.
-
-2019-09-18  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/warn30.adb, gnat.dg/warn30.ads: New testcase.
-
-2019-09-18  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/access8.adb, gnat.dg/access8_pkg.adb,
-	gnat.dg/access8_pkg.ads: New testcase.
-
-2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/aggr28.adb: New testcase.
-
-2019-09-18  Steve Baird  <baird@adacore.com>
-
-	* gnat.dg/ai12_0086_example.adb: New testcase.
-
-2019-09-18  Nicolas Roche  <roche@adacore.com>
-
-	* gnat.dg/float_value2.adb: New testcase.
-
-2019-09-18  Vadim Godunko  <godunko@adacore.com>
-
-	* gnat.dg/expect4.adb: New testcase.
-
-2019-09-18  Steve Baird  <baird@adacore.com>
-
-	* gnat.dg/ghost7.adb, gnat.dg/ghost7.ads: New testcase.
-
-2019-09-18  Olivier Hainque  <hainque@adacore.com>
-
-	* gnat.dg/system_info1.adb: New testcase.
-
-2019-09-18  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/containers1.adb, gnat.dg/containers1.ads: New
-	testcase.
-
-2019-09-18  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/i386/pr82361-1.c (f1, f2, f3, f4, f5, f6): Force
-	"c" to be in %rax and "d" to be in %rdx.
-	* gcc.target/i386/pr82361-2.c: Expect 4 instances of "movl\t%edx".
-
-2019-19-17  Christophe Lyon  <christophe.lyon@st.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_arch_FUNC_ok): Add v4t_arm, v4t_thumb,
-	v5t_arm, v5t_thumb, v5te_arm, v5te_thumb, v6_arm, v6_thumb,
-	v6k_arm, v6k_thumb, v6z_arm, v6z_thumb.
-	Add -mfloat-abi=softfp to v4t, v5t, v5te, v6, v6k, v6z.
-	Remove early exit for -marm.
-	* gcc.target/arm/armv6-unaligned-load-ice.c: Add arm_arch
-	effective-target.
-	* gcc.target/arm/attr-unaligned-load-ice.c: Likewise.
-	* gcc.target/arm/ftest-armv4-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv4t-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv4t-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv5t-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv5t-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv5te-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv5te-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv6-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv6-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv6k-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv6k-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv6m-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv6t2-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv6t2-thumb.c: Likewise.
-	* gcc.target/arm/ftest-armv6z-arm.c: Likewise.
-	* gcc.target/arm/ftest-armv6z-thumb.c: Likewise.
-	* gcc.target/arm/g2.c: Likewise.
-	* gcc.target/arm/macro_defs1.c: Likewise.
-	* gcc.target/arm/pr59858.c: Likewise.
-	* gcc.target/arm/pr65647-2.c: Likewise.
-	* gcc.target/arm/pr79058.c: Likewise.
-	* gcc.target/arm/pr83712.c: Likewise.
-	* gcc.target/arm/pragma_arch_switch_2.c: Likewise.
-	* gcc.target/arm/scd42-1.c: Likewise.
-	* gcc.target/arm/scd42-2.c: Likewise.
-	* gcc.target/arm/scd42-3.c: Likewise.
-	* gcc.c-torture/compile/pr82096.c: Fix arm_arch effective-target.
-	* gcc.target/arm/attr_arm-err.c: Likewise.
-	* gcc.target/arm/di-longlong64-sync-withldrexd.c: Likewise.
-
-2019-09-17  Feng Xue  <fxue@os.amperecomputing.com>
-
-	PR ipa/91089
-	* gcc.dg/ipa/pr91089.c: New test.
-
-2019-09-17  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91588
-	* gfortran.dg/associate_49.f90 : New test.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/fixedpnt7.adb: New testcase.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/multfixed.adb: New testcase.
-
-2019-09-17  Vadim Godunko  <godunko@adacore.com>
-
-	* gnat.dg/expect3.adb: New testcase.
-
-2019-09-17  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate13.adb, gnat.dg/predicate13.ads: New
-	testcase.
-
-2019-09-17  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/limited4.adb: New testcase.
-
-2019-09-17  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/pack25.adb: New testcase.
-
-2019-09-16  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/ext/int128-6.C: New.
-	* c-c++-common/pr68107.c: Test location(s).
-	* g++.dg/other/large-size-array.C: Likewise.
-	* g++.dg/template/dtor2.C: Likewise.
-	* g++.dg/template/error9.C: Likewise.
-	* g++.dg/tls/diag-2.C: Likewise.
-	* g++.dg/tls/diag-4.C: Likewise.
-	* g++.dg/tls/diag-5.C: Likewise.
-	* g++.old-deja/g++.pt/memtemp71.C: Likewise.
-
-2019-09-16  Li Jia He  <helijia@linux.ibm.com>
-	    Qi Feng  <ffengqi@linux.ibm.com>
-
-	PR middle-end/88784
-	* gcc.dg/pr88784-1.c: New testcase.
-	* gcc.dg/pr88784-2.c: New testcase.
-	* gcc.dg/pr88784-3.c: New testcase.
-	* gcc.dg/pr88784-4.c: New testcase.
-	* gcc.dg/pr88784-5.c: New testcase.
-	* gcc.dg/pr88784-6.c: New testcase.
-	* gcc.dg/pr88784-7.c: New testcase.
-	* gcc.dg/pr88784-8.c: New testcase.
-	* gcc.dg/pr88784-9.c: New testcase.
-	* gcc.dg/pr88784-10.c: New testcase.
-	* gcc.dg/pr88784-11.c: New testcase.
-	* gcc.dg/pr88784-12.c: New testcase.
-
-2019-09-16  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91756
-	PR tree-optimization/87132
-	* gcc.dg/tree-ssa/ssa-fre-81.c: New testcase.
-
-2019-09-15  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91740 - ICE with constexpr call and ?: in ARRAY_REF.
-	* g++.dg/cpp1y/var-templ63.C: New test.
-
-2019-09-15  Sandra Loosemore  <sandra@codesourcery.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_neon_fp16_hw)
-	(check_effective_target_arm_fp16_hw): Use check_runtime
-	instead of check_runtime_nocache.
-
-2019-09-15  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91727
-	* gfortran.dg/pr91727.f90: New test.
-
-2019-09-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91550
-	* gfortran.dg/do_subscript_6.f90: New test.
-
-2019-09-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91556
-	* gfortran.dg/warn_argument_mismatch_1.f90: Remove.
-
-2019-09-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91557
-	PR fortran/91556
-	* gfortran.dg/argument_checking_20.f90: New test.
-	* gfortran.dg/argument_checking_21.f90: New test.
-	* gfortran.dg/argument_checking_22.f90: New test.
-	* gfortran.dg/argument_checking_23.f90: New test.
-	* gfortran.dg/warn_unused_dummy_argument_5.f90: New test.
-	* gfortran.dg/bessel_3.f90: Add pattern for type mismatch.
-	* gfortran.dg/g77/20010519-1.f: Adjust dg-warning messages to new
-	handling.
-	* gfortran.dg/pr24823.f: Likewise.
-	* gfortran.dg/pr39937.f: Likewise.
-
-2019-09-14  Sandra Loosemore  <sandra@codesourcery.com>
-
-	PR testsuite/83889
-	* g++.dg/vect/pr87914.cc: Remove explicit dg-do run.
-
-2019-09-14  Kewen Lin  <linkw@gcc.gnu.org>
-
-	PR middle-end/80791
-	* gcc.dg/tree-ssa/ivopts-3.c: Adjust for doloop change.
-	* gcc.dg/tree-ssa/ivopts-lt.c: Likewise.
-	* gcc.dg/tree-ssa/pr32044.c: Likewise.
-
-2019-09-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91566
-	* gfortran.dg/pr91566.f90:
-
-2019-09-13  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR fortran/91716
-	* gfortran.dg/pr91716.f90: New test.
-
-2019-09-13  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91717
-	* gfortran.dg/dependency_55.f90 : New test.
-
-2019-09-12  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR tree-optimization/89386
-	* gcc.target/i386/pr89386.c: New test.
-	* gcc.target/i386/pr89386-1.c: Ditto.
-
-2019-09-12  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91750
-	* gcc.dg/vect/pr91750.c: New testcase.
-
-2019-09-12  Yuliang Wang  <yuliang.wang@arm.com>
-
-	PR tree-optimization/89386
-	* testsuite/gcc.target/aarch64/sve2/mulhrs_1.c: New test.
-	* testsuite/gcc.dg/vect/vect-mulhrs-1.c: As above.
-	* testsuite/gcc.dg/vect/vect-mulhrs-2.c: As above.
-	* testsuite/gcc.dg/vect/vect-mulhrs-3.c: As above.
-	* testsuite/gcc.dg/vect/vect-mulhrs-4.c: As above.
-	* doc/sourcebuild.texi (vect_mulhrs_hi): Document new target selector.
-	* testsuite/lib/target-supports.exp
-	(check_effective_target_vect_mulhrs_hi): Return true for AArch64
-	with SVE2.
-
-2019-09-11  Sandra Loosemore  <sandra@codesourcery.com>
-
-	PR testsuite/83889
-	* gcc.dg/vect/pr81740-2.c: Remove explicit dg-do run.
-	* gcc.dg/vect/pr88598-1.c: Likewise.
-	* gcc.dg/vect/pr88598-2.c: Likewise.
-	* gcc.dg/vect/pr88598-3.c: Likewise.
-	* gcc.dg/vect/pr88598-4.c: Likewise.
-	* gcc.dg/vect/pr88598-5.c: Likewise.
-	* gcc.dg/vect/pr88598-6.c: Likewise.
-	* gcc.dg/vect/pr89440.c: Likewise.
-	* gcc.dg/vect/pr90018.c: Likewise.
-	* gcc.dg/vect/pr91293-1.c: Likewise.
-	* gcc.dg/vect/pr91293-2.c: Likewise.
-	* gcc.dg/vect/pr91293-3.c: Likewise.
-
-2019-09-11  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91553
-	* gfortran.dg/pr91553.f90: New test.
-
-2019-09-11  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91642
-	* gfortran.dg/pr91642.f90: New test.
-
-2019-09-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89435
-	PR rtl-optimization/89795
-	PR rtl-optimization/91720
-	* gcc.dg/pr89435.c: New test.
-	* gcc.dg/pr89795.c: New test.
-	* gcc.dg/pr91720.c: New test.
-
-2019-09-11  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90387
-	* gcc.dg/Warray-bounds-44.c: New testcase.
-
-2019-09-11  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.target/sparc/20161111-1.c: XFAIL redundant zero-extension test.
-
-2019-09-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91723
-	* gcc.dg/vect/vect-fma-3.c: New test.
-
-	PR middle-end/91725
-	* gcc.c-torture/compile/pr91725.c: New test.
-
-2019-09-11  Richard Biener  <rguenther@suse.de>
-
-	Revert
-	2019-09-09  Barnaby Wilks  <barnaby.wilks@arm.com>
-
-	* gcc.dg/fold-binary-math-casts.c: New test.
-
-2019-09-10  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91673 - ICE with noexcept in alias-declaration.
-	* g++.dg/cpp1z/using7.C: New test.
-	* g++.dg/cpp1z/using8.C: New test.
-
-2019-09-10  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91705 - constexpr evaluation rejects ++/-- on floats.
-	* g++.dg/cpp1y/constexpr-incr2.C: New test.
-
-2019-09-10  David Edelsohn  <dje.gcc@gmail.com>
-
-	* gfortran.dg/default_format_1.f90: Remove XFAIL AIX.
-	* gfortran.dg/default_format_denormal_1.f90: Same.
-
-2019-09-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91680
-	* gcc.dg/tree-ssa/pr91680.c: New test.
-	* g++.dg/torture/pr91680.C: New test.
-
-2019-09-10  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/enum29.C: Test location(s) too.
-	* g++.dg/cpp0x/lambda/lambda-ice10.C: Likewise.
-	* g++.dg/cpp2a/constinit3.C: Likewise.
-	* g++.dg/ext/desig4.C: Likewise.
-	* g++.dg/ext/label10.C: Likewise.
-	* g++.old-deja/g++.other/dtor3.C: Likewise.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-
-	* lib/target-supports.exp (check_effective_target_static): Disable
-	for ARM FDPIC target.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-
-	* gcc.target/arm/pr43698.c (bswap_32): Rename as my_bswap_32.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-
-	* g++.dg/cpp0x/noexcept03.C: Add pie_enabled.
-	* g++.dg/ipa/devirt-c-7.C: Likewise.
-	* g++.dg/ipa/ivinline-1.C: Likewise.
-	* g++.dg/ipa/ivinline-2.C: Likewise.
-	* g++.dg/ipa/ivinline-3.C: Likewise.
-	* g++.dg/ipa/ivinline-4.C: Likewise.
-	* g++.dg/ipa/ivinline-5.C: Likewise.
-	* g++.dg/ipa/ivinline-7.C: Likewise.
-	* g++.dg/ipa/ivinline-8.C: Likewise.
-	* g++.dg/ipa/ivinline-9.C: Likewise.
-	* g++.dg/tls/pr79288.C: Likewise.
-	* gcc.dg/addr_equal-1.c: Likewise.
-	* gcc.dg/const-1.c: Likewise.
-	* gcc.dg/ipa/pure-const-1.c: Likewise.
-	* gcc.dg/noreturn-8.c: Likewise.
-	* gcc.dg/pr33826.c: Likewise.
-	* gcc.dg/torture/ipa-pta-1.c: Likewise.
-	* gcc.dg/tree-ssa/alias-2.c: Likewise.
-	* gcc.dg/tree-ssa/ipa-split-5.c: Likewise.
-	* gcc.dg/tree-ssa/loadpre6.c: Likewise.
-	* gcc.dg/uninit-19.c: Likewise.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-
-	* g++.dg/abi/forced.C: Add *-*-uclinux*.
-	* g++.dg/abi/guard2.C: Likewise.
-	* g++.dg/ext/cleanup-10.C: Likewise.
-	* g++.dg/ext/cleanup-11.C: Likewise.
-	* g++.dg/ext/cleanup-8.C: Likewise.
-	* g++.dg/ext/cleanup-9.C: Likewise.
-	* g++.dg/ext/sync-4.C: Likewise.
-	* g++.dg/ipa/comdat.C: Likewise.
-	* gcc.dg/20041106-1.c: Likewise.
-	* gcc.dg/cleanup-10.c: Likewise.
-	* gcc.dg/cleanup-11.c: Likewise.
-	* gcc.dg/cleanup-8.c: Likewise.
-	* gcc.dg/cleanup-9.c: Likewise.
-	* gcc.dg/fdata-sections-1.c: Likewise.
-	* gcc.dg/fdata-sections-2.c: Likewise.
-	* gcc.dg/pr39323-1.c: Likewise.
-	* gcc.dg/pr39323-2.c: Likewise.
-	* gcc.dg/pr39323-3.c: Likewise.
-	* gcc.dg/pr65780-1.c: Likewise.
-	* gcc.dg/pr65780-2.c: Likewise.
-	* gcc.dg/pr67338.c: Likewise.
-	* gcc.dg/pr78185.c: Likewise.
-	* gcc.dg/pr83100-1.c: Likewise.
-	* gcc.dg/pr83100-4.c: Likewise.
-	* gcc.dg/strlenopt-12g.c: Likewise.
-	* gcc.dg/strlenopt-14g.c: Likewise.
-	* gcc.dg/strlenopt-14gf.c: Likewise.
-	* gcc.dg/strlenopt-16g.c: Likewise.
-	* gcc.dg/strlenopt-17g.c: Likewise.
-	* gcc.dg/strlenopt-18g.c: Likewise.
-	* gcc.dg/strlenopt-1f.c: Likewise.
-	* gcc.dg/strlenopt-22g.c: Likewise.
-	* gcc.dg/strlenopt-2f.c: Likewise.
-	* gcc.dg/strlenopt-31g.c: Likewise.
-	* gcc.dg/strlenopt-33g.c: Likewise.
-	* gcc.dg/strlenopt-4g.c: Likewise.
-	* gcc.dg/strlenopt-4gf.c: Likewise.
-	* gcc.dg/strncmp-2.c: Likewise.
-	* gcc.dg/struct-ret-3.c: Likewise.
-	* gcc.dg/torture/pr69760.c: Likewise.
-	* gcc.target/arm/div64-unwinding.c: Likewise.
-	* gcc.target/arm/stack-checking.c: Likewise.
-	* gcc.target/arm/synchronize.c: Likewise.
-	* gcc.target/arm/pr66912.c: Add arm*-*-uclinuxfdpiceabi.
-	* lib/target-supports.exp (check_effective_target_pie): Likewise.
-	(check_effective_target_sync_long_long_runtime): Likewise.
-	(check_effective_target_sync_int_long): Likewise.
-	(check_effective_target_sync_char_short): Likewise.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-
-	* gcc.target/arm/eliminate.c: Accept only nonpic targets.
-	* g++.dg/other/anon5.C: Likewise.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-	Mickaël Guêné <mickael.guene@st.com>
-
-	* gcc.target/arm/interrupt-1.c: Add scan-assembler pattern for
-	arm*-*-uclinuxfdpiceabi.
-	* gcc.target/arm/interrupt-2.c: Likewise.
-	* gcc.target/arm/pr70830.c: Likewise.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-	Mickaël Guêné <mickael.guene@st.com>
-
-	* gcc.dg/20020312-2.c: Skip on arm*-*-uclinuxfdpiceabi.
-	* gcc.target/arm/20051215-1.c: Likewise.
-	* gcc.target/arm/mmx-1.c: Likewise.
-	* gcc.target/arm/pr19599.c: Likewise.
-	* gcc.target/arm/pr40887.c: Likewise.
-	* gcc.target/arm/pr61948.c: Likewise.
-	* gcc.target/arm/pr77933-1.c: Likewise.
-	* gcc.target/arm/pr77933-2.c: Likewise.
-	* gcc.target/arm/sibcall-1.c: Likewise.
-	* gcc.target/arm/data-rel-2.c: Likewise.
-	* gcc.target/arm/data-rel-3.c: Likewise.
-	* gcc.target/arm/tail-long-call: Likewise.
-	* gcc.target/arm/tlscall.c: Likewise.
-	* gcc.target/arm/vfp-longcall-apcs: Likewise.
-	* gcc.target/arm/ivopts-2.c: Skip object-size test on
-	arm*-*-uclinuxfdpiceabi.
-	* gcc.target/arm/ivopts-3.c: Likewise.
-	* gcc.target/arm/ivopts-4.c: Likewise.
-	* gcc.target/arm/ivopts-5.c: Likewise.
-	* gcc.target/arm/pr43597.c: Likewise.
-	* gcc.target/arm/pr43920-2.c: Likewise.
-	* gcc.target/arm/pr45701-1.c: Skip scan-assembler on
-	arm*-*-uclinuxfdpiceabi.
-	* gcc.target/arm/pr45701-2.c: Likewise.
-	* gcc.target/arm/stack-red-zone.c: Likewise.
-
-2019-09-10  Christophe Lyon  <christophe.lyon@st.com>
-	Mickaël Guêné <mickael.guene@st.com>
-
-	* gcc.target/arm/fp16-aapcs-2.c: Adjust scan-assembler-times.
-	* gcc.target/arm/fp16-aapcs-4.c: Likewise.
-
-2019-09-09  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/84374 - diagnose invalid uses of decltype(auto).
-	* g++.dg/cpp1y/auto-fn57.C: New test.
-
-2019-09-09  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/rlwinm-0.c: Adjust expected instruction counts.
-	* gcc.target/powerpc/rlwinm-1.c: Ditto.
-	* gcc.target/powerpc/rlwinm-2.c: Ditto.
-
-2019-09-09  Barnaby Wilks  <barnaby.wilks@arm.com>
-
-	* gcc.dg/fold-binary-math-casts.c: New test.
-
-2019-09-09  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/87853
-	* gcc.target/i386/pr87853.c: New test.
-
-	PR target/91704
-	* gcc.target/i386/pr91704.c: New test.
-
-2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
-
-	* gcc.dg/builtins-config.h: eBPF doesn't support C99 standard
-	functions.
-	* gcc.c-torture/compile/20101217-1.c: Add a function prototype for
-	printf.
-	* gcc.c-torture/compile/20000211-1.c: Skip if target bpf-*-*.
-	* gcc.c-torture/compile/poor.c: Likewise.
-	* gcc.c-torture/compile/pr25311.c: Likewise.
-	* gcc.c-torture/compile/pr39928-1.c: Likewise.
-	* gcc.c-torture/compile/pr70061.c: Likewise.
-	* gcc.c-torture/compile/920501-7.c: Likewise.
-	* gcc.c-torture/compile/20000403-1.c: Likewise.
-	* gcc.c-torture/compile/20001226-1.c: Likewise.
-	* gcc.c-torture/compile/20030903-1.c: Likewise.
-	* gcc.c-torture/compile/20031125-1.c: Likewise.
-	* gcc.c-torture/compile/20040101-1.c: Likewise.
-	* gcc.c-torture/compile/20040317-2.c: Likewise.
-	* gcc.c-torture/compile/20040726-1.c: Likewise.
-	* gcc.c-torture/compile/20051216-1.c: Likewise.
-	* gcc.c-torture/compile/900313-1.c: Likewise.
-	* gcc.c-torture/compile/920625-1.c: Likewise.
-	* gcc.c-torture/compile/930421-1.c: Likewise.
-	* gcc.c-torture/compile/930623-1.c: Likewise.
-	* gcc.c-torture/compile/961004-1.c: Likewise.
-	* gcc.c-torture/compile/980504-1.c: Likewise.
-	* gcc.c-torture/compile/980816-1.c: Likewise.
-	* gcc.c-torture/compile/990625-1.c: Likewise.
-	* gcc.c-torture/compile/DFcmp.c: Likewise.
-	* gcc.c-torture/compile/HIcmp.c: Likewise.
-	* gcc.c-torture/compile/HIset.c: Likewise.
-	* gcc.c-torture/compile/QIcmp.c: Likewise.
-	* gcc.c-torture/compile/QIset.c: Likewise.
-	* gcc.c-torture/compile/SFset.c: Likewise.
-	* gcc.c-torture/compile/SIcmp.c: Likewise.
-	* gcc.c-torture/compile/SIset.c: Likewise.
-	* gcc.c-torture/compile/UHIcmp.c: Likewise.
-	* gcc.c-torture/compile/UQIcmp.c: Likewise.
-	* gcc.c-torture/compile/USIcmp.c: Likewise.
-	* gcc.c-torture/compile/consec.c: Likewise.
-	* gcc.c-torture/compile/limits-fndefn.c: Likewise.
-	* gcc.c-torture/compile/lll.c: Likewise.
-	* gcc.c-torture/compile/parms.c: Likewise.
-	* gcc.c-torture/compile/pass.c: Likewise.
-	* gcc.c-torture/compile/pp.c: Likewise.
-	* gcc.c-torture/compile/pr32399.c: Likewise.
-	* gcc.c-torture/compile/pr34091.c: Likewise.
-	* gcc.c-torture/compile/pr34688.c: Likewise.
-	* gcc.c-torture/compile/pr37258.c: Likewise.
-	* gcc.c-torture/compile/pr37327.c: Likewise.
-	* gcc.c-torture/compile/pr37381.c: Likewise.
-	* gcc.c-torture/compile/pr37669-2.c: Likewise.
-	* gcc.c-torture/compile/pr37669.c: Likewise.
-	* gcc.c-torture/compile/pr37742-3.c: Likewise.
-	* gcc.c-torture/compile/pr44063.c: Likewise.
-	* gcc.c-torture/compile/pr48596.c: Likewise.
-	* gcc.c-torture/compile/pr51856.c: Likewise.
-	* gcc.c-torture/compile/pr54428.c: Likewise.
-	* gcc.c-torture/compile/pr54713-1.c: Likewise.
-	* gcc.c-torture/compile/pr54713-2.c: Likewise.
-	* gcc.c-torture/compile/pr54713-3.c: Likewise.
-	* gcc.c-torture/compile/pr55921.c: Likewise.
-	* gcc.c-torture/compile/pr70240.c: Likewise.
-	* gcc.c-torture/compile/pr70355.c: Likewise.
-	* gcc.c-torture/compile/pr82052.c: Likewise.
-	* gcc.c-torture/compile/pr83487.c: Likewise.
-	* gcc.c-torture/compile/pr86122.c: Likewise.
-	* gcc.c-torture/compile/pret-arg.c: Likewise.
-	* gcc.c-torture/compile/regs-arg-size.c: Likewise.
-	* gcc.c-torture/compile/structret.c: Likewise.
-	* gcc.c-torture/compile/uuarg.c: Likewise.
-	* gcc.dg/20001009-1.c: Likewise.
-	* gcc.dg/20020418-1.c: Likewise.
-	* gcc.dg/20020426-2.c: Likewise.
-	* gcc.dg/20020430-1.c: Likewise.
-	* gcc.dg/20040306-1.c: Likewise.
-	* gcc.dg/20040622-2.c: Likewise.
-	* gcc.dg/20050603-2.c: Likewise.
-	* gcc.dg/20050629-1.c: Likewise.
-	* gcc.dg/20061026.c: Likewise.
-	* gcc.dg/Warray-bounds-3.c: Likewise.
-	* gcc.dg/Warray-bounds-30.c: Likewise.
-	* gcc.dg/Wframe-larger-than-2.c: Likewise.
-	* gcc.dg/Wframe-larger-than.c: Likewise.
-	* gcc.dg/Wrestrict-11.c: Likewise.
-	* gcc.c-torture/compile/20000804-1.c: Likewise.
-
-2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
-
-	* lib/target-supports.exp (check_effective_target_trampolines):
-	Adapt to eBPF.
-	(check_effective_target_indirect_jumps): Likewise.
-	(check_effective_target_nonlocal_goto): Likewise.
-	(check_effective_target_global_constructor): Likewise.
-	(check_effective_target_return_address): Likewise.
-
-2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
-
-	* gcc.target/bpf/bpf.exp: New file.
-	* gcc.target/bpf/builtin-load.c: Likewise.
-	* cc.target/bpf/constant-calls.c: Likewise.
-	* gcc.target/bpf/diag-funargs.c: Likewise.
-	* gcc.target/bpf/diag-funargs-2.c: Likewise.
-	* gcc.target/bpf/diag-funargs-3.c: Likewise.
-	* gcc.target/bpf/diag-indcalls.c: Likewise.
-	* gcc.target/bpf/helper-bind.c: Likewise.
-	* cc.target/bpf/helper-bpf-redirect.c: Likewise.
-	* gcc.target/bpf/helper-clone-redirect.c: Likewise.
-	* gcc.target/bpf/helper-csum-diff.c: Likewise.
-	* gcc.target/bpf/helper-csum-update.c: Likewise.
-	* gcc.target/bpf/helper-current-task-under-cgroup.c: Likewise.
-	* gcc.target/bpf/helper-fib-lookup.c: Likewise.
-	* gcc.target/bpf/helper-get-cgroup-classid.c: Likewise.
-	* gcc.target/bpf/helper-get-current-cgroup-id.c: Likewise.
-	* gcc.target/bpf/helper-get-current-comm.c: Likewise.
-	* gcc.target/bpf/helper-get-current-pid-tgid.c: Likewise.
-	* gcc.target/bpf/helper-get-current-task.c: Likewise.
-	* gcc.target/bpf/helper-get-current-uid-gid.c: Likewise.
-	* gcc.target/bpf/helper-get-hash-recalc.c: Likewise.
-	* gcc.target/bpf/helper-get-listener-sock.c: Likewise.
-	* gcc.target/bpf/helper-get-local-storage.c: Likewise.
-	* gcc.target/bpf/helper-get-numa-node-id.c: Likewise.
-	* gcc.target/bpf/helper-get-prandom-u32.c: Likewise.
-	* gcc.target/bpf/helper-get-route-realm.c: Likewise.
-	* gcc.target/bpf/helper-get-smp-processor-id.c: Likewise.
-	* gcc.target/bpf/helper-get-socket-cookie.c: Likewise.
-	* gcc.target/bpf/helper-get-socket-uid.c: Likewise.
-	* gcc.target/bpf/helper-getsockopt.c: Likewise.
-	* gcc.target/bpf/helper-get-stack.c: Likewise.
-	* gcc.target/bpf/helper-get-stackid.c: Likewise.
-	* gcc.target/bpf/helper-ktime-get-ns.c: Likewise.
-	* gcc.target/bpf/helper-l3-csum-replace.c: Likewise.
-	* gcc.target/bpf/helper-l4-csum-replace.c: Likewise.
-	* gcc.target/bpf/helper-lwt-push-encap.c: Likewise.
-	* gcc.target/bpf/helper-lwt-seg6-action.c: Likewise.
-	* gcc.target/bpf/helper-lwt-seg6-adjust-srh.c: Likewise.
-	* gcc.target/bpf/helper-lwt-seg6-store-bytes.c: Likewise.
-	* gcc.target/bpf/helper-map-delete-elem.c: Likewise.
-	* gcc.target/bpf/helper-map-lookup-elem.c: Likewise.
-	* gcc.target/bpf/helper-map-peek-elem.c: Likewise.
-	* gcc.target/bpf/helper-map-pop-elem.c: Likewise.
-	* gcc.target/bpf/helper-map-push-elem.c: Likewise.
-	* gcc.target/bpf/helper-map-update-elem.c: Likewise.
-	* gcc.target/bpf/helper-msg-apply-bytes.c: Likewise.
-	* gcc.target/bpf/helper-msg-cork-bytes.c: Likewise.
-	* gcc.target/bpf/helper-msg-pop-data.c: Likewise.
-	* gcc.target/bpf/helper-msg-pull-data.c: Likewise.
-	* gcc.target/bpf/helper-msg-push-data.c: Likewise.
-	* gcc.target/bpf/helper-msg-redirect-hash.c: Likewise.
-	* gcc.target/bpf/helper-msg-redirect-map.c: Likewise.
-	* gcc.target/bpf/helper-override-return.c: Likewise.
-	* gcc.target/bpf/helper-perf-event-output.c: Likewise.
-	* gcc.target/bpf/helper-perf-event-read.c: Likewise.
-	* gcc.target/bpf/helper-perf-event-read-value.c: Likewise.
-	* gcc.target/bpf/helper-perf-prog-read-value.c: Likewise.
-	* gcc.target/bpf/helper-probe-read.c: Likewise.
-	* gcc.target/bpf/helper-probe-read-str.c: Likewise.
-	* gcc.target/bpf/helper-probe-write-user.c: Likewise.
-	* gcc.target/bpf/helper-rc-keydown.c: Likewise.
-	* gcc.target/bpf/helper-rc-pointer-rel.c: Likewise.
-	* gcc.target/bpf/helper-rc-repeat.c: Likewise.
-	* gcc.target/bpf/helper-redirect-map.c: Likewise.
-	* gcc.target/bpf/helper-set-hash.c: Likewise.
-	* gcc.target/bpf/helper-set-hash-invalid.c: Likewise.
-	* gcc.target/bpf/helper-setsockopt.c: Likewise.
-	* gcc.target/bpf/helper-skb-adjust-room.c: Likewise.
-	* gcc.target/bpf/helper-skb-cgroup-id.c: Likewise.
-	* gcc.target/bpf/helper-skb-change-head.c: Likewise.
-	* gcc.target/bpf/helper-skb-change-proto.c: Likewise.
-	* gcc.target/bpf/helper-skb-change-tail.c: Likewise.
-	* gcc.target/bpf/helper-skb-change-type.c: Likewise.
-	* gcc.target/bpf/helper-skb-ecn-set-ce.c: Likewise.
-	* gcc.target/bpf/helper-skb-get-tunnel-key.c: Likewise.
-	* gcc.target/bpf/helper-skb-get-tunnel-opt.c: Likewise.
-	* gcc.target/bpf/helper-skb-get-xfrm-state.c: Likewise.
-	* gcc.target/bpf/helper-skb-load-bytes.c: Likewise.
-	* gcc.target/bpf/helper-skb-load-bytes-relative.c: Likewise.
-	* gcc.target/bpf/helper-skb-pull-data.c: Likewise.
-	* gcc.target/bpf/helper-skb-set-tunnel-key.c: Likewise.
-	* gcc.target/bpf/helper-skb-set-tunnel-opt.c: Likewise.
-	* gcc.target/bpf/helper-skb-store-bytes.c: Likewise.
-	* gcc.target/bpf/helper-skb-under-cgroup.c: Likewise.
-	* gcc.target/bpf/helper-skb-vlan-pop.c: Likewise.
-	* gcc.target/bpf/helper-skb-vlan-push.c: Likewise.
-	* gcc.target/bpf/helper-skc-lookup-tcp.c: Likewise.
-	* gcc.target/bpf/helper-sk-fullsock.c: Likewise.
-	* gcc.target/bpf/helper-sk-lookup-tcp.c: Likewise.
-	* gcc.target/bpf/helper-sk-lookup-upd.c: Likewise.
-	* gcc.target/bpf/helper-sk-redirect-hash.c: Likewise.
-	* gcc.target/bpf/helper-sk-redirect-map.c: Likewise.
-	* gcc.target/bpf/helper-sk-release.c: Likewise.
-	* gcc.target/bpf/helper-sk-select-reuseport.c: Likewise.
-	* gcc.target/bpf/helper-sk-storage-delete.c: Likewise.
-	* gcc.target/bpf/helper-sk-storage-get.c: Likewise.
-	* gcc.target/bpf/helper-sock-hash-update.c: Likewise.
-	* gcc.target/bpf/helper-sock-map-update.c: Likewise.
-	* gcc.target/bpf/helper-sock-ops-cb-flags-set.c: Likewise.
-	* gcc.target/bpf/helper-spin-lock.c: Likewise.
-	* gcc.target/bpf/helper-spin-unlock.c: Likewise.
-	* gcc.target/bpf/helper-strtol.c: Likewise.
-	* gcc.target/bpf/helper-strtoul.c: Likewise.
-	* gcc.target/bpf/helper-sysctl-get-current-value.c: Likewise.
-	* gcc.target/bpf/helper-sysctl-get-name.c: Likewise.
-	* gcc.target/bpf/helper-sysctl-get-new-value.c: Likewise.
-	* gcc.target/bpf/helper-sysctl-set-new-value.c: Likewise.
-	* gcc.target/bpf/helper-tail-call.c: Likewise.
-	* gcc.target/bpf/helper-tcp-check-syncookie.c: Likewise.
-	* gcc.target/bpf/helper-tcp-sock.c: Likewise.
-	* gcc.target/bpf/helper-trace-printk.c: Likewise.
-	* gcc.target/bpf/helper-xdp-adjust-head.c: Likewise.
-	* gcc.target/bpf/helper-xdp-adjust-meta.c: Likewise.
-	* gcc.target/bpf/helper-xdp-adjust-tail.c: Likewise.
-	* gcc.target/bpf/skb-ancestor-cgroup-id.c: Likewise.
-	* gcc.target/bpf/sync-fetch-and-add.c: Likewise.
-
-2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
-
-	* lib/target-supports.exp (check_effective_target_indirect_calls):
-	New proc.
-	* gcc.c-torture/compile/20010102-1.c: Annotate with
-	dg-require-effective-target indirect_calls.
-	* gcc.c-torture/compile/20010107-1.c: Likewise.
-	* gcc.c-torture/compile/20011109-1.c: Likewise.
-	* gcc.c-torture/compile/20011218-1.c: Likewise.
-	* gcc.c-torture/compile/20011229-1.c: Likewise.
-	* gcc.c-torture/compile/20020129-1.c: Likewise.
-	* gcc.c-torture/compile/20020320-1.c: Likewise.
-	* gcc.c-torture/compile/20020706-1.c: Likewise.
-	* gcc.c-torture/compile/20020706-2.c: Likewise.
-	* gcc.c-torture/compile/20021205-1.c: Likewise.
-	* gcc.c-torture/compile/20030921-1.c: Likewise.
-	* gcc.c-torture/compile/20031023-1.c: Likewise.
-	* gcc.c-torture/compile/20031023-2.c: Likewise.
-	* gcc.c-torture/compile/20031023-3.c: Likewise.
-	* gcc.c-torture/compile/20031023-4.c: Likewise.
-	* gcc.c-torture/compile/20040614-1.c: Likewise.
-	* gcc.c-torture/compile/20040909-1.c: Likewise.
-	* gcc.c-torture/compile/20050122-1.c: Likewise.
-	* gcc.c-torture/compile/20050202-1.c: Likewise.
-	* gcc.c-torture/compile/20060208-1.c: Likewise.
-	* gcc.c-torture/compile/20081108-1.c: Likewise.
-	* gcc.c-torture/compile/20150327.c: Likewise.
-	* gcc.c-torture/compile/920428-2.c: Likewise.
-	* gcc.c-torture/compile/920928-5.c: Likewise.
-	* gcc.c-torture/compile/930117-1.c: Likewise.
-	* gcc.c-torture/compile/930607-1.c: Likewise.
-	* gcc.c-torture/compile/991213-2.c: Likewise.
-	* gcc.c-torture/compile/callind.c: Likewise.
-	* gcc.c-torture/compile/calls-void.c: Likewise.
-	* gcc.c-torture/compile/calls.c: Likewise.
-	* gcc.c-torture/compile/pr21840.c: Likewise.
-	* gcc.c-torture/compile/pr32139.c: Likewise.
-	* gcc.c-torture/compile/pr35607.c: Likewise.
-	* gcc.c-torture/compile/pr37433-1.c: Likewise.
-	* gcc.c-torture/compile/pr37433.c: Likewise.
-	* gcc.c-torture/compile/pr39941.c: Likewise.
-	* gcc.c-torture/compile/pr40080.c: Likewise.
-	* gcc.c-torture/compile/pr43635.c: Likewise.
-	* gcc.c-torture/compile/pr43791.c: Likewise.
-	* gcc.c-torture/compile/pr43845.c: Likewise.
-	* gcc.c-torture/compile/pr44043.c: Likewise.
-	* gcc.c-torture/compile/pr51694.c: Likewise.
-	* gcc.c-torture/compile/pr77754-2.c: Likewise.
-	* gcc.c-torture/compile/pr77754-3.c: Likewise.
-	* gcc.c-torture/compile/pr77754-4.c: Likewise.
-	* gcc.c-torture/compile/pr89663-2.c: Likewise.
-	* gcc.c-torture/compile/pta-1.c: Likewise.
-	* gcc.c-torture/compile/stack-check-1.c: Likewise.
-	* gcc.dg/Walloc-size-larger-than-18.c: Likewise.
-
-2019-09-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
-
-	* gcc.c-torture/compile/20000609-1.c: Annotate with
-	dg-require-stack-size.
-	* gcc.c-torture/compile/20000804-1.c: Likewise.
-	* gcc.c-torture/compile/20020304-1.c: Likewise.
-	* gcc.c-torture/compile/20020604-1.c: Likewise.
-	* gcc.c-torture/compile/20021015-1.c: Likewise.
-	* gcc.c-torture/compile/20050303-1.c: Likewise.
-	* gcc.c-torture/compile/20060421-1.c: Likewise.
-	* gcc.c-torture/compile/20071207-1.c: Likewise.
-	* gcc.c-torture/compile/20080903-1.c: Likewise.
-	* gcc.c-torture/compile/20121027-1.c: Likewise.
-	* gcc.c-torture/compile/20151204.c: Likewise.
-	* gcc.c-torture/compile/920501-12.c: Likewise.
-	* gcc.c-torture/compile/920501-4.c: Likewise.
-	* gcc.c-torture/compile/920723-1.c: Likewise.
-	* gcc.c-torture/compile/921202-1.c: Likewise.
-	* gcc.c-torture/compile/931003-1.c: Likewise.
-	* gcc.c-torture/compile/931004-1.c: Likewise.
-	* gcc.c-torture/compile/950719-1.c: Likewise.
-	* gcc.c-torture/compile/951222-1.c: Likewise.
-	* gcc.c-torture/compile/990517-1.c: Likewise.
-	* gcc.c-torture/compile/bcopy.c: Likewise.
-	* gcc.c-torture/compile/pr23929.c: Likewise.
-	* gcc.c-torture/compile/pr25310.c: Likewise.
-	* gcc.c-torture/compile/pr34458.c: Likewise.
-	* gcc.c-torture/compile/pr39937.c: Likewise.
-	* gcc.c-torture/compile/pr41181.c: Likewise.
-	* gcc.c-torture/compile/pr41634.c: Likewise.
-	* gcc.c-torture/compile/pr43415.c: Likewise.
-	* gcc.c-torture/compile/pr43417.c: Likewise.
-	* gcc.c-torture/compile/pr44788.c: Likewise.
-	* gcc.c-torture/compile/sound.c: Likewise.
-
-2019-09-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	* gcc.target/arm/pr91684.c: Use effective-target arm_prefer_ldrd_strd.
-
-2019-09-07  David Edelsohn  <dje.gcc@gmail.com>
-
-	* g++.dg/cpp2a/decomp2.C: Add TLS options.
-	* gcc.target/powerpc/pr88233.c: Limit to lp64.
-
-2019-09-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91665
-	* gcc.dg/vect/pr91665.c: New test.
-
-2019-09-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR target/91684
-	* gcc.target/arm/pr91684.c: New test.
-
-2019-09-06  Ian Lance Taylor  <iant@golang.org>
-
-	* go.test/test/fixedbugs/bug369.go: Update to match libgo update
-	to Go 1.13beta1.
-
-2019-09-06  David Edelsohn  <dje.gcc@gmail.com>
-
-	* gcc.dg/torture/inf-compare-1.c: Skip AIX.
-	* gcc.dg/torture/inf-compare-2.c: Skip AIX.
-	* gcc.dg/torture/inf-compare-3.c: Skip AIX.
-	* gcc.dg/torture/inf-compare-4.c: Skip AIX.
-	* gcc.dg/torture/pr52451.c: Skip AIX.
-	* gcc.dg/torture/pr68264.c: Skip AIX
-	* gcc.dg/torture/pr91323.c: Skip AIX.
-
-	* g++.dg/warn/Warray-bounds-4.C: Skip AIX.
-	* g++.dg/warn/Warray-bounds-8.C: Skip AIX.
-	* g++.dg/opt/flifetime-dse2.C: XFAIL AIX.
-	* g++.dg/opt/flifetime-dse4.C: XFAIL AIX.
-
-2019-09-06  Caroline Tice  <cmtice@google.com>
-
-	PR testsuite/91670
-	* g++.dg/ubsan/pr59415.C: Disable LTO, since test uses
-	-fvtable-verify, and the two options are no longer allowed
-	together.
-
-2019-09-06  Nathan Sidwell  <nathan@acm.org>
-
-	* c-c++-common/cpp/line-1.c: New.
-
-2019-09-06  Martin Liska  <mliska@suse.cz>
-
-	PR c++/91125
-	* g++.dg/parse/repo1.C: Remove.
-	* g++.dg/rtti/repo1.C: Remove.
-	* g++.dg/template/repo1.C: Remove.
-	* g++.dg/template/repo10.C: Remove.
-	* g++.dg/template/repo11.C: Remove.
-	* g++.dg/template/repo2.C: Remove.
-	* g++.dg/template/repo3.C: Remove.
-	* g++.dg/template/repo4.C: Remove.
-	* g++.dg/template/repo5.C: Remove.
-	* g++.dg/template/repo6.C: Remove.
-	* g++.dg/template/repo7.C: Remove.
-	* g++.dg/template/repo8.C: Remove.
-	* g++.dg/template/repo9.C: Remove.
-	* g++.old-deja/g++.pt/instantiate4.C: Remove.
-	* g++.old-deja/g++.pt/instantiate6.C: Remove.
-	* g++.old-deja/g++.pt/repo1.C: Remove.
-	* g++.old-deja/g++.pt/repo2.C: Remove.
-	* g++.old-deja/g++.pt/repo3.C: Remove.
-	* g++.old-deja/g++.pt/repo4.C: Remove.
-	* lib/g++.exp: Remove removal of repo files.
-	* lib/gcc-dg.exp: Likewise.
-	* lib/obj-c++.exp: Likewise.
-
-2019-09-05  Jakub Jelinek  <jakub@redhat.com>
-	    Jim Wilson  <jimw@sifive.com>
-
-	PR target/91635
-	* gcc.c-torture/execute/pr91635.c: New test.
-	* gcc.target/riscv/shift-shift-4.c: New test.
-	* gcc.target/riscv/shift-shift-5.c: New test.
-
-2019-09-05  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/91496
-	* gfortran.dg/directive_unroll_5.f90: Adjust error message.
-
-2019-09-05  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91660
-	* gfortran.dg/pdt_4.f03: Fix invalid code.
-        * gfortran.dg/pr91660_1.f90: New test.
-	* gfortran.dg/pr91660_2.f90: Ditto.
-
-2019-09-05  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91644 - ICE with constinit in function template.
-	* g++.dg/cpp2a/constinit13.C: New test.
-
-2019-09-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91001
-	PR middle-end/91105
-	PR middle-end/91106
-	* gcc.c-torture/compile/pr91001.c: New test.
-
-2019-09-05  Richard Biener  <rguenther@suse.de>
-
-	PR rtl-optimization/91656
-	* gcc.dg/torture/pr91656-1.c: New testcase.
-	* gcc.dg/torture/pr91656-2.c: Likewise.
-	* gcc.dg/torture/pr91656-3.c: Likewise.
-
-2019-09-05  Nathan Sidwell  <nathan@acm.org>
-
-	PR preprocessor/91639
-	* c-c++-common/cpp/pr91639.c: New.
-	* c-c++-common/cpp/pr91639-one.h: New.
-	* c-c++-common/cpp/pr91639-two.h: New.
-
-2019-09-05  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR middle-end/91577
-	* gfortran.dg/pr91577.f90: New test, taken from temporary_1.f90.
-
-2019-09-04  Steven G. Kargl  <kargl@gcvc.gnu.org>
-
-	PR fortran/91650
-	* gfortran.dg/pr91650_1.f90: New test.
-	* gfortran.dg/pr91650_2.f90: Ditto.
-
-2019-09-04  Marek Polacek  <polacek@redhat.com>
-
-	* g++.dg/cpp0x/initlist-deduce.C: Don't use -fdeduce-init-list.  Remove
-	dg-warning.  Add dg-error.
-
-2019-09-04  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	PR c/78736
-	* gcc.dg/Wenum-conversion.c: New test-case.
-
-2019-09-03  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/data-attributes-2.c: New test.
-	* gcc.target/msp430/function-attributes-4.c: Update dg-warning
-	strings.
-	* gcc.target/msp430/region-attribute-misuse.c: Likewise.
-
-2019-09-03  Kamlesh Kumar  <kamleshbhalui@gmail.com>
-
-	PR tree-optimization/91504
-	gcc.dg/tree-ssa/pr91504.c: New test.
-
-2019-09-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/91604
-	* gcc.target/i386/pr91604.c: New test.
-
-2019-09-03  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* lib/compat.exp: Remove references to spu.
-	* lib/fortran-torture.exp: Likewise.
-	* lib/gcc-dg.exp: Likewise.
-	* lib/gfortran.exp: Likewise.
-	* lib/target-supports.exp: Likewise.
-	* lib/target-utils.exp: Likewise.
-
-	* c-c++-common/torture/complex-sign-add.c: Remove references to spu.
-	* c-c++-common/torture/complex-sign-mixed-add.c: Likewise.
-	* c-c++-common/torture/complex-sign-mixed-div.c: Likewise.
-	* c-c++-common/torture/complex-sign-mixed-mul.c: Likewise.
-	* c-c++-common/torture/complex-sign-mixed-sub.c: Likewise.
-	* c-c++-common/torture/complex-sign-mul-minus-one.c: Likewise.
-	* c-c++-common/torture/complex-sign-mul-one.c: Likewise.
-	* c-c++-common/torture/complex-sign-mul.c: Likewise.
-	* c-c++-common/torture/complex-sign-sub.c: Likewise.
-
-	* g++.dg/opt/temp1.C: Remove references to spu.
-	* g++.dg/opt/vt1.C: Likewise.
-	* g++.dg/torture/type-generic-1.C: Likewise.
-	* g++.dg/warn/pr30551-2.C: Likewise.
-	* g++.dg/warn/pr30551.C: Likewise.
-	* g++.old-deja/g++.jason/thunk2.C: Likewise.
-	* g++.old-deja/g++.other/comdat5.C: Likewise.
-	* g++.old-deja/g++.other/local-alloc1.C: Likewise.
-
-	* gcc.c-torture/compile/20001226-1.c: Remove references to spu.
-	* gcc.c-torture/execute/20030222-1.c: Likewise.
-	* gcc.c-torture/execute/20031003-1.c: Likewise.
-	* gcc.c-torture/execute/20101011-1.c: Likewise.
-	* gcc.c-torture/execute/conversion.c: Likewise.
-	* gcc.c-torture/execute/ieee/compare-fp-4.x: Likewise.
-	* gcc.c-torture/execute/ieee/fp-cmp-2.x: Likewise.
-	* gcc.c-torture/execute/ieee/inf-1.c: Likewise.
-	* gcc.c-torture/execute/ieee/inf-2.c: Likewise.
-	* gcc.c-torture/execute/ieee/mul-subnormal-single-1.x: Likewise.
-	* gcc.c-torture/execute/ieee/rbug.c: Likewise.
-	* gcc.c-torture/execute/pr39228.c: Likewise.
-	* gcc.c-torture/execute/ieee/20010114-2.x: Remove file.
-	* gcc.c-torture/execute/ieee/20030331-1.x: Remove file.
-	* gcc.c-torture/execute/ieee/920518-1.x: Remove file.
-	* gcc.c-torture/execute/ieee/compare-fp-1.x: Remove file.
-	* gcc.c-torture/execute/ieee/fp-cmp-4f.x: Remove file.
-	* gcc.c-torture/execute/ieee/fp-cmp-8f.x: Remove file.
-
-	* gcc.dg/20020312-2.c: Remove references to spu.
-	* gcc.dg/20030702-1.c: Likewise.
-	* gcc.dg/and-1.c: Likewise.
-	* gcc.dg/builtin-inf-1.c: Likewise.
-	* gcc.dg/builtins-1.c: Likewise.
-	* gcc.dg/builtins-43.c: Likewise.
-	* gcc.dg/builtins-44.c: Likewise.
-	* gcc.dg/builtins-45.c: Likewise.
-	* gcc.dg/float-range-1.c: Likewise.
-	* gcc.dg/float-range-3.c: Likewise.
-	* gcc.dg/float-range-4.c: Likewise.
-	* gcc.dg/float-range-5.c: Likewise.
-	* gcc.dg/fold-overflow-1.c: Likewise.
-	* gcc.dg/format/ms_unnamed-1.c: Likewise.
-	* gcc.dg/format/unnamed-1.c: Likewise.
-	* gcc.dg/hex-round-1.c: Likewise.
-	* gcc.dg/hex-round-2.c: Likewise.
-	* gcc.dg/lower-subreg-1.c: Likewise.
-	* gcc.dg/nrv3.c: Likewise.
-	* gcc.dg/pr15784-3.c: Likewise.
-	* gcc.dg/pr27095.c: Likewise.
-	* gcc.dg/pr28243.c: Likewise.
-	* gcc.dg/pr28796-2.c: Likewise.
-	* gcc.dg/pr30551-3.c: Likewise.
-	* gcc.dg/pr30551-6.c: Likewise.
-	* gcc.dg/pr30551.c: Likewise.
-	* gcc.dg/pr70317.c: Likewise.
-	* gcc.dg/sms-1.c: Likewise.
-	* gcc.dg/sms-2.c: Likewise.
-	* gcc.dg/sms-3.c: Likewise.
-	* gcc.dg/sms-4.c: Likewise.
-	* gcc.dg/sms-5.c: Likewise.
-	* gcc.dg/sms-6.c: Likewise.
-	* gcc.dg/sms-7.c: Likewise.
-	* gcc.dg/stack-usage-1.c: Likewise.
-	* gcc.dg/strlenopt-73.c: Likewise.
-	* gcc.dg/titype-1.c: Likewise.
-	* gcc.dg/tls/thr-cse-1.c: Likewise.
-	* gcc.dg/torture/builtin-attr-1.c: Likewise.
-	* gcc.dg/torture/builtin-complex-1.c: Likewise.
-	* gcc.dg/torture/builtin-cproj-1.c: Likewise.
-	* gcc.dg/torture/builtin-frexp-1.c: Likewise.
-	* gcc.dg/torture/builtin-ldexp-1.c: Likewise.
-	* gcc.dg/torture/builtin-logb-1.c: Likewise.
-	* gcc.dg/torture/builtin-math-2.c: Likewise.
-	* gcc.dg/torture/builtin-math-5.c: Likewise.
-	* gcc.dg/torture/builtin-modf-1.c: Likewise.
-	* gcc.dg/torture/fp-int-convert.h: Likewise.
-	* gcc.dg/torture/pr25947-1.c: Likewise.
-	* gcc.dg/torture/type-generic-1.c: Likewise.
-	* gcc.dg/tree-ssa/20040204-1.c: Likewise.
-	* gcc.dg/tree-ssa/ivopts-1.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-fre-3.c: Likewise.
-	* gcc.dg/tree-ssa/vector-6.c: Likewise.
-	* gcc.dg/uninit-C-O0.c: Likewise.
-	* gcc.dg/uninit-C.c: Likewise.
-	* gcc.dg/vect/no-math-errno-slp-32.c: Likewise.
-	* gcc.dg/vect/no-math-errno-vect-pow-1.c: Likewise.
-	* gcc.dg/vect/vect-float-extend-1.c: Likewise.
-	* gcc.dg/vect/vect-float-truncate-1.c: Likewise.
-	* gcc.dg/vect/vect.exp: Likewise.
-	* gcc.gd/vect/costmodel/spu/: Remove directory.
-
-	* gcc.target/spu/: Remove directory.
-
-	* gfortran.dg/bessel_6.f90: Remove references to spu.
-	* gfortran.dg/bessel_7.f90: Likewise.
-	* gfortran.dg/char4_iunit_1.f03: Likewise.
-	* gfortran.dg/chmod_1.f90: Likewise.
-	* gfortran.dg/chmod_2.f90: Likewise.
-	* gfortran.dg/chmod_3.f90: Likewise.
-	* gfortran.dg/default_format_1.f90: Likewise.
-	* gfortran.dg/default_format_denormal_1.f90: Likewise.
-	* gfortran.dg/erf_2.F90: Likewise.
-	* gfortran.dg/erf_3.F90: Likewise.
-	* gfortran.dg/init_flag_10.f90: Likewise.
-	* gfortran.dg/init_flag_3.f90: Likewise.
-	* gfortran.dg/int_conv_2.f90: Likewise.
-	* gfortran.dg/integer_exponentiation_3.F90: Likewise.
-	* gfortran.dg/integer_exponentiation_5.F90: Likewise.
-	* gfortran.dg/isnan_1.f90: Likewise.
-	* gfortran.dg/isnan_2.f90: Likewise.
-	* gfortran.dg/maxloc_2.f90: Likewise.
-	* gfortran.dg/maxlocval_2.f90: Likewise.
-	* gfortran.dg/maxlocval_4.f90: Likewise.
-	* gfortran.dg/minloc_1.f90: Likewise.
-	* gfortran.dg/minlocval_1.f90: Likewise.
-	* gfortran.dg/minlocval_4.f90: Likewise.
-	* gfortran.dg/module_nan.f90: Likewise.
-	* gfortran.dg/namelist_42.f90: Likewise.
-	* gfortran.dg/namelist_43.f90: Likewise.
-	* gfortran.dg/nan_1.f90: Likewise.
-	* gfortran.dg/nan_2.f90: Likewise.
-	* gfortran.dg/nan_3.f90: Likewise.
-	* gfortran.dg/nan_4.f90: Likewise.
-	* gfortran.dg/nan_5.f90: Likewise.
-	* gfortran.dg/nan_6.f90: Likewise.
-	* gfortran.dg/nearest_1.f90: Likewise.
-	* gfortran.dg/nearest_3.f90: Likewise.
-	* gfortran.dg/open_errors.f90: Likewise.
-	* gfortran.dg/pr20257.f90: Likewise.
-	* gfortran.dg/read_infnan_1.f90: Likewise.
-	* gfortran.dg/real_const_3.f90: Likewise.
-	* gfortran.dg/realloc_on_assign_2.f03: Likewise.
-	* gfortran.dg/reassoc_4.f: Likewise.
-	* gfortran.dg/scalar_mask_2.f90: Likewise.
-	* gfortran.dg/scratch_1.f90: Likewise.
-	* gfortran.dg/stat_1.f90: Likewise.
-	* gfortran.dg/stat_2.f90: Likewise.
-	* gfortran.dg/transfer_simplify_1.f90: Likewise.
-	* gfortran.dg/typebound_operator_9.f03: Likewise.
-
-	* gfortran.fortran-torture/execute/intrinsic_nearest.x: Remove
-	references to spu.
-	* gfortran.fortran-torture/execute/intrinsic_set_exponent.x: Likewise.
-	* gfortran.fortran-torture/execute/nan_inf_fmt.x: Likewise.
-	* gfortran.fortran-torture/execute/getarg_1.x: Remove file.
-
-2019-09-03  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR middle-end/91603
-	* gcc.target/arm/pr91603.c: New test.
-
-2019-09-03  Ilya Leoshkevich  <iii@linux.ibm.com>
-
-	* gcc.target/s390/sigfpe-eh.c: New test.
-
-2019-09-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* gcc.target/aarch64/acle/jcvt_1.c: New test.
-
-2019-09-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* gcc.target/aarch64/acle/rintnzx_1.c: New test.
-	* gcc.target/aarch64/simd/vrndnzx_1.c: Likewise.
-
-2019-09-03  Jakub Jelinek  <jakub@redhat.com>
-	    Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91597
-	* gcc.c-torture/execute/pr91597.c: New test.
-
-2019-09-03  Alexandre Oliva <oliva@adacore.com>
-
-	* gcc.target/i386/20020616-1.c: Preserve full register across
-	main.
-
-2019-09-02  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91589
-	* gfortran.dg/pr91589.f90 : New test.
-
-2019-09-02  Steven G. Kargl  <kargl@gc.gnu.org>
-
-	PR fortran/91552
-	* gfortran.dg/pr91552.f90: New test.
-
-2019-09-02  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR middle-end/91605
-	* g++.target/i386/pr91605.C: New test.
-
-2019-09-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91632
-	* gcc.c-torture/execute/pr91632.c: New test.
-
-2019-09-02  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.dg/tree-ssa/slsr-42.c: New test.
-
-2019-09-02  Martin Liska  <mliska@suse.cz>
-
-	PR c++/91155
-	* g++.dg/torture/pr91155.C: New test.
-
-2019-09-01  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91129 - wrong error with binary op in template argument.
-	* g++.dg/cpp1y/nontype1.C: New test.
-
-2019-09-01  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.c-torture/compile/20190827-1.c: Add dg-requires-alias.
-
-2019-09-01  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.c-torture/execute/20190901-1.c: New test.
-
-	* lib/target-supports.exp (check_effective_target_pthread): Add
-	#include <pthread.h> directive to the test.
-
-2019-09-01  Paul Thomas  <pault@gcc.gnu.org>
-
-	* gfortran.dg/select_rank_1.f90 : New test.
-	* gfortran.dg/select_rank_2.f90 : New test.
-
-2019-09-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91623
-	* gcc.target/i386/pr91623.c: New test.
-
-	PR lto/91572
-	* g++.dg/lto/pr91572_0.C: New test.
-
-2019-08-30  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91587
-	* gfortran.dg/pr91587.f90: New test.
-
-2019-08-30  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/91599
-	* gcc.dg/Wstringop-overflow-16.c: New test.
-
-	PR middle-end/91584
-	* gfortran.dg/char_array_constructor_4.f90: New test.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/pack24.adb: New test.
-
-2019-08-30  Jeff Law  <law@redhat.com>
-
-	* gcc.target/mips/r10k-cache-barrier-9.c: Suppress warnings.
-
-2019-08-30  Martin Jambor  <mjambor@suse.cz>
-
-	tree-optimization/91579
-	* gcc.dg/tree-ssa/pr91579.c: New test.
-
-2019-08-29  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/91560
-	* gcc.dg/torture/vshuf-8.inc: Add two further permutations.
-
-	PR tree-optimization/91351
-	* g++.dg/opt/pr91351.C: New test.
-
-2019-08-29  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/spellcheck-typenames.C: Adjust expected locations.
-	* g++.dg/cpp0x/pr84676.C: Check locations.
-	* g++.dg/other/pr88187.C: Likewise.
-	* g++.dg/parse/crash13.C: Likewise.
-	* g++.dg/parse/crash46.C: Likewise.
-	* g++.dg/parse/template28.C: Likewise.
-	* g++.dg/parse/typename4.C: Likewise.
-
-2019-08-29  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91568
-	* gfortran.dg/pr91568.f: New testcase.
-
-2019-08-28  Marek Polacek  <polacek@redhat.com>
-
-	Implement P1152R4: Deprecating some uses of volatile.
-	PR c++/91361
-	* c-c++-common/Wbool-operation-1.c: Use -Wno-volatile in C++.
-	* c-c++-common/gomp/atomic-1.c: Likewise.
-	* c-c++-common/gomp/atomic-9.c: Likewise.
-	* c-c++-common/gomp/depend-iterator-1.c: Likewise.
-	* c-c++-common/gomp/loop-1.c: Adjust warning location for C++.
-	* c-c++-common/gomp/order-3.c: Likewise.
-	* c-c++-common/pr69733.c: Use -Wno-volatile in C++.
-	* c-c++-common/spec-barrier-2.c: Likewise.
-	* c-c++-common/tm/pr54893.c: Likewise.
-	* g++.dg/cpp0x/pr65327.C: Add dg-warning.
-	* g++.dg/cpp0x/rv-conv2.C: Likewise.
-	* g++.dg/cpp0x/rv1n.C: Likewise.
-	* g++.dg/cpp0x/rv1p.C: Likewise.
-	* g++.dg/cpp0x/rv2n.C: Likewise.
-	* g++.dg/cpp0x/rv2p.C: Likewise.
-	* g++.dg/cpp0x/rv3n.C: Likewise.
-	* g++.dg/cpp0x/rv3p.C: Likewise.
-	* g++.dg/cpp0x/rv4n.C: Likewise.
-	* g++.dg/cpp0x/rv4p.C: Likewise.
-	* g++.dg/cpp0x/rv5n.C: Likewise.
-	* g++.dg/cpp0x/rv5p.C: Likewise.
-	* g++.dg/cpp0x/rv6n.C: Likewise.
-	* g++.dg/cpp0x/rv6p.C: Likewise.
-	* g++.dg/cpp0x/rv7n.C: Likewise.
-	* g++.dg/cpp0x/rv7p.C: Likewise.
-	* g++.dg/cpp0x/rv8p.C: Likewise.
-	* g++.dg/cpp0x/trailing14.C: Use -Wno-volatile.
-	* g++.dg/cpp1y/new1.C: Add dg-warning.
-	* g++.dg/cpp2a/volatile1.C: New test.
-	* g++.dg/cpp2a/volatile2.C: New test.
-	* g++.dg/cpp2a/volatile3.C: New test.
-	* g++.dg/cpp2a/volatile4.C: New test.
-	* g++.dg/expr/bool3.C: Add dg-warning.
-	* g++.dg/expr/bool4.C: Likewise.
-	* g++.dg/expr/cond9.C: Likewise.
-	* g++.dg/ext/vector25.C: Likewise.
-	* g++.dg/gomp/depend-iterator-1.C: Use -Wno-volatile.
-	* g++.dg/inherit/covariant21.C: Add dg-warning.
-	* g++.dg/init/ref18.C: Likewise.
-	* g++.dg/ipa/pr63838.C: Likewise.
-	* g++.dg/overload/rvalue2.C: Likewise.
-	* g++.dg/parse/semicolon4.C: Likewise.
-	* g++.dg/warn/Wreturn-type-4.C: Likewise.
-	* g++.dg/warn/pr36069.C: Likewise.
-	* g++.old-deja/g++.mike/p9506.C: Likewise.
-	* g++.old-deja/g++.other/volatile1.C: Likewise.
-
-2019-08-28  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91551
-	* gfortran.dg/allocated_3.f90
-
-2019-08-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91360 - Implement C++20 P1143R2: constinit.
-	* g++.dg/cpp2a/constinit1.C: New test.
-	* g++.dg/cpp2a/constinit2.C: New test.
-	* g++.dg/cpp2a/constinit3.C: New test.
-	* g++.dg/cpp2a/constinit4.C: New test.
-	* g++.dg/cpp2a/constinit5.C: New test.
-	* g++.dg/cpp2a/constinit6.C: New test.
-	* g++.dg/cpp2a/constinit7.C: New test.
-	* g++.dg/cpp2a/constinit8.C: New test.
-	* g++.dg/cpp2a/constinit9.C: New test.
-	* g++.dg/cpp2a/constinit10.C: New test.
-	* g++.dg/cpp2a/constinit11.C: New test.
-	* g++.dg/cpp2a/constinit12.C: New test.
-
-2019-08-28  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91565
-	* gfortran.dg/pr91565.f90: New test.
-
-2019-08-28  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91564
-	* gfortran.dg/pr91564.f90: New test.
-
-2019-08-28  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91457
-	* c-c++-common/Wstringop-overflow-2.c: New test.
-	* g++.dg/warn/Warray-bounds-8.C: New test.
-	* g++.dg/warn/Wstringop-overflow-3.C: New test.
-	* gcc.dg/Wstringop-overflow-15.c: New test.
-
-2019-08-16  Martin Liska  <mliska@suse.cz>
-
-	PR c++/90613
-	* g++.dg/lookup/using61.C: New.
-
-2019-08-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR middle-end/89544
-	* gcc.target/arm/unaligned-argument-3.c: New test.
-
-2019-08-27  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/81676 - bogus -Wunused warnings in constexpr if.
-	* g++.dg/cpp1z/constexpr-if31.C: New test.
-	* g++.dg/cpp1z/constexpr-if32.C: New test.
-
-	PR c++/91428 - warn about std::is_constant_evaluated in if constexpr.
-	* g++.dg/cpp2a/is-constant-evaluated9.C: New test.
-
-2019-08-27  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91567
-	* gcc.dg/tree-ssa/builtin-snprintf-6.c: Xfail a subset of assertions
-	on targets other than x86_64 to work around PR 83543.
-	* gcc.dg/tree-ssa/builtin-sprintf-warn-22.c: New test.
-
-2019-08-27  Jeff Law  <law@redhat.com>
-
-	* gcc.c-torture/compile/20190827-1.c: New test.
-
-2019-08-27  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/91496
-	* gfortran.dg/pr91496.f90: New testcase.
-
-2019-08-27  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/sse4_1-round-roundeven-1.c (dg-options):
-	Add -mfpmath=sse.
-	* gcc.target/i386/sse4_1-round-roundeven-2.c (dg-options): Ditto.
-
-2019-08-27  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/91528
-	* gcc.target/i386/pr91528.c: New test.
-
-2019-08-27  Martin Sebor  <msebor@redhat.com>
-
-	PR c++/83431
-	PR testsuite/91562
-	* gcc.dg/strlenopt-8.c: Adjust pass/dump name.
-
-2019-08-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/91415
-	* g++.dg/warn/sequence-pt-4.C: New test.
-
-2019-08-27  Robin Dapp  <rdapp@linux.ibm.com>
-
-	PR testsuite/91549
-	* gcc.dg/wrapped-binop-simplify.c: Test only on x86, s390 with lp64.
-
-2019-08-26  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91390
-	PR fortran/91473
-	* gfortran.dg/used_before_typed_4.f90: Change warning to error.
-	* gfortran.dg/argument_checking_20.f90: New test.
-
-2019-08-26  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91545 - ICE in constexpr store evaluation.
-	* g++.dg/cpp0x/pr91545.C: New test.
-
-2019-08-26  Tejas Joshi  <tejasjoshi9673@gmail.com>
-
-	* gcc.target/i386/sse4_1-round-roundeven-1.c: New test.
-	* gcc.target/i386/sse4_1-round-roundeven-2.c: New test.
-
-2019-08-26  Tejas Joshi  <tejasjoshi9673@gmail.com>
-
-	* gcc.dg/torture/builtin-round-roundeven.c: New test.
-	* gcc.dg/torture/builtin-round-roundevenf128.c: Likewise.
-
-2019-08-26  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.dg/tree-ssa/copy-headers-5.c: Do not run vrp pass.
-	* gcc.dg/tree-ssa/copy-headers-7.c: Do not run vrp pass.
-	* gcc.dg/tree-ssa/loop-15.c: Remove XFAIL.
-	* gcc.dg/tree-ssa/pr23744.c: Change search pattern.
-	* gcc.dg/wrapped-binop-simplify.c: New test.
-
-2019-08-26  Kito Cheng  <kito.cheng@sifive.com>
-
-	* gcc.target/riscv/li.c: New test.
-
-2019-08-24  Nathan Sidwell  <nathan@acm.org>
-
-	* g++.dg/inherit/virtual14.C: New.
-
-2019-08-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91390
-	PR fortran/91519
-	* gfortran.dg/bessel_3.f90: Add type mismatch errors.
-	* gfortran.dg/coarray_7.f90: Rename subroutines to avoid
-	additional errors.
-	* gfortran.dg/g77/20010519-1.f: Add -std=legacy. Remove
-	warnings for ASSIGN. Add warnings for type mismatch.
-	* gfortran.dg/goacc/acc_on_device-1.f95: Add -std=legacy.
-	Add catch-all warning.
-	* gfortran.dg/internal_pack_9.f90: Rename subroutine to
-	avoid type error.
-	* gfortran.dg/internal_pack_9.f90: Add -std=legacy. Add
-	warnings for type mismatch.
-	* gfortran.dg/pr39937.f: Add -std=legacy and type warnings. Move
-	here from
-	* gfortran.fortran-torture/compile/pr39937.f: Move to gfortran.dg.
-
-2019-08-24  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/conversion/simd4.C: Test all the locations.
-
-2019-08-23  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91521 - wrong error with operator->.
-	* g++.dg/parse/operator8.C: New test.
-
-2019-08-23  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	PR target/91481
-	* gcc.target/powerpc/darn-3.c: New testcase.
-
-2019-08-23  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/79817 - attribute deprecated on namespace.
-	* g++.dg/cpp0x/attributes-namespace1.C: New test.
-	* g++.dg/cpp0x/attributes-namespace2.C: New test.
-	* g++.dg/cpp0x/attributes-namespace3.C: New test.
-	* g++.dg/cpp0x/attributes-namespace4.C: New test.
-	* g++.dg/cpp0x/attributes-namespace5.C: New test.
-	* g++.dg/cpp1z/namespace-attribs.C: Adjust.
-	* g++.dg/cpp1z/namespace-attribs2.C: Adjust.
-
-2019-08-23  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
-
-	* gcc.target/mips/get-fcsr-3.c: New test.
-
-2019-08-23  Martin Sebor  <msebor@redhat.com>
-
-	PR c++/83431
-	* gcc.dg/strlenopt-63.c: New test.
-	* gcc.dg/pr79538.c: Adjust text of expected warning.
-	* gcc.dg/pr81292-1.c: Adjust pass name.
-	* gcc.dg/pr81292-2.c: Same.
-	* gcc.dg/pr81703.c: Same.
-	* gcc.dg/strcmpopt_2.c: Same.
-	* gcc.dg/strcmpopt_3.c: Same.
-	* gcc.dg/strcmpopt_4.c: Same.
-	* gcc.dg/strlenopt-1.c: Same.
-	* gcc.dg/strlenopt-10.c: Same.
-	* gcc.dg/strlenopt-11.c: Same.
-	* gcc.dg/strlenopt-13.c: Same.
-	* gcc.dg/strlenopt-14g.c: Same.
-	* gcc.dg/strlenopt-14gf.c: Same.
-	* gcc.dg/strlenopt-15.c: Same.
-	* gcc.dg/strlenopt-16g.c: Same.
-	* gcc.dg/strlenopt-17g.c: Same.
-	* gcc.dg/strlenopt-18g.c: Same.
-	* gcc.dg/strlenopt-19.c: Same.
-	* gcc.dg/strlenopt-1f.c: Same.
-	* gcc.dg/strlenopt-2.c: Same.
-	* gcc.dg/strlenopt-20.c: Same.
-	* gcc.dg/strlenopt-21.c: Same.
-	* gcc.dg/strlenopt-22.c: Same.
-	* gcc.dg/strlenopt-22g.c: Same.
-	* gcc.dg/strlenopt-24.c: Same.
-	* gcc.dg/strlenopt-25.c: Same.
-	* gcc.dg/strlenopt-26.c: Same.
-	* gcc.dg/strlenopt-27.c: Same.
-	* gcc.dg/strlenopt-28.c: Same.
-	* gcc.dg/strlenopt-29.c: Same.
-	* gcc.dg/strlenopt-2f.c: Same.
-	* gcc.dg/strlenopt-3.c: Same.
-	* gcc.dg/strlenopt-30.c: Same.
-	* gcc.dg/strlenopt-31g.c: Same.
-	* gcc.dg/strlenopt-32.c: Same.
-	* gcc.dg/strlenopt-33.c: Same.
-	* gcc.dg/strlenopt-33g.c: Same.
-	* gcc.dg/strlenopt-34.c: Same.
-	* gcc.dg/strlenopt-35.c: Same.
-	* gcc.dg/strlenopt-4.c: Same.
-	* gcc.dg/strlenopt-48.c: Same.
-	* gcc.dg/strlenopt-49.c: Same.
-	* gcc.dg/strlenopt-4g.c: Same.
-	* gcc.dg/strlenopt-4gf.c: Same.
-	* gcc.dg/strlenopt-5.c: Same.
-	* gcc.dg/strlenopt-50.c: Same.
-	* gcc.dg/strlenopt-51.c: Same.
-	* gcc.dg/strlenopt-52.c: Same.
-	* gcc.dg/strlenopt-53.c: Same.
-	* gcc.dg/strlenopt-54.c: Same.
-	* gcc.dg/strlenopt-55.c: Same.
-	* gcc.dg/strlenopt-56.c: Same.
-	* gcc.dg/strlenopt-6.c: Same.
-	* gcc.dg/strlenopt-61.c: Same.
-	* gcc.dg/strlenopt-7.c: Same.
-	* gcc.dg/strlenopt-8.c: Same.
-	* gcc.dg/strlenopt-9.c: Same.
-	* gcc.dg/strlenopt.h (snprintf, snprintf): Declare.
-	* gcc.dg/tree-ssa/builtin-snprintf-6.c: New test.
-	* gcc.dg/tree-ssa/builtin-snprintf-7.c: New test.
-	* gcc.dg/tree-ssa/builtin-snprintf-8.c: New test.
-	* gcc.dg/tree-ssa/builtin-snprintf-9.c: New test.
-	* gcc.dg/tree-ssa/builtin-sprintf-warn-21.c: New test.
-	* gcc.dg/tree-ssa/dump-4.c: New test.
-	* gcc.dg/tree-ssa/pr83501.c: Adjust pass name.
-
-2019-08-23  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/Warray-bounds-36.c: Make functions static to avoid failures
-	with -fpic.
-	* gcc.dg/Warray-bounds-41.c: Same.
-	* gcc.dg/pr78973.c: Same.
-	* gcc.dg/pr78973-2.c: Same.
-
-2019-08-22  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91304 - prefix attributes ignored in condition.
-	* g++.dg/cpp0x/gen-attrs-70.C: New test.
-
-2019-08-22  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/91490
-	* c-c++-common/Warray-bounds-7.c: New test.
-	* gcc.dg/Warray-bounds-39.c: Expect either -Warray-bounds or
-	-Wstringop-overflow.
-	* gcc.dg/strlenopt-78.c: New test.
-
-2019-08-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.target/i386/minmax-4.c: Add -mno-stackrealign to dg-options.
-	* gcc.target/i386/minmax-5.c: Likewise.
-	* gcc.target/i386/minmax-6.c: Likewise.
-	* gcc.target/i386/minmax-7.c: Likewise.
-	* gcc.target/i386/pr91154.c: Likewise.
-
-2019-08-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* c-c++-common/dump-ada-spec-15.c: Check that the parameters are named.
-
-2019-08-22  Kyrylo Tkachov <kyrylo.tkachov@arm.com>
-
-	* gcc.target/arm/acle/crc_hf_1.c: New test.
-
-2019-08-22  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* gcc.target/arm/neon-extend-1.c: Remove test.
-	* gcc.target/arm/neon-extend-2.c: Remove test.
-
-2019-08-22  Sylvia Taylor  <sylvia.taylor@arm.com>
-
-	* gcc.target/aarch64/advsimd-intrinsics/vld1x4.c: New test.
-	* gcc.target/aarch64/advsimd-intrinsics/vst1x4.c: New test.
-
-2019-08-22  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-	    Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR target/88839
-	* gcc.target/aarch64/sve/sel_1.c: New test.
-	* gcc.target/aarch64/sve/sel_2.c: Likewise.
-	* gcc.target/aarch64/sve/sel_3.c: Likewise.
-	* gcc.target/aarch64/sve/sel_4.c: Likewise.
-	* gcc.target/aarch64/sve/sel_5.c: Likewise.
-	* gcc.target/aarch64/sve/sel_6.c: Likewise.
-
-2019-08-21  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR c++/91505
-	* g++.target/i386/crc32-4.C: New test.
-
-2019-08-21  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91482
-	* gcc.dg/tree-ssa/pr91482.c: New testcase.
-
-2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* c-c++-common/dump-ada-spec-15.c: New test.
-
-2019-08-21  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* gcc.target/arm/cmse/cmse-9.c: Add quotes to expected
-	warning messages.
-
-2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/prot9.adb, gnat.dg/prot9_gen.ads,
-	gnat.dg/prot9_pkg1.ads, gnat.dg/prot9_pkg2.ads: New testcase.
-
-2019-08-21  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/implicit_param.adb, gnat.dg/implicit_param_pkg.ads:
-	New testcase.
-
-2019-08-20  Martin Sebor  <msebor@redhat.com>
-
-	PR testsuite/91458
-	* g++.dg/tree-ssa/ssa-dse-1.C: Use the same search pattern
-	unconditionally (correcting r272199, PR middle-end/90676).
-	* gcc.dg/tree-prof/stringop-2.c: Same.
-
-2019-08-20  Ian Lance Taylor  <iant@golang.org>
-
-	* go.test/test/fixedbugs/bug073.go: Update for language changes.
-
-2019-08-20  Matthew Beliveau  <mbelivea@redhat.com>
-
-	* gcc.dg/tree-ssa/redundant-assign-zero-1.c: New test.
-	* gcc.dg/tree-ssa/redundant-assign-zero-2.c: New test.
-
-2019-08-20  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/37242
-	* gcc.dg/tree-ssa/ssa-fre-80.c: New testcase.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/storage_size1.adb: New testcase.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/loop_entry2.adb: New testcase.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/tagged5.adb, gnat.dg/tagged5.ads: New testcase.
-
-2019-08-20  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/type_conv2.adb, gnat.dg/type_conv2.ads: New testcase.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/unchecked_convert14.adb: New testcase.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/object_size1.adb: New testcase.
-
-2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.c-torture/execute/20190820-1.c: New test.
-
-2019-08-20  Richard Biener  <rguenther@suse.de>
-
-	PR target/91498
-	* gcc.target/i386/minmax-7.c: New testcase.
-
-2019-08-20  Lili Cui  <lili.cui@intel.com>
-
-	* gcc.target/i386/funcspec-56.inc: Handle new march.
-	* g++.target/i386/mv16.C: Handle new march
-
-2019-08-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR middle-end/89544
-	* gcc.target/arm/unaligned-argument-1.c: New test.
-	* gcc.target/arm/unaligned-argument-2.c: New test.
-
-2019-08-19  Joel Hutton  <Joel.Hutton@arm.com>
-
-	* gcc.target/aarch64/fmul_scvtf_1.c: New test.
-
-2019-08-19  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91264 - detect modifying const objects in constexpr.
-	* g++.dg/cpp1y/constexpr-tracking-const1.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const2.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const3.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const4.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const5.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const6.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const7.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const8.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const9.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const10.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const11.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const12.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const13.C: New test.
-	* g++.dg/cpp1y/constexpr-tracking-const14.C: New test.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/elab8.adb, gnat.dg/elab8_gen.adb,
-	gnat.dg/elab8_gen.ads, gnat.dg/elab8_pkg.adb,
-	gnat.dg/elab8_pkg.ads: New testcase.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/warn29.adb, gnat.dg/warn29.ads: New testcase.
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/expr_func9.adb: New testcase.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/valid_scalars2.adb: New testcase.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/generic_inst12.adb, gnat.dg/generic_inst12_pkg1.adb,
-	gnat.dg/generic_inst12_pkg1.ads,
-	gnat.dg/generic_inst12_pkg2.ads: New testcase.
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/warn28.adb, gnat.dg/warn28.ads: New testcase.
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/rep_clause9.adb: New testcase.
-
-2019-08-19  Olivier Hainque  <hainque@adacore.com>
-
-	* gnat.dg/openacc1.adb: New testcase.
-
-2019-08-19  Kito Cheng  <kito.cheng@sifive.com>
-
-	PR target/91441
-	* gcc.target/riscv/pr91441.c: New.
-
-2019-08-18  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91485
-	* gfortran.dg/pr91485.f90: New test.
-
-2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/82992
-	* gfortran.dg/pr71649.f90: Adjust error messages.
-	* gfortran.dg/use_15.f90: Ditto.
-	* gfortran.dg/use_rename_8.f90: Ditto.
-
-2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/78739
-	* fortran.dg/pr78739.f90: New test.
-
-2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/78719
-	* gfortran.dg/pr78719_1.f90: New test.
-	* gfortran.dg/pr78719_2.f90: Ditto.
-	* gfortran.dg/pr78719_3.f90: Ditto.
-
-2019-08-17  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91471
-	* gfortran.dg/pr91471.f90: New test.
-
-2019-08-16  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/85827
-	* g++.dg/cpp1z/constexpr-if29.C: New test.
-
-2019-08-16  Jeff Law  <law@redhat.com>
-
-	* gcc.target/sh/pr54236-6.c: Use -fno-tree-forwprop.
-
-2019-08-16  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/struct-ret-1.c: Enable on all targets.
-
-2019-08-16  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt81.ad[sb]: New test.
-
-2019-08-16  Martin Sebor  <msebor@redhat.com>
-
-	PR testsuite/91458
-	* g++.dg/tree-ssa/pr19807.C: Use the same search pattern
-	unconditionally (correcting r272199, PR middle-end/90676).
-
-2019-08-16  Richard Biener  <rguenther@suse.de>
-
-	PR target/91469
-	* gcc.target/i386/pr91469-1.c: New testcase.
-	* gcc.target/i386/pr91469-2.c: Likewise.
-
-2019-08-16  Mark Eggleston <mark.eggleston@codethink.com>
-
-	* gfortran.dg/auto_in_equiv_1.f90: New test.
-	* gfortran.dg/auto_in_equiv_2.f90: New test.
-	* gfortran.dg/auto_in_equiv_3.f90: New test.
-
-2019-08-16  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/forwprop-31.c: Adjust.
-
-2019-08-16  Martin Liska  <mliska@suse.cz>
-
-	PR ipa/91447
-	* g++.dg/ipa/ipa-icf-4.C: Add -missed for target that
-	don't have aliases.
-
-2019-08-16  Alexandre Oliva <oliva@adacore.com>
-
-	* gcc.target/i386/pr85044.c: Require support for trampolines.
-
-	* gcc.target/i386/asm-4.c: Use amd64 natural addressing mode
-	on all __LP64__ targets.
-
-	* gcc.target/arc/interrupt-6.c: Use __builtin_alloca, require
-	effective target support for alloca, drop include of alloca.h.
-	* gcc.target/i386/pr80969-3.c: Likewise.
-	* gcc.target/sparc/setjmp-1.c: Likewise.
-	* gcc.target/x86_64/abi/ms-sysv/gen.cc: Likewise.
-	* gcc.target/x86_64/abi/ms-sysv/ms-sysv.c: Likewise.
-
-	* gcc.misc-tests/options.exp: Match /ld and -ld besides
-	/collect2.
-
-2019-08-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91443
-	* gfortran.dg/argument_checking_19.f90: New test.
-	* gfortran.dg/altreturn_10.f90: Change dg-warning to dg-error.
-	* gfortran.dg/dec_union_11.f90: Add -std=legacy.
-	* gfortran.dg/hollerith8.f90: Likewise. Remove warning for
-	Hollerith constant.
-	* gfortran.dg/integer_exponentiation_2.f90: New subroutine gee_i8;
-	use it to avoid type mismatches.
-	* gfortran.dg/pr41011.f: Add -std=legacy.
-	* gfortran.dg/whole_file_1.f90: Change warnings to errors.
-	* gfortran.dg/whole_file_2.f90: Likewise.
-
-2019-08-15  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91445
-	* gcc.dg/torture/pr91445.c: New testcase.
-
-2019-08-15  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/pr80170.c: Adjust to use __SIZETYPE__.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/loop_add_4.c: Expect 10 INCWs and
-	INCDs rather than 8.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/revb_1.c: Restrict to little-endian targets.
-	Avoid including stdint.h.
-	* gcc.target/aarch64/sve/revh_1.c: Likewise.
-	* gcc.target/aarch64/sve/revw_1.c: Likewise.
-	* gcc.target/aarch64/sve/revb_2.c: New big-endian test.
-	* gcc.target/aarch64/sve/revh_2.c: Likewise.
-	* gcc.target/aarch64/sve/revw_2.c: Likewise.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_mla_5.c: Allow FMAD as well as FMLA
-	and FMSB as well as FMLS.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/ext_2.c: Expect a MOVPRFX.
-	* gcc.target/aarch64/sve/ext_3.c: New test.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	* gcc.target/aarch64/sve/shift_1.c: Accept reversed shifts.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_mla_1.c: New test.
-	* gcc.target/aarch64/sve/cond_mla_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_5.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_5_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_6.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_6_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_7.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_7_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_8.c: Likewise.
-	* gcc.target/aarch64/sve/cond_mla_8_run.c: Likewise.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_fadd_1.c: New test.
-	* gcc.target/aarch64/sve/cond_fadd_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fadd_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fadd_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fadd_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fadd_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fadd_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fadd_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_1.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fsubr_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_1.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmaxnm_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_1.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fminnm_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_1.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fmul_4_run.c: Likewise.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_fabd_1.c: New test.
-	* gcc.target/aarch64/sve/cond_fabd_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_5.c: Likewise.
-	* gcc.target/aarch64/sve/cond_fabd_5_run.c: Likewise.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_abd_1.c: New test.
-	* gcc.target/aarch64/sve/cond_abd_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_5.c: Likewise.
-	* gcc.target/aarch64/sve/cond_abd_5_run.c: Likewise.
-
-2019-08-15  Richard Sandiford  <richard.sandiford@arm.com>
-	    Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_shift_1.c: New test.
-	* gcc.target/aarch64/sve/cond_shift_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_5.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_5_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_6.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_6_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_7.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_7_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_8.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_8_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_9.c: Likewise.
-	* gcc.target/aarch64/sve/cond_shift_9_run.c: Likewise.
-
-2019-08-14  Martin Sebor  <msebor@redhat.com>
-
-	PR testsuite/91449
-	* gcc.dg/strlenopt-73.c: Restrict 128-bit tests to i386.
-
-2019-08-14  Jonathan Wakely  <jwakely@redhat.com>
-
-	PR c++/91436
-	* g++.dg/lookup/missing-std-include-5.C: Limit test to C++14 and up.
-	* g++.dg/lookup/missing-std-include-6.C: Don't check make_unique in
-	test that runs for C++11.
-	* g++.dg/lookup/missing-std-include-8.C: Check make_unique here.
-
-2019-08-14  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* gcc.c-torture/execute/noinit-attribute.c: Fix typo.
-
-2019-08-14  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91294
-	* gcc.dg/strlenopt-44.c: Adjust tested result.
-	* gcc.dg/strlenopt-70.c: Avoid exercising unimplemnted optimization.
-	* gcc.dg/strlenopt-73.c: New test.
-	* gcc.dg/strlenopt-74.c: New test.
-	* gcc.dg/strlenopt-75.c: New test.
-	* gcc.dg/strlenopt-76.c: New test.
-	* gcc.dg/strlenopt-77.c: New test.
-
-2019-08-14  Jakub Jelinek  <jakub@redhat.com>
-	    Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91391 - bogus -Wcomma-subscript warning.
-	* g++.dg/cpp2a/comma5.C: New test.
-
-2019-08-14  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* lib/target-supports.exp (check_effective_target_noinit): New
-	proc.
-	* gcc.c-torture/execute/noinit-attribute.c: New test.
-
-2019-08-14  Richard Biener  <rguenther@suse.de>
-
-	PR target/91154
-	* gcc.target/i386/pr91154.c: New testcase.
-	* gcc.target/i386/minmax-3.c: Likewise.
-	* gcc.target/i386/minmax-4.c: Likewise.
-	* gcc.target/i386/minmax-5.c: Likewise.
-	* gcc.target/i386/minmax-6.c: Likewise.
-	* gcc.target/i386/minmax-1.c: Add -mno-stv.
-	* gcc.target/i386/minmax-2.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_logical_1.c: New test.
-	* gcc.target/aarch64/sve/cond_logical_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_5.c: Likewise.
-	* gcc.target/aarch64/sve/cond_logical_5_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/cond_uxt_1.c: New test.
-	* gcc.target/aarch64/sve/cond_uxt_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_uxt_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_uxt_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_uxt_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_uxt_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_uxt_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_uxt_4_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/cond_convert_1.c: New test.
-	* gcc.target/aarch64/sve/cond_convert_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_5.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_5_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_6.c: Likewise.
-	* gcc.target/aarch64/sve/cond_convert_6_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_unary_1.c: Add tests for
-	floating-point types.
-	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_4.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/cond_unary_1.c: New test.
-	* gcc.target/aarch64/sve/cond_unary_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_4.c: Likewise.
-	* gcc.target/aarch64/sve/cond_unary_4_run.c: Likewise.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/alignment15.adb: New testcase.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/warn27.adb: New testcase.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/inline19.adb, gnat.dg/inline19.ads: New testcase.
-
-2019-08-14  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/equal11.adb, gnat.dg/equal11_interface.ads,
-	gnat.dg/equal11_record.adb, gnat.dg/equal11_record.ads: New
-	testcase.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/discr57.adb: New testcase.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/generic_inst11.adb, gnat.dg/generic_inst11_pkg.adb,
-	gnat.dg/generic_inst11_pkg.ads: New testcase.
-
-2019-08-14  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/assert2.adb, gnat.dg/assert2.ads: New testcase.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/inline18.adb, gnat.dg/inline18.ads,
-	gnat.dg/inline18_gen1-inner_g.ads, gnat.dg/inline18_gen1.adb,
-	gnat.dg/inline18_gen1.ads, gnat.dg/inline18_gen2.adb,
-	gnat.dg/inline18_gen2.ads, gnat.dg/inline18_gen3.adb,
-	gnat.dg/inline18_gen3.ads, gnat.dg/inline18_pkg1.adb,
-	gnat.dg/inline18_pkg1.ads, gnat.dg/inline18_pkg2-child.ads,
-	gnat.dg/inline18_pkg2.ads: New testcase.
-
-2019-08-14  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate12.adb, gnat.dg/predicate12.ads: New
-	testcase.
-
-2019-08-14  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/task5.adb: New testcase.
-
-2019-08-14  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/91419
-	* lib/target-supports.exp (natural_alignment_32): Amend target
-	list based on BIGGEST_ALIGNMENT.
-	(natural_alignment_64): Targets not natural_alignment_32 cannot
-	be natural_alignment_64.
-	* gcc.dg/tree-ssa/pr91091-2.c: XFAIL for !natural_alignment_32.
-	* gcc.dg/tree-ssa/ssa-fre-77.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-fre-61.c: Require natural_alignment_32.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/vcond_21.c: New test.
-	* gcc.target/aarch64/sve/vcond_21_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* g++.target/aarch64/sve/dup_sel_1.C: New test.
-	* g++.target/aarch64/sve/dup_sel_2.C: Likewise.
-	* g++.target/aarch64/sve/dup_sel_3.C: Likewise.
-	* g++.target/aarch64/sve/dup_sel_4.C: Likewise.
-	* g++.target/aarch64/sve/dup_sel_5.C: Likewise.
-	* g++.target/aarch64/sve/dup_sel_6.C: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-	    Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/sve/vcond_18.c: New test.
-	* gcc.target/aarch64/sve/vcond_18_run.c: Likewise.
-	* gcc.target/aarch64/sve/vcond_19.c: Likewise.
-	* gcc.target/aarch64/sve/vcond_19_run.c: Likewise.
-	* gcc.target/aarch64/sve/vcond_20.c: Likewise.
-	* gcc.target/aarch64/sve/vcond_20_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/fmaxnm_1.c: New test.
-	* gcc.target/aarch64/sve/fminnm_1.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/smax_1.c: New test.
-	* gcc.target/aarch64/sve/smin_1.c: Likewise.
-	* gcc.target/aarch64/sve/umax_1.c: Likewise.
-	* gcc.target/aarch64/sve/umin_1.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/cnot_1.c: New test.
-	* gcc.target/aarch64/sve/cond_cnot_1.c: Likewise.
-	* gcc.target/aarch64/sve/cond_cnot_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_cnot_2.c: Likewise.
-	* gcc.target/aarch64/sve/cond_cnot_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/cond_cnot_3.c: Likewise.
-	* gcc.target/aarch64/sve/cond_cnot_3_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/vect-clz.c: Force SVE off.
-	* gcc.target/aarch64/sve/clrsb_1.c: New test.
-	* gcc.target/aarch64/sve/clrsb_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/clz_1.c: Likewise.
-	* gcc.target/aarch64/sve/clz_1_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/adr_1.c: New test.
-	* gcc.target/aarch64/sve/adr_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/adr_2.c: Likewise.
-	* gcc.target/aarch64/sve/adr_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/adr_3.c: Likewise.
-	* gcc.target/aarch64/sve/adr_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/adr_4.c: Likewise.
-	* gcc.target/aarch64/sve/adr_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/adr_5.c: Likewise.
-	* gcc.target/aarch64/sve/adr_5_run.c: Likewise.
-
-2019-08-14  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/conversion/simd4.C: Test locations.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/peel_ind_1.c: Look for an inverted .B VL1.
-	* gcc.target/aarch64/sve/peel_ind_2.c: Likewise .S VL7.
-
-2019-08-14  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/parse/typedef9.C: Test locations too.
-
-2019-08-14  Martin Liska  <mliska@suse.cz>
-
-	* c-c++-common/asan/memcmp-1.c: There's a new function in the
-	stack-trace on the top.  So shift expected output in stack
-	trace.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/vcond_17.c: New test.
-	* gcc.target/aarch64/sve/vcond_17_run.c: Likewise.
-
-2019-08-14  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/spill_4.c: Expect all ptrues to be .Bs.
-	* gcc.target/aarch64/sve/single_1.c: Likewise.
-	* gcc.target/aarch64/sve/single_2.c: Likewise.
-	* gcc.target/aarch64/sve/single_3.c: Likewise.
-	* gcc.target/aarch64/sve/single_4.c: Likewise.
-
-2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/87991
-	* gfortran.dg/pr87991.f90: New test.
-
-2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/spill_2.c: Increase iteration counts
-	beyond the range of a PTRUE.
-	* gcc.target/aarch64/sve/while_6.c: New test.
-	* gcc.target/aarch64/sve/while_7.c: Likewise.
-	* gcc.target/aarch64/sve/while_8.c: Likewise.
-	* gcc.target/aarch64/sve/while_9.c: Likewise.
-	* gcc.target/aarch64/sve/while_10.c: Likewise.
-
-2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/88072
-	* gfortran.dg/unlimited_polymorphic_28.f90: Fix error message.  Left
-	out of previous commit!
-
-2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/88072
-	* gfortran.dg/pr88072.f90: New test.
-	* gfortran.dg/unlimited_polymorphic_28.f90: Fix error message.
-
-2019-08-13  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* obj-c++.dg/stubify-1.mm: Rename symbol stub option.
-	* obj-c++.dg/stubify-2.mm: Likewise.
-	* objc.dg/stubify-1.m: Likewise.
-	* objc.dg/stubify-2.m: Likewise.
-
-2013-08-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/90563
-	* gfortran.dg/do_subsript_5.f90: New test.
-
-2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/89647
-	* gfortran.dg/pr89647.f90: New test.
-
-2019-08-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/87993
-	* gfortran.dg/pr87993.f90: New test.
-
-2019-08-13  Martin Sebor  <msebor@redhat.com>
-
-	PR c/80619
-	* gcc.dg/format/pr80619.c: New test.
-
-2019-08-13  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90473 - wrong code with nullptr in default argument.
-	* g++.dg/cpp0x/nullptr42.C: New test.
-
-2019-08-13  Olivier Hainque  <hainque@adacore.com>
-
-	* gnat.dg/casesi.ad[bs], test_casesi.adb: New test.
-
-2019-08-13  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR target/81800
-	* gcc.target/aarch64/no-inline-lrint_3.c: New test.
-
-2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/init_2.c: Expect ld1rd to be used
-	instead of a full vector load.
-	* gcc.target/aarch64/sve/init_4.c: Likewise.
-	* gcc.target/aarch64/sve/ld1r_2.c: Remove constants that no longer
-	need to be loaded from memory.
-	* gcc.target/aarch64/sve/slp_2.c: Expect the same output for
-	big and little endian.
-	* gcc.target/aarch64/sve/slp_3.c: Likewise.  Expect 3 of the
-	doubles to be moved via integer registers rather than loaded
-	from memory.
-	* gcc.target/aarch64/sve/slp_4.c: Likewise but for 4 doubles.
-	* gcc.target/aarch64/sve/spill_4.c: Expect 16-bit constants to be
-	loaded via an integer register rather than from memory.
-	* gcc.target/aarch64/sve/const_1.c: New test.
-	* gcc.target/aarch64/sve/const_2.c: Likewise.
-	* gcc.target/aarch64/sve/const_3.c: Likewise.
-
-2019-08-13  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/msp430.exp (msp430_device_permutations_runtest):
-	Handle csv-* and bad-devices-* tests.
-	* gcc.target/msp430/devices/README: Document how bad-devices-* tests
-	work.
-	* gcc.target/msp430/devices/bad-devices-1.c: New test.
-	* gcc.target/msp430/devices/bad-devices-2.c: Likewise.
-	* gcc.target/msp430/devices/bad-devices-3.c: Likewise.
-	* gcc.target/msp430/devices/bad-devices-4.c: Likewise.
-	* gcc.target/msp430/devices/bad-devices-5.c: Likewise.
-	* gcc.target/msp430/devices/bad-devices-6.c: Likewise.
-	* gcc.target/msp430/devices/csv-device-order.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_00.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_01.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_02.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_04.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_08.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_10.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_11.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_12.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_14.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_18.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_20.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_21.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_22.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_24.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430_28.c: Likewise.
-	* gcc.target/msp430/devices/csv-msp430fr5969.c: Likewise.
-	* gcc.target/msp430/devices/hard-foo.c: Likewise.
-	* gcc.target/msp430/devices/bad-devices-1.csv: New test support file.
-	* gcc.target/msp430/devices/bad-devices-2.csv: Likewise.
-	* gcc.target/msp430/devices/bad-devices-3.csv: Likewise.
-	* gcc.target/msp430/devices/bad-devices-4.csv: Likewise.
-	* gcc.target/msp430/devices/bad-devices-5.csv: Likewise.
-	* gcc.target/msp430/devices/bad-devices-6.csv: Likewise.
-	* gcc.target/msp430/devices/devices.csv: Likewise.
-
-2019-08-13  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/msp430.exp
-	(check_effective_target_msp430_430_selected): New.
-	(check_effective_target_msp430_430x_selected): New.
-	(check_effective_target_msp430_mlarge_selected): New.
-	(check_effective_target_msp430_hwmul_not_none): New.
-	(check_effective_target_msp430_hwmul_not_16bit): New.
-	(check_effective_target_msp430_hwmul_not_32bit): New.
-	(check_effective_target_msp430_hwmul_not_f5): New.
-	(msp430_get_opts): New.
-	(msp430_device_permutations_runtest): New.
-	* gcc.target/msp430/devices/README: New file.
-	* gcc.target/msp430/devices-main.c: New test.
-	* gcc.target/msp430/devices/hard-cc430f5123.c: Likewise.
-	* gcc.target/msp430/devices/hard-foo.c: Likewise.
-	* gcc.target/msp430/devices/hard-msp430afe253.c: Likewise.
-	* gcc.target/msp430/devices/hard-msp430cg4616.c: Likewise.
-	* gcc.target/msp430/devices/hard-msp430f4783.c: Likewise.
-	* gcc.target/msp430/devices/hard-rf430frl154h_rom.c: Likewise.
-
-2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/asm-x-constraint-1.c: New test.
-	* gcc.target/aarch64/asm-y-constraint-1.c: Likewise.
-
-2019-08-13  Janne Blomqvist  <jb@gcc.gnu.org>
-
-        PR fortran/91414
-        * gfortran.dg/random_seed_1.f90: Update to match new seed size.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/discr56.adb, gnat.dg/discr56.ads,
-	gnat.dg/discr56_pkg1.adb, gnat.dg/discr56_pkg1.ads,
-	gnat.dg/discr56_pkg2.ads: New testcase.
-
-2019-08-13  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/tagged4.adb: New testcase.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/generic_inst10.adb, gnat.dg/generic_inst10_pkg.ads:
-	New testcase.
-
-2019-08-13  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/tagged3.adb, gnat.dg/tagged3_pkg.adb,
-	gnat.dg/tagged3_pkg.ads: New testcase.
-
-2019-08-13  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/aggr27.adb: New testcase.
-
-2019-08-13  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/aggr26.adb: New testcase.
-
-2019-08-13  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/allocator2.adb, gnat.dg/allocator2.ads: New testcase.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/generic_inst9.adb, gnat.dg/generic_inst9.ads,
-	gnat.dg/generic_inst9_pkg1-operator.ads,
-	gnat.dg/generic_inst9_pkg1.ads, gnat.dg/generic_inst9_pkg2.adb,
-	gnat.dg/generic_inst9_pkg2.ads: New testcase.
-
-2019-08-13  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/anon3.adb, gnat.dg/anon3.ads: New testcase.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/generic_inst8.adb, gnat.dg/generic_inst8.ads,
-	gnat.dg/generic_inst8_g.adb, gnat.dg/generic_inst8_g.ads: New
-	testcase.
-
-2019-08-13  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/tag2.adb, gnat.dg/tag2_pkg.ads: New testcase.
-
-2019-08-13  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/tree-prof/ic-misattribution-1.c: Use -fdump-ipa-profile-node.
-
-2019-08-12  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/91424
-	* gfortran.dg/do_subscript_3.f90: New test.
-	* gfortran.dg/do_subscript_4.f90: New test.
-	* gfortran.dg/pr70754.f90: Use indices that to not overflow.
-
-2019-08-12  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/83250
-	PR target/91340
-	* gcc.target/i386/avx-typecast-1.c: New test.
-	* gcc.target/i386/avx-typecast-2.c: New test.
-	* gcc.target/i386/avx512f-typecast-2.c: New test.
-
-2019-08-12  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/null_check.adb: New testcase.
-
-2019-08-12  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/renaming15.adb: New testcase.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/slice10.adb: New testcase.
-
-2019-08-12  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/generic_inst7.adb, gnat.dg/generic_inst7_pkg.adb,
-	gnat.dg/generic_inst7_pkg.ads, gnat.dg/generic_inst7_types.ads:
-	New testcase.
-
-2019-08-12  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/equal10.adb, gnat.dg/equal10.ads: New testcase.
-
-2019-08-12  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/suppress_initialization2.adb,
-	gnat.dg/suppress_initialization2.ads: New testcase.
-
-2019-08-12  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/no_caching.adb, gnat.dg/no_caching.ads: New testcase.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/range_check7.adb: New testcase.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/range_check6.adb: New testcase.
-
-2019-08-11  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/90601
-	* gdc.dg/pr90601.d: New test.
-
-2019-08-10  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	* gfortran.dg/boz_8.f90: Adjust error messages.
-	* gfortran.dg/nan_4.f90: Ditto.
-	* gfortran.dg/boz_1.f90: Add -fallow-invalid-boz to dg-options,
-	and test for warnings.
-	* gfortran.dg/boz_3.f90: Ditto.
-	* gfortran.dg/boz_4.f90: Ditto.
-	* gfortran.dg/dec_structure_6.f90: Ditto.
-	* gfortran.dg/ibits.f90: Ditto.
-
-2019-08-10  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/91238
-	* gdc.dg/pr91238.d: New test.
-
-2019-08-10  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/declare-target-2.c: Don't expect error for
-	declare target with clauses in between declare target without clauses
-	and end declare target.
-	* c-c++-common/gomp/declare-target-4.c: New test.
-
-	PR target/91408
-	* gcc.target/i386/pr91408.c: New test.
-
-2019-08-09  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/vec_rotate-1.c: Rename to ...
-	* gcc.target/powerpc/vec-rotate-1.c: ... this.  Add -maltivec option.
-	* gcc.target/powerpc/vec_rotate-2.c: Rename to ...
-	* gcc.target/powerpc/vec-rotate-2.c: ... this.
-	* gcc.target/powerpc/vec_rotate-3.c: Rename to ...
-	* gcc.target/powerpc/vec-rotate-3.c: ... this.  Add -maltivec option.
-	* gcc.target/powerpc/vec_rotate-4.c: Rename to ...
-	* gcc.target/powerpc/vec-rotate-4.c: ... this.
-
-2019-08-09  Sam Tebbs  <sam.tebbs@arm.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_v8_4a_bkey_directive): New proc.
-	* g++.target/aarch64/return_address_sign_b_exception.C,
-	return_address_sign_ab_exception.C: Add dg-require-effective-target
-	checks.
-
-2019-08-09  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR middle-end/90313
-	* g++.dg/torture/pr90313.cc: New test.
-
-2019-08-09  Martin Liska  <mliska@suse.cz>
-
-	* g++.dg/lto/devirt-19_0.C: Add -flto=auto.
-
-2019-08-09  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/spellcheck-options-21.c: New test.
-
-2019-08-09  Martin Liska  <mliska@suse.cz>
-
-	* g++.dg/ipa/ipa-icf-2.C: Add -optimized to -fdump-ipa-icf.
-	* g++.dg/ipa/ipa-icf-3.C: Likewise.
-	* g++.dg/ipa/ipa-icf-4.C: Likewise.
-	* g++.dg/ipa/ipa-icf-6.C: Likewise.
-	* gcc.dg/ipa/ipa-icf-1.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-10.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-11.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-12.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-13.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-16.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-18.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-2.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-20.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-21.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-23.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-25.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-26.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-27.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-3.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-35.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-36.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-37.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-38.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-39.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-5.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-7.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-8.c: Likewise.
-	* gcc.dg/ipa/ipa-icf-merge-1.c: Likewise.
-	* gcc.dg/ipa/pr64307.c: Likewise.
-	* gcc.dg/ipa/pr90555.c: Likewise.
-
-2019-08-09  Martin Liska  <mliska@suse.cz>
-
-	* g++.dg/tree-prof/indir-call-prof.C: Add -optimize
-	to -fdump-ipa-profile.
-	* g++.dg/tree-prof/morefunc.C: Likewise.
-	* g++.dg/tree-prof/reorder.C: Likewise.
-	* gcc.dg/tree-prof/ic-misattribution-1.c: Likewise.
-	* gcc.dg/tree-prof/indir-call-prof.c: Likewise.
-	* gcc.dg/tree-prof/stringop-1.c: Likewise.
-	* gcc.dg/tree-prof/stringop-2.c: Likewise.
-	* gcc.dg/tree-prof/val-prof-1.c: Likewise.
-	* gcc.dg/tree-prof/val-prof-2.c: Likewise.
-	* gcc.dg/tree-prof/val-prof-3.c: Likewise.
-	* gcc.dg/tree-prof/val-prof-4.c: Likewise.
-	* gcc.dg/tree-prof/val-prof-5.c: Likewise.
-	* gcc.dg/tree-prof/val-prof-7.c: Likewise.
-
-2019-08-09  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/if-4.c: New test.
-	* c-c++-common/gomp/clause-dups-1.c: New test.
-
-	PR c/91401
-	* c-c++-common/gomp/pr91401-1.c: New test.
-	* c-c++-common/gomp/pr91401-2.c: New test.
-
-2019-08-09  Alexandre Oliva  <oliva@adacore.com>
-
-	* gcc.target/i386/sse2-mul-1.c: Use rand.  Drop fallback.
-	* gcc.target/i386/sse4_1-blendps-2.c: Likewise.
-	* gcc.target/i386/sse4_1-blendps.c: Likewise.
-	* gcc.target/i386/xop-vshift-1.c: Likewise.
-	* gcc.target/powerpc/direct-move.h: Likewise.
-
-2019-08-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/enum20.C: Test location(s) too.
-	* g++.dg/other/friend3.C: Likewise.
-	* g++.dg/parse/dtor5.C: Likewise.
-	* g++.dg/parse/friend7.C: Likewise.
-	* g++.dg/template/error22.C: Likewise.
-	* g++.old-deja/g++.brendan/err-msg5.C: Likewise.
-
-2019-08-08  Jim Wilson  <jimw@sifive.com>
-
-	PR target/91229
-	* gcc.target/riscv/flattened-struct-abi-1.c: New test.
-	* gcc.target/riscv/flattened-struct-abi-2.c: New test.
-
-2019-08-08  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/79520
-	* g++.dg/cpp1y/constexpr-79520.C: New test.
-
-2019-08-08  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/pr79983.c (enum E): Don't allow an error about nested
-	definitions.
-	* gcc.dg/enum-redef-1.c: New test.
-
-2019-08-08  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87519 - bogus warning with -Wsign-conversion.
-	* g++.dg/warn/Wsign-conversion-5.C: New test.
-
-	* g++.dg/cpp2a/inline-asm3.C: New test.
-
-2019-08-07  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91359
-	* pr91359_2.f: Fix missing hyphen in dg-do
-	* pr91359_1.f: Ditto.  Remove RESULT variable to test actual fix!
-
-2019-08-07  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/67533
-	* g++.dg/tls/thread_local-ice5.C: New test.
-
-2019-08-07  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/init_13.c: New test.
-
-2019-08-07  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/init_12.c: Expect w1 to be moved into
-	a temporary FPR.
-
-2019-08-07  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/clastb_8.c: New test.
-
-2019-08-07  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/91385
-	* gcc.target/i386/pr91385.c: New test.
-
-2019-08-07  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/81429 - wrong parsing of constructor with C++11 attribute.
-	* g++.dg/cpp0x/gen-attrs-68.C: New test.
-	* g++.dg/cpp0x/gen-attrs-69.C: New test.
-
-2019-08-07  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91346 - Implement P1668R1, allow unevaluated asm in constexpr.
-	* g++.dg/cpp2a/inline-asm1.C: New test.
-	* g++.dg/cpp2a/inline-asm2.C: New test.
-	* g++.dg/cpp1y/constexpr-neg1.C: Adjust dg-error.
-
-2019-08-07  Janne Blomqvist  <jb@gcc.gnu.org>
-
-	PR fortran/53796
-	* gfortran.dg/inquire_recl_f2018.f90: Test for unconnected unit
-	with inquire via filename.
-
-2019-08-07  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/target-data-1.c (foo): Use use_device_addr clause
-	instead of use_device_ptr clause where required by OpenMP 5.0, add
-	further tests for both use_device_ptr and use_device_addr clauses.
-
-2019-08-07  Kewen Lin  <linkw@gcc.gnu.org>
-
-	* gcc.target/powerpc/vec_rotate-1.c: New test.
-	* gcc.target/powerpc/vec_rotate-2.c: New test.
-	* gcc.target/powerpc/vec_rotate-3.c: New test.
-	* gcc.target/powerpc/vec_rotate-4.c: New test.
-
-2019-08-07  Alexandre Oliva  <oliva@adacore.com>
-
-	* gcc.target/i386/math_m_pi.h: New.
-	* gcc.target/i386/sse4_1-round.h: Use it.
-	* gcc.target/i386/pr73350.c: Likewise.
-	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Likewise.
-	* gcc.target/i386/avx512f-vfixupimmps-2.c: Likewise.
-	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Likewise.
-	* gcc.target/i386/avx512f-vfixupimmss-2.c: Likewise.
-	* gcc.target/i386/avx512f-vfixupimmss-2.c: Likewise.
-	* gcc.target/i386/avx-ceil-sfix-2-vec.c: Likewise.  Drop
-	dg-skip-if "no M_PI".
-	* gcc.target/i386/avx-cvt-2-vec.c: Likewise.
-	* gcc.target/i386/avx-floor-sfix-2-vec.c: Likewise.
-	* gcc.target/i386/avx-rint-sfix-2-vec.c: Likewise.
-	* gcc.target/i386/avx-round-sfix-2-vec.c: Likewise.
-	* gcc.target/i386/avx512f-ceil-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-ceil-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-ceilf-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-ceilf-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-floor-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-floor-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-floorf-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-floorf-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-rint-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-rintf-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-round-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-roundf-sfix-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-trunc-vec-1.c: Likewise.
-	* gcc.target/i386/avx512f-truncf-vec-1.c: Likewise.
-	* gcc.target/i386/sse2-cvt-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-ceil-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-ceil-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-ceilf-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-ceilf-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-floor-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-floor-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-floorf-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-floorf-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-rint-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-rint-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-rintf-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-rintf-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-round-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-round-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-roundf-sfix-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-roundf-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-roundsd-4.c: Likewise.
-	* gcc.target/i386/sse4_1-roundss-4.c: Likewise.
-	* gcc.target/i386/sse4_1-trunc-vec.c: Likewise.
-	* gcc.target/i386/sse4_1-truncf-vec.c: Likewise.
-
-2019-08-06  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91359
-	* gfortran.dg/pr91359_1.f: New test.
-	* gfortran.dg/pr91359_2.f: Ditto.
-
-2019-08-06  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/42546
-	* gfortran.dg/allocated_1.f90: New test.
-	* gfortran.dg/allocated_2.f90: Ditto.
-
-2019-08-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.target/i386/avx512vp2intersect-2intersect-1b.c (AVX512F):
-	Remove.
-	(AVX512VP2INTERSECT): Define.
-	* gcc.target/i386/avx512vp2intersect-2intersectvl-1b.c (AVX512F):
-	Remove.
-	(AVX512VP2INTERSECT): Define.
-
-2019-08-06  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/desig1.C: Check location too.
-
-2019-08-05  Marek Polacek  <polacek@redhat.com>
-
-	DR 2413 - typename in conversion-function-ids.
-	* g++.dg/cpp2a/typename17.C: New test.
-
-2019-08-05  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/50476
-	* gcc.dg/uninit-pr50476.c: New test.
-
-	PR c++/60517
-	* g++.dg/pr60517.C: New test.
-
-2019-08-02  Tom Honermann  <tom@honermann.net>
-
-	PR c++/88095
-	* g++.dg/cpp2a/udlit-class-nttp-ctad.C: New test.
-	* g++.dg/cpp2a/udlit-class-nttp-ctad-neg.C: New test.
-	* g++.dg/cpp2a/udlit-class-nttp-ctad-neg2.C: New test.
-	* g++.dg/cpp2a/udlit-class-nttp.C: New test.
-	* g++.dg/cpp2a/udlit-class-nttp-neg.C: New test.
-	* g++.dg/cpp2a/udlit-class-nttp-neg2.C: New test.
-
-2019-08-05  Steven g. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91372
-	* gfortran.dg/pr91372.f90: New test.
-
-2019-08-05  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91338 - Implement P1161R3: Deprecate a[b,c].
-	* g++.dg/cpp2a/comma1.C: New test.
-	* g++.dg/cpp2a/comma2.C: New test.
-	* g++.dg/cpp2a/comma3.C: New test.
-	* g++.dg/cpp2a/comma4.C: New test.
-
-2019-08-05  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/mask_load_1.c: New test.
-
-2019-08-05  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/pr80993.c: Add cleanup-saved-temps to final
-	actions.
-
-2019-08-05  Martin Liska  <mliska@suse.cz>
-
-	PR c++/91334
-	* g++.dg/torture/pr91334.C: New test.
-
-2019-08-05  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/91169
-	* gnat.dg/array37.adb: New testcase.
-
-2019-08-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/91341
-	* gcc.target/i386/avx-loadu2-m128-1.c: New test.
-	* gcc.target/i386/avx-loadu2-m128-2.c: New test.
-	* gcc.target/i386/avx-loadu2-m128d-1.c: New test.
-	* gcc.target/i386/avx-loadu2-m128d-2.c: New test.
-	* gcc.target/i386/avx-loadu2-m128i-1.c: New test.
-	* gcc.target/i386/avx-loadu2-m128i-2.c: New test.
-	* gcc.target/i386/avx-storeu2-m128-1.c: New test.
-	* gcc.target/i386/avx-storeu2-m128-2.c: New test.
-	* gcc.target/i386/avx-storeu2-m128d-1.c: New test.
-	* gcc.target/i386/avx-storeu2-m128d-2.c: New test.
-	* gcc.target/i386/avx-storeu2-m128i-1.c: New test.
-	* gcc.target/i386/avx-storeu2-m128i-2.c: New test.
-
-2019-08-05  Kito Cheng  <kito.cheng@sifive.com>
-
-	* gcc.target/riscv/promote-type-for-libcall.c: New.
-
-2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/90985
-	* gfortran.dg/pr90985.f90: New test.
-
-2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/90986
-	* gfortran.dg/equiv_10.f90: New test.
-
-2019-08-02  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/56428
-	* g++.dg/cpp0x/nontype4.C: New test.
-
-2019-08-02  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/53009
-	* g++.dg/cpp0x/nontype3.C: New test.
-
-2019-08-02  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/77575
-	* g++.dg/cpp0x/nontype2.C: New test.
-
-2019-08-02  Steve Ellcey  <sellcey@marvell.com>
-
-	* gcc.target/aarch64/simd_pcs_attribute.c: New test.
-	* gcc.target/aarch64/simd_pcs_attribute-2.c: Ditto.
-	* gcc.target/aarch64/simd_pcs_attribute-3.c: Ditto.
-
-2019-08-02  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/91201
-	* gcc.target/i386/sse4_1-pr91201.c: New test.
-
-2019-08-02  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/91230 - wrong error with __PRETTY_FUNCTION__ and generic lambda.
-	* g++.dg/cpp1y/lambda-generic-pretty1.C: New test.
-
-2019-08-02  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/91323
-	* gcc.dg/torture/pr91323.c: New test.
-
-2019-08-02  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp1z/nodiscard6.C: New.
-
-2019-08-02  Senthil Kumar Selvaraj  <senthilkumar.selvaraj@microchip.com>
-
-	* gcc.dg/torture/ssa-fre-5.c: Add dg-require-effective-target int32.
-	* gcc.dg/torture/ssa-fre-7.c: Likewise.
-
-2019-08-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91201
-	* gcc.target/i386/sse2-pr91201-3.c: New test.
-	* gcc.target/i386/sse2-pr91201-4.c: New test.
-	* gcc.target/i386/sse2-pr91201-5.c: New test.
-	* gcc.target/i386/sse2-pr91201-6.c: New test.
-
-2019-08-02  Martin Liska  <mliska@suse.cz>
-
-	* g++.dg/cpp1y/new2.C: New test.
-
-2019-08-02  Senthil Kumar Selvaraj  <senthilkumar.selvaraj@microchip.com>
-
-	* gcc.dg/torture/ssa-fre-6.c: Add dg-require-effective-target int32.
-
-2019-08-02  Kito Cheng  <kito.cheng@sifive.com>
-
-	* g++.dg/lto/pr87906_0.C: Add dg-require-effective-target shared check.
-
-2019-08-01  Martin Sebor  <msebor@redhat.com>
-
-	PR c++/90947
-	* c-c++-common/array-1.c: New test.
-	* g++.dg/abi/mangle73.C: New test.
-	* g++.dg/cpp2a/nontype-class23.C: New test.
-	* g++.dg/init/array53.C: New test.
-
-2019-08-01  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/85693
-	* gcc.target/i386/pr85693-1.c: New test.
-
-2019-08-01  Matthew Beliveau  <mbelivea@redhat.com>
-
-	PR c++/90590
-	* c-c++-common/pr90590-1.c: New test.
-	* c-c++-common/pr90590-1.h: New test.
-	* c-c++-common/pr90590-2.c: New test.
-	* c-c++-common/pr90590-2.h: New test.
-
-2019-08-01  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90805 - detect narrowing in case values.
-	* c-c++-common/pr89888.c: Update expected dg-error.
-	* g++.dg/cpp0x/Wnarrowing17.C: New test.
-	* g++.dg/cpp0x/enum28.C: Update expected dg-error.
-
-2019-08-01  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* g++.dg/lto/pr89330_0.C: Add effective-target shared.
-
-2019-08-01  Kito Cheng  <kito.cheng@sifive.com>
-
-	* gcc.target/riscv/attribute-10.c: Fix testcase on rv64.
-
-2019-07-31  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/delete1.C: New.
-
-2019-07-31  Maxim Blinov  <maxim.blinov@embecosm.com>
-
-	* gcc.target/riscv/attribute-10.c: New test.
-
-2019-07-31  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91280
-	* g++.dg/torture/pr91280.C: New testcase.
-
-2019-07-31  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91293
-	* gcc.dg/vect/pr91293-1.c: New testcase.
-	* gcc.dg/vect/pr91293-2.c: Likewise.
-	* gcc.dg/vect/pr91293-3.c: Likewise.
-
-2019-07-31  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91201
-	* gcc.target/i386/sse2-pr91201-2.c: New test.
-
-2019-07-31  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91178
-	* gcc.dg/torture/pr91178-2.c: New testcase.
-
-2019-07-31  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91201
-	* gcc.target/i386/sse2-pr91201.c: New test.
-	* gcc.target/i386/avx2-pr91201.c: New test.
-	* gcc.target/i386/avx512bw-pr91201.c: New test.
-
-2019-07-31  Sudakshina Das  <sudi.das@arm.com>
-
-	* gcc.target/aarch64/acle/tme.c: New test.
-	* gcc.target/aarch64/pragma_cpp_predefs_2.c: New test.
-
-2019-07-31  Joel Hutton  <Joel.Hutton@arm.com>
-
-	* gcc.target/arm/cmse/cmse-17.c: New test.
-
-2019-07-30  Martin Sebor  <msebor@redhat.com>
-
-	PR testsuite/91258
-	* g++.dg/ubsan/vla-1.C: Suppress a valid warning.
-
-2019-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/91296
-	* gfortran.dg/pr91296.f90: New test.
-
-2019-07-30  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/91270
-	* g++.dg/torture/pr91270.C: New test.
-
-2019-07-30  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/vect/vect-cond-arith-7.c: New test.
-
-2019-07-30  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91282
-	* gcc.dg/type-convert-var.c: Add -fexcess-precision=fast to
-	dg-additional-options.
-
-	PR middle-end/91216
-	* gcc.dg/gomp/pr91216.c: New test.
-
-	PR target/91150
-	* gcc.target/i386/avx512bw-pr91150.c: New test.
-
-2019-07-29  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/pr78818-data-region.c: Add -mlarge to dg-options.
-	* gcc.target/msp430/region-misuse-code.c: New test.
-	* gcc.target/msp430/region-misuse-data.c: Likewise.
-	* gcc.target/msp430/region-misuse-code-data.c: Likewise.
-	* gcc.target/msp430/region-attribute-misuse.c: Likewise.
-
-2019-07-29  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	PR target/70320
-	* gcc.target/msp430/asm-register-names-lower-case.c: New test.
-	* gcc.target/msp430/asm-register-names-upper-case.c: Likewise.
-
-2019-07-29  Martin Liska  <mliska@suse.cz>
-
-	* g++.dg/cpp1y/new1.C (test_unused): Add new case that causes
-	ICE.
-
-2019-07-29  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91267
-	* gcc.dg/torture/pr91267.c: New testcase.
-
-2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* c-c++-common/guality/Og-dce-1.c: New test.
-	* c-c++-common/guality/Og-dce-2.c: Likewise.
-	* c-c++-common/guality/Og-dce-3.c: Likewise.
-
-2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* c-c++-common/guality/Og-global-dse-1.c: New test.
-
-2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* c-c++-common/guality/Og-static-wo-1.c: New test.
-	* g++.dg/guality/guality.exp: Separate the c-c++-common tests into
-	"Og" and "general" tests.  Run the latter at -O0 and -Og only.
-	* gcc.dg/guality/guality.exp: Likewise.
-
-2019-07-29  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* lib/scanasm.exp (parse_function_bodies, check_function_body)
-	(check-function-bodies): New procedures.
-	* gcc.target/aarch64/sve/init_1.c: Use check-function-bodies
-	instead of scan-assembler.
-	* gcc.target/aarch64/sve/init_2.c: Likewise.
-	* gcc.target/aarch64/sve/init_3.c: Likewise.
-	* gcc.target/aarch64/sve/init_4.c: Likewise.
-	* gcc.target/aarch64/sve/init_5.c: Likewise.
-	* gcc.target/aarch64/sve/init_6.c: Likewise.
-	* gcc.target/aarch64/sve/init_7.c: Likewise.
-	* gcc.target/aarch64/sve/init_8.c: Likewise.
-	* gcc.target/aarch64/sve/init_9.c: Likewise.
-	* gcc.target/aarch64/sve/init_10.c: Likewise.
-	* gcc.target/aarch64/sve/init_11.c: Likewise.
-	* gcc.target/aarch64/sve/init_12.c: Likewise.
-
-2019-07-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* g++.dg/lto/pr89330_0.C (dg-lto-options): Add -fPIC.
-	Require fpic support.
-
-2019-07-27  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/bmi2-bzhi64-1a.c: Add options to enable altivec
-	and vsx.
-
-2019-07-26  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* lib/scanasm.exp (object-size): Handle Darwin's size command.
-
-2018-07-26  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.dg/type-convert-var.c: New test.
-
-2019-07-26  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/89330
-	* g++.dg/lto/pr89330_[01].C: New test.
-	* g++.dg/tree-prof/devirt.C: Added -fno-profile-values to dg-options.
-
-2019-07-25  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91183
-	PR tree-optimization/86688
-	* gcc.dg/Wstringop-overflow-14.c: Disable for stricly aligned targets.
-	* gcc.dg/strlenopt-70.c: Fix bugs.
-	* gcc.dg/strlenopt-71.c: Same.
-	* gcc.dg/strlenopt-72.c: Same.
-
-2019-07-25  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR rtl-optimization/91223
-	* gcc.target/i386/pr91223.c: New test.
-
-2019-07-25  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR gcov-profile/91087
-	* g++.dg/gcov/pr16855.C: Xfail the count lines for the DTORs and the
-	"final" line for the failure summaries.  Adjust source layout so that
-	dejagnu xfail expressions work.
-
-2019-07-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/65819
-	* gfortran.dg/dependency_54.f90: New test.
-
-2019-07-25  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/case_optimization3.ad[sb]: New test.
-
-2019-07-25  Martin Liska  <mliska@suse.cz>
-	    Dominik Infuhr  <dominik.infuehr@theobroma-systems.com>
-
-	PR c++/23383
-	* g++.dg/cpp1y/new1.C: New test.
-
-2019-07-25  Eric Botcazou  <ebotcazou@adacore.com>
-
-	PR testsuite/91245
-	* gnat.dg/float_value1.adb: Only run on x86.
-
-2019-07-24  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/91183
-	PR tree-optimization/86688
-	* c-c++-common/ubsan/object-size-9.c: Disable warnings.
-	* gcc.dg/Wstringop-overflow-14.c: New test.
-	* gcc.dg/attr-nonstring-2.c: Remove xfails.
-	* gcc.dg/strlenopt-70.c: New test.
-	* gcc.dg/strlenopt-71.c: New test.
-	* gcc.dg/strlenopt-72.c: New test.
-	* gcc.dg/strlenopt-8.c: Remove xfails.
-
-2019-07-24  Martin Sebor  <msebor@redhat.com>
-
-	PR driver/80545
-	* gcc.misc-tests/help.exp: Add tests.
-	* lib/options.exp: Handle C++.
-
-2019-07-24  Claudiu Zissulescu  <claziss@synopsys.com>
-
-	* gcc.target/arc/arc.exp (check_effective_target_accregs): New
-	predicate.
-	* gcc.target/arc/builtin_special.c: Update test/
-	* gcc.target/arc/interrupt-1.c: Likewise.
-	* gcc.target/arc/interrupt-10.c: New test.
-	* gcc.target/arc/interrupt-11.c: Likewise.
-	* gcc.target/arc/interrupt-12.c: Likewise.
-
-2019-07-24  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/addsub-signed-overflow-1.c: New test.
-	* gcc.target/s390/addsub-signed-overflow-2.c: New test.
-	* gcc.target/s390/mul-signed-overflow-1.c: New test.
-	* gcc.target/s390/mul-signed-overflow-2.c: New test.
-
-2019-07-24  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	PR middle-end/91166
-	* gcc.target/aarch64/sve/pr91166.c: New test.
-
-2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/54072
-	* gfortran.dg/illegal_boz_arg_1.f90: New tests.
-
-2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	* gfortran.dg/achar_5.f90: Fix for new BOZ handling.
-	* arithmetic_overflow_1.f90: Ditto.
-	* gfortran.dg/boz_11.f90: Ditto.
-	* gfortran.dg/boz_12.f90: Ditto.
-	* gfortran.dg/boz_4.f90: Ditto.
-	* gfortran.dg/boz_5.f90: Ditto.
-	* gfortran.dg/boz_6.f90: Ditto.
-	* gfortran.dg/boz_7.f90: Ditto.
-	* gfortran.dg/boz_8.f90: Ditto.
-	* gfortran.dg/dec_structure_6.f90: Ditto.
-	* gfortran.dg/dec_union_1.f90: Ditto.
-	* gfortran.dg/dec_union_2.f90: Ditto.
-	* gfortran.dg/dec_union_5.f90: Ditto.
-	* gfortran.dg/dshift_3.f90: Ditto.
-	* gfortran.dg/gnu_logical_2.f90: Ditto.
-	* gfortran.dg/int_conv_1.f90: Ditto.
-	* gfortran.dg/ishft_1.f90: Ditto.
-	* gfortran.dg/nan_4.f90: Ditto.
-	* gfortran.dg/no_range_check_3.f90: Ditto.
-	* gfortran.dg/pr16433.f: Ditto.
-	* gfortran.dg/pr44491.f90: Ditto.
-	* gfortran.dg/pr58027.f90: Ditto.
-	* gfortran.dg/pr81509_2.f90: Ditto.
-	* gfortran.dg/unf_io_convert_1.f90: Ditto.
-	* gfortran.dg/unf_io_convert_2.f90: Ditto.
-	* gfortran.fortran-torture/execute/intrinsic_fraction_exponent.f90:
-	Ditto.
-	* gfortran.fortran-torture/execute/intrinsic_mvbits.f90: Ditto.
-	* gfortran.fortran-torture/execute/intrinsic_nearest.f90: Ditto.
-	* gfortran.fortran-torture/execute/seq_io.f90: Ditto.
-	* gfortran.dg/gnu_logical_1.F: Delete test.
-	* gfortran.dg/merge_bits_3.f90: New test.
-	* gfortran.dg/merge_bits_3.f90: Ditto.
-	* gfortran.dg/boz_int.f90: Ditto.
-	* gfortran.dg/boz_bge.f90: Ditto.
-	* gfortran.dg/boz_complex_1.f90: Ditto.
-	* gfortran.dg/boz_complex_2.f90: Ditto.
-	* gfortran.dg/boz_complex_3.f90: Ditto.
-	* gfortran.dg/boz_dble.f90: Ditto.
-	* gfortran.dg/boz_dshift_1.f90: Ditto.
-	* gfortran.dg/boz_dshift_2.f90: Ditto.
-	* gfortran.dg/boz_float_1.f90: Ditto.
-	* gfortran.dg/boz_float_2.f90: Ditto.
-	* gfortran.dg/boz_float_3.f90: Ditto.
-	* gfortran.dg/boz_iand_1.f90: Ditto.
-	* gfortran.dg/boz_iand_2.f90: Ditto.
-
-2019-07-23  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/86061
-	* gcc.dg/tree-ssa/pr86061.c: New test.
-
-2019-07-23  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/83518
-	* gcc.dg/tree-ssa/ssa-fre-79.c: New testcase.
-
-2019-07-23  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/task4.adb: New testcase.
-
-2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/range_check5.adb: New testcase.
-
-2019-07-23  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/iter5.adb: Add an expected error.
-	* gnat.dg/iter6.adb: New testcase.
-
-2019-07-23  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/ghost6.adb, gnat.dg/ghost6_pkg.ads: New testcase.
-
-2019-07-22  Sylvia Taylor  <sylvia.taylor@arm.com>
-
-	* gcc.target/aarch64/simd/ssra.c: New test.
-	* gcc.target/aarch64/simd/usra.c: New test.
-
-2019-07-22  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/isr-push-pop-main.c: New test.
-	* gcc.target/msp430/isr-push-pop-isr-430.c: Likewise.
-	* gcc.target/msp430/isr-push-pop-isr-430x.c: Likewise.
-	* gcc.target/msp430/isr-push-pop-leaf-isr-430.c: Likewise.
-	* gcc.target/msp430/isr-push-pop-leaf-isr-430x.c: Likewise.
-
-2019-07-22  Andrea Corallo  <andrea.corallo@arm.com>
-
-	* jit.dg/test-error-gcc_jit_context_new_unary_op-bad-res-type.c:
-	New testcase.
-	* jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c:
-	Adjust error message.
-
-2019-07-22  Paul A. Clarke  <pc@us.ibm.com>
-
-	* gcc.target/powerpc/sse4_1-check.h: New.
-	* gcc.target/powerpc/sse4_1-pblendvb.c: New.
-	* gcc.target/powerpc/sse4_1-pblendw.c: New.
-	* gcc.target/powerpc/sse4_1-pblendw-2.c: New.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/fixedpnt6.adb: New testcase.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/warn26.adb: New testcase.
-
-2019-07-22  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/class_wide5.adb: New testcase.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/opt80.adb: New testcase.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/warn25.adb: New testcase.
-
-2019-07-22  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/warn24.adb: New testcase.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/inline17.adb, gnat.dg/inline17_pkg1.adb,
-	gnat.dg/inline17_pkg1.ads, gnat.dg/inline17_pkg2.ads,
-	gnat.dg/inline17_pkg3.adb, gnat.dg/inline17_pkg3.ads: New
-	testcase.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/iter5.adb, gnat.dg/iter5_pkg.ads: New testcase.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/enum_val1.adb: New testcase.
-
-2019-07-22  Nicolas Roche  <roche@adacore.com>
-
-	* gnat.dg/float_value1.adb: New testcase.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/encode_string1.adb, gnat.dg/encode_string1_pkg.adb,
-	gnat.dg/encode_string1_pkg.ads: New testcase.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/warn23.adb: New testcase.
-
-2019-07-22  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/cpp_constructor2.adb: New testcase.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/warn22.adb: New testcase.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/loop_invariant1.adb, gnat.dg/loop_invariant1.ads: New
-	testcase.
-
-2019-07-22  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91221
-	* g++.dg/pr91221.C: New testcase.
-
-2019-07-22  Martin Liska  <mliska@suse.cz>
-
-	PR driver/91172
-	* gcc.dg/pr91172.c: New test.
-
-2019-07-22  Claudiu Zissulescu  <claziss@synopsys.com>
-
-	* gcc.target/arc/tls-2.c: New test.
-	* gcc.target/arc/tls-3.c: Likewise.
-
-2019-07-21  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/67853
-	* g++.dg/cpp0x/decltype72.C: New test.
-
-2019-07-22  Stafford Horne  <shorne@gmail.com>
-
-	* gcc.target/or1k/ror-4.c: New file.
-	* gcc.target/or1k/shftimm-1.c: Update test from rotate to shift
-	as the shftimm option no longer controls rotate.
-
-2019-07-22  Stafford Horne  <shorne@gmail.com>
-
-	PR target/90362
-	* gcc.target/or1k/div-mul-3.c: New test.
-
-2019-07-22  Stafford Horne  <shorne@gmail.com>
-
-	PR target/90363
-	* gcc.target/or1k/swap-1.c: New test.
-	* gcc.target/or1k/swap-2.c: New test.
-
-2019-07-20  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/volatile-mem.c: New testcase.
-
-2019-07-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/91204
-	* gcc.c-torture/compile/pr91204.c: New test.
-
-	* c-c++-common/gomp/cancel-1.c: Adjust expected diagnostic wording.
-	* c-c++-common/gomp/clauses-1.c (foo, baz, bar): Add order(concurrent)
-	clause where allowed.  Add combined constructs with loop with all
-	possible clauses.
-	(qux): New function.
-	* c-c++-common/gomp/loop-1.c: New test.
-	* c-c++-common/gomp/loop-2.c: New test.
-	* c-c++-common/gomp/loop-3.c: New test.
-	* c-c++-common/gomp/loop-4.c: New test.
-	* c-c++-common/gomp/loop-5.c: New test.
-	* c-c++-common/gomp/order-3.c: Adjust expected diagnostic wording.
-	* c-c++-common/gomp/simd-setjmp-1.c: New test.
-	* c-c++-common/gomp/teams-2.c: Adjust expected diagnostic wording.
-
-	* gcc.dg/vect/vect-simd-16.c: New test.
-
-2019-07-19  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/86061
-	* gcc.dg/tree-ssa/ssa-dse-37.c: New test.
-	* gcc.dg/tree-ssa/ssa-dse-38.c: New test.
-
-2019-07-19  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91211
-	* gcc.dg/torture/pr91211.c: New testcase.
-
-2019-07-19  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91200
-	* gcc.dg/torture/pr91200.c: New testcase.
-
-2019-07-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91190
-	* gcc.c-torture/compile/pr91190.c: New test.
-
-2019-07-19  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91207
-	* gcc.dg/torture/pr91207.c: New testcase.
-
-2019-07-18  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/91188
-	* gcc.target/i386/pr91188-1a.c: New test.
-	* gcc.target/i386/pr91188-1b.c: Ditto.
-	* gcc.target/i386/pr91188-1c.c: Ditto.
-	* gcc.target/i386/pr91188-2a.c: Ditto.
-	* gcc.target/i386/pr91188-2b.c: Ditto.
-	* gcc.target/i386/pr91188-2c.c: Ditto.
-
-2019-07-18  Sylvia Taylor  <sylvia.taylor@arm.com>
-
-	PR target/90317
-	* gcc.target/arm/crypto-vsha1cq_u32.c (foo): Change return type to
-	uint32_t.
-	(GET_LANE, TEST_SHA1C_VEC_SELECT): New.
-	* gcc.target/arm/crypto-vsha1h_u32.c (foo): Change return type to
-	uint32_t.
-	(GET_LANE, TEST_SHA1H_VEC_SELECT): New.
-	* gcc.target/arm/crypto-vsha1mq_u32.c (foo): Change return type to
-	uint32_t.
-	(GET_LANE, TEST_SHA1M_VEC_SELECT): New.
-	* gcc.target/arm/crypto-vsha1pq_u32.c (foo): Change return type to
-	uint32_t.
-	(GET_LANE, TEST_SHA1P_VEC_SELECT): New.
-
-2019-07-18  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/lto/alias-5_0.C: New testcase.
-	* g++.dg/lto/alias-5_1.C: New.
-	* g++.dg/lto/alias-5_2.c: New.
-
-2019-07-18  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/91137
-	* gcc.c-torture/execute/pr91137.c: New test.
-
-2019-07-18  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* c-c++-common/pr53633-2.c: New test.
-
-2019-07-17  Alexandre Oliva  <oliva@adacore.com>
-
-	PR middle-end/81824
-	* g++.dg/Wmissing-attributes-1.C: New.  Some of its fragments
-	are from Martin Sebor.
-
-2019-07-17  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90455
-	* g++.dg/cpp0x/nsdmi-list6.C: New test.
-
-2019-07-17  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/lto/alias-4_0.C
-
-2019-07-17  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91178
-	* gcc.dg/torture/pr91178.c: New testcase.
-
-2019-07-17  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91180
-	* gcc.dg/torture/pr91180.c: New testcase.
-
-2019-07-17  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91157
-	* gcc.target/i386/avx512f-pr91157.c: New test.
-	* gcc.target/i386/avx512bw-pr91157.c: New test.
-
-2019-07-17  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91181
-	* gcc.dg/pr91181.c: New testcase.
-
-2019-07-16  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/90903
-	* gfortran.dg/check_bits_1.f90: New testcase.
-
-2019-07-16  Jeff Law  <law@redhat.com>
-
-	PR rtl-optimization/91173
-	* g++.dg/pr91173.C: New test.
-
-2019-07-16  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR target/89190
-	* gcc.target/arm/pr89190.c: New test.
-
-2019-07-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/91164
-	* g++.dg/opt/pr91164.C: New test.
-
-2019-07-16  Jan Hubicka  <jh@suse.cz>
-
-	* g++.dg/lto/alias-1_0.C: Use -O3.
-	* g++.dg/lto/alias-2_0.C: Use -O3.
-	* g++.dg/lto/alias-3_0.C: Add loop to enable inlining with
-	-fno-use-linker-plugin.
-	* g++.dg/lto/alias-3_1.C: Remove dg-lto-do and dg-lto-options.
-
-2019-07-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.dg/tree-ssa/pr84512.c: Don't xfail scan-tree-dump on
-	sparcv9.
-
-2019-07-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.dg/autopar/pr91162.c: Require int128 support.
-
-2019-07-15  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/91162
-	* gcc.dg/autopar/pr91162.c: New testcase.
-
-2019-07-15  Kewen Lin  <linkw@gcc.gnu.org>
-
-	PR tree-optimization/88497
-	* gcc.dg/tree-ssa/pr88497-1.c: New test.
-	* gcc.dg/tree-ssa/pr88497-2.c: Likewise.
-	* gcc.dg/tree-ssa/pr88497-3.c: Likewise.
-	* gcc.dg/tree-ssa/pr88497-4.c: Likewise.
-	* gcc.dg/tree-ssa/pr88497-5.c: Likewise.
-	* gcc.dg/tree-ssa/pr88497-6.c: Likewise.
-	* gcc.dg/tree-ssa/pr88497-7.c: Likewise.
-
-2019-07-14  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-
-	PR fortran/87233
-	* gfortran.dg/initialization_14.f90: Modify to now pass by
-	removing two dg-error commands. Added comments.
-	* gfortran.dg/initialization_30.f90: New test that includes the
-	two tests removed above with the 'dg-options -std=f95'.
-
-2019-07-14  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.dg/tree-ssa/pr84512.c (dg-final): Remove XFAIL on alpha*-*-*.
-
-2019-07-14  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	PR target/91148
-	* gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Adjust.
-	* gcc.target/powerpc/byte-in-set-2.c: Adjust.
-	* gcc.target/powerpc/cmpb-3.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-all-nez-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-any-eqz-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xl-len-13.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xst-len-12.c: Adjust.
-
-2019-07-13  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/stabs-attrib-vect-darwin.c: Require stabs
-	support.
-
-2019-07-13  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	PR target/91148
-	* gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-exp-1.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-exp-4.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-sig-1.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-extract-sig-4.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-1.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-10.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-4.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-7.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-test-data-class-11.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-test-data-class-6.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-test-data-class-7.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-test-neg-2.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-test-neg-3.c: Adjust.
-	* gcc.target/powerpc/bfp/scalar-test-neg-5.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-extract-exp-2.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-extract-exp-3.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-extract-sig-2.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-extract-sig-3.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-insert-exp-2.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-insert-exp-3.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-insert-exp-6.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-insert-exp-7.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-test-data-class-2.c: Adjust.
-	* gcc.target/powerpc/bfp/vec-test-data-class-3.c: Adjust.
-	* gcc.target/powerpc/byte-in-either-range-1.c: Adjust.
-	* gcc.target/powerpc/byte-in-range-1.c: Adjust.
-	* gcc.target/powerpc/byte-in-set-1.c: Adjust.
-	* gcc.target/powerpc/byte-in-set-2.c: Adjust.
-	* gcc.target/powerpc/cmpb-3.c: Adjust.
-	* gcc.target/powerpc/crypto-builtin-2.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-1.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-11.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-16.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-21.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-26.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-31.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-36.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-41.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-46.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-51.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-56.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-6.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-61.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-66.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-71.c: Adjust.
-	* gcc.target/powerpc/dfp/dtstsfi-76.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-all-nez-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-any-eqz-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-cmpnez-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xl-len-12.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xl-len-13.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xlx-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xrx-7.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xst-len-12.c: Adjust.
-	* gcc.target/powerpc/vsu/vec-xst-len-13.c: Adjust.
-
-2019-07-13  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/91149
-	* c-c++-common/gomp/reduction-task-3.c: New test.
-
-	* c-c++-common/gomp/order-3.c: New test.
-	* c-c++-common/gomp/order-4.c: New test.
-
-2019-07-12  Bill Seurer  <seurer@linux.vnet.ibm.com>
-
-	* gcc.dg/tree-ssa/vector-7.c: Fix typo.
-
-2019-07-12  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/pr57438-2.c: Remove.
-
-2019-07-12  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/Warray-bounds-43.c: New test.
-
-2019-07-12  Jan Hubicka  <jh@suse.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-9.c: New testcase.
-
-2019-07-08  Jiangning Liu  <jiangning.liu@amperecomputing.com>
-
-	PR tree-optimization/89430
-	* gcc.dg/tree-ssa/pr89430-1.c: New test.
-	* gcc.dg/tree-ssa/pr89430-2.c: New test.
-	* gcc.dg/tree-ssa/pr89430-3.c: New test.
-	* gcc.dg/tree-ssa/pr89430-4.c: New test.
-	* gcc.dg/tree-ssa/pr89430-5.c: New test.
-	* gcc.dg/tree-ssa/pr89430-6.c: New test.
-
-2019-07-12  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91145
-	* gcc.dg/torture/pr91145.c: New testcase.
-
-2019-07-12  Alexandre Oliva  <oliva@adacore.com>
-
-	* gcc.dg/gimplefe-44.c: New.
-	* gcc.dg/gimplefe-43.c: New.
-
-2019-07-12  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/vector-7.c: New testcase.
-
-2019-07-12  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/order-1.c: New test.
-	* c-c++-common/gomp/order-2.c: New test.
-
-2019-07-11  Sunil K Pandey  <sunil.k.pandey@intel.com>
-
-	PR target/90980
-	* gcc.target/i386/pr90980-1.c: New test.
-	* gcc.target/i386/pr90980-2.c: Likewise.
-	* gcc.target/i386/pr90980-3.c: Likewise.
-
-2019-07-11  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/loop_entry1.adb: New testcase.
-
-2019-07-11  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/prot8.adb, gnat.dg/prot8.ads: New testcase.
-
-2019-07-11  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/unreferenced2.adb: New testcase.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/self_ref1.adb: New testcase.
-
-2019-07-11  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate11.adb: New testcase.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/equal9.adb: New testcase.
-
-2019-07-11  Thomas Quinot  <quinot@adacore.com>
-
-	* gnat.dg/scos1.adb: New testcase.
-
-2019-07-11  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/access7.adb: New testcase.
-
-2019-07-11  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/warn21.adb, gnat.dg/warn21.ads: New testcase.
-
-2019-07-11  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/91131
-	* gcc.target/i386/pr91131.c: New testcase.
-
-2019-07-10  Martin Sebor  <msebor@redhat.com>
-
-	PR testsuite/91132
-	* gcc.dg/strlenopt-67.c: Removed second copy of test.
-
-2019-07-10  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR target/91102
-	* gcc.target/aarch64/pr91102.c: New test.
-
-2019-07-10  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91126
-	* gcc.dg/torture/pr91126.c: New testcase.
-
-2019-07-10  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/torture/ssa-fre-5.c: New testcase.
-	* gcc.dg/torture/ssa-fre-6.c: Likewise.
-	* gcc.dg/torture/ssa-fre-7.c: Likewise.
-
-2019-07-10  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/modular5.adb: New testcase.
-
-2019-07-10  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/limited3.adb, gnat.dg/limited3_pkg.adb,
-	gnat.dg/limited3_pkg.ads: New testcase.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/incomplete7.adb, gnat.dg/incomplete7.ads: New testcase.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/limited2.adb, gnat.dg/limited2_pack_1.adb,
-	gnat.dg/limited2_pack_1.ads, gnat.dg/limited2_pack_2.adb,
-	gnat.dg/limited2_pack_2.ads: New testcase.
-
-2019-07-10  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/equal8.adb, gnat.dg/equal8.ads,
-	gnat.dg/equal8_pkg.ads: New testcase.
-
-2019-07-10  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/complex-invalid-1.C: New.
-	* g++.dg/diagnostic/static-cdtor-1.C: Likewise.
-	* g++.dg/cpp1z/has-unique-obj-representations2.C: Test location
-	too.
-	* g++.dg/other/anon-union3.C: Adjust expected location.
-	* g++.dg/parse/error8.C: Likewise.
-
-2019-07-09  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/lto/alias-3_0.C: New file.
-	* g++.dg/lto/alias-3_1.c: New file.
-
-2019-07-09  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/90989
-	* gcc.dg/strlenopt-26.c: Exit with test result status.
-	* gcc.dg/strlenopt-67.c: New test.
-
-2019-07-09  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
-
-	* gcc.target/mips/cfgcleanup-jalr1.c: New test.
-	* gcc.target/mips/cfgcleanup-jalr2.c: New test.
-	* gcc.target/mips/cfgcleanup-jalr3.c: New test.
-
-2019-07-09  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91114
-	* gcc.dg/vect/pr91114.c: New testcase.
-
-2019-07-09  Sylvia Taylor  <sylvia.taylor@arm.com>
-
-	* gcc.target/aarch64/crypto-fuse-1.c: Remove.
-	* gcc.target/aarch64/crypto-fuse-2.c: Remove.
-	* gcc.target/aarch64/aes-fuse-1.c: New testcase.
-	* gcc.target/aarch64/aes-fuse-2.c: New testcase.
-
-2019-07-09  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* gcc.target/arm/cmse/bitfield-1.c: Fix address of .gnu.sgstubs
-	section.
-	* gcc.target/arm/cmse/bitfield-2.c: Likewise.
-	* gcc.target/arm/cmse/bitfield-3.c: Likewise.
-	* gcc.target/arm/cmse/struct-1.c: Likewise.
-
-2019-07-09  Sylvia Taylor  <sylvia.taylor@arm.com>
-
-	* gcc.target/arm/aes-fuse-1.c: New.
-	* gcc.target/arm/aes-fuse-2.c: New.
-	* gcc.target/arm/aes_xor_combine.c: New.
-
-2019-07-09  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/predict-17.c: Test loop optimizer assumption
-	about loop iterations.
-
-2019-07-09  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/alias-access-path-1.c: Scan fre1 dump.
-	* gcc.dg/tree-ssa/alias-access-path-2.c: Likewise.
-	* gcc.dg/tree-ssa/alias-access-path-8.c: Likewise.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate10.adb, gnat.dg/predicate10_pkg.adb,
-	gnat.dg/predicate10_pkg.ads: New testcase.
-
-2019-07-09  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/image1.adb: New testcase.
-
-2019-07-09  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/rep_clause8.adb: New testcase.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/equal7.adb, gnat.dg/equal7_pkg.adb,
-	gnat.dg/equal7_pkg.ads: New testcase.
-
-2019-07-09  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/range_check3.adb, gnat.dg/range_check3_pkg.adb,
-	gnat.dg/range_check3_pkg.ads: New testcase.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/generic_inst5.adb, gnat.dg/generic_inst6.adb,
-	gnat.dg/generic_inst6_g1-c.adb, gnat.dg/generic_inst6_g1-c.ads,
-	gnat.dg/generic_inst6_g1.ads, gnat.dg/generic_inst6_i1.ads,
-	gnat.dg/generic_inst6_i2.ads, gnat.dg/generic_inst6_x.ads: New
-	testcases.
-
-2019-07-08  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/71924
-	PR middle-end/90549
-	* gcc.c-torture/execute/return-addr.c: New test.
-	* gcc.dg/Wreturn-local-addr-2.c: New test.
-	* gcc.dg/Wreturn-local-addr-4.c: New test.
-	* gcc.dg/Wreturn-local-addr-5.c: New test.
-	* gcc.dg/Wreturn-local-addr-6.c: New test.
-	* gcc.dg/Wreturn-local-addr-7.c: New test.
-	* gcc.dg/Wreturn-local-addr-8.c: New test.
-	* gcc.dg/Wreturn-local-addr-9.c: New test.
-	* gcc.dg/Wreturn-local-addr-10.c: New test.
-	* gcc.dg/Walloca-4.c: Handle expected warnings.
-	* gcc.dg/pr41551.c: Same.
-	* gcc.dg/pr59523.c: Same.
-	* gcc.dg/tree-ssa/pr88775-2.c: Same.
-	* gcc.dg/tree-ssa/alias-37.c: Same.
-	* gcc.dg/winline-7.c: Same.
-
-2019-07-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/vect/simd-6.cc: Replace xfail with target x86.
-	* g++.dg/vect/simd-9.cc: Likewise.
-
-	PR c++/91110
-	* g++.dg/gomp/pr91110.C: New test.
-
-2019-07-08  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	PR rtl-optimization/88233
-	* gcc.target/powerpc/pr88233.c: New testcase.
-
-2019-07-08  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR testsuite/91059
-	PR testsuite/78529
-	* gcc.c-torture/execute/builtins/builtins.exp: Add -fno-ipa-ra.
-
-2019-07-08  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.target/s390/rotate-truncation-mask.c: New test.
-
-2019-07-08  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.target/s390/combine-rotate-modulo.c: New test.
-	* gcc.target/s390/combine-shift-rotate-add-mod.c: New test.
-	* gcc.target/s390/vector/combine-shift-vec.c: New test.
-
-2019-07-08  Joern Rennecke  <joern.rennecke@riscy-ip.com>
-
-	Avoid clash with system header declaration.
-	* gcc.dg/vect/slp-reduc-sad.c (uint32_t): Remove unused declaration.
-
-2019-07-08  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91108
-	* gcc.dg/tree-ssa/ssa-fre-61.c: Adjust back.
-	* gcc.dg/tree-ssa/ssa-fre-78.c: New testcase.
-
-2019-07-08  Jim Wilson  <jimw@sifive.com>
-
-	* gcc.target/riscv/shift-shift-2.c: Add one more test.
-
-2019-07-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/65143
-	* g++.dg/tree-ssa/final2.C: New.
-	* g++.dg/tree-ssa/final3.C: Likewise.
-
-2019-07-08  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/interface10.adb: New testcase.
-
-2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/addr13.adb, gnat.dg/addr13.ads: New testcase.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/entry1.adb, gnat.dg/entry1.ads: New testcase.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/fixed_delete.adb: New testcase.
-
-2019-07-08  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/interface9.adb, gnat.dg/interface9_root-child.ads,
-	gnat.dg/interface9_root.ads: New testcase.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate9.adb: New testcase.
-
-2019-07-08  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/sso16.adb: New testcase.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate8.adb, gnat.dg/predicate8_pkg.adb,
-	gnat.dg/predicate8_pkg.ads: New testcase.
-
-2019-07-08  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/83518
-	* gcc.dg/tree-ssa/ssa-fre-73.c: New testcase.
-	* gcc.dg/tree-ssa/ssa-fre-74.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-fre-75.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-fre-76.c: Likewise.
-	* g++.dg/tree-ssa/pr83518.C: Likewise.
-
-2019-07-08  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/guality/guality.h: Include <sys/prctl.h> on Linux targets.
-	(main): Use PR_SET_PTRACER where available.
-
-2019-07-07  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/91077
-	* gfortran.dg/pointer_array_11.f90 : New test.
-
-2019-07-06  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/scan-4.c: Don't expect sorry message.
-
-	PR tree-optimization/91096
-	* gcc.dg/vect/vect-simd-10.c (FLT_MIN_VALUE): Define.
-	(bar, main): Use it instead of -__builtin_inff ().
-	* gcc.dg/vect/vect-simd-14.c (FLT_MIN_VALUE): Define.
-	(bar, main): Use it instead of -__builtin_inff ().
-
-2019-07-05  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/67184 (again)
-	PR c++/69445
-	* g++.dg/other/final4.C: New.
-
-2019-07-04  Marek Polacek  <polacek@redhat.com>
-
-	DR 1813
-	PR c++/83374 - __is_standard_layout wrong for a class with repeated
-	bases.
-	* g++.dg/ext/is_std_layout3.C: New test.
-	* g++.dg/ext/is_std_layout4.C: New test.
-
-2019-07-05  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/ssa-fre-77.c: New testcase.
-
-2019-07-05  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91091
-	* gcc.dg/tree-ssa/pr91091-2.c: New testcase.
-	* gcc.dg/tree-ssa/ssa-fre-70.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-fre-71.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-fre-72.c: Likewise.
-
-2019-07-05  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/91091
-	* gcc.dg/tree-ssa/pr91091-1.c: New testcase.
-	* gcc.dg/tree-ssa/ssa-fre-61.c: Adjust.
-
-2019-07-05  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/pack23.adb, gnat.dg/pack23_pkg.ads: New testcase.
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/task3.adb, gnat.dg/task3.ads, gnat.dg/task3_pkg1.ads,
-	gnat.dg/task3_pkg2.ads: New testcase.
-
-2019-07-05  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/access6.adb: New testcase.
-
-2019-07-05  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/bip_export.adb, gnat.dg/bip_export.ads: New testcase.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/aggr25.adb, gnat.dg/aggr25.ads: New testcase.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate7.adb, gnat.dg/predicate7.ads,
-	gnat.dg/predicate7_pkg.ads: New testcase.
-
-2019-07-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/78884
-	* gcc.dg/gomp/pr78884.c: New test.
-
-2019-07-04  Andrea Corallo  <andrea.corallo@arm.com>
-
-	* jit.dg/test-error-gcc_jit_context_new_binary_op-bad-res-type.c:
-	New testcase.
-
-2019-07-04  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* gcc.dg/tree-ssa/cunroll-15.c: Remove XFAIL on arm.
-
-2019-07-04  Andrea Corallo  <andrea.corallo@arm.com>
-
-	* jit.dg/all-non-failing-tests.h: Add test-accessing-bitfield.c.
-	* jit.dg/test-accessing-bitfield.c: New testcase.
-	* jit.dg/test-error-gcc_jit_context_new_bitfield-invalid-type.c:
-	Likewise.
-	* jit.dg/test-error-gcc_jit_context_new_bitfield-invalid-width.c:
-	Likewise.
-	* jit.dg/test-error-gcc_jit_lvalue_get_address-bitfield.c:
-	Likewise.
-
-2019-07-04  Jan Hubicka  <jh@suse.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-3.c: New testcase.
-	* gcc.dg/tree-ssa/alias-access-path-8.c: New testcase.
-
-2019-07-04  Andrew Stubbs  <ams@codesourcery.com>
-
-	* g++.dg/gomp/unmappable-1.C: New file.
-
-2019-07-04  Javier Miranda  <miranda@adacore.com>
-
-	* gnat.dg/cpp_constructor.adb, gnat.dg/cpp_constructor_fp.ads,
-	gnat.dg/cpp_constructor_useit.ads: New testcase.
-
-2019-07-04  Gary Dismukes  <dismukes@adacore.com>
-
-	* gnat.dg/ghost5.adb, gnat.dg/ghost5.ads,
-	gnat.dg/ghost5_parent.ads: New testcase.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/spark3.adb: New testcase.
-
-2019-07-04  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/tagged2.adb, gnat.dg/tagged2.ads: New testcase.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/equal6.adb, gnat.dg/equal6_types.adb,
-	gnat.dg/equal6_types.ads: New testcase.
-
-2019-07-04  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/allocator.adb: New testcase.
-
-2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/default_initial_condition.adb,
-	gnat.dg/default_initial_condition_pack.adb,
-	gnat.dg/default_initial_condition_pack.ads: New testcase.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/aspect2.adb, gnat.dg/aspect2.ads: New testcase.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* gnat.dg/synchronized2.adb, gnat.dg/synchronized2.ads,
-	gnat.dg/synchronized2_pkg.ads: New testcase.
-
-2019-07-04  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/generic_inst4.adb, gnat.dg/generic_inst4_gen.ads,
-	gnat.dg/generic_inst4_inst.ads, gnat.dg/generic_inst4_typ.ads:
-	New testcase.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/dimensions2.adb, gnat.dg/dimensions2_phys.ads,
-	gnat.dg/dimensions2_real_numbers.ads: New testcase.
-
-2019-07-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91063
-	* gcc.dg/gomp/pr91063.c: New test.
-
-2019-07-04  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	PR target/88833
-	* gfortran.dg/pr88833.f90: New test.
-
-2019-07-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91069
-	* gcc.dg/pr91069.c (v2df): Use 2 * sizeof (double) instead of
-	hardcoded 16 for better portability.
-	(v2di): Change from long vector to long long vector.  Use
-	2 * sizeof (long long) instead of hardcoded 16.
-
-	PR rtl-optimization/90756
-	* gcc.dg/pr90756.c: New test.
-
-2019-07-04  Chenghua Xu  <paul.hua.gm@gmail.com>
-
-	* gcc.target/mips/mips-fmadd.c: Rename to ...
-	* gcc.target/mips/mips-fmadd-o32.c: ... Here; add abi=32.
-	* gcc.target/mips/mips-fmadd-n64.c: New.
-
-2019-07-03  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* gcc.dg/store_merging_27.c: Fix test for Arm.
-	* gcc.dg/store_merging_28.c: Likewise.
-	* gcc.dg/store_merging_29.c: Likewise.
-	* gcc.dg/tree-ssa/dump-6.c: Likewise.
-
-2019-07-03  Mark Wielaard  <mark@klomp.org>
-
-	PR debug/90981
-	* g++.dg/pr90981.C: New test.
-
-2019-07-03  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/91069
-	* gcc.dg/pr91069.c: New testcase.
-
-2019-07-03  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/tree-prof/val-prof-2.c: Update scanned pattern
-	as we do now better.
-
-2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/debug1.ads: New test.
-
-2019-07-03  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/90892
-	* gcc.dg/pr90892.c: New test.
-
-2019-07-03  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/90899
-	* gcc.target/i386/pr90899.c: New test.
-
-2019-07-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/91033
-	* gcc.target/i386/pr91033.c: New test.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/task2.adb, gnat.dg/task2_pkg.adb,
-	gnat.dg/task2_pkg.ads: New testcase.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/inline16.adb, gnat.dg/inline16_gen.adb,
-	gnat.dg/inline16_gen.ads, gnat.dg/inline16_types.ads: New
-	testcase.
-
-2019-07-03  Justin Squirek  <squirek@adacore.com>
-
-	* gnat.dg/renaming13.adb, gnat.dg/renaming14.adb: New testcases.
-
-2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/inline15.adb, gnat.dg/inline15_gen.adb,
-	gnat.dg/inline15_gen.ads, gnat.dg/inline15_types.ads: New
-	testcase.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* gnat.dg/warn20.adb, gnat.dg/warn20_pkg.adb,
-	gnat.dg/warn20_pkg.ads: New testcase.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate6.adb, gnat.dg/predicate6.ads: New testcase.
-	* gnat.dg/static_pred1.adb: Remove expected error.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate5.adb, gnat.dg/predicate5.ads: New testcase.
-
-2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/alignment14.adb: New testcase.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/predicate4.adb, gnat.dg/predicate4_pkg.ads: New
-	testcase.
-
-2019-07-03  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/scan-3.c (f1): Don't expect a sorry message.
-	* c-c++-common/gomp/scan-5.c (foo): Likewise.
-
-	* c-c++-common/gomp/scan-5.c: New test.
-
-	* c-c++-common/gomp/lastprivate-conditional-5.c: New test.
-
-2019-07-02  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/90883
-	* g++.dg/tree-ssa/pr90883.c: Add -Os.  Check dse2 for the
-	deleted store on some targets.
-
-2019-07-02  Joern Rennecke  <joern.rennecke@riscy-ip.com>
-
-	PR testsuite/91065
-	* gcc.dg/plugin/start_unit_plugin.c: Register a root tab
-	to reference fake_var.
-
-2019-07-02  qing zhao  <qing.zhao@oracle.com>
-
-	PR preprocessor/90581
-	* c-c++-common/cpp/fmax-include-depth-1a.h: New test.
-	* c-c++-common/cpp/fmax-include-depth-1b.h: New test.
-	* c-c++-common/cpp/fmax-include-depth.c: New test.
-
-2019-07-02  Jan Hubicka  <jh@suse.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-7.c: New testcase.
-
-2019-07-02  Jan Hubicka  <jh@suse.cz>
-
-	* g++.dg/lto/pr90990_0.C: New testcase.
-
-2019-07-02  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/58483
-	* gcc.dg/tree-ssa/ssa-dom-cse-8.c: New testcase.
-
-2019-07-01  Joern Rennecke  <joern.rennecke@riscy-ip.com>
-
-	PR middle-end/66726
-	* gcc.dg/tree-ssa/pr66726-4.c: New testcase.
-
-2019-07-01  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/vector/vec-shift-2.c: New test.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/generic_inst3.adb,
-	gnat.dg/generic_inst3_kafka_lib-topic.ads,
-	gnat.dg/generic_inst3_kafka_lib.ads,
-	gnat.dg/generic_inst3_markets.ads,
-	gnat.dg/generic_inst3_traits-encodables.ads,
-	gnat.dg/generic_inst3_traits.ads: New testcase.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/enum_rep.adb, gnat.dg/enum_rep.ads: New testcase.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/derived_type6.adb, gnat.dg/derived_type6.ads: New
-	testcase.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/weak3.adb, gnat.dg/weak3.ads: New testcase.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* gnat.dg/prot7.adb, gnat.dg/prot7.ads: New testcase.
-
-2019-07-01  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-42.c: New testcase.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/sets1.adb: Update.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/linkedlist.adb: Update.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/dynhash.adb, gnat.dg/dynhash1.adb: Update.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* gnat.dg/freezing1.adb, gnat.dg/freezing1.ads,
-	gnat.dg/freezing1_pack.adb, gnat.dg/freezing1_pack.ads: New
-	testcase.
-
-2019-07-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	PR lto/91028
-	PR lto/90720
-	* g++.dg/lto/alias-1_0.C: Add loop to make inlining happen with
-	-fno-use-linker-plugin
-	* g++.dg/lto/alias-2_0.C: Likewise.
-
-2019-07-01  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	* g++.dg/cpp0x/gen-attrs-67.C: Add error for darwin.
-
-2019-07-01  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/pr77445-2.c: Adjust.
-
-2019-07-01  Hongtao Liu  <hongtao.liu@intel.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_avx512vp2intersect): New proc.
-	* gcc.target/i386/avx512vp2intersect-2intersect-1b.c: Add
-	dg-require-effective-target avx512vp2intersect.
-	* gcc.target/i386/avx512vp2intersect-2intersectvl-1b.c: Ditto.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/array5.ads: New test.
-	* gnat.dg/specs/array5_pkg1.ads: New helper.
-	* gnat.dg/specs/array5_pkg2.ads: Likewise.
-	* gnat.dg/specs/array5_pkg2-g.ads: Likewise.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/unchecked_convert1.ads: New test.
-	* gnat.dg/specs/unchecked_convert2.ads: Likewise.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/size_clause3.ads: Adjust error message.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/atomic2.ads: Adjust error message.
-	* gnat.dg/specs/clause_on_volatile.ads: Likewise.
-	* gnat.dg/specs/size_clause3.ads: Likewise.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/array35.adb: New test.
-	* gnat.dg/array36.adb: Likewise.
-
-2019-06-28  Jan Beulich  <jbeulich@suse.com>
-
-	* gcc.target/i386/gfni-5.c: New.
-
-2019-06-28  Jan Beulich  <jbeulich@suse.com>
-
-	* gcc.target/i386/cvtpd2pi: New.
-
-2019-06-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/91024
-	* g++.dg/warn/Wimplicit-fallthrough-4.C: New test.
-
-	PR tree-optimization/91010
-	* g++.dg/vect/simd-10.cc: New test.
-
-2019-06-27  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/90987
-	* match.c (gfc_match_common): Adjust parsing of fixed and free form
-	source code containing, e.g., COMMONI.
-
-2019-06-27  Jan Hubicka  <jh@suse.cz>
-
-	* g++.dg/lto/alias-2_0.C: New testcase.
-	* g++.dg/lto/alias-2_1.C: New testcase.
-
-2019-06-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/90991
-	* gcc.target/i386/avx2-pr90991-1.c: New test.
-	* gcc.target/i386/avx512dq-pr90991-2.c: New test.
-
-2019-06-27  Jan Beulich  <jbeulich@suse.com>
-
-	* gcc.target/i386/gfni-4.c: Pass -msse2.
-
-2019-06-27  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/ssa-fre-69.c: New testcase.
-
-2019-06-27  Jun Ma  <JunMa@linux.alibaba.com>
-
-	PR tree-optimization/89772
-	* gcc.dg/builtin-memchr-4.c: New test.
-
-2019-06-27  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/91014
-	* gcc.target/s390/pr91014.c: New test.
-
-2019-06-27  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/91004
-	* g++.dg/torture/pr34850.C: Fix overly reduced testcase.
-
-2019-06-27  Kewen Lin  <linkw@gcc.gnu.org>
-
-	PR target/62147
-	* gcc.target/powerpc/pr62147.c: New test.
-
-2019-06-26  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/90883
-	* g++.dg/tree-ssa/pr90883.C: New test.
-	* gcc.dg/tree-ssa/ssa-dse-36.c: New test.
-
-2019-06-26  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/89021
-	* lib/target-supports.exp (available_vector_sizes)
-	<[istarget i?86-*-*] || [istarget x86_64-*-*]>: Add
-	64-bit vectors for !ia32.
-
-2019-06-26  Jeff Law  <law@redhat.com>
-
-	* gcc.c-torture/execute/builtins/builtins.exp: Add -fno-tree-dse
-	as DSE compromises several of these tests.
-	* gcc.dg/builtin-stringop-chk-1.c: Similarly.
-	* gcc.dg/memcpy-2.c: Similarly.
-	* gcc.dg/pr40340-1.c: Similarly.
-	* gcc.dg/pr40340-2.c: Similarly.
-	* gcc.dg/pr40340-5.c: Similarly.
-
-2019-06-26  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR Fortran/90988
-	ChangeLog forgotten with revision 272667
-	* gfortran.dg/pr90988_1.f90: New test.
-	* gfortran.dg/pr90988_2.f90: Ditto.
-	* gfortran.dg/pr90988_3.f90: Ditto.
-
-2019-06-26  Nathan Sidwell  <nathan@acm.org>
-
-	* c-c++-common/pr90927.c: New.
-
-2019-06-26  Richard Biener  <rguenther@suse.de>
-
-	PR ipa/90982
-	* g++.dg/torture/pr90982.C: New testcase.
-
-2019-06-26  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/67184
-	PR c++/69445
-	* g++.dg/other/final3.C: New.
-	* g++.dg/other/final5.C: Likewise.
-
-2019-06-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/90991
-	* gcc.target/i386/avx512dq-pr90991-1.c: New test.
-
-2019-06-26  Li Jia He  <helijia@linux.ibm.com>
-
-	* gcc.target/powerpc/maddld-1.c: New testcase.
-
-2019-06-06  Hongtao Liu  <hongtao.liu@intel.com>
-	    Olga Makhotina  <olga.makhotina@intel.com>
-
-	* gcc.target/i386/avx512-check.h: Handle bit_AVX512VP2INTERSECT.
-	* gcc.target/i386/avx512vp2intersect-2intersect-1a.c: New test.
-	* gcc.target/i386/avx512vp2intersect-2intersect-1b.c: Likewise.
-	* gcc.target/i386/avx512vp2intersect-2intersectvl-1a.c: Likewise.
-	* gcc.target/i386/avx512vp2intersect-2intersectvl-1b.c: Likewise.
-	* gcc.target/i386/sse-12.c: Add -mavx512vp2intersect.
-	* gcc.target/i386/sse-13.c: Likewsie.
-	* gcc.target/i386/sse-14.c: Likewise.
-	* gcc.target/i386/sse-22.c: Likewise.
-	* gcc.target/i386/sse-23.c: Likewise.
-	* g++.dg/other/i386-2.C: Likewise.
-	* g++.dg/other/i386-3.C: Likewise.
-
-2019-06-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/90969
-	* g++.dg/ext/vector38.C: New test.
-
-2019-06-25  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/90939
-	* g++.dg/lto/pr90939_[01].C: New test.
-
-2019-06-25  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90930
-	* gcc.dg/tree-ssa/reassoc-24.c: Adjust.
-	* gcc.dg/tree-ssa/reassoc-25.c: Likewise.
-
-2019-06-25  Claudiu Zissulescu  <claziss@synopsys.com>
-
-	* gcc.target/arc/pr89838.c: New file.
-
-2019-06-25  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/mlarge-pedwarns.c: New test.
-
-2019-06-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR sanitizer/90954
-	* c-c++-common/gomp/pr90954.c: New test.
-
-2019-06-24  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/safe-indirect-jump-1.c: Skip for Darwin.
-	* gcc.target/powerpc/safe-indirect-jump-7.c: Likewise.
-
-2019-06-24  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/spec-barr-1.c: Adjust scan assembler regex
-	to recognise Darwin's register names.
-
-2019-06-24  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/cpp/isysroot-1.c: Use <example.h> as the test header.
-	* gcc.dg/cpp/usr/include/stdio.h: Rename...
-	* gcc.dg/cpp/usr/include/example.h: ... to this.
-
-2019-06-24  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90972
-	* gcc.dg/torture/pr90972.c: New testcase.
-
-2019-06-24  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/Wfloat-equal-1.c: Adjust text of expected diagnostic.
-	* gcc.dg/misc-column.c: Ditto.
-
-2019-06-23  Ian Lance Taylor  <iant@golang.org>
-
-	* go.test/test/blank1.go: Update for diagnostic message changes.
-
-2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/builtins-2.c: Require VSX hardware support.
-
-2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/pr80125.c (foo): Use an unsigned char
-	vector explicitly for the vec_perm.
-
-2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/builtins-1.c: Account for Darwin's use of
-	__USER_LABEL_PREFIX__.
-
-2019-06-23  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/pr71785.c: For Darwin, make test non-PIC,
-	expect the out-of-line GPR restore, and test specifically for
-	absence of branches to local labels.
-
-2019-06-22  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-
-	PR fortran/89782
-	* gfortran.dg/io_constraints_14.f90: New test.
-
-2019-06-22  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/pr64205.c: Require effective target dfp.
-	* gcc.target/powerpc/pr79909.c: Likewise.
-
-2019-06-22  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/powerpc/darwin-bool-1.c: Suppress the pedantic
-	warning about _Bool.
-
-2019-06-22  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/65707
-	PR c++/89480
-	PR c++/58836
-	* g++.dg/cpp0x/nondeduced5.C: New test.
-	* g++.dg/cpp0x/nondeduced6.C: New test.
-	* g++.dg/cpp0x/nondeduced7.C: New test.
-
-	PR c++/66256
-	* g++.dg/cpp0x/noexcept54.C: New test.
-
-2019-06-22  Jan Hubicka  <jh@suse.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-6.c: New testcase.
-
-2019-06-22  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/86476 - noexcept-specifier is a complete-class context.
-	PR c++/52869
-	* g++.dg/cpp0x/noexcept45.C: New test.
-	* g++.dg/cpp0x/noexcept46.C: New test.
-	* g++.dg/cpp0x/noexcept47.C: New test.
-	* g++.dg/cpp0x/noexcept48.C: New test.
-	* g++.dg/cpp0x/noexcept49.C: New test.
-	* g++.dg/cpp0x/noexcept50.C: New test.
-	* g++.dg/cpp0x/noexcept51.C: New test.
-	* g++.dg/cpp0x/noexcept52.C: New test.
-	* g++.dg/cpp0x/noexcept53.C: New test.
-	* g++.dg/eh/shadow1.C: Adjust dg-error.
-
-	PR c++/90881 - bogus -Wunused-value in unevaluated context.
-	* g++.dg/cpp0x/Wunused-value1.C: New test.
-
-2019-06-22  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/auto-storage-1.C: New.
-	* g++.dg/diagnostic/no-type-1.C: Likewise.
-	* g++.dg/diagnostic/no-type-2.C: Likewise.
-	* g++.dg/diagnostic/top-level-auto-1.C: Likewise.
-	* g++.dg/cpp0x/auto9.C: Test some locations too.
-	* g++.dg/cpp1z/register1.C: Likewise.
-	* g++.dg/cpp1z/register2.C: Likewise.
-	* g++.dg/cpp1z/register3.C: Likewise.
-	* g++.dg/other/error34.C: Likewise.
-
-2019-06-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/90909
-	* g++.dg/other/final7.C: New.
-
-2019-06-21  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/vect/simd-2.cc: Don't xfail, instead expect vectorization on
-	x86.
-	* g++.dg/vect/simd-5.cc: Likewise.
-
-2019-06-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/90909
-	Revert:
-	2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/67184
-	PR c++/69445
-	* g++.dg/other/final3.C: New.
-	* g++.dg/other/final4.C: Likewise.
-	* g++.dg/other/final5.C: Likewise.
-
-	* g++.dg/other/final6.C: New.
-
-2019-06-21  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/61490 - qualified-id in friend function definition.
-	* g++.dg/diagnostic/friend2.C: New test.
-	* g++.dg/diagnostic/friend3.C: New test.
-
-	PR c++/60223 - ICE with T{} in non-deduced context.
-	* g++.dg/cpp0x/nondeduced1.C: New test.
-	* g++.dg/cpp0x/nondeduced2.C: New test.
-	* g++.dg/cpp0x/nondeduced3.C: New test.
-	* g++.dg/cpp0x/nondeduced4.C: New test.
-
-	PR c++/64235 - missing syntax error with invalid alignas.
-	* g++.dg/parse/alignas1.C: New test.
-
-2019-06-21  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/67884
-	* gfortran.dg/dummy_procedure_8.f90: Remove a test that is ...
-	* gfortran.dg/pr67884.f90: ... covered here.  New test.
-
-2019-06-21  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90490 - fix decltype issues in noexcept-specifier.
-	* g++.dg/cpp0x/noexcept43.C: New test.
-	* g++.dg/cpp0x/noexcept44.C: New test.
-
-2019-06-21  Matthew Beliveau  <mbelivea@redhat.com>
-
-	PR c++/90875 - added -Wswitch-outside-range option
-	* c-c++-common/Wswitch-outside-range-1.c: New test.
-	* c-c++-common/Wswitch-outside-range-2.c: New test.
-	* c-c++-common/Wswitch-outside-range-3.c: New test.
-	* c-c++-common/Wswitch-outside-range-4.c: New test.
-
-2019-06-21  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/51991
-	gfortran.dg/pr51991.f90
-
-2019-06-21  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/90949
-	* gcc.c-torture/execute/pr90949.c: New test.
-
-2019-06-21  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90953 - ICE with -Wmissing-format-attribute.
-	* g++.dg/warn/miss-format-7.C: New test.
-
-2019-06-21  Richard Biener  <rguenther@suse.de>
-
-	PR debug/90914
-	* g++.dg/debug/pr90914.C: New testcase.
-
-2019-06-21  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90913
-	* gfortran.dg/vect/pr90913.f90: New testcase.
-
-2019-06-21  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.dg/vect/vect-simd-12.c: New test.
-	* gcc.dg/vect/vect-simd-13.c: New test.
-	* gcc.dg/vect/vect-simd-14.c: New test.
-	* gcc.dg/vect/vect-simd-15.c: New test.
-	* gcc.target/i386/sse2-vect-simd-12.c: New test.
-	* gcc.target/i386/sse2-vect-simd-13.c: New test.
-	* gcc.target/i386/sse2-vect-simd-14.c: New test.
-	* gcc.target/i386/sse2-vect-simd-15.c: New test.
-	* gcc.target/i386/avx2-vect-simd-12.c: New test.
-	* gcc.target/i386/avx2-vect-simd-13.c: New test.
-	* gcc.target/i386/avx2-vect-simd-14.c: New test.
-	* gcc.target/i386/avx2-vect-simd-15.c: New test.
-	* gcc.target/i386/avx512f-vect-simd-12.c: New test.
-	* gcc.target/i386/avx512f-vect-simd-13.c: New test.
-	* gcc.target/i386/avx512f-vect-simd-14.c: New test.
-	* gcc.target/i386/avx512bw-vect-simd-15.c: New test.
-	* g++.dg/vect/simd-6.cc: New test.
-	* g++.dg/vect/simd-7.cc: New test.
-	* g++.dg/vect/simd-8.cc: New test.
-	* g++.dg/vect/simd-9.cc: New test.
-	* c-c++-common/gomp/scan-2.c: Don't expect any diagnostics.
-
-	PR c++/90950
-	* g++.dg/gomp/lastprivate-1.C: New test.
-
-	* gcc.dg/vect/vect-simd-11.c: New test.
-	* gcc.target/i386/sse2-vect-simd-11.c: New test.
-	* gcc.target/i386/avx2-vect-simd-11.c: New test.
-	* gcc.target/i386/avx512bw-vect-simd-11.c: New test.
-
-2019-06-20  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/79781
-	* g++.dg/ext/goto1.C: New test.
-
-2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/77632
-	* gfortran.dg/pr77632_1.f90: New test.
-
-2019-06-20  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/68265
-	* g++.dg/parse/error62.C: New test.
-
-2019-06-20  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/86587
-	* gfortran.dg/pr86587.f90: New test.
-
-2019-06-20  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* obj-c++.dg/stubify-1.mm: Adjust options and scan-asm checks.
-	* obj-c++.dg/stubify-2.mm: Likewise.
-	* objc.dg/stubify-1.m: Likewise.
-	* objc.dg/stubify-2.m: Likewise.
-
-2019-06-20  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87512
-	* g++.dg/cpp1z/inline-var7.C: New test.
-
-2019-06-20  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/54855
-	* gcc.target/i386/pr54855-1.c: New test.
-	* gcc.target/i386/pr54855-2.c: Likewise.
-	* gcc.target/i386/pr54855-3.c: Likewise.
-	* gcc.target/i386/pr54855-4.c: Likewise.
-	* gcc.target/i386/pr54855-5.c: Likewise.
-	* gcc.target/i386/pr54855-6.c: Likewise.
-	* gcc.target/i386/pr54855-7.c: Likewise.
-	* gcc.target/i386/pr54855-8.c: Likewise.
-	* gcc.target/i386/pr54855-9.c: Likewise.
-	* gcc.target/i386/pr54855-10.c: Likewise.
-
-2019-06-20  Jan Hubicka  <jh@suse.cz>
-
-	* gcc.c-torture/execute/alias-access-path-1.c: New testcase.
-
-2019-06-20  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89873
-	* g++.dg/cpp1y/noexcept1.C: New test.
-
-2019-06-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/90937
-	* gfortran.dg/external_procedure_4.f90: New test.
-
-2019-06-20  Tom de Vries  <tdevries@suse.de>
-
-	* gcc.dg/pr90866-2.c: Require global_constructor.
-
-2019-06-20  Tom de Vries  <tdevries@suse.de>
-
-	* gcc.c-torture/compile/pr89280.c: Require nonlocal_goto.
-	* gcc.dg/pr88870.c: Same.
-	* gcc.dg/pr90082.c: Same.
-
-2019-06-20  Tom de Vries  <tdevries@suse.de>
-
-	* gcc.dg/pr89737.c: Require indirect_jumps.
-	* gcc.dg/torture/pr87693.c: Same.
-	* gcc.dg/torture/pr89135.c: Same.
-	* gcc.dg/torture/pr90071.c: Same.
-
-2019-06-20  Tom de Vries  <tdevries@suse.de>
-
-	* gcc.c-torture/compile/pr89280.c: Require label_values.
-	* gcc.dg/pr89737.c: Same.
-	* gcc.dg/pr90082.c: Same.
-	* gcc.dg/torture/pr89135.c: Same.
-	* gcc.dg/torture/pr89247.c: Same.
-	* gcc.dg/torture/pr90071.c: Same.
-
-2019-06-20  Tom de Vries  <tdevries@suse.de>
-
-	* gcc.c-torture/compile/pr77754-1.c: Require alloca.
-	* gcc.c-torture/compile/pr77754-2.c: Same.
-	* gcc.c-torture/compile/pr77754-3.c: Same.
-	* gcc.c-torture/compile/pr77754-4.c: Same.
-	* gcc.c-torture/compile/pr77754-5.c: Same.
-	* gcc.c-torture/compile/pr77754-6.c: Same.
-	* gcc.c-torture/compile/pr87110.c: Same.
-	* gcc.c-torture/execute/pr86528.c: Same.
-	* gcc.dg/Walloca-larger-than-2.c: Same.
-	* gcc.dg/Walloca-larger-than.c: Same.
-	* gcc.dg/Warray-bounds-41.c: Same.
-	* gcc.dg/Wrestrict-17.c: Same.
-	* gcc.dg/Wstrict-overflow-27.c: Same.
-	* gcc.dg/Wstringop-truncation-3.c: Same.
-	* gcc.dg/pr78902.c: Same.
-	* gcc.dg/pr87099.c: Same.
-	* gcc.dg/pr87320.c: Same.
-	* gcc.dg/pr89045.c: Same.
-	* gcc.dg/strlenopt-62.c: Same.
-	* gcc.dg/tree-ssa/alias-37.c: Same.
-
-2019-06-19  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/60364 - noreturn after first decl not diagnosed.
-	* g++.dg/warn/noreturn-8.C: New test.
-	* g++.dg/warn/noreturn-9.C: New test.
-	* g++.dg/warn/noreturn-10.C: New test.
-	* g++.dg/warn/noreturn-11.C: New test.
-
-2019-06-19  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/90626
-	* gcc.dg/strlenopt-65.c: New test.
-	* gcc.dg/strlenopt-66.c: New test.
-	* gcc.dg/strlenopt.h (strcmp, strncmp): Declare.
-
-2019-06-19  Martin Sebor  <msebor@redhat.com>
-
-	PR translation/90156
-	* gcc.dg/format/gcc_diag-11.c: Enable.
-
-2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/69499
-	* gfortran.dg/pr69499.f90: New test.
-	* gfortran.dg/module_error_1.f90: Update dg-error string.
-
-2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/69398
-	* gfortran.dg/pr69398.f90: New test.
-
-2019-06-19  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/87907
-	* gfortran.dg/pr87907.f90: New testcase.
-
-2019-06-19  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR middle-end/84521
-	* gcc.c-torture/execute/pr84521.c: New test.
-
-2019-06-19  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.dg/vect/vect-simd-8.c: If main is defined, don't include
-	tree-vect.h nor call check_vect.
-	* gcc.dg/vect/vect-simd-9.c: Likewise.
-	* gcc.dg/vect/vect-simd-10.c: New test.
-	* gcc.target/i386/sse2-vect-simd-8.c: New test.
-	* gcc.target/i386/sse2-vect-simd-9.c: New test.
-	* gcc.target/i386/sse2-vect-simd-10.c: New test.
-	* gcc.target/i386/avx2-vect-simd-8.c: New test.
-	* gcc.target/i386/avx2-vect-simd-9.c: New test.
-	* gcc.target/i386/avx2-vect-simd-10.c: New test.
-	* gcc.target/i386/avx512f-vect-simd-8.c: New test.
-	* gcc.target/i386/avx512f-vect-simd-9.c: New test.
-	* gcc.target/i386/avx512f-vect-simd-10.c: New test.
-
-	* g++.dg/vect/simd-3.cc: New test.
-	* g++.dg/vect/simd-4.cc: New test.
-	* g++.dg/vect/simd-5.cc: New test.
-
-2019-06-19  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/ubsan/pr63956.C: Adjust expected diagnostics.
-
-2019-06-19  Jim MacArthur  <jim.macarthur@codethink.co.uk>
-	    Mark Eggleston  <mark.eggleston@codethink.com>
-
-	PR fortran/89103
-	* gfortran.dg/dec_format_empty_item_1.f: New test.
-	* gfortran.dg/dec_format_empty_item_2.f: New test.
-	* gfortran.dg/dec_format_empty_item_3.f: New test.
-
-2019-06-19  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	* gcc.target/aarch64/pr88834.c: Move from here...
-	* gcc.target/aarch64/sve/pr88834.c: ...to here.
-
-2019-06-18  Cherry Zhang  <cherryyz@google.com>
-
-	* go.dg/concatstring.go: New test.
-
-2019-06-18  Thomas Schwinge  <thomas@codesourcery.com>
-
-	PR fortran/90921
-	* gfortran.dg/goacc/declare-3.f95: Update.
-
-	PR fortran/85221
-	* gfortran.dg/goacc/declare-3.f95: New file.
-
-	PR middle-end/90859
-	* c-c++-common/goacc/firstprivate-mappings-1.c: Update.
-
-	* c-c++-common/goacc/firstprivate-mappings-1.c: New file.
-	* g++.dg/goacc/firstprivate-mappings-1.C: Likewise.
-
-	PR testsuite/90861
-	* c-c++-common/goacc/declare-pr90861.c: New file.
-
-	PR testsuite/90868
-	* c-c++-common/goacc/declare-1.c: Update.
-	* c-c++-common/goacc/declare-2.c: Likewise.
-
-	PR middle-end/90862
-	* c-c++-common/goacc/declare-1.c: Update.
-	* c-c++-common/goacc/declare-2.c: Likewise.
-
-2019-06-18  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/84698
-	* g++.dg/cpp0x/noexcept42.C: New test.
-
-	PR c++/71548
-	* g++.dg/cpp0x/variadic177.C: New test.
-
-2019-06-18  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/struct_vect_18.c: Allow branches to
-	contain dots.
-	* gcc.target/aarch64/sve/struct_vect_19.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_20.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_21.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_22.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_23.c: Likewise.
-	* gcc.target/aarch64/sve/unroll-1.c: Likewise.
-	* gcc.target/aarch64/sve/while_1.c: Check for b.any.
-
-2019-06-18  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/pr81563.c (dg-final): Check that no
-	registers are restored from %esp.
-
-2019-06-18  Richard Biener  <rguenther@suse.de>
-
-	PR debug/90900
-	* gcc.dg/gomp/pr90900.c: New testcase.
-
-2019-06-18  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/pr90866-2.c: Remove a pointless declaration
-	to avoid compilation errors on arm-none-eabi.
-
-2019-06-18  Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* gcc.target/aarch64/pcs_attribute-2.c: Remove ifunc usage.
-	* gcc.target/aarch64/pcs_attribute-3.c: New test.
-
-2019-06-18  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-	* gcc.target/aarch64/sve/fadda_1.c: New test.
-
-2019-06-17  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.dg/vect/vect-simd-8.c: New test.
-	* gcc.dg/vect/vect-simd-9.c: New test.
-	* g++.dg/vect/simd-2.cc: New test.
-	* g++.dg/gomp/scan-1.C: New test.
-
-2019-06-17  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/62055
-	* gcc.target/i386/fnabs.c: New test.
-
-2019-06-17  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/83820 - excessive attribute arguments not detected.
-	* g++.dg/cpp0x/gen-attrs-67.C: New test.
-
-2019-06-17  Nathan Sidwell  <nathan@acm.org>
-
-	PR c++/90754
-	* g++.dg/lookup/pr90754.C: New.
-
-2019-06-17  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR middle-end/64242
-	* gcc.c-torture/execute/pr64242.c: Improve test.
-
-2019-06-16  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/mspabi_sllll.c: New test.
-	* gcc.target/msp430/mspabi_srall.c: New test.
-	* gcc.target/msp430/mspabi_srlll.c: New test.
-	* gcc.c-torture/execute/shiftdi-2.c: New test.
-
-2019-06-16  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* lib/target-supports.exp: Add check_effective_target_longlong64.
-
-2019-06-16  Jan Hubicka  <hubicka@ucw.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-4.c: New testcase.
-	* gcc.dg/tree-ssa/alias-access-path-5.c: New testcase.
-
-2019-06-15  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/90650
-	* gdc.dg/pr90650a.d: New test.
-	* gdc.dg/pr90650b.d: New test.
-
-2019-06-15  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	* gfortran.dg/dummy_derived_typed.f90: New test.
-
-2019-06-15  Jan Hubicka  <hubicka@ucw.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-2.c: New testcase.
-
-2019-06-15  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	* gfortran.dg/ieee/ieee_4.f90: Un-xfail on i?86-*-freebsd.
-
-2019-06-15  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR objc/90709
-	* obj-c++.dg/proto-lossage-7.mm: Use proxy headers.
-	* obj-c++.dg/strings/const-cfstring-2.mm: Likewise.
-	* obj-c++.dg/strings/const-cfstring-5.mm: Likewise.
-	* obj-c++.dg/strings/const-str-12.mm: Likewise.
-	* obj-c++.dg/syntax-error-1.mm: Likewise.
-	* obj-c++.dg/torture/strings/const-cfstring-1.mm: Likewise.
-	* obj-c++.dg/torture/strings/const-str-10.mm: Likewise.
-	* obj-c++.dg/torture/strings/const-str-11.mm: Likewise.
-	* obj-c++.dg/torture/strings/const-str-9.mm: Likewise.
-	* obj-c++.dg/cxx-ivars-3.mm: Skip on later Darwin, where the 10.4 API
-	in no longer supported, also on m64 where there's no meaning to it.
-	* obj-c++.dg/isa-field-1.mm: Suppress unwanted warning, add comment why.
-	* obj-c++.dg/objc-gc-3.mm: Skip for Darwin > 16, the API use is an error
-	there.
-	* obj-c++.dg/qual-types-1.mm: Prune a spurious l64 warning.
-	* obj-c++.dg/stubify-1.mm: Tidy up after better compiler warnings.
-	* obj-c++.dg/stubify-2.mm: Likewise.
-	* obj-c++.dg/try-catch-1.mm: Likewise.
-	* obj-c++.dg/try-catch-3.mm: Likewise.
-
-2019-06-15  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR objc/90709
-	* objc.dg/encode-7-next-64bit.m: Use proxy headers.
-	* objc.dg/image-info.m: Likewise.
-	* objc.dg/method-6.m: Likewise.
-	* objc.dg/no-extra-load.m: Likewise.
-	* objc.dg/objc-foreach-4.m: Likewise.
-	* objc.dg/objc-foreach-5.m: Likewise.
-	* objc.dg/proto-lossage-7.m: Likewise.
-	* objc.dg/strings/const-cfstring-2.m: Likewise.
-	* objc.dg/strings/const-cfstring-5.m: Likewise.
-	* objc.dg/strings/const-str-12b.m: Likewise.
-	* objc.dg/symtab-1.m: Likewise.
-	* objc.dg/torture/strings/const-cfstring-1.m: Likewise.
-	* objc.dg/torture/strings/const-str-10.m: Likewise.
-	* objc.dg/torture/strings/const-str-11.m: Likewise.
-	* objc.dg/torture/strings/const-str-9.m: Likewise.
-	* objc.dg/zero-link-1.m: Likewise.
-	* objc.dg/zero-link-2.m: Likewise.
-	* objc.dg/zero-link-3.m: Likewise.
-	* objc.dg/isa-field-1.m: Suppress unwanted warning, add comment why.
-	* objc.dg/headers.m: XFAIL for Darwin14-19.
-	* objc.dg/objc-gc-4.m: Skip for Darwin > 16, the API use is an error
-	there.
-
-2019-06-15  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR objc/90709
-	* objc-obj-c++-shared/CF-CFString.h: New.
-	* objc-obj-c++-shared/F-NSArray.h: New.
-	* objc-obj-c++-shared/F-NSAutoreleasePool.h: New.
-	* objc-obj-c++-shared/F-NSObject.h: New.
-	* objc-obj-c++-shared/F-NSString.h: New.
-	* objc-obj-c++-shared/F-NSValue.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFArray.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFAvailability.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFBase.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFCharacterSet.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFData.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFDictionary.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFLocale.h: New.
-	* objc-obj-c++-shared/GNUStep/CoreFoundation/CFString.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSArray.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSAutoreleasePool.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSDate.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSEnumerator.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSGeometry.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSObjCRuntime.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSObject.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSRange.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSString.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSValue.h: New.
-	* objc-obj-c++-shared/GNUStep/Foundation/NSZone.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/GNUstep.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSBlocks.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSConfig.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSObjCRuntime.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/GSVersionMacros.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSArray+GNUstepBase.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSMutableString+GNUstepBase.h:
-	New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSNumber+GNUstepBase.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSObject+GNUstepBase.h: New.
-	* objc-obj-c++-shared/GNUStep/GNUstepBase/NSString+GNUstepBase.h: New.
-
-2019-06-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/90779
-	* c-c++-common/goacc/routine-5.c (func2): Don't expect error for
-	static block scope variable in #pragma acc routine.
-
-2019-06-14  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	* gfortran.dg/integer_exponentiation_4.f90: Update test.
-	* gfortran.dg/integer_exponentiation_5.F90: Ditto.
-	* gfortran.dg/no_range_check_1.f90: Ditto.
-
-2019-06-14  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/90577
-	PR fortran/90578
-	* gfortran.dg/lrshift_1.f90: Adjust testcase.
-	* gfortran.dg/shiftalr_3.f90: New testcase.
-
-2019-06-14  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/89646
-	* gfortran.dg/pr89646.f90: New test.
-
-2019-06-14  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR rtl-optimization/90765
-	* gcc.target/i386/pr90765-1.c: New test.
-	* gcc.target/i386/pr90765-2.c: Likewise.
-
-2019-06-14  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90884 - stray note with -Wctor-dtor-privacy.
-	* g++.dg/warn/ctor-dtor-privacy-4.C: New.
-	* g++.dg/warn/ctor-dtor-privacy-4.h: New.
-
-2019-06-14  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/ldist-26.c: Adjust.
-
-2019-06-14  Feng Xue  <fxue@os.amperecomputing.com>
-
-	PR ipa/90401
-	* gcc.dg/ipa/ipcp-agg-10.c: New test.
-
-2019-06-13  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/90662
-	* gcc.dg/pr90866-2.c: New test.
-	* gcc.dg/pr90866.c: Ditto.
-
-2019-06-13  Jiufu Guo  <guojiufu@linux.ibm.com>
-	    Lijia He  <helijia@linux.ibm.com>
-
-	PR tree-optimization/77820
-	* gcc.dg/tree-ssa/phi_on_compare-1.c: New testcase.
-	* gcc.dg/tree-ssa/phi_on_compare-2.c: New testcase.
-	* gcc.dg/tree-ssa/phi_on_compare-3.c: New testcase.
-	* gcc.dg/tree-ssa/phi_on_compare-4.c: New testcase.
-	* gcc.dg/tree-ssa/split-path-6.c: Update testcase.
-	* gcc.target/sh/pr51244-20.c: Update testcase.
-
-2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/darwin-minversion-link.c: New test.
-
-2019-06-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/68544
-	* gfortran.dg/pr68544.f90: New test.
-	* gfortran.dg/pr85687.f90: Modify test for new error message.
-
-2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* g++.dg/pr71694.C: Use non-PIC codegen for Darwin m32.
-
-2019-06-13  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/89344
-	* gfortran.dg/pr89344.f90: New test.
-
-2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/darwin-minversion-1.c: Use compile rather than link/run.
-	* gcc.dg/darwin-minversion-2.c: Likewise.
-
-2019-06-13  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR target/90871
-	* g++.dg/ext/altivec-15.C: Add dg-error directive.
-
-2019-06-13  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/pr90760.c: Require alias support.
-
-2019-06-13  Jan Hubicka  <hubicka@ucw.cz>
-
-	PR tree-optimization/90869
-	* g++.dg/tree-ssa/alias-access-path-1.C: New testcase.
-
-2019-06-13  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90856
-	* gcc.target/i386/pr90856.c: New testcase.
-
-2019-06-13  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/tree-ssa/ssa-dse-1.C: Don't match exact number of chars of
-	= {} store.
-	* g++.dg/tree-ssa/pr31146.C: Change -fdump-tree-forwprop to
-	-fdump-tree-forwprop1 in dg-options.  Expect <int[5]> in MEM.
-
-2019-06-13  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/vect/vect-version-1.c: New testcase.
-	* gcc.dg/vect/vect-version-2.c: Likewise.
-
-2019-06-13  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/variably-modified-type-1.C: New.
-	* g++.dg/cpp0x/alias-decl-1.C: Test the location too.
-	* g++.dg/other/pr84792-1.C: Likewise.
-	* g++.dg/other/pr84792-2.C: Likewise.
-	* g++.dg/parse/error24.C: Likewise.
-	* g++.dg/parse/error32.C: Likewise.
-	* g++.dg/parse/error33.C: Likewise.
-	* g++.dg/parse/saved1.C: Likewise.
-	* g++.dg/template/operator6.C: Likewise.
-	* g++.dg/template/pr61745.C: Likewise.
-	* g++.dg/template/typedef41.C: Likewise.
-	* g++.old-deja/g++.jason/crash10.C: Likewise.
-
-2019-06-13  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/conflicting-specifiers-1.C: New.
-	* g++.dg/diagnostic/two-or-more-data-types-1.C: Likewise.
-	* g++.dg/parse/error10.C: Adjust location.
-	* g++.dg/parse/pragma2.C: Likewise.
-
-2019-06-13  Feng Xue  <fxue@os.amperecomputing.com>
-
-	PR tree-optimization/89713
-	* g++.dg/tree-ssa/empty-loop.C: New test.
-	* gcc.dg/tree-ssa/dce-2.c: New test.
-	* gcc.dg/const-1.c: Add -fno-finite-loops option.
-	* gcc.dg/graphite/graphite.exp: Likewise.
-	* gcc.dg/loop-unswitch-1.c: Likewise.
-	* gcc.dg/predict-9.c: Likewise.
-	* gcc.dg/pure-2.c: Likewise.
-	* gcc.dg/tree-ssa/20040211-1.c: Likewise.
-	* gcc.dg/tree-ssa/loop-10.c: Likewise.
-	* gcc.dg/tree-ssa/split-path-6.c: Likewise.
-	* gcc.dg/tree-ssa/ssa-thread-12.c: Likewise.
-
-2019-06-13  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	PR target/88838
-	* gcc.target/aarch64/pr88838.c: New test.
-	* gcc.target/aarch64/sve/while_1.c: Adjust.
-
-2019-06-13  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
-
-	PR target/88834
-	* gcc.target/aarch64/pr88834.c: New test.
-	* gcc.target/aarch64/sve/struct_vect_1.c: Adjust.
-	* gcc.target/aarch64/sve/struct_vect_14.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_15.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_16.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_17.c: Likewise.
-	* gcc.target/aarch64/sve/struct_vect_7.c: Likewise.
-
-2019-06-12  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87410
-	* g++.dg/cpp1y/pr87410.C: New test.
-
-2019-06-12  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/66999 - 'this' captured by reference.
-	* g++.dg/cpp0x/lambda/lambda-this21.C: New test.
-
-	PR c++/90825 - endless recursion when evaluating sizeof.
-	PR c++/90832 - endless recursion when evaluating sizeof.
-	* g++.dg/cpp0x/constexpr-sizeof2.C: New test.
-	* g++.dg/cpp0x/constexpr-sizeof3.C: New test.
-
-2019-06-12  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/90676
-	* gcc.dg/tree-ssa/pr30375.c: Adjust and simplify expected test
-	output some more.
-	* gcc.dg/tree-ssa/slsr-27.c: Ditto.
-	* gcc.dg/tree-ssa/slsr-28.c: Ditto.
-	* gcc.dg/tree-ssa/slsr-29.c: Ditto.
-	* gcc.dg/tree-ssa/ssa-dse-24.c: Ditto.
-
-2019-06-12  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90736 - bogus error with alignof.
-	* g++.dg/cpp0x/alignof5.C: New test.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* gcc.dg/builtin-apply2.c: Skip for PRU.
-	* gcc.dg/torture/stackalign/builtin-apply-2.c: Ditto.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* g++.old-deja/g++.abi/ptrmem.C: Add PRU to list.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* gcc.dg/tree-ssa/20040204-1.c: XFAIL on pru.
-	* gcc.dg/tree-ssa/reassoc-33.c: Ditto.
-	* gcc.dg/tree-ssa/reassoc-34.c: Ditto.
-	* gcc.dg/tree-ssa/reassoc-35.c: Ditto.
-	* gcc.dg/tree-ssa/reassoc-36.c: Ditto.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* gcc.dg/stack-usage-1.c: Define PRU stack usage.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* gcc.c-torture/execute/20101011-1.c: Define DO_TEST to 0 for PRU.
-	* gcc.dg/20020312-2.c: No PIC register for PRU.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* lib/gcc-dg.exp: Filter unsupported features in PRU's TI ABI mode.
-	* lib/target-utils.exp: Ditto.
-	* lib/target-supports.exp (check_effective_target_function_pointers,
-	check_effective_target_large_return_values): New.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* lib/gcc-dg.exp: Bail on region overflow for tiny targets.
-	* lib/target-utils.exp: Ditto.
-	* lib/target-supports.exp: Declare PRU target as tiny.
-
-2019-06-12  Dimitar Dimitrov  <dimitar@dinux.eu>
-
-	* gcc.target/pru/abi-arg-struct.c: New test.
-	* gcc.target/pru/ashiftrt.c: New test.
-	* gcc.target/pru/builtins-1.c: New test.
-	* gcc.target/pru/builtins-error.c: New test.
-	* gcc.target/pru/clearbit.c: New test.
-	* gcc.target/pru/loop-asm.c: New test.
-	* gcc.target/pru/loop-dowhile.c: New test.
-	* gcc.target/pru/loop-hi-1.c: New test.
-	* gcc.target/pru/loop-hi-2.c: New test.
-	* gcc.target/pru/loop-qi-1.c: New test.
-	* gcc.target/pru/loop-qi-2.c: New test.
-	* gcc.target/pru/loop-short-1.c: New test.
-	* gcc.target/pru/loop-short-2.c: New test.
-	* gcc.target/pru/loop-si-1.c: New test.
-	* gcc.target/pru/loop-si-2.c: New test.
-	* gcc.target/pru/loop-u8_pcrel_overflow.c: New test.
-	* gcc.target/pru/loop-ubyte-1.c: New test.
-	* gcc.target/pru/loop-ubyte-2.c: New test.
-	* gcc.target/pru/lra-framepointer-fragmentation-1.c: New test.
-	* gcc.target/pru/lra-framepointer-fragmentation-2.c: New test.
-	* gcc.target/pru/mabi-ti-1.c: New test.
-	* gcc.target/pru/mabi-ti-2.c: New test.
-	* gcc.target/pru/mabi-ti-3.c: New test.
-	* gcc.target/pru/mabi-ti-4.c: New test.
-	* gcc.target/pru/mabi-ti-5.c: New test.
-	* gcc.target/pru/mabi-ti-6.c: New test.
-	* gcc.target/pru/mabi-ti-7.c: New test.
-	* gcc.target/pru/pr64366.c: New test.
-	* gcc.target/pru/pragma-ctable_entry.c: New test.
-	* gcc.target/pru/pru.exp: New file.
-	* gcc.target/pru/qbbc-1.c: New test.
-	* gcc.target/pru/qbbc-2.c: New test.
-	* gcc.target/pru/qbbc-3.c: New test.
-	* gcc.target/pru/qbbs-1.c: New test.
-	* gcc.target/pru/qbbs-2.c: New test.
-	* gcc.target/pru/setbit.c: New test.
-	* gcc.target/pru/zero_extend-and-hisi.c: New test.
-	* gcc.target/pru/zero_extend-and-qihi.c: New test.
-	* gcc.target/pru/zero_extend-and-qisi.c: New test.
-	* gcc.target/pru/zero_extend-hisi.c: New test.
-	* gcc.target/pru/zero_extend-qihi.c: New test.
-	* gcc.target/pru/zero_extend-qisi.c: New test.
-	* lib/target-supports.exp: Add PRU to feature filters.
-
-2019-06-12  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/90002
-	* gfortran.dg/pr90002.f90: New test.
-
-2019-06-12  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/90676
-	* gcc.dg/tree-ssa/dump-6.c: New test.
-	* g++.dg/tree-ssa/pr19807.C: Adjust expected output.
-	* g++.dg/tree-ssa/ssa-dse-1.C: Same.
-	* gcc.dg/store_merging_5.c: Same.
-	* gcc.dg/tree-prof/stringop-2.c: Same.
-	* gcc.dg/tree-ssa/pr30375.c: Same.
-	* gcc.dg/tree-ssa/slsr-27.c: Same.
-	* gcc.dg/tree-ssa/slsr-28.c: Same.
-	* gcc.dg/tree-ssa/slsr-29.c: Same.
-	* gcc.dg/tree-ssa/ssa-dse-24.c: Same.
-
-2019-06-12  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/90662
-	* gcc.dg/strlenopt-62.c: New test.
-	* gcc.dg/strlenopt-63.c: New test.
-	* gcc.dg/strlenopt-64.c: New test.
-
-2019-06-12  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>
-
-	* gcc.target/arm/ssadv16qi.c: New test.
-	* gcc.target/arm/usadv16qi.c: Likewise.
-
-2019-06-12  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/90760
-	* gcc.dg/pr90760.c: New test.
-
-2019-06-11  Faraz Shahbazker  <fshahbazker@wavecomp.com>
-
-	* gcc.target/mips/data-sym-pool.c: Update expected output.
-	* gcc.target/mips/data-sym-multi-pool.c: New test.
-
-2019-06-11  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR testsuite/65364
-	* gcc.dg/uninit-19.c (fn1): Adjust target condition for Darwin.
-	(fn2): Likewise.
-
-2019-06-11  Michael Meissner  <meissner@linux.ibm.com>
-
-	* gcc.target/powerpc/localentry-1.c: Add -mpcrel option.
-	* gcc.target/powerpc/localentry-detect-1.c: Explicitly set and
-	unset -mpcrel in the target pragmas.
-	* gcc.target/powerpc/notoc-direct-1.c: Add -mpcrel option.
-	* gcc.target/powerpc/pcrel-sibcall-1.c: Explicitly set and
-	unset -mpcrel in the target pragmas.
-
-2019-06-11  Marc Glisse  <marc.glisse@inria.fr>
-
-	* gcc.dg/tree-ssa/cmpexactdiv-5.c: New file.
-
-2019-06-11  Matthew Beliveau  <mbelivea@redhat.com>
-
-	PR c++/90449 - add -Winaccessible-base option.
-	* g++.dg/warn/Winaccessible-base-1.C: New file.
-	* g++.dg/warn/Winaccessible-base-2.C: New file.
-	* g++.dg/warn/Winaccessible-virtual-base-1.C: New file.
-	* g++.dg/warn/Winaccessible-virtual-base-2.C: New file.
-
-2019-06-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/90810
-	* g++.dg/ext/vector37.C: New test.
-
-2019-06-10  Matthew Beliveau  <mbelivea@redhat.com>
-
-	PR c++/87250
-	* g++.dg/cpp0x/pr87250.C: New test.
-
-2019-06-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR testsuite/90772
-	* g++.dg/cpp1y/feat-cxx14.C: Use std::size_t instead of size_t.
-	* g++.dg/cpp1z/feat-cxx1z.C: Likewise.
-	* g++.dg/cpp2a/feat-cxx2a.C: Likewise.
-	* g++.dg/cpp1z/pr85569.C: Include <functional>.
-	* g++.dg/tree-ssa/pr80293.C: Include <cstdint>.
-	* g++.dg/tree-ssa/pr69336.C: Include <stdexcept>.
-
-2019-06-10  Jonathan Wakely  <jwakely@redhat.com>
-
-	PR other/90695
-	* g++.dg/cpp0x/noexcept15.C: Remove dependency on library header.
-
-2019-06-10  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/scan-1.c: New test.
-	* c-c++-common/gomp/scan-2.c: New test.
-	* c-c++-common/gomp/scan-3.c: New test.
-	* c-c++-common/gomp/scan-4.c: New test.
-
-2019-06-10  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/no_profile_instrument_function-attr-1.c: Fix
-	function name.
-
-2019-06-10  Claudiu Zissulescu  <claziss@synopsys.com>
-
-	* gcc.target/arc/jumptables.c: Update test.
-
-2019-06-10  Claudiu Zissulescu  <claziss@synopsys.com>
-
-	* gcc.target/arc/and-cnst-size.c: New test.
-	* gcc.target/arc/mov-cnst-size.c: Likewise.
-	* gcc.target/arc/or-cnst-size.c: Likewise.
-	* gcc.target/arc/store-merge-1.c: Update test.
-	* gcc.target/arc/arc700-stld-hazard.c: Likewise.
-	* gcc.target/arc/cmem-1.c: Likewise.
-	* gcc.target/arc/cmem-2.c: Likewise.
-	* gcc.target/arc/cmem-3.c: Likewise.
-	* gcc.target/arc/cmem-4.c: Likewise.
-	* gcc.target/arc/cmem-5.c: Likewise.
-	* gcc.target/arc/cmem-6.c: Likewise.
-	* gcc.target/arc/loop-4.c: Likewise.
-	* gcc.target/arc/movh_cl-1.c: Likewise.
-	* gcc.target/arc/sdata-3.c: Likewise.
-
-2019-06-10  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/ipa/pr68035.c: Update scanned pattern.
-
-2019-06-10  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/attr-copy-6.c: Require alias support.
-
-2019-06-09  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/65175
-	* g++.dg/cpp0x/alias-decl-69.C: New test.
-
-	PR c++/60366
-	* g++.dg/cpp0x/lambda/lambda-ice32.C: New test.
-
-019-06-09  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/89365
-	* gfortran.dg/assumed_rank_bounds_3.f90 : New test.
-
-2019-06-08  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/90786
-	* gfortran.dg/proc_ptr_51.f90 : New test.
-
-2019-06-08  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/52269
-	* g++.dg/cpp0x/constexpr-decltype4.C: New test.
-
-2019-06-08  Thomas Koenig  <tkoenig@gcc.gnu.org>
-	    Tomáš Trnka  <trnka@scm.com>
-
-	PR fortran/90744
-	* gfortran.dg/deferred_character_33.f90: New test.
-	* gfortran.dg/deferred_character_33a.f90: New test.
-
-2019-06-08  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/77548
-	* g++.dg/other/pr77548.C: New test.
-
-	PR c++/72845
-	* g++.dg/cpp0x/noexcept41.C: New test.
-
-2019-06-08  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	* gcc.target/aarch64/sve/init_1.c: Remove options
-	-O2 -fno-schedule-insns and instead pass -O.
-	Update assembly in comments.
-	* gcc.target/aarch64/sve/init_2.c: Likewise.
-	* gcc.target/aarch64/sve/init_3.c: Likewise.
-	* gcc.target/aarch64/sve/init_4.c: Likewise.
-	* gcc.target/aarch64/sve/init_5.c: Likewise and additionally
-	adjust dg-scan.
-	* gcc.target/aarch64/sve/init_6.c: Likewise.
-	* gcc.target/aarch64/sve/init_7.c: Likewise.
-	* gcc.target/aarch64/sve/init_8.c: Likewise.
-	* gcc.target/aarch64/sve/init_9.c: Likewise.
-	* gcc.target/aarch64/sve/init_10.c: Likewise.
-	* gcc.target/aarch64/sve/init_11.c: Likewise.
-	* gcc.target/aarch64/sve/init_12.c: Likewise.
-
-2019-06-07  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/77747
-	* g++.dg/cpp0x/inh-ctor33.C: New test.
-
-	PR c++/77967
-	* g++.dg/cpp0x/alias-decl-68.C: New test.
-
-	PR c++/77771
-	* g++.dg/cpp0x/constexpr-77771.C: New test.
-
-2019-06-07  John David Anglin  <danglin@gcc.gnu.org>
-
-	* lib/scanasm.exp (dg-function-on-line): Add pattern for hppa*-*-linux*.
-
-2019-06-07  Mark Eggleston  <mark.eggleston@codethink.com>
-
-	PR fortran/89100
-	* gfortran.dg/fmt_f_default_field_width_3.f90: Modify dg-error
-	to allow use when kind=16 is not supported.
-	* gfortran.dg/fmt_g_default_field_width_3.f90: Modify dg-error
-	to allow use when kind=16 is not supported.
-
-2019-06-07  Richard Biener  <rguenther@suse.de>
-
-	PR debug/90574
-	* gcc.misc-tests/gcov-pr90574-1.c: New testcase.
-	* gcc.misc-tests/gcov-pr90574-2.c: Likewise.
-
-2019-06-07  Jan Hubicka  <hubicka@ucw.cz>
-
-	* gcc.dg/lto/alias-access-path-2.0.c: New testcase.
-
-2019-06-07  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/78902
-	* c-c++-common/asan/alloca_loop_unpoisoning.c: Use result
-	of __builtin_alloca.
-	* c-c++-common/asan/pr88619.c: Likewise.
-	* g++.dg/overload/using2.C: Likewise for malloc.
-	* gcc.dg/attr-alloc_size-5.c: Add new dg-warning.
-	* gcc.dg/nonnull-3.c: Use result of __builtin_strdup.
-	* gcc.dg/pr43643.c: Likewise.
-	* gcc.dg/pr59717.c: Likewise for calloc.
-	* gcc.dg/torture/pr71816.c: Likewise.
-	* gcc.dg/tree-ssa/pr78886.c: Likewise.
-	* gcc.dg/tree-ssa/pr79697.c: Likewise.
-	* gcc.dg/pr78902.c: New test.
-
-2019-06-06  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* g++.dg/cpp0x/alignas4.C: Amend test to check for zerofill syntax
-	on Darwin.
-
-2019-06-06  Martin Jambor  <mjambor@suse.cz>
-
-	* gcc.dg/tree-ssa/alias-access-path-1.c: Remove -fno-tree-sra option.
-	* gcc.dg/tree-ssa/ssa-dse-26.c: Disable FRE.
-	* gnat.dg/opt39.adb: Adjust scan dump.
-
-2019-06-06  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/size-optimized-shifts.c: New test.
-
-2019-06-06  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* gcc.target/msp430/emulate-slli.c: New test.
-	* gcc.target/msp430/emulate-srai.c: New test.
-	* gcc.target/msp430/emulate-srli.c: New test.
-
-2019-06-06  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/87954
-	* gcc.dg/pr87954.c: New test.
-
-2019-06-06  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/alias-37.c: New testcase.
-	* gcc.dg/torture/20190604-1.c: Likewise.
-	* gcc.dg/tree-ssa/pta-callused.c: Adjust.
-
-2019-06-06  Claudiu Zissulescu  <claziss@synopsys.com>
-
-	* gcc.target/arc/tmac-1.c: Reoreder dg-directives.
-	* gcc.target/arc/tmac-2.c: Likewise.
-
-2019-06-05  Martin Sebor  <msebor@redhat.com>
-
-	PR c/90737
-	* c-c++-common/Wreturn-local-addr.c: New test.
-	* g++.dg/warn/Wreturn-local-addr-6.C: New test.
-
-2019-06-05  Hongtao Liu  <hongtao.liu@intel.com>
-
-	* gcc.target/i386/avx512dq-vfpclasspd-1.c: Adjust scan assember
-	for {x,y,z} suffix.
-	* gcc.target/i386/avx512dq-vfpclassps-1.c: Ditto.
-
-2019-06-05  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/format/gcc_diag-11.c: Skip until -Wformat-diag has
-	been committed.
-
-2019-06-05  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/return-type-invalid-1.C: New.
-	* g++.old-deja/g++.brendan/crash16.C: Adjust.
-	* g++.old-deja/g++.law/ctors5.C: Likewise.
-
-2019-06-05  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/other/friend4.C: Test locations too.
-	* g++.dg/other/friend5.C: Likewise.
-	* g++.dg/other/friend7.C: Likewise.
-
-2019-06-05  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* g++.target/powerpc/undef-bool-3.C: Add -maltivec to dg-options.
-
-2019-06-05  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/weak/weak-19.c: New test.
-
-2019-06-05  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/discr6.ads: New test.
-
-2019-06-05  Sam Tebbs  <sam.tebbs@arm.com>
-
-	* gcc.target/aarch64/return_address_sign_b_1.c: New file.
-	* gcc.target/aarch64/return_address_sign_b_2.c: New file.
-	* gcc.target/aarch64/return_address_sign_b_3.c: New file.
-	* gcc.target/aarch64/return_address_sign_builtin.c: New file.
-	* g++.target/aarch64/return_address_sign_ab_exception.C: New file.
-	* g++.target/aarch64/return_address_sign_b_exception.C: New file.
-
-2019-06-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR debug/90733
-	* gcc.dg/pr90733.c: New test.
-
-2019-06-05  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/90726
-	* gcc.dg/pr90726.c: Enable IVOPTs.
-
-2019-06-05  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/vect/simd-1.cc: New test.
-
-2019-06-05  Hongtao Liu  <hongtao.liu@intel.com>
-
-	PR target/89803
-	* gcc.target/i386/avx-1.c (__builtin_ia32_fpclasssss,
-	__builtin_ia32_fpclasssd): Removed.
-	(__builtin_ia32_fpclassss_mask, __builtin_ia32_fpclasssd_mask): Define.
-	* gcc.target/i386/sse-13.c (__builtin_ia32_fpclasssss,
-	__builtin_ia32_fpclasssd): Removed.
-	(__builtin_ia32_fpclassss_mask, __builtin_ia32_fpclasssd_mask): Define.
-	* gcc.target/i386/sse-23.c (__builtin_ia32_fpclasssss,
-	__builtin_ia32_fpclasssd): Removed.
-	(__builtin_ia32_fpclassss_mask, __builtin_ia32_fpclasssd_mask): Define.
-	* gcc.target/i386/avx512dq-vfpclassss-2.c: New.
-	* gcc.target/i386/avx512dq-vfpclasssd-2.c: New.
-	* gcc.target/i386/avx512dq-vfpclassss-1.c (avx512f_test):
-	Add test for _mm_mask_fpclass_ss_mask.
-	* gcc.target/i386/avx512dq-vfpclasssd-1.c (avx512f_test):
-	Add test for _mm_mask_fpclass_sd_mask.
-
-2019-06-04  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/direct-move-double1.c (VSX_REG_ATTR): Delete.
-	* gcc.target/powerpc/direct-move-double2.c: Ditto.
-	* gcc.target/powerpc/direct-move-float1.c: Ditto.
-	* gcc.target/powerpc/direct-move-float2.c: Ditto.
-	* gcc.target/powerpc/direct-move-vint1.c: Ditto.
-	* gcc.target/powerpc/direct-move-vint2.c: Ditto.
-
-2019-06-04  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/direct-move-float1.c: Use "wa" instead of "ww"
-	constraint.
-
-2019-06-04  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/concepts/pr60573.C: Test locations too.
-	* g++.dg/cpp0x/deleted13.C: Likewise.
-	* g++.dg/parse/error29.C: Likewise.
-	* g++.dg/parse/qualified4.C: Likewise.
-	* g++.dg/template/crash96.C Likewise.
-	* g++.old-deja/g++.brendan/crash22.C Likewise.
-	* g++.old-deja/g++.brendan/crash23.C Likewise.
-	* g++.old-deja/g++.law/visibility10.C Likewise.
-	* g++.old-deja/g++.other/decl5.C: Likewise.
-
-2019-06-04  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	PR target/78263
-	* g++.target/powerpc: New directory.
-	* g++.target/powerpc/powerpc.exp: New test driver.
-	* g++.target/powerpc/undef-bool-3.C: New.
-
-2019-06-04  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
-	a sorry_at on any of the clauses.
-
-2019-06-04  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/90726
-	* gcc.dg/pr90726.c: New testcase.
-
-2019-06-04  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90738
-	* gcc.dg/torture/pr90738.c: New testcase.
-
-	Revert
-	2019-06-03  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/alias-access-path-1.c: Scan fre1.
-
-2019-06-04  Martin Liska  <mliska@suse.cz>
-
-	* c-c++-common/goacc/acc-icf.c: Change scanned pattern.
-	* gfortran.dg/goacc/pr78027.f90: Likewise.
-
-2019-06-03  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/mmfpgpr.c: Delete.
-
-2019-06-03  David Edelsohn  <dje.gcc@gmail.com>
-
-	* gcc.dg/debug/enum-1.c: Add -fno-eliminate-unused-debug-symbols
-	on AIX.
-	* g++.dg/debug/enum-1.C: Same.
-
-2019-06-03  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR middle-end/64242
-	* gcc.c-torture/execute/pr64242.c: Update test.
-
-2019-06-03  Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* gcc.target/aarch64/pcs_attribute-2.c: New test.
-	* gcc.target/aarch64/torture/simd-abi-4.c: Check .variant_pcs support.
-	* lib/target-supports.exp (check_effective_target_aarch64_variant_pcs):
-	New.
-
-2019-06-03  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* gcc.target/aarch64/ssadv16qi.c: Add +nodotprod to pragma.
-	* gcc.target/aarch64/usadv16qi.c: Likewise.
-	* gcc.target/aarch64/ssadv16qi-dotprod.c: New test.
-	* gcc.target/aarch64/usadv16qi-dotprod.c: Likewise.
-
-2019-06-03  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	* lib/target-supports.exp (add_options_for_aarch64_sve): New procedure.
-	(aarch64_sve_hw_bits): Call add_options_for_aarch64_sve.
-	(check_effective_target_aarch64_sve_hw): Likewise.
-
-2019-06-03  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/alias-access-path-1.c: Scan fre1.
-
-2019-06-03  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90716
-	* gcc.dg/guality/pr90716.c: New testcase.
-
-2019-06-03  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
-
-	PR target/88837
-	* gcc.target/aarch64/sve/init_1.c: New test.
-	* gcc.target/aarch64/sve/init_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_2.c: Likewise.
-	* gcc.target/aarch64/sve/init_2_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_3.c: Likewise.
-	* gcc.target/aarch64/sve/init_3_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_4.c: Likewise.
-	* gcc.target/aarch64/sve/init_4_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_5.c: Likewise.
-	* gcc.target/aarch64/sve/init_5_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_6.c: Likewise.
-	* gcc.target/aarch64/sve/init_6_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_7.c: Likewise.
-	* gcc.target/aarch64/sve/init_7_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_8.c: Likewise.
-	* gcc.target/aarch64/sve/init_8_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_9.c: Likewise.
-	* gcc.target/aarch64/sve/init_9_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_10.c: Likewise.
-	* gcc.target/aarch64/sve/init_10_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_11.c: Likewise.
-	* gcc.target/aarch64/sve/init_11_run.c: Likewise.
-	* gcc.target/aarch64/sve/init_12.c: Likewise.
-	* gcc.target/aarch64/sve/init_12_run.c: Likewise.
-
-2019-06-03  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-
-	PR tree-optimization/90681
-	* gfortran.dg/vect/pr90681.f: New test.
-
-2019-06-03  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/90713
-	* gcc.dg/gimplefe-40.c: Add -maltivec for powerpc.
-
-2019-06-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/90539
-	* gfortran.dg/internal_pack_24.f90: New test.
-
-2019-06-01  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR target/90698
-	* gcc.target/i386/pr49866.c: XFAIL for Darwin.
-	* gcc.target/i386/pr63538.c: Likewise.
-	* gcc.target/i386/pr61599-1.c: Skip for Darwin.
-
-2019-06-01  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/90694
-	* gcc.dg/tree-ssa/dump-5.c: New test.
-
-2019-05-31  Jan Hubicka  <jh@suse.cz>
-
-	* g++.dg/lto/alias-1_0.C: New testcase.
-	* g++.dg/lto/alias-1_1.C: New testcase.
-
-2019-05-31  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89355
-	* gcc.target/i386/cet-label-3.c: New test.
-	* gcc.target/i386/cet-label-4.c: Likewise.
-	* gcc.target/i386/cet-label-5.c: Likewise.
-
-2019-05-31  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
-
-	* gcc.target/mips/msa-fmadd.c: New.
-
-2019-05-31  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
-	a sorry on lastprivate conditional on simd construct.
-	* gcc.dg/vect/vect-simd-6.c: New test.
-	* gcc.dg/vect/vect-simd-7.c: New test.
-
-	* gcc.dg/vect/vect-simd-5.c: New test.
-
-2019-05-31  Xiong Hu Luo  <luoxhu@linux.ibm.com>
-
-	PR c/43673
-	* gcc.dg/format-dfp-printf-1.c: New test.
-	* gcc.dg/format-dfp-scanf-1.c: Likewise.
-
-2019-05-31  Marc Glisse  <marc.glisse@inria.fr>
-
-	* g++.dg/tree-ssa/cprop-vcond.C: New file.
-
-2019-05-31  Marc Glisse  <marc.glisse@inria.fr>
-
-	* gcc.dg/tree-ssa/cmpexactdiv-3.c: New file.
-	* gcc.dg/tree-ssa/cmpexactdiv-4.c: New file.
-	* gcc.dg/Walloca-13.c: Xfail.
-
-2019-05-31  Bill Schmidt  <wschmidt@linux.ibm.com>
-	    Michael Meissner  <meissner@linux.ibm.com>
-
-	* gcc.target/powerpc/cpu-future.c: Require powerpc_future_ok.
-	* gcc.target/powerpc/localentry-1.c: Likewise.
-	* gcc.target/powerpc/localentry-direct-1.c: Likewise.
-	* gcc.target/powerpc/notoc-direct-1.c: Likewise.
-	* gcc.target/powerpc/pcrel-sibcall-1.c: Likewise.
-	* lib/target-supports.exp (check_powerpc_future_hw_available): New.
-	(check_effective_target_powerpc_future_ok): New.
-
-2019-05-31  Thomas De Schampheleire  <thomas.de_schampheleire@nokia.com>
-
-	PR debug/86964
-	* g++.dg/debug/dwarf2/fesd-any.C: Use
-	-fno-eliminate-unused-debug-symbols.
-	* g++.dg/debug/dwarf2/fesd-baseonly.C: Likewise.
-	* g++.dg/debug/dwarf2/fesd-none.C: Likewise.
-	* g++.dg/debug/dwarf2/fesd-reduced.C: Likewise.
-	* g++.dg/debug/dwarf2/fesd-sys.C: Likewise.
-	* g++.dg/debug/dwarf2/inline-var-1.C: Likewise.
-	* g++.dg/debug/enum-2.C: Likewise.
-	* gcc.dg/debug/dwarf2/fesd-any.c: Likewise.
-	* gcc.dg/debug/dwarf2/fesd-baseonly.c: Likewise.
-	* gcc.dg/debug/dwarf2/fesd-none.c: Likewise.
-	* gcc.dg/debug/dwarf2/fesd-reduced.c: Likewise.
-	* gcc.dg/debug/dwarf2/fesd-sys.c: Likewise.
-
-2019-05-31  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/90671
-	* gcc.dg/torture/pr90671.c: New test.
-
-2019-05-31  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* g++.dg/cpp0x/pr84497.C: Require alias support.
-
-2019-05-31  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/falign-functions-3.c: Adjust align syntax
-	and label for Darwin.
-	* gcc.target/i386/attr-aligned-2.c: Adjust align syntax for
-	Darwin.
-
-2019-05-30  Sylvia Taylor  <sylvia.taylor@arm.com>
-
-	* gcc.target/aarch64/sve/fabd_1.c: New.
-
-2019-05-30  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr86257.c: Require native TLS support.
-	* gcc.target/i386/stack-prot-sym.c: Likewise.
-
-2019-05-30  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/alias-decl-18.C: Test location too.
-	* g++.dg/cpp0x/udlit-nofunc-neg.C: Likewise.
-	* g++.dg/parse/crash59.C: Likewise.
-	* g++.dg/parse/error38.C: Likewise.
-	* g++.dg/parse/error39.C: Likewise.
-	* g++.dg/template/crash31.C: Likewise.
-	* g++.dg/template/operator8.C: Likewise.
-	* g++.dg/template/operator9.C: Likewise.
-
-2019-05-29  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/notoc-direct-1.c: New.
-	* gcc.target/powerpc/pcrel-sibcall-1.c: New.
-
-2019-05-29  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/90598
-	* g++.dg/cpp0x/pr90598.C: New test.
-
-2019-05-29  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/90539
-	* gfortran.dg/internal_pack_21.f90: Adjust scan patterns.
-	* gfortran.dg/internal_pack_22.f90: New test.
-	* gfortran.dg/internal_pack_23.f90: New test.
-
-2019-05-29  Jan Hubicka  <hubicka@ucw.cz>
-
-	* tree-ssa/alias-access-spath-1.c: new testcase.
-
-2019-05-29  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/89875
-	* g++.dg/cpp0x/decltype-pr66548.C: Remove xfail.
-	* g++.dg/template/sizeof-template-argument.C: Adjust expected error.
-
-2019-05-29  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-
-	* gcc.target/aarch64/sve2/aarch64-sve2.exp: New file, regression
-	driver for AArch64 SVE2.
-	* gcc.target/aarch64/sve2/average_1.c: New test.
-	* lib/target-supports.exp (check_effective_target_aarch64_sve2): New
-	helper.
-	(check_effective_target_aarch64_sve1_only): Likewise.
-	(check_effective_target_aarch64_sve2_hw): Likewise.
-	(check_effective_target_vect_avg_qi): Check for SVE1 only.
-
-2019-05-29  Sam Tebbs  <sam.tebbs@arm.com>
-
-	* gcc.target/aarch64/return_address_sign_b_1.c: New file.
-	* gcc.target/aarch64/return_address_sign_b_2.c: New file.
-	* gcc.target/aarch64/return_address_sign_b_3.c: New file.
-	* gcc.target/aarch64/return_address_sign_b_exception.c: New file.
-	* gcc.target/aarch64/return_address_sign_ab_exception.c: New file.
-	* gcc.target/aarch64/return_address_sign_builtin.c: New file
-
-2019-05-29  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
-	sorry on lastprivate conditional on parallel for.
-	* c-c++-common/gomp/lastprivate-conditional-3.c (foo): Add tests for
-	lastprivate conditional warnings on parallel for constructs.
-	* c-c++-common/gomp/lastprivate-conditional-4.c: New test.
-
-	PR c/90628
-	* c-c++-common/builtin-arith-overflow-3.c: New test.
-
-	P1091R3 - Extending structured bindings to be more like var decls
-	P1381R1 - Reference capture of structured bindings
-	* g++.dg/cpp1z/decomp3.C (test): For static, expect only warning
-	instead of error and only for c++17_down.  Add a thread_local test.
-	(z2): Add a __thread test.
-	* g++.dg/cpp2a/decomp1.C: New test.
-	* g++.dg/cpp2a/decomp1-aux.cc: New file.
-	* g++.dg/cpp2a/decomp2.C: New test.
-	* g++.dg/cpp2a/decomp3.C: New test.
-
-2019-05-29  Martin Liska  <mliska@suse.cz>
-
-	PR testsuite/90657
-	* gcc.dg/ipa/pr90555.c: Remove duplicite dg-compile.
-
-2019-05-28  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/localentry-detect-1.c: New file.
-
-2019-05-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90548 - ICE with generic lambda and empty pack.
-	* g++.dg/cpp1y/lambda-generic-90548.C: New test.
-
-2019-05-28  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-
-	* gcc.target/aarch64/sve/mask_load_slp_1.c: New test for SLP
-	vectorized masked loads.
-
-2019-05-28  Jeff Law  <law@redhat.com>
-
-	* gcc.target/sh/pr50749-qihisi-predec-3.c: Disable
-	loop distribution.
-
-2019-05-28  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/p9-dimode1.c: Don't restrict to -m64.  Check for
-	all mtvsr*, not just mtvsrd.  Use "wa" instead of "wi" constraints.
-	* gcc.target/powerpc/p9-dimode2.c: Ditto.
-
-2019-05-28  Martin Liska  <mliska@suse.cz>
-
-	PR ipa/90555
-	* gcc.dg/ipa/pr90555.c: New test.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/machine_attr1.ad[sb]: New test.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt79.ad[sb]: New test.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/discr5.ads: New test.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/prefetch1.ad[sb]: New test.
-
-2019-05-27  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr22076.c: Adjust options to
-	match codegen expected by the scan-asms.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/array4.ads: New test.
-
-2019-05-27  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	PR tree-optimization/88440
-	* gcc.target/aarch64/sve/index_offset_1.c: Add
-	-fno-tree-loop-distribute-patterns.
-	* gcc.target/aarch64/sve/single_1.c: Likewise.
-	* gcc.target/aarch64/sve/single_2.c: Likewise.
-	* gcc.target/aarch64/sve/single_3.c: Likewise.
-	* gcc.target/aarch64/sve/single_4.c: Likewise.
-	* gcc.target/aarch64/sve/vec_init_1.c: Likewise.
-	* gcc.target/aarch64/vect-fmovd-zero.c: Likewise.
-	* gcc.target/aarch64/vect-fmovf-zero.c: Likewise.
-	* gcc.target/arm/ivopts.c: Likewise.
-
-2019-05-27  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90637
-	* gcc.dg/gomp/pr90637.c: New testcase.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/expect2.adb: New test.
-	* gnat.dg/expect2_pkg.ads: New helper.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/aliased2.adb: New test.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/limited_with7.ad[sb]: New test.
-	* gnat.dg/limited_with7_pkg.ads: New helper.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/unchecked_convert13.adb: New test.
-
-2019-05-27  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/90615
-	* gcc.dg/vect/costmodel/ppc/costmodel-vect-31b.c: Add
-	-fno-tree-loop-distribute-patterns.
-	* gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c: Likewise.
-	* gcc.dg/vect/costmodel/ppc/costmodel-vect-76a.c: Likewise.
-	* gcc.dg/vect/costmodel/ppc/costmodel-vect-76b.c: Likewise.
-	* gcc.dg/vect/costmodel/ppc/costmodel-vect-76c.c: Likewise.
-	* gcc.target/powerpc/vsx-vectorize-1.c: Likewise.
-
-2019-05-26  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr39013-1.c: Adjust scan-asms for PIE to
-	account for PIC code on Darwin.
-	* gcc.target/i386/pr39013-2.c: Likewise.
-	* gcc.target/i386/pr64317.c: Likewise.
-
-2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr59874-3.c: Use the spelling of popcnt
-	expected for Darwin.
-
-2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr89261.c: Test that the alignment required
-	by the test correctly produces the expected error on Darwin.
-
-2019-05-25  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr82659-3.c: Require alias support.
-
-2019-05-25  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90572 - wrong disambiguation in friend declaration.
-	* g++.dg/cpp2a/typename16.C: New test.
-	* g++.dg/parse/friend13.C: New test.
-
-2019-05-24  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect
-	sorry for omp for.
-	* c-c++-common/gomp/lastprivate-conditional-3.c: New test.
-
-2019-05-24  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/90607
-	* gcc.dg/pr53265.c: Amend for new expected diagnostic.
-
-2019-05-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/90106
-	PR testsuite/90517
-	* gcc.dg/cdce1.c: Don't scan-assembler, instead -fdump-tree-optimized
-	and scan-tree-dump for tail call.
-	* gcc.dg/cdce2.c: Likewise.
-
-2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pconfig-1.c: Scan for the string in the generated
-	code, not in comments or miscellaneous directives.
-	* gcc.target/i386/pr18041-1.c: Likewise.
-	* gcc.target/i386/pr18041-2.c: Likewise.
-	* gcc.target/i386/wbinvd-1.c: Likewise.
-	* gcc.target/i386/wbnoinvd-1.c: Likewise.
-	* gcc.target/i386/pr66819-3.c: Specifically, check that there is no
-	call to "bar".
-	* gcc.target/i386/pr66819-4.c: Likewise.
-	* gcc.target/i386/pr82662.c
-	* gcc.target/i386/ptwrite2.c: Make the checks look for the specific
-	destination register, don't try the m32 test on m64 targets.
-
-2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/pr67985-2.c: Adjust label checks for
-	Darwin.
-	* gcc.target/i386/pr77881.c: Likewise.
-
-2019-05-24  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/i386/falign-functions-2.c: Skip for Darwin.
-	* gcc.target/i386/pr70738-7.c: Likewise.
-	* gcc.target/i386/pr24414.c: Likewise.
-
-2019-05-23  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* lib/target-supports.exp (check_effective_target_mfentry): New.
-	* gcc.target/i386/fentry-override.c: Require effective target mfentry.
-	* gcc.target/i386/fentry.c: Likewise.
-	* gcc.target/i386/fentryname1.c: Likewise.
-	* gcc.target/i386/fentryname2.c: Likewise.
-	* gcc.target/i386/fentryname3.c: Likewise.
-	* gcc.target/i386/nop-mcount.c: Likewise.
-	* gcc.target/i386/pr82699-2.c: Likewise.
-	* gcc.target/i386/pr82699-4.c: Likewise.
-	* gcc.target/i386/pr82699-5.c: Likewise.
-	* gcc.target/i386/pr82699-6.c: Likewise.
-	* gcc.target/i386/returninst1.c: Likewise.
-	* gcc.target/i386/returninst2.c: Likewise.
-	* gcc.target/i386/returninst3.c : Likewise.
-
-2019-05-23  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/localentry-1.c: New file.
-
-2019-05-23  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/90552
-	* gcc.target/i386/pr90552.c: New test.
-
-2019-05-23  Mark Eggleston  <mark.eggleston@codethink.com>
-
-	* gfortran.dg/fmt_f_default_field_width_1.f90: Hide REAL(16) behind
-	__GFC_REAL_16__.  Add -cpp to dg-options.
-	* gfortran.dg/fmt_f_default_field_width_2.f90: Ditto.
-	* gfortran.dg/fmt_f_default_field_width_3.f90: Ditto.
-	* gfortran.dg/fmt_g_default_field_width_1.f90: Ditto.
-	* gfortran.dg/fmt_g_default_field_width_2.f90: Ditto.
-	* gfortran.dg/fmt_g_default_field_width_3.f90: Ditto.
-
-2019-05-23  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/cpu-future.c: New test.
-
-2019-05-23  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88440
-	* gcc.dg/tree-ssa/ldist-37.c: New testcase.
-	* gcc.dg/tree-ssa/ldist-38.c: Likewise.
-	* gcc.dg/vect/vect.exp: Add -fno-tree-loop-distribute-patterns.
-	* gcc.dg/tree-ssa/ldist-37.c: Adjust.
-	* gcc.dg/tree-ssa/ldist-38.c: Likewise.
-	* g++.dg/tree-ssa/pr78847.C: Likewise.
-	* gcc.dg/autopar/pr39500-1.c: Likewise.
-	* gcc.dg/autopar/reduc-1char.c: Likewise.
-	* gcc.dg/autopar/reduc-7.c: Likewise.
-	* gcc.dg/tree-ssa/ivopts-lt-2.c: Likewise.
-	* gcc.dg/tree-ssa/ivopts-lt.c: Likewise.
-	* gcc.dg/tree-ssa/predcom-dse-1.c: Likewise.
-	* gcc.dg/tree-ssa/predcom-dse-2.c: Likewise.
-	* gcc.dg/tree-ssa/predcom-dse-3.c: Likewise.
-	* gcc.dg/tree-ssa/predcom-dse-4.c: Likewise.
-	* gcc.dg/tree-ssa/prefetch-7.c: Likewise.
-	* gcc.dg/tree-ssa/prefetch-8.c: Likewise.
-	* gcc.dg/tree-ssa/prefetch-9.c: Likewise.
-	* gcc.dg/tree-ssa/scev-11.c: Likewise.
-	* gcc.dg/vect/costmodel/i386/costmodel-vect-31.c: Likewise.
-	* gcc.dg/vect/costmodel/i386/costmodel-vect-33.c: Likewise.
-	* gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c: Likewise.
-	* gcc.dg/vect/costmodel/x86_64/costmodel-vect-33.c: Likewise.
-	* gcc.target/i386/pr30970.c: Likewise.
-	* gcc.target/i386/vect-double-1.c: Likewise.
-	* gcc.target/i386/vect-double-2.c: Likewise.
-	* gcc.dg/tree-ssa/gen-vect-2.c: Likewise.
-	* gcc.dg/tree-ssa/gen-vect-26.c: Likewise.
-	* gcc.dg/tree-ssa/gen-vect-28.c: Likewise.
-	* gcc.dg/tree-ssa/gen-vect-32.c: Likewise.
-	* gfortran.dg/vect/vect-5.f90: Likewise.
-	* gfortran.dg/vect/vect-8.f90: Likewise.
-
-2019-05-23  Martin Liska  <mliska@suse.cz>
-
-	PR sanitizer/90570
-	* g++.dg/asan/pr90570.C: New test.
-
-2019-05-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt78.ad[sb]: New test.
-
-2019-05-23  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR rtl-optimisation/64895
-	* gcc.target/i386/fuse-caller-save-rec.c: Remove XFAILs.
-	* gcc.target/i386/fuse-caller-save.c: Likewise.
-	* gcc.target/i386/fuse-caller-save-xmm.c: Adjust tests for
-	PIC cases, remove XFAILs.
-
-2019-05-23  Thomas Schwinge  <thomas@codesourcery.com>
-
-	PR middle-end/90510
-	* brig.dg/test/gimple/packed.hsail: Adjust.
-
-2019-05-23  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/cpp2a/is-constant-evaluated8.C: New test.
-
-2019-05-23  Hans-Peter Nilsson  <hp@axis.com>
-
-	* gfortran.dg/dec_io_1.f90, gfortran.dg/dtio_1.f90,
-	gfortran.dg/dtio_12.f90, gfortran.dg/fmt_en.f90,
-	gfortran.dg/namelist_89.f90: Gate test on effective_target
-	fd_truncate.
-
-2019-05-22  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/90462
-	* g++.dg/pr90462.C: New test.
-
-2019-05-22  Marek Polacek  <polacek@redhat.com>
-
-	* g++.dg/cpp1y/udlit-char-template-neg.C: Expect the error on a
-	different line.  Check the column number too.
-
-2019-05-22  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/vect-signbitf.c (dg-final): Improve
-	scan-assembler-not string to avoid false matching on 32bit targets.
-
-2019-05-22  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/88483
-	* gcc.target/i386/stackalign/pr88483-1.c: New test.
-	* gcc.target/i386/stackalign/pr88483-2.c: Likewise.
-
-2019-05-22  Andrew Stubbs  <ams@codesourcery.com>
-
-	* gfortran.dg/coarray_lock_7.f90: Fix output patterns.
-
-2019-05-22  Mark Eggleston  <mark.eggleston@codethink.com>
-
-	PR fortran/89100
-	* gfortran.dg/fmt_f_default_field_width_1.f90: New test.
-	* gfortran.dg/fmt_f_default_field_width_2.f90: New test.
-	* gfortran.dg/fmt_f_default_field_width_3.f90: New test.
-	* gfortran.dg/fmt_g_default_field_width_1.f90: New test.
-	* gfortran.dg/fmt_g_default_field_width_2.f90: New test.
-	* gfortran.dg/fmt_g_default_field_width_3.f90: New test.
-	* gfortran.dg/fmt_i_default_field_width_1.f90: New test.
-	* gfortran.dg/fmt_i_default_field_width_2.f90: New test.
-	* gfortran.dg/fmt_i_default_field_width_3.f90: New test.
-
-2019-05-22  Martin Liska  <mliska@suse.cz>
-
-	PR testsuite/90564
-	* gcc.target/powerpc/pr80315-1.c: Remove usage of quotes.
-	* gcc.target/powerpc/pr80315-2.c: Likewise.
-	* gcc.target/powerpc/pr80315-3.c: Likewise.
-	* gcc.target/powerpc/pr80315-4.c: Likewise.
-
-2019-05-22  Martin Liska  <mliska@suse.cz>
-
-	PR testsuite/90564
-	* gcc.target/powerpc/pr80315-1.c: Add one extra \ to escape brackets.
-	* gcc.target/powerpc/pr80315-2.c: Likewise.
-	* gcc.target/powerpc/pr80315-3.c: Likewise.
-	* gcc.target/powerpc/pr80315-4.c: Likewise.
-
-2019-05-22  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR testsuite/27221
-	* g++.dg/ext/alignof2.C: XFAIL for 32bit Darwin.
-
-2019-05-22  Martin Liska  <mliska@suse.cz>
-
-	PR lto/90500
-	* gcc.target/i386/pr90500-1.c: Make the test-case valid now.
-
-2019-05-22  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/tree-ssa/ssa-lim-13.c: New testcase.
-
-2019-05-22  Alan Modra  <amodra@gmail.com>
-
-	* gcc.target/powerpc/ppc32-abi-dfp-1.c: Don't use
-	power mnemonics.
-	* gcc.dg/vect/O3-pr70130.c: Disable default options
-	added by check_vect_support_and_set_flags.
-	* gcc.dg/vect/pr48765.c: Likewise.
-	* gfortran.dg/vect/pr45714-b.f: Likewise.
-
-2019-05-22  Hans-Peter Nilsson  <hp@axis.com>
-
-	PR middle-end/90553
-	* gcc.dg/torture/pr90553.c: New test.
-
-2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/udlit-tmpl-arg-neg2.C: Check locations too.
-	* g++.dg/cpp0x/udlit-tmpl-parms-neg.C: Likewise.
-
-2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/67184
-	PR c++/69445
-	* g++.dg/other/final3.C: New.
-	* g++.dg/other/final4.C: Likewise.
-	* g++.dg/other/final5.C: Likewise.
-
-2019-05-21  Marek Polacek  <polacek@redhat.com>
-
-	DR 1940 - static_assert in anonymous unions.
-	* g++.dg/DRs/dr1940.C: New test.
-
-2019-05-21  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/90547
-	* gcc.target/i386/pr90547.c: New test.
-
-2019-05-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.dg/Wattribute-alias.c: Pass emtpy arg to dg-require-ifunc.
-
-	* gcc.c-torture/execute/20030125-1.c: Pass emtpy arg to dg-require-weak.
-
-	* gcc.dg/torture/ftrapv-2.c: Pass empty arg to dg-require-fork.
-
-	* gcc.target/i386/pr84723-1.c: Remove dg-require-ifunc.
-	* gcc.target/i386/pr84723-2.c: Likewise.
-	* gcc.target/i386/pr84723-3.c: Likewise.
-	* gcc.target/i386/pr84723-4.c: Likewise.
-	* gcc.target/i386/pr84723-5.c: Likewise.
-
-2019-05-21  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR testsuite/67958
-	* gcc.target/i386/pr32219-1.c: Adjust scan-asms for Darwin, comment
-	the differences.
-	* gcc.target/i386/pr32219-2.c: Likewise.
-	* gcc.target/i386/pr32219-3.c: Likewise.
-	* gcc.target/i386/pr32219-4.c: Likewise.
-	* gcc.target/i386/pr32219-5.c: Likewise.
-	* gcc.target/i386/pr32219-6.c: Likewise.
-	* gcc.target/i386/pr32219-7.c: Likewise.
-	* gcc.target/i386/pr32219-8.c: Likewise.
-
-2019-05-21  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR target/63891
-	* gcc.dg/darwin-weakimport-3.c: Adjust options and explain
-	the reasons.
-
-2019-05-21  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/vect-signbitf.c: New test.
-
-2019-05-21  Nathan Sidwell  <nathan@acm.org>
-
-	* g++.dg/lookup/using53.C: Adjust diagnostic.
-
-2019-05-21  Alan Modra  <amodra@gmail.com>
-
-	PR target/90545
-	* gcc.target/powerpc/fold-vec-splats-floatdouble.c: Correct comments
-	and rename functions to suit parameters.
-
-2019-05-21  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/90510
-	* gcc.target/i386/pr90510.c: New testcase.
-
-2019-05-21  Martin Liska  <mliska@suse.cz>
-
-	* gcc.target/i386/pr90500-1.c: Add missing '""'.
-	* gcc.target/i386/pr90500-2.c: Likewise.
-
-2019-05-21  Vladislav Ivanishin  <vlad@ispras.ru>
-
-	* gcc.dg/uninit-28-gimple.c: New test.
-	* gcc.dg/uninit-29-gimple.c: New test.
-	* gcc.dg/uninit-30-gimple.c: New test.
-	* gcc.dg/uninit-31-gimple.c: New test.
-
-2019-05-21  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/pr90263.c: Add -O2.
-
-2019-05-21  Martin Liska  <mliska@suse.cz>
-
-	* gcc.target/powerpc/ppc64-abi-warn-1.c: Wrap a type.
-	* gcc.target/powerpc/pr80315-1.c: Use new interval format.
-	* gcc.target/powerpc/pr80315-2.c: Likewise.
-	* gcc.target/powerpc/pr80315-3.c: Likewise.
-	* gcc.target/powerpc/pr80315-4.c: Likewise.
-	* gcc.target/powerpc/warn-lvsl-lvsr.c: Wrap builtin names.
-
-2019-05-21  Martin Liska  <mliska@suse.cz>
-
-	PR testsuite/90551
-	* pr90263.c: Move from gcc.c-torture/compile
-	into gcc.dg.
-
-2019-05-20  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR testsuite/90503
-	* gcc.target/i386/pr22076.c (dg-options): Add -mno-sse2.
-	Remove -flax-vector-conversions.
-	(dg-additional-options): Remove.
-	(test): Change to void.  Declare m0 and m1 as __m64 and
-	cast initializer in a proper way.  Do not return result.
-	(dg-final): Scan for 2 instances of movq.
-
-2019-05-20  Marek Polacek  <polacek@redhat.com>
-
-	CWG 2094 - volatile scalars are trivially copyable.
-	PR c++/85679
-	* g++.dg/ext/is_trivially_constructible1.C: Change the expected result
-	for volatile int.
-	* g++.dg/ext/is_trivially_copyable.C: New test.
-
-2019-05-20  Marek Polacek  <polacek@redhat.com>
-
-	* g++.dg/ext/utf8-2.C: Accept both "char" and "char8_t" in aka.
-
-	* g++.dg/cpp2a/nontype-class17.C: New test.
-
-	* g++.dg/lookup/strong-using2.C: New test.
-
-2019-05-20  Jeff Law  <law@redhat.com>
-
-	* gcc.dg/Wtype-limits-Wextra.c: Adjust expected output after
-	recent diagnostic cleanups.
-
-2019-05-20  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	PR tree-optimization/90106
-	* gcc.dg/cdce3.c: Add hard_float effective target.
-
-2019-05-20  Marc Glisse  <marc.glisse@inria.fr>
-
-	* gcc.dg/torture/pta-ptrarith-3.c: Relax the matched pattern.
-
-2019-05-20  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR testsuite/58321
-	* gcc.target/i386/memcpy-strategy-3.c: Adjust count for Darwin and
-	add a comment as to the reason for the difference.
-	* gcc.target/i386/memset-strategy-1.c: Likewise.
-
-2019-05-20  Jonathan Wakely  <jwakely@redhat.com>
-
-	PR c++/90532 Ensure __is_constructible(T[]) is false
-	* g++.dg/ext/90532.C: New test.
-
-2019-05-20  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.target/i386/avx512f-simd-1.c: New test.
-
-2019-05-20  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* gcc.target/aarch64/target_attr_10.c: Add quotes to expected
-	error message.
-	* gcc.target/arm/attr-neon-builtin-fail.c: Likewise.
-
-2019-05-20  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/90263
-	* gcc.c-torture/compile/pr90263.c: New test.
-	* lib/target-supports.exp: Add check_effective_target_glibc.
-
-2019-05-20  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/90518
-	* gcc.dg/gimplefe-40.c: Restrict to targets with appropriate
-	vector support.
-	* gcc.dg/gimplefe-41.c: Likewise.
-
-2019-05-19  Andrew Pinski  <apinski@marvell.com>
-
-	PR pch/81721
-	* g++.dg/pch/operator-1.C: New testcase.
-	* g++.dg/pch/operator-1.Hs: New file.
-
-2019-05-19  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/90498
-	* gfortran.dg/associate_48.f90 : New test.
-
-2019-05-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/78290
-	* gfortran.dg/pr78290.f90: New test.
-
-2019-05-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/88821
-	* gfortran.dg/alloc_comp_auto_array_3.f90: Add -O0 to dg-options
-	to make sure the test for internal_pack is retained.
-	* gfortran.dg/assumed_type_2.f90: Split compile and run time
-	tests into this and
-	* gfortran.dg/assumed_type_2a.f90: New file.
-	* gfortran.dg/c_loc_test_22.f90: Likewise.
-	* gfortran.dg/contiguous_3.f90: Likewise.
-	* gfortran.dg/internal_pack_11.f90: Likewise.
-	* gfortran.dg/internal_pack_12.f90: Likewise.
-	* gfortran.dg/internal_pack_16.f90: Likewise.
-	* gfortran.dg/internal_pack_17.f90: Likewise.
-	* gfortran.dg/internal_pack_18.f90: Likewise.
-	* gfortran.dg/internal_pack_4.f90: Likewise.
-	* gfortran.dg/internal_pack_5.f90: Add -O0 to dg-options
-	to make sure the test for internal_pack is retained.
-	* gfortran.dg/internal_pack_6.f90: Split compile and run time
-	tests into this and
-	* gfortran.dg/internal_pack_6a.f90: New file.
-	* gfortran.dg/internal_pack_8.f90: Likewise.
-	* gfortran.dg/missing_optional_dummy_6: Split compile and run time
-	tests into this and
-	* gfortran.dg/missing_optional_dummy_6a.f90: New file.
-	* gfortran.dg/no_arg_check_2.f90: Split compile and run time tests
-	into this and
-	* gfortran.dg/no_arg_check_2a.f90: New file.
-	* gfortran.dg/typebound_assignment_5.f90: Split compile and run time
-	tests into this and
-	* gfortran.dg/typebound_assignment_5a.f90: New file.
-	* gfortran.dg/typebound_assignment_6.f90: Split compile and run time
-	tests into this and
-	* gfortran.dg/typebound_assignment_6a.f90: New file.
-	* gfortran.dg/internal_pack_19.f90: New file.
-	* gfortran.dg/internal_pack_20.f90: New file.
-	* gfortran.dg/internal_pack_21.f90: New file.
-
-2019-05-18  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* objc.dg/instancetype-0.m: New.
-
-2019-05-17  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/gcc_diag-11.c: Remove accidentally committed test.
-
-	* g++.dg/overload/conv-op1.C: Adjust text of expected messages.
-	* g++.dg/ubsan/pr63956.C: Same.
-	* g++.old-deja/g++.pt/assign1.C: Same.
-
-2019-05-17  Thomas Schwinge  <thomas@codesourcery.com>
-
-	PR testsuite/89433
-	* c-c++-common/goacc/routine-5.c: Update.
-	* c-c++-common/goacc/routine-level-of-parallelism-1.c: Likewise.
-	* c-c++-common/goacc/routine-level-of-parallelism-2.c: New file.
-
-	PR testsuite/89433
-	* c-c++-common/goacc/routine-2.c: Update, and move some test
-	into...
-	* c-c++-common/goacc/routine-level-of-parallelism-1.c: ... this
-	new file.
-
-	PR testsuite/89433
-	* c-c++-common/goacc/classify-routine.c: Update.
-	* gfortran.dg/goacc/classify-routine.f95: Likewise.
-
-2019-05-16  Martin Sebor  <msebor@redhat.com>
-
-	* c-c++-common/Wbool-operation-1.c: Adjust text of expected diagnostics.
-	* c-c++-common/Wvarargs-2.c: Same.
-	* c-c++-common/Wvarargs.c: Same.
-	* c-c++-common/pr51768.c: Same.
-	* c-c++-common/tm/inline-asm.c: Same.
-	* c-c++-common/tm/safe-1.c: Same.
-	* g++.dg/asm-qual-1.C: Same.
-	* g++.dg/asm-qual-3.C: Same.
-	* g++.dg/conversion/dynamic1.C: Same.
-	* g++.dg/cpp0x/constexpr-89599.C: Same.
-	* g++.dg/cpp0x/constexpr-cast.C: Same.
-	* g++.dg/cpp0x/constexpr-shift1.C: Same.
-	* g++.dg/cpp0x/lambda/lambda-conv11.C: Same.
-	* g++.dg/cpp0x/nullptr04.C: Same.
-	* g++.dg/cpp0x/static_assert12.C: Same.
-	* g++.dg/cpp0x/static_assert8.C: Same.
-	* g++.dg/cpp1y/lambda-conv1.C: Same.
-	* g++.dg/cpp1y/pr79393-3.C: Same.
-	* g++.dg/cpp1y/static_assert1.C: Same.
-	* g++.dg/cpp1z/constexpr-if4.C: Same.
-	* g++.dg/cpp1z/constexpr-if5.C: Same.
-	* g++.dg/cpp1z/constexpr-if9.C: Same.
-	* g++.dg/eh/goto2.C: Same.
-	* g++.dg/eh/goto3.C: Same.
-	* g++.dg/expr/static_cast8.C: Same.
-	* g++.dg/ext/flexary5.C: Same.
-	* g++.dg/ext/utf-array-short-wchar.C: Same.
-	* g++.dg/ext/utf-array.C: Same.
-	* g++.dg/ext/utf8-2.C: Same.
-	* g++.dg/gomp/loop-4.C: Same.
-	* g++.dg/gomp/macro-4.C: Same.
-	* g++.dg/gomp/udr-1.C: Same.
-	* g++.dg/init/initializer-string-too-long.C: Same.
-	* g++.dg/other/offsetof9.C: Same.
-	* g++.dg/ubsan/pr63956.C: Same.
-	* g++.dg/warn/Wbool-operation-1.C: Same.
-	* g++.dg/warn/Wtype-limits-Wextra.C: Same.
-	* g++.dg/warn/Wtype-limits.C: Same.
-	* g++.dg/wrappers/pr88680.C: Same.
-	* g++.old-deja/g++.mike/eh55.C: Same.
-	* gcc.dg/Wsign-compare-1.c: Same.
-	* gcc.dg/Wtype-limits-Wextra.c: Same.
-	* gcc.dg/Wtype-limits.c: Same.
-	* gcc.dg/Wunknownprag.c: Same.
-	* gcc.dg/Wunsuffixed-float-constants-1.c: Same.
-	* gcc.dg/asm-6.c: Same.
-	* gcc.dg/asm-qual-1.c: Same.
-	* gcc.dg/cast-1.c: Same.
-	* gcc.dg/cast-2.c: Same.
-	* gcc.dg/cast-3.c: Same.
-	* gcc.dg/cpp/source_date_epoch-2.c: Same.
-	* gcc.dg/debug/pr85252.c: Same.
-	* gcc.dg/dfp/cast-bad.c: Same.
-	* gcc.dg/format/gcc_diag-1.c: Same.
-	* gcc.dg/format/gcc_diag-11.c: Same.
-	* gcc.dg/gcc_diag-11.c: Same.
-	* gcc.dg/gnu-cond-expr-2.c: Same.
-	* gcc.dg/gnu-cond-expr-3.c: Same.
-	* gcc.dg/gomp/macro-4.c: Same.
-	* gcc.dg/init-bad-1.c: Same.
-	* gcc.dg/init-bad-2.c: Same.
-	* gcc.dg/init-bad-3.c: Same.
-	* gcc.dg/pr27528.c: Same.
-	* gcc.dg/pr48552-1.c: Same.
-	* gcc.dg/pr48552-2.c: Same.
-	* gcc.dg/pr59846.c: Same.
-	* gcc.dg/pr61096-1.c: Same.
-	* gcc.dg/pr8788-1.c: Same.
-	* gcc.dg/pr90082.c: Same.
-	* gcc.dg/simd-2.c: Same.
-	* gcc.dg/spellcheck-params-2.c: Same.
-	* gcc.dg/spellcheck-params.c: Same.
-	* gcc.dg/strlenopt-49.c: Same.
-	* gcc.dg/tm/pr52141.c: Same.
-	* gcc.dg/torture/pr51106-1.c: Same.
-	* gcc.dg/torture/pr51106-2.c: Same.
-	* gcc.dg/utf-array-short-wchar.c: Same.
-	* gcc.dg/utf-array.c: Same.
-	* gcc.dg/utf8-2.c: Same.
-	* gcc.dg/warn-sprintf-no-nul.c: Same.
-	* gcc.target/i386/asm-flag-0.c: Same.
-	* gcc.target/i386/inline_error.c: Same.
-	* gcc.target/i386/pr30848.c: Same.
-	* gcc.target/i386/pr39082-1.c: Same.
-	* gcc.target/i386/pr39678.c: Same.
-	* gcc.target/i386/pr57756.c: Same.
-	* gcc.target/i386/pr68843-1.c: Same.
-	* gcc.target/i386/pr79804.c: Same.
-	* gcc.target/i386/pr82673.c: Same.
-	* obj-c++.dg/class-protocol-1.mm: Same.
-	* obj-c++.dg/exceptions-3.mm: Same.
-	* obj-c++.dg/exceptions-4.mm: Same.
-	* obj-c++.dg/exceptions-5.mm: Same.
-	* obj-c++.dg/exceptions-6.mm: Same.
-	* obj-c++.dg/method-12.mm: Same.
-	* obj-c++.dg/method-13.mm: Same.
-	* obj-c++.dg/method-6.mm: Same.
-	* obj-c++.dg/method-7.mm: Same.
-	* obj-c++.dg/method-9.mm: Same.
-	* obj-c++.dg/method-lookup-1.mm: Same.
-	* obj-c++.dg/proto-lossage-4.mm: Same.
-	* obj-c++.dg/protocol-qualifier-2.mm: Same.
-	* objc.dg/call-super-2.m: Same.
-	* objc.dg/class-protocol-1.m: Same.
-	* objc.dg/desig-init-1.m: Same.
-	* objc.dg/exceptions-3.m: Same.
-	* objc.dg/exceptions-4.m: Same.
-	* objc.dg/exceptions-5.m: Same.
-	* objc.dg/exceptions-6.m: Same.
-	* objc.dg/method-19.m: Same.
-	* objc.dg/method-2.m: Same.
-	* objc.dg/method-5.m: Same.
-	* objc.dg/method-6.m: Same.
-	* objc.dg/method-7.m: Same.
-	* objc.dg/method-lookup-1.m: Same.
-	* objc.dg/proto-hier-1.m: Same.
-	* objc.dg/proto-lossage-4.m: Same.
-
-2019-05-17  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
-
-	* g++.dg/eh/o32-fp.C: New.
-	* gcc.target/mips/dwarfregtable-1.c: New.
-	* gcc.target/mips/dwarfregtable-2.c: New.
-	* gcc.target/mips/dwarfregtable-3.c: New.
-	* gcc.target/mips/dwarfregtable-4.c: New.
-	* gcc.target/mips/dwarfregtable.h: New.
-
-2019-05-17  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* gcc.target/x86_64/abi/test_varargs-m128.c: New file.
-	* gcc.target/x86_64/abi/avx/test_varargs-m256.c: Likewise.
-	* gcc.target/x86_64/abi/avx512f/test_varargs-m512.c: Likewise.
-
-2019-05-17  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/90497
-	* gcc.target/i386/pr90497-1.c: New test.
-	* gcc.target/i386/pr90497-2.c: Likewise.
-
-2019-05-17  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.target/s390/global-array-element-pic.c: Add -march=z900.
-	* gcc.target/s390/global-array-element-pic2.c: New test for z10+.
-
-2019-05-17  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-41.c: New testcase.
-
-2019-05-17  Jun Ma  <JunMa@linux.alibaba.com>
-
-	PR tree-optimization/90106
-	* gcc.dg/cdce3.c: New test.
-
-2019-05-17  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-sldw.c: New test.
-
-2019-05-17  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/90478
-	* gcc.dg/tree-ssa/pr90478-2.c: Remove.
-
-2019-05-16  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.dg/vect/vect-simd-1.c: New test.
-	* gcc.dg/vect/vect-simd-2.c: New test.
-	* gcc.dg/vect/vect-simd-3.c: New test.
-	* gcc.dg/vect/vect-simd-4.c: New test.
-
-2019-05-16  Martin Liska  <mliska@suse.cz>
-
-	PR lto/90500
-	* gcc.target/i386/pr90500-1.c: New test.
-	* gcc.target/i386/pr90500-2.c: New test.
-
-2019-05-16  Vladislav Ivanishin  <vlad@ispras.ru>
-
-	PR tree-optimization/90394
-	* gcc.dg/uninit-pr90394-1-gimple.c: New test.
-	* gcc.dg/uninit-pr90394.c: New test.
-
-2019-05-16  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/90502
-	* gcc.dg/tree-ssa/vector-6.c: Adjust for half of the
-	transforms happening earlier now.
-
-2019-05-16  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* lib/target-supports.exp (check_effective_target_cet): Add the
-	-fcf-protection flag to the build conditions.
-
-2019-05-16  Jun Ma  <JunMa@linux.alibaba.com>
-
-	PR tree-optimization/90106
-	* gcc.dg/cdce1.c: Check tailcall code generation after cdce pass.
-	* gcc.dg/cdce2.c: Likewise.
-
-2019-05-16  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90424
-	* g++.target/i386/pr90424-1.C: New testcase.
-	* g++.target/i386/pr90424-2.C: Likewise.
-
-2019-05-16  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-40.c: Amend again.
-
-2019-05-15  Cherry Zhang  <cherryyz@google.com>
-
-	* go.test/test/nilptr2.go: Change use function to actually do
-	something.
-
-2019-05-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/90478
-	* gcc.dg/tree-ssa/pr90478.c: Add empty dg-options.  Use long long type
-	instead of long.
-
-	* c-c++-common/gomp/simd8.c: New test.
-
-2019-05-15  Marek Polacek  <polacek@redhat.com>
-
-	CWG 2096 - constraints on literal unions.
-	* g++.dg/cpp0x/literal-type1.C: New test.
-
-2019-05-15  Janne Blomqvist  <jb@gcc.gnu.org>
-
-	PR fortran/90461
-	* gfortran.dg/open_errors_2.f90: Add -std=f2008, adjust line number.
-	* gfortran.dg/open_errors_3.f90: New test.
-
-2019-05-15  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89021
-	* gcc.target/i386/mmx-vals.h: New file.
-	* gcc.target/i386/sse2-mmx-2.c: Likewise.
-	* gcc.target/i386/sse2-mmx-3.c: Likewise.
-	* gcc.target/i386/sse2-mmx-4.c: Likewise.
-	* gcc.target/i386/sse2-mmx-5.c: Likewise.
-	* gcc.target/i386/sse2-mmx-6.c: Likewise.
-	* gcc.target/i386/sse2-mmx-7.c: Likewise.
-	* gcc.target/i386/sse2-mmx-8.c: Likewise.
-	* gcc.target/i386/sse2-mmx-9.c: Likewise.
-	* gcc.target/i386/sse2-mmx-10.c: Likewise.
-	* gcc.target/i386/sse2-mmx-11.c: Likewise.
-	* gcc.target/i386/sse2-mmx-12.c: Likewise.
-	* gcc.target/i386/sse2-mmx-13.c: Likewise.
-	* gcc.target/i386/sse2-mmx-14.c: Likewise.
-	* gcc.target/i386/sse2-mmx-15.c: Likewise.
-	* gcc.target/i386/sse2-mmx-16.c: Likewise.
-	* gcc.target/i386/sse2-mmx-17.c: Likewise.
-	* gcc.target/i386/sse2-mmx-18a.c: Likewise.
-	* gcc.target/i386/sse2-mmx-18b.c: Likewise.
-	* gcc.target/i386/sse2-mmx-18c.c: Likewise.
-	* gcc.target/i386/sse2-mmx-19a.c: Likewise.
-	* gcc.target/i386/sse2-mmx-18b.c: Likewise.
-	* gcc.target/i386/sse2-mmx-19c.c: Likewise.
-	* gcc.target/i386/sse2-mmx-19d.c: Likewise.
-	* gcc.target/i386/sse2-mmx-19e.c: Likewise.
-	* gcc.target/i386/sse2-mmx-20.c: Likewise.
-	* gcc.target/i386/sse2-mmx-21.c: Likewise.
-	* gcc.target/i386/sse2-mmx-22.c: Likewise.
-	* gcc.target/i386/sse2-mmx-cvtpi2ps.c: Likewise.
-	* gcc.target/i386/sse2-mmx-cvtps2pi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-cvttps2pi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-maskmovq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-packssdw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-packsswb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-packuswb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddsb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddsw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddusb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddusw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-paddw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pand.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pandn.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pavgb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pavgw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pcmpeqb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pcmpeqd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pcmpeqw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pcmpgtb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pcmpgtd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pcmpgtw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pextrw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pinsrw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmaddwd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmaxsw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmaxub.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pminsw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pminub.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmovmskb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmulhuw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmulhw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmullw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pmuludq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-por.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psadbw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pshufw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pslld.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pslldi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psllq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psllqi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psllw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psllwi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrad.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psradi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psraw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrawi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrld.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrldi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrlq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrlqi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrlw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psrlwi.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psubb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psubd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psubq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psubusb.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psubusw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-psubw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-punpckhbw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-punpckhdq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-punpckhwd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-punpcklbw.c: Likewise.
-	* gcc.target/i386/sse2-mmx-punpckldq.c: Likewise.
-	* gcc.target/i386/sse2-mmx-punpcklwd.c: Likewise.
-	* gcc.target/i386/sse2-mmx-pxor.c: Likewise.
-
-2019-05-15  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89021
-	* config/i386/i386-builtins.c (bdesc_tm): Enable MMX intrinsics
-	with SSE2.
-
-2019-05-15  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89021
-	* gcc.target/i386/pr82483-1.c: Error only on ia32.
-	* gcc.target/i386/pr82483-2.c: Likewise.
-
-2019-05-15  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/90478
-	* gcc.dg/tree-ssa/pr90478-2.c: New test.
-	* gcc.dg/tree-ssa/pr90478.c: New test.
-
-2019-05-15  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-40.c: Amend.
-
-2019-05-15  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* lib/target-supports.exp
-	(check_effective_target_powerpc_p8vector_ok): No support for Darwin.
-	(check_effective_target_powerpc_p9vector_ok): Likewise.
-	(check_effective_target_powerpc_float128_sw_ok): Likewise.
-	(check_effective_target_powerpc_float128_hw_ok): Likewise.
-	(check_effective_target_powerpc_vsx_ok): Likewise.
-	* gcc.target/powerpc/bfp/bfp.exp: Don't try to run this for Darwin.
-	* gcc.target/powerpc/dfp/dfp.exp: Likewise.
-
-2019-05-15  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/pr87600.h: Add __POWERPC__ as an alternate test
-	for PowerPC platforms.
-
-2019-05-15  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR target/82920
-	* g++.dg/cet-notrack-1.C: Adjust scan assembler for Darwin.
-	* gcc.target/i386/cet-notrack-5a.c: Likewise.
-	* gcc.target/i386/cet-notrack-5b.c: Likewise.
-	* gcc.target/i386/cet-notrack-6b.c: Likewise.
-	* gcc.target/i386/cet-notrack-icf-1.c: Likewise.
-	* gcc.target/i386/cet-notrack-icf-2.c: Likewise.
-	* gcc.target/i386/cet-notrack-icf-3.c: Likewise.
-	* gcc.target/i386/cet-notrack-icf-4.c: Likewise.
-	* gcc.target/i386/cet-sjlj-3.c: Likewise.
-	* gcc.target/i386/cet-sjlj-5.c: Likewise.
-
-2019-05-14  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/68918
-	* g++.dg/cpp0x/decltype71.C: New test.
-
-	PR c++/70156
-	* g++.dg/init/static5.C: New test.
-
-2019-05-14  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR target/82920
-	* gcc.target/i386/cet-sjlj-6b.c: Require effective target x32.
-	* gcc.target/i386/pr52146.c: Likewise.
-	* gcc.target/i386/pr52698.c: Likewise.
-	* gcc.target/i386/pr52857-1.c: Likewise.
-	* gcc.target/i386/pr52857-2.c: Likewise.
-	* gcc.target/i386/pr52876.c: Likewise.
-	* gcc.target/i386/pr53698.c: Likewise.
-	* gcc.target/i386/pr54157.c: Likewise.
-	* gcc.target/i386/pr55049-1.c: Likewise.
-	* gcc.target/i386/pr55093.c: Likewise.
-	* gcc.target/i386/pr55116-1.c: Likewise.
-	* gcc.target/i386/pr55116-2.c: Likewise.
-	* gcc.target/i386/pr55597.c: Likewise.
-	* gcc.target/i386/pr59929.c: Likewise.
-	* gcc.target/i386/pr66470.c: Likewise.
-
-2019-05-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.dg/atomic/c11-atomic-exec-4.c: Simplify triplet to
-	*-*-solaris2*.
-	* gcc.dg/atomic/c11-atomic-exec-5.c: Likewise.
-	* gcc.dg/c99-math-double-1.c: Likewise.
-	* gcc.dg/c99-math-float-1.c: Likewise.
-	* gcc.dg/c99-math-long-double-1.c: Likewise.
-	* gcc.misc-tests/linkage.exp: Simplify triplet to
-	x86_64-*-solaris2*.
-
-	* gcc.target/i386/mcount_pic.c: Remove *-*-solaris2.10* && !gld
-	xfail.
-	* gcc.target/i386/pr63620.c: Likewise.
-
-	* lib/target-supports.exp (check_sse_os_support_available): Remove
-	Solaris 9/x86 workaround.
-
-2019-05-14  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-40.c: New testcase.
-
-2019-05-14  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR preprocessor/90382
-	* g++.dg/diagnostic/trailing1.C: New test.
-
-2019-05-14  marxin  <mliska@suse.cz>
-
-	PR middle-end/90340
-	* gcc.dg/tree-ssa/pr90340-2.c: Add case-values-threshold
-	param.
-
-2019-05-14  Richard Biener  <rguenther@suse.de>
-	    H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR tree-optimization/88828
-	* gcc.target/i386/pr88828-1.c: New test.
-	* gcc.target/i386/pr88828-1a.c: Likewise.
-	* gcc.target/i386/pr88828-1b.c: Likewise.
-	* gcc.target/i386/pr88828-1c.c: Likewise.
-	* gcc.target/i386/pr88828-4a.c: Likewise.
-	* gcc.target/i386/pr88828-4b.c: Likewise.
-	* gcc.target/i386/pr88828-5a.c: Likewise.
-	* gcc.target/i386/pr88828-5b.c: Likewise.
-	* gcc.target/i386/pr88828-7.c: Likewise.
-	* gcc.target/i386/pr88828-7a.c: Likewise.
-	* gcc.target/i386/pr88828-7b.c: Likewise.
-	* gcc.target/i386/pr88828-8.c: Likewise.
-	* gcc.target/i386/pr88828-8a.c: Likewise.
-	* gcc.target/i386/pr88828-8b.c: Likewise.
-	* gcc.target/i386/pr88828-9.c: Likewise.
-	* gcc.target/i386/pr88828-9a.c: Likewise.
-	* gcc.target/i386/pr88828-9b.c: Likewise.
-
-2019-05-14  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com\>
-
-	* gcc.target/aarch64/signbitv4sf.c: New test.
-	* gcc.target/aarch64/signbitv2sf.c: New test.
-
-2019-05-13  Jonathan Wakely  <jwakely@redhat.com>
-
-	* g++.dg/cpp0x/Wattributes1.C: Adjust dg-error line number to fix
-	regression, by matching a note on any line.
-	* g++.dg/cpp0x/Wattributes2.C: Add another copy that checks the
-	correct line number is matched without depending on a library header.
-
-2019-05-13  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90402
-	* gcc.dg/torture/pr90402-1.c: New testcase.
-
-2019-05-12  Iain Sandoe  <iain@sandoe.co.uk>
-	    Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR target/82920
-	* gcc.target/i386/indirect-thunk-1.c: Adjust scan-asms for Darwin,
-	do not use -fno-pic on Darwin.
-	* gcc.target/i386/indirect-thunk-2.c: Likewise.
-	* gcc.target/i386/indirect-thunk-3.c: Likewise.
-	* gcc.target/i386/indirect-thunk-4.c: Likewise.
-	* gcc.target/i386/indirect-thunk-7.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-7.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-8.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-7.c: Likewise.
-	* gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
-	* gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
-	* gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
-	* gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
-	* gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
-	* gcc.target/i386/indirect-thunk-register-1.c: Likewise.
-	* gcc.target/i386/indirect-thunk-register-2.c: Likewise.
-	* gcc.target/i386/indirect-thunk-register-3.c: Likewise.
-	* gcc.target/i386/indirect-thunk-register-4.c: Likewise.
-	* gcc.target/i386/ret-thunk-1.c: Likewise.
-	* gcc.target/i386/ret-thunk-10.c: Likewise.
-	* gcc.target/i386/ret-thunk-11.c: Likewise.
-	* gcc.target/i386/ret-thunk-12.c: Likewise.
-	* gcc.target/i386/ret-thunk-13.c: Likewise.
-	* gcc.target/i386/ret-thunk-14.c: Likewise.
-	* gcc.target/i386/ret-thunk-15.c: Likewise.
-	* gcc.target/i386/ret-thunk-16.c: Likewise.
-	* gcc.target/i386/ret-thunk-2.c: Likewise.
-	* gcc.target/i386/ret-thunk-22.c: Likewise.
-	* gcc.target/i386/ret-thunk-23.c: Likewise.
-	* gcc.target/i386/ret-thunk-24.c: Likewise.
-	* gcc.target/i386/ret-thunk-3.c: Likewise.
-	* gcc.target/i386/ret-thunk-4.c: Likewise.
-	* gcc.target/i386/ret-thunk-5.c: Likewise.
-	* gcc.target/i386/ret-thunk-6.c: Likewise.
-	* gcc.target/i386/ret-thunk-7.c: Likewise.
-	* gcc.target/i386/ret-thunk-8.c: Likewise.
-	* gcc.target/i386/ret-thunk-9.c: Likewise.
-
-2019-05-11  Iain Sandoe  <iain@sandoe.co.uk>
-
-	PR testsuite/81058
-	* gcc.target/i386/avx512bw-vpmovswb-1.c: Use regular data section
-	for variables on Darwin, rather than common.
-	* gcc.target/i386/avx512bw-vpmovuswb-1.c: Likewise.
-	* gcc.target/i386/avx512bw-vpmovwb-1.c: Likewise.
-
-2019-05-11  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp2a/multiple-deleted-destroying-delete-error-1.C: New.
-	* g++.dg/cpp2a/multiple-deleted-destroying-delete-error-2.C: Likewise.
-
-2019-05-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/61968
-	* gfortran.dg/assumed_type_10.f90: New test case.
-	* gfortran.dg/assumed_type_11.f90: New test case.
-
-2019-05-10  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.target/x86_64/abi/avx512f/abi-avx512f.exp: Darwin is
-	now tested.
-	* gcc.target/x86_64/abi/avx512f/asm-support-darwin.s: New.
-
-2019-05-10  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/main1.C: New.
-
-2019-05-10  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/78010 - bogus -Wsuggest-override warning on final function.
-	* g++.dg/warn/Wsuggest-override-2.C: New test.
-
-2019-05-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/90385
-	* gfortran.dg/pr90385.f90: New test.
-
-	PR c++/90383
-	* g++.dg/cpp1y/constexpr-90383-1.C: New test.
-	* g++.dg/cpp1y/constexpr-90383-2.C: New test.
-
-2019-05-10  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/90093
-	* gfortran.dg/ISO_Fortran_binding_12.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_12.c: Supplementary code.
-
-	PR fortran/90352
-	* gfortran.dg/iso_c_binding_char_1.f90: New test.
-
-	PR fortran/90355
-	* gfortran.dg/ISO_Fortran_binding_4.f90: Add 'substr' to test
-	the direct passing of substrings as descriptors to bind(C).
-	* gfortran.dg/assign_10.f90: Increase the tree_dump count of
-	'atmp' to account for the setting of the 'span' field.
-	* gfortran.dg/transpose_optimization_2.f90: Ditto.
-
-2019-05-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88709
-	PR tree-optimization/90271
-	* gcc.dg/store_merging_29.c: Allow 4 stores to replace 6 stores on
-	arm*-*-*.
-
-	PR pch/90326
-	* g++.dg/pch/pr90326.C: New test.
-	* g++.dg/pch/pr90326.Hs: New file.
-
-2019-05-10  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/90340
-	* gcc.dg/tree-ssa/pr90340-2.c: New test.
-	* gcc.dg/tree-ssa/pr90340.c: New test.
-
-2019-05-09  Cherry Zhang  <cherryyz@google.com>
-
-	* go.dg/mapstring.go: New test.
-
-2019-05-09  Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/90405
-	* gcc.target/arm/pr90405.c: New test.
-
-2019-05-09  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/gimplefe-39.c: New test.
-
-2019-05-09  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/gimplefe-37.c: New test.
-	* gcc.dg/gimplefe-33.c: Likewise.
-
-2019-05-09  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/90382
-	Revert:
-	2018-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/trailing1.C: New.
-
-2019-05-09  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90395
-	* gcc.dg/torture/pr90395.c: New testcase.
-
-2019-05-08  Cherry Zhang  <cherryyz@google.com>
-
-	* go.dg/cmpstring.go: New test.
-
-2019-05-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/59813
-	PR tree-optimization/89060
-	* gcc.dg/tree-ssa/pr89060.c: New test.
-
-2019-05-08  Mihail Ionescu  <mihail.ionescu@arm.com>
-	    Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/88167
-	* gcc.target/arm/pr88167-1.c: New test.
-	* gcc.target/arm/pr88167-2.c: New test.
-
-2018-05-08  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/90078
-	* g++.dg/tree-ssa/pr90078.C: New test.
-
-2018-05-08  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/90240
-	* gfortran.dg/graphite/pr90240.f: New test.
-
-2019-05-08  Li Jia He  <helijia@linux.ibm.com>
-
-	PR other/90381
-	* gcc.dg/tree-ssa/pr88676-2.c: Add 'target le' option to limit the
-	test case to run on the little endian machine.
-
-2019-05-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/90356
-	* gcc.dg/tree-ssa/pr90356-1.c: New test.
-	* gcc.dg/tree-ssa/pr90356-2.c: New test.
-	* gcc.dg/tree-ssa/pr90356-3.c: New test.
-	* gcc.dg/tree-ssa/pr90356-4.c: New test.
-
-2019-05-07  Wei Xiao  <wei3.xiao@intel.com>
-
-	* gcc.target/i386/avx512bf16-vcvtne2ps2bf16-1.c: New test.
-	* gcc.target/i386/avx512bf16-vcvtneps2bf16-1.c: New test.
-	* gcc.target/i386/avx512bf16-vdpbf16ps-1.c: New test.
-	* gcc.target/i386/avx512bf16vl-vcvtne2ps2bf16-1.c: New test.
-	* gcc.target/i386/avx512bf16vl-vcvtneps2bf16-1.c: New test.
-	* gcc.target/i386/avx512bf16vl-vdpbf16ps-1.c: New test.
-	* gcc.target/i386/builtin_target.c: Handle avx512bf16.
-	* gcc.target/i386/sse-12.c: Add -mavx512bf16.
-	* gcc.target/i386/sse-13.c: Ditto.
-	* gcc.target/i386/sse-14.c: Ditto.
-	* gcc.target/i386/sse-22.c: Ditto.
-	* gcc.target/i386/sse-23.c: Ditto.
-	* g++.dg/other/i386-2.C: Ditto.
-	* g++.dg/other/i386-3.C: Ditto.
-
-2019-05-07  Cherry Zhang  <cherryyz@google.com>
-
-	* go.dg/arrayclear.go: New test.
-	* go.dg/mapclear.go: New test.
-
-2019-05-07  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	PR target/89765
-	* gcc.target/powerpc/pr89765-mc.c: New test.
-	* gcc.target/powerpc/vsx-builtin-10c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-10d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-11c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-11d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-12c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-12d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-13c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-13d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-14c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-14d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-15c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-15d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-16c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-16d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-17c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-17d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-18c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-18d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-19c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-19d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-20c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-20d.c: New test.
-	* gcc.target/powerpc/vsx-builtin-9c.c: New test.
-	* gcc.target/powerpc/vsx-builtin-9d.c: New test.
-
-2019-05-07  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-
-	* gcc.target/aarch64/sve/sad_1.c: New test for sum of absolute
-	differences.
-
-2019-05-07  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/asm-7.c: New test.
-	* gcc.target/i386/asm-1.c: Update expected error string.
-	* gcc.target/i386/pr62120.c: Ditto.
-
-2019-05-07  Li Jia He  <helijia@linux.ibm.com>
-
-	* gcc.dg/tree-ssa/pr37508.c: Add the no-ssa-phiopt option to skip phi
-	optimization.
-	* gcc.dg/tree-ssa/pr88676-2.c: New testcase.
-
-2019-05-06  H.J. Lu  <hongjiu.lu@intel.com>
-	    Hongtao Liu  <hongtao.liu@intel.com>
-
-	PR target/89750
-	PR target/86444
-	* gcc.target/i386/avx512f-vcomisd-2.c: New.
-	* gcc.target/i386/avx512f-vcomisd-2.c: Likewise.
-
-2019-05-06  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/90290
-	* gfortran.dg/pr90290.f90: New test.
-
-2019-05-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88709
-	PR tree-optimization/90271
-	* gcc.dg/store_merging_26.c: New test.
-	* gcc.dg/store_merging_27.c: New test.
-	* gcc.dg/store_merging_28.c: New test.
-	* gcc.dg/store_merging_29.c: New test.
-
-2019-05-06  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	PR target/89424
-	* gcc.target/powerpc/pr89424-0.c: New test.
-	* gcc.target/powerpc/vsx-builtin-13a.c: Define macro PR89424 to
-	enable testing of newly patched capability.
-	* gcc.target/powerpc/vsx-builtin-13b.c: Likewise.
-	* gcc.target/powerpc/vsx-builtin-20a.c: Likewise.
-	* gcc.target/powerpc/vsx-builtin-20b.c: Likewise.
-
-2019-05-06  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90265 - ICE with generic lambda.
-	* g++.dg/cpp1y/lambda-generic-90265.C: New test.
-
-2019-05-06  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90358
-	* gcc.target/i386/pr90358.c: New testcase.
-
-2019-05-06  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88828
-	* gcc.target/i386/pr88828-0.c: New testcase.
-
-2019-05-06  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90328
-	* gcc.dg/torture/pr90328.c: New testcase.
-
-2019-05-06  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/90331
-	* gcc.dg/pr87314-1.c: Align the substring to open up
-	string merging for targets aligning strings to 8 bytes.
-
-2019-05-06  Martin Liska  <mliska@suse.cz>
-
-	PR sanitizer/90312
-	* gcc.dg/asan/pr87930.c: Run the test only on *linux or *gnu
-	systems.
-	* gcc.dg/tsan/pr88017.c: Likewise.
-
-2019-05-05  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/90344
-	* gfortran.dg/pr90344.f90: New test
-
-2019-05-03  Marc Glisse  <marc.glisse@inria.fr>
-
-	PR tree-optimization/90269
-	* g++.dg/tree-ssa/ldist-1.C: New file.
-
-2019-05-03  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/vect/slp-reduc-sad-2.c: New testcase.
-
-2019-05-03  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89518
-	* gcc.dg/pr89518.c: New testcase.
-
-2019-05-03  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/87314
-	* gcc.dg/pr87314-1.c: New testcase.
-
-2019-05-03  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88963
-	* gcc.dg/tree-ssa/ssa-fre-31.c: Disable forwprop.
-	* gcc.target/i386/pr88963-1.c: New testcase.
-	* gcc.target/i386/pr88963-2.c: Likewise.
-
-2019-05-03  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR target/88809
-	* gcc.target/i386/pr88809.c: Adjust for darwin.
-	* gcc.target/i386/pr88809-2.c: Adjust for i386 and darwin.
-
-2019-05-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/90303
-	* g++.target/i386/pr90303.C: New test.
-
-2019-05-03  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89698
-	* g++.dg/tree-ssa/pr89698.C: New testcase.
-
-2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* g++.dg/ext/instantiate2.C: Remove special-casing for Darwin.
-
-2019-05-02  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89653
-	* g++.dg/vect/pr89653.cc: New testcase.
-
-2019-05-02  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89509
-	* gcc.dg/torture/restrict-8.c: New testcase.
-
-2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/tree-prof/section-attr-1.c: Update scan-asm regex
-	for cold section label.
-	* gcc.dg/tree-prof/section-attr-2.c: Likewise.
-	* gcc.dg/tree-prof/section-attr-3.c: Likewise.
-
-2019-05-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.target/i386/spellcheck-options-5.c: Restrict to Linux and
-	GNU targets.
-
-2019-05-02  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-
-	* gcc.target/aarch64/sve/dot_1.c: New test for dot product.
-
-2019-05-02  Martin Liska  <mliska@suse.cz>
-
-	* gcc.target/i386/funcspec-4.c: Update scanned pattern.
-	* g++.target/i386/pr57362.C: Likewise.
-
-2019-05-02  Martin Liska  <mliska@suse.cz>
-
-	PR target/88809
-	* gcc.target/i386/pr88809.c: New test.
-	* gcc.target/i386/pr88809-2.c: New test.
-
-2019-05-01  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR fortran/60144
-	* gfortran.dg/block_name_2.f90: Adjust dg-error.
-	* gfortran.dg/dec_type_print_3.f90.f90: Likewise.
-	* gfortran.dg/pr60144.f90: New test.
-
-2019-05-01  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/90037
-	* g++.dg/tree-ssa/pr88797.C: New test.
-
-2019-05-01  Nathan Sidwell  <nathan@acm.org>
-
-	* g++.dg/cpp0x/decltype9.C: Adjust expected diagnostics.
-
-2019-04-30  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89093
-	* gcc.target/aarch64/return_address_sign_3.c: Remove extra space in
-	target attribute.
-
-2019-04-30  Giuliano Belinassi  <giuliano.belinassi@usp.br>
-
-	* gcc.dg/sinhatanh-2.c: Count the number of functions.
-	* gcc.dg/sinhatanh-3.c: Likewise.
-
-2019-04-30  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/Werror-13.c: Add new tests for it.
-	* gcc.dg/pragma-diag-6.c: Likewise.
-
-2019-04-30  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89093
-	* gcc.target/aarch64/pr89093.c: New test.
-	* gcc.target/aarch64/pr63304_1.c: Remove space from target string.
-
-	PR tree-optimization/89475
-	* gcc.dg/tree-ssa/pr89475.c: New test.
-
-2019-04-30  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/90240
-	Revert:
-	2019-04-23  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/90078
-	* g++.dg/tree-ssa/pr90078.C: New test.
-
-2019-04-29  Vladislav Ivanishin  <vlad@ispras.ru>
-
-	* gcc.dg/uninit-25-gimple.c: New test.
-	* gcc.dg/uninit-25.c: New test.
-	* gcc.dg/uninit-26.c: New test.
-	* gcc.dg/uninit-27-gimple.c: New test.
-
-2019-04-29  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90278
-	* gcc.dg/torture/pr90278.c: New testcase.
-
-2019-04-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/90173
-	* g++.dg/cpp1z/class-deduction66.C: Use dg-do compile instead of
-	dg-do run.
-
-2019-04-27  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/89261
-	* gcc.target/i386/pr89261.c: New test.
-
-2019-04-27  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/90258
-	* gcc.dg/completion-5.c: New test.
-	* gcc.target/i386/spellcheck-options-5.c: New test.
-
-2019-04-26  Jim Wilson  <jimw@sifive.com>
-
-	* gcc.target/riscv/load-immediate.c: New.
-
-2019-04-26  Jonathan Wakely  <jwakely@redhat.com>
-
-	PR c++/90243
-	* g++.dg/diagnostic/pr90243.C: New test.
-
-2019-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/90173
-	* g++.dg/cpp1z/class-deduction66.C: New.
-
-2019-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/trailing1.C: New.
-
-2019-04-26  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.dg/alias-16.c: New test.
-
-2019-04-25  Martin Liska  <mliska@suse.cz>
-	    H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89929
-	* g++.target/i386/mv28.C: New test.
-	* gcc.target/i386/mvc14.c: Likewise.
-	* g++.target/i386/pr57362.C: Updated.
-
-2019-04-24  Jeff Law  <law@redhat.com>
-
-	PR tree-optimization/90037
-	* gcc.dg/tree-ssa/20030710-1.c: Update dump file to scan.
-	* gcc.dg/isolate-2.c: Likewise.
-	* gcc.dg/isolate-4.c: Likewise.
-	* gcc.dg/pr19431.c: Accept either ordering of PHI args.
-	* gcc.dg/pr90037.c: New test.
-
-2019-04-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/44648
-	* g++.dg/warn/Wunused-var-35.C: Remove xfail.
-
-2019-04-25  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/90194
-	* g++.dg/torture/pr90194.C: New testcase.
-
-2019-04-24  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90236
-	* g++.dg/cpp1z/nontype-auto16.C: New test.
-
-2019-04-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/90193
-	* gcc.target/i386/pr90193.c: New test.
-
-2019-04-24  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	PR target/89952
-	* gcc.target/s390/pr89952.c: New test.
-
-2019-04-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/90187
-	* g++.target/i386/pr90187.C: New test.
-
-2019-04-24  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.test/README.gcc: New file.
-
-2019-04-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/90208
-	* gcc.dg/tsan/pr90208-1.c: New test.
-	* gcc.dg/tsan/pr90208-2.c: New test.
-
-	PR tree-optimization/90211
-	* gcc.dg/autopar/pr90211.c: New test.
-
-2019-04-23  Iain Buclaw  <ibuclaw@gdcproject.org>
-	    Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gdc.dg/link.d: Test if target d_runtime.
-	* gdc.dg/runnable.d: Fix tests to work on BigEndian.
-	* gdc.dg/simd.d: Likewise.
-
-2019-04-23  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.test/fail_compilation/fail2456.d: New test.
-	* gdc.test/fail_compilation/test18312.d: New test.
-	* gdc.test/gdc-test.exp (gdc-convert-args): Handle -betterC.
-
-2018-04-23  Sudakshina Das  <sudi.das@arm.com>
-
-	* gcc.target/aarch64/bti-1.c: Add scan directive for gnu note section
-	for linux targets.
-	* gcc.target/aarch64/va_arg_1.c: Update scan directive to not clash
-	with GNU note section.
-
-2019-04-23  Jeff Law  <law@redhat.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_keeps_null_pointer_checks): Add cr16.
-
-2019-04-23  Roman Zhuykov  <zhroma@ispras.ru>
-
-	PR rtl-optimization/87979
-	* gcc.dg/pr87979.c: New test.
-
-2019-04-23  Roman Zhuykov  <zhroma@ispras.ru>
-
-	PR rtl-optimization/84032
-	* gcc.dg/pr84032.c: New test.
-
-2018-04-23  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/90078
-	* g++.dg/tree-ssa/pr90078.C: New test.
-
-2018-04-23  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/90021
-	* gfortran.dg/pr90021.f90: New test.
-
-2019-04-22  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/90166
-	* gfortran.dg/submodule_22.f08: Add additional dg-error comments.
-
-2019-04-22  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/57284
-	* gfortran.dg/class_70.f03
-
-2019-04-21  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/90178
-	* gcc.target/i386/pr90178.c: New test.
-
-2019-04-20  Sandra Loosemore  <sandra@codesourcery.com>
-
-	* g++.dg/ipa/pr89009.C: Add dg-require-effective-target fpic.
-
-2019-04-19  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/89900
-	* g++.dg/cpp0x/pr89900-1.C: New.
-	* g++.dg/cpp0x/pr89900-2.C: Likewise.
-	* g++.dg/cpp0x/pr89900-3.C: Likewise.
-	* g++.dg/cpp0x/pr89900-4.C: Likewise.
-
-2019-04-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/90139
-	* gcc.c-torture/compile/pr90139.c: New test.
-
-	PR c++/90138
-	* g++.dg/template/pr90138.C: New test.
-
-	PR c/89888
-	* c-c++-common/pr89888.c: New test.
-	* g++.dg/torture/pr40335.C: Change dg-bogus into dg-warning.
-	Don't expect -Wswitch-unreachable warning.
-
-	PR c++/90108
-	* c-c++-common/pr90108.c: New test.
-
-2019-04-18  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR middle-end/85164
-	* gcc.dg/pr85164-1.c, gcc.dg/pr85164-2.c: New tests.
-
-2019-04-18  Richard Biener  <rguenther@suse.de>
-
-	PR debug/90131
-	* gcc.dg/guality/pr90131.c: New testcase.
-
-2019-04-17  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89325
-	* g++.dg/ext/attrib58.C: New test.
-	* g++.dg/ext/attrib59.C: New test.
-	* g++.dg/ext/attrib60.C: New test.
-
-	PR target/90125
-	* gcc.target/i386/avx512f-vfmsubXXXss-2.c (avx512f_test): Adjust
-	constants to ensure precise result even when not using fma.
-	* gcc.target/i386/avx512f-vfnmaddXXXss-2.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfmaddXXXsd-3.c: New test.
-	* gcc.target/i386/avx512f-vfmaddXXXss-3.c: New test.
-	* gcc.target/i386/avx512f-vfmsubXXXsd-3.c: New test.
-	* gcc.target/i386/avx512f-vfmsubXXXss-3.c: New test.
-	* gcc.target/i386/avx512f-vfnmaddXXXsd-3.c: New test.
-	* gcc.target/i386/avx512f-vfnmaddXXXss-3.c: New test.
-	* gcc.target/i386/avx512f-vfnmsubXXXsd-3.c: New test.
-	* gcc.target/i386/avx512f-vfnmsubXXXss-3.c: New test.
-
-2019-04-17  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/90124 - bogus error with incomplete type in decltype.
-	* g++.dg/cpp0x/decltype70.C: New test.
-
-2019-04-17  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/90095
-	* gcc.dg/pr90095-1.c: New test.
-	* gcc.dg/pr90095-2.c: New test.
-
-2019-04-17  Thomas Schwinge  <thomas@codesourcery.com>
-
-	PR fortran/90048
-	* gfortran.dg/goacc/private-explicit-kernels-1.f95: New file.
-	* gfortran.dg/goacc/private-explicit-parallel-1.f95: Likewise.
-	* gfortran.dg/goacc/private-explicit-routine-1.f95: Likewise.
-
-	PR fortran/90067
-	PR fortran/90114
-	* gfortran.dg/goacc/private-1.f95: Remove file.
-	* gfortran.dg/goacc/private-2.f95: Likewise.
-	* gfortran.dg/goacc/private-predetermined-kernels-1.f95: New file.
-	* gfortran.dg/goacc/private-predetermined-parallel-1.f95:
-	Likewise.
-	* gfortran.dg/goacc/private-predetermined-routine-1.f95: Likewise.
-
-2019-04-17  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89093
-	* gcc.target/arm/pr89093-2.c: New test.
-
-2019-04-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/86953
-	* g++.dg/cpp0x/constexpr-86953.C: New test.
-
-2019-04-16  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	* g++.dg/lto/pr89358_0.C: Replace dg-* with dg-lto-*.
-
-2019-04-16  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR debug/89528
-	* gcc.dg/guality/pr89528.c: New.
-
-	PR rtl-optimization/86438
-	* gcc.dg/torture/pr86438.c: Split up too-wide shift.
-
-2019-04-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/90096
-	* gcc.target/i386/pr90096.c: New test.
-	* gcc.target/i386/pr69255-1.c: Adjust expected diagnostics.
-	* gcc.target/i386/pr69255-2.c: Likewise.
-	* gcc.target/i386/pr69255-3.c: Likewise.
-
-	PR rtl-optimization/90082
-	* gcc.dg/pr90082.c: New test.
-
-	PR tree-optimization/90090
-	* g++.dg/opt/pr90090.C: New test.
-
-2019-04-16  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/56049
-	* gfortran.dg/pr56049.f90: New testcase.
-
-2019-04-15  Richard Biener  <rguenther@suse.de>
-
-	PR debug/90074
-	* gcc.dg/guality/pr90074.c: New testcase.
-
-2019-04-15  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90071
-	* gcc.dg/torture/pr90071.c: New testcase.
-
-2019-04-15  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	PR rtl-optimization/89794
-	* gcc.dg/torture/pr89794.c: New testcase.
-
-2019-04-15  Richard Biener  <rguenther@suse.de>
-
-	PR ipa/88936
-	* gcc.dg/torture/pr88936-1.c: New testcase.
-	* gcc.dg/torture/pr88936-2.c: Likewise.
-	* gcc.dg/torture/pr88936-3.c: Likewise.
-
-2019-04-15  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/pr89693
-	* g++.dg/ipa/pr89693.C: New test.
-
-2019-04-15  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR tree-optimization/90020
-	* gcc.dg/torture/pr90020.c: Add linker options for darwin.
-
-2019-04-14  Jan Hubicka  <hubicka@ucw.cz>
-
-	PR lto/89358
-	* g++.dg/lto/pr89358_0.C: New testcase.
-	* g++.dg/lto/pr89358_1.C: New testcase.
-
-2019-04-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/85448
-	* gfortran.dg/bind_c_usage_33.f90: New test and...
-	* gfortran.dg/bind_c_usage_33_c.c: Additional source.
-
-2019-04-14  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/89843
-	* gfortran.dg/ISO_Fortran_binding_4.f90: Modify the value of x
-	in ctg. Test the conversion of the descriptor types in the main
-	program.
-	* gfortran.dg/ISO_Fortran_binding_10.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_10.c: Called by it.
-
-	PR fortran/89846
-	* gfortran.dg/ISO_Fortran_binding_11.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_11.c: Called by it.
-
-	PR fortran/90022
-	* gfortran.dg/ISO_Fortran_binding_1.c: Correct the indexing for
-	the computation of 'ans'. Also, change the expected results for
-	CFI_is_contiguous to comply with standard.
-	* gfortran.dg/ISO_Fortran_binding_1.f90: Correct the expected
-	results for CFI_is_contiguous to comply with standard.
-	* gfortran.dg/ISO_Fortran_binding_9.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_9.c: Called by it.
-
-2019-04-13  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89093
-	* gcc.target/arm/pr89093.c: New test.
-
-2019-04-12  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89933
-	* c-c++-common/pr89933.c: New test.
-
-2019-04-12  Martin Sebor  <msebor@redhat.com>
-
-	PR c/88383
-	PR c/89288
-	PR c/89798
-	PR c/89797
-	* c-c++-common/attributes-1.c: Adjust.
-	* c-c++-common/builtin-has-attribute-4.c: Adjust expectations.
-	* c-c++-common/builtin-has-attribute-6.c: New test.
-	* c-c++-common/builtin-has-attribute-7.c: New test.
-	* c-c++-common/pr71574.c: Adjust.
-	* gcc.dg/pr25559.c: Adjust.
-	* gcc.dg/attr-vector_size.c: New test.
-
-2019-04-12  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89965
-	* gcc.target/i386/pr89965.c: New test.
-
-2019-04-12  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87603 - constexpr functions are no longer noexcept.
-	* g++.dg/cpp0x/constexpr-noexcept.C: Adjust the expected result.
-	* g++.dg/cpp0x/constexpr-noexcept3.C: Likewise.
-	* g++.dg/cpp0x/constexpr-noexcept4.C: Likewise.
-	* g++.dg/cpp0x/constexpr-noexcept8.C: New test.
-	* g++.dg/cpp0x/inh-ctor32.C: Remove dg-message.
-	* g++.dg/cpp1y/constexpr-noexcept1.C: New test.
-
-2019-04-12  Marek Polacek  <polacek@redhat.com>
-
-	* g++.dg/cpp0x/noexcept30.C: Tweak dg-error.
-	* g++.dg/cpp0x/pr86397-1.C: Likewise.
-	* g++.dg/cpp0x/pr86397-2.C: Likewise.
-
-2019-04-12  Matthew Malcomson  <matthew.malcomson@arm.com>
-
-	* g++.target/arm/arm.exp: Change format of default prune regex.
-	* gcc.target/arm/arm.exp: Change format of default prune regex.
-
-2019-04-12  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/89970
-	* gcc.target/i386/mvc15.c: New test.
-	* gcc.target/i386/mvc3.c: Quote target in error pattern.
-	* gcc.target/i386/mvc4.c: Remove duplicit 'default'.
-
-2019-04-12  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	PR target/87532
-	* gcc.target/powerpc/fold-vec-extract-char.p8.c: Adjust expected
-	instruction counts.
-	* gcc.target/powerpc/fold-vec-extract-int.p8.c: Likewise.
-	* gcc.target/powerpc/fold-vec-extract-short.p8.c: Likewise.
-
-2019-04-12  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89946
-	* c-c++-common/pr89946.c: New test.
-
-	PR rtl-optimization/90026
-	* g++.dg/opt/pr90026.C: New test.
-
-2018-04-11  Steve Ellcey  <sellcey@marvell.com>
-
-	PR rtl-optimization/87763
-	* gcc.target/aarch64/combine_bfxil.c: Change some bfxil checks
-	to bfi.
-
-2019-04-11  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90020
-	* gcc.dg/torture/pr90020.c: New testcase.
-
-2019-04-11  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90018
-	* gcc.dg/vect/pr90018.c: New testcase.
-
-2018-04-10  Steve Ellcey  <sellcey@marvell.com>
-
-	PR rtl-optimization/87763
-	* gcc.target/aarch64/combine_bfxil.c: Change some bfxil checks
-	to bfi.
-	* gcc.target/aarch64/combine_bfi_2.c: New test.
-
-2019-04-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/90025
-	* gcc.c-torture/execute/pr90025.c: New test.
-
-	PR c++/90010
-	* gcc.dg/pr90010.c: New test.
-
-2019-04-09  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/ifcvt-onecmpl-abs-1.c
-	(dg-options): Use -O2 -fdump-rtl-ce1.
-	(dg-final): Scan ce1 RTL dump instead of asm dump.
-
-2019-04-09  Matthew Malcomson  <matthew.malcomson@arm.com>
-
-	PR target/90024
-	* gcc.dg/torture/neon-immediate-timode.c: New test.
-
-2019-04-09  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89998
-	* gcc.c-torture/compile/pr89998-1.c: New test.
-	* gcc.c-torture/compile/pr89998-2.c: New test.
-
-	PR target/90015
-	* gcc.target/riscv/interrupt-conflict-mode.c (foo): Adjust expected
-	diagnostics.
-
-2019-04-08  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/90006
-	* gcc.dg/vect/bb-slp-pr90006.c: New testcase.
-
-2019-04-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89865
-	* gcc.target/i386/pr49095.c: Don't expect any RMW sequences.
-
-	PR rtl-optimization/89865
-	* gcc.target/i386/pr49095.c: Adjust number of expected RMW spots
-	on ia32.
-
-2019-04-01  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/89725
-	* gcc.dg/tree-ssa/pr89725.c: New test.
-
-2019-04-08  Martin Liska  <mliska@suse.cz>
-
-	* gcc.target/riscv/arch-1.c: Fix expected scanned pattern.
-
-2019-04-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/89914
-	* g++.dg/ext/has_nothrow_constructor-3.C: New.
-
-2019-04-07  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/89945
-	* gcc.target/i386/pr89945.c: New test.
-
-2019-04-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/87352
-	* gfortran.dg/finalize_28.f90: Adjust count of __builtin_free.
-	* gfortran.dg/finalize_33.f90: Likewise.
-	* gfortran.dg/finalize_34.f90: New test.
-
-2019-04-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/89981
-	* gfortran.dg/entry_22.f90: New test.
-
-2019-04-05  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87145 - bogus error converting class type in template arg list.
-	* g++.dg/cpp0x/constexpr-conv3.C: New test.
-	* g++.dg/cpp0x/constexpr-conv4.C: New test.
-
-2019-04-05  Martin Sebor  <msebor@redhat.com>
-
-	PR bootstrap/89980
-	* g++.dg/init/array52.C: New test.
-
-2019-04-05  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c/89985
-	* c-c++-common/pr89985.c: New test.
-
-2019-04-05  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	PR c/71598
-	* gcc.dg/torture/pr71598-1.c: dg-prune arm linker messages about
-	size of enums.
-	* gcc.dg/torture/pr71598-2.c: Likewise.
-
-2019-04-05  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89973 - -Waddress-of-packed-member ICE with invalid conversion.
-	* g++.dg/warn/Waddress-of-packed-member2.C: New test.
-
-2019-04-05  Richard Biener  <rguenther@suse.de>
-
-	PR debug/89892
-	PR debug/89905
-	* gcc.dg/guality/pr89892.c: New testcase.
-	* gcc.dg/guality/pr89905.c: Likewise.
-	* gcc.dg/guality/loop-1.c: Likewise.
-
-2019-04-05  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR tree-optimization/89956
-	* gfortran.dg/pr89956.f90: New test.
-
-2019-04-04  Martin Sebor  <msebor@redhat.com>
-
-	PR c++/89974
-	PR c++/89878
-	PR c++/89833
-	PR c++/47488
-	* g++.dg/abi/mangle69.C: New test.
-	* g++.dg/abi/mangle70.C: New test.
-	* g++.dg/abi/mangle71.C: New test.
-	* g++.dg/abi/mangle72.C: New test.
-	* g++.dg/cpp0x/constexpr-array19.C: New test.
-	* g++.dg/cpp2a/nontype-class15.C: New test.
-	* g++.dg/cpp2a/nontype-class16.C: New test.
-	* g++.dg/init/array51.C: New test.
-	* g++.dg/template/nontype29.C: New test.
-
-2019-04-04  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/89957
-	PR middle-end/89911
-	* gcc.dg/Wstringop-overflow-13.c: New test.
-
-2019-04-04  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/89934
-	* gcc.dg/Wrestrict-19.c: New test.
-	* gcc.dg/Wrestrict-5.c: Add comment.  Remove unused code.
-
-2019-04-04  Jeff Law  <law@redhat.com>
-
-	PR rtl-optimization/89399
-	* gcc.c-torture/compile/pr89399.c: New test.
-
-2019-04-04  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89904
-	* gfortran.dg/pr85797.f90: Adjust testcase.
-
-2019-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/65619
-	* g++.dg/template/friend67.C: New.
-
-2019-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/61327
-	* g++.dg/cpp0x/friend4.C: New.
-	* g++.dg/cpp0x/friend5.C: Likewise.
-
-2019-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/56643
-	* g++.dg/cpp0x/noexcept40.C: New.
-
-2019-04-03  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR fortran/68567
-	* gfortran.dg/parameter_array_error_1.f90: New test.
-
-2019-04-03  qing zhao  <qing.zhao@oracle.com>
-
-	PR tree-optimization/89730
-	* gcc.dg/live-patching-4.c: New test.
-
-2019-04-03  Clément Chigot  <clement.chigot@atos.net>
-
-	* lib/go-torture.exp: Only add lto to TORTURE_OPTIONS if it is
-	supported.
-
-2019-04-03  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	PR c/71598
-	* gcc.dg/torture/pr71598-1.c: Skip if short_enums target.
-	* gcc.dg/torture/pr71598-2.c: Skip if not short_enums target.
-
-2019-04-03  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/84101
-	* gcc.target/i386/pr84101.c: New testcase.
-
-2019-04-02  Jeff Law  <law@redhat.com>
-
-	* gcc.target/visium/bit_shift.c: xfail.
-
-2019-04-02  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/89902
-	PR target/89903
-	* gcc.target/i386/pr70799-4.c: Remove.
-	* gcc.target/i386/pr70799-5.c: Remove.
-	* gcc.target/i386/pr89902.c: New test.
-	* gcc.target/i386/pr89903.c: Ditto.
-
-2019-04-02  Andrey Belevantsev  <abel@ispras.ru>
-
-	PR rtl-optimization/84206
-	* gcc.dg/pr84206.c: New test.
-
-2019-04-02  Andrey Belevantsev  <abel@ispras.ru>
-
-	PR rtl-optimization/85876
-	* gcc.dg/pr85876.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-double-compile.c: New test.
-	* gcc.target/s390/zvector/vec-float-compile.c: New test.
-	* gcc.target/s390/zvector/vec-signed-compile.c: New test.
-	* gcc.target/s390/zvector/vec-unsigned-compile.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-search-string-cc-1.c: New test.
-	* gcc.target/s390/zvector/vec-search-string-cc-compile.c: New test.
-	* gcc.target/s390/zvector/vec-search-string-until-zero-cc-1.c: New test.
-	* gcc.target/s390/zvector/vec-search-string-until-zero-cc-compile.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-shift-left-double-by-bit-1.c: New test.
-	* gcc.target/s390/zvector/vec-shift-right-double-by-bit-1.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/replicate-bswap-1.c: New test.
-	* gcc.target/s390/zvector/replicate-bswap-2.c: New test.
-
-2019-04-02  Alexander Monakov  <amonakov@ispras.ru>
-
-	PR testsuite/89916
-	* gcc.dg/pr86928.c: Do not attempt to add -m32.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/bswap-and-replicate-1.c: New test.
-	* gcc.target/s390/zvector/get-element-bswap-1.c: New test.
-	* gcc.target/s390/zvector/get-element-bswap-2.c: New test.
-	* gcc.target/s390/zvector/get-element-bswap-3.c: New test.
-	* gcc.target/s390/zvector/get-element-bswap-4.c: New test.
-	* gcc.target/s390/zvector/set-element-bswap-1.c: New test.
-	* gcc.target/s390/zvector/set-element-bswap-2.c: New test.
-	* gcc.target/s390/zvector/set-element-bswap-3.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-reve-load-byte-z14.c: New test.
-	* gcc.target/s390/zvector/vec-reve-load-byte.c: New test.
-	* gcc.target/s390/zvector/vec-reve-load-halfword-z14.c: New test.
-	* gcc.target/s390/zvector/vec-reve-load-halfword.c: New test.
-	* gcc.target/s390/zvector/vec-reve-store-byte-z14.c: New test.
-	* gcc.target/s390/zvector/vec-reve-store-byte.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-revb-load-double-z14.c: New test.
-	* gcc.target/s390/zvector/vec-revb-load-double.c: New test.
-	* gcc.target/s390/zvector/vec-revb-store-double-z14.c: New test.
-	* gcc.target/s390/zvector/vec-revb-store-double.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/arch13/fp-signedint-convert-1.c: New test.
-	* gcc.target/s390/arch13/fp-unsignedint-convert-1.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/arch13/sel-1.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/arch13/popcount-1.c: New test.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/arch13/bitops-1.c: New test.
-	* gcc.target/s390/arch13/bitops-2.c: New test.
-	* gcc.target/s390/md/andc-splitter-1.c: Add -march=z14 build
-	option and adjust line numbers.
-	* gcc.target/s390/md/andc-splitter-2.c: Likewise.
-
-2019-04-02  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/s390.exp: Run tests in arch13 subdir.
-	* lib/target-supports.exp (check_effective_target_s390_vxe2): New
-	runtime check for the vxe2 hardware feature on IBM Z.
-
-2019-04-01  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR testsuite/89907
-	* lib/target-supports.exp (check_avx2_available): Replace
-	avx_available with avx2_available.
-
-2019-04-01  Andrey Belevantsev  <abel@ispras.ru>
-
-	PR rtl-optimization/85412
-	* gcc.dg/pr85412.c: New test.
-
-2019-04-01  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/62207
-	* g++.dg/template/crash130.C: New.
-	* g++.dg/template/crash131.C: Likewise.
-
-2019-04-01  Martin Sebor  <msebor@redhat.com>
-
-	PR c/89685
-	* gcc.dg/attr-copy-8.c: New test.
-	* g++.dg/ext/attr-copy-2.C: New test.
-
-2019-04-01  Andrey Belevantsev  <abel@ispras.ru>
-
-	PR rtl-optimization/86928
-	* gcc.dg/pr86928.c: New test.
-
-2019-04-01  Andrey Belevantsev  <abel@ispras.ru>
-
-	PR rtl-optimization/87273
-	* gcc.dg/pr87273.c: New test.
-
-2019-04-01  Martin Liska  <mliska@suse.cz>
-
-	PR driver/89861
-	* gcc.dg/spellcheck-options-18.c: New test.
-	* gcc.dg/spellcheck-options-19.c: New test.
-	* gcc.dg/spellcheck-options-20.c: New test.
-	* gcc.dg/spellcheck-options-13.c: Adjust expected output.
-	* gcc.dg/completion-2.c: Add one variant with no argument.
-
-2019-04-01  Richard Biener  <rguenther@suse.de>
-
-	PR c/71598
-	* gcc.dg/torture/pr71598-1.c: New testcase.
-	* gcc.dg/torture/pr71598-2.c: Likewise.
-	* gcc.dg/torture/pr71598-3.c: Likewise.
-
-2019-03-31  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89852 - ICE with C++11 functional cast with { }.
-	* g++.dg/cpp0x/initlist115.C: New test.
-
-2019-03-31  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/83515
-	PR fortran/85797
-	* gfortran.dg/pr85797.f90: New test.
-
-2019-03-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.dg/attr-aligned-3.c: Enable on *-*-solaris2.*.
-
-2019-03-30  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.test/gdc-test.exp (gdc-copy-extra): Append copied files to
-	cleanup_extra_files.
-	(dmd2dg): Copy additional files after test is translated.
-	(gdc-do-test): Remove all copied files after test.
-
-2019-03-30  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/89841
-	* gfortran.dg/ISO_Fortran_binding_1.f90: Change the interfaces
-	for c_deallocate, c_allocate and c_assumed_size so that the
-	attributes of the array arguments are correct and are typed.
-	* gfortran.dg/ISO_Fortran_binding_7.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_7.c: Additional source.
-
-	PR fortran/89842
-	* gfortran.dg/ISO_Fortran_binding_8.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_8.c: Additional source.
-
-2019-03-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/89866
-	* gfortran.dg/pointer_intent_8.f90: New test.
-
-2019-03-29  Jim Wilson  <jimw@sifive.com>
-
-	* gcc.target/riscv/predef-1.c: New.
-	* gcc.target/riscv/predef-2.c: New.
-	* gcc.target/riscv/predef-3.c: New.
-	* gcc.target/riscv/predef-4.c: New.
-	* gcc.target/riscv/predef-5.c: New.
-	* gcc.target/riscv/predef-6.c: New.
-	* gcc.target/riscv/predef-7.c: New.
-	* gcc.target/riscv/predef-8.c: New.
-
-2019-03-29  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89865
-	* gcc.target/i386/pr49095.c: Include in scan-assembler-times patterns
-	the first argument register, so that occassional spills/fills are
-	ignored.
-
-	PR sanitizer/89869
-	* g++.dg/ubsan/vptr-14.C: New test.
-
-	PR c/89872
-	* gcc.dg/tree-ssa/pr89872.c: New test.
-
-2019-03-29  Roman Zhuykov  <zhroma@ispras.ru>
-
-	* gcc.dg/diag-sanity.c: New test.
-
-2019-03-29  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89871
-	* g++.dg/cpp2a/desig14.C: New test.
-
-	PR c++/89876 - ICE with deprecated conversion.
-	* g++.dg/warn/conv5.C: New test.
-
-2019-03-29  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/ipa/ipa-icf-39.c: Prine '***dbgcnt' output.
-	* gcc.dg/pr68766.c: Likewise.
-
-2019-03-29  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/87485
-	* gcc.dg/pr87485.c: New test.
-
-2019-03-28  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89621
-	* gfortran.dg/gomp/pr89621.f90: New test.
-
-2019-03-28  Martin Sebor  <msebor@redhat.com>
-
-	PR c++/66548
-	* g++.dg/cpp0x/decltype-pr66548.C: New test.
-
-	PR c++/81506
-	* g++.dg/cpp0x/decltype-pr81506.C: New test.
-
-2019-03-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89612 - ICE with member friend template with noexcept.
-	* g++.dg/cpp0x/noexcept38.C: New test.
-	* g++.dg/cpp0x/noexcept39.C: New test.
-	* g++.dg/cpp1z/noexcept-type21.C: New test.
-
-2019-03-28  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/89848
-	* gcc.target/i386/pr89848.c: New test.
-
-2019-03-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89836 - bool constant expression and explicit conversions.
-	* g++.dg/cpp2a/explicit15.C: New test.
-
-2019-03-28  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89812
-	* gcc.dg/attr-aligned-3.c: Limit the test to known ELF targets
-	other than AVR.  Add dg-options "".
-
-	PR c++/89785
-	* g++.dg/cpp1y/constexpr-89785-1.C: New test.
-	* g++.dg/cpp1y/constexpr-89785-2.C: New test.
-
-2019-03-27  Janus Weil  <janus@gcc.gnu.org>
-
-	PR fortran/85537
-	* gfortran.dg/dummy_procedure_11.f90: Fix test case.
-	* gfortran.dg/pointer_init_11.f90: New test case.
-
-2019-03-27  Mateusz B  <mateuszb@poczta.onet.pl>
-
-	PR target/85667
-	* gcc.target/i386/pr85667-5.c: New testcase.
-	* gcc.target/i386/pr85667-6.c: New testcase.
-
-2019-03-27  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	PR testsuite/89834
-	* gcc.dg/vect/pr81740-2.c: Require vect_hw_misalign.
-
-2019-03-27  Peter Bergner  <bergner@linux.ibm.com>
-
-	PR rtl-optimization/89313
-	* gcc.dg/pr89313.c: New test.
-
-2019-03-26  Jeff Law  <law@redhat.com>
-
-	PR rtl-optimization/87761
-	PR rtl-optimization/89826
-	* gcc.c-torture/execute/pr89826.c: New test.
-
-2019-03-27  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/torture/20190327-1.c: New testcase.
-
-2019-03-27  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/88247
-	* gfortran.dg/associate_47.f90: New test.
-
-2019-03-27  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89463
-	* gcc.dg/guality/pr89463.c: New testcase.
-
-2019-03-26  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/89827
-	* gcc.target/i386/pr89827.c: New test.
-
-2019-03-26  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* g++.dg/abi/lambda-static-1.C: Handle Solaris as comdat group
-	syntax.
-
-2019-03-26  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/81740
-	* gcc.dg/vect/pr81740-1.c: New testcase.
-	* gcc.dg/vect/pr81740-2.c: Likewise.
-
-2019-03-26  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.test/gdc-test.exp (gdc-do-test): Sort and remove duplicate
-	options in permute args tests.
-
-2019-03-26  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84598
-	* g++.dg/ext/pr84598.C: New.
-
-2019-03-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89796
-	* g++.dg/gomp/pr89796.C: New test.
-	* gcc.dg/gomp/pr89796.c: New test.
-
-2019-03-25  David Malcolm  <dmalcolm@redhat.com>
-
-	PR rtl-optimization/88347
-	PR rtl-optimization/88423
-	* gcc.c-torture/compile/pr88347.c: New test.
-	* gcc.c-torture/compile/pr88423.c: New test.
-
-2019-03-25  Martin Sebor  <msebor@redhat.com>
-
-	PR c/89812
-	* gcc.dg/attr-aligned-3.c: New test.
-
-2019-03-25  Johan Karlsson  <johan.karlsson@enea.com>
-
-	PR debug/86964
-	* gcc.dg/debug/dwarf2/pr86964.c: New testcase.
-
-2019-03-25  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84661
-	PR c++/85013
-	* g++.dg/concepts/pr84661.C: New.
-	* g++.dg/torture/pr85013.C: Likewise.
-
-2019-03-25  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89214 - ICE when initializing aggregates with bases.
-	* g++.dg/cpp1z/aggr-base8.C: New test.
-	* g++.dg/cpp1z/aggr-base9.C: New test.
-
-	PR c++/89705 - ICE with reference binding with conversion function.
-	* g++.dg/cpp0x/rv-conv2.C: New test.
-
-2019-03-25  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89789
-	* gcc.dg/torture/pr89789.c: New testcase.
-
-2019-03-25  Nathan Sidwell  <nathan@acm.org>
-
-	* g++.dg/abi/lambda-static-1.C: New.
-
-2019-03-25  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89802
-	* g++.dg/tree-ssa/pr89802.C: New testcase.
-
-2019-03-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/60702
-	* g++.dg/tls/thread_local11.C: Remove scan-tree-dump-times directives
-	for _ZTH* calls.
-	* g++.dg/tls/thread_local11a.C: New test.
-
-2019-03-25  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89790
-	* g++.dg/pr89790.C: New testcase.
-
-2019-03-24  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/pr82281.c: Compile only for ia32 effective target.
-	(dg-options): Remove -m32. Add -msse2 -mtune=znver1.
-	* gcc.target/i386/pr89676.c: Compile only for ia32 effective target.
-	(dg-options): Remove -m32 and -march=i686. Add -mno-stv.
-
-2019-03-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/78865
-	* gfortran.dg/altreturn_10.f90: New test.
-	* gfortran.dg/whole_file_3.f90: Change dg-warning to dg-error.
-
-2019-03-22  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR rtl-optimization/89676
-	* gcc.target/i386/pr89676.c: New.
-
-2019-03-22  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/60702
-	* g++.dg/tls/thread_local11.C: New test.
-	* g++.dg/tls/thread_local11.h: New test.
-	* g++.dg/tls/thread_local12a.C: New test.
-	* g++.dg/tls/thread_local12b.C: New test.
-	* g++.dg/tls/thread_local12c.C: New test.
-	* g++.dg/tls/thread_local12d.C: New test.
-	* g++.dg/tls/thread_local12e.C: New test.
-	* g++.dg/tls/thread_local12f.C: New test.
-	* g++.dg/tls/thread_local12g.C: New test.
-	* g++.dg/tls/thread_local12h.C: New test.
-	* g++.dg/tls/thread_local12i.C: New test.
-	* g++.dg/tls/thread_local12j.C: New test.
-	* g++.dg/tls/thread_local12k.C: New test.
-	* g++.dg/tls/thread_local12l.C: New test.
-
-	PR c++/87481
-	* g++.dg/cpp1y/constexpr-87481.C: New test.
-
-2019-03-22  Simon Wright  <simon@pushface.org>
-
-	PR ada/89583
-	* gnat.dg/socket2.adb: New.
-
-2019-03-22  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/mmx-psubd-2.c: Test _m_psubd.
-
-2019-03-22  Hongtao Liu  <hongtao.liu@intel.com>
-
-	PR target/89784
-	* gcc.target/i386/avx512f-vfmaddXXXsd-1.c (avx512f_test): Add tests
-	for _mm_mask{,3,z}_*.
-	* gcc.target/i386/avx512f-vfmaddXXXss-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfmsubXXXsd-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfmsubXXXss-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfnmaddXXXsd-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfnmaddXXXss-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfnmsubXXXsd-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfnmsubXXXss-1.c (avx512f_test): Likewise.
-	* gcc.target/i386/avx512f-vfmaddXXXsd-2.c: New test.
-	* gcc.target/i386/avx512f-vfmaddXXXss-2.c: New test.
-	* gcc.target/i386/avx512f-vfmsubXXXsd-2.c: New test.
-	* gcc.target/i386/avx512f-vfmsubXXXss-2.c: New test.
-	* gcc.target/i386/avx512f-vfnmaddXXXsd-2.c: New test.
-	* gcc.target/i386/avx512f-vfnmaddXXXss-2.c: New test.
-	* gcc.target/i386/avx512f-vfnmsubXXXsd-2.c: New test.
-	* gcc.target/i386/avx512f-vfnmsubXXXss-2.c: New test.
-
-2019-03-22  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89784
-	* gcc.target/i386/sse-13.c (__builtin_ia32_vfmaddsd3_mask,
-	__builtin_ia32_vfmaddsd3_mask3, __builtin_ia32_vfmaddsd3_maskz,
-	__builtin_ia32_vfmsubsd3_mask3, __builtin_ia32_vfmaddss3_mask,
-	__builtin_ia32_vfmaddss3_mask3, __builtin_ia32_vfmaddss3_maskz,
-	__builtin_ia32_vfmsubss3_mask3): Define.
-	* gcc.target/i386/sse-23.c (__builtin_ia32_vfmaddsd3_mask,
-	__builtin_ia32_vfmaddsd3_mask3, __builtin_ia32_vfmaddsd3_maskz,
-	__builtin_ia32_vfmsubsd3_mask3, __builtin_ia32_vfmaddss3_mask,
-	__builtin_ia32_vfmaddss3_mask3, __builtin_ia32_vfmaddss3_maskz,
-	__builtin_ia32_vfmsubss3_mask3): Define.
-	* gcc.target/i386/avx-1.c (__builtin_ia32_vfmaddsd3_mask,
-	__builtin_ia32_vfmaddsd3_mask3, __builtin_ia32_vfmaddsd3_maskz,
-	__builtin_ia32_vfmsubsd3_mask3, __builtin_ia32_vfmaddss3_mask,
-	__builtin_ia32_vfmaddss3_mask3, __builtin_ia32_vfmaddss3_maskz,
-	__builtin_ia32_vfmsubss3_mask3): Define.
-	* gcc.target/i386/sse-14.c: Add tests for
-	_mm_mask{,3,z}_f{,n}m{add,sub}_round_s{s,d} builtins.
-	* gcc.target/i386/sse-22.c: Likewise.
-
-2019-03-21  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/89350
-	* gcc.dg/Warray-bounds-40.c: Remove an xfail.
-	* gcc.dg/Wstringop-overflow.c: Xfail overly ambitious tests.
-	* gcc.dg/Wstringop-overflow-11.c: New test.
-	* gcc.dg/Wstringop-overflow-12.c: New test.
-	* gcc.dg/pr89350.c: New test.
-	* gcc.dg/pr40340-1.c: Adjust expected warning.
-	* gcc.dg/pr40340-2.c: Same.
-	* gcc.dg/pr40340-4.c: Same.
-	* gcc.dg/pr40340-5.c: Same.
-
-2019-03-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR lto/89692
-	* g++.dg/other/pr89692.C: New test.
-
-	PR c++/89767
-	* g++.dg/cpp1y/lambda-init18.C: New test.
-	* g++.dg/cpp1y/lambda-init19.C: New test.
-	* g++.dg/cpp1y/pr89767.C: New test.
-
-2019-03-21  Thomas Schwinge  <thomas@codesourcery.com>
-	    Cesar Philippidis  <cesar@codesourcery.com>
-
-	PR fortran/72741
-	* gfortran.dg/goacc/routine-external-level-of-parallelism-1.f: New
-	file.
-	* gfortran.dg/goacc/routine-external-level-of-parallelism-2.f:
-	Likewise.
-
-2019-03-21  Thomas Schwinge  <thomas@codesourcery.com>
-
-	PR fortran/72741
-	* c-c++-common/goacc/routine-3-extern.c: New file.
-	* c-c++-common/goacc/routine-3.c: Adjust.
-	* c-c++-common/goacc/routine-4-extern.c: New file.
-	* c-c++-common/goacc/routine-4.c: Adjust.
-	* gfortran.dg/goacc/routine-module-3.f90: New file.
-
-	PR fortran/89773
-	* gfortran.dg/goacc/pr89773.f90: New file.
-	* gfortran.dg/goacc/pr77765.f90: Adjust.
-	* gfortran.dg/goacc/routine-6.f90: Adjust, and extend.
-
-	PR fortran/72741
-	* gfortran.dg/goacc/routine-module-mod-1.f90: Update.
-
-	PR fortran/72741
-	* gfortran.dg/goacc/routine-module-1.f90: New file.
-	* gfortran.dg/goacc/routine-module-2.f90: Likewise.
-	* gfortran.dg/goacc/routine-module-mod-1.f90: Likewise.
-
-	* gfortran.dg/goacc/goacc.exp (dg-compile-aux-modules): New proc.
-
-	PR fortran/56408
-	* gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
-	(dg-compile-aux-modules): Fix diagnostic.
-	* gfortran.dg/coarray/caf.exp (dg-compile-aux-modules): Likewise.
-	* gfortran.dg/dg.exp (dg-compile-aux-modules): Likewise.
-
-	PR fortran/56408
-	* gfortran.dg/coarray/caf.exp (dg-compile-aux-modules): Workaround
-	missing nexted dg-test call support in dejaGNU 1.4.4.
-
-	PR fortran/29383
-	* gfortran.dg/ieee/ieee.exp (DEFAULT_FFLAGS): Set the same as in
-	other '*.exp' files.
-
-2019-03-21  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89779
-	* gcc.dg/torture/pr89779.c: New testcase.
-
-2019-03-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/78645
-	* g++.dg/cpp0x/constexpr-ice20.C: New.
-
-2019-03-21  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/89571
-	* g++.dg/cpp0x/noexcept37.C: New.
-
-2019-03-21  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/89017
-	* gdc.dg/pr89017.d: New test.
-
-2019-03-20  Janus Weil  <janus@gcc.gnu.org>
-
-	PR fortran/71861
-	* gfortran.dg/interface_abstract_5.f90: New test case.
-
-2019-03-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89775
-	* gcc.target/s390/pr89775-1.c: New test.
-	* gcc.target/s390/pr89775-2.c: New test.
-
-2019-03-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89752
-	* g++.target/aarch64/aarch64.exp: New file.
-	* g++.target/aarch64/pr89752.C: New test.
-
-2019-03-19  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/89688
-	* gcc.dg/strlenopt-61.c: New test.
-	* g++.dg/warn/Wstringop-overflow-2.C: New test.
-
-2019-03-19  Jim Wilson  <jimw@sifive.com>
-
-	PR target/89411
-	* gcc.target/riscv/losum-overflow.c: New test.
-
-2019-03-19  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/89644
-	* gcc.dg/Wstringop-truncation-8.c: New test.
-
-2019-03-19  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/89737
-	* gcc.dg/pr89737.c: New test.
-
-2019-03-19  Jan Hubicka  <hubicka@ucw.cz>
-
-	PR lto/87809
-	PR lto/89335
-	* g++.dg/lto/pr87089_0.C: New testcase.
-	* g++.dg/lto/pr87089_1.C: New testcase.
-	* g++.dg/lto/pr89335_0.C: New testcase.
-
-2019-03-19  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	PR target/89736
-	* gcc.target/powerpc/pr87532-mc.c: Modify dejagnu directives to
-	restrict this test to vsx targets.
-
-2019-03-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89752
-	* g++.dg/ext/asm15.C: Check for particular diagnostic wording.
-	* g++.dg/ext/asm16.C: Likewise.
-	* g++.dg/ext/asm17.C: New test.
-
-2019-03-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* c-c++-common/unroll-7.c: New test.
-
-2019-03-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89726
-	* gcc.target/i386/fpprec-1.c (x): Add 6 new constants.
-	(expect_round, expect_rint, expect_floor, expect_ceil, expect_trunc):
-	Add expected results for them.
-
-	PR c/89734
-	* gcc.dg/pr89734.c: New test.
-
-2019-03-18  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/89720
-	* gcc.dg/Warray-bounds-42.c: New test.
-
-2019-03-19  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR c++/89630
-	* g++.target/i386/pr89630.C: New test.
-
-2019-03-18  Kito Cheng  <kito.cheng@gmail.com>
-
-	* gcc.target/riscv/arch-1.c: Add quotes around march in dg-error.
-
-2019-03-18  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/bswap16.c: Use a pointer instead of a global for
-	the "store" test as well.
-	* gcc.target/powerpc/bswap32.c: Ditto.
-
-2019-03-18  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/bswap16.c: Use a pointer instead of a global for
-	the "store" test as well.
-	* gcc.target/powerpc/bswap32.c: Ditto.
-
-2019-03-18  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/pr18096-1.c: Allow an error message that says
-	"exceeds" instead of just one that talks about "too large".
-
-2019-03-18  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc.target/aarch64/sve/cost_model_1.c: New test.
-
-2019-03-18  Martin Jambor  <mjambor@suse.cz>
-
-	PR tree-optimization/89546
-	* gcc.dg/tree-ssa/pr89546.c: New test.
-
-2019-03-18  Andrew Burgess  <andrew.burgess@embecosm.com>
-
-	PR target/89627
-	* g++.target/riscv/call-with-empty-struct-float.C: New file.
-	* g++.target/riscv/call-with-empty-struct-int.C: New file.
-	* g++.target/riscv/call-with-empty-struct.H: New file.
-	* g++.target/riscv/riscv.exp: New file.
-
-2019-03-18  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/85014
-	* g++.dg/cpp0x/pr85014.C: New.
-
-2019-03-18  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/86979
-	* gcc.dg/pr86979.c: New test.
-
-2019-03-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/88008
-	* gfortran.dg/typebound_call_31.f90: New test.
-
-2019-03-03-17  John David Anglin  <danglin@gcc.gnu.org>
-
-	* gcc.dg/compat/pr83487-1_x.c: Use -fno-common option on
-	hppa*-*-hpux*.
-	* gcc.dg/compat/pr83487-1_y.c: Likewise.
-
-	* gfortran.dg/pointer_init_10.f90: Require visibility support.
-	* gfortran.dg/temporary_3.f90: Likewise.
-
-	* gcc.dg/pr88074.c: Require c99_runtime.
-	* gcc.dg/warn-abs-1.c: Likewise.
-	* gfortran.dg/ISO_Fortran_binding_1.f90: Likewise.
-
-	PR testsuite/89666
-	* c-c++-common/builtin-has-attribute-3.c: Define SKIP_ALIAS on
-	hppa*-*-hpux*.
-	* gcc.dg/attr-copy.c: Require alias support.
-	* gcc.dg/ipa/ipa-icf-39.c: Likewise.
-
-2019-03-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR fortran/89724
-	* gfortran.dg/continuation_15.f90: New test.
-	* gfortran.dg/continuation_16.f90: New test.
-
-2019-03-16  John David Anglin  <danglin@gcc.gnu.org>
-
-	* g++.dg/cpp0x/pr84497.C: Restore dg-require-weak.
-
-	PR testsuite/89393
-	* g++.dg/abi/ref-temp1.C: Skip on 32-bit hppa*-*-hpux*.
-	* g++.dg/cpp0x/pr84497.C: Likewise.
-
-	* c-c++-common/builtin-has-attribute-4.c: Skip on 32-bit hppa*-*-hpux*.
-	* gcc.dg/attr-copy-6.c: Likewise.
-	* gcc.dg/pr87793.c: Likewise.
-
-	PR testsuite/89471
-	* gcc.dg/pr84941.c: Skip on hppa*-*-*.
-
-	* gcc.dg/Wattributes-10.c: Add -fno-common option on hppa*-*-hpux*.
-	* gcc.dg/gimplefe-34.c: Likewise.
-	* gcc.dg/compat/pr83487-2_x.c: Use -fno-common option on hppa*-*-hpux*.
-	* gcc.dg/compat/pr83487-2_y.c: Likewise.
-
-	PR testsuite/84174
-	* gcc.dg/Wattributes-6.c: Skip warning check at line 404 on
-	hppa*64*-*-*.
-
-	PR testsuite/83453
-	* c-c++-common/Wattributes.c: Skip a warning check on hppa*64*-*-*.
-
-	* lib/target-supports.exp (check_ascii_locale_available): Remove
-	hppa*-*-hpux*.
-
-2019-03-16  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/84394
-	* gfortran.dg/blockdata_11.f90: New test.
-
-2019-03-15  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/60091
-	* gfortran.dg/pointer_remapping_3.f08: Adjust error messages.
-	* gfortran.dg/pointer_remapping_7.f90: Adjust error message.
-
-2019-03-15  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	PR target/87532
-	* gcc.target/powerpc/fold-vec-extract-char.p8.c: Modify expected
-	instruction selection.
-	* gcc.target/powerpc/fold-vec-extract-int.p8.c: Likewise.
-	* gcc.target/powerpc/fold-vec-extract-short.p8.c: Likewise.
-	* gcc.target/powerpc/pr87532-mc.c: New test.
-	* gcc.target/powerpc/pr87532.c: New test.
-	* gcc.target/powerpc/vec-extract-v16qiu-v2.h: New test.
-	* gcc.target/powerpc/vec-extract-v16qiu-v2a.c: New test.
-	* gcc.target/powerpc/vec-extract-v16qiu-v2b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-10a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-10b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-11a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-11b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-12a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-12b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-13a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-13b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-14a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-14b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-15a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-15b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-16a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-16b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-17a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-17b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-18a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-18b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-19a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-19b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-20a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-20b.c: New test.
-	* gcc.target/powerpc/vsx-builtin-9a.c: New test.
-	* gcc.target/powerpc/vsx-builtin-9b.c: New test.
-
-2019-03-15  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR c++/88534
-	PR c++/88537
-	* g++.dg/cpp2a/pr88534.C: New.
-	* g++.dg/cpp2a/pr88537.C: New.
-
-2019-03-15  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.target/s390/target-attribute/tattr-1.c (htm0): -mhtm -> '-mhtm'.
-	* gcc.target/s390/target-attribute/tattr-2.c: Likewise.
-	* gcc.target/s390/target-attribute/tattr-3.c (vx0): -mvx -> '-mvx'.
-	* gcc.target/s390/target-attribute/tattr-4.c: Likewise.
-
-2019-03-15  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	PR target/89719
-	* gcc.target/aarch64/spellcheck_4.c: Adjust dg-error string.
-	* gcc.target/aarch64/spellcheck_5.c: Likewise.
-	* gcc.target/aarch64/spellcheck_6.c: Likewise.
-
-2019-03-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89709
-	* g++.dg/cpp0x/constexpr-89709.C: New test.
-
-	PR debug/89704
-	* gcc.dg/debug/pr89704.c: New test.
-
-2019-03-15  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89650
-	* g++.target/i386/pr89650.C: New test.
-
-2019-03-14  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-13.c: Adjust.
-	* gcc.dg/gimplefe-14.c: Likewise.
-	* gcc.dg/gimplefe-17.c: Likewise.
-	* gcc.dg/gimplefe-18.c: Likewise.
-	* gcc.dg/gimplefe-7.c: Likewise.
-	* gcc.dg/torture/pr89595.c: Likewise.
-	* gcc.dg/tree-ssa/cunroll-13.c: Likewise.
-	* gcc.dg/tree-ssa/ivopt_mult_1g.c: Likewise.
-	* gcc.dg/tree-ssa/ivopt_mult_2g.c: Likewise.
-	* gcc.dg/tree-ssa/scev-3.c: Likewise.
-	* gcc.dg/tree-ssa/scev-4.c: Likewise.
-	* gcc.dg/tree-ssa/scev-5.c: Likewise.
-	* gcc.dg/vect/vect-cond-arith-2.c: Likewise.
-	* gcc.target/aarch64/sve/loop_add_6.c: Likewise.
-
-2019-03-14  Jakub Jelinek  <jakub@redhat.com>
-
-	PR ipa/89684
-	* gcc.target/i386/pr89684.c: New test.
-
-	PR rtl-optimization/89679
-	* gcc.dg/pr89679.c: New test.
-
-2019-03-14  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89710
-	* gcc.dg/torture/pr89710.c: New testcase.
-
-2019-03-14  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89698
-	* g++.dg/torture/pr89698.C: New testcase.
-
-2019-03-14  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89703
-	* gcc.c-torture/compile/pr89703-1.c: New test.
-	* gcc.c-torture/compile/pr89703-2.c: New test.
-
-2019-03-14  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89523
-	* gcc.target/i386/pr89523-1a.c: New test.
-	* gcc.target/i386/pr89523-1b.c: Likewise.
-	* gcc.target/i386/pr89523-2.c: Likewise.
-	* gcc.target/i386/pr89523-3.c: Likewise.
-	* gcc.target/i386/pr89523-4.c: Likewise.
-	* gcc.target/i386/pr89523-5.c: Likewise.
-	* gcc.target/i386/pr89523-6.c: Likewise.
-	* gcc.target/i386/pr89523-7.c: Likewise.
-	* gcc.target/i386/pr89523-8.c: Likewise.
-	* gcc.target/i386/pr89523-9.c: Likewise.
-
-2019-03-14  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89512
-	* g++.dg/cpp1y/var-templ61.C: New test.
-
-	PR c++/89652
-	* g++.dg/cpp1y/constexpr-89652.C: New test.
-
-2019-03-13  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/87045
-	* gfortran.dg/pr87045.f90: New test.
-
-2019-03-13  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR target/85860
-	* gcc.target/i386/pr85860.c: New.
-
-2019-03-13  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89686 - mixing init-capture and simple-capture in lambda.
-	* g++.dg/cpp2a/lambda-pack-init2.C: New test.
-
-	PR c++/89660 - bogus error with -Wredundant-move.
-	* g++.dg/cpp0x/Wredundant-move8.C: New test.
-	* g++.dg/cpp0x/Wredundant-move9.C: New test.
-
-2019-03-13  Janus Weil  <janus@gcc.gnu.org>
-
-	PR fortran/89601
-	* gfortran.dg/pdt_16.f03: Modified to avoid follow-up errors.
-	* gfortran.dg/pdt_30.f90: New test case.
-
-2019-03-13  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88979 - further P0634 fix for constructors.
-	* g++.dg/cpp2a/typename15.C: New test.
-
-2019-03-13  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/89662
-	* gcc.dg/Warray-bounds-41.c: New test.
-
-2019-03-13  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/63508
-	* g++.dg/cpp0x/auto53.C: New.
-
-2019-03-13  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89677
-	* gcc.dg/torture/pr89677.c: New testcase.
-
-2019-03-13  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/85558
-	* g++.dg/other/friend16.C: New.
-	* g++.dg/other/friend17.C: Likewise.
-
-2019-03-13  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/88588
-	* c-c++-common/gomp/pr88588.c: New test.
-
-2019-03-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/66695
-	PR fortran/77746
-	PR fortran/79485
-	* gfortran.dg/binding_label_tests_30.f90: New test.
-	* gfortran.dg/binding_label_tests_31.f90: New test.
-	* gfortran.dg/binding_label_tests_32.f90: New test.
-	* gfortran.dg/binding_label_tests_33.f90: New test.
-
-2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.dg/pr88957.d: Move to gdc.dg/ubsan.
-	* gdc.dg/ubsan/ubsan.exp: New file.
-	* lib/gdc.exp (gdc_include_flags): Remove unused target variable.
-	Explicitly return flags from procedure.
-
-2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/88957
-	* gdc.dg/pr88957.d: New test.
-	* gdc.dg/simd.d: Add new vector tests.
-
-2019-03-12  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR d/87824
-	* lib/gdc.exp (gdc_include_flags): Find C++ headers by calling
-	libstdc++v3/scripts/testsuite_flags.  Filter out unsupported
-	-nostdinc++ flag.
-
-2019-03-12  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/87673
-	* gfortran.dg/charlen_17.f90: New test.
-
-2019-03-12  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.target/s390/memset-1.c: Adapt test case for new scheduling.
-
-2019-03-12  Martin Liska  <mliska@suse.cz>
-
-	* gfortran.dg/abstract_type_3.f03: Amend test-case scan patterns.
-	* gfortran.dg/binding_label_tests_4.f03: Likewise.
-	* gfortran.dg/c_f_pointer_tests_6.f90: Likewise.
-	* gfortran.dg/c_funloc_tests_6.f90: Likewise.
-	* gfortran.dg/c_loc_tests_17.f90: Likewise.
-	* gfortran.dg/constructor_9.f90: Likewise.
-	* gfortran.dg/dec_structure_8.f90: Likewise.
-	* gfortran.dg/entry_4.f90: Likewise.
-	* gfortran.dg/init_char_with_nonchar_ctr.f90: Likewise.
-	* gfortran.dg/initialization_23.f90: Likewise.
-	* gfortran.dg/logical_assignment_1.f90: Likewise.
-	* gfortran.dg/pr80752.f90: Likewise.
-	* gfortran.dg/pr88116_1.f90: Likewise.
-	* gfortran.dg/pr88467.f90: Likewise.
-	* gfortran.dg/typebound_call_7.f03: Likewise.
-	* gfortran.dg/typebound_generic_1.f03: Likewise.
-	* gfortran.dg/typebound_operator_2.f03: Likewise.
-	* gfortran.dg/typebound_operator_4.f03: Likewise.
-	* gfortran.dg/typebound_proc_9.f03: Likewise.
-	* gfortran.dg/unlimited_polymorphic_2.f03: Likewise.
-
-2019-03-12  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/89363
-	* gfortran.dg/assumed_rank_16.f90: New test.
-
-	PR fortran/89364
-	* gfortran.dg/assumed_rank_17.f90: New test.
-
-2019-03-12  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89663
-	* gcc.c-torture/compile/pr89663-1.c: New test.
-	* gcc.c-torture/compile/pr89663-2.c: New test.
-
-2019-03-12  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89664
-	* gfortran.dg/pr89664.f90: New testcase.
-
-2019-03-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR fortran/89651
-	* gfortran.dg/gomp/pr89651.f90: New test.
-
-	PR middle-end/89655
-	PR bootstrap/89656
-	* gcc.c-torture/compile/pr89655.c: New test.
-
-2019-03-11  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* gcc.target/arm/f16_f64_conv_no_dp.c: Add arm_fp16_ok effective
-	target.
-
-2019-03-11  Martin Liska  <mliska@suse.cz>
-
-	* g++.dg/conversion/simd3.C (foo): Wrap option names
-	with apostrophe character.
-	* g++.dg/cpp1z/decomp3.C (test): Likewise.
-	(test3): Likewise.
-	* g++.dg/cpp1z/decomp4.C (test): Likewise.
-	* g++.dg/cpp1z/decomp44.C (foo): Likewise.
-	* g++.dg/cpp1z/decomp45.C (f): Likewise.
-	* g++.dg/opt/pr34036.C: Likewise.
-	* g++.dg/spellcheck-c++-11-keyword.C: Likewise.
-	* gcc.dg/c90-fordecl-1.c (foo): Likewise.
-	* gcc.dg/cpp/dir-only-4.c: Likewise.
-	* gcc.dg/cpp/dir-only-5.c: Likewise.
-	* gcc.dg/cpp/pr71591.c: Likewise.
-	* gcc.dg/format/opt-1.c: Likewise.
-	* gcc.dg/format/opt-2.c: Likewise.
-	* gcc.dg/format/opt-3.c: Likewise.
-	* gcc.dg/format/opt-4.c: Likewise.
-	* gcc.dg/format/opt-5.c: Likewise.
-	* gcc.dg/format/opt-6.c: Likewise.
-	* gcc.dg/pr22231.c: Likewise.
-	* gcc.dg/pr33007.c: Likewise.
-	* gcc.dg/simd-1.c (hanneke): Likewise.
-	* gcc.dg/simd-5.c: Likewise.
-	* gcc.dg/simd-6.c: Likewise.
-	* gcc.dg/spellcheck-options-14.c: Likewise.
-	* gcc.dg/spellcheck-options-15.c: Likewise.
-	* gcc.dg/spellcheck-options-16.c: Likewise.
-	* gcc.dg/spellcheck-options-17.c: Likewise.
-	* gcc.dg/tree-ssa/pr23109.c: Likewise.
-	* gcc.dg/tree-ssa/recip-5.c: Likewise.
-	* gcc.target/i386/cet-notrack-1a.c (func): Likewise.
-	(__attribute__): Likewise.
-	* gcc.target/i386/cet-notrack-icf-1.c (fn3): Likewise.
-	* gcc.target/i386/cet-notrack-icf-3.c (__attribute__): Likewise.
-	* gcc.target/powerpc/warn-1.c: Likewise.
-	* gcc.target/powerpc/warn-2.c: Likewise.
-
-2019-03-11  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/vec-addc-u128.c: New test.
-
-2019-03-11  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* c-c++-common/unroll-6.c: New test.
-
-2019-03-11  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/87571
-	* g++.dg/template/memfriend18.C: New.
-
-2019-03-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gdc.dg/pr89041.d: Mark as compile test.
-
-2019-03-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc.target/i386/indirect-thunk-extern-7.c: Add -fjump-tables to
-	dg-options.
-
-2019-03-10  Martin Jambor  <mjambor@suse.cz>
-
-	PR tree-optimization/85762
-	PR tree-optimization/87008
-	PR tree-optimization/85459
-	* g++.dg/tree-ssa/pr87008.C: New test.
-	* gcc.dg/guality/pr54970.c: Xfail tests querying a[0] everywhere.
-
-2019-03-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/66089
-	* gfortran.dg/assumed_type_2.f90: Adapted tree dumps.
-	* gfortran.dg/no_arg_check_2.f90: Likewise.
-
-2019-03-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89648
-	* g++.dg/cpp0x/lambda/lambda-89648.C: New test.
-
-2019-03-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/66089
-	* gfortran.dg/dependency_53.f90: New test.
-
-2019-03-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/87734
-	* gfortran.dg/public_private_module_10.f90: New test.
-
-2019-03-09  John David Anglin  <dave.anglin@bell.net>
-
-	PR c++/70349
-	* g++.dg/abi/abi-tag18a.C: Skip on 32-bit hppa*-*-hpux*.
-
-	PR middle-end/68733
-	* c-c++-common/gomp/clauses-2.c: Skip on 32-bit hppa*-*-hpux*.
-
-	PR testsuite/89472
-	* gcc.dg/debug/dwarf2/inline5.c: XFAIL one scan-assembler-times check.
-
-2019-03-09  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/87750
-	* g++.dg/cpp0x/pr87750.C: New.
-
-2019-03-09  John David Anglin  <dave.anglin@bell.net>
-
-	* c-c++-common/ident-0b.c: Also skip on 32-bit hppa*-*-hpux*.
-	* c-c++-common/ident-1a.c: Likewise.
-	* c-c++-common/ident-1b.c: Likewise.
-	* c-c++-common/ident-2b.c: Likewise.
-
-	* g++.dg/tls/pr77285-2.C: Require tls_native support.
-
-	* g++.dg/ext/visibility/lambda1.C: Require visibility.
-
-	PR inline-asm/87010
-	* gcc.dg/torture/20180712-1.c: Skip on hppa*-*-*.
-
-	* gfortran.dg/coarray_data_1.f90: Link against libatomic if target
-	libatomic_available.
-
-2019-03-09  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/89041
-	* gdc.dg/pr89041.d: New test.
-
-2019-03-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/71544
-	* gfortran.dg/c_ptr_tests_19.f90: New test.
-
-2019-03-09  John David Anglin  <dave.anglin@bell.net>
-
-	* gnat.dg/debug11.adb: Skip on 32-bit hppa*-*-hpux*.
-	* gnat.dg/debug12.adb: Likewise.
-
-	* lib/target-supports.exp (check_effective_target_weak_undefined):
-	Return 0 on hppa*-*-hpux*.
-	(check_ascii_locale_available): Likewise.
-
-2019-03-09  Janus Weil  <janus@gcc.gnu.org>
-
-	PR fortran/84504
-	* gfortran.dg/pointer_init_10.f90: New test case.
-
-2019-03-09  John David Anglin  <dave.anglin@bell.net>
-
-	* gfortran.dg/ieee/ieee_9.f90: Fix typo.
-
-2019-03-09  John David Anglin  <dave.anglin@bell.net>
-
-	PR fortran/89639
-	* gfortran.dg/ieee/ieee_9.f90: Skip on hppa*-*-linux*.
-
-2019-03-09  Thomas König  <tkoenig@gcc.gnu.org>
-
-	PR fortran/71203
-	* gfortran.dg/array_simplify_3.f90: New test case.
-
-2019-03-09  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/88568
-	* g++.dg/other/pr88568.C: New test.
-
-	PR rtl-optimization/89634
-	* gcc.c-torture/execute/pr89634.c: New test.
-
-2019-03-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/85870
-	* gcc.dg/lto/pr85870_0.c: Add dg-extra-ld-options with
-	-r -nostdlib -flinker-output=nolto-rel.
-
-2019-03-08  David Malcolm  <dmalcolm@redhat.com>
-
-	PR target/79926
-	* gcc.target/i386/interrupt-387-err-1.c: Update expected message.
-	* gcc.target/i386/interrupt-387-err-2.c: Likewise.
-	* gcc.target/i386/interrupt-mmx-err-1.c: Likewise.
-	* gcc.target/i386/interrupt-mmx-err-2.c: Likewise.
-
-2019-03-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/63540
-	* g++.dg/cpp0x/implicit17.C: New.
-
-2019-03-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/22149
-	* g++.dg/template/access29.C: New.
-
-2019-03-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/82075
-	* g++.dg/cpp1z/decomp49.C: New test.
-
-2019-03-08  Andre Vieira  <andre.simoesdiasvieira@arm.com>
-
-	* gcc.target/arm/f16_f64_conv_no_dp.c: New test.
-
-2019-03-08  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/68924
-	PR target/78782
-	PR target/87558
-	* gcc.target/i386/pr78782.c: New test.
-	* gcc.target/i386/pr87558.c: Ditto.
-
-2019-03-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/85870
-	* gcc.dg/lto/pr85870_0.c: New test.
-	* gcc.dg/lto/pr85870_1.c: New test.
-
-2019-03-08  Martin Liska  <mliska@suse.cz>
-
-	PR target/86952
-	* gcc.target/i386/pr86952.c: New test.
-	* gcc.target/i386/indirect-thunk-7.c: Use jump tables to match
-	scanned pattern.
-	* gcc.target/i386/indirect-thunk-inline-7.c: Likewise.
-
-2019-03-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89585
-	* g++.dg/asm-qual-3.C: Adjust expected diagnostics for toplevel
-	asm volatile.
-
-	PR c++/89599
-	* g++.dg/ubsan/vptr-4.C: Adjust expected diagnostics.
-	* g++.dg/parse/array-size2.C: Likewise.
-	* g++.dg/cpp0x/constexpr-89599.C: New test.
-
-	PR c++/89622
-	* g++.dg/warn/pr89622.C: New test.
-
-2019-03-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/80003
-	* gcc.target/i386/pr68657.c: Adjust expected diagnostics wording.
-	* gcc.target/i386/interrupt-6.c: Likewise.
-	* g++.target/i386/pr57362.C: Adjust capitalization in dg-prune-output.
-
-2019-03-07  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84518
-	* g++.dg/cpp0x/lambda/lambda-ice30.C: New.
-	* g++.dg/cpp0x/lambda/lambda-ice31.C: Likewise.
-
-2019-03-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR translation/79999
-	* c-c++-common/gomp/doacross-1.c: Adjust expected diagnostics.
-	* c-c++-common/gomp/doacross-3.c: New test.
-
-	PR target/89602
-	* gcc.target/i386/avx512f-vmovss-1.c: New test.
-	* gcc.target/i386/avx512f-vmovss-2.c: New test.
-	* gcc.target/i386/avx512f-vmovss-3.c: New test.
-	* gcc.target/i386/avx512f-vmovsd-1.c: New test.
-	* gcc.target/i386/avx512f-vmovsd-2.c: New test.
-	* gcc.target/i386/avx512f-vmovsd-3.c: New test.
-
-2019-03-07  Martin Jambor  <mjambor@suse.cz>
-
-	PR lto/87525
-	* gcc.dg/ipa/ipcp-5.c: New test.
-
-2019-03-07  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/88235
-	* g++.dg/ipa/pr88235.C: New test.
-
-2019-04-07  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89618
-	* gcc.target/i386/pr89618.c: New testcase.
-
-2019-03-07  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89595
-	* gcc.dg/torture/pr89595.c: New testcase.
-
-2019-03-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89585
-	* g++.dg/asm-qual-3.C: Adjust expected diagnostics.
-
-2019-03-06  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/71203
-	* gfortran.dg/substr_8.f90: New test.
-
-2019-03-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/87148
-	* g++.dg/ext/flexary34.C: New test.
-
-2019-03-06  Peter Bergner  <bergner@linux.ibm.com>
-
-	PR rtl-optimization/88845
-	* gcc.target/powerpc/pr88845.c: New test.
-
-2019-03-06  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87378 - bogus -Wredundant-move warning.
-	* g++.dg/cpp0x/Wredundant-move1.C (fn4): Drop dg-warning.
-	* g++.dg/cpp0x/Wredundant-move7.C: New test.
-
-2019-03-06  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/89551
-	* gcc.dg/uninit-pred-8_b.c: Force logical-op-non-short-circuit
-	the way that makes the testcase PASS.
-
-2019-03-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89590
-	* gcc.dg/pr89590.c: New test.
-
-2019-03-05  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR target/89222
-	* gcc.target/arm/pr89222.c: Add new test.
-
-2019-03-05  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89594
-	* gcc.dg/pr89594.c: New testcase.
-
-2019-03-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89487
-	* gcc.dg/tree-ssa/pr89487.c: Include ../pr87600.h.
-	(caml_interprete): Ifdef the whole body out if REG1 or REG2 macros
-	aren't defined.  Use REG1 instead of "%r15" and REG2 instead of
-	"%r14".
-
-	PR bootstrap/89560
-	* g++.dg/other/pr89560.C: New test.
-
-	PR tree-optimization/89570
-	* gcc.dg/pr89570.c: New test.
-
-	PR tree-optimization/89566
-	* c-c++-common/pr89566.c: New test.
-
-2019-03-04  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84605
-	* g++.dg/parse/crash69.C: New.
-
-2019-03-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/71446
-	* g++.dg/cpp2a/desig12.C: New test.
-	* g++.dg/cpp2a/desig13.C: New test.
-
-2019-03-04  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88530
-	* gcc.target/aarch64/options_set_10.c: Add native.
-
-2019-03-04  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR tree-optimization/89437
-	* gcc.dg/sinatan-1.c: Fix testcase.
-
-2019-03-04  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89572
-	* gcc.dg/torture/pr89572.c: New testcase.
-
-2018-03-04  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/89487
-	* gcc.dg/tree-ssa/pr89487.c: New test.
-
-2019-03-03  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/77583
-	* gfortran.dg/pr77583.f90: New test.
-
-2019-03-03  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/72714
-	* gfortran.dg/coarray_allocate_11.f90: New test.
-
-2019-03-02  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89516
-	* gfortran.dg/pr89492.f90: Adjust testcase.
-	* gfortran.dg/transfer_check_5.f90: New test.
-
-2019-03-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/71446
-	* g++.dg/cpp2a/desig10.C: New test.
-	* g++.dg/cpp2a/desig11.C: New test.
-	* g++.dg/ext/desig4.C: Expect 4 new errors.
-
-	PR target/89506
-	* gcc.dg/pr89506.c: New test.
-
-2019-03-01  Kito Cheng  <kito.cheng@gmail.com>
-	    Monk Chiang  <sh.chiang04@gmail.com>
-
-	* gcc.target/riscv/attribute-1.c: New.
-	* gcc.target/riscv/attribute-2.c: Likewise.
-	* gcc.target/riscv/attribute-3.c: Likewise.
-	* gcc.target/riscv/attribute-4.c: Likewise.
-	* gcc.target/riscv/attribute-5.c: Likewise.
-	* gcc.target/riscv/attribute-6.c: Likewise.
-	* gcc.target/riscv/attribute-7.c: Likewise.
-	* gcc.target/riscv/attribute-8.c: Likewise.
-	* gcc.target/riscv/attribute-9.c: Likewise.
-
-	* gcc.target/riscv/arch-1.c: New.
-	* gcc.target/riscv/arch-2.c: Likewise.
-	* gcc.target/riscv/arch-3.c: Likewise.
-	* gcc.target/riscv/arch-4.c: Likewise.
-
-2019-03-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89497
-	* g++.dg/tree-prof/devirt.C: Adjust also the ilp32
-	scan-tree-dump-times from dom3 to tracer pass.
-
-2019-03-01  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.target/powerpc/ throughout: Delete dg-skip-if "do not override
-	-mcpu".  Use -mdejagnu-cpu= in dg-options instead of -mcpu=.
-
-2019-03-01  Alexander Monakov  <amonakov@ispras.ru>
-
-	PR rtl-optimization/85899
-	* gcc.dg/pr85899.c: New test.
-
-2019-03-01  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89537 - missing location for error with non-static member fn.
-	* g++.dg/diagnostic/member-fn-1.C: New test.
-
-	PR c++/89532 - ICE with incomplete type in decltype.
-	* g++.dg/cpp2a/nontype-class14.C: New test.
-
-2019-03-01  Jakub Jelinek  <jakub@redhat.com>
-
-	Implement P1002R1, Try-catch blocks in constexpr functions
-	PR c++/89513
-	* g++.dg/cpp2a/constexpr-try1.C: New test.
-	* g++.dg/cpp2a/constexpr-try2.C: New test.
-	* g++.dg/cpp2a/constexpr-try3.C: New test.
-	* g++.dg/cpp2a/constexpr-try4.C: New test.
-	* g++.dg/cpp2a/constexpr-try5.C: New test.
-	* g++.dg/cpp0x/constexpr-ctor10.C: Don't expect error for C++2a.
-
-2019-03-01  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR tree-optimization/89535
-	* gfortran.dg/vect/pr89535.f90: New test.
-
-2019-03-01  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89541
-	* gfortran.dg/pr89451.f90: New testcase.
-
-2019-03-01  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89497
-	* gcc.dg/tree-ssa/reassoc-43.c: Avoid false match in regex.
-	* g++.dg/tree-prof/devirt.C: Scan tracer dump for foldings
-	that happen now earlier.
-
-2019-02-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.c-torture/execute/20190228-1.c: New test.
-
-2019-02-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/87068 - missing diagnostic with fallthrough statement.
-	* c-c++-common/Wimplicit-fallthrough-37.c: New test.
-
-2019-02-28  Thomas Schwinge  <thomas@codesourcery.com>
-	    Cesar Philippidis  <cesar@codesourcery.com>
-
-	PR fortran/72741
-	PR fortran/89433
-	* gfortran.dg/goacc/routine-multiple-directives-1.f90: New file.
-	* gfortran.dg/goacc/routine-multiple-directives-2.f90: Likewise.
-
-	PR fortran/72741
-	* gfortran.dg/goacc/routine-multiple-lop-clauses-1.f90: New file.
-
-	PR fortran/72741
-	PR fortran/89433
-	* gfortran.dg/goacc/routine-6.f90: Update
-	* gfortran.dg/goacc/routine-intrinsic-1.f: New file.
-	* gfortran.dg/goacc/routine-intrinsic-2.f: Likewise.
-
-2019-02-28  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89521
-	* gcc.dg/pr89521-1.c: New test.
-	* gcc.dg/pr89521-2.c: New test.
-
-2019-02-28  John David Anglin  <danglin@gcc.gnu.org>
-
-	PR testsuite/89441
-	* g++.dg/ipa/pr89009.C: Update symbol visibility.
-
-2019-02-28  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88530
-	* gcc.target/aarch64/options_set_10.c: New test.
-
-2019-02-28  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/89522
-	* g++.dg/cpp1y/lambda-generic-ice10.C: New.
-
-2019-02-28  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89525
-	* gcc.dg/pr89525.c: New test.
-
-	PR c/89520
-	* gcc.dg/pr89520-1.c: New test.
-	* gcc.dg/pr89520-2.c: New test.
-
-2019-02-27  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88857 - ICE with value-initialization of argument in template.
-	* g++.dg/cpp0x/initlist-value4.C: New test.
-
-2019-02-27  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89511 - ICE with using-declaration and unscoped enumerator.
-	* g++.dg/cpp0x/using-enum-3.C: New test.
-
-2019-02-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89280
-	* gcc.dg/torture/pr57147-2.c (SetNaClSwitchExpectations): Add static
-	keyword.
-
-2019-02-27  Richard Biener  <rguenther@suse.de>
-
-	* gcc.dg/gimplefe-36.c: New testcase.
-
-2019-02-27  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/89488
-	* g++.dg/cpp0x/nsdmi15.C: New.
-
-2019-02-27  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/88987
-	* g++.dg/cpp0x/pr88987.C: New.
-
-2019-02-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89280
-	* gcc.c-torture/compile/pr89280.c: New test.
-	* gcc.dg/torture/pr57147-2.c: Don't expect a setjmp after noreturn
-	function.  Skip the test for -O0.
-
-2018-02-26  Steve Ellcey  <sellcey@marvell.com>
-
-	* gfortran.dg/simd-builtins-1.f90: Update for aarch64*-*-*.
-	* gfortran.dg/simd-builtins-2.f90: Ditto.
-	* gfortran.dg/simd-builtins-6.f90: Ditto.
-	* gfortran.dg/simd-builtins-8.f90: New test.
-	* gfortran.dg/simd-builtins-8.h: New header file.
-
-2019-02-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89507
-	* g++.dg/other/new2.C: New test.
-
-	PR tree-optimization/89500
-	* gcc.dg/pr89500.c: New test.
-	* gcc.dg/Wstringop-overflow-10.c: New test.
-	* gcc.dg/strlenopt-60.c: New test.
-
-2019-02-26  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89492
-	* gfortran.dg/pr89492.f90: New test.
-
-2019-02-26  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/89496
-	* gfortran.dg/altreturn_9_0.f90: New file.
-	* gfortran.dg/altreturn_9_1.f90: New file.
-
-2019-02-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89481
-	* g++.dg/cpp1y/constexpr-89481.C: New test.
-
-2019-02-26  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89505
-	* gcc.dg/torture/pr89505.c: New testcase.
-
-2019-02-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt77.adb: New test.
-	* gnat.dg/opt77_pkg.ad[sb]: New helper.
-
-2019-02-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89474
-	* gcc.target/i386/pr89474.c: New test.
-
-2019-02-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/77754
-	* gcc.c-torture/compile/pr77754-1.c: New test.
-	* gcc.c-torture/compile/pr77754-2.c: New test.
-	* gcc.c-torture/compile/pr77754-3.c: New test.
-	* gcc.c-torture/compile/pr77754-4.c: New test.
-	* gcc.c-torture/compile/pr77754-5.c: New test.
-	* gcc.c-torture/compile/pr77754-6.c: New test.
-
-2019-02-25  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88530
-	* gcc.target/aarch64/options_set_1.c: New test.
-	* gcc.target/aarch64/options_set_2.c: New test.
-	* gcc.target/aarch64/options_set_3.c: New test.
-	* gcc.target/aarch64/options_set_4.c: New test.
-	* gcc.target/aarch64/options_set_5.c: New test.
-	* gcc.target/aarch64/options_set_6.c: New test.
-	* gcc.target/aarch64/options_set_7.c: New test.
-	* gcc.target/aarch64/options_set_8.c: New test.
-	* gcc.target/aarch64/options_set_9.c: New test.
-
-2019-02-25  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.target/arm/simd/fp16fml_high.c (test_vfmlal_high_u32,
-	test_vfmlalq_high_u32, test_vfmlsl_high_u32, test_vfmlslq_high_u32):
-	Rename ....
-	(test_vfmlal_high_f16, test_vfmlalq_high_f16, test_vfmlsl_high_f16,
-	test_vfmlslq_high_f16): ... To this.
-	* gcc.target/arm/simd/fp16fml_lane_high.c (test_vfmlal_lane_high_u32,
-	tets_vfmlsl_lane_high_u32, test_vfmlal_laneq_high_u32,
-	test_vfmlsl_laneq_high_u32, test_vfmlalq_lane_high_u32,
-	test_vfmlslq_lane_high_u32, test_vfmlalq_laneq_high_u32,
-	test_vfmlslq_laneq_high_u32): Rename ...
-	(test_vfmlal_lane_high_f16, tets_vfmlsl_lane_high_f16,
-	test_vfmlal_laneq_high_f16, test_vfmlsl_laneq_high_f16,
-	test_vfmlalq_lane_high_f16, test_vfmlslq_lane_high_f16,
-	test_vfmlalq_laneq_high_f16, test_vfmlslq_laneq_high_f16): ... To this.
-	* gcc.target/arm/simd/fp16fml_lane_low.c (test_vfmlal_lane_low_u32,
-	test_vfmlsl_lane_low_u32, test_vfmlal_laneq_low_u32,
-	test_vfmlsl_laneq_low_u32, test_vfmlalq_lane_low_u32,
-	test_vfmlslq_lane_low_u32, test_vfmlalq_laneq_low_u32,
-	test_vfmlslq_laneq_low_u32): Rename ...
-	(test_vfmlal_lane_low_f16, test_vfmlsl_lane_low_f16,
-	test_vfmlal_laneq_low_f16, test_vfmlsl_laneq_low_f16,
-	test_vfmlalq_lane_low_f16, test_vfmlslq_lane_low_f16,
-	test_vfmlalq_laneq_low_f16, test_vfmlslq_laneq_low_f16): ... To this.
-	* gcc.target/arm/simd/fp16fml_low.c (test_vfmlal_low_u32,
-	test_vfmlalq_low_u32, test_vfmlsl_low_u32, test_vfmlslq_low_u32):
-	Rename ...
-	(test_vfmlal_low_f16, test_vfmlalq_low_f16, test_vfmlsl_low_f16,
-	test_vfmlslq_low_f16): ... To this.
-
-2019-02-25  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.target/aarch64/fp16_fmul_high.h (test_vfmlal_high_u32,
-	test_vfmlalq_high_u32, test_vfmlsl_high_u32, test_vfmlslq_high_u32):
-	Rename ...
-	(test_vfmlal_high_f16, test_vfmlalq_high_f16, test_vfmlsl_high_f16,
-	test_vfmlslq_high_f16): ... To this.
-	* gcc.target/aarch64/fp16_fmul_lane_high.h (test_vfmlal_lane_high_u32,
-	tets_vfmlsl_lane_high_u32, test_vfmlal_laneq_high_u32,
-	test_vfmlsl_laneq_high_u32, test_vfmlalq_lane_high_u32,
-	test_vfmlslq_lane_high_u32, test_vfmlalq_laneq_high_u32,
-	test_vfmlslq_laneq_high_u32): Rename ...
-	(test_vfmlal_lane_high_f16, tets_vfmlsl_lane_high_f16,
-	test_vfmlal_laneq_high_f16, test_vfmlsl_laneq_high_f16,
-	test_vfmlalq_lane_high_f16, test_vfmlslq_lane_high_f16,
-	test_vfmlalq_laneq_high_f16, test_vfmlslq_laneq_high_f16): ... To this.
-	* gcc.target/aarch64/fp16_fmul_lane_low.h (test_vfmlal_lane_low_u32,
-	test_vfmlsl_lane_low_u32, test_vfmlal_laneq_low_u32,
-	test_vfmlsl_laneq_low_u32, test_vfmlalq_lane_low_u32,
-	test_vfmlslq_lane_low_u32, test_vfmlalq_laneq_low_u32,
-	test_vfmlslq_laneq_low_u32): Rename ...
-	(test_vfmlal_lane_low_f16, test_vfmlsl_lane_low_f16,
-	test_vfmlal_laneq_low_f16, test_vfmlsl_laneq_low_f16,
-	test_vfmlalq_lane_low_f16, test_vfmlslq_lane_low_f16,
-	test_vfmlalq_laneq_low_f16, test_vfmlslq_laneq_low_f16): ... To this.
-	* gcc.target/aarch64/fp16_fmul_low.h (test_vfmlal_low_u32,
-	test_vfmlalq_low_u32, test_vfmlsl_low_u32, test_vfmlslq_low_u32):
-	Rename ...
-	(test_vfmlal_low_f16, test_vfmlalq_low_f16, test_vfmlsl_low_f16,
-	test_vfmlslq_low_f16): ... To This.
-	* lib/target-supports.exp
-	(check_effective_target_arm_fp16fml_neon_ok_nocache): Update test.
-
-2019-02-25  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR fortran/89282
-	* gfortran.dg/overload_3.f90: New test.
-
-2019-02-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89285
-	* g++.dg/cpp1y/constexpr-89285-2.C: New test.
-
-2019-02-25  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR libfortran/89274
-	* gfortran.dg/list_directed_large.f90: New test.
-
-2019-02-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89434
-	* gcc.c-torture/execute/pr89434.c: New test.
-
-	PR target/89438
-	* gcc.dg/pr89438.c: New test.
-
-2019-02-24  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84585
-	* g++.dg/cpp0x/pr84585.C: New.
-
-2019-02-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/89174
-	* gfortran.dg/allocate_with_mold_3.f90: New test.
-
-2019-02-24  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/87007
-	* gcc.target/i386/pr87007-1.c: Compile with -mfpmath=sse.
-	* gcc.target/i386/pr87007-2.c: Likewise.
-
-2019-02-24  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89266
-	PR fortran/88326
-	* gfortran.dg/pr89266.f90: New test.
-	* gfortran.dg/pr88326.f90: New test.
-
-2019-02-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89445
-	* gcc.target/i386/avx512f-pr89445.c: New test.
-
-2019-02-23  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/tree-ssa/builtin-sprintf-10.c: Cast remaining
-	wchar_t to wint_t to avoid a bogus -Wformat warning in
-	ILP32 (bug 77970).
-
-2019-02-23  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR testsuite/89476
-	* gfortran.dg/ISO_Fortran_binding_5.c: Include
-	"../../../libgfortran/ISO_Fortran_binding.h".
-	* gfortran.dg/ISO_Fortran_binding_6.c: Likewise.
-
-2019-02-23  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR driver/69471
-	* gcc.dg/pr69471-1.c: New test.
-	* gcc.dg/pr69471-2.c: Likewise.
-	* gcc.target/i386/pr69471-3.c: Likewise.
-
-2019-02-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-
-	PR fortran/84387
-	* gfortran.dg/dtio_34.f90: New test.
-
-2019-02-23  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88294 - ICE with non-constant noexcept-specifier.
-	* g++.dg/cpp0x/noexcept34.C: New test.
-	* g++.dg/cpp0x/noexcept35.C: New test.
-
-	PR c++/89419
-	* g++.dg/cpp1y/lambda-generic-89419.C: New test.
-
-2019-02-23  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/88117
-	* gfortran.dg/deferred_character_32.f90 : New test
-
-2019-02-23  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/89385
-	* gfortran.dg/ISO_Fortran_binding_1.f90 : Correct test for
-	previously incorrect lbound for allocatable expressions. Also
-	correct stop values to avoid repetition.
-	* gfortran.dg/ISO_Fortran_binding_5.f90 : New test
-	* gfortran.dg/ISO_Fortran_binding_5.c : Support previous test.
-
-	PR fortran/89366
-	* gfortran.dg/ISO_Fortran_binding_6.f90 : New test
-	* gfortran.dg/ISO_Fortran_binding_6.c : Support previous test.
-	* gfortran.dg/pr32599.f03 : Set standard to F2008.
-
-2019-02-22  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/89390
-	* g++.dg/diagnostic/pr89390.C: Update expected location of error,
-	renaming to a multicharacter name, so that start != finish.  Add
-	tests for dtor locations.
-
-2019-02-22  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84676
-	* g++.dg/cpp0x/pr84676.C: New.
-
-2019-02-22  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/tree-ssa/builtin-sprintf-10.c: Cast wchar_t to wint_t
-	to avoid a bogus -Wformat warning in ILP32 (bug 77970).
-
-2019-02-22  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/83057
-	* gfortran.dg/newunit_6.f90: New test.
-
-2019-02-22  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89420 - ICE with CAST_EXPR in explicit-specifier.
-	* g++.dg/cpp2a/explicit14.C: New test.
-
-2019-02-22  Matthew Malcomson  <matthew.malcomson@arm.com>
-
-	PR target/89324
-	* gcc.dg/rtl/aarch64/subs_adds_sp.c: New test.
-	* gfortran.fortran-torture/compile/pr89324.f90: New test.
-
-2019-02-22  Martin Sebor  <msebor@redhat.com>
-
-	PR c/89425
-	* gcc.dg/Wabsolute-value.c: New test.
-
-	* gcc.dg/Wbuiltin-declaration-mismatch-12.c: New test.
-
-2019-02-22  H.J. Lu  <hongjiu.lu@intel.com>
-	    Hongtao Liu  <hongtao.liu@intel.com>
-	    Sunil K Pandey  <sunil.k.pandey@intel.com>
-
-	PR target/87007
-	* gcc.target/i386/pr87007-1.c: New test.
-	* gcc.target/i386/pr87007-2.c: Likewise.
-
-2019-02-22  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89440
-	* gcc.dg/vect/pr89440.c: New testcase.
-
-2019-02-22  Thomas Schwinge  <thomas@codesourcery.com>
-
-	* lib/target-supports.exp (check_effective_target_offload_nvptx):
-	Remove.
-
-	PR fortran/72741
-	* gfortran.dg/goacc/classify-routine.f95: Adjust.
-
-	* c-c++-common/goacc/routine-5.c: Revert earlier changes.
-	* g++.dg/goacc/template.C: Likewise.
-
-	PR fortran/78027
-	* gfortran.dg/goacc/pr78027.f90: Add 'dg-additional-options "-Wno-hsa"'.
-
-2019-02-22  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/87609
-	* gcc.dg/torture/restrict-7.c: New testcase.
-
-2019-02-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89285
-	* g++.dg/ubsan/vptr-4.C: Expect reinterpret_cast errors.
-	* g++.dg/cpp1y/constexpr-84192.C (f2): Adjust expected diagnostics.
-	* g++.dg/cpp1y/constexpr-70265-2.C (foo): Adjust expected line of
-	diagnostics.
-	* g++.dg/cpp1y/constexpr-89285.C: New test.
-	* g++.dg/cpp0x/constexpr-arith-overflow.C (add, sub, mul): Ifdef out
-	for C++11.
-	(TEST_ADD, TEST_SUB, TEST_MUL): Define to Assert (true) for C++11.
-	* g++.dg/cpp0x/constexpr-arith-overflow2.C: New test.
-
-2019-02-21  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/87412
-	* gcc.target/i386/indirect-thunk-attr-14.c: Replace
-	-fcf-protection with -fcf-protection=branch.
-	* gcc.target/i386/indirect-thunk-attr-15.c: Likewise.
-	* gcc.target/i386/indirect-thunk-attr-16.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-8.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-9.c: Likewise.
-	* gcc.target/i386/indirect-thunk-extern-10.c: Likewise.
-
-2019-02-21  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* gcc.target/arm/pr88850-2.c: Block -mfloat-abi override.
-	* gcc.target/arm/pr88850.c: Use -mfloat-abi=softfp.
-
-2019-02-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/86119
-	* gfortran.dg/warn_conversion_11.f90: New test.
-
-2019-02-21  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/87412
-	* gcc.target/i386/pr87412-1.c: New file.
-	* gcc.target/i386/pr87412-2.c: Likewise.
-	* gcc.target/i386/pr87412-3.c: Likewise.
-	* gcc.target/i386/pr87412-4.c: Likewise.
-
-2019-02-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89403
-	* g++.dg/cpp0x/pr89403.C: New test.
-
-	PR c++/89405
-	* g++.dg/cpp1z/inline-var5.C: New test.
-
-	PR middle-end/89412
-	* gcc.c-torture/compile/pr89412.c: New test.
-
-2019-02-20  Jakub Jelinek  <jakub@redhat.com>
-	    David Malcolm  <dmalcolm@redhat.com>
-
-	PR middle-end/89091
-	* gcc.dg/torture/pr89091.c: New test.
-
-2019-02-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/88074
-	PR middle-end/89415
-	* gcc.dg/pr88074-2.c: New test.
-
-	PR c++/89336
-	* g++.dg/cpp1y/constexpr-89336-3.C: New test.
-
-2019-02-20  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c/89410
-	* gcc.dg/pr89410-1.c: New test.
-	* gcc.dg/pr89410-2.c: New test.
-
-2019-02-20  Pat Haugen  <pthaugen@us.ibm.com>
-
-	* lib/target-supports.exp (check_effective_target_vect_usad_char):
-	Add PowerPC support.
-	* gcc.dg/vect/slp-reduc-sad.c: Update scan string.
-	* gcc.dg/vect/vect-reduc-sad.c: Likewise.
-
-2019-02-20  Andre Vieira  <andre.simoesdiasvieira@arm.com>
-
-	PR target/86487
-	* gcc.target/arm/pr86487.c: New.
-
-2019-02-20  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/84536
-	* g++.dg/cpp1y/var-templ60.C: New.
-
-2019-02-20  Li Jia He  <helijia@linux.ibm.com>
-
-	PR target/88100
-	* gcc.target/powerpc/pr88100.c: New testcase.
-
-2019-02-19  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* gcc.target/arm/pr88850.c: Block -mfloat-abi override.
-
-2019-02-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/89384
-	* gfortran.dg/ISO_Fortran_binding_4.f90
-
-2019-02-19  Thomas Schwinge  <thomas@codesourcery.com>
-
-	PR c/87924
-	* c-c++-common/goacc/asyncwait-5.c: Remove XFAILs.
-	* gfortran.dg/goacc/asyncwait-5.f: Likewise.
-
-2019-02-19  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/88074
-	* gcc.dg/pr88074.c: New testcase.
-
-2019-02-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89303
-	* g++.dg/torture/pr89303.C: Move everything from std namespace to my
-	namespace.
-
-	PR c++/89387
-	* g++.dg/cpp0x/lambda/lambda-89387.C: New test.
-
-	PR c++/89391
-	* g++.dg/cpp0x/reinterpret_cast2.C: New test.
-
-	PR c++/89390
-	* g++.dg/diagnostic/pr89390.C: New test.
-
-2019-02-18  Sharon Dvir  <unapologtic@gmail.com>
-
-	* README: Fix typos.
-
-2019-02-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* g++.dg/torture/pr89303.C (bad_weak_ptr): Rename to
-	bad_weak_ptr_.
-
-2019-02-18  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/87689
-	* gfortran.dg/lto/20091028-1_0.f90: Add -Wno-lto-type-mismatch to
-	options.
-	* gfortran.dg/lto/20091028-2_0.f90: Likewise.
-	* gfortran.dg/lto/pr87689_0.f: New file.
-	* gfortran.dg/lto/pr87689_1.f: New file.
-
-2019-02-18  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	* g++.dg/wrappers/pr88680.C: Add -fno-short-enums.
-
-2019-02-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gdc.dg/dg.exp: Tabify.
-	* gdc.dg/lto/lto.exp: Likewise.
-	* gdc.test/gdc-test.exp: Likewise.
-	* lib/gdc-dg.exp: Likewise.
-	* lib/gdc.exp: Likewise.
-
-2019-02-18  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89296
-	* gcc.dg/uninit-pr89296.c: New testcase.
-
-2019-02-18  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89369
-	* gcc.c-torture/execute/pr89369.c: New test.
-	* gcc.target/s390/md/rXsbg_mode_sXl.c (rosbg_si_srl,
-	rxsbg_si_srl): Expect last 3 operands 32,63,62 rather than
-	34,63,62.
-
-2019-02-18  Martin Jambor  <mjambor@suse.cz>
-
-	PR tree-optimization/89209
-	* gcc.dg/tree-ssa/pr89209.c: New test.
-
-2019-02-18  Martin Liska  <mliska@suse.cz>
-
-	* gfortran.dg/simd-builtins-7.f90: New test.
-	* gfortran.dg/simd-builtins-7.h: New test.
-
-2019-02-17  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/88299
-	* gfortran.dg/pr88299.f90: New test.
-
-2019-02-17  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89077
-	* gfortran.dg/transfer_simplify_12.f90: New test.
-
-2019-02-17  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89217 - ICE with list-initialization in range-based for loop.
-	* g++.dg/cpp0x/range-for37.C: New test.
-
-	* g++.old-deja/g++.robertl/eb82.C: Tweak dg-error.
-
-	PR c++/89315
-	* g++.dg/cpp0x/initlist114.C: New test.
-
-	PR c++/89356
-	* g++.dg/abi/mangle68.C: New test.
-	* g++.dg/cpp0x/decltype69.C: New test.
-
-2019-02-16  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/88680
-	* g++.dg/wrappers/pr88680.C: New test.
-
-2019-02-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/71066
-	* gfortran.dg/coarray_data_1.f90: New test.
-
-2019-02-16  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* c-c++-common/patchable_function_entry-decl.c: Add -fno-pie on SPARC.
-	* c-c++-common/patchable_function_entry-default.c: Likewise.
-	* c-c++-common/patchable_function_entry-definition.c: Likewise.
-
-2019-02-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/66152
-	* gcc.target/i386/pr66152.c: New test.
-
-2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* g++.dg/asan/asan_oob_test.cc: Skip OOB_int on SPARC.
-	* g++.dg/asan/function-argument-3.C: Tweak for 32-bit SPARC.
-
-2019-02-15  Tamar Christina  <tamar.christina@arm.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_neon_softfp_fp16_ok_nocache): Drop non-fpu
-	checking alternative.
-
-2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.target/sparc/struct-ret-check-1.c: Add -fno-pie option.
-
-2019-02-15  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* c-c++-common/patchable_function_entry-decl.c: Do not run on Visium.
-	* c-c++-common/patchable_function_entry-default.c: Likewise.
-	* c-c++-common/patchable_function_entry-definition.c: Likewise.
-	* gcc.dg/tree-ssa/pr84859.c: Add -ftree-cselim switch.
-
-2019-02-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR other/69006
-	PR testsuite/88920
-	* lib/gcc-dg.exp: If llvm_binutils effective target, set
-	allow_blank_lines to 2 during initialization.
-	(dg-allow-blank-lines-in-output): Set allow_blank_lines to 1 only if
-	it was previously zero.
-	(gcc-dg-prune): Don't check for llvm_binutils effective target here.
-	Clear allow_blank_lines afterwards whenever it was 1.
-	* gdc.test/gdc-test.exp (dmd2dg): Don't call
-	dg-allow-blank-lines-in-output here.
-	(gdc-do-test): Set allow_blank_lines to 3 if it is 0 before running
-	the tests and restore it back at the end.
-
-	* c-c++-common/ubsan/opts-1.c: New test.
-	* c-c++-common/ubsan/opts-2.c: New test.
-	* c-c++-common/ubsan/opts-3.c: New test.
-	* c-c++-common/ubsan/opts-4.c: New test.
-
-2019-02-15  Richard Biener  <rguenther@suse.de>
-	    Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89278
-	* gcc.dg/pr89278.c: New test.
-
-2019-02-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89340
-	* gcc.dg/pr89340.c: New test.
-	* gcc.dg/torture/pr57036-2.c (jpgDecode_convert): Expect a warning
-	that leaf attribute on nested function is useless.
-
-	PR other/89342
-	* gcc.dg/pr89342.c: New test.
-
-2019-02-14  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89354
-	* gcc.dg/pr89354.c: New test.
-
-2019-02-14  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/ssse3-pabsb.c: Re-enable 64-bit form on AVX targets.
-	* gcc.target/i386/ssse3-pabsd.c: Ditto.
-	* gcc.target/i386/ssse3-pabsw.c: Ditto.
-	* gcc.target/i386/ssse3-palignr.c: Ditto.
-	* gcc.target/i386/ssse3-phaddd.c: Ditto.
-	* gcc.target/i386/ssse3-phaddsw.c: Ditto.
-	* gcc.target/i386/ssse3-phaddw.c: Ditto.
-	* gcc.target/i386/ssse3-phsubd.c: Ditto.
-	* gcc.target/i386/ssse3-phsubsw.c: Ditto.
-	* gcc.target/i386/ssse3-phsubw.c: Ditto.
-	* gcc.target/i386/ssse3-pmaddubsw.c: Ditto.
-	* gcc.target/i386/ssse3-pmulhrsw.c: Ditto.
-	* gcc.target/i386/ssse3-pshufb.c: Ditto.
-	* gcc.target/i386/ssse3-psignb.c: Ditto.
-	* gcc.target/i386/ssse3-psignd.c: Ditto.
-	* gcc.target/i386/ssse3-psignw.c: Ditto.
-
-2018-02-14  Steve Ellcey  <sellcey@marvell.com>
-
-	* gcc.target/aarch64/pcs_attribute.c: New test.
-
-2019-02-14  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/88248
-	* gfortran.dg/pr88248.f90: New test.
-	* gfortran.dg/f2018_obs.f90: Updated test.
-
-2019-02-14  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.target/arm/pr88850.c: change options to additional option.
-
-2019-02-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR d/87864
-	* lib/gdc.exp (gdc_link_flags): Add path to drtbegin.o/drtend.o if
-	present.
-
-2019-02-14  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88850
-	* gcc.target/arm/pr88850-2.c: New test.
-	* lib/target-supports.exp
-	(check_effective_target_arm_neon_softfp_fp16_ok_nocache,
-	check_effective_target_arm_neon_softfp_fp16_ok,
-	add_options_for_arm_neon_softfp_fp16): New.
-
-2019-02-14  Matthew Malcomson  <matthew.malcomson@arm.com>
-
-	* gcc.dg/rtl/arm/ldrd-peepholes.c: Restrict testcase.
-	* lib/target-supports.exp: Add procedure to check for ldrd.
-
-2019-02-14  Cesar Philippidis  <cesar@codesourcery.com>
-
-	PR fortran/72715
-	* gfortran.dg/goacc/loop-3-2.f95: Error on do concurrent loops.
-	* gfortran.dg/goacc/loop-3.f95: Likewise.
-	* gfortran.dg/goacc/pr72715.f90: New test.
-
-2019-02-14  Martin Liska  <mliska@suse.cz>
-
-	PR rtl-optimization/89242
-	* g++.dg/pr89242.C: New test.
-
-2019-02-14  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89314
-	* gcc.dg/pr89314.c: New test.
-
-	PR middle-end/89284
-	* gcc.dg/ubsan/pr89284.c: New test.
-
-2019-02-13  Ian Lance Taylor  <iant@golang.org>
-
-	* gcc.dg/func-attr-1.c: New test.
-
-2019-02-13  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* gcc.target/i386/sse2-init-v2di-2.c (dg-final): Update scan string.
-
-2019-02-13  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89297 - ICE with OVERLOAD in template.
-	* g++.dg/cpp0x/initlist113.C: New test.
-
-2019-02-13  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR c++/86379
-	* g++.dg/cpp0x/pr86379.C: New.
-
-	PR c++/87322
-	* g++.dg/cpp1y/pr87322.C: New.
-	* g++.dg/cpp0x/lambda/lambda-variadic5.C: Test that we
-	instantiate the expected number of lambda functions.
-
-2019-02-13  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/77304
-	* g++.dg/cpp2a/nontype-class13.C: New test.
-
-2019-02-13  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR target/89190
-	* gcc.target/arm/pr89190.c: New test.
-
-2019-02-13  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/89036
-	* g++.dg/concepts/pr89036.C: New test.
-
-2019-02-13  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88847
-	* gcc.target/aarch64/sve/pr88847.c: New test.
-
-2019-02-13  Jonathan Wakely  <jwakely@redhat.com>
-	    Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89303
-	* g++.dg/torture/pr89303.C: New test.
-
-2019-02-13  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/88986
-	* g++.dg/cpp1z/using4.C: New.
-	* g++.dg/cpp1z/using5.C: Likewise.
-	* g++.dg/cpp1z/using6.C: Likewise.
-
-2019-02-13  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89290
-	* gcc.target/i386/pr89290.c: New test.
-
-2019-01-23  Xuepeng Guo  <xuepeng.guo@intel.com>
-
-	* gcc.target/i386/enqcmd.c: New test.
-	* gcc.target/i386/enqcmds.c: Likewise.
-	* g++.dg/other/i386-2.C: Add -menqcmd.
-	* g++.dg/other/i386-3.C: Likewise.
-	* gcc.target/i386/sse-12.c: Likewise.
-	* gcc.target/i386/sse-13.c: Likewise.
-	* gcc.target/i386/sse-14.c: Likewise.
-	* gcc.target/i386/sse-23.c: Likewise.
-
-2019-01-23  Xiong Hu Luo  <luoxhu@linux.vnet.ibm.com>
-
-	* gcc.target/powerpc/crypto-builtin-1.c
-	(crypto1_be, crypto2_be, crypto3_be, crypto4_be, crypto5_be):
-	New testcases.
-
-2019-02-12  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/89229
-	* gcc.target/i386/pr89229-1.c: New test.
-
-2019-02-12  Ilya Leoshkevich  <iii@linux.ibm.com>
-
-	PR target/89233
-	* gcc.target/s390/pr89233.c: New test.
-
-2018-01-12  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/vec-sld-modulo.c: Require p8vector_hw.
-	* gcc.target/powerpc/vec-srad-modulo.c: Likewise.
-	* gcc.target/powerpc/vec-srd-modulo.c: Likewise.
-
-2019-02-12  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89253
-	* gfortran.dg/pr89253.f: New testcase.
-
-2019-02-11  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89212 - ICE converting nullptr to pointer-to-member-function.
-	* g++.dg/cpp0x/nullptr40.C: New test.
-	* g++.dg/cpp0x/nullptr41.C: New test.
-
-2019-02-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/88977
-	* g++.dg/cpp2a/is-constant-evaluated7.C: New test.
-
-2019-02-12  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR tree-optimization/86637
-	* gcc.c-torture/compile/pr86637-2.c: Test pthread and graphite target.
-
-2019-02-11  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/88771
-	* gcc.dg/Wstringop-overflow-8.c: New test.
-	* gcc.dg/Wstringop-overflow-9.c: New test.
-	* gcc.dg/Warray-bounds-40.c: New test.
-	* gcc.dg/builtin-stpncpy.c: Adjust.
-	* gcc.dg/builtin-stringop-chk-4.c: Adjust.
-	* g++.dg/opt/memcpy1.C: Adjust.
-
-2019-02-11  Martin Sebor  <msebor@redhat.com>
-
-	PR c++/87996
-	* c-c++-common/array-5.c: New test.
-	* c-c++-common/pr68107.c: Adjust text of diagnostics.
-	* g++.dg/init/new38.C: Same.
-	* g++.dg/init/new43.C: Same.
-	* g++.dg/init/new44.C: Same.
-	* g++.dg/init/new46.C: Same.
-	* g++.dg/other/large-size-array.C: Same.
-	* g++.dg/other/new-size-type.C: Same.
-	* g++.dg/template/array30.C: Same.
-	* g++.dg/template/array32.C: New test.
-	* g++.dg/template/dependent-name3.C: Adjust.
-	* gcc.dg/large-size-array-3.c: Same.
-	* gcc.dg/large-size-array-5.c: Same.
-	* gcc.dg/large-size-array.c: Same.
-	* g++.old-deja/g++.brendan/array1.C: Same.
-	* g++.old-deja/g++.mike/p6149.C: Same.
-
-2019-02-11  Martin Sebor  <msebor@redhat.com>
-
-	* gcc.dg/tree-prof/inliner-1.c: Correct comments.
-
-2019-02-11  Tamar Christina  <tamar.christina@arm.com>
-
-	PR middle-end/88560
-	* gcc.target/arm/armv8_2-fp16-move-1.c: Update assembler scans.
-	* gcc.target/arm/fp16-aapcs-3.c: Likewise.
-	* gcc.target/arm/fp16-aapcs-1.c: Likewise.
-
-2019-02-11  Bill Schmidt  <wschmidt@linux.ibm.com>
-
-	* gcc.target/powerpc/vec-sld-modulo.c: New.
-	* gcc.target/powerpc/vec-srad-modulo.c: New.
-	* gcc.target/powerpc/vec-srd-modulo.c: New.
-
-2019-02-11  Martin Liska  <mliska@suse.cz>
-
-	PR ipa/89009
-	* g++.dg/ipa/pr89009.C: New test.
-
-2019-02-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/71723
-	* gfortran.dg/pointer_init_2.f90: Adjust error messages.
-	* gfortran.dg/pointer_init_6.f90: Likewise.
-	* gfortran.dg/pointer_init_9.f90: New test.
-
-2019-02-10  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/67679
-	* gfortran.dg/warn_undefined_1.f90: New test.o
-
-2019-02-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89268
-	* gcc.dg/vect/pr89268.c: New test.
-
-2019-02-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gnat.dg/lto19.adb: Remove dg-excess-errors.
-
-2019-02-09  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89077
-	* gfortran.dg/substr_simplify.f90: New test.
-
-2019-02-09  Jan Hubicka  <hubicka@ucw.cz>
-
-	PR ipa/88711
-	* gfortran.dg/pr79966.f90: Xfail everwyhere.
-
-2019-02-09  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/89200
-	* gfortran.dg/array_reference_2.f90 : New test.
-
-2019-02-09  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/89246
-	* gcc.dg/gomp/pr89246-1.c: New test.
-	* gcc.dg/gomp/pr89246-2.c: New test.
-
-2019-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88739
-	* gcc.c-torture/execute/pr88739.c: New test.
-
-2019-02-08  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	PR testsuite/89258
-	* gcc.dg/tree-ssa/pr80887.c: Require int32plus.
-
-2019-02-08  Robin Dapp  <rdapp@linux.ibm.com>
-
-	* gcc.target/s390/vector/vec-copysign-execute.c: New test.
-	* gcc.target/s390/vector/vec-copysign.c: New test.
-
-2019-02-08  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89247
-	* gcc.dg/torture/pr89247.c: New testcase.
-
-2019-02-08  Ilya Leoshkevich  <iii@linux.ibm.com>
-
-	* gcc.target/s390/jump-label.c: New test.
-
-2019-02-08  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/89250
-	* gcc.dg/vect/vect-24.c: Remove XFAIL on vect_condition targets.
-
-2019-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/89234
-	* g++.dg/ubsan/pr89234.C: New test.
-
-2019-02-08  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/89223
-	* gcc.dg/torture/pr89223.c: New testcase.
-
-2019-02-07  David Malcolm  <dmalcolm@redhat.com>
-
-	PR tree-optimization/86637
-	PR tree-optimization/89235
-	* gcc.c-torture/compile/pr86637-1.c: New test.
-	* gcc.c-torture/compile/pr86637-2.c: New test.
-	* gcc.c-torture/compile/pr86637-3.c: New test.
-	* gcc.c-torture/compile/pr89235.c: New test.
-
-2019-02-07  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
-
-	* gcc.target/aarch64/abd_1.c: New test.
-	* gcc.dg/sabd_1.c: Likewise.
-
-2019-02-07  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR fortran/52789
-	* gfortran.dg/wunused-parameter_2.f90: New test.
-
-2019-02-07  Matthew Malcomson  <matthew.malcomson@arm.com>
-
-	* gcc.dg/rtl/arm/ldrd-peepholes.c: Only run on arm
-
-2019-02-07  Andreas Krebbel  <krebbel@linux.ibm.com>
-
-	* gcc.target/s390/zvector/xl-xst-align-1.c: New test.
-	* gcc.target/s390/zvector/xl-xst-align-2.c: New test.
-
-2019-02-07  Matthew Malcomson  <matthew.malcomson@arm.com>
-	    Jakub Jelinek  <jakub@redhat.com>
-
-	PR bootstrap/88714
-	* gcc.c-torture/execute/pr88714.c: New test.
-	* gcc.dg/rtl/arm/ldrd-peepholes.c: New test.
-
-2019-02-07  Tamar Christina  <tamar.christina@arm.com>
-
-	PR/target 88850
-	* gcc.target/arm/pr88850.c: New test.
-
-2019-02-07  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR c++/86218
-	* g++.dg/cpp0x/pr86218.C: New.
-
-2019-02-06  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR rtl-optimization/89225
-	* gcc.target/powerpc/pr89225.c: New.
-
-2019-02-06  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt76.adb: New test.
-
-2019-02-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/71860
-	* gfortran.dg/null_10.f90: New test.
-
-2019-02-06  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/71302
-	* g++.dg/cpp0x/Wzero-as-null-pointer-constant-1.C: Add expected
-	column numbers to dg-warning directives where they are correct.
-	* g++.dg/warn/Wzero-as-null-pointer-constant-5.C: Likewise.
-	* g++.dg/warn/Wzero-as-null-pointer-constant-7.C: Likewise.
-	* g++.dg/warn/Wzero-as-null-pointer-constant-8.C: New test.
-
-2019-02-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	PR debug/87451
-	* gcc.dg/debug/dwarf2/inline5.c: Allow for non-comment before
-	"(DIE (0x[0-9a-f]*) DW_TAG_variable".
-	xfail scan-assembler-not with Solaris as.
-
-2019-02-06  Bill Seurer  <seurer@linux.vnet.ibm.com>
-
-	* gcc.target/powerpc/vsx-vector-6.p7.c: Update instruction
-	counts and target.
-	* gcc.target/powerpc/vsx-vector-6.p8.c: Update instruction
-	counts and target.
-	* gcc.target/powerpc/vsx-vector-6.p9.c: Update instruction
-	counts and target.
-
-2019-02-06  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89182
-	* gfortran.dg/graphite/pr89182.f90: New testcase.
-
-2019-02-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89211
-	* gcc.dg/pr89211.c: New test.
-
-	PR middle-end/89210
-	* c-c++-common/builtin-convertvector-2.c: New test.
-
-2019-02-05  Nikhil Benesch  <nikhil.benesch@gmail.com>
-
-	PR go/89019
-	* lib/go-torture.exp: Test compiling with -flto.
-
-2019-02-06  Joseph Myers  <joseph@codesourcery.com>
-
-	PR c/88584
-	* gcc.dg/redecl-18.c: New test.
-
-2019-02-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89187
-	* g++.dg/opt/pr89187.C: New test.
-
-2019-02-05  Andrea Corallo  <andrea.corallo@arm.com>
-
-	* jit.dg/add-driver-options-testlib.c: Add support file for
-	test-add-driver-options.c testcase.
-	* jit.dg/all-non-failing-tests.h: Add note about
-	test-add-driver-options.c
-	* jit.dg/jit.exp (jit-dg-test): Update to support
-	add-driver-options-testlib.c compilation.
-	* jit.dg/test-add-driver-options.c: New testcase.
-
-2019-02-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/11304
-	* gcc.target/i386/call-1.c (set_eax): Add "eax" clobber.
-	* gcc.target/i386/call-2.c: New test.
-
-2019-02-05  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89158 - by-value capture of constexpr variable broken.
-	* g++.dg/cpp0x/lambda/lambda-89158.C: New test.
-
-2019-02-05  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* gcc.dg/vect/pr84711.c: Use -Wno-psabi.
-
-2019-02-05  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.target/powerpc/vec-extract-sint128-1.c: Require int128 effective
-	target.
-	* gcc.target/powerpc/vec-extract-uint128-1.c: Likewise.
-
-	PR target/89188
-	* g++.dg/opt/pr89188.C: New test.
-
-	PR rtl-optimization/89195
-	* gcc.c-torture/execute/pr89195.c: New test.
-
-2019-02-05  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	* gcc.target/powerpc/vec-extract-slong-1.c: Require p8 execution
-	hardware.
-	* gcc.target/powerpc/vec-extract-schar-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-sint128-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-sshort-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-ulong-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-uchar-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-sint-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-uint128-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-ushort-1.c: Likewise.
-	* gcc.target/powerpc/vec-extract-uint-1.c: Likewise.
-
-2019-02-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89186
-	* g++.dg/ext/vector36.C: New test.
-
-2019-02-05  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR c++/87770
-	* g++.dg/pr87770.C: New.
-
-2019-02-04  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/89077
-	* gfortran.dg/pr89077.f90: New test.
-
-2019-02-04  Martin Liska  <mliska@suse.cz>
-
-	PR ipa/88985
-	* gcc.dg/ipa/pr88985.c: New test.
-
-2019-02-04  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.dg/debug/dwarf2/inline5.c: Handle also @, ; or | comment
-	characters or extra spaces after the comment character.
-
-2019-02-04  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/torture/alias-1.C: New test.
-
-2019-02-03  Martin Sebor  <msebor@redhat.com>
-
-	PR c/69661
-	* c-c++-common/Wsequence-point-2.c: New test.
-
-	PR c++/44648
-	* g++.dg/warn/Wunused-var-35.C: New test.
-
-2019-02-03  Richard Biener  <rguenther@suse.de>
-
-	PR debug/87295
-	* g++.dg/debug/dwarf2/pr87295.C: New testcase.
-
-2019-02-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/88298
-	* gfortran.dg/warn_conversion_10.f90: New test.
-
-2019-02-02  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/88393
-	* gfortran.dg/alloc_comp_assign_16.f03 : New test.
-
-2019-02-02  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/88980
-	* gfortran.dg/realloc_on_assign_32.f90 : New test.
-
-2019-02-02  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/88685
-	* gfortran.dg/pointer_array_component_3.f90 : New test.
-
-2019-02-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/87887
-	* gcc.dg/gomp/pr87887-1.c: New test.
-	* gcc.dg/gomp/pr87887-2.c: New test.
-
-2019-02-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR fortran/83246
-	PR fortran/89084
-	* gfortran.dg/pr89084.f90: New test.
-	* gfortran.dg/lto/pr89084_0.f90: New test.
-	* gfortran.dg/pr83246.f90: New test.
-
-2019-02-01  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88325 - ICE with invalid out-of-line template member definition.
-	* g++.dg/cpp2a/typename14.C: New test.
-
-2019-02-01  Richard Biener  <rguenther@suse.de>
-
-	PR middle-end/88597
-	* gcc.dg/torture/pr88597.c: New testcase.
-
-2019-02-01  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/85497
-	* gcc.dg/graphite/pr85497.c: New testcase.
-
-2019-02-01  Richard Biener  <rguenther@suse.de>
-
-	PR testsuite/87451
-	* gcc.dg/debug/dwarf2/inline5.c: Allow more comment variants.
-
-2019-02-01  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89143
-	* gcc.dg/tree-ssa/vrp121.c: New test.
-
-	PR tree-optimization/88107
-	* gcc.dg/gomp/pr88107.c: New test.
-
-	PR c++/87175
-	* g++.dg/ext/attrib57.C: New test.
-
-2018-02-01  Bin Cheng  <bin.cheng@linux.alibaba.com>
-
-	PR tree-optimization/88932
-	* gfortran.dg/pr88932.f90: New test.
-
-2019-01-31  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88983 - ICE with switch in constexpr function.
-	* g++.dg/cpp1y/constexpr-88983.C: New test.
-
-2019-01-31  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/88669
-	* gfortran.dg/contiguous_9.f90: New test.
-
-2019-01-31  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89083, c++/80864 - ICE with list initialization in template.
-	* g++.dg/cpp0x/initlist107.C: New test.
-	* g++.dg/cpp0x/initlist108.C: New test.
-	* g++.dg/cpp0x/initlist109.C: New test.
-	* g++.dg/cpp0x/initlist110.C: New test.
-	* g++.dg/cpp0x/initlist111.C: New test.
-	* g++.dg/cpp0x/initlist112.C: New test.
-	* g++.dg/init/ptrfn4.C: New test.
-
-2019-01-31  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c/89122
-	* g++.dg/spellcheck-stdlib.C (test_FLT_MAX): New test.
-	* gcc.dg/spellcheck-stdlib.c (test_FLT_MAX): New test.
-
-2019-01-31  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89135
-	* gcc.dg/torture/pr89135.c: New testcase.
-
-2019-01-31  Jakub Jelinek  <jakub@redhat.com>
-
-	PR sanitizer/89124
-	* c-c++-common/asan/pr89124.c: New test.
-
-2019-01-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-
-	PR fortran/52564
-	* gfortran.dg/print_2.f90: New test.
-
-2019-01-30  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR rtl-optimization/87246
-	* gcc.target/i386/pr87246.c: New.
-
-2019-01-30  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/89119 - ICE with value-initialization in template.
-	* g++.dg/cpp0x/initlist-value3.C: New test.
-
-2019-01-30  Kelvin Nilsen  <kelvin@gcc.gnu.org>
-
-	* gcc.target/powerpc/vec-extract-schar-1.c: New test.
-	* gcc.target/powerpc/vec-extract-sint-1.c: New test.
-	* gcc.target/powerpc/vec-extract-sint128-1.c: New test.
-	* gcc.target/powerpc/vec-extract-slong-1.c: New test.
-	* gcc.target/powerpc/vec-extract-sshort-1.c: New test.
-	* gcc.target/powerpc/vec-extract-uchar-1.c: New test.
-	* gcc.target/powerpc/vec-extract-uint-1.c: New test.
-	* gcc.target/powerpc/vec-extract-uint128-1.c: New test.
-	* gcc.target/powerpc/vec-extract-ulong-1.c: New test.
-	* gcc.target/powerpc/vec-extract-ushort-1.c: New test.
-
-2019-01-30  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89111
-	* gcc.dg/torture/pr89111.c: New testcase.
-
-2019-01-30  Andrew Stubbs  <ams@codesourcery.com>
-
-	PR testsuite/88920
-	* lib/target-supports.exp: Cache result.
-
-2019-01-30  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/89105
-	* g++.target/i386/pr89105.C: New test.
-
-	PR c/89061
-	* gcc.dg/pr89061.c: New test.
-
-2019-01-29  Martin Sebor  <msebor@redhat.com>
-
-	PR c/88956
-	* gcc.dg/Warray-bounds-39.c: New test.
-
-2019-01-29  Marek Polacek  <polacek@redhat.com>
-
-	PR testsuite/89110
-	* g++.dg/other/nontype-1.C: Expect error in all modes.
-	* g++.dg/parse/crash13.C: Likewise.
-	* g++.dg/parse/error36.C: Likewise.
-	* g++.dg/template/error29.C: Likewise.
-
-2019-01-29  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/57048
-	* gfortran.dg/c_funptr_1.f90: New file.
-	* gfortran.dg/c_funptr_1_mod.f90: New file.
-
-2019-01-29  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/66676
-	PR ipa/89104
-	* gcc.dg/gomp/pr89104.c: New test.
-
-2019-01-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gdc.dg/pr89042a.d: Mark as compile test.
-	* gdc.dg/pr89042b.d: Likewise.
-
-2019-01-29  Richard Biener  <rguenther@suse.de>
-
-	PR debug/87295
-	* g++.dg/lto/pr87295_0.C: New testcase.
-
-2019-01-29  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/89045
-	* gcc.dg/pr89045.c: New test.
-
-	PR c/86125
-	* gcc.dg/Wbuiltin-declaration-mismatch-7.c: Guard testcase for
-	lp64, ilp32 and llp64 only.
-	(fputs): Use unsigned long long instead of size_t for return type.
-	(vfprintf, vfscanf): Accept arbitrary target specific type for
-	va_list.
-
-2019-01-28  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88358 - name wrongly treated as type.
-	* g++.dg/cpp2a/typename1.C: Add dg-error.
-	* g++.dg/cpp2a/typename13.C: New test.
-	* g++.dg/cpp2a/typename6.C: Make a function name qualified.
-	Add typename.
-
-2019-01-28  Marek Polacek  <polacek@redhat.com>
-
-	* g++.dg/cpp0x/enum37.C: Add dg-error.
-
-2019-01-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	* c-c++-common/Waddress-of-packed-member-1.c: Extended test case.
-	* c-c++-common/Waddress-of-packed-member-2.c: New test case.
-
-2019-01-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	* gcc.dg/Wattribute-alias.c: Add test for #pragma GCC diagnostic ignored
-	"-Wattribute-alias".
-
-2019-01-27  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR fortran/70696
-	* gfortran.dg/coarray/event_3.f0: Add save attribue to x.
-
-2019-01-27  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88815 - narrowing conversion lost in decltype.
-	PR c++/78244 - narrowing conversion in template not detected.
-	* g++.dg/cpp0x/Wnarrowing15.C: New test.
-	* g++.dg/cpp0x/Wnarrowing16.C: New test.
-	* g++.dg/cpp0x/constexpr-decltype3.C: New test.
-	* g++.dg/cpp1y/Wnarrowing1.C: New test.
-
-	PR c++/89024 - ICE with incomplete enum type.
-	* g++.dg/cpp0x/enum37.C: New test.
-
-2019-01-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/opt75.adb: New test.
-	* gnat.dg/opt75_pkg.ad[sb]: New helper.
-
-2019-01-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/87214
-	* gcc.target/i386/avx512vl-pr87214-1.c: New test.
-	* gcc.target/i386/avx512vl-pr87214-2.c: New test.
-
-2019-01-26  Martin Jambor  <mjambor@suse.cz>
-
-	PR ipa/88933
-	* gfortran.dg/gomp/pr88933.f90: New test.
-
-2019-01-26  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	PR d/89042
-	* gdc.dg/pr89042a.d: New test.
-	* gdc.dg/pr89042b.d: New test.
-
-2019-01-26  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/57553
-	* gfortran.dg/pr57553.f90: New test.
-
-2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/array34.adb: New test.
-
-2019-01-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR preprocessor/88974
-	* c-c++-common/cpp/pr88974.c: New test.
-
-2019-01-25  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	PR c++/88969
-	* g++.dg/cpp2a/destroying-delete2.C: New.
-	* g++.dg/cpp2a/destroying-delete3.C: Likewise.
-
-2019-01-25  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/85780
-	* gfortran.dg/pr85780.f90: Update testcase for error message.
-
-2019-01-25  Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/88469
-	* gcc.target/aarch64/aapcs64/test_align-10.c: New test.
-	* gcc.target/aarch64/aapcs64/test_align-11.c: New test.
-	* gcc.target/aarch64/aapcs64/test_align-12.c: New test.
-
-2019-01-25  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR middle-end/89037
-	* gcc.dg/pr89037.c: New test.
-
-2019-01-25  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* lib/target-supports.exp (check_effective_target_fenv): New.
-	* gcc.dg/torture/fp-int-convert-float128-timode-3.c: Add missing
-	fenv effective target.
-	* gcc.dg/torture/fp-int-convert-timode-1.c: Likewise.
-	* gcc.dg/torture/fp-int-convert-timode-2.c: Likewise.
-	* gcc.dg/torture/fp-int-convert-timode-3.c: Likewise.
-	* gcc.dg/torture/fp-int-convert-timode-4.c: Likewise.
-
-2019-01-25  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/86865
-	* gcc.dg/graphite/pr86865.c: New testcase.
-	* gcc.dg/graphite/pr69728.c: XFAIL.
-	* gcc.dg/graphite/scop-21.c: Likewise.
-
-2019-01-24  Martin Sebor  <msebor@redhat.com>
-
-	PR c/86125
-	PR c/88886
-	PR middle-end/86308
-	* gcc.dg/Wbuiltin-declaration-mismatch-6.c: New test.
-	* gcc.dg/Wbuiltin-declaration-mismatch-7.c: New test.
-	* gcc.dg/Wbuiltin-declaration-mismatch-8.c: New test.
-	* gcc.dg/Wbuiltin-declaration-mismatch-9.c: New test.
-	* gcc.dg/Wbuiltin-declaration-mismatch-10.c: New test.
-	* gcc.dg/builtins-69.c: New test.
-	* gcc.dg/Wint-conversion-2.c: Add expected warning.
-	* gcc.c-torture/execute/eeprof-1.c: Adjust function signatures.
-
-2019-01-24  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR rtl-optimization/88948
-	* gcc.target/i386/pr88948.c: New test.
-
-2019-01-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR debug/89006
-	* g++.dg/debug/pr89006.C: New test.
-
-	PR middle-end/89015
-	* gcc.dg/gomp/pr89015.c: New test.
-
-	PR c++/88976
-	* c-c++-common/gomp/cancel-2.c: New test.
-	* gcc.dg/gomp/cancel-1.c: New test.
-	* g++.dg/gomp/cancel-1.C: New test.
-	* g++.dg/gomp/cancel-2.C: New test.
-	* g++.dg/gomp/cancel-3.C: New test.
-
-2019-01-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/89027
-	* gfortran.dg/gomp/pr89027.f90: New test.
-
-2019-01-24  Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/88929
-	* gfortran.dg/ISO_Fortran_binding_3.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_3.c: Subsidiary source.
-
-2019-01-23  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR libgcc/88931
-	* gcc.dg/torture/fp-int-convert-timode-1.c: New test.
-	* gcc.dg/torture/fp-int-convert-timode-2.c: Likewise.
-	* gcc.dg/torture/fp-int-convert-timode-3.c: Likewise.
-	* gcc.dg/torture/fp-int-convert-timode-4.c: Likewise.
-
-2019-01-23  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/88998
-	* g++.target/i386/pr88998.c: New test.
-
-2019-01-23  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88757 - qualified name treated wrongly as type.
-	* g++.dg/cpp0x/dependent2.C: New test.
-	* g++.dg/cpp2a/typename10.C: Remove dg-error.
-	* g++.dg/cpp2a/typename12.C: New test.
-	* g++.dg/template/static30.C: Remove dg-error.
-
-2019-01-23  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/44715
-	* c-c++-common/pr44715.c: New test.
-
-	PR c++/88984
-	* c-c++-common/pr88984.c: New test.
-
-2019-01-23  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/89008
-	* gcc.dg/torture/pr89008.c: New testcase.
-
-2019-01-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat.dg/specs/opt4.ads: New test.
-
-2019-01-23  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88964
-	* gfortran.dg/pr88964.f90: New test.
-
-2019-01-22  Martin Sebor  <msebor@redhat.com>
-
-	* c-c++-common/Warray-bounds-2.c: Include headers only if they exist.
-	* c-c++-common/Warray-bounds-3.c: Make xfails conditional on target
-	non_strict_align.
-	* c-c++-common/Wrestrict-2.c: Include headers only if they exist.
-	* c-c++-common/Wrestrict.c: Make xfails conditional on target
-	non_strict_align.
-
-2018-01-22  Steve Ellcey  <sellcey@marvell.com>
-
-	* c-c++-common/gomp/pr60823-1.c: Change aarch64-*-* target
-	to aarch64*-*-* target.
-	* c-c++-common/gomp/pr60823-3.c: Ditto.
-	* g++.dg/gomp/declare-simd-1.C: Ditto.
-	* g++.dg/gomp/declare-simd-3.C: Ditto.
-	* g++.dg/gomp/declare-simd-4.C: Ditto.
-	* g++.dg/gomp/declare-simd-7.C: Ditto.
-	* g++.dg/gomp/pr88182.C: Ditto.
-	* gcc.dg/gomp/declare-simd-1.c: Ditto.
-	* gcc.dg/gomp/declare-simd-3.c: Ditto.
-	* gcc.dg/gomp/pr59669-2.c: Ditto.
-	* gcc.dg/gomp/pr87895-1.c: Ditto.
-	* gcc.dg/gomp/simd-clones-2.c: Ditto.
-	* gfortran.dg/gomp/declare-simd-2.f90: Ditto.
-	* gfortran.dg/gomp/pr79154-1.f90: Ditto.
-	* gfortran.dg/gomp/pr83977.f90: Ditto.
-
-2019-01-22  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/88965
-	* gcc.target/powerpc/pr88965.c: New test.
-
-	PR middle-end/88968
-	* c-c++-common/gomp/atomic-23.c: New test.
-
-2019-01-22  Harald Anlauf  <anlauf@gmx.de>
-
-	PR fortran/88579
-	* gfortran.dg/power_8.f90: New test.
-
-2019-01-22  Sandra Loosemore  <sandra@codesourcery.com>
-
-	* g++.dg/lto/pr87906_0.C: Add dg-require-effective-target fpic.
-	* g++.dg/vec-init-1.C: Likewise.
-	* gcc.dg/pr87793.c: Likewise.
-
-2019-01-22  Sandra Loosemore  <sandra@codesourcery.com>
-
-	* g++.dg/cpp0x/pr86397-1.C: Add -fdelete-null-pointer-checks.
-	* g++.dg/cpp0x/pr86397-2.C: Likewise.
-
-2019-01-22  Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/88469
-	* gcc.target/arm/aapcs/bitfield2.c: New test.
-	* gcc.target/arm/aapcs/bitfield3.c: New test.
-
-2019-01-22  Wilco Dijkstra  <wdijkstr@arm.com>
-
-	PR rtl-optimization/87763
-	* gcc.dg/vect/vect-nop-move.c: Fix testcase on AArch64.
-
-2019-01-22  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/88954
-	* gcc.target/i386/pr88954-1.c: New test.
-	* gcc.target/i386/pr88954-2.c: Likewise.
-
-2019-01-22  Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/88469
-	* gcc.target/arm/aapcs/bitfield1.c: New test.
-	* gcc.target/arm/aapcs/overalign_rec1.c: New test.
-	* gcc.target/arm/aapcs/overalign_rec2.c: New test.
-	* gcc.target/arm/aapcs/overalign_rec3.c: New test.
-
-2019-01-22  Manfred Schwarb  <manfred99@gmx.ch>
-
-	* gfortran.dg/array_function_5.f90: Fix a dg directive.
-	* gfortran.dg/block_16.f08: Likewise.
-	* gfortran.dg/dec_structure_14.f90: Likewise.
-	* gfortran.dg/namelist_96.f90: Likewise.
-	* gfortran.dg/newunit_5.f90.f90: Moved to
-	* gfortran.dg/newunit_5.f90: here.
-	* gfortran.dg/pdt_28.f03: Likewise.
-	* gfortran.dg/spread_simplify_1.f90: Likewise.
-
-2019-01-22  Tamar Christina  <tamar.christina@arm.com>
-
-	PR/tree-optimization 88903
-	* gcc.dg/vect/pr88903-1.c: Add explicit &.
-
-2019-01-22  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/88904
-	* gcc.c-torture/execute/pr88904.c: New test.
-
-	PR target/88905
-	* gcc.dg/pr88905.c: New test.
-
-	PR rtl-optimization/49429
-	PR target/49454
-	PR rtl-optimization/86334
-	PR target/88906
-	* gcc.target/i386/pr86334.c: New test.
-	* gcc.target/i386/pr88906.c: New test.
-
-2019-01-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/88949
-	* g++.dg/gomp/pr88949.C: New test.
-
-2019-01-21  Manfred Schwarb  <manfred99@gmx.ch>
-
-	* class_66.f90: Fix a dg directive.
-	* debug/pr35154-stabs.f: Likewise.
-	* dec_d_lines_3.f: Likewise.
-	* dec_d_lines_3.f: Likewise.
-	* dec_structure_12.f90: Likewise.
-	* dec_structure_15.f90: Likewise.
-	* deferred_character_31.f90: Likewise.
-	* dtio_31.f03: Likewise.
-	* dtio_32.f03: Likewise.
-	* extends_11.f03: Likewise.
-	* integer_plus.f90: Likewise.
-	* pdt_25.f03: Likewise.
-	* pr58968.f: Likewise.
-	* pr78259.f90: Likewise.
-	* vect/vect-2.f90: Likewise.
-	* matmul_const.f90: Likewise.
-
-2019-01-21  Uroš Bizjak  <ubizjak@gmail.com>
-
-	PR target/88938
-	* gcc.target/i386/pr88938.c: New test.
-
-2019-01-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR sanitizer/88901
-	* g++.dg/asan/pr88901.C: New test.
-
-2019-01-21  Tamar Christina  <tamar.christina@arm.com>
-
-	* g++.dg/vect/simd-clone-7.cc: Fix assembler scan.
-
-2019-01-21  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR c/88928
-	* c-c++-common/Waddress-of-packed-member-1.c: New test case.
-	* gcc.dg/pr88928.c: New test case.
-
-2019-01-21  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.dg/utf-array.c: Allow wchar_t to be printed as
-	{long ,short ,}{unsigned ,}int.
-
-2019-01-21  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88934
-	* gfortran.dg/pr88934.f90: New testcase.
-
-2019-01-20  Ulrich Drepper  <drepper@redhat.com>
-
-	Fix after C++ P0600 implementation.
-	* g++.dg/init/new39.C: Don't just ignore result of new.
-
-2019-01-20  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.dg/runnable.d: Add more tests for comparing complex types.
-
-2019-01-20  Johannes Pfau  <johannespfau@gmail.com>
-
-	* gdc.dg/runnable.d: Add tests for comparing complex types.
-
-2019-01-20  Kewen Lin  <linkw@gcc.gnu.org>
-
-	* gcc.target/powerpc/altivec_vld_vst_addr.c: Remove, split into
-	altivec_vld_vst_addr-1.c and altivec_vld_vst_addr-2.c.
-	* gcc.target/powerpc/altivec_vld_vst_addr-1.c: New test.
-	* gcc.target/powerpc/altivec_vld_vst_addr-2.c: Ditto.
-
-2019-01-18  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR fortran/37835
-	* gfortran.dg/no-automatic.f90: New test.
-
-2019-01-19  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/77960
-	* gfortran.dg/pr77960.f90: New test.
-
-2018-01-19  Thomas Koenig  <tkoenig@gcc.gnu.org>
-	    Paul Thomas  <pault@gcc.gnu.org>
-
-	PR fortran/56789
-	* gfortran.dg/contiguous_3.f90: Make code compilant.  Remove
-	scan-tree tests that fail with patch.
-	* gfortran.dg/contiguous_8.f90: New test.
-
-2019-01-19  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gfortran.dg/loop_versioning_1.f90: Bump the number of identified
-	inner strides.
-	* gfortran.dg/loop_versioning_9.f90: New test.
-	* gfortran.dg/loop_versioning_10.f90: Likewise.
-
-2019-01-19  Jakub Jelinek  <jakub@redhat.com>
-
-	PR fortran/88902
-	* gfortran.dg/pr88902.f90: New test.
-
-2019-01-18  Martin Sebor  <msebor@redhat.com>
-
-	* c-c++-common/attr-nonstring-3.c: Remove an xfail.
-
-2019-01-18  Ian Lance Taylor  <iant@golang.org>
-
-	* go.go-torture/execute/names-1.go: Stop using debug/xcoff, which
-	is no longer externally visible.
-
-2019-01-18  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/86926
-	* g++.dg/cpp1z/constexpr-lambda23.C: New test.
-
-2019-01-18  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR middle-end/88587
-	* g++.target/i386/pr88587.C (dg-do): Add { target ia32 }.
-	(dg-options): Replace -m32 with -fno-pic.
-	* gcc.target/i386/mvc13.c (dg-do): Add { target ia32 }.
-	(dg-options): Remove -m32.
-
-2019-01-18  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88903
-	* gcc.dg/vect/pr88903-1.c: New testcase.
-	* gcc.dg/vect/pr88903-2.c: Likewise.
-
-2019-01-18  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR c/51628
-	PR c/88664
-	* c-c++-common/pr51628-33.c: New test.
-	* c-c++-common/pr51628-35.c: New test.
-	* c-c++-common/pr88664-1.c: Likewise.
-	* c-c++-common/pr88664-2.c: Likewise.
-	* gcc.dg/pr51628-34.c: Likewise.
-
-2019-01-18  Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/88799
-	* gcc.target/arm/multilib.exp (config "aprofile"): Add tests for
-	mp and sec extensions to armv7-a.
-
-2019-01-18  Martin Liska  <mliska@suse.cz>
-
-	* gcc.dg/no_profile_instrument_function-attr-1.c: Update
-	expected function name.
-
-2019-01-18  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/86214
-	* g++.dg/opt/pr86214-1.C: New test.
-	* g++.dg/opt/pr86214-2.C: New test.
-
-2019-01-18  Christophe Lyon  <christophe.lyon@linaro.org>
-
-	* gcc.target/arm/pr77904.c: Add dg-warning for sp clobber.
-
-2019-01-18  Jakub Jelinek  <jakub@redhat.com>
-
-	Reapply:
-	2018-12-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/88489
-	* gcc.target/i386/avx512vl-vfixupimmsd-2.c: New test.
-	* gcc.target/i386/avx512vl-vfixupimmss-2.c: New test.
-
-2019-01-18  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/88587
-	* g++.target/i386/pr88587.C: New test.
-	* gcc.target/i386/mvc13.c: New test.
-
-2018-01-17  Steve Ellcey  <sellcey@cavium.com>
-
-	PR fortran/88898
-	* gfortran.dg/gomp/declare-simd-2.f90: Add aarch64 target specifier to
-	warning checks.
-	* gfortran.dg/gomp/pr79154-1.f90: Ditto.
-	* gfortran.dg/gomp/pr83977.f90: Ditto.
-
-2019-01-17  Martin Sebor  <msebor@redhat.com>
-
-	PR middle-end/88273
-	* gcc.dg/Warray-bounds-38.c: New test.
-
-2018-01-17  Steve Ellcey  <sellcey@cavium.com>
-
-	* c-c++-common/gomp/pr60823-1.c: Add aarch64 specific
-	warning checks and assembler scans.
-	* c-c++-common/gomp/pr60823-3.c: Ditto.
-	* c-c++-common/gomp/pr63328.c: Ditto.
-	* g++.dg/gomp/declare-simd-1.C: Ditto.
-	* g++.dg/gomp/declare-simd-3.C: Ditto.
-	* g++.dg/gomp/declare-simd-4.C: Ditto.
-	* g++.dg/gomp/declare-simd-7.C: Ditto.
-	* g++.dg/gomp/pr88182.C: Ditto.
-	* g++.dg/vect/simd-clone-7.cc: Ditto.
-	* gcc.dg/gomp/declare-simd-1.c: Ditto.
-	* gcc.dg/gomp/declare-simd-3.c: Ditto.
-	* gcc.dg/gomp/pr59669-2.c: Ditto.
-	* gcc.dg/gomp/pr87895-1.c: Ditto.
-	* gcc.dg/gomp/pr87895-2.c: Ditto.
-	* gcc.dg/gomp/simd-clones-2.c: Ditto.
-	* gfortran.dg/gomp/declare-simd-2.f90: Ditto.
-	* gfortran.dg/gomp/pr79154-1.f90: Ditto.
-	* gfortran.dg/gomp/pr83977.f90: Ditto.
-
-2019-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/auto52.C: Test locations too.
-	* g++.dg/cpp0x/trailing2.C: Likewise.
-	* g++.dg/cpp1y/auto-fn18.C: Likewise.
-	* g++.dg/cpp1y/auto-fn25.C: Likewise.
-	* g++.dg/cpp1y/auto-fn52.C: Likewise.
-	* g++.dg/cpp1y/auto-fn53.C: Likewise.
-	* g++.dg/cpp1y/auto-fn54.C: Likewise.
-
-2019-01-17  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/88699
-	* g++.dg/template/pr88699.C: New test.
-
-2019-01-17  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/88800
-	* c-c++-common/Wrestrict.c: Adjust.
-	* gcc.dg/Warray-bounds-37.c: New test.
-	* gcc.dg/builtin-memcpy-2.c: New test.
-	* gcc.dg/builtin-memcpy.c: New test.
-
-2019-01-17  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88850
-	* gcc.target/arm/pr51968.c: Use neon intrinsics.
-
-2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
-	    Kwok Cheung Yeung  <kcy@codesourcery.com>
-	    Julian Brown  <julian@codesourcery.com>
-	    Tom de Vries  <tom@codesourcery.com>
-
-	* gcc.dg/20020312-2.c: Add amdgcn support.
-	* gcc.dg/Wno-frame-address.c: Disable on amdgcn.
-	* gcc.dg/builtin-apply2.c: Likewise.
-	* gcc.dg/torture/stackalign/builtin-apply-2.c: Likewise.
-	* gcc.dg/gimplefe-28.c: Add dg-add-options for sqrt_insn.
-	* gcc.dg/intermod-1.c: Add -mlocal-symbol-id on amdgcn.
-	* gcc.dg/memcmp-1.c: Increase timeout factor.
-	* gcc.dg/pr59605-2.c: Addd -DMAX_COPY=1025 on amdgcn.
-	* gcc.dg/sibcall-10.c: xfail on amdgcn.
-	* gcc.dg/sibcall-9.c: Likewise.
-	* gcc.dg/tree-ssa/gen-vect-11c.c: Likewise.
-	* gcc.dg/tree-ssa/pr84512.c: Likewise.
-	* gcc.dg/tree-ssa/loop-1.c: Adjust expectations for amdgcn.
-	* gfortran.dg/bind_c_array_params_2.f90: Likewise.
-	* lib/target-supports.exp (check_effective_target_trampolines):
-	Configure amdgcn.
-	(check_profiling_available): Likewise.
-	(check_effective_target_global_constructor): Likewise.
-	(check_effective_target_return_address): Likewise.
-	(check_effective_target_fopenacc): Likewise.
-	(check_effective_target_fopenmp): Likewise.
-	(check_effective_target_vect_int): Likewise.
-	(check_effective_target_vect_intfloat_cvt): Likewise.
-	(check_effective_target_vect_uintfloat_cvt): Likewise.
-	(check_effective_target_vect_floatint_cvt): Likewise.
-	(check_effective_target_vect_floatuint_cvt): Likewise.
-	(check_effective_target_vect_simd_clones): Likewise.
-	(check_effective_target_vect_shift): Likewise.
-	(check_effective_target_whole_vector_shift): Likewise.
-	(check_effective_target_vect_bswap): Likewise.
-	(check_effective_target_vect_shift_char): Likewise.
-	(check_effective_target_vect_long): Likewise.
-	(check_effective_target_vect_float): Likewise.
-	(check_effective_target_vect_double): Likewise.
-	(check_effective_target_vect_perm): Likewise.
-	(check_effective_target_vect_perm_byte): Likewise.
-	(check_effective_target_vect_perm_short): Likewise.
-	(check_effective_target_vect_widen_mult_qi_to_hi): Likewise.
-	(check_effective_target_vect_widen_mult_hi_to_si): Likewise.
-	(check_effective_target_vect_widen_mult_qi_to_hi_pattern): Likewise.
-	(check_effective_target_vect_widen_mult_hi_to_si_pattern): Likewise.
-	(check_effective_target_vect_natural_alignment): Likewise.
-	(check_effective_target_vect_fully_masked): Likewise.
-	(check_effective_target_vect_element_align): Likewise.
-	(check_effective_target_vect_masked_store): Likewise.
-	(check_effective_target_vect_scatter_store): Likewise.
-	(check_effective_target_vect_condition): Likewise.
-	(check_effective_target_vect_cond_mixed): Likewise.
-	(check_effective_target_vect_char_mult): Likewise.
-	(check_effective_target_vect_short_mult): Likewise.
-	(check_effective_target_vect_int_mult): Likewise.
-	(check_effective_target_sqrt_insn): Likewise.
-	(check_effective_target_vect_call_sqrtf): Likewise.
-	(check_effective_target_vect_call_btrunc): Likewise.
-	(check_effective_target_vect_call_btruncf): Likewise.
-	(check_effective_target_vect_call_ceil): Likewise.
-	(check_effective_target_vect_call_floorf): Likewise.
-	(check_effective_target_lto): Likewise.
-	(check_vect_support_and_set_flags): Likewise.
-	(check_effective_target_vect_stridedN): Enable when fully masked is
-	available.
-	(add_options_for_sqrt_insn): New procedure.
-
-2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
-
-	* lib/file-format.exp (gcc_target_object_format): Handle AMD GCN.
-	* lib/gcc-dg.exp (gcc-dg-prune): Ignore blank lines from the LLVM
-	linker.
-	* lib/target-supports.exp (check_effective_target_llvm_binutils): New.
-
-2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
-
-	* gcc.dg/graphite/scop-19.c: Check pie_enabled.
-	* gcc.dg/pic-1.c: Disable on amdgcn.
-	* gcc.dg/pic-2.c: Disable on amdgcn.
-	* gcc.dg/pic-3.c: Disable on amdgcn.
-	* gcc.dg/pic-4.c: Disable on amdgcn.
-	* gcc.dg/pie-3.c: Disable on amdgcn.
-	* gcc.dg/pie-4.c: Disable on amdgcn.
-	* gcc.dg/uninit-19.c: Check pie_enabled.
-	* lib/target-supports.exp (check_effective_target_pie): Add amdgcn.
-
-2019-01-17  Andrew Stubbs  <ams@codesourcery.com>
-	    Kwok Cheung Yeung  <kcy@codesourcery.com>
-	    Julian Brown  <julian@codesourcery.com>
-	    Tom de Vries  <tom@codesourcery.com>
-
-	* c-c++-common/ubsan/pr71512-1.c: Require exceptions.
-	* c-c++-common/ubsan/pr71512-2.c: Require exceptions.
-	* gcc.c-torture/compile/pr34648.c: Require exceptions.
-	* gcc.c-torture/compile/pr41469.c: Require exceptions.
-	* gcc.dg/20111216-1.c: Require exceptions.
-	* gcc.dg/cleanup-10.c: Require exceptions.
-	* gcc.dg/cleanup-11.c: Require exceptions.
-	* gcc.dg/cleanup-12.c: Require exceptions.
-	* gcc.dg/cleanup-13.c: Require exceptions.
-	* gcc.dg/cleanup-5.c: Require exceptions.
-	* gcc.dg/cleanup-8.c: Require exceptions.
-	* gcc.dg/cleanup-9.c: Require exceptions.
-	* gcc.dg/gomp/pr29955.c: Require exceptions.
-	* gcc.dg/lto/pr52097_0.c: Require exceptions.
-	* gcc.dg/nested-func-5.c: Require exceptions.
-	* gcc.dg/pch/except-1.c: Require exceptions.
-	* gcc.dg/pch/valid-2.c: Require exceptions.
-	* gcc.dg/pr41470.c: Require exceptions.
-	* gcc.dg/pr42427.c: Require exceptions.
-	* gcc.dg/pr44545.c: Require exceptions.
-	* gcc.dg/pr47086.c: Require exceptions.
-	* gcc.dg/pr51481.c: Require exceptions.
-	* gcc.dg/pr51644.c: Require exceptions.
-	* gcc.dg/pr52046.c: Require exceptions.
-	* gcc.dg/pr54669.c: Require exceptions.
-	* gcc.dg/pr56424.c: Require exceptions.
-	* gcc.dg/pr64465.c: Require exceptions.
-	* gcc.dg/pr65802.c: Require exceptions.
-	* gcc.dg/pr67563.c: Require exceptions.
-	* gcc.dg/tree-ssa/pr41469-1.c: Require exceptions.
-	* gcc.dg/tree-ssa/ssa-dse-28.c: Require exceptions.
-	* gcc.dg/vect/pr46663.c: Require exceptions.
-	* lib/target-supports.exp (check_effective_target_exceptions): New.
-
-2019-01-17  Tamar Christina  <tamar.christina@arm.com>
-
-	PR target/88851
-	* gcc.target/aarch64/stack-check-cfa-3.c: Update test.
-
-2019-01-17  Nathan Sidwell  <nathan@acm.org>
-
-	PR c++/86610
-	* g++.dg/cpp0x/pr86610.C: New.
-
-2019-01-17  Wei Xiao  <wei3.xiao@intel.com>
-
-	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Fix the test cases for
-	VFIXUPIMM* intrinsics.
-	* gcc.target/i386/avx512f-vfixupimmps-2.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmss-2.c: Ditto.
-
-2019-01-17  Wei Xiao  <wei3.xiao@intel.com>
-
-	PR target/88794
-	Revert:
-	2018-11-06  Wei Xiao  <wei3.xiao@intel.com>
-
-	* gcc.target/i386/avx-1.c: Update tests for VFIXUPIMM* intrinsics.
-	* gcc.target/i386/avx512f-vfixupimmpd-1.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmps-1.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmsd-1.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmss-1.c: Ditto.
-	* gcc.target/i386/avx512f-vfixupimmss-2.c: Ditto.
-	* gcc.target/i386/avx512vl-vfixupimmpd-1.c: Ditto.
-	* gcc.target/i386/avx512vl-vfixupimmps-1.c: Ditto.
-	* gcc.target/i386/sse-13.c: Ditto.
-	* gcc.target/i386/sse-14.c: Ditto.
-	* gcc.target/i386/sse-22.c: Ditto.
-	* gcc.target/i386/sse-23.c: Ditto.
-	* gcc.target/i386/testimm-10.c: Ditto.
-	* gcc.target/i386/testround-1.c: Ditto.
-
-2019-01-17  Wei Xiao  <wei3.xiao@intel.com>
-
-	PR target/88794
-	Revert:
-	2018-12-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/88489
-	* gcc.target/i386/avx512vl-vfixupimmsd-2.c: New test.
-	* gcc.target/i386/avx512vl-vfixupimmss-2.c: New test.
-
-2019-01-17  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/88870
-	* gcc.dg/pr88870.c: New test.
-
-2019-01-17  Kewen Lin  <linkw@gcc.gnu.org>
-
-	* gcc.target/powerpc/altivec_vld_vst_addr.c: New test.
-
-2019-01-17  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR c++/87768
-	* g++.dg/concepts/pr87768.C: New.
-
-	PR c++/86648
-	* gcc.dg/cpp1z/pr86648.C: New.
-
-2019-01-17  Kewen Lin  <linkw@gcc.gnu.org>
-
-	PR target/87306
-	* gcc.dg/vect/bb-slp-pow-1.c: Modify to reflect that the loop is not
-	vectorized on POWER unless hardware misaligned loads are available.
-
-2019-01-16  David Malcolm  <dmalcolm@redhat.com>
-
-	PR target/88861
-	* g++.dg/torture/pr88861.C: New test.
-
-2019-01-16  Tamar Christina  <tamar.christina@arm.com>
-
-	PR debug/88046
-	* g++.dg/lto/pr88046_0.C: Check for shared and fPIC.
-
-2019-01-16  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/other/pr33558.C: Test location too.
-	* g++.dg/other/pr33558-2.C: Likewise.
-	* g++.dg/parse/crash4.C: Likewise.
-	* g++.old-deja/g++.brendan/err-msg11.C: Likewise.
-	* g++.old-deja/g++.mike/p7635.C: Likewise.
-	* g++.old-deja/g++.other/decl6.C: Likewise.
-
-2019-01-16  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/78244 - narrowing conversion in template not detected.
-	* g++.dg/cpp0x/Wnarrowing13.C: New test.
-	* g++.dg/cpp0x/Wnarrowing14.C: New test.
-
-2019-01-16  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/51628
-	PR target/88682
-	* c-c++-common/pr51628-10.c (unaligned_int128_t): Add
-	may_alias attribute.
-
-2019-01-15  Nikhil Benesch  <nikhil.benesch@gmail.com>
-
-	* gcc.misc-tests/godump-1.c: Add test case for typedef before
-	struct.
-
-2019-01-15  David Malcolm  <dmalcolm@redhat.com>
-
-	PR c++/88795
-	* g++.dg/template/pr88795.C: New test.
-
-2019-01-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/43136
-	* gfortran.dg/actual_array_substr_3.f90: New test.
-
-2019-01-15  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/81849
-	* gfortran.dg/pr81849.f90: New test.
-
-2019-01-15  Paul Thomas  <pault@gcc.gnu.org>
-
-	* gfortran.dg/ISO_Fortran_binding_2.c: Change reference to
-	ISO_Fortran_binding_2.h.
-
-2019-01-15  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88866
-	* g++.dg/cpp0x/variadic126.C: Tweak dg-error.
-
-2019-01-15  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR inline-asm/52813
-	* gcc.target/i386/pr52813.c (test1): Turn the diagnostic into a
-	-Wdeprecated warning and expect a following note:.
-
-2019-01-15  Richard Biener  <rguenther@suse.de>
-
-	PR debug/88046
-	* g++.dg/lto/pr88046_0.C: New testcase.
-
-2019-01-15  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88855
-	* gcc.dg/pr88855.c: New testcase.
-
-2019-01-15  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/typedef-initialized.C: New.
-
-2019-01-15  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/bitfld3.C: New.
-
-2019-01-15  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88775
-	* gcc.dg/tree-ssa/pr88775-1.c: New test.
-	* gcc.dg/tree-ssa/pr88775-2.c: New test.
-
-2019-01-14  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88825 - ICE with bogus function return type deduction.
-	* g++.dg/cpp1y/auto-fn55.C: New test.
-
-2019-01-14  Jakub Jelinek  <jakub@redhat.com>
-
-	* g++.dg/cpp1z/feat-cxx1z.C: Add tests for
-	__cpp_guaranteed_copy_elision and __cpp_nontype_template_parameter_auto
-	feature test macros.
-	* g++.dg/cpp2a/feat-cxx2a.C: Likewise.
-
-2019-01-14  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88830 - ICE with abstract class.
-	* g++.dg/other/abstract7.C: New test.
-
-2019-01-14  Martin Sebor  <msebor@redhat.com>
-
-	PR target/88638
-	* gcc.dg/format/attr-8.c: New test.
-	* gcc.dg/darwin-cfstring-format-1.c: Adjust diagnostics.
-	* gcc.dg/format/attr-3.c: Same.
-	* obj-c++.dg/fsf-nsstring-format-1.mm: Same.
-	* objc.dg/fsf-nsstring-format-1.m: Same.
-
-2019-01-14  Martin Liska  <mliska@suse.cz>
-
-	PR gcov-profile/88263
-	* g++.dg/gcov/pr88263-2.C: New test.
-
-2019-01-14  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/88796
-	* gcc.target/i386/pr88796.c: New test.
-
-2019-01-14  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* gdc.dg/asm1.d: New test.
-	* gdc.dg/asm2.d: New test.
-	* gdc.dg/asm3.d: New test.
-	* gdc.dg/asm4.d: New test.
-	* lib/gdc.exp (gdc_init): Set gcc_error_prefix and gcc_warning_prefix.
-
-2019-01-13  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-
-	PR libfortran/88776
-	* gfortran.dg/namelist_96.f90: New test.
-
-2019-01-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/59345
-	* gfortran.dg/internal_pack_18.f90: New test.
-
-2019-01-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* gcc.dg/pr51628-20.c: Updated.
-	* gcc.dg/pr51628-21.c: Likewise.
-	* gcc.dg/pr51628-25.c: Likewise.
-
-2019-01-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/59345
-	* gfortran.dg/internal_pack_17.f90: New test.
-	* gfortran.dg/alloc_comp_auto_array_3.f90: Adjust number of calls
-	to builtin_free.
-
-2019-01-12  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/61765
-	* gfortran.dg/pr61765.f90: New test.
-
-2019-01-12  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp0x/pr62101.C: Test locations too.
-	* g++.dg/inherit/pure1.C: Likewise.
-
-2019-01-12  Paul Thomas  <pault@gcc.gnu.org>
-
-	* gfortran.dg/ISO_Fortran_binding_2.f90: Remove because of
-	reports of ICEs.
-	* gfortran.dg/ISO_Fortran_binding_2.c: Ditto.
-
-2019-01-12  Paul Thomas  <pault@gcc.gnu.org>
-
-	* gfortran.dg/ISO_Fortran_binding_1.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_1.c: Auxilliary file for test.
-	* gfortran.dg/ISO_Fortran_binding_2.f90: New test.
-	* gfortran.dg/ISO_Fortran_binding_2.c: Auxilliary file for test.
-	* gfortran.dg/bind_c_array_params_2.f90: Change search string
-	for dump tree scan.
-
-2019-01-11  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/35031
-	* gfortran.dg/pr35031.f90: new test.
-
-2019-01-11  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88692, c++/87882 - -Wredundant-move false positive with *this.
-	* g++.dg/cpp0x/Wredundant-move5.C: New test.
-	* g++.dg/cpp0x/Wredundant-move6.C: New test.
-
-2019-01-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/85956
-	PR lto/88733
-	* c-c++-common/gomp/pr85956.c: New test.
-	* g++.dg/gomp/pr88733.C: New test.
-
-2019-01-11  Tobias Burnus  <burnus@net-b.de>
-
-	PR C++/88114
-	* g++.dg/cpp0x/defaulted61.C: New
-	* g++.dg/cpp0x/defaulted62.C: New.
-
-2019-01-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88693
-	* gcc.c-torture/execute/pr88693.c: New test.
-
-2019-01-11  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: Require neon
-	and add options.
-
-2019-01-11  Martin Liska  <mliska@suse.cz>
-
-	PR middle-end/88758
-	* g++.dg/lto/pr88758_0.C: New test.
-	* g++.dg/lto/pr88758_1.C: New test.
-
-2019-01-11  Jan Beulich  <jbeulich@suse.com>
-
-	* gcc.target/i386/avx512f-vcvtsd2si-1.c,
-	gcc.target/i386/avx512f-vcvtss2si-1.c,
-	gcc.target/i386/avx512f-vcvttsd2si-1.c,
-	gcc.target/i386/avx512f-vcvttss2si-1.c: Permit l suffix.
-	* gcc.target/i386/avx512f-vcvtsi2ss-1.c,
-	gcc.target/i386/avx512f-vcvtusi2sd-1.c,
-	gcc.target/i386/avx512f-vcvtusi2ss-1.c: Expect l suffix.
-	* gcc.target/i386/avx512f-vcvtusi2sd-2.c,
-	gcc.target/i386/avx512f-vcvtusi2sd64-2.c,
-	gcc.target/i386/avx512f-vcvtusi2ss-2.c,
-	gcc.target/i386/avx512f-vcvtusi2ss64-2.c: Add asm volatile().
-	gcc.target/i386/pr19398.c: Permit l or q suffix.
-
-2019-01-11  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/88296
-	* gcc.target/i386/pr88296.c: New test.
-
-2019-01-11  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/extern-initialized.C: New.
-	* g++.dg/ext/dllimport-initialized.C: Likewise.
-
-2019-01-11  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/59345
-	* gfortran.dg/internal_pack_16.f90: New test.
-
-2019-01-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/88785
-	* g++.target/i386/pr88785.C: New test.
-
-2019-01-10  Vladimir Makarov  <vmakarov@redhat.com>
-
-	PR rtl-optimization/87305
-	* gcc.target/aarch64/pr87305.c: New.
-
-2019-01-10  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88792
-	* gcc.dg/torture/pr88792.c: New testcase.
-
-2019-01-10  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/86322
-	* gfortran.dg/pr86322_1.f90: New test.
-	* gfortran.dg/pr86322_2.f90: Ditto.
-	* gfortran.dg/pr86322_3.f90: Ditto.
-
-2019-01-10  Sudakshina Das  <sudi.das@arm.com>
-
-	* gcc.target/aarch64/bti-1.c: Exempt for ilp32.
-	* gcc.target/aarch64/bti-2.c: Likewise.
-	* gcc.target/aarch64/bti-3.c: Likewise.
-
-2019-01-10  Stefan Agner  <stefan@agner.ch>
-
-	PR target/88648
-	* gcc.target/arm/pr88648-asm-syntax-unified.c: Add test to
-	check if -masm-syntax-unified gets applied properly.
-
-2019-01-10  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/88568
-	* gcc.dg/pr88568.c: New test.
-
-2019-01-10  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.target/aarch64/advsimd-intrinsics/vector-complex.c: Add AArch32 regexpr.
-	* gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: Likewise.
-
-2019-01-10  Tamar Christina  <tamar.christina@arm.com>
-
-	* gcc.target/aarch64/advsimd-intrinsics/vector-complex.c: New test.
-	* gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: New test.
-
-2019-01-10  Tamar Christina  <tamar.christina@arm.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_arm_v8_3a_complex_neon_ok_nocache,
-	check_effective_target_arm_v8_3a_complex_neon_ok,
-	add_options_for_arm_v8_3a_complex_neon,
-	check_effective_target_arm_v8_3a_complex_neon_hw,
-	check_effective_target_vect_complex_rot_N): New.
-
-2019-01-09  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	PR fortran/88376
-	* gfortran.dg/pr88376.f90: New test.
-
-2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
-
-	PR other/16615
-	* g++.dg/lto/odr-1_1.C: Update diagnostic message patterns to replace
-	"can not" with "cannot".
-	* gfortran.dg/common_15.f90: Likewise.
-	* gfortran.dg/derived_result_2.f90: Likewise.
-	* gfortran.dg/do_check_6.f90: Likewise.
-	* gfortran.dg/namelist_args.f90: Likewise.
-	* gfortran.dg/negative_unit_check.f90: Likewise.
-	* gfortran.dg/pure_formal_3.f90: Likewise.
-	* obj-c++.dg/attributes/method-attribute-2.mm: Likewise.
-	* obj-c++.dg/exceptions-3.mm: Likewise.
-	* obj-c++.dg/exceptions-4.mm: Likewise.
-	* obj-c++.dg/exceptions-5.mm: Likewise.
-	* obj-c++.dg/property/at-property-23.mm: Likewise.
-	* obj-c++.dg/property/dotsyntax-17.mm: Likewise.
-	* obj-c++.dg/property/property-neg-7.mm: Likewise.
-	* objc.dg/attributes/method-attribute-2.m: Likewise.
-	* objc.dg/exceptions-3.m: Likewise.
-	* objc.dg/exceptions-4.m: Likewise.
-	* objc.dg/exceptions-5.m: Likewise.
-	* objc.dg/param-1.m: Likewise.
-	* objc.dg/property/at-property-23.m: Likewise.
-	* objc.dg/property/dotsyntax-17.m: Likewise.
-	* objc.dg/property/property-neg-7.m: Likewise.
-
-2019-01-09  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/68426
-	* gfortran.dg/spread_simplify_1.f90: New test.
-
-2019-01-09  Uroš Bizjak  <ubizjak@gmail.com>
-
-	* lib/target-supports.exp
-	(check_effective_target_xorsign): Add i?86-*-* and x86_64-*-* targets.
-	* gcc.target/i386/xorsign.c: New test.
-
-2019-01-09  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc.target/sparc/tls-ld-int8.c: New test.
-	* gcc.target/sparc/tls-ld-int16.c: Likewise.
-	* gcc.target/sparc/tls-ld-int32.c: Likewise.
-	* gcc.target/sparc/tls-ld-uint8.c: Likewise.
-	* gcc.target/sparc/tls-ld-uint16.c: Likewise.
-	* gcc.target/sparc/tls-ld-uint32.c: Likewise.
-
-2018-01-09  Sudakshina Das  <sudi.das@arm.com>
-
-	* gcc.target/aarch64/bti-1.c: Update test to not add command line
-	option when configure with bti.
-	* gcc.target/aarch64/bti-2.c: Likewise.
-	* lib/target-supports.exp
-	(check_effective_target_default_branch_protection):
-	Add configure check for --enable-standard-branch-protection.
-
-2018-01-09  Sudakshina Das  <sudi.das@arm.com>
-
-	* gcc.target/aarch64/bti-1.c: New test.
-	* gcc.target/aarch64/bti-2.c: New test.
-	* gcc.target/aarch64/bti-3.c: New test.
-	* lib/target-supports.exp
-	(check_effective_target_aarch64_bti_hw): Add new check for BTI hw.
-
-2018-01-09  Sudakshina Das  <sudi.das@arm.com>
-
-	* gcc.target/aarch64/test_frame_17.c: Update to check for EP0_REGNUM
-	instead of IP0_REGNUM and add test case.
-
-2019-01-09  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
-
-	* gcc.target/aarch64/sve/copysign_1.c: New test for SVE vectorized
-	copysign.
-	* gcc.target/aarch64/sve/copysign_1_run.c: Likewise.
-	* gcc.target/aarch64/sve/xorsign_1.c: New test for SVE vectorized
-	xorsign.
-	* gcc.target/aarch64/sve/xorsign_1_run.c: Likewise.
-
-2019-01-09  Jakub Jelinek  <jakub@redhat.com>
-
-	PR rtl-optimization/88331
-	* gcc.target/i386/pr88331.c: New test.
-
-2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/constexpr2.C: New.
-	* g++.dg/diagnostic/ref3.C: Likewise.
-
-2019-01-08  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88538 - braced-init-list in template-argument-list.
-	* g++.dg/cpp2a/nontype-class11.C: New test.
-
-	PR c++/88744
-	* g++.dg/cpp2a/nontype-class12.C: New test.
-
-2019-01-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/88457
-	* gcc.target/powerpc/pr88457.c: Remove -m32, -c and -mcpu=e300c3 from
-	dg-options.  Require ppc_cpu_supports_hw effective target instead of
-	powerpc64*-*-*.
-
-2019-01-08  Janus Weil  <janus@gcc.gnu.org>
-
-	PR fortran/88047
-	* gfortran.dg/class_69.f90: New test case.
-
-2019-01-08  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR target/88717
-	* gcc.target/i386/pr88717.c: New test.
-
-2019-01-08  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88548 - this accepted in static member functions.
-	* g++.dg/cpp0x/this1.C: New test.
-
-2019-01-08  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/88753
-	* gcc.dg/tree-ssa/pr88753.c: New test.
-
-2019-01-08  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/86554
-	* gcc.dg/torture/pr86554-1.c: New testcase.
-	* gcc.dg/torture/pr86554-2.c: Likewise.
-
-2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/thread1.C: Tweak expected error #line 13 to
-	cover target variance.
-
-2019-01-08  Richard Biener  <rguenther@suse.de>
-
-	PR fortran/88611
-	* trans-expr.c (gfc_conv_initializer): For ISOCBINDING_NULL_*
-	directly build the expected GENERIC tree.
-
-2019-01-08  Sam Tebbs  <sam.tebbs@arm.com>
-
-	* gcc.target/aarch64/(return_address_sign_1.c,
-	return_address_sign_2.c, return_address_sign_3.c (__attribute__)):
-	Change option to -mbranch-protection.
-	* gcc.target/aarch64/(branch-protection-option.c,
-	branch-protection-option-2.c, branch-protection-attr.c,
-	branch-protection-attr-2.c): New file.
-
-2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/out-of-class-redeclaration.C: New.
-
-2019-01-08  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* c-c++-common/builtin-has-attribute-3.c: Skip tests requiring symbol
-	alias support.
-	* c-c++-common/builtin-has-attribute-4.c: Likewise.
-	Append match for warning that ‘protected’ attribute is not supported.
-
-2019-01-08  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/Wmissing-attributes.c: Require alias support.
-	* gcc.dg/attr-copy-2.c: Likewise.
-	* gcc.dg/attr-copy-5.c: Likewise.
-
-2019-01-08  Jonathan Wakely  <jwakely@redhat.com>
-	    Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/88554
-	* g++.dg/warn/Wreturn-type-11.C: New test.
-
-2019-01-07  David Malcolm  <dmalcolm@redhat.com>
-
-	PR jit/88747
-	* jit.dg/test-sum-of-squares.c (verify_code): Update expected vrp
-	dump to reflect r266077.
-
-2019-01-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/88701
-	* gcc.dg/pr88701.c: New test.
-
-2019-01-07  Joseph Myers  <joseph@codesourcery.com>
-
-	PR c/88720
-	PR c/88726
-	* gcc.dg/inline-40.c, gcc.dg/inline-41.c: New tests.
-
-2019-01-07  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/diagnostic/constexpr1.C: New.
-	* g++.dg/diagnostic/thread1.C: Likewise.
-
-2019-01-07  Thomas Koenig  <tkoenig@gcc.gnu.org>
-	    Harald Anlauf  <anlauf@gmx.de>
-	    Tobias Burnus  <burnus@gcc.gnu.org>
-
-	* gfortran.dg/is_contiguous_1.f90: New test.
-	* gfortran.dg/is_contiguous_2.f90: New test.
-	* gfortran.dg/is_contiguous_3.f90: New test.
-
-2019-01-07  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88741 - wrong error with initializer-string.
-	* g++.dg/init/array50.C: New test.
-
-2019-01-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-	PR c++/88261
-	PR c++/69338
-	PR c++/69696
-	PR c++/69697
-	* gcc.dg/array-6.c: Move from here ...
-	* c-c++-common/array-6.c: ... to here and add some more test coverage.
-	* g++.dg/pr69338.C: New test.
-	* g++.dg/pr69697.C: Likewise.
-	* g++.dg/ext/flexary32.C: Likewise.
-	* g++.dg/ext/flexary3.C: Adjust test.
-	* g++.dg/ext/flexary12.C: Likewise.
-	* g++.dg/ext/flexary13.C: Likewise.
-	* g++.dg/ext/flexary15.C: Likewise.
-	* g++.dg/warn/Wplacement-new-size-1.C: Likewise.
-	* g++.dg/warn/Wplacement-new-size-2.C: Likewise.
-	* g++.dg/warn/Wplacement-new-size-6.C: Likewise.
-
-2019-01-07  Richard Earnshaw  <rearnsha@arm.com>
-
-	* gcc.target/aarch64/subs_compare_2.c: Make '#' immediate prefix
-	optional in scan pattern.
-
-2019-01-07  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR tree-optimization/88598
-	* gcc.dg/vect/pr88598-1.c: New test.
-	* gcc.dg/vect/pr88598-2.c: Likewise.
-	* gcc.dg/vect/pr88598-3.c: Likewise.
-	* gcc.dg/vect/pr88598-4.c: Likewise.
-	* gcc.dg/vect/pr88598-5.c: Likewise.
-	* gcc.dg/vect/pr88598-6.c: Likewise.
-
-2019-01-07  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR tree-optimization/88598
-	* gcc.dg/pr88598-1.c: New test.
-	* gcc.dg/pr88598-2.c: Likewise.
-	* gcc.dg/pr88598-3.c: Likewise.
-	* gcc.dg/pr88598-4.c: Likewise.
-	* gcc.dg/pr88598-5.c: Likewise.
-
-2019-01-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/88676
-	* gcc.dg/tree-ssa/pr88676.c: New test.
-	* gcc.dg/pr88676.c: New test.
-	* gcc.dg/tree-ssa/pr15826.c: Just verify there is no goto,
-	allow &.
-
-	PR sanitizer/88619
-	* c-c++-common/asan/pr88619.c: New test.
-
-	PR c++/85052
-	* c-c++-common/builtin-convertvector-1.c: New test.
-	* c-c++-common/torture/builtin-convertvector-1.c: New test.
-	* g++.dg/ext/builtin-convertvector-1.C: New test.
-	* g++.dg/cpp0x/constexpr-builtin4.C: New test.
-
-2018-12-26  Mateusz B  <mateuszb@poczta.onet.pl>
-
-	PR target/88521
-	* gcc.target/i386/pr88521.c: New testcase.
-
-2019-01-06  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/88658
-	* gfortran.dg/min_max_type_2.f90: New test.
-
-2019-01-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c/88363
-	* c-c++-common/attributes-4.c (falloc_align_int128,
-	falloc_size_int128): Guard with #ifdef __SIZEOF_INT128__.
-
-2019-01-05  Jan Hubicka  <hubicka@ucw.cz>
-
-	* gcc.dg/ipa/ipcp-2.c: Update bounds.
-
-2019-01-05  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	* gcc.dg/plugin/plugindir1.c: Adjust dg-prune-output for Darwin.
-	* gcc.dg/plugin/plugindir2.c: Likewise.
-	* gcc.dg/plugin/plugindir3.c: Likewise.
-	* gcc.dg/plugin/plugindir4.c: Likewise.
-
-2019-01-05  Janus Weil  <janus@gcc.gnu.org>
-
-	PR fortran/88009
-	* gfortran.dg/blockdata_10.f90: New test case.
-
-2019-01-05  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/82564
-	PR target/88620
-	* gcc.dg/nested-func-12.c: New test.
-	* gcc.c-torture/compile/pr82564.c: New test.
-
-	PR debug/88635
-	* gcc.dg/debug/dwarf2/pr88635.c: New test.
-
-2019-01-05  Dominique d'Humieres  <dominiq@gcc.gnu.org>
-
-	PR target/60563
-	* g++.dg/ext/sync-4.C: Add dg-xfail-run-if for darwin.
-
-2019-01-04  Martin Sebor  <msebor@redhat.com>
-
-	PR c/88546
-	* g++.dg/ext/attr-copy.C: New test.
-	* gcc.dg/attr-copy-4.c: Disable macro expansion tracking.
-	* gcc.dg/attr-copy-6.c: New test.
-	* gcc.dg/attr-copy-7.c: New test.
-
-2019-01-04  Martin Sebor  <msebor@redhat.com>
-
-	PR c/88363
-	* c-c++-common/attributes-4.c: New test.
-
-2019-01-04  Sam Tebbs  <sam.tebbs@arm.com>
-
-	PR gcc/87763
-	* gcc.target/aarch64/combine_bfxil.c: Change scan-assembler-times bfxil
-	count to 18.
-
-2019-01-04  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/48543
-	* gfortran.dg/const_chararacter_merge.f90: Actually remove.
-	* gfortran.dg/merge_char_const.f90: Restore.
-
-2019-01-04  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/88594
-	* gcc.dg/pr88594.c: New test.
-
-2019-01-04  Jan Beulich  <jbeulich@suse.com>
-
-	* gcc.target/i386/avx512bitalg-vpshufbitqmb.c,
-	gcc.target/i386/avx512bw-vpcmpeqb-1.c,
-	gcc.target/i386/avx512bw-vpcmpequb-1.c,
-	gcc.target/i386/avx512bw-vpcmpequw-1.c,
-	gcc.target/i386/avx512bw-vpcmpeqw-1.c,
-	gcc.target/i386/avx512bw-vpcmpgeb-1.c,
-	gcc.target/i386/avx512bw-vpcmpgeub-1.c,
-	gcc.target/i386/avx512bw-vpcmpgeuw-1.c,
-	gcc.target/i386/avx512bw-vpcmpgew-1.c,
-	gcc.target/i386/avx512bw-vpcmpgtb-1.c,
-	gcc.target/i386/avx512bw-vpcmpgtub-1.c,
-	gcc.target/i386/avx512bw-vpcmpgtuw-1.c,
-	gcc.target/i386/avx512bw-vpcmpgtw-1.c,
-	gcc.target/i386/avx512bw-vpcmpleb-1.c,
-	gcc.target/i386/avx512bw-vpcmpleub-1.c,
-	gcc.target/i386/avx512bw-vpcmpleuw-1.c,
-	gcc.target/i386/avx512bw-vpcmplew-1.c,
-	gcc.target/i386/avx512bw-vpcmpltb-1.c,
-	gcc.target/i386/avx512bw-vpcmpltub-1.c,
-	gcc.target/i386/avx512bw-vpcmpltuw-1.c,
-	gcc.target/i386/avx512bw-vpcmpltw-1.c,
-	gcc.target/i386/avx512bw-vpcmpneqb-1.c,
-	gcc.target/i386/avx512bw-vpcmpnequb-1.c,
-	gcc.target/i386/avx512bw-vpcmpnequw-1.c,
-	gcc.target/i386/avx512bw-vpcmpneqw-1.c,
-	gcc.target/i386/avx512bw-vpmovb2m-1.c,
-	gcc.target/i386/avx512bw-vpmovm2b-1.c,
-	gcc.target/i386/avx512bw-vpmovm2w-1.c,
-	gcc.target/i386/avx512bw-vpmovw2m-1.c,
-	gcc.target/i386/avx512bw-vptestmb-1.c,
-	gcc.target/i386/avx512bw-vptestmw-1.c,
-	gcc.target/i386/avx512bw-vptestnmb-1.c,
-	gcc.target/i386/avx512bw-vptestnmw-1.c,
-	gcc.target/i386/avx512cd-vpbroadcastmb2q-1.c,
-	gcc.target/i386/avx512cd-vpbroadcastmw2d-1.c,
-	gcc.target/i386/avx512dq-vfpclasssd-1.c,
-	gcc.target/i386/avx512dq-vfpclassss-1.c,
-	gcc.target/i386/avx512dq-vpmovd2m-1.c,
-	gcc.target/i386/avx512dq-vpmovm2d-1.c,
-	gcc.target/i386/avx512dq-vpmovm2q-1.c,
-	gcc.target/i386/avx512dq-vpmovq2m-1.c,
-	gcc.target/i386/avx512vl-vpbroadcastmb2q-1.c,
-	gcc.target/i386/avx512vl-vpbroadcastmw2d-1.c,
-	gcc.target/i386/avx512vl-vpcmpeqd-1.c,
-	gcc.target/i386/avx512vl-vpcmpeqq-1.c,
-	gcc.target/i386/avx512vl-vpcmpequd-1.c,
-	gcc.target/i386/avx512vl-vpcmpequq-1.c,
-	gcc.target/i386/avx512vl-vpcmpged-1.c,
-	gcc.target/i386/avx512vl-vpcmpgeq-1.c,
-	gcc.target/i386/avx512vl-vpcmpgeud-1.c,
-	gcc.target/i386/avx512vl-vpcmpgeuq-1.c,
-	gcc.target/i386/avx512vl-vpcmpgtd-1.c,
-	gcc.target/i386/avx512vl-vpcmpgtq-1.c,
-	gcc.target/i386/avx512vl-vpcmpgtud-1.c,
-	gcc.target/i386/avx512vl-vpcmpgtuq-1.c,
-	gcc.target/i386/avx512vl-vpcmpled-1.c,
-	gcc.target/i386/avx512vl-vpcmpleq-1.c,
-	gcc.target/i386/avx512vl-vpcmpleud-1.c,
-	gcc.target/i386/avx512vl-vpcmpleuq-1.c,
-	gcc.target/i386/avx512vl-vpcmpltd-1.c,
-	gcc.target/i386/avx512vl-vpcmpltq-1.c,
-	gcc.target/i386/avx512vl-vpcmpltud-1.c,
-	gcc.target/i386/avx512vl-vpcmpltuq-1.c,
-	gcc.target/i386/avx512vl-vpcmpneqd-1.c,
-	gcc.target/i386/avx512vl-vpcmpneqq-1.c,
-	gcc.target/i386/avx512vl-vpcmpnequd-1.c,
-	gcc.target/i386/avx512vl-vpcmpnequq-1.c,
-	gcc.target/i386/avx512vl-vptestmd-1.c,
-	gcc.target/i386/avx512vl-vptestmq-1.c,
-	gcc.target/i386/avx512vl-vptestnmd-1.c,
-	gcc.target/i386/avx512vl-vptestnmq-1.c: Permit %k0 as ordinary
-	operand.
-	* gcc.target/i386/avx512bw-vpcmpb-1.c,
-	gcc.target/i386/avx512bw-vpcmpub-1.c,
-	gcc.target/i386/avx512bw-vpcmpuw-1.c,
-	gcc.target/i386/avx512bw-vpcmpw-1.c,
-	gcc.target/i386/avx512dq-vfpclasspd-1.c,
-	gcc.target/i386/avx512dq-vfpclassps-1.c,
-	gcc.target/i386/avx512f-vcmppd-1.c,
-	gcc.target/i386/avx512f-vcmpps-1.c,
-	gcc.target/i386/avx512f-vcmpsd-1.c,
-	gcc.target/i386/avx512f-vcmpss-1.c,
-	gcc.target/i386/avx512f-vpcmpd-1.c,
-	gcc.target/i386/avx512f-vpcmpq-1.c,
-	gcc.target/i386/avx512f-vpcmpud-1.c,
-	gcc.target/i386/avx512f-vpcmpuq-1.c,
-	gcc.target/i386/avx512f-vptestmd-1.c,
-	gcc.target/i386/avx512f-vptestmq-1.c,
-	gcc.target/i386/avx512f-vptestnmd-1.c,
-	gcc.target/i386/avx512f-vptestnmq-1.c,
-	gcc.target/i386/avx512vl-vcmppd-1.c,
-	gcc.target/i386/avx512vl-vcmpps-1.c,
-	gcc.target/i386/avx512vl-vpcmpd-1.c,
-	gcc.target/i386/avx512vl-vpcmpq-1.c,
-	gcc.target/i386/avx512vl-vpcmpud-1.c,
-	gcc.target/i386/avx512vl-vpcmpuq-1.c: Likewise. Don't permit %k0
-	as mask operand.
-
-2019-01-03  Martin Sebor  <msebor@redhat.com>
-
-	PR tree-optimization/88659
-	* gcc.dg/Wstringop-truncation-6.c: New test.
-
-2019-01-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/48543
-	* gfortran.dg/const_chararacter_merge.f90: Remove.
-
-2019-01-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR debug/88644
-	* gcc.dg/debug/dwarf2/pr88644.c: New test.
-	* gcc.dg/debug/dwarf2/pr80263.c: Remove darwin hack.
-
-2019-01-03  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gcc.dg/pubtypes-2.c: Adjust expected pubtypes length.
-	* gcc.dg/pubtypes-3.c: Likewise.
-	* gcc.dg/pubtypes-4.c: Likewise.
-
-2019-01-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/88636
-	* g++.target/i386/pr88636.C: New test.
-
-2019-01-03  Paolo Carlini  <paolo.carlini@oracle.com>
-
-	* g++.dg/cpp1z/nodiscard3.C: Test locations too.
-
-2019-01-03  Martin Liska  <mliska@suse.cz>
-
-	PR testsuite/88436
-	* gcc.target/powerpc/pr54240.c: Scan phiopt2.
-
-2019-01-02  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/88612 - ICE with -Waddress-of-packed-member.
-	* g++.dg/warn/Waddress-of-packed-member1.C: New test.
-
-	PR c++/88631 - CTAD failing for value-initialization.
-	* g++.dg/cpp1z/class-deduction59.C: New test.
-
-	PR c++/81486 - CTAD failing with ().
-	* g++.dg/cpp1z/class-deduction60.C: New test.
-	* g++.dg/cpp1z/class-deduction61.C: New test.
-
-2019-01-02  Martin Sebor  <msebor@redhat.com>
-	    Jeff Law  <law@redhat.com>
-
-	* gcc.dg/strlenopt-36.c: Update.
-	* gcc.dg/strlenopt-45.c: Update.
-	* gcc.c-torture/execute/strlen-5.c: New test.
-	* gcc.c-torture/execute/strlen-6.c: New test.
-	* gcc.c-torture/execute/strlen-7.c: New test.
-
-2019-01-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR testsuite/87304
-	* gcc.dg/vect/bb-slp-over-widen-1.c: Expect basic block vectorized
-	messages only on vect_hw_misalign targets.
-
-2019-01-02  Steven G. Kargl  <kargl@gcc.gnu.org>
-
-	* gfortran.dg/argument_checking_7.f90: Remove run-on error message.
-	* gfortran.dg/dec_d_lines_3.f: Ditto.
-	* gfortran.dg/dec_structure_24.f90: Ditto.
-	* gfortran.dg/dec_structure_26.f90: Ditto.
-	* gfortran.dg/dec_structure_27.f90: Ditto.
-	* gfortran.dg/dec_type_print_3.f90: Ditto.
-	* gfortran.dg/derived_name_1.f90: Ditto.
-	* gfortran.dg/error_recovery_1.f90: Ditto.
-	* gfortran.dg/gomp/pr29759.f90: Ditto.
-	* gfortran.dg/pr36192.f90: Ditto.
-	* gfortran.dg/pr56007.f90: Ditto.
-	* gfortran.dg/pr56520.f90: Ditto.
-	* gfortran.dg/pr78741.f90: Ditto.
-	* gfortran.dg/print_fmt_2.f90: Ditto.
-	* gfortran.dg/select_type_20.f90: Ditto.
-
-2019-01-02  Marek Polacek  <polacek@redhat.com>
-
-	PR c++/86875
-	* g++.dg/cpp1y/lambda-generic-86875.C: New test.
-
-2019-01-02  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/48543
-	* gfortran.dg/const_chararacter_merge.f90: New test.
-
-2019-01-02  Jan Hubicka  <hubicka@ucw.cz>
-
-	PR lto/88130
-	* g++.dg/torture/pr88130.C: New testcase.
-
-2019-01-02  Martin Liska  <mliska@suse.cz>
-
-	PR tree-optimization/88650
-	* gfortran.dg/predict-3.f90: New test.
-
-2019-01-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* g++.dg/gcov/pr88263.C: Rename namespace log to logging.
-
-2019-01-02  Richard Biener  <rguenther@suse.de>
-
-	PR tree-optimization/88621
-	* gcc.dg/torture/pr88621.c: New testcase.
-
-2019-01-02  Jakub Jelinek  <jakub@redhat.com>
-
-	PR ipa/88561
-	* g++.dg/tree-prof/devirt.C: Expect _ZThn16 only for lp64 and llp64
-	targets and expect _ZThn8 for ilp32 targets.
-
-2019-01-01  Martin Sebor  <msebor@redhat.com>
-	    Jeff Law  <law@redhat.com>
-
-	* gcc.dg/strlenopt-40.c: Update.
-	* gcc.dg/strlenopt-51.c: Likewise.
-	* gcc.dg/tree-ssa/pr79376.c: Likewise.
-
-	* gcc.dg/strlenopt-40.c: Disable a couple tests.
-	* gcc.dg/strlenopt-48.c: Twiddle test slightly.
-	* gcc.dg/strlenopt-59.c: New test.
-	* gcc.dg/tree-ssa/builtin-snprintf-5.c: New test.
-	* g++.dg/init/strlen.C: New test.
-
-2019-01-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-	PR fortran/82743
-	* gfortran.dg/structure_constructor_16.f90: New test.
-
-2019-01-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/ipa/devirt-36.C: Add dg-do-compile.
-	* g++.dg/ipa/devirt-53.C: Fix scan template.
-
-2019-01-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/lto/devirt-13_0.C: Drop broken scan of ssa dump.
-	* g++.dg/lto/devirt-14_0.C: Drop broken scan of ssa dump.
-	* g++.dg/lto/devirt-23_0.C: Add -fdump-ipa-cp.
-
-2019-01-01  Jan Hubicka  <hubicka@ucw.cz>
-
-	* g++.dg/tree-prof/devirt.C: Update testcase.
-
-2019-01-01  Jakub Jelinek  <jakub@redhat.com>
-
-	Update copyright years.
-
-Copyright (C) 2019 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-- 
cgit v1.1


From 224d1b10aeaccbb86b78339f18e83dcd5ad2f956 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Sun, 6 Oct 2019 00:16:37 +0000
Subject: Daily bump.

From-SVN: r276634
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 4d531d0..3d165d7 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191005
+20191006
-- 
cgit v1.1


From b1ca639a8692ac245753b10cb528e0db0f56dd57 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sun, 6 Oct 2019 08:02:03 +0000
Subject: [Darwin] Fix some format-related build warnings.

This fixes two error messages to avoid punctuation and contracted
negations.

gcc/ChangeLog:

2019-10-06  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (darwin_override_options): Adjust objective-c
	ABI version error messages to avoid punctuation and contracted
	negations.

From-SVN: r276635
---
 gcc/ChangeLog       |  6 ++++++
 gcc/config/darwin.c | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d4e180d..a2740d2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-06  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (darwin_override_options): Adjust objective-c
+	ABI version error messages to avoid punctuation and contracted
+	negations.
+
 2019-10-05  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-inline.c: Fix type; compute size rather than self_size
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 2fb9c56..5673982 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -3152,13 +3152,14 @@ darwin_override_options (void)
   if (global_options_set.x_flag_objc_abi && flag_next_runtime)
     {
       if (TARGET_64BIT && global_options.x_flag_objc_abi < 2)
-	error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> >= 2 must be"
-				    " used for %<-m64%> targets with"
-				    " %<-fnext-runtime%>");
+	error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> must be greater"
+				    " than or equal to 2 for %<-m64%> targets"
+				    " with %<-fnext-runtime%>");
       if (!TARGET_64BIT && global_options.x_flag_objc_abi >= 2)
-	error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> >= 2 is not"
+	error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> %d is not"
 				    " supported on %<-m32%> targets with"
-				    " %<-fnext-runtime%>");
+				    " %<-fnext-runtime%>",
+				    global_options.x_flag_objc_abi);
     }
 
   /* Don't emit DWARF3/4 unless specifically selected.  This is a
-- 
cgit v1.1


From 1c8264003ab1d6932d874bd1a9af4ac498d4b4a4 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Sun, 6 Oct 2019 15:39:27 +0000
Subject: Fix EXECUTE_IF_SET_IN_HARD_REG_SET use

As Maxim pointed out, r276309 broke -O3 bootstrap for aarch64-linux-gnu.
It turns out that EXECUTE_IF_SET_IN_HARD_REG_SET isn't safe to use for
temporary objects because their lifetimes don't extend to the end of
the loop.  This patch therefore uses an explicit temporary instead.

Other patches in the series already used this style (but for
full_reg_and_partial_clobbers rather than full_reg_clobbers),
so AFAICT this is the only place that needs fixing.

2019-10-06  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* var-tracking.c (dataflow_set_clear_at_call): Hoist temporary
	function result outside of EXECUTE_IF_SET_IN_HARD_REG_SET.

From-SVN: r276639
---
 gcc/ChangeLog      | 5 +++++
 gcc/var-tracking.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a2740d2..4b7cb0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-06  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* var-tracking.c (dataflow_set_clear_at_call): Hoist temporary
+	function result outside of EXECUTE_IF_SET_IN_HARD_REG_SET.
+
 2019-10-06  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (darwin_override_options): Adjust objective-c
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 3d069e4..5de36ae 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -4902,9 +4902,10 @@ dataflow_set_clear_at_call (dataflow_set *set, rtx_insn *call_insn)
   unsigned int r;
   hard_reg_set_iterator hrsi;
 
-  function_abi callee_abi = insn_callee_abi (call_insn);
+  HARD_REG_SET callee_clobbers
+    = insn_callee_abi (call_insn).full_reg_clobbers ();
 
-  EXECUTE_IF_SET_IN_HARD_REG_SET (callee_abi.full_reg_clobbers (), 0, r, hrsi)
+  EXECUTE_IF_SET_IN_HARD_REG_SET (callee_clobbers, 0, r, hrsi)
     var_regno_delete (set, r);
 
   if (MAY_HAVE_DEBUG_BIND_INSNS)
-- 
cgit v1.1


From 3e1f7c33aeaf33ca532fbef745bb4ab1e3b0aa3f Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Mon, 7 Oct 2019 00:16:24 +0000
Subject: Daily bump.

From-SVN: r276644
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 3d165d7..19cc974 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191006
+20191007
-- 
cgit v1.1


From 806bdf4e40d31cf55744c876eb9f17654de36b99 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 7 Oct 2019 07:53:45 +0000
Subject: re PR tree-optimization/91975 (worse code for small array copy using
 pointer arithmetic than array indexing)

2019-10-07  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/91975
	* tree-ssa-loop-ivcanon.c (constant_after_peeling): Consistently
	handle invariants.

	* g++.dg/tree-ssa/ivopts-3.C: Adjust.
	* gcc.dg/vect/vect-profile-1.c: Disable cunrolli.
	* gcc.dg/vect/vect-double-reduc-6.c: Disable unrolling of
	the innermost loop.
	* gcc.dg/vect/vect-93.c: Likewise.
	* gcc.dg/vect/vect-105.c: Likewise.
	* gcc.dg/vect/pr79920.c: Likewise.
	* gcc.dg/vect/no-vfa-vect-102.c: Likewise.
	* gcc.dg/vect/no-vfa-vect-101.c: Likewise.
	* gcc.dg/vect/pr83202-1.c: Operate on a larger array.
	* gfortran.dg/vect/vect-8.f90: Likewise.
	* gcc.dg/tree-ssa/cunroll-2.c: Scan early unrolling dump instead
	of late one.

From-SVN: r276645
---
 gcc/ChangeLog                                   |  6 ++++++
 gcc/testsuite/ChangeLog                         | 17 +++++++++++++++++
 gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C        |  6 ++++--
 gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c       |  4 ++--
 gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c     |  1 +
 gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c     |  1 +
 gcc/testsuite/gcc.dg/vect/pr79920.c             |  1 +
 gcc/testsuite/gcc.dg/vect/pr83202-1.c           |  4 ++--
 gcc/testsuite/gcc.dg/vect/vect-105.c            |  1 +
 gcc/testsuite/gcc.dg/vect/vect-93.c             |  1 +
 gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c |  1 +
 gcc/testsuite/gcc.dg/vect/vect-profile-1.c      |  2 +-
 gcc/testsuite/gfortran.dg/vect/vect-8.f90       |  2 +-
 gcc/tree-ssa-loop-ivcanon.c                     |  5 ++---
 14 files changed, 41 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b7cb0e..ef1eb59 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-07  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91975
+	* tree-ssa-loop-ivcanon.c (constant_after_peeling): Consistently
+	handle invariants.
+
 2019-10-06  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* var-tracking.c (dataflow_set_clear_at_call): Hoist temporary
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2c7d62a..e8e0060 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2019-10-07  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91975
+	* g++.dg/tree-ssa/ivopts-3.C: Adjust.
+	* gcc.dg/vect/vect-profile-1.c: Disable cunrolli.
+	* gcc.dg/vect/vect-double-reduc-6.c: Disable unrolling of
+	the innermost loop.
+	* gcc.dg/vect/vect-93.c: Likewise.
+	* gcc.dg/vect/vect-105.c: Likewise.
+	* gcc.dg/vect/pr79920.c: Likewise.
+	* gcc.dg/vect/no-vfa-vect-102.c: Likewise.
+	* gcc.dg/vect/no-vfa-vect-101.c: Likewise.
+	* gcc.dg/vect/pr83202-1.c: Operate on a larger array.
+	* gfortran.dg/vect/vect-8.f90: Likewise.
+	* gcc.dg/tree-ssa/cunroll-2.c: Scan early unrolling dump instead
+	of late one.
+
 2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/47045
diff --git a/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C b/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C
index 07ff1b7..6760a5b 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C
@@ -70,6 +70,8 @@ int main ( int , char** ) {
     return 0;
 }
 
-// Verify that on x86_64 and i?86 we use a single IV for the innermost loop
+// Verify that on x86_64 and i?86 we unroll the innsermost loop and
+// use three IVs for the then innermost loop
 
-// { dg-final { scan-tree-dump "Selected IV set for loop \[0-9\]* at \[^ \]*:64, 3 avg niters, 1 IVs" "ivopts" { target x86_64-*-* i?86-*-* } } }
+// { dg-final { scan-tree-dump "Selected IV set for loop \[0-9\]* at \[^ \]*:63, 127 avg niters, 3 IVs" "ivopts" { target x86_64-*-* i?86-*-* } } }
+// { dg-final { scan-tree-dump-not "Selected IV set for loop \[0-9\]* at \[^ \]*:64" "ivopts" { target x86_64-*-* i?86-*-* } } }
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c
index b1d1c7d..ae3fec9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fdump-tree-cunroll-details" } */
+/* { dg-options "-O3 -fdump-tree-cunrolli-details" } */
 int a[2];
 int test2 (void);
 void
@@ -14,4 +14,4 @@ test(int c)
     }
 }
 /* We are not able to get rid of the final conditional because the loop has two exits.  */
-/* { dg-final { scan-tree-dump "loop with 1 iterations completely unrolled" "cunroll"} } */
+/* { dg-final { scan-tree-dump "loop with 2 iterations completely unrolled" "cunrolli"} } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c
index 91eb282..ce93427 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c
@@ -22,6 +22,7 @@ int main1 (int x, int y) {
   p = (struct extraction *) malloc (sizeof (struct extraction));
 
   /* Not vectorizable: different unknown offset.  */
+#pragma GCC unroll 0
   for (i = 0; i < N; i++)
     {
       *((int *)p + x + i) = a[i];
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c
index 51f6278..d9e0529 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c
@@ -28,6 +28,7 @@ int main1 (int x, int y) {
     }
 
   /* Not vectorizable: distance 1.  */
+#pragma GCC unroll 0
   for (i = 0; i < N - 1; i++)
     {
        *((int *)p + x + i + 1) = *((int *)p + x + i);
diff --git a/gcc/testsuite/gcc.dg/vect/pr79920.c b/gcc/testsuite/gcc.dg/vect/pr79920.c
index 276a280..38e0fef 100644
--- a/gcc/testsuite/gcc.dg/vect/pr79920.c
+++ b/gcc/testsuite/gcc.dg/vect/pr79920.c
@@ -14,6 +14,7 @@ compute_integral (double w_1[18])
 
   for (int ip_1 = 0; ip_1 < 2; ++ip_1)
     {
+#pragma GCC unroll 0
       for (int i_0 = 0; i_0 < 6; ++i_0)
 	t33[ip_1][i_0] = ((w_1[i_0*3] * t32[ip_1][0])
 			  + (w_1[i_0*3+2] * t32[ip_1][2]));
diff --git a/gcc/testsuite/gcc.dg/vect/pr83202-1.c b/gcc/testsuite/gcc.dg/vect/pr83202-1.c
index 33c83de..ac12f07 100644
--- a/gcc/testsuite/gcc.dg/vect/pr83202-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr83202-1.c
@@ -1,9 +1,9 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target vect_double } */
 
-void test(double data[8][8])
+void test(double data[16][16])
 {
-  for (int i = 0; i < 8; i++)
+  for (int i = 0; i < 16; i++)
     {
       for (int j = 0; j < i; j+=4)
 	{
diff --git a/gcc/testsuite/gcc.dg/vect/vect-105.c b/gcc/testsuite/gcc.dg/vect/vect-105.c
index 0024457..17b6e89 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-105.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-105.c
@@ -35,6 +35,7 @@ int main1 (int x) {
   /* Vectorizable: distance > number of iterations.  */
   for (i = 1; i < N; i++)
   {
+#pragma GCC unroll 0
     for (j = 0; j < N; j++)
     {
        *((int *)p + x + i + j) = *((int *)p + x + i + j + 5);
diff --git a/gcc/testsuite/gcc.dg/vect/vect-93.c b/gcc/testsuite/gcc.dg/vect/vect-93.c
index 397c2ed..c3e1278 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-93.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-93.c
@@ -29,6 +29,7 @@ main1 (float *pa)
 	abort ();
     }
 
+#pragma GCC unroll 0
   for (i = 1; i <= N2; i++)
     {
       pa[i] = 3.0;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c
index 3a4f087..85aec1b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c
@@ -19,6 +19,7 @@ foo ()
     {
       sum = 1;
       for (j = 0; j < K; j++) 
+#pragma GCC unroll 0
         for (i = 0; i < K; i++)
           sum *= in[i+k][j];
       out[k] = sum;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-profile-1.c b/gcc/testsuite/gcc.dg/vect/vect-profile-1.c
index 93d7ad1..922f965 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-profile-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-profile-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target vect_int } */
-/* { dg-additional-options "-fdump-tree-vect-details-blocks" } */
+/* { dg-additional-options "-fdump-tree-vect-details-blocks -fdisable-tree-cunrolli" } */
 
 /* At least one of these should correspond to a full vector.  */
 
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-8.f90 b/gcc/testsuite/gfortran.dg/vect/vect-8.f90
index e26cdf9..386f7de 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-8.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-8.f90
@@ -247,7 +247,7 @@ nl1= 1
 nl2= 2
 fw= 2.000D0
   DO ky= 2,n
-DO kx= 2,3
+DO kx= 2,4
     du1ky= u1(kx,ky+1,nl1)-u1(kx,ky-1,nl1)
     du2ky= u2(kx,ky+1,nl1)-u2(kx,ky-1,nl1)
     du3ky= u3(kx,ky+1,nl1)-u3(kx,ky-1,nl1)
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 5952cad..d38959c 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -195,9 +195,8 @@ constant_after_peeling (tree op, gimple *stmt, class loop *loop)
   /* Induction variables are constants when defined in loop.  */
   if (loop_containing_stmt (stmt) != loop)
     return false;
-  tree ev = analyze_scalar_evolution (loop, op);
-  if (chrec_contains_undetermined (ev)
-      || chrec_contains_symbols (ev))
+  tree ev = instantiate_parameters (loop, analyze_scalar_evolution (loop, op));
+  if (chrec_contains_undetermined (ev))
     return false;
   return true;
 }
-- 
cgit v1.1


From 698114484e668abf28c70d989bc93fa399dda9ac Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 7 Oct 2019 08:36:06 +0000
Subject: [i386] Make the vzeroupper pattern describe its effects (PR91994)

The problem in this PR was that vzeroupper has an effect on register
contents, but those effects weren't modelled in the rtl pattern,
which was just an unspec_volatile.

This patch fixes that by running a subpass after vzeroupper insertion
to add SETs and CLOBBERs as appropriate.  See the comments in the patch
for more details.

2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	PR target/91994
	* config/i386/sse.md (avx_vzeroupper): Turn into a define_expand
	and wrap the unspec_volatile in a parallel.
	(*avx_vzeroupper): New define_insn.  Use a match_parallel around
	the unspec_volatile.
	* config/i386/predicates.md (vzeroupper_pattern): Expect the
	unspec_volatile to be wrapped in a parallel.
	* config/i386/i386-features.c (ix86_add_reg_usage_to_vzeroupper)
	(ix86_add_reg_usage_to_vzerouppers): New functions.
	(rest_of_handle_insert_vzeroupper): Use them to add register
	usage information to the vzeroupper instructions.

gcc/testsuite/
	PR target/91994
	* gcc.target/i386/pr91994.c: New test.

From-SVN: r276648
---
 gcc/ChangeLog                           | 14 ++++++++
 gcc/config/i386/i386-features.c         | 63 +++++++++++++++++++++++++++++++++
 gcc/config/i386/predicates.md           |  5 +--
 gcc/config/i386/sse.md                  | 13 +++++--
 gcc/testsuite/ChangeLog                 |  5 +++
 gcc/testsuite/gcc.target/i386/pr91994.c | 35 ++++++++++++++++++
 6 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/i386/pr91994.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef1eb59..ef8731f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR target/91994
+	* config/i386/sse.md (avx_vzeroupper): Turn into a define_expand
+	and wrap the unspec_volatile in a parallel.
+	(*avx_vzeroupper): New define_insn.  Use a match_parallel around
+	the unspec_volatile.
+	* config/i386/predicates.md (vzeroupper_pattern): Expect the
+	unspec_volatile to be wrapped in a parallel.
+	* config/i386/i386-features.c (ix86_add_reg_usage_to_vzeroupper)
+	(ix86_add_reg_usage_to_vzerouppers): New functions.
+	(rest_of_handle_insert_vzeroupper): Use them to add register
+	usage information to the vzeroupper instructions.
+
 2019-10-07  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/91975
diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c
index 9b297ba..4781a33 100644
--- a/gcc/config/i386/i386-features.c
+++ b/gcc/config/i386/i386-features.c
@@ -1757,6 +1757,68 @@ convert_scalars_to_vector (bool timode_p)
   return 0;
 }
 
+/* Modify the vzeroupper pattern in INSN so that it describes the effect
+   that the instruction has on the SSE registers.  LIVE_REGS are the set
+   of registers that are live across the instruction.
+
+   For a live register R we use:
+
+     (set (reg:V2DF R) (reg:V2DF R))
+
+   which preserves the low 128 bits but clobbers the upper bits.
+   For a dead register we just use:
+
+     (clobber (reg:V2DF R))
+
+   which invalidates any previous contents of R and stops R from becoming
+   live across the vzeroupper in future.  */
+
+static void
+ix86_add_reg_usage_to_vzeroupper (rtx_insn *insn, bitmap live_regs)
+{
+  rtx pattern = PATTERN (insn);
+  unsigned int nregs = TARGET_64BIT ? 16 : 8;
+  rtvec vec = rtvec_alloc (nregs + 1);
+  RTVEC_ELT (vec, 0) = XVECEXP (pattern, 0, 0);
+  for (unsigned int i = 0; i < nregs; ++i)
+    {
+      unsigned int regno = GET_SSE_REGNO (i);
+      rtx reg = gen_rtx_REG (V2DImode, regno);
+      if (bitmap_bit_p (live_regs, regno))
+	RTVEC_ELT (vec, i + 1) = gen_rtx_SET (reg, reg);
+      else
+	RTVEC_ELT (vec, i + 1) = gen_rtx_CLOBBER (VOIDmode, reg);
+    }
+  XVEC (pattern, 0) = vec;
+  df_insn_rescan (insn);
+}
+
+/* Walk the vzeroupper instructions in the function and annotate them
+   with the effect that they have on the SSE registers.  */
+
+static void
+ix86_add_reg_usage_to_vzerouppers (void)
+{
+  basic_block bb;
+  rtx_insn *insn;
+  auto_bitmap live_regs;
+
+  df_analyze ();
+  FOR_EACH_BB_FN (bb, cfun)
+    {
+      bitmap_copy (live_regs, df_get_live_out (bb));
+      df_simulate_initialize_backwards (bb, live_regs);
+      FOR_BB_INSNS_REVERSE (bb, insn)
+	{
+	  if (!NONDEBUG_INSN_P (insn))
+	    continue;
+	  if (vzeroupper_pattern (PATTERN (insn), VOIDmode))
+	    ix86_add_reg_usage_to_vzeroupper (insn, live_regs);
+	  df_simulate_one_insn_backwards (bb, insn, live_regs);
+	}
+    }
+}
+
 static unsigned int
 rest_of_handle_insert_vzeroupper (void)
 {
@@ -1773,6 +1835,7 @@ rest_of_handle_insert_vzeroupper (void)
 
   /* Call optimize_mode_switching.  */
   g->get_passes ()->execute_pass_mode_switching ();
+  ix86_add_reg_usage_to_vzerouppers ();
   return 0;
 }
 
diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index 72f8e7e..31f1cea 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -1441,8 +1441,9 @@
 
 ;; return true if OP is a vzeroupper pattern.
 (define_predicate "vzeroupper_pattern"
-  (and (match_code "unspec_volatile")
-       (match_test "XINT (op, 1) == UNSPECV_VZEROUPPER")))
+  (and (match_code "parallel")
+       (match_code "unspec_volatile" "a")
+       (match_test "XINT (XVECEXP (op, 0, 0), 1) == UNSPECV_VZEROUPPER")))
 
 ;; Return true if OP is an addsub vec_merge operation
 (define_predicate "addsub_vm_operator"
diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index c7f539f..07922a1 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -19622,9 +19622,16 @@
    (set_attr "mode" "OI")])
 
 ;; Clear the upper 128bits of AVX registers, equivalent to a NOP
-;; if the upper 128bits are unused.
-(define_insn "avx_vzeroupper"
-  [(unspec_volatile [(const_int 0)] UNSPECV_VZEROUPPER)]
+;; if the upper 128bits are unused.  Initially we expand the instructions
+;; as though they had no effect on the SSE registers, but later add SETs and
+;; CLOBBERs to the PARALLEL to model the real effect.
+(define_expand "avx_vzeroupper"
+  [(parallel [(unspec_volatile [(const_int 0)] UNSPECV_VZEROUPPER)])]
+  "TARGET_AVX")
+
+(define_insn "*avx_vzeroupper"
+  [(match_parallel 0 "vzeroupper_pattern"
+     [(unspec_volatile [(const_int 0)] UNSPECV_VZEROUPPER)])]
   "TARGET_AVX"
   "vzeroupper"
   [(set_attr "type" "sse")
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8e0060..01253be 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR target/91994
+	* gcc.target/i386/pr91994.c: New test.
+
 2019-10-07  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/91975
diff --git a/gcc/testsuite/gcc.target/i386/pr91994.c b/gcc/testsuite/gcc.target/i386/pr91994.c
new file mode 100644
index 0000000..033be68
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr91994.c
@@ -0,0 +1,35 @@
+/* { dg-do run } */
+/* { dg-require-effective-target avx } */
+/* { dg-options "-O2 -mavx -mvzeroupper" } */
+
+#include "avx-check.h"
+
+#include <immintrin.h>
+
+__m256i x1, x2, x3;
+
+__attribute__ ((noinline))
+static void
+foo (void)
+{
+  x1 = x2;
+}
+
+void
+bar (void)
+{
+  __m256i x = x1;
+  foo ();
+  x3 = x;
+}
+
+__attribute__ ((noinline))
+void
+avx_test (void)
+{
+  __m256i x = _mm256_set1_epi8 (3);
+  x1 = x;
+  bar ();
+  if (__builtin_memcmp (&x3, &x, sizeof (x)))
+    __builtin_abort ();
+}
-- 
cgit v1.1


From ad00d6c1746fdcbfd86b2d50f2500d7ccb0d1691 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 7 Oct 2019 08:38:49 +0000
Subject: Use CONSTEXPR in machmode.h

This patch adds CONSTEXPR to constructors and operators in machmode.h,
excluding the controversial constexpr-resistant "() {}" constructors,
which would become "= default" if we required C++11.

Some of the other routines could potentially be constexpr too,
but that can be done on an as-needed basis.

2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* machmode.h (opt_mode): Mark constructors with CONSTEXPR.
	(pod_mode): Mark operators likewise.
	(scalar_int_mode): Mark non-default constructors and
	operators with CONSTEXPR.
	(scalar_float_mode, scalar_mode, complex_mode): Likewise.
	(fixed_size_mode): Likewise.

From-SVN: r276649
---
 gcc/ChangeLog  |  9 ++++++
 gcc/machmode.h | 87 +++++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 71 insertions(+), 25 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef8731f..ce91585 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* machmode.h (opt_mode): Mark constructors with CONSTEXPR.
+	(pod_mode): Mark operators likewise.
+	(scalar_int_mode): Mark non-default constructors and
+	operators with CONSTEXPR.
+	(scalar_float_mode, scalar_mode, complex_mode): Likewise.
+	(fixed_size_mode): Likewise.
+
+2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
+
 	PR target/91994
 	* config/i386/sse.md (avx_vzeroupper): Turn into a define_expand
 	and wrap the unspec_volatile in a parallel.
diff --git a/gcc/machmode.h b/gcc/machmode.h
index 005ec80..64ac213 100644
--- a/gcc/machmode.h
+++ b/gcc/machmode.h
@@ -244,11 +244,11 @@ class opt_mode
 public:
   enum from_int { dummy = MAX_MACHINE_MODE };
 
-  ALWAYS_INLINE opt_mode () : m_mode (E_VOIDmode) {}
-  ALWAYS_INLINE opt_mode (const T &m) : m_mode (m) {}
+  ALWAYS_INLINE CONSTEXPR opt_mode () : m_mode (E_VOIDmode) {}
+  ALWAYS_INLINE CONSTEXPR opt_mode (const T &m) : m_mode (m) {}
   template<typename U>
-  ALWAYS_INLINE opt_mode (const U &m) : m_mode (T (m)) {}
-  ALWAYS_INLINE opt_mode (from_int m) : m_mode (machine_mode (m)) {}
+  ALWAYS_INLINE CONSTEXPR opt_mode (const U &m) : m_mode (T (m)) {}
+  ALWAYS_INLINE CONSTEXPR opt_mode (from_int m) : m_mode (machine_mode (m)) {}
 
   machine_mode else_void () const;
   machine_mode else_blk () const { return else_mode (BLKmode); }
@@ -324,8 +324,12 @@ struct pod_mode
   typedef typename T::measurement_type measurement_type;
 
   machine_mode m_mode;
-  ALWAYS_INLINE operator machine_mode () const { return m_mode; }
-  ALWAYS_INLINE operator T () const { return from_int (m_mode); }
+  ALWAYS_INLINE CONSTEXPR
+  operator machine_mode () const { return m_mode; }
+
+  ALWAYS_INLINE CONSTEXPR
+  operator T () const { return from_int (m_mode); }
+
   ALWAYS_INLINE pod_mode &operator = (const T &m) { m_mode = m; return *this; }
 };
 
@@ -403,8 +407,11 @@ public:
   typedef unsigned short measurement_type;
 
   ALWAYS_INLINE scalar_int_mode () {}
-  ALWAYS_INLINE scalar_int_mode (from_int m) : m_mode (machine_mode (m)) {}
-  ALWAYS_INLINE operator machine_mode () const { return m_mode; }
+
+  ALWAYS_INLINE CONSTEXPR
+  scalar_int_mode (from_int m) : m_mode (machine_mode (m)) {}
+
+  ALWAYS_INLINE CONSTEXPR operator machine_mode () const { return m_mode; }
 
   static bool includes_p (machine_mode);
 
@@ -428,8 +435,11 @@ public:
   typedef unsigned short measurement_type;
 
   ALWAYS_INLINE scalar_float_mode () {}
-  ALWAYS_INLINE scalar_float_mode (from_int m) : m_mode (machine_mode (m)) {}
-  ALWAYS_INLINE operator machine_mode () const { return m_mode; }
+
+  ALWAYS_INLINE CONSTEXPR
+  scalar_float_mode (from_int m) : m_mode (machine_mode (m)) {}
+
+  ALWAYS_INLINE CONSTEXPR operator machine_mode () const { return m_mode; }
 
   static bool includes_p (machine_mode);
 
@@ -453,11 +463,20 @@ public:
   typedef unsigned short measurement_type;
 
   ALWAYS_INLINE scalar_mode () {}
-  ALWAYS_INLINE scalar_mode (from_int m) : m_mode (machine_mode (m)) {}
-  ALWAYS_INLINE scalar_mode (const scalar_int_mode &m) : m_mode (m) {}
-  ALWAYS_INLINE scalar_mode (const scalar_float_mode &m) : m_mode (m) {}
-  ALWAYS_INLINE scalar_mode (const scalar_int_mode_pod &m) : m_mode (m) {}
-  ALWAYS_INLINE operator machine_mode () const { return m_mode; }
+
+  ALWAYS_INLINE CONSTEXPR
+  scalar_mode (from_int m) : m_mode (machine_mode (m)) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  scalar_mode (const scalar_int_mode &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  scalar_mode (const scalar_float_mode &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  scalar_mode (const scalar_int_mode_pod &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR operator machine_mode () const { return m_mode; }
 
   static bool includes_p (machine_mode);
 
@@ -494,8 +513,11 @@ public:
   typedef unsigned short measurement_type;
 
   ALWAYS_INLINE complex_mode () {}
-  ALWAYS_INLINE complex_mode (from_int m) : m_mode (machine_mode (m)) {}
-  ALWAYS_INLINE operator machine_mode () const { return m_mode; }
+
+  ALWAYS_INLINE CONSTEXPR
+  complex_mode (from_int m) : m_mode (machine_mode (m)) {}
+
+  ALWAYS_INLINE CONSTEXPR operator machine_mode () const { return m_mode; }
 
   static bool includes_p (machine_mode);
 
@@ -764,14 +786,29 @@ public:
   typedef unsigned short measurement_type;
 
   ALWAYS_INLINE fixed_size_mode () {}
-  ALWAYS_INLINE fixed_size_mode (from_int m) : m_mode (machine_mode (m)) {}
-  ALWAYS_INLINE fixed_size_mode (const scalar_mode &m) : m_mode (m) {}
-  ALWAYS_INLINE fixed_size_mode (const scalar_int_mode &m) : m_mode (m) {}
-  ALWAYS_INLINE fixed_size_mode (const scalar_float_mode &m) : m_mode (m) {}
-  ALWAYS_INLINE fixed_size_mode (const scalar_mode_pod &m) : m_mode (m) {}
-  ALWAYS_INLINE fixed_size_mode (const scalar_int_mode_pod &m) : m_mode (m) {}
-  ALWAYS_INLINE fixed_size_mode (const complex_mode &m) : m_mode (m) {}
-  ALWAYS_INLINE operator machine_mode () const { return m_mode; }
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (from_int m) : m_mode (machine_mode (m)) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (const scalar_mode &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (const scalar_int_mode &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (const scalar_float_mode &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (const scalar_mode_pod &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (const scalar_int_mode_pod &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR
+  fixed_size_mode (const complex_mode &m) : m_mode (m) {}
+
+  ALWAYS_INLINE CONSTEXPR operator machine_mode () const { return m_mode; }
 
   static bool includes_p (machine_mode);
 
-- 
cgit v1.1


From 9b0365879b3c4917f5a2485a1fca8bb678484bfe Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 7 Oct 2019 08:39:12 +0000
Subject: [IRA] Handle fully-tied destinations in a similar way to
 earlyclobbers

IRA's make_early_clobber_and_input_conflicts checks for cases in
which an output operand is likely to be an earlyclobber and an input
operand is unlikely to be tieable with it.  If so, the allocno for
the output conflicts with the allocno for the input.  This seems
to work well.

However, a similar situation arises if an output operand is likely
to be tied to one of a set of input operands X and if another input
operand has a different value from all of the operands in X.
E.g. if we have:

  0: "=r, r"
  1: "0, r"
  2: "r, 0"
  3: "r, r"

operand 0 will always be tied to operand 1 or operand 2, so if operand 3
is different from them both, operand 0 acts like an earlyclobber as far
as operand 3 (only) is concerned.  The same is true for operand 2 in:

  0: "=r"
  1: "0"
  2: "r"

In the second example, we'd normally have a copy between operand 1 and
operand 0 if operand 1 dies in the instruction, and so there's rarely
a problem.  But if operand 1 doesn't die in the instruction, operand 0
still acts as an earlyclobber for operand 2 (if different from operand 1),
since in that case LRA must copy operand 1 to operand 0 before the
instruction.

As the existing comment says:

    Avoid introducing unnecessary conflicts by checking classes of the
    constraints and pseudos because otherwise significant code
    degradation is possible for some targets.

I think that's doubly true here.  E.g. it's perfectly reasonable to have
constraints like:

  0: "=r, r"
  1: "0, r"
  2: "r, r"

on targets like s390 that have shorter instructions for tied operands,
but that don't want the size difference to influence RA too much.
We shouldn't treat operand 0 as earlyclobber wrt operand 2 in that case.

This patch therefore treats a normal tied non-earlyclobber output as
being effectively earlyclobber wrt to an input if it is so for *all*
preferred alternatives.

2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* ira-lives.c (check_and_make_def_conflict): Handle cases in which
	DEF is not a true earlyclobber but is tied to a specific input
	operand, and so is effectively earlyclobber wrt inputs that have
	different values.
	(make_early_clobber_and_input_conflicts): Pass this case to the above.

From-SVN: r276650
---
 gcc/ChangeLog   |  8 ++++++
 gcc/ira-lives.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 80 insertions(+), 14 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce91585..798d16c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* ira-lives.c (check_and_make_def_conflict): Handle cases in which
+	DEF is not a true earlyclobber but is tied to a specific input
+	operand, and so is effectively earlyclobber wrt inputs that have
+	different values.
+	(make_early_clobber_and_input_conflicts): Pass this case to the above.
+
+2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* machmode.h (opt_mode): Mark constructors with CONSTEXPR.
 	(pod_mode): Mark operators likewise.
 	(scalar_int_mode): Mark non-default constructors and
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index cce73a1..098b0e7 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -633,9 +633,28 @@ check_and_make_def_use_conflict (rtx dreg, rtx orig_dreg,
 
 /* Check and make if necessary conflicts for definition DEF of class
    DEF_CL of the current insn with input operands.  Process only
-   constraints of alternative ALT.  */
+   constraints of alternative ALT.
+
+   One of three things is true when this function is called:
+
+   (1) DEF is an earlyclobber for alternative ALT.  Input operands then
+       conflict with DEF in ALT unless they explicitly match DEF via 0-9
+       constraints.
+
+   (2) DEF matches (via 0-9 constraints) an operand that is an
+       earlyclobber for alternative ALT.  Other input operands then
+       conflict with DEF in ALT.
+
+   (3) [FOR_TIE_P] Some input operand X matches DEF for alternative ALT.
+       Input operands with a different value from X then conflict with
+       DEF in ALT.
+
+   However, there's still a judgement call to make when deciding
+   whether a conflict in ALT is important enough to be reflected
+   in the pan-alternative allocno conflict set.  */
 static void
-check_and_make_def_conflict (int alt, int def, enum reg_class def_cl)
+check_and_make_def_conflict (int alt, int def, enum reg_class def_cl,
+			     bool for_tie_p)
 {
   int use, use_match;
   ira_allocno_t a;
@@ -669,14 +688,40 @@ check_and_make_def_conflict (int alt, int def, enum reg_class def_cl)
       if (use == def || recog_data.operand_type[use] == OP_OUT)
 	continue;
 
+      /* An earlyclobber on DEF doesn't apply to an input operand X if X
+	 explicitly matches DEF, but it applies to other input operands
+	 even if they happen to be the same value as X.
+
+	 In contrast, if an input operand X is tied to a non-earlyclobber
+	 DEF, there's no conflict with other input operands that have the
+	 same value as X.  */
+      if (op_alt[use].matches == def
+	  || (for_tie_p
+	      && rtx_equal_p (recog_data.operand[use],
+			      recog_data.operand[op_alt[def].matched])))
+	continue;
+
       if (op_alt[use].anything_ok)
 	use_cl = ALL_REGS;
       else
 	use_cl = op_alt[use].cl;
+      if (use_cl == NO_REGS)
+	continue;
+
+      /* If DEF is simply a tied operand, ignore cases in which this
+	 alternative requires USE to have a likely-spilled class.
+	 Adding a conflict would just constrain USE further if DEF
+	 happens to be allocated first.  */
+      if (for_tie_p && targetm.class_likely_spilled_p (use_cl))
+	continue;
 
       /* If there's any alternative that allows USE to match DEF, do not
 	 record a conflict.  If that causes us to create an invalid
-	 instruction due to the earlyclobber, reload must fix it up.  */
+	 instruction due to the earlyclobber, reload must fix it up.
+
+	 Likewise, if we're treating a tied DEF like a partial earlyclobber,
+	 do not record a conflict if there's another alternative in which
+	 DEF is neither tied nor earlyclobber.  */
       for (alt1 = 0; alt1 < recog_data.n_alternatives; alt1++)
 	{
 	  if (!TEST_BIT (preferred_alternatives, alt1))
@@ -691,6 +736,12 @@ check_and_make_def_conflict (int alt, int def, enum reg_class def_cl)
 		  && recog_data.constraints[use - 1][0] == '%'
 		  && op_alt1[use - 1].matches == def))
 	    break;
+	  if (for_tie_p
+	      && !op_alt1[def].earlyclobber
+	      && op_alt1[def].matched < 0
+	      && alternative_class (op_alt1, def) != NO_REGS
+	      && alternative_class (op_alt1, use) != NO_REGS)
+	    break;
 	}
 
       if (alt1 < recog_data.n_alternatives)
@@ -701,8 +752,7 @@ check_and_make_def_conflict (int alt, int def, enum reg_class def_cl)
 
       if ((use_match = op_alt[use].matches) >= 0)
 	{
-	  if (use_match == def)
-	    continue;
+	  gcc_checking_assert (use_match != def);
 
 	  if (op_alt[use_match].anything_ok)
 	    use_cl = ALL_REGS;
@@ -717,7 +767,11 @@ check_and_make_def_conflict (int alt, int def, enum reg_class def_cl)
 /* Make conflicts of early clobber pseudo registers of the current
    insn with its inputs.  Avoid introducing unnecessary conflicts by
    checking classes of the constraints and pseudos because otherwise
-   significant code degradation is possible for some targets.  */
+   significant code degradation is possible for some targets.
+
+   For these purposes, tying an input to an output makes that output act
+   like an earlyclobber for inputs with a different value, since the output
+   register then has a predetermined purpose on input to the instruction.  */
 static void
 make_early_clobber_and_input_conflicts (void)
 {
@@ -732,15 +786,19 @@ make_early_clobber_and_input_conflicts (void)
     if (TEST_BIT (preferred_alternatives, alt))
       for (def = 0; def < n_operands; def++)
 	{
-	  def_cl = NO_REGS;
-	  if (op_alt[def].earlyclobber)
+	  if (op_alt[def].anything_ok)
+	    def_cl = ALL_REGS;
+	  else
+	    def_cl = op_alt[def].cl;
+	  if (def_cl != NO_REGS)
 	    {
-	      if (op_alt[def].anything_ok)
-		def_cl = ALL_REGS;
-	      else
-		def_cl = op_alt[def].cl;
-	      check_and_make_def_conflict (alt, def, def_cl);
+	      if (op_alt[def].earlyclobber)
+		check_and_make_def_conflict (alt, def, def_cl, false);
+	      else if (op_alt[def].matched >= 0
+		       && !targetm.class_likely_spilled_p (def_cl))
+		check_and_make_def_conflict (alt, def, def_cl, true);
 	    }
+
 	  if ((def_match = op_alt[def].matches) >= 0
 	      && (op_alt[def_match].earlyclobber
 		  || op_alt[def].earlyclobber))
@@ -749,7 +807,7 @@ make_early_clobber_and_input_conflicts (void)
 		def_cl = ALL_REGS;
 	      else
 		def_cl = op_alt[def_match].cl;
-	      check_and_make_def_conflict (alt, def, def_cl);
+	      check_and_make_def_conflict (alt, def, def_cl, false);
 	    }
 	}
 }
-- 
cgit v1.1


From 7a3248463c2095ba112a31809f2965d04bed03b3 Mon Sep 17 00:00:00 2001
From: Mark Eggleston <markeggleston@gcc.gnu.org>
Date: Mon, 7 Oct 2019 09:13:16 +0000
Subject: Delete auto-in_equiv.f90 forgot to use svn delete the first time.

From-SVN: r276651
---
 gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90 | 63 ---------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90

(limited to 'gcc')

diff --git a/gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90 b/gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90
deleted file mode 100644
index 57c384d..0000000
--- a/gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90
+++ /dev/null
@@ -1,63 +0,0 @@
-! { dg-do run }
-! { dg-options "-fdec-static -fno-automatic" }
-
-! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
-
-! Storage is NOT on the static unless explicitly specified using the
-! DEC extension "automatic". The address of the first local variable
-! is used to determine that storage for the automatic local variable
-! is different to that of a local variable with no attributes. The
-! contents of the local variable in suba should be overwritten by the
-! call to subb. 
-!
-program test
-  integer :: dummy
-  integer, parameter :: address = kind(loc(dummy))
-  integer(address) :: ad1
-  integer(address) :: ad2
-  integer(address) :: ad3
-  logical :: ok
-
-  call suba(0, ad1)
-  call subb(0, ad2)
-  call suba(1, ad1)
-  call subc(0, ad3)
-  ok = (ad1.eq.ad3).and.(ad1.ne.ad2)
-  if (.not.ok) stop 4
-
-contains
-  subroutine suba(option, addr) 
-    integer, intent(in) :: option
-    integer(address), intent(out) :: addr
-    integer, automatic :: a
-    integer :: b
-    equivalence (a, b)
-    addr = loc(a)
-    if (option.eq.0) then
-      ! initialise a and c
-      a = 9
-      if (a.ne.b) stop 1
-      if (loc(a).ne.loc(b)) stop 2
-    else
-      ! a should've been overwritten
-      if (a.eq.9) stop 3
-    end if
-  end subroutine suba
-
-  subroutine subb(dummy, addr)
-    integer, intent(in) :: dummy
-    integer(address), intent(out) :: addr
-    integer :: x
-    addr = loc(x)
-    x = 77
-  end subroutine subb
-
-  subroutine subc(dummy, addr)
-    integer, intent(in) :: dummy
-    integer(address), intent(out) :: addr
-    integer, automatic :: y
-    addr = loc(y)
-    y = 77
-  end subroutine subc
-
-end program test
-- 
cgit v1.1


From 3faf75d458529592007436a0972f44e14ebf46f6 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@redhat.com>
Date: Mon, 7 Oct 2019 09:39:42 +0000
Subject: Use value_range_base::num_pairs instead of vrp_val_is* to check if a
 range has one sub-range.

From-SVN: r276653
---
 gcc/ChangeLog  | 8 +++++++-
 gcc/tree-vrp.c | 5 +----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 798d16c..fbb1634 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-07  Aldy Hernandez  <aldyh@redhat.com>
+
+	* tree-vrp.c (value_range_base::singleton_p): Use
+	value_range_base::num_pairs instead of vrp_val_is* to check
+	if a range has one sub-range.
+
 2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* ira-lives.c (check_and_make_def_conflict): Handle cases in which
@@ -179,7 +185,7 @@
 
 2019-10-04  Aldy Hernandez  <aldyh@redhat.com>
 
-	(value_range_from_overflowed_bounds): Rename from
+	* range-op.o (value_range_from_overflowed_bounds): Rename from
 	adjust_overflow_bound.
 	(value_range_with_overflow): Rename from
 	create_range_with_overflow.
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index a2ab4a2..86e4dac 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -379,10 +379,7 @@ value_range_base::singleton_p (tree *result) const
 	    }
 	  return false;
 	}
-
-      /* An anti-range that includes an extreme, is just a range with
-	 one sub-range.  Use the one sub-range.  */
-      if (vrp_val_is_min (m_min, true) || vrp_val_is_max (m_max, true))
+      if (num_pairs () == 1)
 	{
 	  value_range_base vr0, vr1;
 	  ranges_from_anti_range (this, &vr0, &vr1, true);
-- 
cgit v1.1


From 523fe5b61119c17d9b5adf4a6a4cffa10cfaacf7 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@redhat.com>
Date: Mon, 7 Oct 2019 11:43:13 +0000
Subject: Disentangle range_fold_*ary_expr() into various independent pieces.

From-SVN: r276654
---
 gcc/ChangeLog  |  20 +++++
 gcc/ipa-prop.c |  16 +++-
 gcc/ipa-prop.h |   1 +
 gcc/tree-vrp.c | 264 +++++++++++++++++++++++++++++++++------------------------
 gcc/tree-vrp.h |   1 +
 5 files changed, 187 insertions(+), 115 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbb1634..83ad001 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,25 @@
 2019-10-07  Aldy Hernandez  <aldyh@redhat.com>
 
+	* ipa-prop.c (ipa_vr::nonzero_p): New.
+	(ipcp_update_vr): Use nonzero_p instead of open-coding check for
+	non-zero range.
+	* ipa-prop.h (class ipa_vr): Add nonzero_p.
+	* tree-vrp.c (range_has_numeric_bounds_p): New.
+	(range_int_cst_p): Use range_has_numeric_bounds_p.
+	(get_range_op_handler): New.
+	(supported_types_p): New.
+	(defined_ranges_p): New.
+	(drop_undefines_to_varying): New.
+	(range_fold_binary_symbolics_p): New.
+	(range_fold_unary_symbolics_p): New.
+	(range_fold_unary_expr): Extract out into above functions.
+	(range_fold_binary_expr): Same.
+	(value_range_base::normalize_addresses): New.
+	(value_range_base::normalize_symbolics): Normalize addresses.
+	* tree-vrp.h (class value_range_base): Add normalize_addresses.
+
+2019-10-07  Aldy Hernandez  <aldyh@redhat.com>
+
 	* tree-vrp.c (value_range_base::singleton_p): Use
 	value_range_base::num_pairs instead of vrp_val_is* to check
 	if a range has one sub-range.
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index e79add1..20a0bdd 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -5109,6 +5109,18 @@ ipcp_update_bits (struct cgraph_node *node)
     }
 }
 
+bool
+ipa_vr::nonzero_p (tree expr_type) const
+{
+  if (type == VR_ANTI_RANGE && wi::eq_p (min, 0) && wi::eq_p (max, 0))
+    return true;
+
+  unsigned prec = TYPE_PRECISION (expr_type);
+  return (type == VR_RANGE
+	  && wi::eq_p (min, wi::one (prec))
+	  && wi::eq_p (max, wi::max_value (prec, TYPE_SIGN (expr_type))));
+}
+
 /* Update value range of formal parameters as described in
    ipcp_transformation.  */
 
@@ -5181,9 +5193,7 @@ ipcp_update_vr (struct cgraph_node *node)
 						      TYPE_SIGN (type)));
 	    }
 	  else if (POINTER_TYPE_P (TREE_TYPE (ddef))
-		   && vr[i].type == VR_ANTI_RANGE
-		   && wi::eq_p (vr[i].min, 0)
-		   && wi::eq_p (vr[i].max, 0))
+		   && vr[i].nonzero_p (TREE_TYPE (ddef)))
 	    {
 	      if (dump_file)
 		fprintf (dump_file, "Setting nonnull for %u\n", i);
diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h
index 0ff8085..eb3397a 100644
--- a/gcc/ipa-prop.h
+++ b/gcc/ipa-prop.h
@@ -165,6 +165,7 @@ public:
   enum value_range_kind type;
   wide_int min;
   wide_int max;
+  bool nonzero_p (tree) const;
 };
 
 /* A jump function for a callsite represents the values passed as actual
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 86e4dac..d69cfb1 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -910,15 +910,21 @@ vrp_bitmap_equal_p (const_bitmap b1, const_bitmap b2)
 	      && bitmap_equal_p (b1, b2)));
 }
 
+static bool
+range_has_numeric_bounds_p (const value_range_base *vr)
+{
+  return (vr->min ()
+	  && TREE_CODE (vr->min ()) == INTEGER_CST
+	  && TREE_CODE (vr->max ()) == INTEGER_CST);
+}
+
 /* Return true if max and min of VR are INTEGER_CST.  It's not necessary
    a singleton.  */
 
 bool
 range_int_cst_p (const value_range_base *vr)
 {
-  return (vr->kind () == VR_RANGE
-	  && TREE_CODE (vr->min ()) == INTEGER_CST
-	  && TREE_CODE (vr->max ()) == INTEGER_CST);
+  return (vr->kind () == VR_RANGE && range_has_numeric_bounds_p (vr));
 }
 
 /* Return true if VR is a INTEGER_CST singleton.  */
@@ -1760,119 +1766,102 @@ extract_range_from_plus_minus_expr (value_range_base *vr,
     vr->set (kind, min, max);
 }
 
-/* Normalize a value_range for use in range_ops and return it.  */
+/* Return the range-ops handler for CODE and EXPR_TYPE.  If no
+   suitable operator is found, return NULL and set VR to VARYING.  */
 
-static value_range_base
-normalize_for_range_ops (const value_range_base &vr)
+static const range_operator *
+get_range_op_handler (value_range_base *vr,
+		      enum tree_code code,
+		      tree expr_type)
 {
-  tree type = vr.type ();
+  const range_operator *op = range_op_handler (code, expr_type);
+  if (!op)
+    vr->set_varying (expr_type);
+  return op;
+}
+
+/* If the types passed are supported, return TRUE, otherwise set VR to
+   VARYING and return FALSE.  */
 
-  /* This will return ~[0,0] for [&var, &var].  */
-  if (POINTER_TYPE_P (type) && !range_includes_zero_p (&vr))
+static bool
+supported_types_p (value_range_base *vr,
+		   tree type0,
+		   tree type1 = NULL)
+{
+  if (!value_range_base::supports_type_p (type0)
+      || (type1 && !value_range_base::supports_type_p (type1)))
     {
-      value_range_base temp;
-      temp.set_nonzero (type);
-      return temp;
+      vr->set_varying (type0);
+      return false;
     }
-  if (vr.symbolic_p ())
-    return normalize_for_range_ops (vr.normalize_symbolics ());
-  if (TREE_CODE (vr.min ()) == INTEGER_CST
-      && TREE_CODE (vr.max ()) == INTEGER_CST)
-    return vr;
-  /* Anything not strictly numeric at this point becomes varying.  */
-  return value_range_base (vr.type ());
+  return true;
 }
 
-/* Fold a binary expression of two value_range's with range-ops.  */
+/* If any of the ranges passed are defined, return TRUE, otherwise set
+   VR to UNDEFINED and return FALSE.  */
 
-void
-range_fold_binary_expr (value_range_base *vr,
-			enum tree_code code,
-			tree expr_type,
-			const value_range_base *vr0_,
-			const value_range_base *vr1_)
+static bool
+defined_ranges_p (value_range_base *vr,
+		  const value_range_base *vr0,
+		  const value_range_base *vr1 = NULL)
 {
-  if (!value_range_base::supports_type_p (expr_type)
-      || (!vr0_->undefined_p ()
-	  && !value_range_base::supports_type_p (vr0_->type ()))
-      || (!vr1_->undefined_p ()
-	  && !value_range_base::supports_type_p (vr1_->type ())))
-    {
-      vr->set_varying (expr_type);
-      return;
-    }
-  if (vr0_->undefined_p () && vr1_->undefined_p ())
+  if (vr0->undefined_p () && (!vr1 || vr1->undefined_p ()))
     {
       vr->set_undefined ();
-      return;
-    }
-  range_operator *op = range_op_handler (code, expr_type);
-  if (!op)
-    {
-      vr->set_varying (expr_type);
-      return;
+      return false;
     }
+  return true;
+}
 
-  /* Mimic any behavior users of extract_range_from_binary_expr may
-     expect.  */
-  value_range_base vr0 = *vr0_, vr1 = *vr1_;
-  if (vr0.undefined_p ())
-    vr0.set_varying (expr_type);
-  else if (vr1.undefined_p ())
-    vr1.set_varying (expr_type);
+static value_range_base
+drop_undefines_to_varying (const value_range_base *vr, tree expr_type)
+{
+  if (vr->undefined_p ())
+    return value_range_base (expr_type);
+  else
+    return *vr;
+}
+
+/* If any operand is symbolic, perform a binary operation on them and
+   return TRUE, otherwise return FALSE.  */
 
-  /* Handle symbolics.  */
-  if (vr0.symbolic_p () || vr1.symbolic_p ())
+static bool
+range_fold_binary_symbolics_p (value_range_base *vr,
+			       tree_code code,
+			       tree expr_type,
+			       const value_range_base *vr0,
+			       const value_range_base *vr1)
+{
+  if (vr0->symbolic_p () || vr1->symbolic_p ())
     {
       if ((code == PLUS_EXPR || code == MINUS_EXPR))
 	{
-	  extract_range_from_plus_minus_expr (vr, code, expr_type,
-					      &vr0, &vr1);
-	  return;
+	  extract_range_from_plus_minus_expr (vr, code, expr_type, vr0, vr1);
+	  return true;
 	}
       if (POINTER_TYPE_P (expr_type) && code == POINTER_PLUS_EXPR)
 	{
-	  extract_range_from_pointer_plus_expr (vr, code, expr_type,
-						&vr0, &vr1);
-	  return;
+	  extract_range_from_pointer_plus_expr (vr, code, expr_type, vr0, vr1);
+	  return true;
 	}
+      const range_operator *op = get_range_op_handler (vr, code, expr_type);
+      *vr = op->fold_range (expr_type,
+			    vr0->normalize_symbolics (),
+			    vr1->normalize_symbolics ());
+      return true;
     }
-
-  /* Do the range-ops dance.  */
-  value_range_base n0 = normalize_for_range_ops (vr0);
-  value_range_base n1 = normalize_for_range_ops (vr1);
-  *vr = op->fold_range (expr_type, n0, n1);
+  return false;
 }
 
-/* Fold a unary expression of a value_range with range-ops.  */
+/* If operand is symbolic, perform a unary operation on it and return
+   TRUE, otherwise return FALSE.  */
 
-void
-range_fold_unary_expr (value_range_base *vr,
-		       enum tree_code code, tree expr_type,
-		       const value_range_base *vr0,
-		       tree vr0_type)
+static bool
+range_fold_unary_symbolics_p (value_range_base *vr,
+			      tree_code code,
+			      tree expr_type,
+			      const value_range_base *vr0)
 {
-  /* Mimic any behavior users of extract_range_from_unary_expr may
-     expect.  */
-  if (!value_range_base::supports_type_p (expr_type)
-      || !value_range_base::supports_type_p (vr0_type))
-    {
-      vr->set_varying (expr_type);
-      return;
-    }
-  if (vr0->undefined_p ())
-    {
-      vr->set_undefined ();
-      return;
-    }
-  range_operator *op = range_op_handler (code, expr_type);
-  if (!op)
-    {
-      vr->set_varying (expr_type);
-      return;
-    }
-
-  /* Handle symbolics.  */
   if (vr0->symbolic_p ())
     {
       if (code == NEGATE_EXPR)
@@ -1881,7 +1870,7 @@ range_fold_unary_expr (value_range_base *vr,
 	  value_range_base zero;
 	  zero.set_zero (vr0->type ());
 	  range_fold_binary_expr (vr, MINUS_EXPR, expr_type, &zero, vr0);
-	  return;
+	  return true;
 	}
       if (code == BIT_NOT_EXPR)
 	{
@@ -1889,30 +1878,64 @@ range_fold_unary_expr (value_range_base *vr,
 	  value_range_base minusone;
 	  minusone.set (build_int_cst (vr0->type (), -1));
 	  range_fold_binary_expr (vr, MINUS_EXPR, expr_type, &minusone, vr0);
-	  return;
+	  return true;
 	}
+      const range_operator *op = get_range_op_handler (vr, code, expr_type);
       *vr = op->fold_range (expr_type,
-			    normalize_for_range_ops (*vr0),
+			    vr0->normalize_symbolics (),
 			    value_range_base (expr_type));
-      return;
-    }
-  if (CONVERT_EXPR_CODE_P (code) && (POINTER_TYPE_P (expr_type)
-				     || POINTER_TYPE_P (vr0->type ())))
-    {
-      /* This handles symbolic conversions such such as [25, x_4].  */
-      if (!range_includes_zero_p (vr0))
-	vr->set_nonzero (expr_type);
-      else if (vr0->zero_p ())
-	vr->set_zero (expr_type);
-      else
-	vr->set_varying (expr_type);
-      return;
+      return true;
     }
+  return false;
+}
 
-  /* Do the range-ops dance.  */
-  value_range_base n0 = normalize_for_range_ops (*vr0);
-  value_range_base n1 (expr_type);
-  *vr = op->fold_range (expr_type, n0, n1);
+/* Perform a binary operation on a pair of ranges.  */
+
+void
+range_fold_binary_expr (value_range_base *vr,
+			enum tree_code code,
+			tree expr_type,
+			const value_range_base *vr0_,
+			const value_range_base *vr1_)
+{
+  if (!supported_types_p (vr, expr_type)
+      || !defined_ranges_p (vr, vr0_, vr1_))
+    return;
+  const range_operator *op = get_range_op_handler (vr, code, expr_type);
+  if (!op)
+    return;
+
+  value_range_base vr0 = drop_undefines_to_varying (vr0_, expr_type);
+  value_range_base vr1 = drop_undefines_to_varying (vr1_, expr_type);
+  if (range_fold_binary_symbolics_p (vr, code, expr_type, &vr0, &vr1))
+    return;
+
+  *vr = op->fold_range (expr_type,
+			vr0.normalize_addresses (),
+			vr1.normalize_addresses ());
+}
+
+/* Perform a unary operation on a range.  */
+
+void
+range_fold_unary_expr (value_range_base *vr,
+		       enum tree_code code, tree expr_type,
+		       const value_range_base *vr0,
+		       tree vr0_type)
+{
+  if (!supported_types_p (vr, expr_type, vr0_type)
+      || !defined_ranges_p (vr, vr0))
+    return;
+  const range_operator *op = get_range_op_handler (vr, code, expr_type);
+  if (!op)
+    return;
+
+  if (range_fold_unary_symbolics_p (vr, code, expr_type, vr0))
+    return;
+
+  *vr = op->fold_range (expr_type,
+			vr0->normalize_addresses (),
+			value_range_base (expr_type));
 }
 
 /* Given a COND_EXPR COND of the form 'V OP W', and an SSA name V,
@@ -5997,7 +6020,24 @@ value_range::union_ (const value_range *other)
     }
 }
 
-/* Normalize symbolics into constants.  */
+/* Normalize addresses into constants.  */
+
+value_range_base
+value_range_base::normalize_addresses () const
+{
+  if (!POINTER_TYPE_P (type ()) || range_has_numeric_bounds_p (this))
+    return *this;
+
+  if (!range_includes_zero_p (this))
+    {
+      gcc_checking_assert (TREE_CODE (m_min) == ADDR_EXPR
+			   || TREE_CODE (m_max) == ADDR_EXPR);
+      return range_nonzero (type ());
+    }
+  return value_range_base (type ());
+}
+
+/* Normalize symbolics and addresses into constants.  */
 
 value_range_base
 value_range_base::normalize_symbolics () const
@@ -6008,7 +6048,7 @@ value_range_base::normalize_symbolics () const
   bool min_symbolic = !is_gimple_min_invariant (min ());
   bool max_symbolic = !is_gimple_min_invariant (max ());
   if (!min_symbolic && !max_symbolic)
-    return *this;
+    return normalize_addresses ();
 
   // [SYM, SYM] -> VARYING
   if (min_symbolic && max_symbolic)
diff --git a/gcc/tree-vrp.h b/gcc/tree-vrp.h
index d20d004..a3f9e90 100644
--- a/gcc/tree-vrp.h
+++ b/gcc/tree-vrp.h
@@ -86,6 +86,7 @@ public:
 
   static bool supports_type_p (tree);
   value_range_base normalize_symbolics () const;
+  value_range_base normalize_addresses () const;
 
   static const unsigned int m_max_pairs = 2;
   bool contains_p (tree) const;
-- 
cgit v1.1


From 19849d1585d6ff2cef5f495a93699703cf18b335 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@redhat.com>
Date: Mon, 7 Oct 2019 11:53:40 +0000
Subject: * ipa-prop.c (ipa_vr::nonzero_p): Add TYPE_UNSIGNED check.

From-SVN: r276655
---
 gcc/ChangeLog  | 4 ++++
 gcc/ipa-prop.c | 1 +
 2 files changed, 5 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83ad001..db122e2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-07  Aldy Hernandez  <aldyh@redhat.com>
 
+	* ipa-prop.c (ipa_vr::nonzero_p): Add TYPE_UNSIGNED check.
+
+2019-10-07  Aldy Hernandez  <aldyh@redhat.com>
+
 	* ipa-prop.c (ipa_vr::nonzero_p): New.
 	(ipcp_update_vr): Use nonzero_p instead of open-coding check for
 	non-zero range.
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 20a0bdd..5020f4a 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -5117,6 +5117,7 @@ ipa_vr::nonzero_p (tree expr_type) const
 
   unsigned prec = TYPE_PRECISION (expr_type);
   return (type == VR_RANGE
+	  && TYPE_UNSIGNED (expr_type)
 	  && wi::eq_p (min, wi::one (prec))
 	  && wi::eq_p (max, wi::max_value (prec, TYPE_SIGN (expr_type))));
 }
-- 
cgit v1.1


From ca95ce80e05143e64bca88ce5a6a38ee68894a95 Mon Sep 17 00:00:00 2001
From: Vladislav Ivanishin <vlad@ispras.ru>
Date: Mon, 7 Oct 2019 14:19:30 +0000
Subject: [doc] -Wuninitialized doesn't do -Wclobbered's job

        * gcc/doc/invoke.texi (-Wuninitialized): Don't mention the clobbered by
        setjmp situation here.  Fix a verb's ending: "the exact variables or
        elements for which there are warnings depends" -> "... depend".

From-SVN: r276657
---
 gcc/ChangeLog       |  6 ++++++
 gcc/doc/invoke.texi | 21 ++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db122e2..8ecb2a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-07 Vladislav Ivanishin  <vlad@ispras.ru>
+
+	* doc/invoke.texi (-Wuninitialized): Don't mention the clobbered by
+	setjmp situation here.  Fix a verb's ending: "the exact variables or
+	elements for which there are warnings depends" -> "... depend".
+
 2019-10-07  Aldy Hernandez  <aldyh@redhat.com>
 
 	* ipa-prop.c (ipa_vr::nonzero_p): Add TYPE_UNSIGNED check.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 0b56162..1077930 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -5578,21 +5578,20 @@ either specify @option{-Wextra -Wunused} (note that @option{-Wall} implies
 @item -Wuninitialized
 @opindex Wuninitialized
 @opindex Wno-uninitialized
-Warn if an automatic variable is used without first being initialized
-or if a variable may be clobbered by a @code{setjmp} call. In C++,
-warn if a non-static reference or non-static @code{const} member
-appears in a class without constructors.
+Warn if an automatic variable is used without first being initialized.
+In C++, warn if a non-static reference or non-static @code{const}
+member appears in a class without constructors.
 
 If you want to warn about code that uses the uninitialized value of the
 variable in its own initializer, use the @option{-Winit-self} option.
 
-These warnings occur for individual uninitialized or clobbered
-elements of structure, union or array variables as well as for
-variables that are uninitialized or clobbered as a whole.  They do
-not occur for variables or elements declared @code{volatile}.  Because
-these warnings depend on optimization, the exact variables or elements
-for which there are warnings depends on the precise optimization
-options and version of GCC used.
+These warnings occur for individual uninitialized elements of
+structure, union or array variables as well as for variables that are
+uninitialized as a whole.  They do not occur for variables or elements
+declared @code{volatile}.  Because these warnings depend on
+optimization, the exact variables or elements for which there are
+warnings depend on the precise optimization options and version of GCC
+used.
 
 Note that there may be no warning about a variable that is used only
 to compute a value that itself is never used, because such
-- 
cgit v1.1


From 880dcdaedac453d2c64ebcc6f1bb5f81539c863c Mon Sep 17 00:00:00 2001
From: Vladislav Ivanishin <vlad@ispras.ru>
Date: Mon, 7 Oct 2019 14:29:07 +0000
Subject: Make gsi_next_nonvirtual_phi do what one expects

gcc/

        * gimple-iterator.h (gsi_next_nonvirtual_phi): Change the semantics to
        match that of other gsi_next_* functions.  Adjust the comment.
        (gsi_start_nonvirtual_phis): New function.
        * ipa-icf.c (sem_function::compare_phi_node): Update uses of
        gsi_next_nonvirtual_phi accordingly.  (No functional change.)

From-SVN: r276658
---
 gcc/ChangeLog         |  8 ++++++++
 gcc/gimple-iterator.h | 31 +++++++++++++++++--------------
 gcc/ipa-icf.c         | 11 ++++-------
 3 files changed, 29 insertions(+), 21 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ecb2a1..2702146 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-07 Vladislav Ivanishin  <vlad@ispras.ru>
 
+	* gimple-iterator.h (gsi_next_nonvirtual_phi): Change the semantics to
+	match that of other gsi_next_* functions.  Adjust the comment.
+	(gsi_start_nonvirtual_phis): New function.
+	* ipa-icf.c (sem_function::compare_phi_node): Update uses of
+	gsi_next_nonvirtual_phi accordingly.  (No functional change.)
+
+2019-10-07 Vladislav Ivanishin  <vlad@ispras.ru>
+
 	* doc/invoke.texi (-Wuninitialized): Don't mention the clobbered by
 	setjmp situation here.  Fix a verb's ending: "the exact variables or
 	elements for which there are warnings depends" -> "... depend".
diff --git a/gcc/gimple-iterator.h b/gcc/gimple-iterator.h
index ee6f5b1..ccd93d9 100644
--- a/gcc/gimple-iterator.h
+++ b/gcc/gimple-iterator.h
@@ -325,28 +325,31 @@ gsi_one_nondebug_before_end_p (gimple_stmt_iterator i)
   return gsi_end_p (i);
 }
 
-/* Iterates I statement iterator to the next non-virtual statement.  */
+/* Advance I statement iterator to the next non-virtual GIMPLE_PHI
+   statement.  */
 
 static inline void
 gsi_next_nonvirtual_phi (gphi_iterator *i)
 {
-  gphi *phi;
-
-  if (gsi_end_p (*i))
-    return;
-
-  phi = i->phi ();
-  gcc_assert (phi != NULL);
-
-  while (virtual_operand_p (gimple_phi_result (phi)))
+  do
     {
       gsi_next (i);
+    }
+  while (!gsi_end_p (*i) && virtual_operand_p (gimple_phi_result (i->phi ())));
+}
 
-      if (gsi_end_p (*i))
-	return;
+/* Return a new iterator pointing to the first non-virtual phi statement in
+   basic block BB.  */
 
-      phi = i->phi ();
-    }
+static inline gphi_iterator
+gsi_start_nonvirtual_phis (basic_block bb)
+{
+  gphi_iterator i = gsi_start_phis (bb);
+
+  if (!gsi_end_p (i) && virtual_operand_p (gimple_phi_result (i.phi ())))
+    gsi_next_nonvirtual_phi (&i);
+
+  return i;
 }
 
 /* Return the basic block associated with this iterator.  */
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 009aeb4..8bf0f7c 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -1688,13 +1688,10 @@ sem_function::compare_phi_node (basic_block bb1, basic_block bb2)
   gcc_assert (bb1 != NULL);
   gcc_assert (bb2 != NULL);
 
-  si2 = gsi_start_phis (bb2);
-  for (si1 = gsi_start_phis (bb1); !gsi_end_p (si1);
-       gsi_next (&si1))
+  si2 = gsi_start_nonvirtual_phis (bb2);
+  for (si1 = gsi_start_nonvirtual_phis (bb1); !gsi_end_p (si1);
+       gsi_next_nonvirtual_phi (&si1))
     {
-      gsi_next_nonvirtual_phi (&si1);
-      gsi_next_nonvirtual_phi (&si2);
-
       if (gsi_end_p (si1) && gsi_end_p (si2))
 	break;
 
@@ -1731,7 +1728,7 @@ sem_function::compare_phi_node (basic_block bb1, basic_block bb2)
 	    return return_false ();
 	}
 
-      gsi_next (&si2);
+      gsi_next_nonvirtual_phi (&si2);
     }
 
   return true;
-- 
cgit v1.1


From 70e2a30ac8f474feefbcc392cbc59cf91271b92b Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Mon, 7 Oct 2019 14:59:00 +0000
Subject: Allow COND_EXPR and VEC_COND_EXPR condtions to trap

Right now gimplifier does not allow VEC_COND_EXPR's condition to trap
and introduces a temporary if this could happen, for example, generating

  _5 = _4 > { 2.0e+0, 2.0e+0, 2.0e+0, 2.0e+0 };
  _6 = VEC_COND_EXPR <_5, { -1, -1, -1, -1 }, { 0, 0, 0, 0 }>;

from GENERIC

  VEC_COND_EXPR < (*b > { 2.0e+0, 2.0e+0, 2.0e+0, 2.0e+0 }) ,
                  { -1, -1, -1, -1 } ,
		  { 0, 0, 0, 0 } >

This is not necessary and makes the resulting GIMPLE harder to analyze.
Change the gimplifier so as to allow COND_EXPR and VEC_COND_EXPR
conditions to trap.

This patch takes special care to avoid introducing trapping comparisons
in GIMPLE_COND.  They are not allowed, because they would require 3
outgoing edges (then, else and EH), which is awkward to say the least.
Therefore, computations of such conditions should live in their own basic
blocks.

gcc/ChangeLog:

2019-10-07  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR target/77918
	* gimple-expr.c (gimple_cond_get_ops_from_tree): Assert that the
	caller passes a non-trapping condition.
	(is_gimple_condexpr): Allow trapping conditions.
	(is_gimple_condexpr_1): New helper function.
	(is_gimple_condexpr_for_cond): New function, acts like old
	is_gimple_condexpr.
	* gimple-expr.h (is_gimple_condexpr_for_cond): New function.
	* gimple.c (gimple_could_trap_p_1): Handle COND_EXPR and
	VEC_COND_EXPR. Fix an issue with statements like i = (fp < 1.).
	* gimplify.c (gimplify_cond_expr): Use
	is_gimple_condexpr_for_cond.
	(gimplify_expr): Allow is_gimple_condexpr_for_cond.
	* tree-eh.c (operation_could_trap_p): Assert on COND_EXPR and
	VEC_COND_EXPR.
	(tree_could_trap_p): Handle COND_EXPR and VEC_COND_EXPR.
	* tree-ssa-forwprop.c (forward_propagate_into_gimple_cond): Use
	is_gimple_condexpr_for_cond, remove pointless tmp check
	(forward_propagate_into_cond): Remove pointless tmp check.

From-SVN: r276659
---
 gcc/ChangeLog           | 22 ++++++++++++++++++++++
 gcc/gimple-expr.c       | 25 +++++++++++++++++++++----
 gcc/gimple-expr.h       |  1 +
 gcc/gimple.c            | 14 +++++++++++++-
 gcc/gimplify.c          |  5 +++--
 gcc/tree-eh.c           |  8 ++++++++
 gcc/tree-ssa-forwprop.c |  7 ++++---
 7 files changed, 72 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2702146..922ca5d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+2019-10-07  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	PR target/77918
+	* gimple-expr.c (gimple_cond_get_ops_from_tree): Assert that the
+	caller passes a non-trapping condition.
+	(is_gimple_condexpr): Allow trapping conditions.
+	(is_gimple_condexpr_1): New helper function.
+	(is_gimple_condexpr_for_cond): New function, acts like old
+	is_gimple_condexpr.
+	* gimple-expr.h (is_gimple_condexpr_for_cond): New function.
+	* gimple.c (gimple_could_trap_p_1): Handle COND_EXPR and
+	VEC_COND_EXPR. Fix an issue with statements like i = (fp < 1.).
+	* gimplify.c (gimplify_cond_expr): Use
+	is_gimple_condexpr_for_cond.
+	(gimplify_expr): Allow is_gimple_condexpr_for_cond.
+	* tree-eh.c (operation_could_trap_p): Assert on COND_EXPR and
+	VEC_COND_EXPR.
+	(tree_could_trap_p): Handle COND_EXPR and VEC_COND_EXPR.
+	* tree-ssa-forwprop.c (forward_propagate_into_gimple_cond): Use
+	is_gimple_condexpr_for_cond, remove pointless tmp check
+	(forward_propagate_into_cond): Remove pointless tmp check.
+
 2019-10-07 Vladislav Ivanishin  <vlad@ispras.ru>
 
 	* gimple-iterator.h (gsi_next_nonvirtual_phi): Change the semantics to
diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index 4082828..1738af1 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -574,6 +574,7 @@ gimple_cond_get_ops_from_tree (tree cond, enum tree_code *code_p,
 	      || TREE_CODE (cond) == TRUTH_NOT_EXPR
 	      || is_gimple_min_invariant (cond)
 	      || SSA_VAR_P (cond));
+  gcc_checking_assert (!tree_could_throw_p (cond));
 
   extract_ops_from_tree (cond, code_p, lhs_p, rhs_p);
 
@@ -605,17 +606,33 @@ is_gimple_lvalue (tree t)
 	  || TREE_CODE (t) == BIT_FIELD_REF);
 }
 
-/*  Return true if T is a GIMPLE condition.  */
+/* Helper for is_gimple_condexpr and is_gimple_condexpr_for_cond.  */
 
-bool
-is_gimple_condexpr (tree t)
+static bool
+is_gimple_condexpr_1 (tree t, bool allow_traps)
 {
   return (is_gimple_val (t) || (COMPARISON_CLASS_P (t)
-				&& !tree_could_throw_p (t)
+				&& (allow_traps || !tree_could_throw_p (t))
 				&& is_gimple_val (TREE_OPERAND (t, 0))
 				&& is_gimple_val (TREE_OPERAND (t, 1))));
 }
 
+/* Return true if T is a GIMPLE condition.  */
+
+bool
+is_gimple_condexpr (tree t)
+{
+  return is_gimple_condexpr_1 (t, true);
+}
+
+/* Like is_gimple_condexpr, but does not allow T to trap.  */
+
+bool
+is_gimple_condexpr_for_cond (tree t)
+{
+  return is_gimple_condexpr_1 (t, false);
+}
+
 /* Return true if T is a gimple address.  */
 
 bool
diff --git a/gcc/gimple-expr.h b/gcc/gimple-expr.h
index 1ad1432..0925aeb 100644
--- a/gcc/gimple-expr.h
+++ b/gcc/gimple-expr.h
@@ -41,6 +41,7 @@ extern void gimple_cond_get_ops_from_tree (tree, enum tree_code *, tree *,
 					   tree *);
 extern bool is_gimple_lvalue (tree);
 extern bool is_gimple_condexpr (tree);
+extern bool is_gimple_condexpr_for_cond (tree);
 extern bool is_gimple_address (const_tree);
 extern bool is_gimple_invariant_address (const_tree);
 extern bool is_gimple_ip_invariant_address (const_tree);
diff --git a/gcc/gimple.c b/gcc/gimple.c
index 8e828a5..a874c29 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -2149,10 +2149,22 @@ gimple_could_trap_p_1 (gimple *s, bool include_mem, bool include_stores)
       return false;
 
     case GIMPLE_ASSIGN:
-      t = gimple_expr_type (s);
       op = gimple_assign_rhs_code (s);
+
+      /* For COND_EXPR and VEC_COND_EXPR only the condition may trap.  */
+      if (op == COND_EXPR || op == VEC_COND_EXPR)
+	return tree_could_trap_p (gimple_assign_rhs1 (s));
+
+      /* For comparisons we need to check rhs operand types instead of rhs type
+         (which is BOOLEAN_TYPE).  */
+      if (TREE_CODE_CLASS (op) == tcc_comparison)
+	t = TREE_TYPE (gimple_assign_rhs1 (s));
+      else
+	t = gimple_expr_type (s);
+
       if (get_gimple_rhs_class (op) == GIMPLE_BINARY_RHS)
 	div = gimple_assign_rhs2 (s);
+
       return (operation_could_trap_p (op, FLOAT_TYPE_P (t),
 				      (INTEGRAL_TYPE_P (t)
 				       && TYPE_OVERFLOW_TRAPS (t)),
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 88d6571..8367069 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -4142,8 +4142,8 @@ gimplify_cond_expr (tree *expr_p, gimple_seq *pre_p, fallback_t fallback)
   /* Now do the normal gimplification.  */
 
   /* Gimplify condition.  */
-  ret = gimplify_expr (&TREE_OPERAND (expr, 0), pre_p, NULL, is_gimple_condexpr,
-		       fb_rvalue);
+  ret = gimplify_expr (&TREE_OPERAND (expr, 0), pre_p, NULL,
+		       is_gimple_condexpr_for_cond, fb_rvalue);
   if (ret == GS_ERROR)
     return GS_ERROR;
   gcc_assert (TREE_OPERAND (expr, 0) != NULL_TREE);
@@ -12976,6 +12976,7 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
   else if (gimple_test_f == is_gimple_val
            || gimple_test_f == is_gimple_call_addr
            || gimple_test_f == is_gimple_condexpr
+	   || gimple_test_f == is_gimple_condexpr_for_cond
            || gimple_test_f == is_gimple_mem_rhs
            || gimple_test_f == is_gimple_mem_rhs_or_call
            || gimple_test_f == is_gimple_reg_rhs
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 1aba733..7a02873 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -2523,6 +2523,10 @@ operation_could_trap_p (enum tree_code op, bool fp_operation, bool honor_trapv,
   bool honor_snans = fp_operation && flag_signaling_nans != 0;
   bool handled;
 
+  /* This function cannot tell whether or not COND_EXPR and VEC_COND_EXPR could
+     trap, because that depends on the respective condition op.  */
+  gcc_assert (op != COND_EXPR && op != VEC_COND_EXPR);
+
   if (TREE_CODE_CLASS (op) != tcc_comparison
       && TREE_CODE_CLASS (op) != tcc_unary
       && TREE_CODE_CLASS (op) != tcc_binary)
@@ -2610,6 +2614,10 @@ tree_could_trap_p (tree expr)
   if (!expr)
     return false;
 
+  /* For COND_EXPR and VEC_COND_EXPR only the condition may trap.  */
+  if (TREE_CODE (expr) == COND_EXPR || TREE_CODE (expr) == VEC_COND_EXPR)
+    expr = TREE_OPERAND (expr, 0);
+
   code = TREE_CODE (expr);
   t = TREE_TYPE (expr);
 
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index a1e22c9..fe55ca9 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -527,9 +527,10 @@ forward_propagate_into_gimple_cond (gcond *stmt)
   tmp = forward_propagate_into_comparison_1 (stmt, code,
 					     boolean_type_node,
 					     rhs1, rhs2);
-  if (tmp)
+  if (tmp
+      && is_gimple_condexpr_for_cond (tmp))
     {
-      if (dump_file && tmp)
+      if (dump_file)
 	{
 	  fprintf (dump_file, "  Replaced '");
 	  print_gimple_expr (dump_file, stmt, 0);
@@ -607,7 +608,7 @@ forward_propagate_into_cond (gimple_stmt_iterator *gsi_p)
   if (tmp
       && is_gimple_condexpr (tmp))
     {
-      if (dump_file && tmp)
+      if (dump_file)
 	{
 	  fprintf (dump_file, "  Replaced '");
 	  print_generic_expr (dump_file, cond);
-- 
cgit v1.1


From dcd2ca63ec5c467decb70db983fc19a8329f67dc Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Mon, 7 Oct 2019 15:01:15 +0000
Subject: Introduce can_vcond_compare_p function

z13 supports only non-signaling vector comparisons.  This means we
cannot vectorize LT, LE, GT, GE and LTGT when compiling for z13.
However, we cannot express this restriction today: the code only checks
whether vcond$a$b optab exists, but this does not say anything about the
operation.

Introduce a function that checks whether back-end supports vector
comparisons with individual rtx codes by matching vcond expander's third
argument with a fake comparison with the corresponding rtx code.

gcc/ChangeLog:

2019-10-07  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR target/77918
	* optabs-tree.c (vcond_icode_p): New function.
	(vcond_eq_icode_p): Likewise.
	(expand_vec_cond_expr_p): Use vcond_icode_p and
	vcond_eq_icode_p.
	* optabs.c (can_vcond_compare_p): New function.
	* optabs.h (can_vcond_compare_p): Likewise.

From-SVN: r276660
---
 gcc/ChangeLog     | 10 ++++++++++
 gcc/optabs-tree.c | 39 +++++++++++++++++++++++++++++++++------
 gcc/optabs.c      | 19 +++++++++++++++++++
 gcc/optabs.h      |  6 ++++++
 4 files changed, 68 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 922ca5d..c9ca3ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,16 @@
 2019-10-07  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	PR target/77918
+	* optabs-tree.c (vcond_icode_p): New function.
+	(vcond_eq_icode_p): Likewise.
+	(expand_vec_cond_expr_p): Use vcond_icode_p and
+	vcond_eq_icode_p.
+	* optabs.c (can_vcond_compare_p): New function.
+	* optabs.h (can_vcond_compare_p): Likewise.
+
+2019-10-07  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	PR target/77918
 	* gimple-expr.c (gimple_cond_get_ops_from_tree): Assert that the
 	caller passes a non-trapping condition.
 	(is_gimple_condexpr): Allow trapping conditions.
diff --git a/gcc/optabs-tree.c b/gcc/optabs-tree.c
index 8157798..a5ecbf0 100644
--- a/gcc/optabs-tree.c
+++ b/gcc/optabs-tree.c
@@ -23,7 +23,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "insn-codes.h"
+#include "rtl.h"
 #include "tree.h"
+#include "memmodel.h"
+#include "optabs.h"
 #include "optabs-tree.h"
 #include "stor-layout.h"
 
@@ -329,6 +332,31 @@ expand_vec_cmp_expr_p (tree value_type, tree mask_type, enum tree_code code)
   return false;
 }
 
+/* Return true iff vcond_optab/vcondu_optab can handle a vector
+   comparison for code CODE, comparing operands of type CMP_OP_TYPE and
+   producing a result of type VALUE_TYPE.  */
+
+static bool
+vcond_icode_p (tree value_type, tree cmp_op_type, enum tree_code code)
+{
+  return can_vcond_compare_p (get_rtx_code (code, TYPE_UNSIGNED (cmp_op_type)),
+			      TYPE_MODE (value_type), TYPE_MODE (cmp_op_type));
+}
+
+/* Return true iff vcondeq_optab can handle a vector comparison for code CODE,
+   comparing operands of type CMP_OP_TYPE and producing a result of type
+   VALUE_TYPE.  */
+
+static bool
+vcond_eq_icode_p (tree value_type, tree cmp_op_type, enum tree_code code)
+{
+  if (code != EQ_EXPR && code != NE_EXPR)
+    return false;
+
+  return get_vcond_eq_icode (TYPE_MODE (value_type), TYPE_MODE (cmp_op_type))
+	 != CODE_FOR_nothing;
+}
+
 /* Return TRUE iff, appropriate vector insns are available
    for vector cond expr with vector type VALUE_TYPE and a comparison
    with operand vector types in CMP_OP_TYPE.  */
@@ -347,14 +375,13 @@ expand_vec_cond_expr_p (tree value_type, tree cmp_op_type, enum tree_code code)
       || maybe_ne (GET_MODE_NUNITS (value_mode), GET_MODE_NUNITS (cmp_op_mode)))
     return false;
 
-  if (get_vcond_icode (TYPE_MODE (value_type), TYPE_MODE (cmp_op_type),
-		       TYPE_UNSIGNED (cmp_op_type)) == CODE_FOR_nothing
-      && ((code != EQ_EXPR && code != NE_EXPR)
-	  || get_vcond_eq_icode (TYPE_MODE (value_type),
-				 TYPE_MODE (cmp_op_type)) == CODE_FOR_nothing))
+  if (TREE_CODE_CLASS (code) != tcc_comparison)
+    /* This may happen, for example, if code == SSA_NAME, in which case we
+       cannot be certain whether a vector insn is available.  */
     return false;
 
-  return true;
+  return vcond_icode_p (value_type, cmp_op_type, code)
+	 || vcond_eq_icode_p (value_type, cmp_op_type, code);
 }
 
 /* Use the current target and options to initialize
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 35921e6..d6701df 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -3819,6 +3819,25 @@ can_compare_p (enum rtx_code code, machine_mode mode,
   return 0;
 }
 
+/* Return whether the backend can emit a vector comparison for code CODE,
+   comparing operands of mode CMP_OP_MODE and producing a result with
+   VALUE_MODE.  */
+
+bool
+can_vcond_compare_p (enum rtx_code code, machine_mode value_mode,
+		     machine_mode cmp_op_mode)
+{
+  enum insn_code icode;
+  bool unsigned_p = (code == LTU || code == LEU || code == GTU || code == GEU);
+  rtx reg1 = alloca_raw_REG (cmp_op_mode, LAST_VIRTUAL_REGISTER + 1);
+  rtx reg2 = alloca_raw_REG (cmp_op_mode, LAST_VIRTUAL_REGISTER + 2);
+  rtx test = alloca_rtx_fmt_ee (code, value_mode, reg1, reg2);
+
+  return (icode = get_vcond_icode (value_mode, cmp_op_mode, unsigned_p))
+	 != CODE_FOR_nothing
+	 && insn_operand_matches (icode, 3, test);
+}
+
 /* This function is called when we are going to emit a compare instruction that
    compares the values found in X and Y, using the rtl operator COMPARISON.
 
diff --git a/gcc/optabs.h b/gcc/optabs.h
index 897bb5d..b1348ce 100644
--- a/gcc/optabs.h
+++ b/gcc/optabs.h
@@ -242,6 +242,12 @@ enum can_compare_purpose
    (without splitting it into pieces).  */
 extern int can_compare_p (enum rtx_code, machine_mode,
 			  enum can_compare_purpose);
+
+/* Return whether the backend can emit a vector comparison for code CODE,
+   comparing operands of mode CMP_OP_MODE and producing a result with
+   VALUE_MODE.  */
+extern bool can_vcond_compare_p (enum rtx_code, machine_mode, machine_mode);
+
 extern rtx prepare_operand (enum insn_code, rtx, int, machine_mode,
 			    machine_mode, int);
 /* Emit a pair of rtl insns to compare two rtx's and to jump
-- 
cgit v1.1


From 132235c30fbb2f660e93d72578e95aeb3c7a932f Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 7 Oct 2019 15:37:52 +0000
Subject: call.c (resolve_args): Use cp_expr_loc_or_input_loc in one place.

/cp
2019-10-07  Paolo Carlini  <paolo.carlini@oracle.com>

	* call.c (resolve_args): Use cp_expr_loc_or_input_loc in one place.
	* decl.c (grokdeclarator): Use id_loc in one place.
	* decl2.c (build_anon_union_vars): Use DECL_SOURCE_LOCATION.
	* parser.c (cp_parser_delete_expression): Fix the location of the
	returned expression.
	(cp_parser_throw_expression): Likewise.
	* pt.c (determine_specialization): Use DECL_SOURCE_LOCATION.

/testsuite
2019-10-07  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/diagnostic/not-a-function-template-1.C: New.
	* g++.dg/template/crash107.C: Adjust expected location.
	* g++.dg/template/dependent-expr1.C: Check locations.
	* g++.dg/template/error17.C: Check location.

From-SVN: r276661
---
 gcc/cp/ChangeLog                                   | 10 ++++++++
 gcc/cp/call.c                                      |  3 ++-
 gcc/cp/decl.c                                      |  4 ++--
 gcc/cp/decl2.c                                     |  3 ++-
 gcc/cp/parser.c                                    | 28 +++++++++++++++++++---
 gcc/cp/pt.c                                        |  6 +++--
 gcc/testsuite/ChangeLog                            |  7 ++++++
 .../g++.dg/diagnostic/not-a-function-template-1.C  |  9 +++++++
 gcc/testsuite/g++.dg/template/crash107.C           |  4 ++--
 gcc/testsuite/g++.dg/template/dependent-expr1.C    |  8 +++----
 gcc/testsuite/g++.dg/template/error17.C            |  2 +-
 11 files changed, 68 insertions(+), 16 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/diagnostic/not-a-function-template-1.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b40825e..90cab94 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* call.c (resolve_args): Use cp_expr_loc_or_input_loc in one place.
+	* decl.c (grokdeclarator): Use id_loc in one place.
+	* decl2.c (build_anon_union_vars): Use DECL_SOURCE_LOCATION.
+	* parser.c (cp_parser_delete_expression): Fix the location of the
+	returned expression.
+	(cp_parser_throw_expression): Likewise.
+	* pt.c (determine_specialization): Use DECL_SOURCE_LOCATION.
+
 2019-10-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/91369 - Implement P0784R7: constexpr new
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 56dcbd3..6c9acac 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4381,7 +4381,8 @@ resolve_args (vec<tree, va_gc> *args, tsubst_flags_t complain)
       else if (VOID_TYPE_P (TREE_TYPE (arg)))
 	{
 	  if (complain & tf_error)
-	    error ("invalid use of void expression");
+	    error_at (cp_expr_loc_or_input_loc (arg),
+		      "invalid use of void expression");
 	  return NULL;
 	}
       else if (invalid_nonstatic_memfn_p (EXPR_LOCATION (arg), arg, complain))
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ea9a001..e405367 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12754,8 +12754,8 @@ grokdeclarator (const cp_declarator *declarator,
 		tree tmpl = TREE_OPERAND (unqualified_id, 0);
 		if (variable_template_p (tmpl))
 		  {
-		    error ("specialization of variable template %qD "
-			   "declared as function", tmpl);
+		    error_at (id_loc, "specialization of variable template "
+			      "%qD declared as function", tmpl);
 		    inform (DECL_SOURCE_LOCATION (tmpl),
 			    "variable template declared here");
 		    return error_mark_node;
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 8f935e8..a28e776 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1608,7 +1608,8 @@ build_anon_union_vars (tree type, tree object)
      just give an error.  */
   if (TREE_CODE (type) != UNION_TYPE)
     {
-      error ("anonymous struct not inside named type");
+      error_at (DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (type)),
+		"anonymous struct not inside named type");
       return error_mark_node;
     }
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 018a03d..c61e0b2 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9014,6 +9014,7 @@ cp_parser_delete_expression (cp_parser* parser)
   bool global_scope_p;
   bool array_p;
   tree expression;
+  location_t start_loc = cp_lexer_peek_token (parser->lexer)->location;
 
   /* Look for the optional `::' operator.  */
   global_scope_p
@@ -9043,8 +9044,18 @@ cp_parser_delete_expression (cp_parser* parser)
   if (cp_parser_non_integral_constant_expression (parser, NIC_DEL))
     return error_mark_node;
 
-  return delete_sanity (expression, NULL_TREE, array_p, global_scope_p,
-			tf_warning_or_error);
+  /* Construct a location e.g.:
+       delete [ ] ptr
+       ^~~~~~~~~~~~~~
+     with caret == start at the start of the "delete" token, and
+     the end at the end of the final token we consumed.  */
+  location_t combined_loc = make_location (start_loc, start_loc,
+					   parser->lexer);
+  expression = delete_sanity (expression, NULL_TREE, array_p,
+			      global_scope_p, tf_warning_or_error);
+  protected_set_expr_location (expression, combined_loc);
+
+  return expression;
 }
 
 /* Returns 1 if TOKEN may start a cast-expression and isn't '++', '--',
@@ -25827,6 +25838,7 @@ cp_parser_throw_expression (cp_parser* parser)
 {
   tree expression;
   cp_token* token;
+  location_t start_loc = cp_lexer_peek_token (parser->lexer)->location;
 
   cp_parser_require_keyword (parser, RID_THROW, RT_THROW);
   token = cp_lexer_peek_token (parser->lexer);
@@ -25842,7 +25854,17 @@ cp_parser_throw_expression (cp_parser* parser)
   else
     expression = cp_parser_assignment_expression (parser);
 
-  return build_throw (expression);
+  /* Construct a location e.g.:
+       throw x
+       ^~~~~~~
+     with caret == start at the start of the "throw" token, and
+     the end at the end of the final token we consumed.  */
+  location_t combined_loc = make_location (start_loc, start_loc,
+					   parser->lexer);
+  expression = build_throw (expression);
+  protected_set_expr_location (expression, combined_loc);
+
+  return expression;
 }
 
 /* GNU Extensions */
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 67b3b63..6310e7b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -2137,7 +2137,8 @@ determine_specialization (tree template_id,
 
   if (TREE_CODE (decl) == FUNCTION_DECL && !is_overloaded_fn (fns))
     {
-      error ("%qD is not a function template", fns);
+      error_at (DECL_SOURCE_LOCATION (decl),
+		"%qD is not a function template", fns);
       return error_mark_node;
     }
   else if (VAR_P (decl) && !variable_template_p (fns))
@@ -2416,7 +2417,8 @@ determine_specialization (tree template_id,
       error ("template-id %qD for %q+D does not match any template "
 	     "declaration", template_id, decl);
       if (header_count && header_count != template_count + 1)
-	inform (input_location, "saw %d %<template<>%>, need %d for "
+	inform (DECL_SOURCE_LOCATION (decl),
+		"saw %d %<template<>%>, need %d for "
 		"specializing a member function template",
 		header_count, template_count + 1);
       else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 01253be..e851acd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/not-a-function-template-1.C: New.
+	* g++.dg/template/crash107.C: Adjust expected location.
+	* g++.dg/template/dependent-expr1.C: Check locations.
+	* g++.dg/template/error17.C: Check location.
+
 2019-10-07  Richard Sandiford  <richard.sandiford@arm.com>
 
 	PR target/91994
diff --git a/gcc/testsuite/g++.dg/diagnostic/not-a-function-template-1.C b/gcc/testsuite/g++.dg/diagnostic/not-a-function-template-1.C
new file mode 100644
index 0000000..caf8afa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/not-a-function-template-1.C
@@ -0,0 +1,9 @@
+// { dg-do compile { target c++14 } }
+
+template<typename> int A;  // { dg-message "24:variable template" }
+
+template int A<>();  // { dg-error "14:template<class>" }
+
+struct B {
+  friend int A<>();  // { dg-error "14:specialization" }
+};
diff --git a/gcc/testsuite/g++.dg/template/crash107.C b/gcc/testsuite/g++.dg/template/crash107.C
index cecf901..3b0b4e8 100644
--- a/gcc/testsuite/g++.dg/template/crash107.C
+++ b/gcc/testsuite/g++.dg/template/crash107.C
@@ -6,8 +6,8 @@
 template<typename FP_> struct Vec { // { dg-message "note" }
     Vec& operator^=(Vec& rhs)     {
         union {
-            struct {FP_ x,y,z;};
-        }; // { dg-error "anonymous struct" }
+            struct {FP_ x,y,z;}; // { dg-error "20:anonymous struct" }
+        };
         X = y*rhs.z() - z*rhs.y(); // { dg-error "not declared|no member" }
     }
     Vec& operator^(Vec& rhs) {
diff --git a/gcc/testsuite/g++.dg/template/dependent-expr1.C b/gcc/testsuite/g++.dg/template/dependent-expr1.C
index 7964986..eda7526 100644
--- a/gcc/testsuite/g++.dg/template/dependent-expr1.C
+++ b/gcc/testsuite/g++.dg/template/dependent-expr1.C
@@ -19,11 +19,11 @@ namespace std
     Foo (sizeof (x));
     Foo (__alignof__ (I));
     Foo (__alignof__ (x));
-    Foo (x->~I ()); // { dg-error "" }
+    Foo (x->~I ()); // { dg-error "16:invalid" }
     //    Foo (typeid (I));
-    Foo (delete x); // { dg-error "" }
-    Foo (delete[] x); // { dg-error "" }
-    Foo (throw x); // { dg-error "" }
+    Foo (delete x); // { dg-error "10:invalid" }
+    Foo (delete[] x); // { dg-error "10:invalid" }
+    Foo (throw x); // { dg-error "10:invalid" }
   }
 
 }
diff --git a/gcc/testsuite/g++.dg/template/error17.C b/gcc/testsuite/g++.dg/template/error17.C
index 30a693f..5b3281a 100644
--- a/gcc/testsuite/g++.dg/template/error17.C
+++ b/gcc/testsuite/g++.dg/template/error17.C
@@ -5,5 +5,5 @@ void
 foo()
 {
   union { struct { }; }; // { dg-error "prohibits anonymous struct" "anon" }
-  // { dg-error "not inside" "not inside" { target *-*-* } .-1 }
+  // { dg-error "18:anonymous struct not inside" "not inside" { target *-*-* } .-1 }
 }
-- 
cgit v1.1


From 240334e0847ea4185539e3dfef1ab8709bc04d88 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 7 Oct 2019 17:44:55 +0200
Subject: * gcc.target/i386/pr71801.c (uuidcache_init): Fix up size of d array.

From-SVN: r276663
---
 gcc/testsuite/ChangeLog                 | 4 ++++
 gcc/testsuite/gcc.target/i386/pr71801.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e851acd..ddf94bc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/i386/pr71801.c (uuidcache_init): Fix up size of d array.
+
 2019-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.dg/diagnostic/not-a-function-template-1.C: New.
diff --git a/gcc/testsuite/gcc.target/i386/pr71801.c b/gcc/testsuite/gcc.target/i386/pr71801.c
index 6c87522..8db137e 100644
--- a/gcc/testsuite/gcc.target/i386/pr71801.c
+++ b/gcc/testsuite/gcc.target/i386/pr71801.c
@@ -16,7 +16,7 @@ static int get_label_uuid(char *p1) {
 }
 void uuidcache_addentry(char *p1) { __builtin_memcpy(&c, p1, sizeof(c)); }
 void uuidcache_init() {
-  char d[1];
+  char d[16];
   get_label_uuid(d);
   uuidcache_addentry(d);
 }
-- 
cgit v1.1


From 0b06099d407225a28f12ed600ae561aa8317dfc9 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Mon, 7 Oct 2019 17:49:52 +0200
Subject: * gcc.target/i386/pr71801.c (uuidcache_init): Fix up size of d array.

From-SVN: r276664
---
 gcc/testsuite/gcc.target/i386/pr71801.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/gcc.target/i386/pr71801.c b/gcc/testsuite/gcc.target/i386/pr71801.c
index 8db137e..4f1cb19 100644
--- a/gcc/testsuite/gcc.target/i386/pr71801.c
+++ b/gcc/testsuite/gcc.target/i386/pr71801.c
@@ -16,7 +16,7 @@ static int get_label_uuid(char *p1) {
 }
 void uuidcache_addentry(char *p1) { __builtin_memcpy(&c, p1, sizeof(c)); }
 void uuidcache_init() {
-  char d[16];
+  char d[sizeof(a) + sizeof(c)];
   get_label_uuid(d);
   uuidcache_addentry(d);
 }
-- 
cgit v1.1


From 8682b1a508e5ba9bd2e1b2b4d298bf7d07a37f80 Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Mon, 7 Oct 2019 15:58:19 +0000
Subject: MSP430: Don't generate 430X insns when handling data in the lower
 memory region

gcc/ChangeLog:

2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config.in: Regenerate.
	* config/msp430/constraints.md: Fix docstring for "Ys" constraint.
	Add new "Yx" constraint.
	* config/msp430/driver-msp430.c (msp430_propagate_region_opt): New spec
	function.
	* config/msp430/msp430-protos.h (msp430_op_not_in_high_mem): New
	prototype.
	* config/msp430/msp430.c (msp430_option_override): Allow the lower
	code/data region to be selected in the small memory model.
	(msp430_section_attr): Don't warn if the "section" and "lower"
	attributes are used together.
	(msp430_handle_generic_attribute): Likewise.
	(msp430_var_in_low_mem): New function.
	(TARGET_ENCODE_SECTION_INFO): Define.
	(msp430_encode_section_info): New function.
	(gen_prefix): Return early in the small memory model.
	Require TARGET_USE_LOWER_REGION_PREFIX to be set before adding the
	".lower" prefix if -m{code,data}-region=lower have been passed.
	(msp430_output_aligned_decl_common): Emit common symbols when
	-mdata-region=lower is passed unless TARGET_USE_LOWER_REGION_PREFIX is
	set.
	(TARGET_ASM_FILE_END): Define.
	(msp430_file_end): New function.
	(msp430_do_not_relax_short_jumps): Allow relaxation when
	function will be in the lower region.
	(msp430_op_not_in_high_mem): New function.
	(msp430_print_operand): Check "msp430_op_not_in_high_mem" for
	the 'X' operand selector.
	Clarify comment for 'x' operand selector.
	* config/msp430/msp430.h (LINK_SPEC): Propagate
	-m{code,data}-region to the linker via spec function
	msp430_propagate_region_opt.
	(msp430_propagate_region_opt): New prototype.
	(EXTRA_SPEC_FUNCTIONS): Add msp430_propagate_region_opt.
	(SYMBOL_FLAG_LOW_MEM): Define.
	* config/msp430/msp430.md (addsipsi3): Add missing "%X" operand
	selector.
	(zero_extendqihi2): Fix operand number used by "%X" selector.
	(zero_extendqisi2): Likewise.
	(zero_extendhisi2): Likewise.
	(movqi): Use "Yx" constraint in place of "%X" operand selector.
	(movhi): Likewise.
	(addqi3): Likewise.
	(addhi3): Likewise.
	(addsi3): Likewise.
	(addhi3_cy): Likewise.
	(addchi4_cy): Likewise.
	(subqi3): Likewise.
	(subhi3): Likewise.
	(subsi3): Likewise.
	(bic<mode>3): Likewise.
	(and<mode>3): Likewise.
	(ior<mode>3): Likewise.
	(xor<mode>3): Likewise.
	(slli_1): Add missing "%X" operand selector.
	(slll_1): Likewise.
	(slll_2): Likewise.
	(srai_1): Likewise.
	(sral_1): Likewise.
	(sral_2): Likewise.
	(srli_1): Likewise.
	(srll_1): Likewise.
	(cbranchqi4_real): Use "Yx" constraint in place of "%X" operand
	selector.
	(cbranchhi4_real): Likewise.
	(cbranchqi4_reversed): Likewise.
	(cbranchhi4_reversed): Likewise.
	(*bitbranch<mode>4): Likewise.
	(*bitbranch<mode>4_z): Remove unnecessary "%x" operand selector.
	* config/msp430/msp430.opt (mcode-region=): Set default to
	MSP430_REGION_LOWER. Improve docstring.
	(mdata-region=): Likewise.
	(muse-lower-region-prefix): New option.
	* config/msp430/t-msp430 (MULTILIB_OPTIONS): Add
	mdata-region=none multilib.
	(MULTILIB_MATCHES): Set mdata-region={upper,either} to match
	mdata-region=none multilib.
	MULTILIB_EXCEPTIONS: Remove.
	MULTILIB_REQUIRED: Define.
	* configure: Regenerate.
	* configure.ac: Define HAVE_AS_GNU_ATTRIBUTE and
	HAVE_AS_MSPABI_ATTRIBUTE if GAS version >= 2.33.50.
	* doc/extend.texi: Clarify comment for {upper,lower,either}
	function attributes.
	Add separate description for "lower" variable attribute.

gcc/testsuite/ChangeLog:

2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* gcc.target/msp430/430x-insns.c: New test.
	* gcc.target/msp430/data-attributes-2.c: Remove dg-warning
	directives for conflicts between the "section" and "lower" attributes.
	* gcc.target/msp430/msp430.exp
	(check_effective_target_msp430_region_not_lower): New.
	(check_effective_target_msp430_region_lower): New.
	* gcc.target/msp430/object-attributes-430.c: New test.
	* gcc.target/msp430/object-attributes-default.c: New test.
	* gcc.target/msp430/object-attributes-mlarge-any-region.c: New test.
	* gcc.target/msp430/object-attributes-mlarge.c: New test.

From-SVN: r276665
---
 gcc/ChangeLog                                      |   88 ++
 gcc/config.in                                      |    6 +
 gcc/config/msp430/constraints.md                   |   10 +-
 gcc/config/msp430/driver-msp430.c                  |   13 +
 gcc/config/msp430/msp430-protos.h                  |    1 +
 gcc/config/msp430/msp430.c                         |  214 ++-
 gcc/config/msp430/msp430.h                         |   13 +-
 gcc/config/msp430/msp430.md                        |  176 ++-
 gcc/config/msp430/msp430.opt                       |   12 +-
 gcc/config/msp430/t-msp430                         |   11 +-
 gcc/configure                                      |   74 +
 gcc/configure.ac                                   |   14 +
 gcc/doc/extend.texi                                |   25 +-
 gcc/testsuite/ChangeLog                            |   13 +
 gcc/testsuite/gcc.target/msp430/430x-insns.c       | 1646 ++++++++++++++++++++
 .../gcc.target/msp430/data-attributes-2.c          |    4 +-
 gcc/testsuite/gcc.target/msp430/msp430.exp         |    8 +
 .../gcc.target/msp430/object-attributes-430.c      |   14 +
 .../gcc.target/msp430/object-attributes-default.c  |   16 +
 .../msp430/object-attributes-mlarge-any-region.c   |   14 +
 .../gcc.target/msp430/object-attributes-mlarge.c   |   15 +
 21 files changed, 2256 insertions(+), 131 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/msp430/430x-insns.c
 create mode 100644 gcc/testsuite/gcc.target/msp430/object-attributes-430.c
 create mode 100644 gcc/testsuite/gcc.target/msp430/object-attributes-default.c
 create mode 100644 gcc/testsuite/gcc.target/msp430/object-attributes-mlarge-any-region.c
 create mode 100644 gcc/testsuite/gcc.target/msp430/object-attributes-mlarge.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9ca3ba..74afcaa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,91 @@
+2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* config.in: Regenerate.
+	* config/msp430/constraints.md: Fix docstring for "Ys" constraint.
+	Add new "Yx" constraint.
+	* config/msp430/driver-msp430.c (msp430_propagate_region_opt): New spec
+	function.
+	* config/msp430/msp430-protos.h (msp430_op_not_in_high_mem): New
+	prototype.
+	* config/msp430/msp430.c (msp430_option_override): Allow the lower
+	code/data region to be selected in the small memory model.
+	(msp430_section_attr): Don't warn if the "section" and "lower"
+	attributes are used together.
+	(msp430_handle_generic_attribute): Likewise.
+	(msp430_var_in_low_mem): New function.
+	(TARGET_ENCODE_SECTION_INFO): Define.
+	(msp430_encode_section_info): New function.
+	(gen_prefix): Return early in the small memory model.
+	Require TARGET_USE_LOWER_REGION_PREFIX to be set before adding the
+	".lower" prefix if -m{code,data}-region=lower have been passed.
+	(msp430_output_aligned_decl_common): Emit common symbols when
+	-mdata-region=lower is passed unless TARGET_USE_LOWER_REGION_PREFIX is
+	set. 
+	(TARGET_ASM_FILE_END): Define.
+	(msp430_file_end): New function.
+	(msp430_do_not_relax_short_jumps): Allow relaxation when
+	function will be in the lower region.
+	(msp430_op_not_in_high_mem): New function.
+	(msp430_print_operand): Check "msp430_op_not_in_high_mem" for
+	the 'X' operand selector. 
+	Clarify comment for 'x' operand selector.
+	* config/msp430/msp430.h (LINK_SPEC): Propagate
+	-m{code,data}-region to the linker via spec function
+	msp430_propagate_region_opt.
+	(msp430_propagate_region_opt): New prototype.
+	(EXTRA_SPEC_FUNCTIONS): Add msp430_propagate_region_opt.
+	(SYMBOL_FLAG_LOW_MEM): Define.
+	* config/msp430/msp430.md (addsipsi3): Add missing "%X" operand
+	selector.
+	(zero_extendqihi2): Fix operand number used by "%X" selector.
+	(zero_extendqisi2): Likewise.
+	(zero_extendhisi2): Likewise.
+	(movqi): Use "Yx" constraint in place of "%X" operand selector.
+	(movhi): Likewise.
+	(addqi3): Likewise.
+	(addhi3): Likewise.
+	(addsi3): Likewise.
+	(addhi3_cy): Likewise.
+	(addchi4_cy): Likewise.
+	(subqi3): Likewise.
+	(subhi3): Likewise.
+	(subsi3): Likewise.
+	(bic<mode>3): Likewise.
+	(and<mode>3): Likewise.
+	(ior<mode>3): Likewise.
+	(xor<mode>3): Likewise.
+	(slli_1): Add missing "%X" operand selector.
+	(slll_1): Likewise.
+	(slll_2): Likewise.
+	(srai_1): Likewise.
+	(sral_1): Likewise.
+	(sral_2): Likewise.
+	(srli_1): Likewise.
+	(srll_1): Likewise.
+	(cbranchqi4_real): Use "Yx" constraint in place of "%X" operand
+	selector.
+	(cbranchhi4_real): Likewise.
+	(cbranchqi4_reversed): Likewise.
+	(cbranchhi4_reversed): Likewise.
+	(*bitbranch<mode>4): Likewise.
+	(*bitbranch<mode>4_z): Remove unnecessary "%x" operand selector.
+	* config/msp430/msp430.opt (mcode-region=): Set default to
+	MSP430_REGION_LOWER. Improve docstring.
+	(mdata-region=): Likewise.
+	(muse-lower-region-prefix): New option.
+	* config/msp430/t-msp430 (MULTILIB_OPTIONS): Add
+	mdata-region=none multilib. 
+	(MULTILIB_MATCHES): Set mdata-region={upper,either} to match
+	mdata-region=none multilib. 
+	MULTILIB_EXCEPTIONS: Remove.
+	MULTILIB_REQUIRED: Define.
+	* configure: Regenerate.
+	* configure.ac: Define HAVE_AS_GNU_ATTRIBUTE and
+	HAVE_AS_MSPABI_ATTRIBUTE if GAS version >= 2.33.50.
+	* doc/extend.texi: Clarify comment for {upper,lower,either}
+	function attributes.
+	Add separate description for "lower" variable attribute.
+
 2019-10-07  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	PR target/77918
diff --git a/gcc/config.in b/gcc/config.in
index 13fd795..9b54a47 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -553,6 +553,12 @@
 #endif
 
 
+/* Define if your assembler supports .mspabi_attribute. */
+#ifndef USED_FOR_TARGET
+#undef HAVE_AS_MSPABI_ATTRIBUTE
+#endif
+
+
 /* Define if the assembler understands -mnan=. */
 #ifndef USED_FOR_TARGET
 #undef HAVE_AS_NAN
diff --git a/gcc/config/msp430/constraints.md b/gcc/config/msp430/constraints.md
index 7ef249d..4422b2b 100644
--- a/gcc/config/msp430/constraints.md
+++ b/gcc/config/msp430/constraints.md
@@ -69,9 +69,11 @@
 
 
 ;; These are memory references that are safe to use without the X suffix,
-;; because we know/assume they need not index across the 64k boundary.
+;; because we know/assume they need not index across the 64K boundary.
+;; Note that for a PSImode memory operand, we always need to use the X suffix,
+;; regardless of what this constraint decides.
 (define_constraint "Ys"
-  "Memory reference, stack only."
+  "Memory reference, indexed or indirect register addressing modes."
   (and (match_code "mem")
        (ior
 	(and (match_code "plus" "0")
@@ -93,3 +95,7 @@
 		  (match_test ("REGNO (XEXP (XEXP (op, 0), 0)) != SP_REGNO")))
 	     ))))
 
+(define_constraint "Yx"
+  "Memory reference, in lower memory below address 0x10000."
+  (and (match_code "mem")
+       (match_test "msp430_op_not_in_high_mem (op)")))
diff --git a/gcc/config/msp430/driver-msp430.c b/gcc/config/msp430/driver-msp430.c
index 0a3d1e1..c37b169 100644
--- a/gcc/config/msp430/driver-msp430.c
+++ b/gcc/config/msp430/driver-msp430.c
@@ -149,3 +149,16 @@ msp430_select_hwmult_lib (int argc ATTRIBUTE_UNUSED,
 
   return "-lmul_none";
 }
+
+/* Spec function.  Propagate -m{code,data}-region= to the linker, unless the
+   lower region has been specified without -muse-lower-region-prefix also being
+   used.  */
+const char *
+msp430_propagate_region_opt (int argc, const char **argv)
+{
+  if (strcmp (argv[0], "lower") != 0)
+    return argv[0];
+  else if ((argc == 2) && (strcmp (argv[1], "-muse-lower-region-prefix") == 0))
+    return argv[0]; /* argv[0] == "lower".  */
+  return "none";
+}
diff --git a/gcc/config/msp430/msp430-protos.h b/gcc/config/msp430/msp430-protos.h
index 267b6f5..1c1757f 100644
--- a/gcc/config/msp430/msp430-protos.h
+++ b/gcc/config/msp430/msp430-protos.h
@@ -47,5 +47,6 @@ void	msp430_split_movsi (rtx *);
 void    msp430_start_function (FILE *, const char *, tree);
 rtx	msp430_subreg (machine_mode, rtx, machine_mode, int);
 bool    msp430_use_f5_series_hwmult (void);
+bool msp430_op_not_in_high_mem (rtx op);
 
 #endif /* GCC_MSP430_PROTOS_H */
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 6430823..354b4dd 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -35,6 +35,7 @@
 #include "tm_p.h"
 #include "regs.h"
 #include "emit-rtl.h"
+#include "varasm.h"
 #include "diagnostic-core.h"
 #include "fold-const.h"
 #include "stor-layout.h"
@@ -263,9 +264,6 @@ msp430_option_override (void)
   else if (!TARGET_LARGE && msp430_code_region == MSP430_REGION_UPPER)
     error ("%<-mcode-region=upper%> requires the large memory model "
 	   "(%<-mlarge%>)");
-  else if (!TARGET_LARGE && msp430_code_region == MSP430_REGION_LOWER)
-    error ("%<-mcode-region=lower%> requires the large memory model "
-	   "(%<-mlarge%>)");
 
   if (!TARGET_LARGE && msp430_data_region == MSP430_REGION_EITHER)
     error ("%<-mdata-region=either%> requires the large memory model "
@@ -273,10 +271,6 @@ msp430_option_override (void)
   else if (!TARGET_LARGE && msp430_data_region == MSP430_REGION_UPPER)
     error ("%<-mdata-region=upper%> requires the large memory model "
 	   "(%<-mlarge%>)");
-  else if (!TARGET_LARGE && msp430_data_region == MSP430_REGION_LOWER)
-    error ("%<-mdata-region=lower%> requires the large memory model "
-	   "(%<-mlarge%>)");
-
 
   if (flag_exceptions || flag_non_call_exceptions
       || flag_unwind_tables || flag_asynchronous_unwind_tables)
@@ -1386,7 +1380,7 @@ msp430_section_attr (tree * node,
   if (has_attr (ATTR_NOINIT, *node))
     message = G_("ignoring attribute %qE because it conflicts with "
 		 "attribute %<noinit%>");
-  else if (has_attr ("section", *node))
+  else if (has_attr ("section", *node) && !TREE_NAME_EQ (name, "lower"))
     message = G_("ignoring attribute %qE because it conflicts with "
 		 "attribute %<section%>");
   /* It does not make sense to use upper/lower/either attributes without
@@ -1564,12 +1558,14 @@ msp430_handle_generic_attribute (tree *node,
 {
   const char *message = NULL;
 
+  /* The front end has set up an exclusion between the "noinit" and "section"
+     attributes.  */
   if (!(TREE_NAME_EQ (name, ATTR_NOINIT) || TREE_NAME_EQ (name, "section")))
     return NULL_TREE;
 
-  /* The front end has set up an exclusion between the "noinit" and "section"
-     attributes.  */
-  if (has_attr (ATTR_LOWER, *node))
+  /* We allow the "lower" attribute to be used on variables with the "section"
+     attribute.  */
+  if (has_attr (ATTR_LOWER, *node) && !TREE_NAME_EQ (name, "section"))
     message = G_("ignoring attribute %qE because it conflicts with "
 		 "attribute %<lower%>");
   else if (has_attr (ATTR_UPPER, *node))
@@ -1591,6 +1587,55 @@ msp430_handle_generic_attribute (tree *node,
   return NULL_TREE;
 }
 
+/* Given a non-automatic VAR_DECL which can possibly have a section, return
+   true if the variable will definitely be placed in the lower memory
+   region (below address 0x10000).  */
+static bool
+msp430_var_in_low_mem (tree decl)
+{
+  gcc_assert (VAR_P (decl));
+
+  /* "noinit" variables are always placed in the lower memory region.  */
+  if (has_attr (ATTR_UPPER, decl)
+      || has_attr (ATTR_EITHER, decl)
+      || has_attr (ATTR_PERSIST, decl)
+      /* Unless the variable is marked with the lower or noinit attribute, we
+	 cannot assume that it is in the lower region if it is marked with the
+	 section attribute or -mdata-region={upper,either,none} have been
+	 passed.
+	 The noinit and section attributes conflict.  */
+      || (!has_attr (ATTR_LOWER, decl) && !has_attr (ATTR_NOINIT, decl)
+	  && (has_attr ("section", decl)
+	      || msp430_data_region == MSP430_REGION_UPPER
+	      || msp430_data_region == MSP430_REGION_EITHER
+	      || msp430_data_region == MSP430_REGION_ANY)))
+    return false;
+  return true;
+}
+
+#undef TARGET_ENCODE_SECTION_INFO
+#define TARGET_ENCODE_SECTION_INFO msp430_encode_section_info
+
+/* Encode whether a SYMBOL_REF is definitely in the lower memory region.  */
+static void
+msp430_encode_section_info (tree decl, rtx rtl, int first)
+{
+  rtx symbol;
+  default_encode_section_info (decl, rtl, first);
+
+  /* Careful not to prod global register variables.  */
+  if (!MEM_P (rtl))
+    return;
+  symbol = XEXP (rtl, 0);
+  if (GET_CODE (symbol) != SYMBOL_REF)
+    return;
+
+  if (VAR_P (decl)
+      && (TREE_STATIC (decl) || DECL_EXTERNAL (decl))
+      && msp430_var_in_low_mem (decl))
+    SYMBOL_REF_FLAGS (symbol) = SYMBOL_FLAG_LOW_MEM;
+}
+
 #undef  TARGET_ASM_FUNCTION_PROLOGUE
 #define TARGET_ASM_FUNCTION_PROLOGUE	msp430_start_function
 
@@ -1744,15 +1789,17 @@ gen_prefix (tree decl)
   if (has_section_name (".lowtext", decl))
     return NULL;
 
-  /* If the object has __attribute__((lower)) then use the ".lower." prefix.  */
+  /* Memory regions require the large memory model.  */
+  if (!TARGET_LARGE)
+    return NULL;
+
+  /* Note that we always apply the lower prefix when the attribute has been
+     used.  But we only apply the lower prefix when the lower region has been
+     specified by a command line option if -muse-lower-region-prefix has also
+     been passed.  */
   if (has_attr (ATTR_LOWER, decl))
     return lower_prefix;
 
-  /* If we are compiling for the MSP430 then we do not support the upper
-     region.  */
-  if (! msp430x)
-    return NULL;
-
   if (has_attr (ATTR_UPPER, decl))
     return upper_prefix;
 
@@ -1761,7 +1808,8 @@ gen_prefix (tree decl)
 
   if (TREE_CODE (decl) == FUNCTION_DECL)
     {
-      if (msp430_code_region == MSP430_REGION_LOWER)
+      if ((msp430_code_region == MSP430_REGION_LOWER)
+	  && TARGET_USE_LOWER_REGION_PREFIX)
 	return lower_prefix;
 
       if (msp430_code_region == MSP430_REGION_UPPER)
@@ -1772,7 +1820,8 @@ gen_prefix (tree decl)
     }
   else
     {
-      if (msp430_data_region == MSP430_REGION_LOWER)
+      if ((msp430_data_region == MSP430_REGION_LOWER)
+	  && TARGET_USE_LOWER_REGION_PREFIX)
 	return lower_prefix;
 
       if (msp430_data_region == MSP430_REGION_UPPER)
@@ -1966,7 +2015,6 @@ msp430_unique_section (tree decl, int reloc)
 /* Emit a declaration of a common symbol.
    If a data region is in use then put the symbol into the
    equivalent .bss section instead.  */
-
 void
 msp430_output_aligned_decl_common (FILE *		  stream,
 				   const tree		  decl,
@@ -1976,7 +2024,9 @@ msp430_output_aligned_decl_common (FILE *		  stream,
 {
   /* Only emit a common symbol if the variable does not have a specific section
      assigned.  */
-  if (msp430_data_region == MSP430_REGION_ANY
+  if ((msp430_data_region == MSP430_REGION_ANY
+       || ((msp430_data_region == MSP430_REGION_LOWER)
+	   && !TARGET_USE_LOWER_REGION_PREFIX))
       && !(decl != NULL_TREE && DECL_SECTION_NAME (decl))
       && !has_attr (ATTR_EITHER, decl)
       && !has_attr (ATTR_LOWER, decl)
@@ -2021,6 +2071,78 @@ msp430_output_aligned_decl_common (FILE *		  stream,
     }
 }
 
+#undef TARGET_ASM_FILE_END
+#define TARGET_ASM_FILE_END msp430_file_end
+
+/* Emit MSPABI and GNU object attributes.
+   Tags and values for MSPABI attributes are:
+   OFBA_MSPABI_Tag_ISA		4
+     MSP430	1
+     MSP430X	2
+   OFBA_MSPABI_Tag_Code_Model	6
+     Small 	1
+     Large	2
+   OFBA_MSPABI_Tag_Data_Model	8
+     Small 	1
+     Large	2
+     Restricted	3 (Unused by GNU)
+   OFBA_MSPABI_Tag_enum_size	10 (Unused by GNU)
+   Note that Code_Model and Data_Model are always equal for GNU.
+   We define a new .gnu_attribute to keep track of the data region used.
+   Tag_GNU_MSP430_Data_Region	4
+     LOWER	1
+     ANY	2
+   See binutils-gdb/include/elf/msp430.h for the full details.  */
+static void
+msp430_file_end (void)
+{
+#ifdef HAVE_AS_GNU_ATTRIBUTE
+  /* Enum for tag names.  */
+  enum
+    {
+      OFBA_MSPABI_Tag_ISA = 4,
+      OFBA_MSPABI_Tag_Code_Model = 6,
+      OFBA_MSPABI_Tag_Data_Model = 8,
+      Tag_GNU_MSP430_Data_Region = 4
+    };
+  /* Enum for tag values.  */
+  enum
+    {
+      OFBA_MSPABI_Val_ISA_MSP430 = 1,
+      OFBA_MSPABI_Val_ISA_MSP430X = 2,
+      OFBA_MSPABI_Val_Model_Small = 1,
+      OFBA_MSPABI_Val_Model_Large = 2,
+      Tag_GNU_MSP430_Data_Region_Lower = 1,
+      Tag_GNU_MSP430_Data_Region_Any = 2
+    };
+  /* .mspabi_attribute is a GNU assembler directive only.  The assembler will
+     construct a .MSP430.attributes section based on the options it is invoked
+     with.  The values it reads from these directives are used for validating
+     those options.  */
+  const char *msp_attr = ".mspabi_attribute";
+  const char *gnu_attr = ".gnu_attribute";
+
+  /* Emit .mspabi_attribute directive for OFBA_MSPABI_Tag_ISA.  */
+  fprintf (asm_out_file, "\t%s %d, %d\n", msp_attr, OFBA_MSPABI_Tag_ISA,
+	   msp430x ? OFBA_MSPABI_Val_ISA_MSP430X : OFBA_MSPABI_Val_ISA_MSP430);
+  /* Emit .mspabi_attribute directive for OFBA_MSPABI_Tag_Code_Model.  */
+  fprintf (asm_out_file, "\t%s %d, %d\n", msp_attr, OFBA_MSPABI_Tag_Code_Model,
+	   TARGET_LARGE ? OFBA_MSPABI_Val_Model_Large
+	   : OFBA_MSPABI_Val_Model_Small);
+  /* Emit .mspabi_attribute directive for OFBA_MSPABI_Tag_Data_Model.  */
+  fprintf (asm_out_file, "\t%s %d, %d\n", msp_attr, OFBA_MSPABI_Tag_Data_Model,
+	   TARGET_LARGE ? OFBA_MSPABI_Val_Model_Large
+	   : OFBA_MSPABI_Val_Model_Small);
+#ifdef HAVE_AS_MSPABI_ATTRIBUTE
+  /* Emit .gnu_attribute directive for Tag_GNU_MSP430_Data_Region.  */
+  fprintf (asm_out_file, "\t%s %d, %d\n", gnu_attr, Tag_GNU_MSP430_Data_Region,
+	   msp430_data_region == MSP430_REGION_LOWER
+	   ? Tag_GNU_MSP430_Data_Region_Lower
+	   : Tag_GNU_MSP430_Data_Region_Any);
+#endif
+#endif
+}
+
 bool
 msp430_do_not_relax_short_jumps (void)
 {
@@ -2031,9 +2153,7 @@ msp430_do_not_relax_short_jumps (void)
      end up in a low section.  */
   return
     msp430_code_region == MSP430_REGION_EITHER
-    || msp430_code_region == MSP430_REGION_LOWER
-    || has_attr (ATTR_EITHER, current_function_decl)
-    || has_attr (ATTR_LOWER, current_function_decl);
+    || has_attr (ATTR_EITHER, current_function_decl);
 }
 
 enum msp430_builtin
@@ -3074,6 +3194,36 @@ msp430_print_operand_addr (FILE * file, machine_mode /*mode*/, rtx addr)
   msp430_print_operand_raw (file, addr);
 }
 
+/* Determine whether an RTX is definitely not a MEM referencing an address in
+   the upper memory region.  Returns true if we've decided the address will be
+   in the lower memory region, or the RTX is not a MEM.  Returns false
+   otherwise.  */
+bool
+msp430_op_not_in_high_mem (rtx op)
+{
+  rtx op0;
+
+  if (!TARGET_LARGE || !MEM_P (op))
+    return true;
+
+  op0 = XEXP (op, 0);
+
+  if (SYMBOL_REF_P (op0) && (SYMBOL_REF_FLAGS (op0) & SYMBOL_FLAG_LOW_MEM))
+    /* msp430_encode_section_info decided this mem will be in lower
+       memory.  */
+    return true;
+
+  /* Catch (mem (const (plus ((symbol_ref) (const_int))))) e.g. &addr+2.  */
+  if ((GET_CODE (op0) == CONST)
+      && (GET_CODE (XEXP (op0, 0)) == PLUS)
+      && (SYMBOL_REF_P (XEXP (XEXP (op0, 0), 0)))
+      && (SYMBOL_REF_FLAGS (XEXP (XEXP (op0, 0), 0)) & SYMBOL_FLAG_LOW_MEM))
+    return true;
+
+  /* Return false when undecided.  */
+  return false;
+}
+
 #undef  TARGET_PRINT_OPERAND
 #define TARGET_PRINT_OPERAND		msp430_print_operand
 
@@ -3245,15 +3395,21 @@ msp430_print_operand (FILE * file, rtx op, int letter)
 
     case 'X':
       /* This is used to turn, for example, an ADD opcode into an ADDX
-	 opcode when we're using 20-bit addresses.  */
-      if (TARGET_LARGE || GET_MODE (op) == PSImode)
+	 opcode when we're using 20-bit addresses.
+	 This can be used for insns which have only one operand which might be
+	 a mem.
+	 If an insn has two different operands which could be memory operands,
+	 then the "Yx" constraint must be used to determine if the X suffix is
+	 required by checking both operands.  */
+      if (GET_MODE (op) == PSImode
+	  || !msp430_op_not_in_high_mem (op))
 	fprintf (file, "X");
-      /* We don't care which operand we use, but we want 'X' in the MD
-	 file, so we do it this way.  */
       return;
 
     case 'x':
-      /* Similarly, but only for PSImodes.  BIC, for example, needs this.  */
+      /* Similarly, but only for PSImodes.  BIC, and other insn patterns using
+	 the QHI mode iterator (which includes, QI, HI, and PSImode) use
+	 this.  */
       if (GET_MODE (op) == PSImode)
 	fprintf (file, "X");
       return;
diff --git a/gcc/config/msp430/msp430.h b/gcc/config/msp430/msp430.h
index 3449bd4..f885de2 100644
--- a/gcc/config/msp430/msp430.h
+++ b/gcc/config/msp430/msp430.h
@@ -71,7 +71,10 @@ extern bool msp430x;
    is enabled  (the GDB testsuite relies upon unused entities not being
    deleted).  */
 #define LINK_SPEC "%{mrelax:--relax} %{mlarge:%{!r:%{!g:--gc-sections}}} " \
-  "%{mcode-region=*:--code-region=%*} %{mdata-region=*:--data-region=%*}"
+  "%{mcode-region=*:--code-region=%:" \
+    "msp430_propagate_region_opt(%* %{muse-lower-region-prefix})} " \
+  "%{mdata-region=*:--data-region=%:" \
+    "msp430_propagate_region_opt(%* %{muse-lower-region-prefix})} " \
 
 #define DRIVER_SELF_SPECS \
   " %{!mlarge:%{mcode-region=*:%{mdata-region=*:%e-mcode-region and "	\
@@ -90,12 +93,16 @@ extern const char * msp430_select_hwmult_lib (int, const char **);
 extern const char * msp430_select_cpu (int, const char **);
 extern const char * msp430_set_driver_var (int, const char **);
 extern const char * msp430_check_path_for_devices (int, const char **);
+extern const char *msp430_propagate_region_opt (int, const char **);
 
+/* There must be a trailing comma after the last item, see gcc.c
+   "static_spec_functions".  */
 # define EXTRA_SPEC_FUNCTIONS				\
   { "msp430_hwmult_lib", msp430_select_hwmult_lib },	\
   { "msp430_select_cpu", msp430_select_cpu },		\
   { "msp430_set_driver_var", msp430_set_driver_var },		\
-  { "msp430_check_path_for_devices", msp430_check_path_for_devices },
+  { "msp430_check_path_for_devices", msp430_check_path_for_devices }, \
+  { "msp430_propagate_region_opt", msp430_propagate_region_opt },
 
 /* Specify the libraries to include on the linker command line.
 
@@ -482,3 +489,5 @@ typedef struct
 
 #define ASM_OUTPUT_ALIGNED_DECL_COMMON(FILE, DECL, NAME, SIZE, ALIGN)	\
   msp430_output_aligned_decl_common ((FILE), (DECL), (NAME), (SIZE), (ALIGN))
+
+#define SYMBOL_FLAG_LOW_MEM (SYMBOL_FLAG_MACH_DEP << 0)
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index f6d6889..c72f7aa 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -190,22 +190,22 @@
 )
 
 (define_insn "movqi"
-  [(set (match_operand:QI 0 "msp_nonimmediate_operand" "=rYs,rm")
-	(match_operand:QI 1 "msp_general_operand" "riYs,rmi"))]
+  [(set (match_operand:QI 0 "msp_nonimmediate_operand" "=rYsYx,rm")
+	(match_operand:QI 1 "msp_general_operand" "riYsYx,rmi"))]
   ""
   "@
   MOV.B\t%1, %0
-  MOV%X0.B\t%1, %0"
+  MOVX.B\t%1, %0"
 )
 
 (define_insn "movhi"
-  [(set (match_operand:HI 0 "msp_nonimmediate_operand" "=r,rYs,rm")
-	(match_operand:HI 1 "msp_general_operand" "N,riYs,rmi"))]
+  [(set (match_operand:HI 0 "msp_nonimmediate_operand" "=r,rYsYx,rm")
+	(match_operand:HI 1 "msp_general_operand" "N,riYsYx,rmi"))]
   ""
   "@
   MOV.B\t%1, %0
   MOV.W\t%1, %0
-  MOV%X0.W\t%1, %0"
+  MOVX.W\t%1, %0"
 )
 
 (define_expand "movsi"
@@ -241,7 +241,7 @@
   "msp430_split_movsi (operands);"
 )
 
-;; Some MOVX.A cases can be done with MOVA, this is only a few of them.
+;; FIXME: Some MOVX.A cases can be done with MOVA, this is only a few of them.
 (define_insn "movpsi"
   [(set (match_operand:PSI 0 "msp_nonimmediate_operand" "=r,r,r,Ya,rm")
 	(match_operand:PSI 1 "msp_general_operand" "N,O,riYa,r,rmi"))]
@@ -289,23 +289,23 @@
 )
 
 (define_insn "addqi3"
-  [(set (match_operand:QI          0 "msp_nonimmediate_operand" "=rYs,rm")
+  [(set (match_operand:QI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
 	(plus:QI (match_operand:QI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:QI 2 "msp_general_operand"      "riYs,rmi")))]
+		 (match_operand:QI 2 "msp_general_operand"      "riYsYx,rmi")))]
   ""
   "@
    ADD.B\t%2, %0
-   ADD%X0.B\t%2, %0"
+   ADDX.B\t%2, %0"
 )
 
 (define_insn "addhi3"
-  [(set (match_operand:HI           0 "msp_nonimmediate_operand" "=rYs,rm")
+  [(set (match_operand:HI           0 "msp_nonimmediate_operand" "=rYsYx,rm")
 	(plus:HI (match_operand:HI  1 "msp_nonimmediate_operand" "%0,0")
-		  (match_operand:HI 2 "msp_general_operand"      "riYs,rmi")))]
+		  (match_operand:HI 2 "msp_general_operand"      "riYsYx,rmi")))]
   ""
   "@
    ADD.W\t%2, %0
-   ADD%X0.W\t%2, %0"
+   ADDX.W\t%2, %0"
 )
 
 ; This pattern is needed in order to avoid reload problems.
@@ -317,17 +317,17 @@
 	(plus:SI (match_operand:SI    1 "register_operand" "0")
 		 (match_operand       2 "general_operand" "rmi")))]
   ""
-  "ADD.W\t%L2, %L0 { ADDC.W\t%H2, %H0 { PUSH.W\t%H0 { PUSH.W\t%L0 { POPM.A\t#1, %0"
+  "ADD%X2.W\t%L2, %L0 { ADDC%X2.W\t%H2, %H0 { PUSH.W\t%H0 { PUSH.W\t%L0 { POPM.A\t#1, %0"
 )
 
 (define_insn "addsi3"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=&r,rm")
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=&rYsYx,rm")
 	(plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
-		 (match_operand:SI 2 "general_operand" "r,mi")))]
+		 (match_operand:SI 2 "general_operand" "rYsYxi,mi")))]
   ""
   "@
    ADD\t%L2, %L0 { ADDC\t%H2, %H0
-   ADD%X0\t%L2, %L0 { ADDC%X0\t%H2, %H0"
+   ADDX\t%L2, %L0 { ADDCX\t%H2, %H0"
 )
 
 ; Version of addhi that exposes the carry operations, for SImode adds.
@@ -358,9 +358,9 @@
 ; that are not single_set() very well.
 
 (define_insn "addhi3_cy"
-  [(set (match_operand:HI          0 "msp_nonimmediate_operand" "=r,rm")
+  [(set (match_operand:HI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
 	(plus:HI (match_operand:HI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:HI 2 "msp_nonimmediate_operand" "r,rm")))
+		 (match_operand:HI 2 "msp_nonimmediate_operand" "rYsYxi,rm")))
    (set (reg:BI CARRY)
 	(truncate:BI (lshiftrt:SI (plus:SI (zero_extend:SI (match_dup 1))
 					   (zero_extend:SI (match_dup 2)))
@@ -369,7 +369,7 @@
   ""
   "@
    ADD\t%2, %1 ; cy
-   ADD%X0\t%2, %1 ; cy"
+   ADDX\t%2, %1 ; cy"
   )
 
 (define_insn "addhi3_cy_i"
@@ -389,15 +389,15 @@
 
 ; Version of addhi that adds the carry, for SImode adds.
 (define_insn "addchi4_cy"
-  [(set (match_operand:HI                   0 "msp_nonimmediate_operand" "=r,rm")
+  [(set (match_operand:HI                   0 "msp_nonimmediate_operand" "=rYsYx,rm")
 	(plus:HI (plus:HI (match_operand:HI 1 "msp_nonimmediate_operand" "%0,0")
-			  (match_operand:HI 2 "msp_general_operand"      "ri,rmi"))
+			  (match_operand:HI 2 "msp_general_operand"      "riYsYx,rmi"))
 		 (zero_extend:HI (reg:BI CARRY))))
    ]
   ""
   "@
    ADDC\t%2, %1
-   ADDC%X0\t%2, %1"
+   ADDCX\t%2, %1"
   )
 
 ; Split an SImode add into two HImode adds, keeping track of the carry
@@ -458,36 +458,38 @@
 
 ;; Alternatives 2 and 3 are to handle cases generated by reload.
 (define_insn "subqi3"
-  [(set (match_operand:QI           0 "nonimmediate_operand" "=rYs,  rm,  &?r, ?&r")
+  [(set (match_operand:QI           0 "nonimmediate_operand" "=rYsYx,  rm,  &?r, ?&r")
 	(minus:QI (match_operand:QI 1 "general_operand"       "0,    0,    !r,  !i")
-		  (match_operand:QI 2 "general_operand"      " riYs, rmi, rmi,   r")))]
+		  (match_operand:QI 2 "general_operand"      " riYsYx, rmi, rmi,   r")))]
   ""
   "@
   SUB.B\t%2, %0
-  SUB%X0.B\t%2, %0
-  MOV%X0.B\t%1, %0 { SUB%X0.B\t%2, %0
+  SUBX.B\t%2, %0
+  MOV%X2.B\t%1, %0 { SUB%X2.B\t%2, %0
   MOV%X0.B\t%1, %0 { SUB%X0.B\t%2, %0"
 )
 
 ;; Alternatives 2 and 3 are to handle cases generated by reload.
 (define_insn "subhi3"
-  [(set (match_operand:HI           0 "nonimmediate_operand" "=rYs,  rm,  &?r, ?&r")
+  [(set (match_operand:HI           0 "nonimmediate_operand" "=rYsYx,  rm,  &?r, ?&r")
 	(minus:HI (match_operand:HI 1 "general_operand"       "0,    0,    !r,  !i")
-		  (match_operand:HI 2 "general_operand"      " riYs, rmi, rmi,   r")))]
+		  (match_operand:HI 2 "general_operand"      " riYsYx, rmi, rmi,   r")))]
   ""
   "@
   SUB.W\t%2, %0
-  SUB%X0.W\t%2, %0
-  MOV%X0.W\t%1, %0 { SUB%X0.W\t%2, %0
+  SUBX.W\t%2, %0
+  MOV%X2.W\t%1, %0 { SUB%X2.W\t%2, %0
   MOV%X0.W\t%1, %0 { SUB%X0.W\t%2, %0"
 )
 
 (define_insn "subsi3"
-  [(set (match_operand:SI           0 "nonimmediate_operand" "=&rm")
-	(minus:SI (match_operand:SI 1 "nonimmediate_operand"   "0")
-		  (match_operand:SI 2 "general_operand"        "rmi")))]
+  [(set (match_operand:SI           0 "nonimmediate_operand" "=&rYsYx,m")
+	(minus:SI (match_operand:SI 1 "nonimmediate_operand"   "0,0")
+		  (match_operand:SI 2 "general_operand"        "riYsYx,mi")))]
   ""
-  "SUB%X0\t%L2, %L0 { SUBC%X0\t%H2, %H0"
+  "@
+  SUB\t%L2, %L0 { SUBC\t%H2, %H0
+  SUBX\t%L2, %L0 { SUBCX\t%H2, %H0"
 )
 
 (define_insn "*bic<mode>_cg"
@@ -501,44 +503,44 @@
 )
 
 (define_insn "bic<mode>3"
-  [(set (match_operand:QHI                   0 "msp_nonimmediate_operand" "=rYs,rm")
-	(and:QHI (not:QHI (match_operand:QHI 1 "msp_general_operand"       "rYs,rmn"))
+  [(set (match_operand:QHI                   0 "msp_nonimmediate_operand" "=rYsYx,rm")
+	(and:QHI (not:QHI (match_operand:QHI 1 "msp_general_operand"       "rYsYx,rmn"))
 		 (match_operand:QHI          2 "msp_nonimmediate_operand"  "0,0")))]
   ""
   "@
    BIC%x0%b0\t%1, %0
-   BIC%X0%b0\t%1, %0"
+   BICX%b0\t%1, %0"
 )
 
 (define_insn "and<mode>3"
-  [(set (match_operand:QHI 0 "msp_nonimmediate_operand" "=r,rYs,rm")
+  [(set (match_operand:QHI 0 "msp_nonimmediate_operand" "=r,rYsYx,rm")
 	(and:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "%0,0,0")
-		 (match_operand:QHI 2 "msp_general_operand" "N,riYs,rmi")))]
+		 (match_operand:QHI 2 "msp_general_operand" "N,riYsYx,rmi")))]
   ""
   "@
    AND%x0.B\t%2, %0
    AND%x0%b0\t%2, %0
-   AND%X0%b0\t%2, %0"
+   ANDX%b0\t%2, %0"
 )
 
 (define_insn "ior<mode>3"
-  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYs,rm")
+  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
 	(ior:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:QHI 2 "msp_general_operand" "riYs,rmi")))]
+		 (match_operand:QHI 2 "msp_general_operand" "riYsYx,rmi")))]
   ""
   "@
    BIS%x0%b0\t%2, %0
-   BIS%X0%b0\t%2, %0"
+   BISX%b0\t%2, %0"
 )
 
 (define_insn "xor<mode>3"
-  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYs,rm")
+  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
 	(xor:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:QHI 2 "msp_general_operand" "riYs,rmi")))]
+		 (match_operand:QHI 2 "msp_general_operand" "riYsYx,rmi")))]
   ""
   "@
    XOR%x0%b0\t%2, %0
-   XOR%X0%b0\t%2, %0"
+   XORX%b0\t%2, %0"
 )
 
 ;; Macro : XOR #~0, %0
@@ -567,7 +569,7 @@
   "@
    AND\t#0xff, %0
    MOV.B\t%1, %0
-   MOV%X0.B\t%1, %0
+   MOV%X1.B\t%1, %0
    AND%X0\t#0xff, %0"
 )
 
@@ -621,7 +623,7 @@
   [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
 	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
   ""
-  "MOV.B\t%1,%L0 { CLR\t%H0"
+  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
 )
 
 (define_insn "zero_extendhisi2"
@@ -629,7 +631,7 @@
 	(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r")))]
   ""
   "@
-  MOV.W\t#0,%H0
+  MOV%X0.W\t#0,%H0
   MOV.W\t%1,%L0 { MOV.W\t#0,%H0"
 )
 
@@ -782,7 +784,7 @@
 	(ashift:HI (match_operand:HI 1 "general_operand"       "0")
 		   (const_int 1)))]
   ""
-  "RLA.W\t%0" ;; Note - this is a macro for ADD
+  "RLA%X0.W\t%0" ;; Note - this is a macro for ADD
 )
 
 (define_insn "430x_shift_left"
@@ -802,7 +804,7 @@
 	(ashift:SI (match_operand:SI 1 "general_operand"       "0")
 		   (const_int 1)))]
   ""
-  "RLA.W\t%L0 { RLC.W\t%H0"
+  "RLA%X0.W\t%L0 { RLC%X0.W\t%H0"
 )
 
 (define_insn "slll_2"
@@ -810,7 +812,7 @@
 	(ashift:SI (match_operand:SI 1 "general_operand"       "0")
 		   (const_int 2)))]
   ""
-  "RLA.W\t%L0 { RLC.W\t%H0 { RLA.W\t%L0 { RLC.W\t%H0"
+  "RLA%X0.W\t%L0 { RLC%X0.W\t%H0 { RLA%X0.W\t%L0 { RLC%X0.W\t%H0"
 )
 
 (define_expand "ashlsi3"
@@ -867,7 +869,7 @@
 	(ashiftrt:HI (match_operand:HI 1 "msp_general_operand"      "0")
 		     (const_int 1)))]
   ""
-  "RRA.W\t%0"
+  "RRA%X0.W\t%0"
 )
 
 (define_insn "430x_arithmetic_shift_right"
@@ -903,7 +905,7 @@
 	(ashiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 1)))]
   ""
-  "RRA.W\t%H0 { RRC.W\t%L0"
+  "RRA%X0.W\t%H0 { RRC%X0.W\t%L0"
 )
 
 (define_insn "sral_2"
@@ -911,7 +913,7 @@
 	(ashiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 2)))]
   ""
-  "RRA.W\t%H0 { RRC.W\t%L0 { RRA.W\t%H0 { RRC.W\t%L0"
+  "RRA%X0.W\t%H0 { RRC%X0.W\t%L0 { RRA%X0.W\t%H0 { RRC%X0.W\t%L0"
 )
 
 (define_expand "ashrsi3"
@@ -968,7 +970,7 @@
 	(lshiftrt:HI (match_operand:HI 1 "general_operand"       "0")
 		     (const_int 1)))]
   ""
-  "CLRC { RRC.W\t%0"
+  "CLRC { RRC%X0.W\t%0"
 )
 
 (define_insn "430x_logical_shift_right"
@@ -994,7 +996,7 @@
 	(lshiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 1)))]
   ""
-  "CLRC { RRC.W\t%H0 { RRC.W\t%L0"
+  "CLRC { RRC%X0.W\t%H0 { RRC%X0.W\t%L0"
 )
 
 (define_insn "srll_2x"
@@ -1188,8 +1190,8 @@
 (define_insn "cbranchqi4_real"
   [(set (pc) (if_then_else
 	      (match_operator                    0 "msp430_cmp_operator"
-			      [(match_operand:QI 1 "nonimmediate_operand" "rYs,rm")
-			       (match_operand:QI 2 "general_operand"      "rYsi,rmi")])
+			      [(match_operand:QI 1 "nonimmediate_operand" "rYsYx,rm")
+			       (match_operand:QI 2 "general_operand"      "rYsYxi,rmi")])
               (label_ref (match_operand          3 "" ""))
 	      (pc)))
    (clobber (reg:BI CARRY))
@@ -1197,14 +1199,14 @@
   ""
   "@
    CMP.B\t%2, %1 { J%0\t%l3
-   CMP%X0.B\t%2, %1 { J%0\t%l3"
+   CMPX.B\t%2, %1 { J%0\t%l3"
   )
 
 (define_insn "cbranchhi4_real"
   [(set (pc) (if_then_else
 	      (match_operator                    0 "msp430_cmp_operator"
-			      [(match_operand:HI 1 "nonimmediate_operand" "rYs,rm")
-			       (match_operand:HI 2 "general_operand"      "rYsi,rmi")])
+			      [(match_operand:HI 1 "nonimmediate_operand" "rYsYx,rm")
+			       (match_operand:HI 2 "general_operand"      "rYsYxi,rmi")])
               (label_ref (match_operand          3 "" ""))
 	      (pc)))
    (clobber (reg:BI CARRY))
@@ -1222,12 +1224,12 @@
       {
         return which_alternative == 0 ?
             \"CMP.W\t%2, %1 { J%r0 1f { BRA #%l3 { 1:\" :
-         \"CMP%X0.W\t%2, %1 { J%r0 1f { BRA #%l3 { 1:\";
+	    \"CMPX.W\t%2, %1 { J%r0 1f { BRA #%l3 { 1:\";
       }
 
     return which_alternative == 0 ?
          \"CMP.W\t%2, %1 { J%0\t%l3\" :
-      \"CMP%X0.W\t%2, %1 { J%0\t%l3\";
+	 \"CMPX.W\t%2, %1 { J%0\t%l3\";
   "
   [(set (attr "length")
 	(if_then_else
@@ -1257,8 +1259,8 @@
 (define_insn "cbranchqi4_reversed"
   [(set (pc) (if_then_else
 	      (match_operator                    0 "msp430_reversible_cmp_operator"
-			      [(match_operand:QI 1 "general_operand" "rYsi,rmi")
-			       (match_operand:QI 2 "general_operand" "rYs,rm")])
+			      [(match_operand:QI 1 "general_operand" "rYsYxi,rmi")
+			       (match_operand:QI 2 "general_operand" "rYsYx,rm")])
               (label_ref (match_operand          3 "" ""))
 	      (pc)))
    (clobber (reg:BI CARRY))
@@ -1266,14 +1268,14 @@
   ""
   "@
    CMP.B\t%1, %2 { J%R0\t%l3
-   CMP%X0.B\t%1, %2 { J%R0\t%l3"
+   CMPX.B\t%1, %2 { J%R0\t%l3"
   )
 
 (define_insn "cbranchhi4_reversed"
   [(set (pc) (if_then_else
 	      (match_operator                    0 "msp430_reversible_cmp_operator"
-			      [(match_operand:HI 1 "general_operand" "rYsi,rmi")
-			       (match_operand:HI 2 "general_operand" "rYs,rm")])
+			      [(match_operand:HI 1 "general_operand" "rYsYxi,rmi")
+			       (match_operand:HI 2 "general_operand" "rYsYx,rm")])
               (label_ref (match_operand          3 "" ""))
 	      (pc)))
    (clobber (reg:BI CARRY))
@@ -1281,13 +1283,13 @@
   ""
   "@
    CMP.W\t%1, %2 { J%R0\t%l3
-   CMP%X0.W\t%1, %2 { J%R0\t%l3"
+   CMPX.W\t%1, %2 { J%R0\t%l3"
   )
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (ne (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYs,rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rYsi,rmi"))
+	      (ne (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (label_ref (match_operand 2 "" ""))
 	      (pc)))
@@ -1296,46 +1298,52 @@
   ""
   "@
    BIT%x0%b0\t%1, %0 { JNE\t%l2
-   BIT%X0%b0\t%1, %0 { JNE\t%l2"
+   BITX%b0\t%1, %0 { JNE\t%l2"
   )
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (eq (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rmi"))
+	      (eq (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (label_ref (match_operand 2 "" ""))
 	      (pc)))
    (clobber (reg:BI CARRY))
    ]
   ""
-  "BIT%x0%b0\t%1, %0 { JEQ\t%l2"
+  "@
+   BIT%x0%b0\t%1, %0 { JEQ\t%l2
+   BITX%b0\t%1, %0 { JEQ\t%l2"
   )
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (eq (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rmi"))
+	      (eq (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (pc)
 	      (label_ref (match_operand 2 "" ""))))
    (clobber (reg:BI CARRY))
    ]
   ""
-  "BIT%X0%b0\t%1, %0 { JNE\t%l2"
+  "@
+  BIT%x0%b0\t%1, %0 { JNE\t%l2
+  BITX%b0\t%1, %0 { JNE\t%l2"
   )
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (ne (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rmi"))
+	      (ne (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (pc)
 	      (label_ref (match_operand 2 "" ""))))
    (clobber (reg:BI CARRY))
    ]
   ""
-  "BIT%X0%b0\t%1, %0 { JEQ\t%l2"
+  "@
+  BIT%x0%b0\t%1, %0 { JEQ\t%l2
+  BITX%b0\t%1, %0 { JEQ\t%l2"
   )
 
 ;;------------------------------------------------------------
@@ -1368,7 +1376,7 @@
    (clobber (reg:BI CARRY))
    ]
   ""
-  "BIT%x0%X0%b0\t%p1, %0 { JEQ\t%l2"
+  "BIT%X0%b0\t%p1, %0 { JEQ\t%l2"
   )
 
 (define_insn "*bitbranch<mode>4_z"
diff --git a/gcc/config/msp430/msp430.opt b/gcc/config/msp430/msp430.opt
index cbbe0fa..2db2906 100644
--- a/gcc/config/msp430/msp430.opt
+++ b/gcc/config/msp430/msp430.opt
@@ -67,12 +67,16 @@ EnumValue
 Enum(msp430_hwmult_types) String(f5series) Value(MSP430_HWMULT_F5SERIES)
 
 mcode-region=
-Target Joined RejectNegative Report ToLower Var(msp430_code_region) Enum(msp430_regions) Init(MSP430_REGION_ANY)
-Specify whether functions should be placed into low or high memory.
+Target Joined RejectNegative Report ToLower Var(msp430_code_region) Enum(msp430_regions) Init(MSP430_REGION_LOWER)
+Specify whether functions should be placed into the lower or upper memory regions, or if they should be shuffled between the regions (either) for best fit (default: lower).
 
 mdata-region=
-Target Joined RejectNegative Report ToLower Var(msp430_data_region) Enum(msp430_regions) Init(MSP430_REGION_ANY)
-Specify whether variables should be placed into low or high memory.
+Target Joined RejectNegative Report ToLower Var(msp430_data_region) Enum(msp430_regions) Init(MSP430_REGION_LOWER)
+Specify whether variables should be placed into the lower or upper memory regions, or if they should be shuffled between the regions (either) for best fit (default: lower).
+
+muse-lower-region-prefix
+Target Mask(USE_LOWER_REGION_PREFIX) Report
+Add the .lower prefix to section names when compiling with -m{code,data}-region=lower (disabled by default).
 
 Enum
 Name(msp430_regions) Type(enum msp430_regions)
diff --git a/gcc/config/msp430/t-msp430 b/gcc/config/msp430/t-msp430
index b956510..f8ba775 100644
--- a/gcc/config/msp430/t-msp430
+++ b/gcc/config/msp430/t-msp430
@@ -28,17 +28,22 @@ msp430-devices.o: $(srcdir)/config/msp430/msp430-devices.c \
 
 # Enable multilibs:
 
-MULTILIB_OPTIONS    = mcpu=msp430 mlarge 
-MULTILIB_DIRNAMES   = 430          large
+MULTILIB_OPTIONS    = mcpu=msp430 mlarge  mdata-region=none
+MULTILIB_DIRNAMES   = 430	   large  full-memory-range
 
 # Match -mcpu=430
 MULTILIB_MATCHES    = mcpu?msp430=mcpu?430
+# These options are equivalent in terms of the multilib required for them
+MULTILIB_MATCHES   += mdata-region?none=mdata-region?upper
+MULTILIB_MATCHES   += mdata-region?none=mdata-region?either
 
 # The correct multilib for a given mmcu is selected without the need for
 # hard-coded data here, because DRIVER_SELF_SPECS will place the correct
 # -mcpu option for a given mcu onto the command line.
 
-MULTILIB_EXCEPTIONS = mcpu=msp430/mlarge
+MULTILIB_REQUIRED = mcpu=msp430
+MULTILIB_REQUIRED += mlarge
+MULTILIB_REQUIRED += mlarge/mdata-region=none
 
 
 MULTILIB_EXTRA_OPTS =
diff --git a/gcc/configure b/gcc/configure
index 893a9e6..dc9f5fe 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -27773,6 +27773,80 @@ fi
       as_fn_error $? "Requesting --with-nan= requires assembler support for -mnan=" "$LINENO" 5
     fi
     ;;
+    msp430-*-*)
+    # Earlier GAS versions generically support .gnu_attribute, but the
+    # msp430 assembler will not do anything with it.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for .gnu_attribute support" >&5
+$as_echo_n "checking assembler for .gnu_attribute support... " >&6; }
+if ${gcc_cv_as_msp430_gnu_attribute+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gcc_cv_as_msp430_gnu_attribute=no
+    if test $in_tree_gas = yes; then
+    if test $gcc_cv_gas_vers -ge `expr \( \( 2 \* 1000 \) + 33 \) \* 1000 + 50`
+  then gcc_cv_as_msp430_gnu_attribute=yes
+fi
+  elif test x$gcc_cv_as != x; then
+    $as_echo '.gnu_attribute 4,1' > conftest.s
+    if { ac_try='$gcc_cv_as $gcc_cv_as_flags  -o conftest.o conftest.s >&5'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+    then
+	gcc_cv_as_msp430_gnu_attribute=yes
+    else
+      echo "configure: failed program was" >&5
+      cat conftest.s >&5
+    fi
+    rm -f conftest.o conftest.s
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_msp430_gnu_attribute" >&5
+$as_echo "$gcc_cv_as_msp430_gnu_attribute" >&6; }
+if test $gcc_cv_as_msp430_gnu_attribute = yes; then
+
+$as_echo "#define HAVE_AS_GNU_ATTRIBUTE 1" >>confdefs.h
+
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for .mspabi_attribute support" >&5
+$as_echo_n "checking assembler for .mspabi_attribute support... " >&6; }
+if ${gcc_cv_as_msp430_mspabi_attribute+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gcc_cv_as_msp430_mspabi_attribute=no
+    if test $in_tree_gas = yes; then
+    if test $gcc_cv_gas_vers -ge `expr \( \( 2 \* 1000 \) + 33 \) \* 1000 + 50`
+  then gcc_cv_as_msp430_mspabi_attribute=yes
+fi
+  elif test x$gcc_cv_as != x; then
+    $as_echo '.mspabi_attribute 4,1' > conftest.s
+    if { ac_try='$gcc_cv_as $gcc_cv_as_flags  -o conftest.o conftest.s >&5'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+    then
+	gcc_cv_as_msp430_mspabi_attribute=yes
+    else
+      echo "configure: failed program was" >&5
+      cat conftest.s >&5
+    fi
+    rm -f conftest.o conftest.s
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_msp430_mspabi_attribute" >&5
+$as_echo "$gcc_cv_as_msp430_mspabi_attribute" >&6; }
+if test $gcc_cv_as_msp430_mspabi_attribute = yes; then
+
+$as_echo "#define HAVE_AS_MSPABI_ATTRIBUTE 1" >>confdefs.h
+
+fi
+
+    ;;
     riscv*-*-*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for .attribute support" >&5
 $as_echo_n "checking assembler for .attribute support... " >&6; }
diff --git a/gcc/configure.ac b/gcc/configure.ac
index eff849f..54a6715 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4949,6 +4949,20 @@ pointers into PC-relative form.])
 	[Requesting --with-nan= requires assembler support for -mnan=])
     fi
     ;;
+    msp430-*-*)
+    # Earlier GAS versions generically support .gnu_attribute, but the
+    # msp430 assembler will not do anything with it.
+    gcc_GAS_CHECK_FEATURE([.gnu_attribute support],
+      gcc_cv_as_msp430_gnu_attribute, [2,33,50],,
+      [.gnu_attribute 4,1],,
+      [AC_DEFINE(HAVE_AS_GNU_ATTRIBUTE, 1,
+	  [Define if your assembler supports .gnu_attribute.])])
+    gcc_GAS_CHECK_FEATURE([.mspabi_attribute support],
+      gcc_cv_as_msp430_mspabi_attribute, [2,33,50],,
+      [.mspabi_attribute 4,1],,
+      [AC_DEFINE(HAVE_AS_MSPABI_ATTRIBUTE, 1,
+	  [Define if your assembler supports .mspabi_attribute.])])
+    ;;
     riscv*-*-*)
     gcc_GAS_CHECK_FEATURE([.attribute support],
       gcc_cv_as_riscv_attribute, [2,32,0],,
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 64fccfe..7e37c5c 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -5206,7 +5206,7 @@ On the MSP430 target these attributes can be used to specify whether
 the function or variable should be placed into low memory, high
 memory, or the placement should be left to the linker to decide.  The
 attributes are only significant if compiling for the MSP430X
-architecture.
+architecture in the large memory model.
 
 The attributes work in conjunction with a linker script that has been
 augmented to specify where to place sections with a @code{.lower} and
@@ -7537,15 +7537,30 @@ value will be retained across resets.  The linker script being used to
 create the application should ensure that persistent data is correctly
 placed.
 
-@item lower
-@itemx upper
+@item upper
 @itemx either
-@cindex @code{lower} variable attribute, MSP430 
 @cindex @code{upper} variable attribute, MSP430 
 @cindex @code{either} variable attribute, MSP430 
 These attributes are the same as the MSP430 function attributes of the
 same name (@pxref{MSP430 Function Attributes}).  
-These attributes can be applied to both functions and variables.
+
+@item lower
+@cindex @code{lower} variable attribute, MSP430
+This option behaves mostly the same as the MSP430 function attribute of the
+same name (@pxref{MSP430 Function Attributes}), but it has some additional
+functionality.
+
+If @option{-mdata-region=}@{@code{upper,either,none}@} has been passed, or
+the @code{section} attribute is applied to a variable, the compiler will
+generate 430X instructions to handle it.  This is because the compiler has
+to assume that the variable could get placed in the upper memory region
+(above address 0xFFFF).  Marking the variable with the @code{lower} attribute
+informs the compiler that the variable will be placed in lower memory so it
+is safe to use 430 instructions to handle it.
+
+In the case of the @code{section} attribute, the section name given
+will be used, and the @code{.lower} prefix will not be added.
+
 @end table
 
 @node Nvidia PTX Variable Attributes
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ddf94bc..b55e272 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/430x-insns.c: New test.
+	* gcc.target/msp430/data-attributes-2.c: Remove dg-warning
+	directives for conflicts between the "section" and "lower" attributes.
+	* gcc.target/msp430/msp430.exp
+	(check_effective_target_msp430_region_not_lower): New.
+	(check_effective_target_msp430_region_lower): New.
+	* gcc.target/msp430/object-attributes-430.c: New test.
+	* gcc.target/msp430/object-attributes-default.c: New test.
+	* gcc.target/msp430/object-attributes-mlarge-any-region.c: New test.
+	* gcc.target/msp430/object-attributes-mlarge.c: New test.
+
 2019-10-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.target/i386/pr71801.c (uuidcache_init): Fix up size of d array.
diff --git a/gcc/testsuite/gcc.target/msp430/430x-insns.c b/gcc/testsuite/gcc.target/msp430/430x-insns.c
new file mode 100644
index 0000000..a67f778
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/430x-insns.c
@@ -0,0 +1,1646 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" "-mcpu=430" "-msmall" } { "" } } */
+/* { dg-options "-O1 -mlarge" } */
+/* { dg-final { check-function-bodies "**" "" } } */
+
+/* The purpose of this test is to check that all insn patters in msp430.md
+   which use the "Yx" constraint work as expected.
+   So when both of the operands are in lower memory, a 430 instruction is
+   generated, and when at least one of the operands might be in upper memory,
+   a 430X instruction is generated.
+   We do not need to extensively test the situation where one of the operands
+   in an insn is not a mem (i.e. it is a register or immediate).  A single test
+   will verify that the constraint correctly assumes that a reg
+   or immediate does not itself require a 430X instruction.  */
+
+typedef char qi;
+typedef int hi;
+/* For insns which use the QHI mode iterator (therefore accepting QI, HI and 
+   PSI modes), we also check the PSImode version.  All insns should be 430x
+   in that case.  */
+typedef __int20 psi;
+typedef long si;
+
+#define ATTR_EITHER __attribute__((either))
+#define ATTR_LOWER __attribute__((lower))
+
+/* Use these to generate 430X insns.  */
+qi ATTR_EITHER eqi1, eqi2, eqi3, eqi4, eqi5, eqi6;
+hi ATTR_EITHER ehi1, ehi2, ehi3, ehi4, ehi5, ehi6;
+psi ATTR_EITHER epsi1, epsi2, epsi3, epsi4, epsi5, epsi6;
+si ATTR_EITHER esi1, esi2, esi3, esi4, esi5, esi6;
+
+/* Use these to generate 430 insns.  */
+qi ATTR_LOWER lqi1, lqi2, lqi3, lqi4, lqi5, lqi6;
+hi ATTR_LOWER lhi1, lhi2, lhi3, lhi4, lhi5, lhi6;
+psi ATTR_LOWER lpsi1, lpsi2, lpsi3, lpsi4, lpsi5, lpsi6;
+si ATTR_LOWER lsi1, lsi2, lsi3, lsi4, lsi5, lsi6;
+
+/* The default data region is "lower", so these behave the same as the above
+   "l*" variables unless -mdata-region={upper,either,none} is passed.  */
+qi qi1, qi2, qi3, qi4, qi5, qi6;
+hi hi1, hi2, hi3, hi4, hi5, hi6;
+psi psi1, psi2, psi3, psi4, psi5, psi6;
+si si1, si2, si3, si4, si5, si6;
+
+qi use_qi(qi a);
+hi use_hi(hi a);
+psi use_psi(psi a);
+si use_si(si a);
+
+#define USE_MODE(MODE) use_ ## MODE
+#define USE_MODE_N(MODE,N) use_ ## N ## MODE
+
+#define E_VAR(MODE,N) e ## MODE ## N
+#define L_VAR(MODE,N) l ## MODE ## N
+#define VAR(MODE,N) MODE ## N
+
+#define REG_VAR(MODE,N) MODE ## r ## N
+
+/* Verify that a register operand does not influence whether a 430X instruction
+   is used or not.  */
+/*
+** register_operand:  { target msp430_region_lower }
+** ...
+**	MOV.B	&lqi1, R12
+** ...
+**	MOV.B	&qi1, R12
+** ...
+**	MOVX.B	&eqi1, R12
+** ...
+*/
+/*
+** register_operand:  { target msp430_region_not_lower }
+** ...
+**	MOV.B	&lqi1, R12
+** ...
+**	MOVX.B	&qi1, R12
+** ...
+**	MOVX.B	&eqi1, R12
+** ...
+*/
+
+void
+register_operand (void)
+{
+  use_qi (lqi1);
+  use_qi (qi1);
+  use_qi (eqi1);
+}
+
+/* Verify that an immediate operand does not influence whether a 430X instruction
+   is used or not.  */
+/*
+** immediate_operand: { target msp430_region_lower }
+** ...
+**	MOV.B	#1, &lqi1
+**	MOV.B	#2, &qi1
+**	MOVX.B	#3, &eqi1
+** ...
+*/
+/*
+** immediate_operand: { target msp430_region_not_lower }
+** ...
+**	MOV.B	#1, &lqi1
+**	MOVX.B	#2, &qi1
+**	MOVX.B	#3, &eqi1
+** ...
+*/
+void
+immediate_operand (void)
+{
+  lqi1 = 1;
+  qi1 = 2;
+  eqi1 = 3;
+}
+
+/* Verify that variables marked with the noinit, persistent, section and lower
+   attributes have the appropriate format instructions generated to handle
+   them.  */
+int __attribute__((persistent)) pp = 10;
+int __attribute__((noinit)) nn;
+int __attribute__((section(".data.foo"))) s;
+int __attribute__((section(".data.foo"),lower)) sl1;
+int __attribute__((lower,section(".data.foo"))) sl2;
+
+/*
+** attrs:
+** ...
+**	MOVX.W	#1, &pp
+**	MOV.W	#2, &nn
+**	MOVX.W	#3, &s
+**	MOV.W	#4, &sl1
+**	MOV.W	#5, &sl2
+** ...
+*/
+void
+attrs (void)
+{
+  pp = 1;
+  nn = 2;
+  s = 3;
+  sl1 = 4;
+  sl2 = 5;
+}
+
+#define MOV_INSNS(MODE) \
+  E_VAR(MODE, 1) = E_VAR(MODE, 2); \
+  E_VAR(MODE, 3) = L_VAR(MODE, 1); \
+  E_VAR(MODE, 4) = VAR(MODE, 1); \
+  L_VAR(MODE, 4) = E_VAR(MODE, 5); \
+  VAR(MODE, 5) = E_VAR(MODE, 6); \
+  L_VAR(MODE, 2) = L_VAR(MODE, 3); \
+  L_VAR(MODE, 5) = VAR(MODE, 2); \
+  VAR(MODE, 3) = VAR(MODE, 4); \
+  VAR(MODE, 6) = L_VAR(MODE, 6);
+
+
+/*
+** movqi: { target msp430_region_lower }
+** ...
+**	MOVX.B	&eqi2, &eqi1
+**	MOVX.B	&lqi1, &eqi3
+**	MOVX.B	&qi1, &eqi4
+**	MOVX.B	&eqi5, &lqi4
+**	MOVX.B	&eqi6, &qi5
+**	MOV.B	&lqi3, &lqi2
+**	MOV.B	&qi2, &lqi5
+**	MOV.B	&qi4, &qi3
+**	MOV.B	&lqi6, &qi6
+** ...
+*/
+/*
+** movqi: { target msp430_region_not_lower }
+** ...
+**	MOVX.B	&eqi2, &eqi1
+**	MOVX.B	&lqi1, &eqi3
+**	MOVX.B	&qi1, &eqi4
+**	MOVX.B	&eqi5, &lqi4
+**	MOVX.B	&eqi6, &qi5
+**	MOV.B	&lqi3, &lqi2
+**	MOVX.B	&qi2, &lqi5
+**	MOVX.B	&qi4, &qi3
+**	MOVX.B	&lqi6, &qi6
+** ...
+*/
+void
+movqi (void)
+{
+  MOV_INSNS (qi)
+}
+
+/*
+** movhi: { target msp430_region_lower }
+** ...
+**	MOVX.W	&ehi2, &ehi1
+**	MOVX.W	&lhi1, &ehi3
+**	MOVX.W	&hi1, &ehi4
+**	MOVX.W	&ehi5, &lhi4
+**	MOVX.W	&ehi6, &hi5
+**	MOV.W	&lhi3, &lhi2
+**	MOV.W	&hi2, &lhi5
+**	MOV.W	&hi4, &hi3
+**	MOV.W	&lhi6, &hi6
+** ...
+*/
+/*
+** movhi: { target msp430_region_not_lower }
+** ...
+**	MOVX.W	&ehi2, &ehi1
+**	MOVX.W	&lhi1, &ehi3
+**	MOVX.W	&hi1, &ehi4
+**	MOVX.W	&ehi5, &lhi4
+**	MOVX.W	&ehi6, &hi5
+**	MOV.W	&lhi3, &lhi2
+**	MOVX.W	&hi2, &lhi5
+**	MOVX.W	&hi4, &hi3
+**	MOVX.W	&lhi6, &hi6
+** ...
+*/
+void
+movhi (void)
+{
+  MOV_INSNS (hi)
+}
+
+/* There is no specific movsi3 pattern defined for msp430, but we check
+   this is synthesized correctly anyway.  */
+/*
+** movsi: { target msp430_region_lower }
+** ...
+**	MOVX.W	&esi2, &esi1
+**	MOVX.W	&esi2\+2, &esi1\+2
+**	MOVX.W	&lsi1, &esi3
+**	MOVX.W	&lsi1\+2, &esi3\+2
+**	MOVX.W	&si1, &esi4
+**	MOVX.W	&si1\+2, &esi4\+2
+**	MOVX.W	&esi5, &lsi4
+**	MOVX.W	&esi5\+2, &lsi4\+2
+**	MOVX.W	&esi6, &si5
+**	MOVX.W	&esi6\+2, &si5\+2
+**	MOV.W	&lsi3, &lsi2
+**	MOV.W	&lsi3\+2, &lsi2\+2
+**	MOV.W	&si2, &lsi5
+**	MOV.W	&si2\+2, &lsi5\+2
+**	MOV.W	&si4, &si3
+**	MOV.W	&si4\+2, &si3\+2
+**	MOV.W	&lsi6, &si6
+**	MOV.W	&lsi6\+2, &si6\+2
+** ...
+*/
+/*
+** movsi: { target msp430_region_not_lower }
+** ...
+**	MOVX.W	&esi2, &esi1
+**	MOVX.W	&esi2\+2, &esi1\+2
+**	MOVX.W	&lsi1, &esi3
+**	MOVX.W	&lsi1\+2, &esi3\+2
+**	MOVX.W	&si1, &esi4
+**	MOVX.W	&si1\+2, &esi4\+2
+**	MOVX.W	&esi5, &lsi4
+**	MOVX.W	&esi5\+2, &lsi4\+2
+**	MOVX.W	&esi6, &si5
+**	MOVX.W	&esi6\+2, &si5\+2
+**	MOV.W	&lsi3, &lsi2
+**	MOV.W	&lsi3\+2, &lsi2\+2
+**	MOVX.W	&si2, &lsi5
+**	MOVX.W	&si2\+2, &lsi5\+2
+**	MOVX.W	&si4, &si3
+**	MOVX.W	&si4\+2, &si3\+2
+**	MOVX.W	&lsi6, &si6
+**	MOVX.W	&lsi6\+2, &si6\+2
+** ...
+*/
+void
+movsi (void)
+{
+  MOV_INSNS (si)
+}
+
+#define ADD_INSNS(MODE) \
+  E_VAR(MODE,1) += E_VAR(MODE,2); \
+  E_VAR(MODE,3) += L_VAR(MODE,1); \
+  E_VAR(MODE,4) += VAR(MODE,1); \
+  L_VAR(MODE,2) += E_VAR(MODE,5); \
+  VAR(MODE,3) += E_VAR(MODE,6); \
+  L_VAR(MODE,3) += L_VAR(MODE,4); \
+  L_VAR(MODE,5) += VAR(MODE,2); \
+  VAR(MODE,4) += L_VAR(MODE,6); \
+  VAR(MODE,5) += VAR(MODE,6);
+
+/*
+** addqi3: { target msp430_region_lower }
+** ...
+**	ADDX.B	&eqi2, &eqi1
+**	ADDX.B	&lqi1, &eqi3
+**	ADDX.B	&qi1, &eqi4
+**	ADDX.B	&eqi5, &lqi2
+**	ADDX.B	&eqi6, &qi3
+**	ADD.B	&lqi4, &lqi3
+**	ADD.B	&qi2, &lqi5
+**	ADD.B	&lqi6, &qi4
+**	ADD.B	&qi6, &qi5
+** ...
+*/
+/*
+** addqi3: { target msp430_region_not_lower }
+** ...
+**	ADDX.B	&eqi2, &eqi1
+**	ADDX.B	&lqi1, &eqi3
+**	ADDX.B	&qi1, &eqi4
+**	ADDX.B	&eqi5, &lqi2
+**	ADDX.B	&eqi6, &qi3
+**	ADD.B	&lqi4, &lqi3
+**	ADDX.B	&qi2, &lqi5
+**	ADDX.B	&lqi6, &qi4
+**	ADDX.B	&qi6, &qi5
+** ...
+*/
+void
+addqi3 (void)
+{
+  ADD_INSNS(qi)
+}
+
+/*
+** addhi3: { target msp430_region_lower }
+** ...
+**	ADDX.W	&ehi2, &ehi1
+**	ADDX.W	&lhi1, &ehi3
+**	ADDX.W	&hi1, &ehi4
+**	ADDX.W	&ehi5, &lhi2
+**	ADDX.W	&ehi6, &hi3
+**	ADD.W	&lhi4, &lhi3
+**	ADD.W	&hi2, &lhi5
+**	ADD.W	&lhi6, &hi4
+**	ADD.W	&hi6, &hi5
+** ...
+*/
+/*
+** addhi3: { target msp430_region_not_lower }
+** ...
+**	ADDX.W	&ehi2, &ehi1
+**	ADDX.W	&lhi1, &ehi3
+**	ADDX.W	&hi1, &ehi4
+**	ADDX.W	&ehi5, &lhi2
+**	ADDX.W	&ehi6, &hi3
+**	ADD.W	&lhi4, &lhi3
+**	ADDX.W	&hi2, &lhi5
+**	ADDX.W	&lhi6, &hi4
+**	ADDX.W	&hi6, &hi5
+** ...
+*/
+void
+addhi3 (void)
+{
+  ADD_INSNS(hi)
+}
+
+/*
+** addsi3: { target msp430_region_lower }
+** ...
+**	ADDX	&esi2, &esi1 { ADDCX	&esi2\+2, &esi1\+2
+**	ADDX	&lsi1, &esi3 { ADDCX	&lsi1\+2, &esi3\+2
+**	ADDX	&si1, &esi4 { ADDCX	&si1\+2, &esi4\+2
+**	ADDX	&esi5, &lsi2 { ADDCX	&esi5\+2, &lsi2\+2
+**	ADDX	&esi6, &si3 { ADDCX	&esi6\+2, &si3\+2
+**	ADD	&lsi4, &lsi3 { ADDC	&lsi4\+2, &lsi3\+2
+**	ADD	&si2, &lsi5 { ADDC	&si2\+2, &lsi5\+2
+**	ADD	&lsi6, &si4 { ADDC	&lsi6\+2, &si4\+2
+**	ADD	&si6, &si5 { ADDC	&si6\+2, &si5\+2
+** ...
+*/
+/*
+** addsi3: { target msp430_region_not_lower }
+** ...
+**	ADDX	&esi2, &esi1 { ADDCX	&esi2\+2, &esi1\+2
+**	ADDX	&lsi1, &esi3 { ADDCX	&lsi1\+2, &esi3\+2
+**	ADDX	&si1, &esi4 { ADDCX	&si1\+2, &esi4\+2
+**	ADDX	&esi5, &lsi2 { ADDCX	&esi5\+2, &lsi2\+2
+**	ADDX	&esi6, &si3 { ADDCX	&esi6\+2, &si3\+2
+**	ADD	&lsi4, &lsi3 { ADDC	&lsi4\+2, &lsi3\+2
+**	ADDX	&si2, &lsi5 { ADDCX	&si2\+2, &lsi5\+2
+**	ADDX	&lsi6, &si4 { ADDCX	&lsi6\+2, &si4\+2
+**	ADDX	&si6, &si5 { ADDCX	&si6\+2, &si5\+2
+** ...
+*/
+void
+addsi3 (void)
+{
+  ADD_INSNS(si)
+}
+
+#define SUB_INSNS(MODE) \
+  E_VAR(MODE,1) -= E_VAR(MODE,2); \
+  E_VAR(MODE,3) -= L_VAR(MODE,1); \
+  E_VAR(MODE,4) -= VAR(MODE,1); \
+  L_VAR(MODE,2) -= E_VAR(MODE,5); \
+  VAR(MODE,3) -= E_VAR(MODE,6); \
+  L_VAR(MODE,3) -= L_VAR(MODE,4); \
+  L_VAR(MODE,5) -= VAR(MODE,2); \
+  VAR(MODE,4) -= L_VAR(MODE,6); \
+  VAR(MODE,5) -= VAR(MODE,6);
+
+/*
+** subqi3: { target msp430_region_lower }
+** ...
+**	SUBX.B	&eqi2, &eqi1
+**	SUBX.B	&lqi1, &eqi3
+**	SUBX.B	&qi1, &eqi4
+**	SUBX.B	&eqi5, &lqi2
+**	SUBX.B	&eqi6, &qi3
+**	SUB.B	&lqi4, &lqi3
+**	SUB.B	&qi2, &lqi5
+**	SUB.B	&lqi6, &qi4
+**	SUB.B	&qi6, &qi5
+** ...
+*/
+/*
+** subqi3: { target msp430_region_not_lower }
+** ...
+**	SUBX.B	&eqi2, &eqi1
+**	SUBX.B	&lqi1, &eqi3
+**	SUBX.B	&qi1, &eqi4
+**	SUBX.B	&eqi5, &lqi2
+**	SUBX.B	&eqi6, &qi3
+**	SUB.B	&lqi4, &lqi3
+**	SUBX.B	&qi2, &lqi5
+**	SUBX.B	&lqi6, &qi4
+**	SUBX.B	&qi6, &qi5
+** ...
+*/
+void
+subqi3 (void)
+{
+  SUB_INSNS(qi)
+}
+
+/*
+** subhi3: { target msp430_region_lower }
+** ...
+**	SUBX.W	&ehi2, &ehi1
+**	SUBX.W	&lhi1, &ehi3
+**	SUBX.W	&hi1, &ehi4
+**	SUBX.W	&ehi5, &lhi2
+**	SUBX.W	&ehi6, &hi3
+**	SUB.W	&lhi4, &lhi3
+**	SUB.W	&hi2, &lhi5
+**	SUB.W	&lhi6, &hi4
+**	SUB.W	&hi6, &hi5
+** ...
+*/
+/*
+** subhi3: { target msp430_region_not_lower }
+** ...
+**	SUBX.W	&ehi2, &ehi1
+**	SUBX.W	&lhi1, &ehi3
+**	SUBX.W	&hi1, &ehi4
+**	SUBX.W	&ehi5, &lhi2
+**	SUBX.W	&ehi6, &hi3
+**	SUB.W	&lhi4, &lhi3
+**	SUBX.W	&hi2, &lhi5
+**	SUBX.W	&lhi6, &hi4
+**	SUBX.W	&hi6, &hi5
+** ...
+*/
+void
+subhi3 (void)
+{
+  SUB_INSNS(hi)
+}
+
+/*
+** subsi3: { target msp430_region_lower }
+** ...
+**	SUBX	&esi2, &esi1 { SUBCX	&esi2\+2, &esi1\+2
+**	SUBX	&lsi1, &esi3 { SUBCX	&lsi1\+2, &esi3\+2
+**	SUBX	&si1, &esi4 { SUBCX	&si1\+2, &esi4\+2
+**	SUBX	&esi5, &lsi2 { SUBCX	&esi5\+2, &lsi2\+2
+**	SUBX	&esi6, &si3 { SUBCX	&esi6\+2, &si3\+2
+**	SUB	&lsi4, &lsi3 { SUBC	&lsi4\+2, &lsi3\+2
+**	SUB	&si2, &lsi5 { SUBC	&si2\+2, &lsi5\+2
+**	SUB	&lsi6, &si4 { SUBC	&lsi6\+2, &si4\+2
+**	SUB	&si6, &si5 { SUBC	&si6\+2, &si5\+2
+** ...
+*/
+/*
+** subsi3: { target msp430_region_not_lower }
+** ...
+**	SUBX	&esi2, &esi1 { SUBCX	&esi2\+2, &esi1\+2
+**	SUBX	&lsi1, &esi3 { SUBCX	&lsi1\+2, &esi3\+2
+**	SUBX	&si1, &esi4 { SUBCX	&si1\+2, &esi4\+2
+**	SUBX	&esi5, &lsi2 { SUBCX	&esi5\+2, &lsi2\+2
+**	SUBX	&esi6, &si3 { SUBCX	&esi6\+2, &si3\+2
+**	SUB	&lsi4, &lsi3 { SUBC	&lsi4\+2, &lsi3\+2
+**	SUBX	&si2, &lsi5 { SUBCX	&si2\+2, &lsi5\+2
+**	SUBX	&lsi6, &si4 { SUBCX	&lsi6\+2, &si4\+2
+**	SUBX	&si6, &si5 { SUBCX	&si6\+2, &si5\+2
+** ...
+*/
+void
+subsi3 (void)
+{
+  SUB_INSNS(si)
+}
+
+#define BIC_INSN(MODE) \
+  E_VAR(MODE,1) &= (E_VAR(MODE,2) ^ E_VAR(MODE,1)); \
+  E_VAR(MODE,3) &= (L_VAR(MODE,1) ^ E_VAR(MODE,3)); \
+  E_VAR(MODE,4) &= (VAR(MODE,1) ^ E_VAR(MODE,4)); \
+  L_VAR(MODE,2) &= (E_VAR(MODE,5) ^ L_VAR(MODE,2)); \
+  VAR(MODE,2) &= (E_VAR(MODE,6) ^ VAR(MODE,2)); \
+  L_VAR(MODE,3) &= (L_VAR(MODE,4) ^ L_VAR(MODE,3)); \
+  L_VAR(MODE,5) &= (VAR(MODE,3) ^ L_VAR(MODE,5)); \
+  VAR(MODE,4) &= (L_VAR(MODE,6) ^ VAR(MODE,4)); \
+  VAR(MODE,5) &= (VAR(MODE,6) ^ VAR(MODE,5)); \
+
+/*
+** bicqi3: { target msp430_region_lower }
+** ...
+**	BICX.B	&eqi2, &eqi1
+**	BICX.B	&lqi1, &eqi3
+**	BICX.B	&qi1, &eqi4
+**	BICX.B	&eqi5, &lqi2
+**	BICX.B	&eqi6, &qi2
+**	BIC.B	&lqi4, &lqi3
+**	BIC.B	&qi3, &lqi5
+**	BIC.B	&lqi6, &qi4
+**	BIC.B	&qi6, &qi5
+** ...
+*/
+/*
+** bicqi3: { target msp430_region_not_lower }
+** ...
+**	BICX.B	&eqi2, &eqi1
+**	BICX.B	&lqi1, &eqi3
+**	BICX.B	&qi1, &eqi4
+**	BICX.B	&eqi5, &lqi2
+**	BICX.B	&eqi6, &qi2
+**	BIC.B	&lqi4, &lqi3
+**	BICX.B	&qi3, &lqi5
+**	BICX.B	&lqi6, &qi4
+**	BICX.B	&qi6, &qi5
+** ...
+*/
+void
+bicqi3 (void)
+{
+  BIC_INSN(qi)
+}
+
+/*
+** bichi3: { target msp430_region_lower }
+** ...
+**	BICX.W	&ehi2, &ehi1
+**	BICX.W	&lhi1, &ehi3
+**	BICX.W	&hi1, &ehi4
+**	BICX.W	&ehi5, &lhi2
+**	BICX.W	&ehi6, &hi2
+**	BIC.W	&lhi4, &lhi3
+**	BIC.W	&hi3, &lhi5
+**	BIC.W	&lhi6, &hi4
+**	BIC.W	&hi6, &hi5
+** ...
+*/
+/*
+** bichi3: { target msp430_region_not_lower }
+** ...
+**	BICX.W	&ehi2, &ehi1
+**	BICX.W	&lhi1, &ehi3
+**	BICX.W	&hi1, &ehi4
+**	BICX.W	&ehi5, &lhi2
+**	BICX.W	&ehi6, &hi2
+**	BIC.W	&lhi4, &lhi3
+**	BICX.W	&hi3, &lhi5
+**	BICX.W	&lhi6, &hi4
+**	BICX.W	&hi6, &hi5
+** ...
+*/
+void
+bichi3 (void)
+{
+  BIC_INSN(hi)
+}
+
+/*
+** bicpsi3:
+** ...
+**	BICX.A	&epsi2, &epsi1
+**	BICX.A	&lpsi1, &epsi3
+**	BICX.A	&psi1, &epsi4
+**	BICX.A	&epsi5, &lpsi2
+**	BICX.A	&epsi6, &psi2
+**	BICX.A	&lpsi4, &lpsi3
+**	BICX.A	&psi3, &lpsi5
+**	BICX.A	&lpsi6, &psi4
+**	BICX.A	&psi6, &psi5
+** ...
+*/
+void
+bicpsi3 (void)
+{
+  BIC_INSN(psi)
+}
+
+/* There is no specific bicsi3 pattern defined for msp430, but we check
+   this is synthesized correctly anyway.  */
+/*
+** bicsi3: { target msp430_region_lower }
+** ...
+**	BICX.W	&esi2, &esi1
+**	BICX.W	&esi2\+2, &esi1\+2
+**	BICX.W	&lsi1, &esi3
+**	BICX.W	&lsi1\+2, &esi3\+2
+**	BICX.W	&si1, &esi4
+**	BICX.W	&si1\+2, &esi4\+2
+**	BICX.W	&esi5, &lsi2
+**	BICX.W	&esi5\+2, &lsi2\+2
+**	BICX.W	&esi6, &si2
+**	BICX.W	&esi6\+2, &si2\+2
+**	BIC.W	&lsi4, &lsi3
+**	BIC.W	&lsi4\+2, &lsi3\+2
+**	BIC.W	&si3, &lsi5
+**	BIC.W	&si3\+2, &lsi5\+2
+**	BIC.W	&lsi6, &si4
+**	BIC.W	&lsi6\+2, &si4\+2
+**	BIC.W	&si6, &si5
+**	BIC.W	&si6\+2, &si5\+2
+** ...
+*/
+/*
+** bicsi3: { target msp430_region_not_lower }
+** ...
+**	BICX.W	&esi2, &esi1
+**	BICX.W	&esi2\+2, &esi1\+2
+**	BICX.W	&lsi1, &esi3
+**	BICX.W	&lsi1\+2, &esi3\+2
+**	BICX.W	&si1, &esi4
+**	BICX.W	&si1\+2, &esi4\+2
+**	BICX.W	&esi5, &lsi2
+**	BICX.W	&esi5\+2, &lsi2\+2
+**	BICX.W	&esi6, &si2
+**	BICX.W	&esi6\+2, &si2\+2
+**	BIC.W	&lsi4, &lsi3
+**	BIC.W	&lsi4\+2, &lsi3\+2
+**	BICX.W	&si3, &lsi5
+**	BICX.W	&si3\+2, &lsi5\+2
+**	BICX.W	&lsi6, &si4
+**	BICX.W	&lsi6\+2, &si4\+2
+**	BICX.W	&si6, &si5
+**	BICX.W	&si6\+2, &si5\+2
+** ...
+*/
+void
+bicsi3 (void)
+{
+  BIC_INSN(si)
+}
+
+#define BIC_CG_INSN(MODE) \
+  E_VAR(MODE,1) &= (1 ^ E_VAR(MODE,1)); \
+  E_VAR(MODE,2) &= (2 ^ E_VAR(MODE,2)); \
+  L_VAR(MODE,1) &= (4 ^ L_VAR(MODE,1)); \
+  VAR(MODE,1) &= (8 ^ VAR(MODE,1)); \
+
+/*
+** bic_cg_qi3: { target msp430_region_lower }
+** ...
+**	BICX.B	#1, &eqi1
+**	BICX.B	#2, &eqi2
+**	BIC.B	#4, &lqi1
+**	BIC.B	#8, &qi1
+** ...
+*/
+/*
+** bic_cg_qi3: { target msp430_region_not_lower }
+** ...
+**	BICX.B	#1, &eqi1
+**	BICX.B	#2, &eqi2
+**	BIC.B	#4, &lqi1
+**	BICX.B	#8, &qi1
+** ...
+*/
+void
+bic_cg_qi3 (void)
+{
+  BIC_CG_INSN(qi)
+}
+
+/*
+** bic_cg_hi3: { target msp430_region_lower }
+** ...
+**	BICX.W	#1, &ehi1
+**	BICX.W	#2, &ehi2
+**	BIC.W	#4, &lhi1
+**	BIC.W	#8, &hi1
+** ...
+*/
+/*
+** bic_cg_hi3: { target msp430_region_not_lower }
+** ...
+**	BICX.W	#1, &ehi1
+**	BICX.W	#2, &ehi2
+**	BIC.W	#4, &lhi1
+**	BICX.W	#8, &hi1
+** ...
+*/
+void
+bic_cg_hi3 (void)
+{
+  BIC_CG_INSN(hi)
+}
+
+/*
+** bic_cg_psi3:
+** ...
+**	BICX.A	#1, &epsi1
+**	BICX.A	#2, &epsi2
+**	BICX.A	#4, &lpsi1
+**	BICX.A	#8, &psi1
+** ...
+*/
+void
+bic_cg_psi3 (void)
+{
+  BIC_CG_INSN(psi)
+}
+
+/* There is no specific bic_cg_si3 pattern defined for msp430, but we check
+   this is synthesized correctly anyway.  */
+/*
+** bic_cg_si3: { target msp430_region_lower }
+** ...
+**	BICX.W	#1, &esi1
+**	BICX.W	#2, &esi2
+**	BIC.W	#4, &lsi1
+**	BIC.W	#8, &si1
+** ...
+*/
+/*
+** bic_cg_si3: { target msp430_region_not_lower }
+** ...
+**	BICX.W	#1, &esi1
+**	BICX.W	#2, &esi2
+**	BIC.W	#4, &lsi1
+**	BICX.W	#8, &si1
+** ...
+*/
+void
+bic_cg_si3 (void)
+{
+  BIC_CG_INSN(si)
+}
+
+#define AND_INSN(MODE) \
+  E_VAR(MODE,1) &= E_VAR(MODE,2); \
+  E_VAR(MODE,3) &= L_VAR(MODE,1); \
+  E_VAR(MODE,4) &= VAR(MODE,1); \
+  L_VAR(MODE,2) &= E_VAR(MODE,5); \
+  VAR(MODE,2) &= E_VAR(MODE,6); \
+  L_VAR(MODE,3) &= L_VAR(MODE,4); \
+  L_VAR(MODE,5) &= VAR(MODE,3); \
+  VAR(MODE,4) &= VAR(MODE,5); \
+  VAR(MODE,6) &= L_VAR(MODE,6);
+
+/*
+** andqi3: { target msp430_region_lower }
+** ...
+**	ANDX.B	&eqi2, &eqi1
+**	ANDX.B	&lqi1, &eqi3
+**	ANDX.B	&qi1, &eqi4
+**	ANDX.B	&eqi5, &lqi2
+**	ANDX.B	&eqi6, &qi2
+**	AND.B	&lqi4, &lqi3
+**	AND.B	&qi3, &lqi5
+**	AND.B	&qi5, &qi4
+**	AND.B	&lqi6, &qi6
+** ...
+*/
+/*
+** andqi3: { target msp430_region_not_lower }
+** ...
+**	ANDX.B	&eqi2, &eqi1
+**	ANDX.B	&lqi1, &eqi3
+**	ANDX.B	&qi1, &eqi4
+**	ANDX.B	&eqi5, &lqi2
+**	ANDX.B	&eqi6, &qi2
+**	AND.B	&lqi4, &lqi3
+**	ANDX.B	&qi3, &lqi5
+**	ANDX.B	&qi5, &qi4
+**	ANDX.B	&lqi6, &qi6
+** ...
+*/
+void
+andqi3 (void)
+{
+  AND_INSN(qi)
+}
+
+/*
+** andhi3: { target msp430_region_lower }
+** ...
+**	ANDX.W	&ehi2, &ehi1
+**	ANDX.W	&lhi1, &ehi3
+**	ANDX.W	&hi1, &ehi4
+**	ANDX.W	&ehi5, &lhi2
+**	ANDX.W	&ehi6, &hi2
+**	AND.W	&lhi4, &lhi3
+**	AND.W	&hi3, &lhi5
+**	AND.W	&hi5, &hi4
+**	AND.W	&lhi6, &hi6
+** ...
+*/
+/*
+** andhi3: { target msp430_region_not_lower }
+** ...
+**	ANDX.W	&ehi2, &ehi1
+**	ANDX.W	&lhi1, &ehi3
+**	ANDX.W	&hi1, &ehi4
+**	ANDX.W	&ehi5, &lhi2
+**	ANDX.W	&ehi6, &hi2
+**	AND.W	&lhi4, &lhi3
+**	ANDX.W	&hi3, &lhi5
+**	ANDX.W	&hi5, &hi4
+**	ANDX.W	&lhi6, &hi6
+** ...
+*/
+void
+andhi3 (void)
+{
+  AND_INSN(hi)
+}
+
+/*
+** andpsi3:
+** ...
+**	ANDX.A	&epsi2, &epsi1
+**	ANDX.A	&lpsi1, &epsi3
+**	ANDX.A	&psi1, &epsi4
+**	ANDX.A	&epsi5, &lpsi2
+**	ANDX.A	&epsi6, &psi2
+**	ANDX.A	&lpsi4, &lpsi3
+**	ANDX.A	&psi3, &lpsi5
+**	ANDX.A	&psi5, &psi4
+**	ANDX.A	&lpsi6, &psi6
+** ...
+*/
+void
+andpsi3 (void)
+{
+  AND_INSN(psi)
+}
+
+/* There is no specific andsi3 pattern defined for msp430, but we check
+   this is synthesized correctly anyway.  */
+/*
+** andsi3: { target msp430_region_lower }
+** ...
+**	ANDX.W	&esi2, &esi1
+**	ANDX.W	&esi2\+2, &esi1\+2
+**	ANDX.W	&lsi1, &esi3
+**	ANDX.W	&lsi1\+2, &esi3\+2
+**	ANDX.W	&si1, &esi4
+**	ANDX.W	&si1\+2, &esi4\+2
+**	ANDX.W	&esi5, &lsi2
+**	ANDX.W	&esi5\+2, &lsi2\+2
+**	ANDX.W	&esi6, &si2
+**	ANDX.W	&esi6\+2, &si2\+2
+**	AND.W	&lsi4, &lsi3
+**	AND.W	&lsi4\+2, &lsi3\+2
+**	AND.W	&si3, &lsi5
+**	AND.W	&si3\+2, &lsi5\+2
+**	AND.W	&si5, &si4
+**	AND.W	&si5\+2, &si4\+2
+**	AND.W	&lsi6, &si6
+**	AND.W	&lsi6\+2, &si6\+2
+** ...
+*/
+/*
+** andsi3: { target msp430_region_not_lower }
+** ...
+**	ANDX.W	&esi2, &esi1
+**	ANDX.W	&esi2\+2, &esi1\+2
+**	ANDX.W	&lsi1, &esi3
+**	ANDX.W	&lsi1\+2, &esi3\+2
+**	ANDX.W	&si1, &esi4
+**	ANDX.W	&si1\+2, &esi4\+2
+**	ANDX.W	&esi5, &lsi2
+**	ANDX.W	&esi5\+2, &lsi2\+2
+**	ANDX.W	&esi6, &si2
+**	ANDX.W	&esi6\+2, &si2\+2
+**	AND.W	&lsi4, &lsi3
+**	AND.W	&lsi4\+2, &lsi3\+2
+**	ANDX.W	&si3, &lsi5
+**	ANDX.W	&si3\+2, &lsi5\+2
+**	ANDX.W	&si5, &si4
+**	ANDX.W	&si5\+2, &si4\+2
+**	ANDX.W	&lsi6, &si6
+**	ANDX.W	&lsi6\+2, &si6\+2
+** ...
+*/
+void
+andsi3 (void)
+{
+  AND_INSN(si)
+}
+
+#define IOR_INSN(MODE) \
+  E_VAR(MODE,1) |= E_VAR(MODE,2); \
+  E_VAR(MODE,3) |= L_VAR(MODE,1); \
+  E_VAR(MODE,4) |= VAR(MODE,1); \
+  L_VAR(MODE,2) |= E_VAR(MODE,5); \
+  VAR(MODE,2) |= E_VAR(MODE,6); \
+  L_VAR(MODE,3) |= L_VAR(MODE,4); \
+  L_VAR(MODE,5) |= VAR(MODE,3); \
+  VAR(MODE,4) |= VAR(MODE,5); \
+  VAR(MODE,6) |= L_VAR(MODE,6);
+
+/*
+** iorqi3: { target msp430_region_lower }
+** ...
+**	BISX.B	&eqi2, &eqi1
+**	BISX.B	&lqi1, &eqi3
+**	BISX.B	&qi1, &eqi4
+**	BISX.B	&eqi5, &lqi2
+**	BISX.B	&eqi6, &qi2
+**	BIS.B	&lqi4, &lqi3
+**	BIS.B	&qi3, &lqi5
+**	BIS.B	&qi5, &qi4
+**	BIS.B	&lqi6, &qi6
+** ...
+*/
+/*
+** iorqi3: { target msp430_region_not_lower }
+** ...
+**	BISX.B	&eqi2, &eqi1
+**	BISX.B	&lqi1, &eqi3
+**	BISX.B	&qi1, &eqi4
+**	BISX.B	&eqi5, &lqi2
+**	BISX.B	&eqi6, &qi2
+**	BIS.B	&lqi4, &lqi3
+**	BISX.B	&qi3, &lqi5
+**	BISX.B	&qi5, &qi4
+**	BISX.B	&lqi6, &qi6
+** ...
+*/
+void
+iorqi3 (void)
+{
+  IOR_INSN(qi)
+}
+
+/*
+** iorhi3: { target msp430_region_lower }
+** ...
+**	BISX.W	&ehi2, &ehi1
+**	BISX.W	&lhi1, &ehi3
+**	BISX.W	&hi1, &ehi4
+**	BISX.W	&ehi5, &lhi2
+**	BISX.W	&ehi6, &hi2
+**	BIS.W	&lhi4, &lhi3
+**	BIS.W	&hi3, &lhi5
+**	BIS.W	&hi5, &hi4
+**	BIS.W	&lhi6, &hi6
+** ...
+*/
+/*
+** iorhi3: { target msp430_region_not_lower }
+** ...
+**	BISX.W	&ehi2, &ehi1
+**	BISX.W	&lhi1, &ehi3
+**	BISX.W	&hi1, &ehi4
+**	BISX.W	&ehi5, &lhi2
+**	BISX.W	&ehi6, &hi2
+**	BIS.W	&lhi4, &lhi3
+**	BISX.W	&hi3, &lhi5
+**	BISX.W	&hi5, &hi4
+**	BISX.W	&lhi6, &hi6
+** ...
+*/
+void
+iorhi3 (void)
+{
+  IOR_INSN(hi)
+}
+
+/*
+** iorpsi3:
+** ...
+**	BISX.A	&epsi2, &epsi1
+**	BISX.A	&lpsi1, &epsi3
+**	BISX.A	&psi1, &epsi4
+**	BISX.A	&epsi5, &lpsi2
+**	BISX.A	&epsi6, &psi2
+**	BISX.A	&lpsi4, &lpsi3
+**	BISX.A	&psi3, &lpsi5
+**	BISX.A	&psi5, &psi4
+**	BISX.A	&lpsi6, &psi6
+** ...
+*/
+void
+iorpsi3 (void)
+{
+  IOR_INSN(psi)
+}
+
+/* There is no specific iorsi3 pattern defined for msp430, but we check
+   this is synthesized correctly anyway.  */
+/*
+** iorsi3: { target msp430_region_lower }
+** ...
+**	BISX.W	&esi2, &esi1
+**	BISX.W	&esi2\+2, &esi1\+2
+**	BISX.W	&lsi1, &esi3
+**	BISX.W	&lsi1\+2, &esi3\+2
+**	BISX.W	&si1, &esi4
+**	BISX.W	&si1\+2, &esi4\+2
+**	BISX.W	&esi5, &lsi2
+**	BISX.W	&esi5\+2, &lsi2\+2
+**	BISX.W	&esi6, &si2
+**	BISX.W	&esi6\+2, &si2\+2
+**	BIS.W	&lsi4, &lsi3
+**	BIS.W	&lsi4\+2, &lsi3\+2
+**	BIS.W	&si3, &lsi5
+**	BIS.W	&si3\+2, &lsi5\+2
+**	BIS.W	&si5, &si4
+**	BIS.W	&si5\+2, &si4\+2
+**	BIS.W	&lsi6, &si6
+**	BIS.W	&lsi6\+2, &si6\+2
+** ...
+*/
+/*
+** iorsi3: { target msp430_region_not_lower }
+** ...
+**	BISX.W	&esi2, &esi1
+**	BISX.W	&esi2\+2, &esi1\+2
+**	BISX.W	&lsi1, &esi3
+**	BISX.W	&lsi1\+2, &esi3\+2
+**	BISX.W	&si1, &esi4
+**	BISX.W	&si1\+2, &esi4\+2
+**	BISX.W	&esi5, &lsi2
+**	BISX.W	&esi5\+2, &lsi2\+2
+**	BISX.W	&esi6, &si2
+**	BISX.W	&esi6\+2, &si2\+2
+**	BIS.W	&lsi4, &lsi3
+**	BIS.W	&lsi4\+2, &lsi3\+2
+**	BISX.W	&si3, &lsi5
+**	BISX.W	&si3\+2, &lsi5\+2
+**	BISX.W	&si5, &si4
+**	BISX.W	&si5\+2, &si4\+2
+**	BISX.W	&lsi6, &si6
+**	BISX.W	&lsi6\+2, &si6\+2
+** ...
+*/
+void
+iorsi3 (void)
+{
+  IOR_INSN(si)
+}
+
+#define XOR_INSN(MODE) \
+  E_VAR(MODE,1) ^= E_VAR(MODE,2); \
+  E_VAR(MODE,3) ^= L_VAR(MODE,1); \
+  E_VAR(MODE,4) ^= VAR(MODE,1); \
+  L_VAR(MODE,2) ^= E_VAR(MODE,5); \
+  VAR(MODE,2) ^= E_VAR(MODE,6); \
+  L_VAR(MODE,3) ^= L_VAR(MODE,4); \
+  L_VAR(MODE,5) ^= VAR(MODE,3); \
+  VAR(MODE,4) ^= VAR(MODE,5); \
+  VAR(MODE,6) ^= L_VAR(MODE,6);
+
+/*
+** xorqi3: { target msp430_region_lower }
+** ...
+**	XORX.B	&eqi2, &eqi1
+**	XORX.B	&lqi1, &eqi3
+**	XORX.B	&qi1, &eqi4
+**	XORX.B	&eqi5, &lqi2
+**	XORX.B	&eqi6, &qi2
+**	XOR.B	&lqi4, &lqi3
+**	XOR.B	&qi3, &lqi5
+**	XOR.B	&qi5, &qi4
+**	XOR.B	&lqi6, &qi6
+** ...
+*/
+/*
+** xorqi3: { target msp430_region_not_lower }
+** ...
+**	XORX.B	&eqi2, &eqi1
+**	XORX.B	&lqi1, &eqi3
+**	XORX.B	&qi1, &eqi4
+**	XORX.B	&eqi5, &lqi2
+**	XORX.B	&eqi6, &qi2
+**	XOR.B	&lqi4, &lqi3
+**	XORX.B	&qi3, &lqi5
+**	XORX.B	&qi5, &qi4
+**	XORX.B	&lqi6, &qi6
+** ...
+*/
+void
+xorqi3 (void)
+{
+  XOR_INSN(qi)
+}
+
+/*
+** xorhi3: { target msp430_region_lower }
+** ...
+**	XORX.W	&ehi2, &ehi1
+**	XORX.W	&lhi1, &ehi3
+**	XORX.W	&hi1, &ehi4
+**	XORX.W	&ehi5, &lhi2
+**	XORX.W	&ehi6, &hi2
+**	XOR.W	&lhi4, &lhi3
+**	XOR.W	&hi3, &lhi5
+**	XOR.W	&hi5, &hi4
+**	XOR.W	&lhi6, &hi6
+** ...
+*/
+/*
+** xorhi3: { target msp430_region_not_lower }
+** ...
+**	XORX.W	&ehi2, &ehi1
+**	XORX.W	&lhi1, &ehi3
+**	XORX.W	&hi1, &ehi4
+**	XORX.W	&ehi5, &lhi2
+**	XORX.W	&ehi6, &hi2
+**	XOR.W	&lhi4, &lhi3
+**	XORX.W	&hi3, &lhi5
+**	XORX.W	&hi5, &hi4
+**	XORX.W	&lhi6, &hi6
+** ...
+*/
+void
+xorhi3 (void)
+{
+  XOR_INSN(hi)
+}
+
+/*
+** xorpsi3:
+** ...
+**	XORX.A	&epsi2, &epsi1
+**	XORX.A	&lpsi1, &epsi3
+**	XORX.A	&psi1, &epsi4
+**	XORX.A	&epsi5, &lpsi2
+**	XORX.A	&epsi6, &psi2
+**	XORX.A	&lpsi4, &lpsi3
+**	XORX.A	&psi3, &lpsi5
+**	XORX.A	&psi5, &psi4
+**	XORX.A	&lpsi6, &psi6
+** ...
+*/
+void
+xorpsi3 (void)
+{
+  XOR_INSN(psi)
+}
+
+/* There is no specific xorsi3 pattern defined for msp430, but we check
+   this is synthesized correctly anyway.  */
+/*
+** xorsi3: { target msp430_region_lower }
+** ...
+**	XORX.W	&esi2, &esi1
+**	XORX.W	&esi2\+2, &esi1\+2
+**	XORX.W	&lsi1, &esi3
+**	XORX.W	&lsi1\+2, &esi3\+2
+**	XORX.W	&si1, &esi4
+**	XORX.W	&si1\+2, &esi4\+2
+**	XORX.W	&esi5, &lsi2
+**	XORX.W	&esi5\+2, &lsi2\+2
+**	XORX.W	&esi6, &si2
+**	XORX.W	&esi6\+2, &si2\+2
+**	XOR.W	&lsi4, &lsi3
+**	XOR.W	&lsi4\+2, &lsi3\+2
+**	XOR.W	&si3, &lsi5
+**	XOR.W	&si3\+2, &lsi5\+2
+**	XOR.W	&si5, &si4
+**	XOR.W	&si5\+2, &si4\+2
+**	XOR.W	&lsi6, &si6
+**	XOR.W	&lsi6\+2, &si6\+2
+** ...
+*/
+/*
+** xorsi3: { target msp430_region_not_lower }
+** ...
+**	XORX.W	&esi2, &esi1
+**	XORX.W	&esi2\+2, &esi1\+2
+**	XORX.W	&lsi1, &esi3
+**	XORX.W	&lsi1\+2, &esi3\+2
+**	XORX.W	&si1, &esi4
+**	XORX.W	&si1\+2, &esi4\+2
+**	XORX.W	&esi5, &lsi2
+**	XORX.W	&esi5\+2, &lsi2\+2
+**	XORX.W	&esi6, &si2
+**	XORX.W	&esi6\+2, &si2\+2
+**	XOR.W	&lsi4, &lsi3
+**	XOR.W	&lsi4\+2, &lsi3\+2
+**	XORX.W	&si3, &lsi5
+**	XORX.W	&si3\+2, &lsi5\+2
+**	XORX.W	&si5, &si4
+**	XORX.W	&si5\+2, &si4\+2
+**	XORX.W	&lsi6, &si6
+**	XORX.W	&lsi6\+2, &si6\+2
+** ...
+*/
+void
+xorsi3 (void)
+{
+  XOR_INSN(si)
+}
+
+#define DO1 \
+{ \
+  qi z; \
+  z += use_qi(z); \
+  use_qi(z); \
+}
+
+#define DO2 \
+{ \
+  hi z; \
+  z += use_hi(z); \
+  use_hi(z); \
+}
+
+#define DO3 \
+{ \
+  si z; \
+  z += use_si(z); \
+  use_si(z); \
+}
+
+#define CBRANCH_INSN(MODE) \
+  if (E_VAR(MODE,1) == E_VAR(MODE,2)) \
+    DO1 \
+  else if (E_VAR(MODE,3) == L_VAR(MODE,1)) \
+    DO2 \
+  else if (E_VAR(MODE,4) == VAR(MODE,1)) \
+    DO1 \
+  else if (L_VAR(MODE,2) == E_VAR(MODE,5)) \
+    DO2 \
+  else if (VAR(MODE,2) == E_VAR(MODE,6)) \
+    DO1 \
+  else if (L_VAR(MODE,3) == L_VAR(MODE,4)) \
+    DO2 \
+  else if (L_VAR(MODE,5) == VAR(MODE,3)) \
+    DO2 \
+  else if (VAR(MODE,4) == VAR(MODE,5)) \
+    DO1 \
+  else if (VAR(MODE,6) == L_VAR(MODE,6)) \
+    DO2
+
+/*
+** cbranchqi4_real: { target msp430_region_lower }
+** ...
+**	CMPX.B	&eqi2, &eqi1 { JEQ	.L[0-9]+
+**	CMPX.B	&lqi1, &eqi3 { JEQ	.L[0-9]+
+**	CMPX.B	&qi1, &eqi4 { JEQ	.L[0-9]+
+**	CMPX.B	&eqi5, &lqi2 { JEQ	.L[0-9]+
+**	CMPX.B	&eqi6, &qi2 { JEQ	.L[0-9]+
+**	CMP.B	&lqi4, &lqi3 { JEQ	.L[0-9]+
+**	CMP.B	&qi3, &lqi5 { JEQ	.L[0-9]+
+**	CMP.B	&qi5, &qi4 { JEQ	.L[0-9]+
+**	CMP.B	&lqi6, &qi6 { JNE	.L[0-9]+
+** ...
+*/
+/*
+** cbranchqi4_real: { target msp430_region_not_lower }
+** ...
+**	CMPX.B	&eqi2, &eqi1 { JEQ	.L[0-9]+
+**	CMPX.B	&lqi1, &eqi3 { JEQ	.L[0-9]+
+**	CMPX.B	&qi1, &eqi4 { JEQ	.L[0-9]+
+**	CMPX.B	&eqi5, &lqi2 { JEQ	.L[0-9]+
+**	CMPX.B	&eqi6, &qi2 { JEQ	.L[0-9]+
+**	CMP.B	&lqi4, &lqi3 { JEQ	.L[0-9]+
+**	CMPX.B	&qi3, &lqi5 { JEQ	.L[0-9]+
+**	CMPX.B	&qi5, &qi4 { JEQ	.L[0-9]+
+**	CMPX.B	&lqi6, &qi6 { JNE	.L[0-9]+
+** ...
+*/
+void
+cbranchqi4_real (void)
+{
+  CBRANCH_INSN(qi)
+}
+
+/*
+** cbranchhi4_real: { target msp430_region_lower }
+** ...
+**	CMPX.W	&ehi2, &ehi1 { JEQ	.L[0-9]+
+**	CMPX.W	&lhi1, &ehi3 { JEQ	.L[0-9]+
+**	CMPX.W	&hi1, &ehi4 { JEQ	.L[0-9]+
+**	CMPX.W	&ehi5, &lhi2 { JEQ	.L[0-9]+
+**	CMPX.W	&ehi6, &hi2 { JEQ	.L[0-9]+
+**	CMP.W	&lhi4, &lhi3 { JEQ	.L[0-9]+
+**	CMP.W	&hi3, &lhi5 { JEQ	.L[0-9]+
+**	CMP.W	&hi5, &hi4 { JEQ	.L[0-9]+
+**	CMP.W	&lhi6, &hi6 { JNE	.L[0-9]+
+** ...
+*/
+/*
+** cbranchhi4_real: { target msp430_region_not_lower }
+** ...
+**	CMPX.W	&ehi2, &ehi1 { JEQ	.L[0-9]+
+**	CMPX.W	&lhi1, &ehi3 { JEQ	.L[0-9]+
+**	CMPX.W	&hi1, &ehi4 { JEQ	.L[0-9]+
+**	CMPX.W	&ehi5, &lhi2 { JEQ	.L[0-9]+
+**	CMPX.W	&ehi6, &hi2 { JEQ	.L[0-9]+
+**	CMP.W	&lhi4, &lhi3 { JEQ	.L[0-9]+
+**	CMPX.W	&hi3, &lhi5 { JEQ	.L[0-9]+
+**	CMPX.W	&hi5, &hi4 { JEQ	.L[0-9]+
+**	CMPX.W	&lhi6, &hi6 { JNE	.L[0-9]+
+** ...
+*/
+void
+cbranchhi4_real (void)
+{
+  CBRANCH_INSN(hi)
+}
+
+/* There is no specific cbranchsi4_real pattern defined for msp430, but we
+   check this is synthesized correctly anyway.  */
+/*
+** cbranchsi4_real: { target msp430_region_lower }
+** ...
+**	CMPX.W	&esi2, &esi1 { JEQ	.L[0-9]+
+**	CMPX.W	&lsi1, &esi3 { JEQ	.L[0-9]+
+**	CMPX.W	&si1, &esi4 { JEQ	.L[0-9]+
+**	CMPX.W	&esi5, &lsi2 { JEQ	.L[0-9]+
+**	CMPX.W	&esi6, &si2 { JEQ	.L[0-9]+
+**	CMP.W	&lsi4, &lsi3 { JEQ	.L[0-9]+
+**	CMP.W	&si3, &lsi5 { JEQ	.L[0-9]+
+**	CMP.W	&si5, &si4 { JEQ	.L[0-9]+
+**	CMP.W	&lsi6, &si6 { JNE	.L[0-9]+
+**	CMP.W	&lsi6\+2, &si6\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&esi2\+2, &esi1\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&lsi1\+2, &esi3\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&si1\+2, &esi4\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&esi5\+2, &lsi2\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&esi6\+2, &si2\+2 { JNE	.L[0-9]+
+** ...
+**	CMP.W	&lsi4\+2, &lsi3\+2 { JNE	.L[0-9]+
+** ...
+**	CMP.W	&si3\+2, &lsi5\+2 { JNE	.L[0-9]+
+** ...
+**	CMP.W	&si5\+2, &si4\+2 { JNE	.L[0-9]+
+** ...
+*/
+/*
+** cbranchsi4_real: { target msp430_region_not_lower }
+** ...
+**	CMPX.W	&esi2, &esi1 { JEQ	.L[0-9]+
+**	CMPX.W	&lsi1, &esi3 { JEQ	.L[0-9]+
+**	CMPX.W	&si1, &esi4 { JEQ	.L[0-9]+
+**	CMPX.W	&esi5, &lsi2 { JEQ	.L[0-9]+
+**	CMPX.W	&esi6, &si2 { JEQ	.L[0-9]+
+**	CMP.W	&lsi4, &lsi3 { JEQ	.L[0-9]+
+**	CMPX.W	&si3, &lsi5 { JEQ	.L[0-9]+
+**	CMPX.W	&si5, &si4 { JEQ	.L[0-9]+
+**	CMPX.W	&lsi6, &si6 { JNE	.L[0-9]+
+**	CMPX.W	&lsi6\+2, &si6\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&esi2\+2, &esi1\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&lsi1\+2, &esi3\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&si1\+2, &esi4\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&esi5\+2, &lsi2\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&esi6\+2, &si2\+2 { JNE	.L[0-9]+
+** ...
+**	CMP.W	&lsi4\+2, &lsi3\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&si3\+2, &lsi5\+2 { JNE	.L[0-9]+
+** ...
+**	CMPX.W	&si5\+2, &si4\+2 { JNE	.L[0-9]+
+** ...
+*/
+void
+cbranchsi4_real (void)
+{
+  CBRANCH_INSN(si)
+}
+
+#define CBRANCH_REVERSE_INSN(MODE) \
+  if (E_VAR(MODE,1) > E_VAR(MODE,2)) \
+    DO1 \
+  else if (E_VAR(MODE,3) > L_VAR(MODE,1)) \
+    DO2 \
+  else if (E_VAR(MODE,4) > VAR(MODE,1)) \
+    DO1 \
+  else if (L_VAR(MODE,2) > E_VAR(MODE,5)) \
+    DO2 \
+  else if (VAR(MODE,2) > E_VAR(MODE,6)) \
+    DO1 \
+  else if (L_VAR(MODE,3) > L_VAR(MODE,4)) \
+    DO2 \
+  else if (L_VAR(MODE,5) > VAR(MODE,3)) \
+    DO2 \
+  else if (VAR(MODE,4) > VAR(MODE,5)) \
+    DO1 \
+  else if (VAR(MODE,6) > L_VAR(MODE,6)) \
+    DO2
+
+/*
+** cbranchqi4_reversed: { target msp430_region_lower }
+** ...
+**	CMPX.B	&eqi1, &eqi2 { JLO	.L[0-9]+
+**	CMPX.B	&eqi3, &lqi1 { JLO	.L[0-9]+
+**	CMPX.B	&eqi4, &qi1 { JLO	.L[0-9]+
+**	CMPX.B	&lqi2, &eqi5 { JLO	.L[0-9]+
+**	CMPX.B	&qi2, &eqi6 { JLO	.L[0-9]+
+**	CMP.B	&lqi3, &lqi4 { JLO	.L[0-9]+
+**	CMP.B	&lqi5, &qi3 { JLO	.L[0-9]+
+**	CMP.B	&qi4, &qi5 { JLO	.L[0-9]+
+**	CMP.B	&qi6, &lqi6 { JHS	.L[0-9]+
+** ...
+*/
+/*
+** cbranchqi4_reversed: { target msp430_region_not_lower }
+** ...
+**	CMPX.B	&eqi1, &eqi2 { JLO	.L[0-9]+
+**	CMPX.B	&eqi3, &lqi1 { JLO	.L[0-9]+
+**	CMPX.B	&eqi4, &qi1 { JLO	.L[0-9]+
+**	CMPX.B	&lqi2, &eqi5 { JLO	.L[0-9]+
+**	CMPX.B	&qi2, &eqi6 { JLO	.L[0-9]+
+**	CMP.B	&lqi3, &lqi4 { JLO	.L[0-9]+
+**	CMPX.B	&lqi5, &qi3 { JLO	.L[0-9]+
+**	CMPX.B	&qi4, &qi5 { JLO	.L[0-9]+
+**	CMPX.B	&qi6, &lqi6 { JHS	.L[0-9]+
+** ...
+*/
+void
+cbranchqi4_reversed (void)
+{
+  CBRANCH_REVERSE_INSN(qi)
+}
+
+/*
+** cbranchhi4_reversed: { target msp430_region_lower }
+** ...
+**	CMPX.W	&ehi1, &ehi2 { JL	.L[0-9]+
+**	CMPX.W	&ehi3, &lhi1 { JL	.L[0-9]+
+**	CMPX.W	&ehi4, &hi1 { JL	.L[0-9]+
+**	CMPX.W	&lhi2, &ehi5 { JL	.L[0-9]+
+**	CMPX.W	&hi2, &ehi6 { JL	.L[0-9]+
+**	CMP.W	&lhi3, &lhi4 { JL	.L[0-9]+
+**	CMP.W	&lhi5, &hi3 { JL	.L[0-9]+
+**	CMP.W	&hi4, &hi5 { JL	.L[0-9]+
+**	CMP.W	&hi6, &lhi6 { JGE	.L[0-9]+
+** ...
+*/
+/*
+** cbranchhi4_reversed: { target msp430_region_not_lower }
+** ...
+**	CMPX.W	&ehi1, &ehi2 { JL	.L[0-9]+
+**	CMPX.W	&ehi3, &lhi1 { JL	.L[0-9]+
+**	CMPX.W	&ehi4, &hi1 { JL	.L[0-9]+
+**	CMPX.W	&lhi2, &ehi5 { JL	.L[0-9]+
+**	CMPX.W	&hi2, &ehi6 { JL	.L[0-9]+
+**	CMP.W	&lhi3, &lhi4 { JL	.L[0-9]+
+**	CMPX.W	&lhi5, &hi3 { JL	.L[0-9]+
+**	CMPX.W	&hi4, &hi5 { JL	.L[0-9]+
+**	CMPX.W	&hi6, &lhi6 { JGE	.L[0-9]+
+** ...
+*/
+void
+cbranchhi4_reversed (void)
+{
+  CBRANCH_REVERSE_INSN(hi)
+}
+
+/* There is no specific cbranchsi4_reversed pattern defined for msp430, but
+   we check this is synthesized correctly anyway.
+   This output assembly for this one is quite long and convoluted so we only
+   check part of it.  */
+/*
+** cbranchsi4_reversed: { target msp430_region_lower }
+** ...
+**	CMPX.W	&esi1\+2, &esi2\+2 { JL	.L[0-9]+
+**	CMPX.W	&esi2\+2, &esi1\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&esi3\+2, &lsi1\+2 { JL	.L[0-9]+
+**	CMPX.W	&lsi1\+2, &esi3\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&esi4\+2, &si1\+2 { JL	.L[0-9]+
+**	CMPX.W	&si1\+2, &esi4\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&lsi2\+2, &esi5\+2 { JL	.L[0-9]+
+**	CMPX.W	&esi5\+2, &lsi2\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&si2\+2, &esi6\+2 { JL	.L[0-9]+
+**	CMPX.W	&esi6\+2, &si2\+2 { JEQ	.L[0-9]+
+**	CMP.W	&lsi3\+2, &lsi4\+2 { JL	.L[0-9]+
+**	CMP.W	&lsi4\+2, &lsi3\+2 { JEQ	.L[0-9]+
+**	CMP.W	&lsi5\+2, &si3\+2 { JL	.L[0-9]+
+**	CMP.W	&si3\+2, &lsi5\+2 { JEQ	.L[0-9]+
+**	CMP.W	&si4\+2, &si5\+2 { JL	.L[0-9]+
+**	CMP.W	&si5\+2, &si4\+2 { JEQ	.L[0-9]+
+**	CMP.W	&si6\+2, &lsi6\+2 { JL	.L[0-9]+
+**	CMP.W	&lsi6\+2, &si6\+2 { JNE	.L[0-9]+
+** ...
+*/
+/*
+** cbranchsi4_reversed: { target msp430_region_not_lower }
+** ...
+**	CMPX.W	&esi1\+2, &esi2\+2 { JL	.L[0-9]+
+**	CMPX.W	&esi2\+2, &esi1\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&esi3\+2, &lsi1\+2 { JL	.L[0-9]+
+**	CMPX.W	&lsi1\+2, &esi3\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&esi4\+2, &si1\+2 { JL	.L[0-9]+
+**	CMPX.W	&si1\+2, &esi4\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&lsi2\+2, &esi5\+2 { JL	.L[0-9]+
+**	CMPX.W	&esi5\+2, &lsi2\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&si2\+2, &esi6\+2 { JL	.L[0-9]+
+**	CMPX.W	&esi6\+2, &si2\+2 { JEQ	.L[0-9]+
+**	CMP.W	&lsi3\+2, &lsi4\+2 { JL	.L[0-9]+
+**	CMP.W	&lsi4\+2, &lsi3\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&lsi5\+2, &si3\+2 { JL	.L[0-9]+
+**	CMPX.W	&si3\+2, &lsi5\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&si4\+2, &si5\+2 { JL	.L[0-9]+
+**	CMPX.W	&si5\+2, &si4\+2 { JEQ	.L[0-9]+
+**	CMPX.W	&si6\+2, &lsi6\+2 { JL	.L[0-9]+
+**	CMPX.W	&lsi6\+2, &si6\+2 { JNE	.L[0-9]+
+** ...
+*/
+void
+cbranchsi4_reversed (void)
+{
+  CBRANCH_REVERSE_INSN(si)
+}
+
+#define BITBRANCH_NE_INSN(MODE) \
+  if (E_VAR(MODE,1) & E_VAR(MODE,2)) \
+    DO1 \
+  else if (E_VAR(MODE,3) & L_VAR(MODE,1)) \
+    DO2 \
+  else if (E_VAR(MODE,4) & VAR(MODE,1)) \
+    DO1 \
+  else if (L_VAR(MODE,2) & E_VAR(MODE,5)) \
+    DO2 \
+  else if (VAR(MODE,2) & E_VAR(MODE,6)) \
+    DO1 \
+  else if (L_VAR(MODE,3) & L_VAR(MODE,4)) \
+    DO2 \
+  else if (L_VAR(MODE,5) & VAR(MODE,3)) \
+    DO2 \
+  else if (VAR(MODE,4) & VAR(MODE,5)) \
+    DO1 \
+  else if (VAR(MODE,6) & L_VAR(MODE,6)) \
+    DO2
+/*
+** bitbranchqi4: { target msp430_region_lower }
+** ...
+**	BITX.B	&eqi2, &eqi1 { JNE	.L[0-9]+
+**	BITX.B	&lqi1, &eqi3 { JNE	.L[0-9]+
+**	BITX.B	&qi1, &eqi4 { JNE	.L[0-9]+
+**	BITX.B	&eqi5, &lqi2 { JNE	.L[0-9]+
+**	BITX.B	&eqi6, &qi2 { JNE	.L[0-9]+
+**	BIT.B	&lqi4, &lqi3 { JNE	.L[0-9]+
+**	BIT.B	&qi3, &lqi5 { JNE	.L[0-9]+
+**	BIT.B	&qi5, &qi4 { JNE	.L[0-9]+
+**	BIT.B	&lqi6, &qi6 { JEQ	.L[0-9]+
+** ...
+*/
+/*
+** bitbranchqi4: { target msp430_region_not_lower }
+** ...
+**	BITX.B	&eqi2, &eqi1 { JNE	.L[0-9]+
+**	BITX.B	&lqi1, &eqi3 { JNE	.L[0-9]+
+**	BITX.B	&qi1, &eqi4 { JNE	.L[0-9]+
+**	BITX.B	&eqi5, &lqi2 { JNE	.L[0-9]+
+**	BITX.B	&eqi6, &qi2 { JNE	.L[0-9]+
+**	BIT.B	&lqi4, &lqi3 { JNE	.L[0-9]+
+**	BITX.B	&qi3, &lqi5 { JNE	.L[0-9]+
+**	BITX.B	&qi5, &qi4 { JNE	.L[0-9]+
+**	BITX.B	&lqi6, &qi6 { JEQ	.L[0-9]+
+** ...
+*/
+void
+bitbranchqi4 (void)
+{
+  BITBRANCH_NE_INSN(qi)
+}
+
+/*
+** bitbranchhi4: { target msp430_region_lower }
+** ...
+**	BITX.W	&ehi2, &ehi1 { JNE	.L[0-9]+
+**	BITX.W	&lhi1, &ehi3 { JNE	.L[0-9]+
+**	BITX.W	&hi1, &ehi4 { JNE	.L[0-9]+
+**	BITX.W	&ehi5, &lhi2 { JNE	.L[0-9]+
+**	BITX.W	&ehi6, &hi2 { JNE	.L[0-9]+
+**	BIT.W	&lhi4, &lhi3 { JNE	.L[0-9]+
+**	BIT.W	&hi3, &lhi5 { JNE	.L[0-9]+
+**	BIT.W	&hi5, &hi4 { JNE	.L[0-9]+
+**	BIT.W	&lhi6, &hi6 { JEQ	.L[0-9]+
+** ...
+*/
+/*
+** bitbranchhi4: { target msp430_region_not_lower }
+** ...
+**	BITX.W	&ehi2, &ehi1 { JNE	.L[0-9]+
+**	BITX.W	&lhi1, &ehi3 { JNE	.L[0-9]+
+**	BITX.W	&hi1, &ehi4 { JNE	.L[0-9]+
+**	BITX.W	&ehi5, &lhi2 { JNE	.L[0-9]+
+**	BITX.W	&ehi6, &hi2 { JNE	.L[0-9]+
+**	BIT.W	&lhi4, &lhi3 { JNE	.L[0-9]+
+**	BITX.W	&hi3, &lhi5 { JNE	.L[0-9]+
+**	BITX.W	&hi5, &hi4 { JNE	.L[0-9]+
+**	BITX.W	&lhi6, &hi6 { JEQ	.L[0-9]+
+** ...
+*/
+void
+bitbranchhi4 (void)
+{
+  BITBRANCH_NE_INSN(hi)
+}
+
+/*
+** bitbranchpsi4:
+** ...
+**	BITX.A	&epsi2, &epsi1 { JNE	.L[0-9]+
+**	BITX.A	&lpsi1, &epsi3 { JNE	.L[0-9]+
+**	BITX.A	&psi1, &epsi4 { JNE	.L[0-9]+
+**	BITX.A	&epsi5, &lpsi2 { JNE	.L[0-9]+
+**	BITX.A	&epsi6, &psi2 { JNE	.L[0-9]+
+**	BITX.A	&lpsi4, &lpsi3 { JNE	.L[0-9]+
+**	BITX.A	&psi3, &lpsi5 { JNE	.L[0-9]+
+**	BITX.A	&psi5, &psi4 { JNE	.L[0-9]+
+**	BITX.A	&lpsi6, &psi6 { JEQ	.L[0-9]+
+** ...
+*/
+void
+bitbranchpsi4 (void)
+{
+  BITBRANCH_NE_INSN(psi)
+}
+
+
+/* "bitbranch" using SImode operands is omitted since the resulting assembly
+   uses many temporary registers to perform the bitwise and comparison
+   operations.  */
diff --git a/gcc/testsuite/gcc.target/msp430/data-attributes-2.c b/gcc/testsuite/gcc.target/msp430/data-attributes-2.c
index d049194..6113e99 100644
--- a/gcc/testsuite/gcc.target/msp430/data-attributes-2.c
+++ b/gcc/testsuite/gcc.target/msp430/data-attributes-2.c
@@ -27,7 +27,7 @@ int __attribute__((lower,upper)) lu = 20; /* { dg-warning "ignoring attribute 'u
 int __attribute__((lower,either)) le = 20; /* { dg-warning "ignoring attribute 'either' because it conflicts with attribute 'lower'" } */
 int __attribute__((lower,persistent)) lp = 20; /* { dg-warning "ignoring attribute 'persistent' because it conflicts with attribute 'lower'" } */
 int __attribute__((lower,noinit)) ln; /* { dg-warning "ignoring attribute 'noinit' because it conflicts with attribute 'lower'" } */
-int __attribute__((lower,section(".data.foo"))) ls = 30; /* { dg-warning "ignoring attribute 'section' because it conflicts with attribute 'lower'" } */
+int __attribute__((lower,section(".data.foo"))) ls = 30;
 
 int __attribute__((upper)) u = 20;
 int __attribute__((upper,lower)) ul = 20; /* { dg-warning "ignoring attribute 'lower' because it conflicts with attribute 'upper'" } */
@@ -46,6 +46,6 @@ int __attribute__((either,section(".data.foo"))) es = 30; /* { dg-warning "ignor
 int __attribute__((section(".data.foo"))) s = 20;
 int __attribute__((section(".data.foo"),noinit)) sn; /* { dg-warning "ignoring attribute 'noinit' because it conflicts with attribute 'section'" } */
 int __attribute__((section(".data.foo"),persistent)) sp = 20; /* { dg-warning "ignoring attribute 'persistent' because it conflicts with attribute 'section'" } */
-int __attribute__((section(".data.foo"),lower)) sl = 2; /* { dg-warning "ignoring attribute 'lower' because it conflicts with attribute 'section'" } */
+int __attribute__((section(".data.foo"),lower)) sl = 2;
 int __attribute__((section(".data.foo"),upper)) su = 20; /* { dg-warning "ignoring attribute 'upper' because it conflicts with attribute 'section'" } */
 int __attribute__((section(".data.foo"),either)) se = 2; /* { dg-warning "ignoring attribute 'either' because it conflicts with attribute 'section'" } */
diff --git a/gcc/testsuite/gcc.target/msp430/msp430.exp b/gcc/testsuite/gcc.target/msp430/msp430.exp
index b97f4dc..bcc5686 100644
--- a/gcc/testsuite/gcc.target/msp430/msp430.exp
+++ b/gcc/testsuite/gcc.target/msp430/msp430.exp
@@ -36,6 +36,14 @@ proc check_effective_target_msp430_mlarge_selected { } {
     return [check-flags [list "" { *-*-* } { "-mlarge" } { "" } ]]
 }
 
+proc check_effective_target_msp430_region_not_lower { } {
+    return [check-flags [list "" { *-*-* } { "-mdata-region=none" "-mdata-region=upper" "-mdata-region=either" } { "" } ]]
+}
+
+proc check_effective_target_msp430_region_lower { } {
+    return [check-flags [list "" { *-*-* } { "*" } { "-mdata-region=none" "-mdata-region=upper" "-mdata-region=either" } ]]
+}
+
 proc check_effective_target_msp430_hwmul_not_none { } {
     return [check-flags [list "" { *-*-* } \
     { "-mhwmult=16bit" "-mhwmult=32bit" "-mhwmult=f5series" } { "" } ]]
diff --git a/gcc/testsuite/gcc.target/msp430/object-attributes-430.c b/gcc/testsuite/gcc.target/msp430/object-attributes-430.c
new file mode 100644
index 0000000..4296be2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/object-attributes-430.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430x" "-mlarge" } { "" } } */
+/* { dg-options "-mcpu=msp430" } */
+/* { dg-final { scan-assembler ".mspabi_attribute 4, 1" } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 6, 1" } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 8, 1" } } */
+/* { dg-final { scan-assembler ".gnu_attribute 4, 1" } } */
+
+int
+main (void)
+{
+  while (1);
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.target/msp430/object-attributes-default.c b/gcc/testsuite/gcc.target/msp430/object-attributes-default.c
new file mode 100644
index 0000000..39c1f3e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/object-attributes-default.c
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-final { scan-assembler ".mspabi_attribute 4, 1" { target msp430_430_selected } } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 4, 2" { target msp430_430x_selected } } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 6, 1" { target { ! msp430_mlarge_selected } } } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 8, 1" { target { ! msp430_mlarge_selected } } } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 6, 2" { target msp430_mlarge_selected } } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 8, 2" { target msp430_mlarge_selected } } } */
+/* { dg-final { scan-assembler ".gnu_attribute 4, 1" { target { ! msp430_region_not_lower } } } } */
+/* { dg-final { scan-assembler ".gnu_attribute 4, 2" { target msp430_region_not_lower } } } */
+
+int
+main (void)
+{
+  while (1);
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.target/msp430/object-attributes-mlarge-any-region.c b/gcc/testsuite/gcc.target/msp430/object-attributes-mlarge-any-region.c
new file mode 100644
index 0000000..2aa8bfb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/object-attributes-mlarge-any-region.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" "-mdata-region=lower" } { "" } } */
+/* { dg-options "-mlarge -mdata-region=none" } */
+/* { dg-final { scan-assembler ".mspabi_attribute 4, 2" } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 6, 2" } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 8, 2" } } */
+/* { dg-final { scan-assembler ".gnu_attribute 4, 2" } } */
+
+int
+main (void)
+{
+  while (1);
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.target/msp430/object-attributes-mlarge.c b/gcc/testsuite/gcc.target/msp430/object-attributes-mlarge.c
new file mode 100644
index 0000000..06738ea
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/object-attributes-mlarge.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" } { "" } } */
+/* { dg-options "-mlarge" } */
+/* { dg-final { scan-assembler ".mspabi_attribute 4, 2" } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 6, 2" } } */
+/* { dg-final { scan-assembler ".mspabi_attribute 8, 2" } } */
+/* { dg-final { scan-assembler ".gnu_attribute 4, 1" { target msp430_region_lower } } } */
+/* { dg-final { scan-assembler ".gnu_attribute 4, 2" { target { ! msp430_region_lower } } } } */
+
+int
+main (void)
+{
+  while (1);
+  return 0;
+}
-- 
cgit v1.1


From 36d387f2f098d6d1e1e77d19e38f3b6221ccde2b Mon Sep 17 00:00:00 2001
From: Uros Bizjak <uros@gcc.gnu.org>
Date: Mon, 7 Oct 2019 20:41:17 +0200
Subject: i386-expand.c (ix86_expand_floorceildf_32, [...]): Reorder functions.

	* config/i386/i386-expand.c (ix86_expand_floorceildf_32,
	ix86_expand_rounddf_32): Reorder functions.
	* config/i386/i386-protos.h: Update..

From-SVN: r276668
---
 gcc/ChangeLog                 |  14 ++-
 gcc/config/i386/i386-expand.c | 220 +++++++++++++++++++++---------------------
 gcc/config/i386/i386-protos.h |   6 +-
 3 files changed, 124 insertions(+), 116 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 74afcaa..bbdce86 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-07  Uroš Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386-expand.c (ix86_expand_floorceildf_32,
+	ix86_expand_rounddf_32): Reorder functions.
+	* config/i386/i386-protos.h: Update..
+
 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* config.in: Regenerate.
@@ -20,14 +26,14 @@
 	".lower" prefix if -m{code,data}-region=lower have been passed.
 	(msp430_output_aligned_decl_common): Emit common symbols when
 	-mdata-region=lower is passed unless TARGET_USE_LOWER_REGION_PREFIX is
-	set. 
+	set.
 	(TARGET_ASM_FILE_END): Define.
 	(msp430_file_end): New function.
 	(msp430_do_not_relax_short_jumps): Allow relaxation when
 	function will be in the lower region.
 	(msp430_op_not_in_high_mem): New function.
 	(msp430_print_operand): Check "msp430_op_not_in_high_mem" for
-	the 'X' operand selector. 
+	the 'X' operand selector.
 	Clarify comment for 'x' operand selector.
 	* config/msp430/msp430.h (LINK_SPEC): Propagate
 	-m{code,data}-region to the linker via spec function
@@ -74,9 +80,9 @@
 	(mdata-region=): Likewise.
 	(muse-lower-region-prefix): New option.
 	* config/msp430/t-msp430 (MULTILIB_OPTIONS): Add
-	mdata-region=none multilib. 
+	mdata-region=none multilib.
 	(MULTILIB_MATCHES): Set mdata-region={upper,either} to match
-	mdata-region=none multilib. 
+	mdata-region=none multilib.
 	MULTILIB_EXCEPTIONS: Remove.
 	MULTILIB_REQUIRED: Define.
 	* configure: Regenerate.
diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
index 5e377d6..6d3d14c 100644
--- a/gcc/config/i386/i386-expand.c
+++ b/gcc/config/i386/i386-expand.c
@@ -15903,71 +15903,8 @@ ix86_expand_rint (rtx operand0, rtx operand1)
   emit_move_insn (operand0, res);
 }
 
-/* Expand SSE2 sequence for computing floor or ceil from OPERAND1 storing
-   into OPERAND0.  */
-void
-ix86_expand_floorceildf_32 (rtx operand0, rtx operand1, bool do_floor)
-{
-  /* C code for the stuff we expand below.
-        double xa = fabs (x), x2;
-        if (!isless (xa, TWO52))
-          return x;
-        xa = xa + TWO52 - TWO52;
-        x2 = copysign (xa, x);
-     Compensate.  Floor:
-        if (x2 > x)
-          x2 -= 1;
-     Compensate.  Ceil:
-        if (x2 < x)
-          x2 += 1;
-	if (HONOR_SIGNED_ZEROS (mode))
-	  x2 = copysign (x2, x);
-	return x2;
-   */
-  machine_mode mode = GET_MODE (operand0);
-  rtx xa, TWO52, tmp, one, res, mask;
-  rtx_code_label *label;
-
-  TWO52 = ix86_gen_TWO52 (mode);
-
-  /* Temporary for holding the result, initialized to the input
-     operand to ease control flow.  */
-  res = gen_reg_rtx (mode);
-  emit_move_insn (res, operand1);
-
-  /* xa = abs (operand1) */
-  xa = ix86_expand_sse_fabs (res, &mask);
-
-  /* if (!isless (xa, TWO52)) goto label; */
-  label = ix86_expand_sse_compare_and_jump (UNLE, TWO52, xa, false);
-
-  /* xa = xa + TWO52 - TWO52; */
-  xa = expand_simple_binop (mode, PLUS, xa, TWO52, NULL_RTX, 0, OPTAB_DIRECT);
-  xa = expand_simple_binop (mode, MINUS, xa, TWO52, xa, 0, OPTAB_DIRECT);
-
-  /* xa = copysign (xa, operand1) */
-  ix86_sse_copysign_to_positive (xa, xa, res, mask);
-
-  /* generate 1.0 */
-  one = force_reg (mode, const_double_from_real_value (dconst1, mode));
-
-  /* Compensate: xa = xa - (xa > operand1 ? 1 : 0) */
-  tmp = ix86_expand_sse_compare_mask (UNGT, xa, res, !do_floor);
-  emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, one, tmp)));
-  tmp = expand_simple_binop (mode, do_floor ? MINUS : PLUS,
-			     xa, tmp, NULL_RTX, 0, OPTAB_DIRECT);
-  if (!do_floor && HONOR_SIGNED_ZEROS (mode))
-    ix86_sse_copysign_to_positive (tmp, tmp, res, mask);
-  emit_move_insn (res, tmp);
-
-  emit_label (label);
-  LABEL_NUSES (label) = 1;
-
-  emit_move_insn (operand0, res);
-}
-
-/* Expand SSE2 sequence for computing floor or ceil from OPERAND1 storing
-   into OPERAND0.  */
+/* Expand SSE2 sequence for computing floor or ceil
+   from OPERAND1 storing into OPERAND0.  */
 void
 ix86_expand_floorceil (rtx operand0, rtx operand1, bool do_floor)
 {
@@ -16027,30 +15964,30 @@ ix86_expand_floorceil (rtx operand0, rtx operand1, bool do_floor)
   emit_move_insn (operand0, res);
 }
 
-/* Expand SSE sequence for computing round from OPERAND1 storing
-   into OPERAND0.  Sequence that works without relying on DImode truncation
-   via cvttsd2siq that is only available on 64bit targets.  */
+/* Expand SSE2 sequence for computing floor or ceil from OPERAND1 storing
+   into OPERAND0 without relying on DImode truncation via cvttsd2siq
+   that is only available on 64bit targets.  */
 void
-ix86_expand_rounddf_32 (rtx operand0, rtx operand1)
+ix86_expand_floorceildf_32 (rtx operand0, rtx operand1, bool do_floor)
 {
   /* C code for the stuff we expand below.
-        double xa = fabs (x), xa2, x2;
+        double xa = fabs (x), x2;
         if (!isless (xa, TWO52))
           return x;
-     Using the absolute value and copying back sign makes
-     -0.0 -> -0.0 correct.
-        xa2 = xa + TWO52 - TWO52;
-     Compensate.
-	dxa = xa2 - xa;
-        if (dxa <= -0.5)
-          xa2 += 1;
-        else if (dxa > 0.5)
-          xa2 -= 1;
-        x2 = copysign (xa2, x);
-        return x2;
+        xa = xa + TWO52 - TWO52;
+        x2 = copysign (xa, x);
+     Compensate.  Floor:
+        if (x2 > x)
+          x2 -= 1;
+     Compensate.  Ceil:
+        if (x2 < x)
+          x2 += 1;
+	if (HONOR_SIGNED_ZEROS (mode))
+	  x2 = copysign (x2, x);
+	return x2;
    */
   machine_mode mode = GET_MODE (operand0);
-  rtx xa, xa2, dxa, TWO52, tmp, half, mhalf, one, res, mask;
+  rtx xa, TWO52, tmp, one, res, mask;
   rtx_code_label *label;
 
   TWO52 = ix86_gen_TWO52 (mode);
@@ -16066,31 +16003,24 @@ ix86_expand_rounddf_32 (rtx operand0, rtx operand1)
   /* if (!isless (xa, TWO52)) goto label; */
   label = ix86_expand_sse_compare_and_jump (UNLE, TWO52, xa, false);
 
-  /* xa2 = xa + TWO52 - TWO52; */
-  xa2 = expand_simple_binop (mode, PLUS, xa, TWO52, NULL_RTX, 0, OPTAB_DIRECT);
-  xa2 = expand_simple_binop (mode, MINUS, xa2, TWO52, xa2, 0, OPTAB_DIRECT);
-
-  /* dxa = xa2 - xa; */
-  dxa = expand_simple_binop (mode, MINUS, xa2, xa, NULL_RTX, 0, OPTAB_DIRECT);
+  /* xa = xa + TWO52 - TWO52; */
+  xa = expand_simple_binop (mode, PLUS, xa, TWO52, NULL_RTX, 0, OPTAB_DIRECT);
+  xa = expand_simple_binop (mode, MINUS, xa, TWO52, xa, 0, OPTAB_DIRECT);
 
-  /* generate 0.5, 1.0 and -0.5 */
-  half = force_reg (mode, const_double_from_real_value (dconsthalf, mode));
-  one = expand_simple_binop (mode, PLUS, half, half, NULL_RTX, 0, OPTAB_DIRECT);
-  mhalf = expand_simple_binop (mode, MINUS, half, one, NULL_RTX,
-			       0, OPTAB_DIRECT);
+  /* xa = copysign (xa, operand1) */
+  ix86_sse_copysign_to_positive (xa, xa, res, mask);
 
-  /* Compensate.  */
-  /* xa2 = xa2 - (dxa > 0.5 ? 1 : 0) */
-  tmp = ix86_expand_sse_compare_mask (UNGT, dxa, half, false);
-  emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, tmp, one)));
-  xa2 = expand_simple_binop (mode, MINUS, xa2, tmp, NULL_RTX, 0, OPTAB_DIRECT);
-  /* xa2 = xa2 + (dxa <= -0.5 ? 1 : 0) */
-  tmp = ix86_expand_sse_compare_mask (UNGE, mhalf, dxa, false);
-  emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, tmp, one)));
-  xa2 = expand_simple_binop (mode, PLUS, xa2, tmp, NULL_RTX, 0, OPTAB_DIRECT);
+  /* generate 1.0 */
+  one = force_reg (mode, const_double_from_real_value (dconst1, mode));
 
-  /* res = copysign (xa2, operand1) */
-  ix86_sse_copysign_to_positive (res, xa2, force_reg (mode, operand1), mask);
+  /* Compensate: xa = xa - (xa > operand1 ? 1 : 0) */
+  tmp = ix86_expand_sse_compare_mask (UNGT, xa, res, !do_floor);
+  emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, one, tmp)));
+  tmp = expand_simple_binop (mode, do_floor ? MINUS : PLUS,
+			     xa, tmp, NULL_RTX, 0, OPTAB_DIRECT);
+  if (!do_floor && HONOR_SIGNED_ZEROS (mode))
+    ix86_sse_copysign_to_positive (tmp, tmp, res, mask);
+  emit_move_insn (res, tmp);
 
   emit_label (label);
   LABEL_NUSES (label) = 1;
@@ -16098,8 +16028,8 @@ ix86_expand_rounddf_32 (rtx operand0, rtx operand1)
   emit_move_insn (operand0, res);
 }
 
-/* Expand SSE sequence for computing trunc from OPERAND1 storing
-   into OPERAND0.  */
+/* Expand SSE sequence for computing trunc
+   from OPERAND1 storing into OPERAND0.  */
 void
 ix86_expand_trunc (rtx operand0, rtx operand1)
 {
@@ -16144,7 +16074,8 @@ ix86_expand_trunc (rtx operand0, rtx operand1)
 }
 
 /* Expand SSE sequence for computing trunc from OPERAND1 storing
-   into OPERAND0.  */
+   into OPERAND0 without relying on DImode truncation via cvttsd2siq
+   that is only available on 64bit targets.  */
 void
 ix86_expand_truncdf_32 (rtx operand0, rtx operand1)
 {
@@ -16201,8 +16132,8 @@ ix86_expand_truncdf_32 (rtx operand0, rtx operand1)
   emit_move_insn (operand0, res);
 }
 
-/* Expand SSE sequence for computing round from OPERAND1 storing
-   into OPERAND0.  */
+/* Expand SSE sequence for computing round
+   from OPERAND1 storing into OPERAND0.  */
 void
 ix86_expand_round (rtx operand0, rtx operand1)
 {
@@ -16251,6 +16182,77 @@ ix86_expand_round (rtx operand0, rtx operand1)
   emit_move_insn (operand0, res);
 }
 
+/* Expand SSE sequence for computing round from OPERAND1 storing
+   into OPERAND0 without relying on DImode truncation via cvttsd2siq
+   that is only available on 64bit targets.  */
+void
+ix86_expand_rounddf_32 (rtx operand0, rtx operand1)
+{
+  /* C code for the stuff we expand below.
+        double xa = fabs (x), xa2, x2;
+        if (!isless (xa, TWO52))
+          return x;
+     Using the absolute value and copying back sign makes
+     -0.0 -> -0.0 correct.
+        xa2 = xa + TWO52 - TWO52;
+     Compensate.
+	dxa = xa2 - xa;
+        if (dxa <= -0.5)
+          xa2 += 1;
+        else if (dxa > 0.5)
+          xa2 -= 1;
+        x2 = copysign (xa2, x);
+        return x2;
+   */
+  machine_mode mode = GET_MODE (operand0);
+  rtx xa, xa2, dxa, TWO52, tmp, half, mhalf, one, res, mask;
+  rtx_code_label *label;
+
+  TWO52 = ix86_gen_TWO52 (mode);
+
+  /* Temporary for holding the result, initialized to the input
+     operand to ease control flow.  */
+  res = gen_reg_rtx (mode);
+  emit_move_insn (res, operand1);
+
+  /* xa = abs (operand1) */
+  xa = ix86_expand_sse_fabs (res, &mask);
+
+  /* if (!isless (xa, TWO52)) goto label; */
+  label = ix86_expand_sse_compare_and_jump (UNLE, TWO52, xa, false);
+
+  /* xa2 = xa + TWO52 - TWO52; */
+  xa2 = expand_simple_binop (mode, PLUS, xa, TWO52, NULL_RTX, 0, OPTAB_DIRECT);
+  xa2 = expand_simple_binop (mode, MINUS, xa2, TWO52, xa2, 0, OPTAB_DIRECT);
+
+  /* dxa = xa2 - xa; */
+  dxa = expand_simple_binop (mode, MINUS, xa2, xa, NULL_RTX, 0, OPTAB_DIRECT);
+
+  /* generate 0.5, 1.0 and -0.5 */
+  half = force_reg (mode, const_double_from_real_value (dconsthalf, mode));
+  one = expand_simple_binop (mode, PLUS, half, half, NULL_RTX, 0, OPTAB_DIRECT);
+  mhalf = expand_simple_binop (mode, MINUS, half, one, NULL_RTX,
+			       0, OPTAB_DIRECT);
+
+  /* Compensate.  */
+  /* xa2 = xa2 - (dxa > 0.5 ? 1 : 0) */
+  tmp = ix86_expand_sse_compare_mask (UNGT, dxa, half, false);
+  emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, tmp, one)));
+  xa2 = expand_simple_binop (mode, MINUS, xa2, tmp, NULL_RTX, 0, OPTAB_DIRECT);
+  /* xa2 = xa2 + (dxa <= -0.5 ? 1 : 0) */
+  tmp = ix86_expand_sse_compare_mask (UNGE, mhalf, dxa, false);
+  emit_insn (gen_rtx_SET (tmp, gen_rtx_AND (mode, tmp, one)));
+  xa2 = expand_simple_binop (mode, PLUS, xa2, tmp, NULL_RTX, 0, OPTAB_DIRECT);
+
+  /* res = copysign (xa2, operand1) */
+  ix86_sse_copysign_to_positive (res, xa2, force_reg (mode, operand1), mask);
+
+  emit_label (label);
+  LABEL_NUSES (label) = 1;
+
+  emit_move_insn (operand0, res);
+}
+
 /* Expand SSE sequence for computing round
    from OP1 storing into OP0 using sse4 round insn.  */
 void
diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h
index 4d6e76d..c07dfe5 100644
--- a/gcc/config/i386/i386-protos.h
+++ b/gcc/config/i386/i386-protos.h
@@ -193,11 +193,11 @@ extern void ix86_expand_lfloorceil (rtx, rtx, bool);
 extern void ix86_expand_rint (rtx, rtx);
 extern void ix86_expand_floorceil (rtx, rtx, bool);
 extern void ix86_expand_floorceildf_32 (rtx, rtx, bool);
-extern void ix86_expand_round_sse4 (rtx, rtx);
-extern void ix86_expand_round (rtx, rtx);
-extern void ix86_expand_rounddf_32 (rtx, rtx);
 extern void ix86_expand_trunc (rtx, rtx);
 extern void ix86_expand_truncdf_32 (rtx, rtx);
+extern void ix86_expand_round (rtx, rtx);
+extern void ix86_expand_rounddf_32 (rtx, rtx);
+extern void ix86_expand_round_sse4 (rtx, rtx);
 
 extern void ix86_expand_vecop_qihi (enum rtx_code, rtx, rtx, rtx);
 
-- 
cgit v1.1


From 53f450825dd09f95eb7c57677f1803371c57763a Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Mon, 7 Oct 2019 20:05:30 +0000
Subject: msp430-protos.h (msp430_split_addsi): New prototype.

2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430-protos.h (msp430_split_addsi): New prototype.
	* config/msp430/msp430.c (msp430_split_addsi): New.
	* config/msp430/msp430.md: Call msp430_split_addsi () instead of using
	a block of C code for splitting addsi.

From-SVN: r276670
---
 gcc/ChangeLog                     |  7 +++++++
 gcc/config/msp430/msp430-protos.h |  1 +
 gcc/config/msp430/msp430.c        | 23 +++++++++++++++++++++++
 gcc/config/msp430/msp430.md       | 20 +++-----------------
 4 files changed, 34 insertions(+), 17 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bbdce86..91ebb5a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* config/msp430/msp430-protos.h (msp430_split_addsi): New prototype.
+	* config/msp430/msp430.c (msp430_split_addsi): New.
+	* config/msp430/msp430.md: Call msp430_split_addsi () instead of using
+	a block of C code for splitting addsi.
+
 2019-10-07  Uroš Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386-expand.c (ix86_expand_floorceildf_32,
diff --git a/gcc/config/msp430/msp430-protos.h b/gcc/config/msp430/msp430-protos.h
index 1c1757f..37ca482 100644
--- a/gcc/config/msp430/msp430-protos.h
+++ b/gcc/config/msp430/msp430-protos.h
@@ -44,6 +44,7 @@ void	msp430_output_labelref (FILE *, const char *);
 void	msp430_register_pragmas (void);
 rtx	msp430_return_addr_rtx (int);
 void	msp430_split_movsi (rtx *);
+int msp430_split_addsi (rtx *);
 void    msp430_start_function (FILE *, const char *, tree);
 rtx	msp430_subreg (machine_mode, rtx, machine_mode, int);
 bool    msp430_use_f5_series_hwmult (void);
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 354b4dd..add19bd 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -2841,6 +2841,29 @@ msp430_subreg (machine_mode mode, rtx r, machine_mode omode, int byte)
   return rv;
 }
 
+int
+msp430_split_addsi (rtx *operands)
+{
+  operands[3] = msp430_subreg (HImode, operands[0], SImode, 0);
+  operands[4] = msp430_subreg (HImode, operands[1], SImode, 0);
+  operands[5] = msp430_subreg (HImode, operands[2], SImode, 0);
+  operands[6] = msp430_subreg (HImode, operands[0], SImode, 2);
+  operands[7] = msp430_subreg (HImode, operands[1], SImode, 2);
+  operands[8] = msp430_subreg (HImode, operands[2], SImode, 2);
+
+  /* BZ 64160: Do not use this splitter when the dest partially overlaps the
+     source.  */
+  if (reg_overlap_mentioned_p (operands[3], operands[7])
+      || reg_overlap_mentioned_p (operands[3], operands[8]))
+    return 1;
+
+  if (GET_CODE (operands[5]) == CONST_INT)
+    operands[9] = GEN_INT (INTVAL (operands[5]) & 0xffff);
+  else
+    operands[9] = gen_rtx_ZERO_EXTEND (SImode, operands[5]);
+  return 0;
+}
+
 /* Called by movsi_x to generate the HImode operands.  */
 void
 msp430_split_movsi (rtx *operands)
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index c72f7aa..e1c61f5 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -423,23 +423,9 @@
 		 (zero_extend:HI (reg:BI CARRY))))
    ]
   "
-   operands[3] = msp430_subreg (HImode, operands[0], SImode, 0);
-   operands[4] = msp430_subreg (HImode, operands[1], SImode, 0);
-   operands[5] = msp430_subreg (HImode, operands[2], SImode, 0);
-   operands[6] = msp430_subreg (HImode, operands[0], SImode, 2);
-   operands[7] = msp430_subreg (HImode, operands[1], SImode, 2);
-   operands[8] = msp430_subreg (HImode, operands[2], SImode, 2);
-
-   /* BZ 64160: Do not use this splitter when the dest partially overlaps the source.  */
-   if (reg_overlap_mentioned_p (operands[3], operands[7])
-       || reg_overlap_mentioned_p (operands[3], operands[8]))
-      FAIL;
-
-   if (GET_CODE (operands[5]) == CONST_INT)
-     operands[9] = GEN_INT (INTVAL (operands[5]) & 0xffff);
-   else
-     operands[9] = gen_rtx_ZERO_EXTEND (SImode, operands[5]);
-   "
+  if (msp430_split_addsi (operands))
+    FAIL;
+  "
   )
 
 
-- 
cgit v1.1


From 8a8969957a86d1832434a07169976c0b1b9e837c Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Mon, 7 Oct 2019 20:09:49 +0000
Subject: msp430.c (msp430_file_end): s/msp_/msp430_/

2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430.c (msp430_file_end): s/msp_/msp430_/
	(msp430_expand_epilogue): Likewise.
	* config/msp430/predicates.md: Likewise.
	* config/msp430/msp430.md: Likewise.
	Replace blocks of 8 spaces with tabs.

From-SVN: r276671
---
 gcc/ChangeLog                   |   8 +++
 gcc/config/msp430/msp430.c      |  14 +++--
 gcc/config/msp430/msp430.md     | 122 ++++++++++++++++++++--------------------
 gcc/config/msp430/predicates.md |  10 ++--
 4 files changed, 82 insertions(+), 72 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91ebb5a..7d8aa95 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
+	* config/msp430/msp430.c (msp430_file_end): s/msp_/msp430_/
+	(msp430_expand_epilogue): Likewise.
+	* config/msp430/predicates.md: Likewise.
+	* config/msp430/msp430.md: Likewise.
+	Replace blocks of 8 spaces with tabs.
+
+2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
 	* config/msp430/msp430-protos.h (msp430_split_addsi): New prototype.
 	* config/msp430/msp430.c (msp430_split_addsi): New.
 	* config/msp430/msp430.md: Call msp430_split_addsi () instead of using
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index add19bd..ae763fa 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -83,7 +83,7 @@ struct GTY(()) machine_function
 };
 
 /* This is our init_machine_status, as set in
-   msp_option_override.  */
+   msp430_option_override.  */
 static struct machine_function *
 msp430_init_machine_status (void)
 {
@@ -2119,18 +2119,20 @@ msp430_file_end (void)
      construct a .MSP430.attributes section based on the options it is invoked
      with.  The values it reads from these directives are used for validating
      those options.  */
-  const char *msp_attr = ".mspabi_attribute";
+  const char *msp430_attr = ".mspabi_attribute";
   const char *gnu_attr = ".gnu_attribute";
 
   /* Emit .mspabi_attribute directive for OFBA_MSPABI_Tag_ISA.  */
-  fprintf (asm_out_file, "\t%s %d, %d\n", msp_attr, OFBA_MSPABI_Tag_ISA,
+  fprintf (asm_out_file, "\t%s %d, %d\n", msp430_attr, OFBA_MSPABI_Tag_ISA,
 	   msp430x ? OFBA_MSPABI_Val_ISA_MSP430X : OFBA_MSPABI_Val_ISA_MSP430);
   /* Emit .mspabi_attribute directive for OFBA_MSPABI_Tag_Code_Model.  */
-  fprintf (asm_out_file, "\t%s %d, %d\n", msp_attr, OFBA_MSPABI_Tag_Code_Model,
+  fprintf (asm_out_file, "\t%s %d, %d\n", msp430_attr,
+	   OFBA_MSPABI_Tag_Code_Model,
 	   TARGET_LARGE ? OFBA_MSPABI_Val_Model_Large
 	   : OFBA_MSPABI_Val_Model_Small);
   /* Emit .mspabi_attribute directive for OFBA_MSPABI_Tag_Data_Model.  */
-  fprintf (asm_out_file, "\t%s %d, %d\n", msp_attr, OFBA_MSPABI_Tag_Data_Model,
+  fprintf (asm_out_file, "\t%s %d, %d\n", msp430_attr,
+	   OFBA_MSPABI_Tag_Data_Model,
 	   TARGET_LARGE ? OFBA_MSPABI_Val_Model_Large
 	   : OFBA_MSPABI_Val_Model_Small);
 #ifdef HAVE_AS_MSPABI_ATTRIBUTE
@@ -2604,7 +2606,7 @@ msp430_expand_epilogue (int is_eh)
   else if (is_reentrant_func ())
     emit_insn (gen_enable_interrupts ());
 
-  emit_jump_insn (gen_msp_return ());
+  emit_jump_insn (gen_msp430_return ());
 }
 
 /* Implements EH_RETURN_STACKADJ_RTX.  Saved and used later in
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index e1c61f5..ebd9c85 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -183,15 +183,15 @@
 )
 
 (define_insn "movqi_topbyte"
-  [(set (match_operand:QI 0 "msp_nonimmediate_operand" "=r")
-	(subreg:QI (match_operand:PSI 1 "msp_general_operand" "r") 2))]
+  [(set (match_operand:QI 0 "msp430_nonimmediate_operand" "=r")
+	(subreg:QI (match_operand:PSI 1 "msp430_general_operand" "r") 2))]
   "msp430x"
   "PUSHM.A\t#1,%1 { POPM.W\t#1,%0 { POPM.W\t#1,%0"
 )
 
 (define_insn "movqi"
-  [(set (match_operand:QI 0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(match_operand:QI 1 "msp_general_operand" "riYsYx,rmi"))]
+  [(set (match_operand:QI 0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(match_operand:QI 1 "msp430_general_operand" "riYsYx,rmi"))]
   ""
   "@
   MOV.B\t%1, %0
@@ -199,8 +199,8 @@
 )
 
 (define_insn "movhi"
-  [(set (match_operand:HI 0 "msp_nonimmediate_operand" "=r,rYsYx,rm")
-	(match_operand:HI 1 "msp_general_operand" "N,riYsYx,rmi"))]
+  [(set (match_operand:HI 0 "msp430_nonimmediate_operand" "=r,rYsYx,rm")
+	(match_operand:HI 1 "msp430_general_operand" "N,riYsYx,rmi"))]
   ""
   "@
   MOV.B\t%1, %0
@@ -243,8 +243,8 @@
 
 ;; FIXME: Some MOVX.A cases can be done with MOVA, this is only a few of them.
 (define_insn "movpsi"
-  [(set (match_operand:PSI 0 "msp_nonimmediate_operand" "=r,r,r,Ya,rm")
-	(match_operand:PSI 1 "msp_general_operand" "N,O,riYa,r,rmi"))]
+  [(set (match_operand:PSI 0 "msp430_nonimmediate_operand" "=r,r,r,Ya,rm")
+	(match_operand:PSI 1 "msp430_general_operand" "N,O,riYa,r,rmi"))]
   ""
   "@
   MOV.B\t%1, %0
@@ -279,9 +279,9 @@
 ;; Math
 
 (define_insn "addpsi3"
-  [(set (match_operand:PSI           0 "msp_nonimmediate_operand" "=r,rm")
-	(plus:PSI (match_operand:PSI 1 "msp_nonimmediate_operand" "%0,0")
-		  (match_operand:PSI 2 "msp_general_operand"      "rLs,rmi")))]
+  [(set (match_operand:PSI	     0 "msp430_nonimmediate_operand" "=r,rm")
+	(plus:PSI (match_operand:PSI 1 "msp430_nonimmediate_operand" "%0,0")
+		  (match_operand:PSI 2 "msp430_general_operand"      "rLs,rmi")))]
   ""
   "@
   ADDA\t%2, %0
@@ -289,9 +289,9 @@
 )
 
 (define_insn "addqi3"
-  [(set (match_operand:QI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(plus:QI (match_operand:QI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:QI 2 "msp_general_operand"      "riYsYx,rmi")))]
+  [(set (match_operand:QI	   0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(plus:QI (match_operand:QI 1 "msp430_nonimmediate_operand" "%0,0")
+		 (match_operand:QI 2 "msp430_general_operand"      "riYsYx,rmi")))]
   ""
   "@
    ADD.B\t%2, %0
@@ -299,9 +299,9 @@
 )
 
 (define_insn "addhi3"
-  [(set (match_operand:HI           0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(plus:HI (match_operand:HI  1 "msp_nonimmediate_operand" "%0,0")
-		  (match_operand:HI 2 "msp_general_operand"      "riYsYx,rmi")))]
+  [(set (match_operand:HI	    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(plus:HI (match_operand:HI  1 "msp430_nonimmediate_operand" "%0,0")
+		  (match_operand:HI 2 "msp430_general_operand"      "riYsYx,rmi")))]
   ""
   "@
    ADD.W\t%2, %0
@@ -358,9 +358,9 @@
 ; that are not single_set() very well.
 
 (define_insn "addhi3_cy"
-  [(set (match_operand:HI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(plus:HI (match_operand:HI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:HI 2 "msp_nonimmediate_operand" "rYsYxi,rm")))
+  [(set (match_operand:HI	   0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(plus:HI (match_operand:HI 1 "msp430_nonimmediate_operand" "%0,0")
+		 (match_operand:HI 2 "msp430_nonimmediate_operand" "rYsYxi,rm")))
    (set (reg:BI CARRY)
 	(truncate:BI (lshiftrt:SI (plus:SI (zero_extend:SI (match_dup 1))
 					   (zero_extend:SI (match_dup 2)))
@@ -389,9 +389,9 @@
 
 ; Version of addhi that adds the carry, for SImode adds.
 (define_insn "addchi4_cy"
-  [(set (match_operand:HI                   0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(plus:HI (plus:HI (match_operand:HI 1 "msp_nonimmediate_operand" "%0,0")
-			  (match_operand:HI 2 "msp_general_operand"      "riYsYx,rmi"))
+  [(set (match_operand:HI		    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(plus:HI (plus:HI (match_operand:HI 1 "msp430_nonimmediate_operand" "%0,0")
+			  (match_operand:HI 2 "msp430_general_operand"      "riYsYx,rmi"))
 		 (zero_extend:HI (reg:BI CARRY))))
    ]
   ""
@@ -479,8 +479,8 @@
 )
 
 (define_insn "*bic<mode>_cg"
-  [(set (match_operand:QHI 0 "msp_nonimmediate_operand" "=rYs,m")
-	(and:QHI (match_operand:QHI 1 "msp_general_operand" "0,0")
+  [(set (match_operand:QHI 0 "msp430_nonimmediate_operand" "=rYs,m")
+	(and:QHI (match_operand:QHI 1 "msp430_general_operand" "0,0")
 		 (match_operand 2 "msp430_inv_constgen_operator" "n,n")))]
   ""
   "@
@@ -489,9 +489,9 @@
 )
 
 (define_insn "bic<mode>3"
-  [(set (match_operand:QHI                   0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(and:QHI (not:QHI (match_operand:QHI 1 "msp_general_operand"       "rYsYx,rmn"))
-		 (match_operand:QHI          2 "msp_nonimmediate_operand"  "0,0")))]
+  [(set (match_operand:QHI		     0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(and:QHI (not:QHI (match_operand:QHI 1 "msp430_general_operand"       "rYsYx,rmn"))
+		 (match_operand:QHI	     2 "msp430_nonimmediate_operand"  "0,0")))]
   ""
   "@
    BIC%x0%b0\t%1, %0
@@ -499,9 +499,9 @@
 )
 
 (define_insn "and<mode>3"
-  [(set (match_operand:QHI 0 "msp_nonimmediate_operand" "=r,rYsYx,rm")
-	(and:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "%0,0,0")
-		 (match_operand:QHI 2 "msp_general_operand" "N,riYsYx,rmi")))]
+  [(set (match_operand:QHI 0 "msp430_nonimmediate_operand" "=r,rYsYx,rm")
+	(and:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "%0,0,0")
+		 (match_operand:QHI 2 "msp430_general_operand" "N,riYsYx,rmi")))]
   ""
   "@
    AND%x0.B\t%2, %0
@@ -510,9 +510,9 @@
 )
 
 (define_insn "ior<mode>3"
-  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(ior:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:QHI 2 "msp_general_operand" "riYsYx,rmi")))]
+  [(set (match_operand:QHI	    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(ior:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "%0,0")
+		 (match_operand:QHI 2 "msp430_general_operand" "riYsYx,rmi")))]
   ""
   "@
    BIS%x0%b0\t%2, %0
@@ -520,9 +520,9 @@
 )
 
 (define_insn "xor<mode>3"
-  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYsYx,rm")
-	(xor:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "%0,0")
-		 (match_operand:QHI 2 "msp_general_operand" "riYsYx,rmi")))]
+  [(set (match_operand:QHI	    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+	(xor:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "%0,0")
+		 (match_operand:QHI 2 "msp430_general_operand" "riYsYx,rmi")))]
   ""
   "@
    XOR%x0%b0\t%2, %0
@@ -531,8 +531,8 @@
 
 ;; Macro : XOR #~0, %0
 (define_insn "one_cmpl<mode>2"
-  [(set (match_operand:QHI          0 "msp_nonimmediate_operand" "=rYs,m")
-	(not:QHI (match_operand:QHI 1 "msp_nonimmediate_operand" "0,0")))]
+  [(set (match_operand:QHI	    0 "msp430_nonimmediate_operand" "=rYs,m")
+	(not:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "0,0")))]
   ""
   "@
    INV%x0%b0\t%0
@@ -540,8 +540,8 @@
 )
 
 (define_insn "extendqihi2"
-  [(set (match_operand:HI                 0 "msp_nonimmediate_operand" "=rYs,m")
-	(sign_extend:HI (match_operand:QI 1 "msp_nonimmediate_operand" "0,0")))]
+  [(set (match_operand:HI		  0 "msp430_nonimmediate_operand" "=rYs,m")
+	(sign_extend:HI (match_operand:QI 1 "msp430_nonimmediate_operand" "0,0")))]
   ""
   "@
    SXT%X0\t%0
@@ -549,8 +549,8 @@
 )
 
 (define_insn "zero_extendqihi2"
-  [(set (match_operand:HI                 0 "msp_nonimmediate_operand" "=rYs,r,r,m")
-	(zero_extend:HI (match_operand:QI 1 "msp_nonimmediate_operand" "0,rYs,m,0")))]
+  [(set (match_operand:HI		  0 "msp430_nonimmediate_operand" "=rYs,r,r,m")
+	(zero_extend:HI (match_operand:QI 1 "msp430_nonimmediate_operand" "0,rYs,m,0")))]
   ""
   "@
    AND\t#0xff, %0
@@ -571,8 +571,8 @@
 )
 
 (define_insn "zero_extendhipsi2"
-  [(set (match_operand:PSI                 0 "msp_nonimmediate_operand" "=r,m")
-	(zero_extend:PSI (match_operand:HI 1 "msp_nonimmediate_operand" "rm,r")))]
+  [(set (match_operand:PSI		   0 "msp430_nonimmediate_operand" "=r,m")
+	(zero_extend:PSI (match_operand:HI 1 "msp430_nonimmediate_operand" "rm,r")))]
   ""
   "@
   MOVX\t%1, %0
@@ -580,7 +580,7 @@
 )
 
 (define_insn "truncpsihi2"
-  [(set (match_operand:HI               0 "msp_nonimmediate_operand" "=rm")
+  [(set (match_operand:HI		0 "msp430_nonimmediate_operand" "=rm")
 	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
   ""
   "MOVX\t%1, %0"
@@ -851,8 +851,8 @@
 )
 
 (define_insn "srai_1"
-  [(set (match_operand:HI              0 "msp_nonimmediate_operand" "=rm")
-	(ashiftrt:HI (match_operand:HI 1 "msp_general_operand"      "0")
+  [(set (match_operand:HI	       0 "msp430_nonimmediate_operand" "=rm")
+	(ashiftrt:HI (match_operand:HI 1 "msp430_general_operand"      "0")
 		     (const_int 1)))]
   ""
   "RRA%X0.W\t%0"
@@ -1094,7 +1094,7 @@
   "CALL%Q0\t%1"
 )
 
-(define_insn "msp_return"
+(define_insn "msp430_return"
   [(return)]
   ""
   { return msp430_is_interrupt_func () ? "RETI" : (TARGET_LARGE ? "RETA" : "RET"); }
@@ -1274,8 +1274,8 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (ne (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
+	      (ne (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (label_ref (match_operand 2 "" ""))
 	      (pc)))
@@ -1289,8 +1289,8 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (eq (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
+	      (eq (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (label_ref (match_operand 2 "" ""))
 	      (pc)))
@@ -1304,8 +1304,8 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (eq (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
+	      (eq (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (pc)
 	      (label_ref (match_operand 2 "" ""))))
@@ -1319,8 +1319,8 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (ne (and:QHI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYsYx,rm")
-			   (match_operand:QHI 1 "msp_general_operand" "rYsYxi,rmi"))
+	      (ne (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (pc)
 	      (label_ref (match_operand 2 "" ""))))
@@ -1337,7 +1337,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (ne (zero_extract:HI (match_operand:QHI 0 "msp_nonimmediate_operand" "rYs,rm")
+	      (ne (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYs,rm")
 				    (const_int 1)
 				    (match_operand 1 "msp430_bitpos" "i,i"))
 		  (const_int 0))
@@ -1353,7 +1353,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (eq (zero_extract:HI (match_operand:QHI 0 "msp_nonimmediate_operand" "rm")
+	      (eq (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rm")
 				   (const_int 1)
 				   (match_operand 1 "msp430_bitpos" "i"))
 		  (const_int 0))
@@ -1367,7 +1367,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (eq (zero_extract:HI (match_operand:QHI 0 "msp_nonimmediate_operand" "rm")
+	      (eq (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rm")
 				   (const_int 1)
 				   (match_operand 1 "msp430_bitpos" "i"))
 		  (const_int 0))
@@ -1381,7 +1381,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (ne (zero_extract:HI (match_operand:QHI 0 "msp_nonimmediate_operand" "rm")
+	      (ne (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rm")
 				   (const_int 1)
 				   (match_operand 1 "msp430_bitpos" "i"))
 		  (const_int 0))
diff --git a/gcc/config/msp430/predicates.md b/gcc/config/msp430/predicates.md
index 1bfd33d..751548c 100644
--- a/gcc/config/msp430/predicates.md
+++ b/gcc/config/msp430/predicates.md
@@ -18,7 +18,7 @@
 ;; along with GCC; see the file COPYING3.  If not see
 ;; <http://www.gnu.org/licenses/>.
 
-(define_predicate "msp_volatile_memory_operand"
+(define_predicate "msp430_volatile_memory_operand"
   (and (match_code "mem")
        (match_test ("memory_address_addr_space_p (GET_MODE (op), XEXP (op, 0), MEM_ADDR_SPACE (op))")))
 )
@@ -26,16 +26,16 @@
 ; TRUE for any valid general operand.  We do this because
 ; general_operand refuses to match volatile memory refs.
 
-(define_predicate "msp_general_operand"
+(define_predicate "msp430_general_operand"
   (ior (match_operand 0 "general_operand")
-       (match_operand 0 "msp_volatile_memory_operand"))
+       (match_operand 0 "msp430_volatile_memory_operand"))
 )
 
 ; Likewise for nonimmediate_operand.
 
-(define_predicate "msp_nonimmediate_operand"
+(define_predicate "msp430_nonimmediate_operand"
   (ior (match_operand 0 "nonimmediate_operand")
-       (match_operand 0 "msp_volatile_memory_operand"))
+       (match_operand 0 "msp430_volatile_memory_operand"))
 )
 
 (define_predicate "ubyte_operand"
-- 
cgit v1.1


From 2161a445d1c129bf2faa031bd862fa4fe3a4121b Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Mon, 7 Oct 2019 20:14:26 +0000
Subject: [Darwin, machopic 0/n] Initial tidy of Mach-O symbol handling.

We want to improve the detection and caching of symbol-properties
so that (a) we can make the compiler's output match the platform
norms (b) we can improve efficiency by checking flags instead of
inspecting strings. (c) The fix for PR71767 was a largish hammer
and we want to reduce the number of symbols that are made linker-
visible.

This first patch is largely typographical changes with no functional
difference intended:

- Tries to ensure that there's no overlap between the symbols used in
the Mach-O case and those declared in the i386 or rs6000 port trees.

 - Some improvement to comments.

- Makes the naming of the symbol flags consistent with other uses.

 - Provides a predicate macro for each use.

gcc/ChangeLog:

2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_symbol_defined_p): Use symbol flag
	predicates instead of accessing bits directly.
	(machopic_indirect_call_target): Likewise.
	(machopic_output_indirection): Likewise.
	(darwin_encode_section_info): Improve description.  Use renamed
	symbol flags.  Use predicate macros for variables and functions.
	* config/darwin.h:
	Rename MACHO_SYMBOL_VARIABLE to MACHO_SYMBOL_FLAG_VARIABLE.
	Rename MACHO_SYMBOL_DEFINED to MACHO_SYMBOL_FLAG_DEFINED.
	Rename MACHO_SYMBOL_STATIC to MACHO_SYMBOL_FLAG_STATIC.
	(MACHO_SYMBOL_VARIABLE_P): New.
	(MACHO_SYMBOL_DEFINED_P):New.
	(MACHO_SYMBOL_STATIC_P): New.
	* config/i386/darwin.h (MACHO_SYMBOL_FLAG_VARIABLE): Delete.
	(SYMBOL_FLAG_SUBT_DEP): New.
	* config/rs6000/darwin.h (SYMBOL_FLAG_SUBT_DEP): New.

From-SVN: r276674
---
 gcc/ChangeLog              | 19 +++++++++++++++++++
 gcc/config/darwin.c        | 47 +++++++++++++++++++++++++++++-----------------
 gcc/config/darwin.h        | 25 ++++++++++++++++--------
 gcc/config/i386/darwin.h   |  6 ++----
 gcc/config/rs6000/darwin.h |  3 +++
 5 files changed, 71 insertions(+), 29 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d8aa95..021d406 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,22 @@
+2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (machopic_symbol_defined_p): Use symbol flag
+	predicates instead of accessing bits directly.
+	(machopic_indirect_call_target): Likewise.
+	(machopic_output_indirection): Likewise.
+	(darwin_encode_section_info): Improve description.  Use renamed
+	symbol flags.  Use predicate macros for variables and functions.
+	* config/darwin.h:
+	Rename MACHO_SYMBOL_VARIABLE to MACHO_SYMBOL_FLAG_VARIABLE.
+	Rename MACHO_SYMBOL_DEFINED to MACHO_SYMBOL_FLAG_DEFINED.
+	Rename MACHO_SYMBOL_STATIC to MACHO_SYMBOL_FLAG_STATIC.
+	(MACHO_SYMBOL_VARIABLE_P): New.
+	(MACHO_SYMBOL_DEFINED_P):New.
+	(MACHO_SYMBOL_STATIC_P): New.
+	* config/i386/darwin.h (MACHO_SYMBOL_FLAG_VARIABLE): Delete.
+	(SYMBOL_FLAG_SUBT_DEP): New.
+	* config/rs6000/darwin.h (SYMBOL_FLAG_SUBT_DEP): New.
+
 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* config/msp430/msp430.c (msp430_file_end): s/msp_/msp430_/
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 5673982..45e0d74 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -76,7 +76,7 @@ along with GCC; see the file COPYING3.  If not see
    setting the second word in the .non_lazy_symbol_pointer data
    structure to symbol.  See indirect_data for the code that handles
    the extra indirection, and machopic_output_indirection and its use
-   of MACHO_SYMBOL_STATIC for the code that handles @code{static}
+   of MACHO_SYMBOL_FLAG_STATIC for the code that handles @code{static}
    symbol indirection.  */
 
 typedef struct GTY(()) cdtor_record {
@@ -249,7 +249,7 @@ name_needs_quotes (const char *name)
 int
 machopic_symbol_defined_p (rtx sym_ref)
 {
-  if (SYMBOL_REF_FLAGS (sym_ref) & MACHO_SYMBOL_FLAG_DEFINED)
+  if (MACHO_SYMBOL_DEFINED_P (sym_ref))
     return true;
 
   /* If a symbol references local and is not an extern to this
@@ -258,7 +258,7 @@ machopic_symbol_defined_p (rtx sym_ref)
     {
       /* If the symbol references a variable and the variable is a
 	 common symbol, then this symbol is not defined.  */
-      if (SYMBOL_REF_FLAGS (sym_ref) & MACHO_SYMBOL_FLAG_VARIABLE)
+      if (MACHO_SYMBOL_VARIABLE_P (sym_ref))
 	{
 	  tree decl = SYMBOL_REF_DECL (sym_ref);
 	  if (!decl)
@@ -797,8 +797,7 @@ machopic_indirect_call_target (rtx target)
 
   if (MACHOPIC_INDIRECT
       && GET_CODE (XEXP (target, 0)) == SYMBOL_REF
-      && !(SYMBOL_REF_FLAGS (XEXP (target, 0))
-	   & MACHO_SYMBOL_FLAG_DEFINED))
+      && ! MACHO_SYMBOL_DEFINED_P (XEXP (target, 0)))
     {
       rtx sym_ref = XEXP (target, 0);
       const char *stub_name = machopic_indirection_name (sym_ref,
@@ -1167,14 +1166,14 @@ machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
       assemble_name (asm_out_file, sym_name);
       fprintf (asm_out_file, "\n");
 
-      /* Variables that are marked with MACHO_SYMBOL_STATIC need to
+      /* Variables that are marked with MACHO_SYMBOL_FLAG_STATIC need to
 	 have their symbol name instead of 0 in the second entry of
 	 the non-lazy symbol pointer data structure when they are
 	 defined.  This allows the runtime to rebind newer instances
 	 of the translation unit with the original instance of the
 	 symbol.  */
 
-      if ((SYMBOL_REF_FLAGS (symbol) & MACHO_SYMBOL_STATIC)
+      if (MACHO_SYMBOL_STATIC_P (symbol)
 	  && machopic_symbol_defined_p (symbol))
 	init = gen_rtx_SYMBOL_REF (Pmode, sym_name);
 
@@ -1205,23 +1204,37 @@ machopic_operand_p (rtx op)
 	    && XINT (XEXP (op, 0), 1) == UNSPEC_MACHOPIC_OFFSET);
 }
 
-/* This function records whether a given name corresponds to a defined
-   or undefined function or variable, for machopic_classify_ident to
-   use later.  */
+/* This function:
+   computes and caches a series of flags that characterise the symbol's
+   properties that affect Mach-O code gen (including accidental cases
+   from older toolchains).
+
+   TODO:
+   Here we also need to do enough analysis to determine if a symbol's
+   name needs to be made linker-visible.  This is more tricky - since
+   it depends on whether we've previously seen a global weak definition
+   in the same section.
+   */
 
 void
-darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
+darwin_encode_section_info (tree decl, rtx rtl, int first)
 {
-  rtx sym_ref;
+  /* Careful not to prod global register variables.  */
+  if (!MEM_P (rtl))
+    return;
 
-  /* Do the standard encoding things first.  */
+  /* Do the standard encoding things first; this sets:
+     SYMBOL_FLAG_FUNCTION,
+     SYMBOL_FLAG_LOCAL, (binds_local_p)
+     TLS_MODEL, SYMBOL_FLAG_SMALL
+     SYMBOL_FLAG_EXTERNAL.  */
   default_encode_section_info (decl, rtl, first);
 
-  if (TREE_CODE (decl) != FUNCTION_DECL && TREE_CODE (decl) != VAR_DECL)
+  if (! VAR_OR_FUNCTION_DECL_P (decl))
     return;
 
-  sym_ref = XEXP (rtl, 0);
-  if (TREE_CODE (decl) == VAR_DECL)
+  rtx sym_ref = XEXP (rtl, 0);
+  if (VAR_P (decl))
     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_VARIABLE;
 
   if (!DECL_EXTERNAL (decl)
@@ -1234,7 +1247,7 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_DEFINED;
 
   if (! TREE_PUBLIC (decl))
-    SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_STATIC;
+    SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_STATIC;
 }
 
 void
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 93dc638..39c54cc 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -812,21 +812,30 @@ extern GTY(()) section * darwin_sections[NUM_DARWIN_SECTIONS];
 #undef TARGET_ASM_MARK_DECL_PRESERVED
 #define TARGET_ASM_MARK_DECL_PRESERVED darwin_mark_decl_preserved
 
-/* Set on a symbol with SYMBOL_FLAG_FUNCTION or
-   MACHO_SYMBOL_FLAG_VARIABLE to indicate that the function or
-   variable has been defined in this translation unit.
-   When porting Mach-O to new architectures you need to make
-   sure these aren't clobbered by the backend.  */
+/* Any port using this header needs to define the first available
+   subtarget symbol bit: SYMBOL_FLAG_SUBT_DEP.  */
 
-#define MACHO_SYMBOL_FLAG_VARIABLE (SYMBOL_FLAG_MACH_DEP)
-#define MACHO_SYMBOL_FLAG_DEFINED ((SYMBOL_FLAG_MACH_DEP) << 1)
+/* Is a variable. */
+#define MACHO_SYMBOL_FLAG_VARIABLE (SYMBOL_FLAG_SUBT_DEP)
+#define MACHO_SYMBOL_VARIABLE_P(RTX) \
+  ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_VARIABLE) != 0)
+
+/* Set on a symbol with SYMBOL_FLAG_FUNCTION or MACHO_SYMBOL_FLAG_VARIABLE
+   to indicate that the function or variable is considered defined in this
+   translation unit.  */
+
+#define MACHO_SYMBOL_FLAG_DEFINED ((SYMBOL_FLAG_SUBT_DEP) << 2)
+#define MACHO_SYMBOL_DEFINED_P(RTX) \
+  ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_DEFINED) != 0)
 
 /* Set on a symbol to indicate when fix-and-continue style code
    generation is being used and the symbol refers to a static symbol
    that should be rebound from new instances of a translation unit to
    the original instance of the data.  */
 
-#define MACHO_SYMBOL_STATIC ((SYMBOL_FLAG_MACH_DEP) << 2)
+#define MACHO_SYMBOL_FLAG_STATIC ((SYMBOL_FLAG_SUBT_DEP) << 5)
+#define MACHO_SYMBOL_STATIC_P(RTX) \
+  ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_STATIC) != 0)
 
 /* Symbolic names for various things we might know about a symbol.  */
 
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 385d253..bdb36f0 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -324,10 +324,8 @@ along with GCC; see the file COPYING3.  If not see
         }								\
     }
 
-/* This needs to move since i386 uses the first flag and other flags are
-   used in Mach-O.  */
-#undef MACHO_SYMBOL_FLAG_VARIABLE
-#define MACHO_SYMBOL_FLAG_VARIABLE ((SYMBOL_FLAG_MACH_DEP) << 3)
+/* First available SYMBOL flag bit for use by subtargets.  */
+#define SYMBOL_FLAG_SUBT_DEP (SYMBOL_FLAG_MACH_DEP << 5)
 
 #undef MACHOPIC_NL_SYMBOL_PTR_SECTION
 #define MACHOPIC_NL_SYMBOL_PTR_SECTION \
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index a626325..1081967 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -506,6 +506,9 @@ do {									\
    this will need to be modified similar to the x86 case.  */
 #define TARGET_FOLD_BUILTIN SUBTARGET_FOLD_BUILTIN
 
+/* First available SYMBOL flag bit for use by subtargets.  */
+#define SYMBOL_FLAG_SUBT_DEP (SYMBOL_FLAG_MACH_DEP)
+
 /* Use standard DWARF numbering for DWARF debugging information.  */
 #define RS6000_USE_DWARF_NUMBERING
 
-- 
cgit v1.1


From b393e5ede4064d6c2da289ed0b66b8e80e033c54 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Mon, 7 Oct 2019 20:21:50 +0000
Subject: [Darwin, machopic 1/n] Consider visibility in indirections.

For weak, hidden vars the indirection should just be as normal, that
is that the indirections for such symbols should appear in the non-lazy
symbol pointers table, not in the .data section.

gcc/ChangeLog:

2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_output_indirection): Don't put
	hidden symbol indirections into the .data section, use the
	non-lazy symbol pointers section as normal.
	(darwin_encode_section_info): Record if a symbol is hidden.
	* config/darwin.h (MACHO_SYMBOL_FLAG_HIDDEN_VIS): New.
	(MACHO_SYMBOL_HIDDEN_VIS_P): New.

From-SVN: r276675
---
 gcc/ChangeLog       | 9 +++++++++
 gcc/config/darwin.c | 7 +++++++
 gcc/config/darwin.h | 6 ++++++
 3 files changed, 22 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 021d406..af5ac09 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>
 
+	* config/darwin.c (machopic_output_indirection): Don't put
+	hidden symbol indirections into the .data section, use the
+	non-lazy symbol pointers section as normal.
+	(darwin_encode_section_info): Record if a symbol is hidden.
+	* config/darwin.h (MACHO_SYMBOL_FLAG_HIDDEN_VIS): New.
+	(MACHO_SYMBOL_HIDDEN_VIS_P): New.
+
+2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>
+
 	* config/darwin.c (machopic_symbol_defined_p): Use symbol flag
 	predicates instead of accessing bits directly.
 	(machopic_indirect_call_target): Likewise.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 45e0d74..869e850 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1120,6 +1120,7 @@ machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
       machopic_output_stub (asm_out_file, sym, stub);
     }
   else if (! indirect_data (symbol)
+	   && ! MACHO_SYMBOL_HIDDEN_VIS_P (symbol)
 	   && (machopic_symbol_defined_p (symbol)
 	       || SYMBOL_REF_LOCAL_P (symbol)))
     {
@@ -1237,6 +1238,12 @@ darwin_encode_section_info (tree decl, rtx rtl, int first)
   if (VAR_P (decl))
     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_VARIABLE;
 
+  /* For Darwin, if we have specified visibility and it's not the default
+     that's counted 'hidden'.  */
+  if (DECL_VISIBILITY_SPECIFIED (decl)
+      && DECL_VISIBILITY (decl) != VISIBILITY_DEFAULT)
+     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_HIDDEN_VIS;
+
   if (!DECL_EXTERNAL (decl)
       && (!TREE_PUBLIC (decl) || !DECL_WEAK (decl))
       && ! lookup_attribute ("weakref", DECL_ATTRIBUTES (decl))
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 39c54cc..87e1eb6 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -828,6 +828,12 @@ extern GTY(()) section * darwin_sections[NUM_DARWIN_SECTIONS];
 #define MACHO_SYMBOL_DEFINED_P(RTX) \
   ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_DEFINED) != 0)
 
+/* Set on a symbol that has specified non-default visibility.  */
+
+#define MACHO_SYMBOL_FLAG_HIDDEN_VIS ((SYMBOL_FLAG_SUBT_DEP) << 3)
+#define MACHO_SYMBOL_HIDDEN_VIS_P(RTX) \
+  ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_HIDDEN_VIS) != 0)
+
 /* Set on a symbol to indicate when fix-and-continue style code
    generation is being used and the symbol refers to a static symbol
    that should be rebound from new instances of a translation unit to
-- 
cgit v1.1


From 795fe3d2c663337d8a1ae1347db172d54fd96c12 Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Mon, 7 Oct 2019 21:04:07 +0000
Subject: msp430.md: Group zero_extend* insns together.

2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430.md: Group zero_extend* insns together.

From-SVN: r276679
---
 gcc/ChangeLog               |   4 ++
 gcc/config/msp430/msp430.md | 117 ++++++++++++++++++++++----------------------
 2 files changed, 62 insertions(+), 59 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af5ac09..36debb6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* config/msp430/msp430.md: Group zero_extend* insns together.
+
 2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (machopic_output_indirection): Don't put
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index ebd9c85..5bca727 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -559,15 +559,11 @@
    AND%X0\t#0xff, %0"
 )
 
-;; Eliminate extraneous zero-extends mysteriously created by gcc.
-(define_peephole2
-  [(set (match_operand:HI 0 "register_operand")
-	(zero_extend:HI (match_operand:QI 1 "general_operand")))
-   (set (match_operand:HI 2 "register_operand")
-	(zero_extend:HI (match_operand:QI 3 "register_operand")))]
-  "REGNO (operands[0]) == REGNO (operands[2]) && REGNO (operands[2]) == REGNO (operands[3])"
-  [(set (match_dup 0)
-	(zero_extend:HI (match_dup 1)))]
+(define_insn "zero_extendqisi2"
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
+	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
+  ""
+  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
 )
 
 (define_insn "zero_extendhipsi2"
@@ -578,40 +574,6 @@
   MOVX\t%1, %0
   MOVX.A\t%1, %0"
 )
-
-(define_insn "truncpsihi2"
-  [(set (match_operand:HI		0 "msp430_nonimmediate_operand" "=rm")
-	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
-  ""
-  "MOVX\t%1, %0"
-)
-
-(define_insn "extendhisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
-	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
-  ""
-  { return msp430x_extendhisi (operands); }
-)
-
-(define_insn "extendhipsi2"
-  [(set (match_operand:PSI 0 "nonimmediate_operand" "=r")
-	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0")) 0))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #4, %0"
-)
-
-;; Look for cases where integer/pointer conversions are suboptimal due
-;; to missing patterns, despite us not having opcodes for these
-;; patterns.  Doing these manually allows for alternate optimization
-;; paths.
-
-(define_insn "zero_extendqisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
-	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
-  ""
-  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
-)
-
 (define_insn "zero_extendhisi2"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
 	(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r")))]
@@ -630,22 +592,6 @@
    MOV.W\t%1,%0"
 )
 
-(define_insn "extend_and_shift1_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
-		   (const_int 1)))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #3, %0"
-)
-
-(define_insn "extend_and_shift2_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
-		   (const_int 2)))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #2, %0"
-)
-
 ; Nasty - we are sign-extending a 20-bit PSI value in one register into
 ; two adjacent 16-bit registers to make an SI value.  There is no MSP430X
 ; instruction that will do this, so we push the 20-bit value onto the stack
@@ -680,6 +626,59 @@
   "
 )
 
+;; Eliminate extraneous zero-extends mysteriously created by gcc.
+(define_peephole2
+  [(set (match_operand:HI 0 "register_operand")
+	(zero_extend:HI (match_operand:QI 1 "general_operand")))
+   (set (match_operand:HI 2 "register_operand")
+	(zero_extend:HI (match_operand:QI 3 "register_operand")))]
+  "REGNO (operands[0]) == REGNO (operands[2]) && REGNO (operands[2]) == REGNO (operands[3])"
+  [(set (match_dup 0)
+	(zero_extend:HI (match_dup 1)))]
+)
+
+(define_insn "truncpsihi2"
+  [(set (match_operand:HI		0 "msp430_nonimmediate_operand" "=rm")
+	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
+  ""
+  "MOVX\t%1, %0"
+)
+
+(define_insn "extendhisi2"
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
+	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
+  ""
+  { return msp430x_extendhisi (operands); }
+)
+
+(define_insn "extendhipsi2"
+  [(set (match_operand:PSI 0 "nonimmediate_operand" "=r")
+	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0")) 0))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #4, %0"
+)
+
+;; Look for cases where integer/pointer conversions are suboptimal due
+;; to missing patterns, despite us not having opcodes for these
+;; patterns.  Doing these manually allows for alternate optimization
+;; paths.
+
+(define_insn "extend_and_shift1_hipsi2"
+  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
+		   (const_int 1)))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #3, %0"
+)
+
+(define_insn "extend_and_shift2_hipsi2"
+  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
+		   (const_int 2)))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #2, %0"
+)
+
 ;; We also need to be able to sign-extend pointer types (eg ptrdiff_t).
 ;; Since (we assume) pushing a 20-bit value onto the stack zero-extends
 ;; it, we use a different method here.
-- 
cgit v1.1


From cac52161c501abb93ded17a8f41b4a6310dbdab0 Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozefl@gcc.gnu.org>
Date: Mon, 7 Oct 2019 21:22:04 +0000
Subject: Revert: 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430.md: Revert: Group zero_extend* insns together.

From-SVN: r276680
---
 gcc/ChangeLog               |   4 --
 gcc/config/msp430/msp430.md | 117 ++++++++++++++++++++++----------------------
 2 files changed, 59 insertions(+), 62 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 36debb6..af5ac09 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,3 @@
-2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
-
-	* config/msp430/msp430.md: Group zero_extend* insns together.
-
 2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (machopic_output_indirection): Don't put
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index 5bca727..ebd9c85 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -559,11 +559,15 @@
    AND%X0\t#0xff, %0"
 )
 
-(define_insn "zero_extendqisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
-	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
-  ""
-  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
+;; Eliminate extraneous zero-extends mysteriously created by gcc.
+(define_peephole2
+  [(set (match_operand:HI 0 "register_operand")
+	(zero_extend:HI (match_operand:QI 1 "general_operand")))
+   (set (match_operand:HI 2 "register_operand")
+	(zero_extend:HI (match_operand:QI 3 "register_operand")))]
+  "REGNO (operands[0]) == REGNO (operands[2]) && REGNO (operands[2]) == REGNO (operands[3])"
+  [(set (match_dup 0)
+	(zero_extend:HI (match_dup 1)))]
 )
 
 (define_insn "zero_extendhipsi2"
@@ -574,6 +578,40 @@
   MOVX\t%1, %0
   MOVX.A\t%1, %0"
 )
+
+(define_insn "truncpsihi2"
+  [(set (match_operand:HI		0 "msp430_nonimmediate_operand" "=rm")
+	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
+  ""
+  "MOVX\t%1, %0"
+)
+
+(define_insn "extendhisi2"
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
+	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
+  ""
+  { return msp430x_extendhisi (operands); }
+)
+
+(define_insn "extendhipsi2"
+  [(set (match_operand:PSI 0 "nonimmediate_operand" "=r")
+	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0")) 0))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #4, %0"
+)
+
+;; Look for cases where integer/pointer conversions are suboptimal due
+;; to missing patterns, despite us not having opcodes for these
+;; patterns.  Doing these manually allows for alternate optimization
+;; paths.
+
+(define_insn "zero_extendqisi2"
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
+	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
+  ""
+  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
+)
+
 (define_insn "zero_extendhisi2"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
 	(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r")))]
@@ -592,6 +630,22 @@
    MOV.W\t%1,%0"
 )
 
+(define_insn "extend_and_shift1_hipsi2"
+  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
+		   (const_int 1)))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #3, %0"
+)
+
+(define_insn "extend_and_shift2_hipsi2"
+  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
+		   (const_int 2)))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #2, %0"
+)
+
 ; Nasty - we are sign-extending a 20-bit PSI value in one register into
 ; two adjacent 16-bit registers to make an SI value.  There is no MSP430X
 ; instruction that will do this, so we push the 20-bit value onto the stack
@@ -626,59 +680,6 @@
   "
 )
 
-;; Eliminate extraneous zero-extends mysteriously created by gcc.
-(define_peephole2
-  [(set (match_operand:HI 0 "register_operand")
-	(zero_extend:HI (match_operand:QI 1 "general_operand")))
-   (set (match_operand:HI 2 "register_operand")
-	(zero_extend:HI (match_operand:QI 3 "register_operand")))]
-  "REGNO (operands[0]) == REGNO (operands[2]) && REGNO (operands[2]) == REGNO (operands[3])"
-  [(set (match_dup 0)
-	(zero_extend:HI (match_dup 1)))]
-)
-
-(define_insn "truncpsihi2"
-  [(set (match_operand:HI		0 "msp430_nonimmediate_operand" "=rm")
-	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
-  ""
-  "MOVX\t%1, %0"
-)
-
-(define_insn "extendhisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
-	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
-  ""
-  { return msp430x_extendhisi (operands); }
-)
-
-(define_insn "extendhipsi2"
-  [(set (match_operand:PSI 0 "nonimmediate_operand" "=r")
-	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0")) 0))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #4, %0"
-)
-
-;; Look for cases where integer/pointer conversions are suboptimal due
-;; to missing patterns, despite us not having opcodes for these
-;; patterns.  Doing these manually allows for alternate optimization
-;; paths.
-
-(define_insn "extend_and_shift1_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
-		   (const_int 1)))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #3, %0"
-)
-
-(define_insn "extend_and_shift2_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
-		   (const_int 2)))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #2, %0"
-)
-
 ;; We also need to be able to sign-extend pointer types (eg ptrdiff_t).
 ;; Since (we assume) pushing a 20-bit value onto the stack zero-extends
 ;; it, we use a different method here.
-- 
cgit v1.1


From b238b34ea47222ffca7addc5fe4e8c052ade88b3 Mon Sep 17 00:00:00 2001
From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
Date: Mon, 7 Oct 2019 23:44:49 +0000
Subject: re PR tree-optimization/91532 ([SVE] Redundant predicated store in
 gcc.target/aarch64/fmla_2.c)

2019-10-07  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
	    Richard Biener  <rguenther@suse.de>

	PR tree-optimization/91532
	* tree-if-conv.c: Include tree-ssa-dse.h.
	(ifcvt_local_dce): Change param from bb to loop,
	and call dse_classify_store.
	(tree_if_conversion): Pass loop instead of loop->header as arg
	to ifcvt_local_dce.
	* tree-ssa-dse.c: Include tree-ssa-dse.h.
	(delete_dead_or_redundant_assignment): Remove static qualifier from
	declaration, and add prototype in tree-ssa-dse.h.
	(dse_store_status): Move to tree-ssa-dse.h.
	(dse_classify_store): Remove static qualifier and add new tree param
	stop_at_vuse, and add prototype in tree-ssa-dse.h.
	* tree-ssa-dse.h: New header.

Co-Authored-By: Richard Biener <rguenther@suse.de>

From-SVN: r276681
---
 gcc/ChangeLog      | 17 +++++++++++++++++
 gcc/tree-if-conv.c | 24 ++++++++++++++++++++++--
 gcc/tree-ssa-dse.c | 22 ++++++++++------------
 gcc/tree-ssa-dse.h | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 14 deletions(-)
 create mode 100644 gcc/tree-ssa-dse.h

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af5ac09..51edea9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2019-10-07  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+	    Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91532
+	* tree-if-conv.c: Include tree-ssa-dse.h.
+	(ifcvt_local_dce): Change param from bb to loop,
+	and call dse_classify_store.
+	(tree_if_conversion): Pass loop instead of loop->header as arg
+	to ifcvt_local_dce.
+	* tree-ssa-dse.c: Include tree-ssa-dse.h.
+	(delete_dead_or_redundant_assignment): Remove static qualifier from
+	declaration, and add prototype in tree-ssa-dse.h.
+	(dse_store_status): Move to tree-ssa-dse.h.
+	(dse_classify_store): Remove static qualifier and add new tree param
+	stop_at_vuse, and add prototype in tree-ssa-dse.h.
+	* tree-ssa-dse.h: New header.
+
 2019-10-07  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (machopic_output_indirection): Don't put
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 822aae5..af49813 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -120,6 +120,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "tree-ssa-sccvn.h"
 #include "tree-cfgcleanup.h"
+#include "tree-ssa-dse.h"
 
 /* Only handle PHIs with no more arguments unless we are asked to by
    simd pragma.  */
@@ -2873,7 +2874,7 @@ ifcvt_split_critical_edges (class loop *loop, bool aggressive_if_conv)
    loop vectorization.  */
 
 static void
-ifcvt_local_dce (basic_block bb)
+ifcvt_local_dce (class loop *loop)
 {
   gimple *stmt;
   gimple *stmt1;
@@ -2890,6 +2891,10 @@ ifcvt_local_dce (basic_block bb)
     replace_uses_by (name_pair->first, name_pair->second);
   redundant_ssa_names.release ();
 
+  /* The loop has a single BB only.  */
+  basic_block bb = loop->header;
+  tree latch_vdef = NULL_TREE;
+
   worklist.create (64);
   /* Consider all phi as live statements.  */
   for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
@@ -2897,6 +2902,8 @@ ifcvt_local_dce (basic_block bb)
       phi = gsi_stmt (gsi);
       gimple_set_plf (phi, GF_PLF_2, true);
       worklist.safe_push (phi);
+      if (virtual_operand_p (gimple_phi_result (phi)))
+	latch_vdef = PHI_ARG_DEF_FROM_EDGE (phi, loop_latch_edge (loop));
     }
   /* Consider load/store statements, CALL and COND as live.  */
   for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
@@ -2960,6 +2967,19 @@ ifcvt_local_dce (basic_block bb)
   while (!gsi_end_p (gsi))
     {
       stmt = gsi_stmt (gsi);
+      if (gimple_store_p (stmt))
+	{
+	  tree lhs = gimple_get_lhs (stmt);
+	  ao_ref write;
+	  ao_ref_init (&write, lhs);
+
+          if (dse_classify_store (&write, stmt, false, NULL, NULL, latch_vdef)
+              == DSE_STORE_DEAD)
+            delete_dead_or_redundant_assignment (&gsi, "dead");
+	  gsi_next (&gsi);
+	  continue;
+	}
+
       if (gimple_plf (stmt, GF_PLF_2))
 	{
 	  gsi_next (&gsi);
@@ -3070,7 +3090,7 @@ tree_if_conversion (class loop *loop, vec<gimple *> *preds)
   todo |= do_rpo_vn (cfun, loop_preheader_edge (loop), exit_bbs);
 
   /* Delete dead predicate computations.  */
-  ifcvt_local_dce (loop->header);
+  ifcvt_local_dce (loop);
   BITMAP_FREE (exit_bbs);
 
   todo |= TODO_cleanup_cfg;
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index ba67884..d8f7089 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "params.h"
 #include "alias.h"
 #include "tree-ssa-loop.h"
+#include "tree-ssa-dse.h"
 
 /* This file implements dead store elimination.
 
@@ -76,21 +77,13 @@ along with GCC; see the file COPYING3.  If not see
    fact, they are the same transformation applied to different views of
    the CFG.  */
 
-static void delete_dead_or_redundant_assignment (gimple_stmt_iterator *, const char *);
+void delete_dead_or_redundant_assignment (gimple_stmt_iterator *, const char *);
 static void delete_dead_or_redundant_call (gimple_stmt_iterator *, const char *);
 
 /* Bitmap of blocks that have had EH statements cleaned.  We should
    remove their dead edges eventually.  */
 static bitmap need_eh_cleanup;
 
-/* Return value from dse_classify_store */
-enum dse_store_status
-{
-  DSE_STORE_LIVE,
-  DSE_STORE_MAYBE_PARTIAL_DEAD,
-  DSE_STORE_DEAD
-};
-
 /* STMT is a statement that may write into memory.  Analyze it and
    initialize WRITE to describe how STMT affects memory.
 
@@ -662,10 +655,10 @@ dse_optimize_redundant_stores (gimple *stmt)
    if only clobber statements influenced the classification result.
    Returns the classification.  */
 
-static dse_store_status
+dse_store_status
 dse_classify_store (ao_ref *ref, gimple *stmt,
 		    bool byte_tracking_enabled, sbitmap live_bytes,
-		    bool *by_clobber_p = NULL)
+		    bool *by_clobber_p, tree stop_at_vuse)
 {
   gimple *temp;
   int cnt = 0;
@@ -701,6 +694,11 @@ dse_classify_store (ao_ref *ref, gimple *stmt,
 	}
       else
 	defvar = gimple_vdef (temp);
+
+      /* If we're instructed to stop walking at region boundary, do so.  */
+      if (defvar == stop_at_vuse)
+	return DSE_STORE_LIVE;
+
       auto_vec<gimple *, 10> defs;
       gimple *phi_def = NULL;
       FOR_EACH_IMM_USE_STMT (use_stmt, ui, defvar)
@@ -901,7 +899,7 @@ delete_dead_or_redundant_call (gimple_stmt_iterator *gsi, const char *type)
 
 /* Delete a dead store at GSI, which is a gimple assignment. */
 
-static void
+void
 delete_dead_or_redundant_assignment (gimple_stmt_iterator *gsi, const char *type)
 {
   gimple *stmt = gsi_stmt (*gsi);
diff --git a/gcc/tree-ssa-dse.h b/gcc/tree-ssa-dse.h
new file mode 100644
index 0000000..a5eccbd
--- /dev/null
+++ b/gcc/tree-ssa-dse.h
@@ -0,0 +1,36 @@
+/* Support routines for dead store elimination. 
+   Copyright (C) 2019 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_TREE_SSA_DSE_H
+#define GCC_TREE_SSA_DSE_H
+
+/* Return value from dse_classify_store */
+enum dse_store_status
+{
+  DSE_STORE_LIVE,
+  DSE_STORE_MAYBE_PARTIAL_DEAD,
+  DSE_STORE_DEAD
+};
+
+dse_store_status dse_classify_store (ao_ref *, gimple *, bool, sbitmap,
+				     bool * = NULL, tree = NULL);
+
+void delete_dead_or_redundant_assignment (gimple_stmt_iterator *, const char *);
+
+#endif   /* GCC_TREE_SSA_DSE_H  */
-- 
cgit v1.1


From b11df8983de352246b68c1485121d4aa8f26a5bb Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Tue, 8 Oct 2019 00:16:15 +0000
Subject: Daily bump.

From-SVN: r276685
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 19cc974..c440771 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191007
+20191008
-- 
cgit v1.1


From fbb2a6dcf8abbd1a605544597442e3d67984a455 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 8 Oct 2019 01:37:45 +0100
Subject: Make C2X imply -fno-fp-int-builtin-inexact.

Since TS 18661-1 has been integrated into C2X, this patch makes C2X
imply -fno-fp-int-builtin-inexact.

Bootstrapped with no regressions on x86_64-pc-linux-gnu.

gcc:
	* doc/invoke.texi (-ffp-int-builtin-inexact): Document
	-fno-fp-int-builtin-inexact default for C2X.

gcc/c-family:
	* c-opts.c (c_common_post_options): Set
	-fno-fp-int-builtin-inexact for C2X.

gcc/testsuite:
	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: New test.

From-SVN: r276686
---
 gcc/ChangeLog                                             | 5 +++++
 gcc/c-family/ChangeLog                                    | 5 +++++
 gcc/c-family/c-opts.c                                     | 6 ++++++
 gcc/doc/invoke.texi                                       | 8 ++++----
 gcc/testsuite/ChangeLog                                   | 4 ++++
 gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c | 7 +++++++
 6 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 51edea9..23e0a25 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* doc/invoke.texi (-ffp-int-builtin-inexact): Document
+	-fno-fp-int-builtin-inexact default for C2X.
+
 2019-10-07  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 	    Richard Biener  <rguenther@suse.de>
 
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 7deaff0..93077ff 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-opts.c (c_common_post_options): Set
+	-fno-fp-int-builtin-inexact for C2X.
+
 2019-10-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/91369 - Implement P0784R7: constexpr new
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 949d96a..4ad24bd 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -826,6 +826,12 @@ c_common_post_options (const char **pfilename)
   else
     flag_permitted_flt_eval_methods = PERMITTED_FLT_EVAL_METHODS_C11;
 
+  /* C2X Annex F does not permit certain built-in functions to raise
+     "inexact".  */
+  if (flag_isoc2x
+      && !global_options_set.x_flag_fp_int_builtin_inexact)
+    flag_fp_int_builtin_inexact = 0;
+
   /* By default we use C99 inline semantics in GNU99 or C99 mode.  C99
      inline semantics are not supported in GNU89 or C89 mode.  */
   if (flag_gnu89_inline == -1)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 1077930..20e10c0 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -10809,12 +10809,12 @@ Do not allow the built-in functions @code{ceil}, @code{floor},
 double} variants, to generate code that raises the ``inexact''
 floating-point exception for noninteger arguments.  ISO C99 and C11
 allow these functions to raise the ``inexact'' exception, but ISO/IEC
-TS 18661-1:2014, the C bindings to IEEE 754-2008, does not allow these
-functions to do so.
+TS 18661-1:2014, the C bindings to IEEE 754-2008, as integrated into
+ISO C2X, does not allow these functions to do so.
 
 The default is @option{-ffp-int-builtin-inexact}, allowing the
-exception to be raised.  This option does nothing unless
-@option{-ftrapping-math} is in effect.
+exception to be raised, unless C2X or a later C standard is selected.
+This option does nothing unless @option{-ftrapping-math} is in effect.
 
 Even if @option{-fno-fp-int-builtin-inexact} is used, if the functions
 generate a call to a library function then the ``inexact'' exception
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b55e272..4555fc8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: New test.
+
 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* gcc.target/msp430/430x-insns.c: New test.
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
new file mode 100644
index 0000000..039cb53
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
@@ -0,0 +1,7 @@
+/* Test C2X enables -fno-fp-int-builtin-inexact.  */
+/* { dg-do run } */
+/* { dg-options "-std=c2x" } */
+/* { dg-add-options c99_runtime } */
+/* { dg-require-effective-target fenv_exceptions } */
+
+#include "builtin-fp-int-inexact.c"
-- 
cgit v1.1


From 813982933f392afe8779da466bf0c034fab66ac8 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Tue, 8 Oct 2019 08:24:40 +0000
Subject: [AArch64] Limit simd-abi-9.c function body test to LP64

On ILP32 targets, there's an extra UXTW instruction to extend
the incoming pointer before the load.  It doesn't seem worth
complicating the test for that, since all we're checking is
that an optimisation takes place, and that optimisation isn't
related to pointer size.

2019-10-08  Richard Sandiford  <richard.sandiford@arm.com>

gcc/testsuite/
	* gcc.target/aarch64/torture/simd-abi-9.c: Require LP64 for
	the function body test.

From-SVN: r276688
---
 gcc/testsuite/ChangeLog                               | 5 +++++
 gcc/testsuite/gcc.target/aarch64/torture/simd-abi-9.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4555fc8..a7c5bc7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/aarch64/torture/simd-abi-9.c: Require LP64 for
+	the function body test.
+
 2019-10-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: New test.
diff --git a/gcc/testsuite/gcc.target/aarch64/torture/simd-abi-9.c b/gcc/testsuite/gcc.target/aarch64/torture/simd-abi-9.c
index aaa0316..1119d00 100644
--- a/gcc/testsuite/gcc.target/aarch64/torture/simd-abi-9.c
+++ b/gcc/testsuite/gcc.target/aarch64/torture/simd-abi-9.c
@@ -6,7 +6,7 @@
 int callee (void);
 
 /*
-** caller:
+** caller:	{ target lp64 }
 **	ldr	(w[0-9]+), \[x0\]
 **	cbn?z	\1, [^\n]*
 **	...
-- 
cgit v1.1


From 5cfa327dc009e429da3711680ab10122763417a3 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <burnus@gcc.gnu.org>
Date: Tue, 8 Oct 2019 11:35:56 +0200
Subject: Remove '>>>' merge marker from changelog

From-SVN: r276689
---
 gcc/fortran/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 84ee818..6e98130 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -153,7 +153,6 @@
 	(lang_decl): Add new optional_arg field.
 	(GFC_DECL_OPTIONAL_ARGUMENT): New macro.
 
->>>>>>> .r276463
 2019-10-01  David Malcolm  <dmalcolm@redhat.com>
 
 	* error.c (gfc_diagnostic_starter): Clear the prefix before
-- 
cgit v1.1


From 8beaf167f7ca723101e87da432870b65ff521e99 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Tue, 8 Oct 2019 10:49:27 +0000
Subject: Fortran - Improve OpenMP/OpenACC diagnostic

	gcc/fortran/
	* match.h (gfc_match_omp_eos_error): Renamed from gfc_match_omp_eos.
	* openmp.c (gfc_match_omp_eos): Make static.
	(gfc_match_omp_eos_error): New.
	* parse.c (matchs, matchdo, matchds): Do as done for 'matcho' -
        if error occurred after OpenMP/OpenACC directive matched, do not
	try other directives.
	(decode_oacc_directive, decode_omp_directive): Call new function
	instead.

	testsuite/
	* gfortran.dg/goacc/continuation-free-form.f95: Update dg-error.

From-SVN: r276694
---
 gcc/fortran/ChangeLog                              |  11 +++
 gcc/fortran/match.h                                |   2 +-
 gcc/fortran/openmp.c                               |  13 ++-
 gcc/fortran/parse.c                                | 103 +++++++++++----------
 gcc/testsuite/ChangeLog                            |   4 +
 .../gfortran.dg/goacc/continuation-free-form.f95   |   4 +-
 6 files changed, 86 insertions(+), 51 deletions(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6e98130..309d4ef 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-08  Tobias Burnus  <tobias@codesourcery.com>
+
+	* match.h (gfc_match_omp_eos_error): Renamed from gfc_match_omp_eos.
+	* openmp.c (gfc_match_omp_eos): Make static.
+	(gfc_match_omp_eos_error): New.
+	* parse.c (matchs, matchdo, matchds): Do as done for 'matcho' -
+	if error occurred after OpenMP/OpenACC directive matched, do not
+	try other directives.
+	(decode_oacc_directive, decode_omp_directive): Call new function
+	instead.
+
 2019-10-05  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/47045
diff --git a/gcc/fortran/match.h b/gcc/fortran/match.h
index 1bd78b1..611d796 100644
--- a/gcc/fortran/match.h
+++ b/gcc/fortran/match.h
@@ -151,7 +151,7 @@ match gfc_match_oacc_exit_data (void);
 match gfc_match_oacc_routine (void);
 
 /* OpenMP directive matchers.  */
-match gfc_match_omp_eos (void);
+match gfc_match_omp_eos_error (void);
 match gfc_match_omp_atomic (void);
 match gfc_match_omp_barrier (void);
 match gfc_match_omp_cancel (void);
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 7df7384..cd28384 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -31,7 +31,7 @@ along with GCC; see the file COPYING3.  If not see
 /* Match an end of OpenMP directive.  End of OpenMP directive is optional
    whitespace, followed by '\n' or comment '!'.  */
 
-match
+static match
 gfc_match_omp_eos (void)
 {
   locus old_loc;
@@ -57,6 +57,17 @@ gfc_match_omp_eos (void)
   return MATCH_NO;
 }
 
+match
+gfc_match_omp_eos_error (void)
+{
+  if (gfc_match_omp_eos() == MATCH_YES)
+    return MATCH_YES;
+
+  gfc_error ("Unexpected junk at %C");
+  return MATCH_ERROR;
+}
+
+
 /* Free an omp_clauses structure.  */
 
 void
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 4d34345..03fc716 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -674,15 +674,15 @@ decode_oacc_directive (void)
       match ("declare", gfc_match_oacc_declare, ST_OACC_DECLARE);
       break;
     case 'e':
-      matcha ("end atomic", gfc_match_omp_eos, ST_OACC_END_ATOMIC);
-      matcha ("end data", gfc_match_omp_eos, ST_OACC_END_DATA);
-      matcha ("end host_data", gfc_match_omp_eos, ST_OACC_END_HOST_DATA);
-      matcha ("end kernels loop", gfc_match_omp_eos, ST_OACC_END_KERNELS_LOOP);
-      matcha ("end kernels", gfc_match_omp_eos, ST_OACC_END_KERNELS);
-      matcha ("end loop", gfc_match_omp_eos, ST_OACC_END_LOOP);
-      matcha ("end parallel loop", gfc_match_omp_eos,
+      matcha ("end atomic", gfc_match_omp_eos_error, ST_OACC_END_ATOMIC);
+      matcha ("end data", gfc_match_omp_eos_error, ST_OACC_END_DATA);
+      matcha ("end host_data", gfc_match_omp_eos_error, ST_OACC_END_HOST_DATA);
+      matcha ("end kernels loop", gfc_match_omp_eos_error, ST_OACC_END_KERNELS_LOOP);
+      matcha ("end kernels", gfc_match_omp_eos_error, ST_OACC_END_KERNELS);
+      matcha ("end loop", gfc_match_omp_eos_error, ST_OACC_END_LOOP);
+      matcha ("end parallel loop", gfc_match_omp_eos_error,
 	      ST_OACC_END_PARALLEL_LOOP);
-      matcha ("end parallel", gfc_match_omp_eos, ST_OACC_END_PARALLEL);
+      matcha ("end parallel", gfc_match_omp_eos_error, ST_OACC_END_PARALLEL);
       matcha ("enter data", gfc_match_oacc_enter_data, ST_OACC_ENTER_DATA);
       matcha ("exit data", gfc_match_oacc_exit_data, ST_OACC_EXIT_DATA);
       break;
@@ -738,14 +738,17 @@ decode_oacc_directive (void)
    and if spec_only, goto do_spec_only without actually matching.  */
 #define matchs(keyword, subr, st)				\
     do {							\
+      match m2;							\
       if (spec_only && gfc_match (keyword) == MATCH_YES)	\
 	goto do_spec_only;					\
-      if (match_word_omp_simd (keyword, subr, &old_locus,	\
-			       &simd_matched) == MATCH_YES)	\
+      if ((m2 = match_word_omp_simd (keyword, subr, &old_locus,	\
+			       &simd_matched)) == MATCH_YES)	\
 	{							\
 	  ret = st;						\
 	  goto finish;						\
 	}							\
+      else if (m2 == MATCH_ERROR)				\
+	goto error_handling;					\
       else							\
 	undo_new_statement ();				  	\
     } while (0)
@@ -776,12 +779,15 @@ decode_oacc_directive (void)
 /* Like match, but set a flag simd_matched if keyword matched.  */
 #define matchds(keyword, subr, st)				\
     do {							\
-      if (match_word_omp_simd (keyword, subr, &old_locus,	\
-			       &simd_matched) == MATCH_YES)	\
+      match m2;							\
+      if ((m2 = match_word_omp_simd (keyword, subr, &old_locus,	\
+			       &simd_matched)) == MATCH_YES)	\
 	{							\
 	  ret = st;						\
 	  goto finish;						\
 	}							\
+      else if (m2 == MATCH_ERROR)				\
+	goto error_handling;					\
       else							\
 	undo_new_statement ();				  	\
     } while (0)
@@ -789,14 +795,17 @@ decode_oacc_directive (void)
 /* Like match, but don't match anything if not -fopenmp.  */
 #define matchdo(keyword, subr, st)				\
     do {							\
+      match m2;							\
       if (!flag_openmp)						\
 	;							\
-      else if (match_word (keyword, subr, &old_locus)		\
+      else if ((m2 = match_word (keyword, subr, &old_locus))	\
 	       == MATCH_YES)					\
 	{							\
 	  ret = st;						\
 	  goto finish;						\
 	}							\
+      else if (m2 == MATCH_ERROR)				\
+	goto error_handling;					\
       else							\
 	undo_new_statement ();				  	\
     } while (0)
@@ -889,63 +898,63 @@ decode_omp_directive (void)
       matcho ("do", gfc_match_omp_do, ST_OMP_DO);
       break;
     case 'e':
-      matcho ("end atomic", gfc_match_omp_eos, ST_OMP_END_ATOMIC);
+      matcho ("end atomic", gfc_match_omp_eos_error, ST_OMP_END_ATOMIC);
       matcho ("end critical", gfc_match_omp_end_critical, ST_OMP_END_CRITICAL);
-      matchs ("end distribute parallel do simd", gfc_match_omp_eos,
+      matchs ("end distribute parallel do simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_DISTRIBUTE_PARALLEL_DO_SIMD);
-      matcho ("end distribute parallel do", gfc_match_omp_eos,
+      matcho ("end distribute parallel do", gfc_match_omp_eos_error,
 	      ST_OMP_END_DISTRIBUTE_PARALLEL_DO);
-      matchs ("end distribute simd", gfc_match_omp_eos,
+      matchs ("end distribute simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_DISTRIBUTE_SIMD);
-      matcho ("end distribute", gfc_match_omp_eos, ST_OMP_END_DISTRIBUTE);
+      matcho ("end distribute", gfc_match_omp_eos_error, ST_OMP_END_DISTRIBUTE);
       matchs ("end do simd", gfc_match_omp_end_nowait, ST_OMP_END_DO_SIMD);
       matcho ("end do", gfc_match_omp_end_nowait, ST_OMP_END_DO);
-      matchs ("end simd", gfc_match_omp_eos, ST_OMP_END_SIMD);
-      matcho ("end master", gfc_match_omp_eos, ST_OMP_END_MASTER);
-      matchs ("end ordered", gfc_match_omp_eos, ST_OMP_END_ORDERED);
-      matchs ("end parallel do simd", gfc_match_omp_eos,
+      matchs ("end simd", gfc_match_omp_eos_error, ST_OMP_END_SIMD);
+      matcho ("end master", gfc_match_omp_eos_error, ST_OMP_END_MASTER);
+      matchs ("end ordered", gfc_match_omp_eos_error, ST_OMP_END_ORDERED);
+      matchs ("end parallel do simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_PARALLEL_DO_SIMD);
-      matcho ("end parallel do", gfc_match_omp_eos, ST_OMP_END_PARALLEL_DO);
-      matcho ("end parallel sections", gfc_match_omp_eos,
+      matcho ("end parallel do", gfc_match_omp_eos_error, ST_OMP_END_PARALLEL_DO);
+      matcho ("end parallel sections", gfc_match_omp_eos_error,
 	      ST_OMP_END_PARALLEL_SECTIONS);
-      matcho ("end parallel workshare", gfc_match_omp_eos,
+      matcho ("end parallel workshare", gfc_match_omp_eos_error,
 	      ST_OMP_END_PARALLEL_WORKSHARE);
-      matcho ("end parallel", gfc_match_omp_eos, ST_OMP_END_PARALLEL);
+      matcho ("end parallel", gfc_match_omp_eos_error, ST_OMP_END_PARALLEL);
       matcho ("end sections", gfc_match_omp_end_nowait, ST_OMP_END_SECTIONS);
       matcho ("end single", gfc_match_omp_end_single, ST_OMP_END_SINGLE);
-      matcho ("end target data", gfc_match_omp_eos, ST_OMP_END_TARGET_DATA);
-      matchs ("end target parallel do simd", gfc_match_omp_eos,
+      matcho ("end target data", gfc_match_omp_eos_error, ST_OMP_END_TARGET_DATA);
+      matchs ("end target parallel do simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_PARALLEL_DO_SIMD);
-      matcho ("end target parallel do", gfc_match_omp_eos,
+      matcho ("end target parallel do", gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_PARALLEL_DO);
-      matcho ("end target parallel", gfc_match_omp_eos,
+      matcho ("end target parallel", gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_PARALLEL);
-      matchs ("end target simd", gfc_match_omp_eos, ST_OMP_END_TARGET_SIMD);
+      matchs ("end target simd", gfc_match_omp_eos_error, ST_OMP_END_TARGET_SIMD);
       matchs ("end target teams distribute parallel do simd",
-	      gfc_match_omp_eos,
+	      gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_TEAMS_DISTRIBUTE_PARALLEL_DO_SIMD);
-      matcho ("end target teams distribute parallel do", gfc_match_omp_eos,
+      matcho ("end target teams distribute parallel do", gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_TEAMS_DISTRIBUTE_PARALLEL_DO);
-      matchs ("end target teams distribute simd", gfc_match_omp_eos,
+      matchs ("end target teams distribute simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_TEAMS_DISTRIBUTE_SIMD);
-      matcho ("end target teams distribute", gfc_match_omp_eos,
+      matcho ("end target teams distribute", gfc_match_omp_eos_error,
 	      ST_OMP_END_TARGET_TEAMS_DISTRIBUTE);
-      matcho ("end target teams", gfc_match_omp_eos, ST_OMP_END_TARGET_TEAMS);
-      matcho ("end target", gfc_match_omp_eos, ST_OMP_END_TARGET);
-      matcho ("end taskgroup", gfc_match_omp_eos, ST_OMP_END_TASKGROUP);
-      matchs ("end taskloop simd", gfc_match_omp_eos,
+      matcho ("end target teams", gfc_match_omp_eos_error, ST_OMP_END_TARGET_TEAMS);
+      matcho ("end target", gfc_match_omp_eos_error, ST_OMP_END_TARGET);
+      matcho ("end taskgroup", gfc_match_omp_eos_error, ST_OMP_END_TASKGROUP);
+      matchs ("end taskloop simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_TASKLOOP_SIMD);
-      matcho ("end taskloop", gfc_match_omp_eos, ST_OMP_END_TASKLOOP);
-      matcho ("end task", gfc_match_omp_eos, ST_OMP_END_TASK);
-      matchs ("end teams distribute parallel do simd", gfc_match_omp_eos,
+      matcho ("end taskloop", gfc_match_omp_eos_error, ST_OMP_END_TASKLOOP);
+      matcho ("end task", gfc_match_omp_eos_error, ST_OMP_END_TASK);
+      matchs ("end teams distribute parallel do simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_TEAMS_DISTRIBUTE_PARALLEL_DO_SIMD);
-      matcho ("end teams distribute parallel do", gfc_match_omp_eos,
+      matcho ("end teams distribute parallel do", gfc_match_omp_eos_error,
 	      ST_OMP_END_TEAMS_DISTRIBUTE_PARALLEL_DO);
-      matchs ("end teams distribute simd", gfc_match_omp_eos,
+      matchs ("end teams distribute simd", gfc_match_omp_eos_error,
 	      ST_OMP_END_TEAMS_DISTRIBUTE_SIMD);
-      matcho ("end teams distribute", gfc_match_omp_eos,
+      matcho ("end teams distribute", gfc_match_omp_eos_error,
 	      ST_OMP_END_TEAMS_DISTRIBUTE);
-      matcho ("end teams", gfc_match_omp_eos, ST_OMP_END_TEAMS);
+      matcho ("end teams", gfc_match_omp_eos_error, ST_OMP_END_TEAMS);
       matcho ("end workshare", gfc_match_omp_end_nowait,
 	      ST_OMP_END_WORKSHARE);
       break;
@@ -979,7 +988,7 @@ decode_omp_directive (void)
       break;
     case 's':
       matcho ("sections", gfc_match_omp_sections, ST_OMP_SECTIONS);
-      matcho ("section", gfc_match_omp_eos, ST_OMP_SECTION);
+      matcho ("section", gfc_match_omp_eos_error, ST_OMP_SECTION);
       matcho ("single", gfc_match_omp_single, ST_OMP_SINGLE);
       break;
     case 't':
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a7c5bc7..f4819f2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-08  Tobias Burnus  <tobias@codesourcery.com>
+
+	* gfortran.dg/goacc/continuation-free-form.f95: Update dg-error.
+
 2019-10-08  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* gcc.target/aarch64/torture/simd-abi-9.c: Require LP64 for
diff --git a/gcc/testsuite/gfortran.dg/goacc/continuation-free-form.f95 b/gcc/testsuite/gfortran.dg/goacc/continuation-free-form.f95
index 1c9a3f3..b904f7b 100644
--- a/gcc/testsuite/gfortran.dg/goacc/continuation-free-form.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/continuation-free-form.f95
@@ -16,8 +16,8 @@ program test
     x = x + 0.3
   enddo
   ! continuation must begin with sentinel
-  !$acc end parallel & ! { dg-error "Unclassifiable OpenACC directive" }
+  !$acc end parallel & ! { dg-error "Unexpected junk" }
   ! loop
 
   print *, x
-end
\ No newline at end of file
+end
-- 
cgit v1.1


From 65b67cf390bc0240a91730e8eb95d7a7b2d8aca0 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Tue, 8 Oct 2019 12:30:44 +0000
Subject: Fortran - fix OpenMP 'target simd'

	gcc/fortran/
	* parse.c (parse_executable): Add missing ST_OMP_TARGET_SIMD.

	libgomp/
	* testsuite/libgomp.fortran/target-simd.f90: New.

From-SVN: r276698
---
 gcc/fortran/ChangeLog | 4 ++++
 gcc/fortran/parse.c   | 1 +
 2 files changed, 5 insertions(+)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 309d4ef..b5bef54 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-08  Tobias Burnus  <tobias@codesourcery.com>
 
+	* parse.c (parse_executable): Add missing ST_OMP_TARGET_SIMD.
+
+2019-10-08  Tobias Burnus  <tobias@codesourcery.com>
+
 	* match.h (gfc_match_omp_eos_error): Renamed from gfc_match_omp_eos.
 	* openmp.c (gfc_match_omp_eos): Make static.
 	(gfc_match_omp_eos_error): New.
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 03fc716..15f6bf2 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -5534,6 +5534,7 @@ parse_executable (gfc_statement st)
 	case ST_OMP_SIMD:
 	case ST_OMP_TARGET_PARALLEL_DO:
 	case ST_OMP_TARGET_PARALLEL_DO_SIMD:
+	case ST_OMP_TARGET_SIMD:
 	case ST_OMP_TARGET_TEAMS_DISTRIBUTE:
 	case ST_OMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_DO:
 	case ST_OMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_DO_SIMD:
-- 
cgit v1.1


From 69f8c1aef5cdcc54d5cb2ca4f99f4f26c2f822a9 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 8 Oct 2019 13:39:03 +0000
Subject: tree-vectorizer.h (_stmt_vec_info::v_reduc_type): Remove.

2019-10-08  Richard Biener  <rguenther@suse.de>

	* tree-vectorizer.h (_stmt_vec_info::v_reduc_type): Remove.
	(_stmt_vec_info::is_reduc_info): Add.
	(STMT_VINFO_VEC_REDUCTION_TYPE): Remove.
	(vectorizable_condition): Remove.
	(vectorizable_shift): Likewise.
	(vectorizable_reduction): Adjust.
	(info_for_reduction): New.
	* tree-vect-loop.c (vect_force_simple_reduction): Fold into...
	(vect_analyze_scalar_cycles_1): ... here.
	(vect_analyze_loop_operations): Adjust.
	(needs_fold_left_reduction_p): Simplify for single caller.
	(vect_is_simple_reduction): Likewise.  Remove stmt restriction
	for nested cycles not part of double reductions.
	(vect_model_reduction_cost): Pass in the reduction type.
	(info_for_reduction): New function.
	(vect_create_epilog_for_reduction): Use it, access reduction
	meta off the stmt info it returns.  Use STMT_VINFO_REDUC_TYPE
	instead of STMT_VINFO_VEC_REDUCTION_TYPE.
	(vectorize_fold_left_reduction): Remove pointless assert.
	(vectorizable_reduction): Analyze the full reduction when
	visiting the outermost PHI.  Simplify.  Use STMT_VINFO_REDUC_TYPE
	instead of STMT_VINFO_VEC_REDUCTION_TYPE.  Direct reduction
	stmt code-generation to vectorizable_* in most cases.  Verify
	code-generation only for cases handled by
	vect_transform_reductuon.
	(vect_transform_reduction): Use info_for_reduction to get at
	reduction meta.  Simplify.
	(vect_transform_cycle_phi): Likewise.
	(vectorizable_live_operation): Likewise.
	* tree-vect-patterns.c (vect_reassociating_reduction_p): Look
	at the PHI node for STMT_VINFO_REDUC_TYPE.
	* tree-vect-slp.c (vect_schedule_slp_instance): Remove no
	longer necessary code.
	* tree-vect-stmts.c (vectorizable_shift): Make static again.
	(vectorizable_condition): Likewise.  Get at reduction related
	info via info_for_reduction.
	(vect_analyze_stmt): Adjust.
	(vect_transform_stmt): Likewise.
	* tree-vectorizer.c (vec_info::new_stmt_vec_info): Initialize
	STMT_VINFO_REDUC_TYPE instead of STMT_VINFO_VEC_REDUCTION_TYPE.

	* gcc.dg/vect/pr65947-1.c: Adjust.
	* gcc.dg/vect/pr65947-13.c: Likewise.
	* gcc.dg/vect/pr65947-14.c: Likewise.
	* gcc.dg/vect/pr65947-4.c: Likewise.
	* gcc.dg/vect/pr80631-1.c: Likewise.
	* gcc.dg/vect/pr80631-2.c: Likewise.

From-SVN: r276700
---
 gcc/ChangeLog                          |  43 +++
 gcc/testsuite/ChangeLog                |   9 +
 gcc/testsuite/gcc.dg/vect/pr65947-1.c  |   2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-13.c |   2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-14.c |   2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-4.c  |   2 +-
 gcc/testsuite/gcc.dg/vect/pr80631-1.c  |   2 +-
 gcc/testsuite/gcc.dg/vect/pr80631-2.c  |   2 +-
 gcc/tree-vect-loop.c                   | 591 ++++++++++++++-------------------
 gcc/tree-vect-patterns.c               |   8 +-
 gcc/tree-vect-slp.c                    |  11 -
 gcc/tree-vect-stmts.c                  | 113 +++----
 gcc/tree-vectorizer.c                  |   2 +-
 gcc/tree-vectorizer.h                  |  19 +-
 14 files changed, 379 insertions(+), 429 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23e0a25..984a05d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,46 @@
+2019-10-08  Richard Biener  <rguenther@suse.de>
+
+	* tree-vectorizer.h (_stmt_vec_info::v_reduc_type): Remove.
+	(_stmt_vec_info::is_reduc_info): Add.
+	(STMT_VINFO_VEC_REDUCTION_TYPE): Remove.
+	(vectorizable_condition): Remove.
+	(vectorizable_shift): Likewise.
+	(vectorizable_reduction): Adjust.
+	(info_for_reduction): New.
+	* tree-vect-loop.c (vect_force_simple_reduction): Fold into...
+	(vect_analyze_scalar_cycles_1): ... here.
+	(vect_analyze_loop_operations): Adjust.
+	(needs_fold_left_reduction_p): Simplify for single caller.
+	(vect_is_simple_reduction): Likewise.  Remove stmt restriction
+	for nested cycles not part of double reductions.
+	(vect_model_reduction_cost): Pass in the reduction type.
+	(info_for_reduction): New function.
+	(vect_create_epilog_for_reduction): Use it, access reduction
+	meta off the stmt info it returns.  Use STMT_VINFO_REDUC_TYPE
+	instead of STMT_VINFO_VEC_REDUCTION_TYPE.
+	(vectorize_fold_left_reduction): Remove pointless assert.
+	(vectorizable_reduction): Analyze the full reduction when
+	visiting the outermost PHI.  Simplify.  Use STMT_VINFO_REDUC_TYPE
+	instead of STMT_VINFO_VEC_REDUCTION_TYPE.  Direct reduction
+	stmt code-generation to vectorizable_* in most cases.  Verify
+	code-generation only for cases handled by
+	vect_transform_reductuon.
+	(vect_transform_reduction): Use info_for_reduction to get at
+	reduction meta.  Simplify.
+	(vect_transform_cycle_phi): Likewise.
+	(vectorizable_live_operation): Likewise.
+	* tree-vect-patterns.c (vect_reassociating_reduction_p): Look
+	at the PHI node for STMT_VINFO_REDUC_TYPE.
+	* tree-vect-slp.c (vect_schedule_slp_instance): Remove no
+	longer necessary code.
+	* tree-vect-stmts.c (vectorizable_shift): Make static again.
+	(vectorizable_condition): Likewise.  Get at reduction related
+	info via info_for_reduction.
+	(vect_analyze_stmt): Adjust.
+	(vect_transform_stmt): Likewise.
+	* tree-vectorizer.c (vec_info::new_stmt_vec_info): Initialize
+	STMT_VINFO_REDUC_TYPE instead of STMT_VINFO_VEC_REDUCTION_TYPE.
+
 2019-10-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* doc/invoke.texi (-ffp-int-builtin-inexact): Document
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f4819f2..fb2264f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-08  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/pr65947-1.c: Adjust.
+	* gcc.dg/vect/pr65947-13.c: Likewise.
+	* gcc.dg/vect/pr65947-14.c: Likewise.
+	* gcc.dg/vect/pr65947-4.c: Likewise.
+	* gcc.dg/vect/pr80631-1.c: Likewise.
+	* gcc.dg/vect/pr80631-2.c: Likewise.
+
 2019-10-08  Tobias Burnus  <tobias@codesourcery.com>
 
 	* gfortran.dg/goacc/continuation-free-form.f95: Update dg-error.
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-1.c b/gcc/testsuite/gcc.dg/vect/pr65947-1.c
index 879819d..b81baed 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-1.c
@@ -42,4 +42,4 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 4 "vect" { target { ! vect_fold_extract_last } } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-13.c b/gcc/testsuite/gcc.dg/vect/pr65947-13.c
index e1d3ff5..4ad5262 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-13.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-13.c
@@ -41,5 +41,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 4 "vect" { xfail vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { xfail vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-14.c b/gcc/testsuite/gcc.dg/vect/pr65947-14.c
index 9f1e4e1..d0194f2 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-14.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-14.c
@@ -42,4 +42,4 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 4 "vect" { target { ! vect_fold_extract_last } } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-4.c b/gcc/testsuite/gcc.dg/vect/pr65947-4.c
index 186e03a..4055710 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-4.c
@@ -42,5 +42,5 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 4 "vect" { target { ! vect_fold_extract_last } } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr80631-1.c b/gcc/testsuite/gcc.dg/vect/pr80631-1.c
index f240519..b531fe6 100644
--- a/gcc/testsuite/gcc.dg/vect/pr80631-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr80631-1.c
@@ -73,4 +73,4 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 5 "vect" { target vect_condition } } } */
 /* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 10 "vect" { target vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 10 "vect" { target { { ! vect_fold_extract_last } && vect_condition } } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 5 "vect" { target { { ! vect_fold_extract_last } && vect_condition } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr80631-2.c b/gcc/testsuite/gcc.dg/vect/pr80631-2.c
index b334ca2..07f1a72 100644
--- a/gcc/testsuite/gcc.dg/vect/pr80631-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr80631-2.c
@@ -72,5 +72,5 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 5 "vect" { target vect_condition } } } */
-/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 10 "vect" { target vect_condition xfail vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 5 "vect" { target vect_condition xfail vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 10 "vect" { target vect_fold_extract_last } } } */
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 3db4a5c..f63bb85 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -154,8 +154,8 @@ along with GCC; see the file COPYING3.  If not see
 */
 
 static void vect_estimate_min_profitable_iters (loop_vec_info, int *, int *);
-static stmt_vec_info vect_force_simple_reduction (loop_vec_info, stmt_vec_info,
-						  bool *, bool);
+static stmt_vec_info vect_is_simple_reduction (loop_vec_info, stmt_vec_info,
+					       bool *);
 
 /* Subroutine of vect_determine_vf_for_stmt that handles only one
    statement.  VECTYPE_MAYBE_SET_P is true if STMT_VINFO_VECTYPE
@@ -561,19 +561,19 @@ vect_analyze_scalar_cycles_1 (loop_vec_info loop_vinfo, class loop *loop)
 		  && STMT_VINFO_DEF_TYPE (stmt_vinfo) == vect_unknown_def_type);
 
       stmt_vec_info reduc_stmt_info
-	= vect_force_simple_reduction (loop_vinfo, stmt_vinfo,
-				       &double_reduc, false);
+	= vect_is_simple_reduction (loop_vinfo, stmt_vinfo, &double_reduc);
       if (reduc_stmt_info)
         {
-          if (double_reduc)
-            {
-              if (dump_enabled_p ())
-                dump_printf_loc (MSG_NOTE, vect_location,
+	  STMT_VINFO_REDUC_DEF (stmt_vinfo) = reduc_stmt_info;
+	  STMT_VINFO_REDUC_DEF (reduc_stmt_info) = stmt_vinfo;
+	  if (double_reduc)
+	    {
+	      if (dump_enabled_p ())
+		dump_printf_loc (MSG_NOTE, vect_location,
 				 "Detected double reduction.\n");
 
               STMT_VINFO_DEF_TYPE (stmt_vinfo) = vect_double_reduction_def;
-	      STMT_VINFO_DEF_TYPE (reduc_stmt_info)
-		= vect_double_reduction_def;
+	      STMT_VINFO_DEF_TYPE (reduc_stmt_info) = vect_double_reduction_def;
             }
           else
             {
@@ -1558,8 +1558,7 @@ vect_analyze_loop_operations (loop_vec_info loop_vinfo)
 			    == vect_double_reduction_def)
 			|| STMT_VINFO_DEF_TYPE (stmt_info) == vect_nested_cycle)
 		       && ! PURE_SLP_STMT (stmt_info))
-		ok = vectorizable_reduction (stmt_info, NULL, NULL, NULL, NULL,
-					     &cost_vec);
+		ok = vectorizable_reduction (stmt_info, NULL, NULL, &cost_vec);
             }
 
 	  /* SLP PHIs are tested by vect_slp_analyze_node_operations.  */
@@ -2554,8 +2553,7 @@ vect_valid_reduction_input_p (stmt_vec_info def_stmt_info)
    overflow must wrap.  */
 
 static bool
-needs_fold_left_reduction_p (tree type, tree_code code,
-			     bool need_wrapping_integral_overflow)
+needs_fold_left_reduction_p (tree type, tree_code code)
 {
   /* CHECKME: check for !flag_finite_math_only too?  */
   if (SCALAR_FLOAT_TYPE_P (type))
@@ -2573,10 +2571,6 @@ needs_fold_left_reduction_p (tree type, tree_code code,
     {
       if (!operation_no_trapping_overflow (type, code))
 	return true;
-      if (need_wrapping_integral_overflow
-	  && !TYPE_OVERFLOW_WRAPS (type)
-	  && operation_can_overflow (code))
-	return true;
       return false;
     }
 
@@ -2752,9 +2746,7 @@ check_reduction_path (dump_user_location_t loc, loop_p loop, gphi *phi,
 
 static stmt_vec_info
 vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
-			  bool *double_reduc,
-			  bool need_wrapping_integral_overflow,
-			  enum vect_reduction_type *v_reduc_type)
+			  bool *double_reduc)
 {
   gphi *phi = as_a <gphi *> (phi_info->stmt);
   class loop *loop = (gimple_bb (phi))->loop_father;
@@ -2770,7 +2762,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
   bool phi_def;
 
   *double_reduc = false;
-  *v_reduc_type = TREE_CODE_REDUCTION;
+  STMT_VINFO_REDUC_TYPE (phi_info) = TREE_CODE_REDUCTION;
 
   tree phi_name = PHI_RESULT (phi);
   /* ???  If there are no uses of the PHI result the inner loop reduction
@@ -2928,22 +2920,6 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 
   if (nested_in_vect_loop && !check_reduction)
     {
-      /* FIXME: Even for non-reductions code generation is funneled
-	 through vectorizable_reduction for the stmt defining the
-	 PHI latch value.  So we have to artificially restrict ourselves
-	 for the supported operations.  */
-      switch (get_gimple_rhs_class (code))
-	{
-	case GIMPLE_BINARY_RHS:
-	case GIMPLE_TERNARY_RHS:
-	  break;
-	default:
-	  /* Not supported by vectorizable_reduction.  */
-	  if (dump_enabled_p ())
-	    report_vect_op (MSG_MISSED_OPTIMIZATION, def_stmt,
-			    "nested cycle: not handled operation: ");
-	  return NULL;
-	}
       if (dump_enabled_p ())
 	report_vect_op (MSG_NOTE, def_stmt, "detected nested cycle: ");
       return def_stmt_info;
@@ -2959,7 +2935,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
   if (code == COND_EXPR)
     {
       if (! nested_in_vect_loop)
-	*v_reduc_type = COND_REDUCTION;
+	STMT_VINFO_REDUC_TYPE (phi_info) = COND_REDUCTION;
 
       op3 = gimple_assign_rhs1 (def_stmt);
       if (COMPARISON_CLASS_P (op3))
@@ -3043,10 +3019,9 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
      and therefore vectorizing reductions in the inner-loop during
      outer-loop vectorization is safe.  */
   if (check_reduction
-      && *v_reduc_type == TREE_CODE_REDUCTION
-      && needs_fold_left_reduction_p (type, code,
-				      need_wrapping_integral_overflow))
-    *v_reduc_type = FOLD_LEFT_REDUCTION;
+      && STMT_VINFO_REDUC_TYPE (phi_info) == TREE_CODE_REDUCTION
+      && needs_fold_left_reduction_p (type, code))
+    STMT_VINFO_REDUC_TYPE (phi_info) = FOLD_LEFT_REDUCTION;
 
   /* Reduction is safe. We're dealing with one of the following:
      1) integer arithmetic and no trapv
@@ -3142,30 +3117,6 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
   return NULL;
 }
 
-/* Wrapper around vect_is_simple_reduction, which will modify code
-   in-place if it enables detection of more reductions.  Arguments
-   as there.  */
-
-static stmt_vec_info
-vect_force_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
-			     bool *double_reduc,
-			     bool need_wrapping_integral_overflow)
-{
-  enum vect_reduction_type v_reduc_type;
-  stmt_vec_info def_info
-    = vect_is_simple_reduction (loop_info, phi_info, double_reduc,
-				need_wrapping_integral_overflow,
-				&v_reduc_type);
-  if (def_info)
-    {
-      STMT_VINFO_REDUC_TYPE (phi_info) = v_reduc_type;
-      STMT_VINFO_REDUC_DEF (phi_info) = def_info;
-      STMT_VINFO_REDUC_TYPE (def_info) = v_reduc_type;
-      STMT_VINFO_REDUC_DEF (def_info) = phi_info;
-    }
-  return def_info;
-}
-
 /* Calculate cost of peeling the loop PEEL_ITERS_PROLOGUE times.  */
 int
 vect_get_known_peeling_cost (loop_vec_info loop_vinfo, int peel_iters_prologue,
@@ -3754,6 +3705,7 @@ have_whole_vector_shift (machine_mode mode)
 
 static void
 vect_model_reduction_cost (stmt_vec_info stmt_info, internal_fn reduc_fn,
+			   vect_reduction_type reduction_type,
 			   int ncopies, stmt_vector_for_cost *cost_vec)
 {
   int prologue_cost = 0, epilogue_cost = 0, inside_cost;
@@ -3768,8 +3720,6 @@ vect_model_reduction_cost (stmt_vec_info stmt_info, internal_fn reduc_fn,
     loop = LOOP_VINFO_LOOP (loop_vinfo);
 
   /* Condition reductions generate two reductions in the loop.  */
-  vect_reduction_type reduction_type
-    = STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info);
   if (reduction_type == COND_REDUCTION)
     ncopies *= 2;
 
@@ -4208,6 +4158,32 @@ get_initial_defs_for_reduction (slp_tree slp_node,
     gsi_insert_seq_on_edge_immediate (pe, ctor_seq);
 }
 
+/* For a statement STMT_INFO taking part in a reduction operation return
+   the stmt_vec_info the meta information is stored on.  */
+
+stmt_vec_info
+info_for_reduction (stmt_vec_info stmt_info)
+{
+  stmt_info = vect_orig_stmt (stmt_info);
+  gcc_assert (STMT_VINFO_REDUC_DEF (stmt_info));
+  if (!is_a <gphi *> (stmt_info->stmt))
+    stmt_info = STMT_VINFO_REDUC_DEF (stmt_info);
+  gphi *phi = as_a <gphi *> (stmt_info->stmt);
+  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def)
+    {
+      if (gimple_phi_num_args (phi) == 1)
+	stmt_info = STMT_VINFO_REDUC_DEF (stmt_info);
+    }
+  else if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_nested_cycle)
+    {
+      edge pe = loop_preheader_edge (gimple_bb (phi)->loop_father);
+      stmt_vec_info info
+	  = stmt_info->vinfo->lookup_def (PHI_ARG_DEF_FROM_EDGE (phi, pe));
+      if (info && STMT_VINFO_DEF_TYPE (info) == vect_double_reduction_def)
+	stmt_info = info;
+    }
+  return stmt_info;
+}
 
 /* Function vect_create_epilog_for_reduction
 
@@ -4261,6 +4237,8 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
 				  slp_tree slp_node,
 				  slp_instance slp_node_instance)
 {
+  stmt_vec_info reduc_info = info_for_reduction (stmt_info);
+  gcc_assert (reduc_info->is_reduc_info);
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
   /* For double reductions we need to get at the inner loop reduction
      stmt which has the meta info attached.  Our stmt_info is that of the
@@ -4278,8 +4256,8 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
     }
   gphi *reduc_def_stmt
     = as_a <gphi *> (STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info))->stmt);
-  enum tree_code code = STMT_VINFO_REDUC_CODE (stmt_info);
-  internal_fn reduc_fn = STMT_VINFO_REDUC_FN (stmt_info);
+  enum tree_code code = STMT_VINFO_REDUC_CODE (reduc_info);
+  internal_fn reduc_fn = STMT_VINFO_REDUC_FN (reduc_info);
   tree neutral_op = NULL_TREE;
   if (slp_node)
     neutral_op
@@ -4345,15 +4323,14 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
 					   loop_preheader_edge (loop));
       /* Optimize: for induction condition reduction, if we can't use zero
          for induc_val, use initial_def.  */
-      if (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-	  == INTEGER_INDUC_COND_REDUCTION)
-	induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (stmt_info);
+      if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION)
+	induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info);
       else if (double_reduc)
 	;
       else if (nested_in_vect_loop)
 	;
       else
-	adjustment_def = STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (stmt_info);
+	adjustment_def = STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_info);
     }
 
   unsigned vec_num;
@@ -4383,7 +4360,7 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
      The first match will be a 1 to allow 0 to be used for non-matching
      indexes.  If there are no matches at all then the vector will be all
      zeroes.  */
-  if (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) == COND_REDUCTION)
+  if (STMT_VINFO_REDUC_TYPE (reduc_info) == COND_REDUCTION)
     {
       tree indx_before_incr, indx_after_incr;
       poly_uint64 nunits_out = TYPE_VECTOR_SUBPARTS (vectype);
@@ -4616,7 +4593,7 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
   else
     new_phi_result = PHI_RESULT (new_phis[0]);
 
-  if (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) == COND_REDUCTION
+  if (STMT_VINFO_REDUC_TYPE (reduc_info) == COND_REDUCTION
       && reduc_fn != IFN_LAST)
     {
       /* For condition reductions, we have a vector (NEW_PHI_RESULT) containing
@@ -4725,7 +4702,7 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
       gsi_insert_seq_before (&exit_gsi, stmts, GSI_SAME_STMT);
       scalar_results.safe_push (new_temp);
     }
-  else if (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) == COND_REDUCTION
+  else if (STMT_VINFO_REDUC_TYPE (reduc_info) == COND_REDUCTION
 	   && reduc_fn == IFN_LAST)
     {
       /* Condition reduction without supported IFN_REDUC_MAX.  Generate
@@ -4838,8 +4815,7 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
       gimple_set_lhs (epilog_stmt, new_temp);
       gsi_insert_before (&exit_gsi, epilog_stmt, GSI_SAME_STMT);
 
-      if ((STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-	   == INTEGER_INDUC_COND_REDUCTION)
+      if ((STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION)
 	  && induc_val)
 	{
 	  /* Earlier we set the initial value to be a vector if induc_val
@@ -5201,8 +5177,7 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
             scalar_results.safe_push (new_temp);
         }
 
-      if ((STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-	   == INTEGER_INDUC_COND_REDUCTION)
+      if ((STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION)
 	  && induc_val)
 	{
 	  /* Earlier we set the initial value to be a vector if induc_val
@@ -5486,8 +5461,6 @@ vectorize_fold_left_reduction (stmt_vec_info stmt_info,
   gcc_assert (!nested_in_vect_loop_p (loop, stmt_info));
   gcc_assert (ncopies == 1);
   gcc_assert (TREE_CODE_LENGTH (code) == binary_op);
-  gcc_assert (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-	      == FOLD_LEFT_REDUCTION);
 
   if (slp_node)
     gcc_assert (known_eq (TYPE_VECTOR_SUBPARTS (vectype_out),
@@ -5762,8 +5735,7 @@ build_vect_cond_expr (enum tree_code code, tree vop[3], tree mask,
    does *NOT* necessarily hold for reduction patterns.  */
 
 bool
-vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
-			stmt_vec_info *vec_stmt, slp_tree slp_node,
+vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 			slp_instance slp_node_instance,
 			stmt_vector_for_cost *cost_vec)
 {
@@ -5774,9 +5746,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
   enum tree_code code;
   internal_fn reduc_fn;
-  machine_mode vec_mode;
   int op_type;
-  optab optab;
   enum vect_def_type dt, cond_reduc_dt = vect_unknown_def_type;
   stmt_vec_info cond_stmt_vinfo = NULL;
   tree scalar_type;
@@ -5799,6 +5769,69 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       && STMT_VINFO_DEF_TYPE (stmt_info) != vect_nested_cycle)
     return false;
 
+  /* The stmt we store reduction analysis meta on.  */
+  stmt_vec_info reduc_info = info_for_reduction (stmt_info);
+  reduc_info->is_reduc_info = true;
+
+  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_nested_cycle)
+    {
+      if (is_a <gphi *> (stmt_info->stmt))
+	{
+	  /* Analysis for double-reduction is done on the outer
+	     loop PHI, nested cycles have no further restrictions.  */
+	  STMT_VINFO_TYPE (stmt_info) = cycle_phi_info_type;
+	  /* For nested cycles we want to let regular vectorizable_*
+	     routines handle code-generation.  */
+	  if (STMT_VINFO_DEF_TYPE (reduc_info) != vect_double_reduction_def)
+	    {
+	      stmt_info = STMT_VINFO_REDUC_DEF (stmt_info);
+	      STMT_VINFO_DEF_TYPE (stmt_info) = vect_internal_def;
+	      STMT_VINFO_DEF_TYPE (vect_stmt_to_vectorize (stmt_info))
+		= vect_internal_def;
+	    }
+	}
+      else
+	STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type;
+      return true;
+    }
+
+  stmt_vec_info orig_stmt_of_analysis = stmt_info;
+  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_reduction_def
+      || STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def)
+    {
+      if (!is_a <gphi *> (stmt_info->stmt))
+	{
+	  STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type;
+	  return true;
+	}
+      if (slp_node)
+	{
+	  slp_node_instance->reduc_phis = slp_node;
+	  /* ???  We're leaving slp_node to point to the PHIs, we only
+	     need it to get at the number of vector stmts which wasn't
+	     yet initialized for the instance root.  */
+	}
+      if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_reduction_def)
+	stmt_info = vect_stmt_to_vectorize (STMT_VINFO_REDUC_DEF (stmt_info));
+      else /* STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def */
+	{
+	  use_operand_p use_p;
+	  gimple *use_stmt;
+	  bool res = single_imm_use (gimple_phi_result (stmt_info->stmt),
+				     &use_p, &use_stmt);
+	  gcc_assert (res);
+	  stmt_info = loop_vinfo->lookup_stmt (use_stmt);
+	  stmt_info = vect_stmt_to_vectorize (STMT_VINFO_REDUC_DEF (stmt_info));
+	}
+      /* STMT_VINFO_REDUC_DEF doesn't point to the first but the last
+         element.  */
+      if (slp_node && REDUC_GROUP_FIRST_ELEMENT (stmt_info))
+	{
+	  gcc_assert (!REDUC_GROUP_NEXT_ELEMENT (stmt_info));
+	  stmt_info = REDUC_GROUP_FIRST_ELEMENT (stmt_info);
+	}
+    }
+
   if (nested_in_vect_loop_p (loop, stmt_info))
     {
       loop = loop->inner;
@@ -5809,18 +5842,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
     gcc_assert (slp_node
 		&& REDUC_GROUP_FIRST_ELEMENT (stmt_info) == stmt_info);
 
-  if (is_a <gphi *> (stmt_info->stmt))
-    {
-      /* Analysis is fully done on the reduction stmt invocation.  */
-      gcc_assert (! vec_stmt);
-
-      if (slp_node)
-	slp_node_instance->reduc_phis = slp_node;
-
-      STMT_VINFO_TYPE (stmt_info) = cycle_phi_info_type;
-      return true;
-    }
-
   /* 1. Is vectorizable reduction?  */
   /* Not supportable if the reduction variable is used in the loop, unless
      it's a reduction chain.  */
@@ -5898,13 +5919,10 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
      The last use is the reduction variable.  In case of nested cycle this
      assumption is not true: we use reduc_index to record the index of the
      reduction variable.  */
-  stmt_vec_info reduc_def_info;
-  if (orig_stmt_info)
-    reduc_def_info = STMT_VINFO_REDUC_DEF (orig_stmt_info);
-  else
-    reduc_def_info = STMT_VINFO_REDUC_DEF (stmt_info);
-  gcc_assert (reduc_def_info);
-  gphi *reduc_def_phi = as_a <gphi *> (reduc_def_info->stmt);
+  stmt_vec_info phi_info = STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info));
+  /* PHIs should not participate in patterns.  */
+  gcc_assert (!STMT_VINFO_RELATED_STMT (phi_info));
+  gphi *reduc_def_phi = as_a <gphi *> (phi_info->stmt);
   tree reduc_def = PHI_RESULT (reduc_def_phi);
   int reduc_index = -1;
   for (i = 0; i < op_type; i++)
@@ -5973,7 +5991,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
      directy used in stmt.  */
   if (reduc_index == -1)
     {
-      if (STMT_VINFO_REDUC_TYPE (stmt_info) == FOLD_LEFT_REDUCTION)
+      if (STMT_VINFO_REDUC_TYPE (phi_info) == FOLD_LEFT_REDUCTION)
 	{
 	  if (dump_enabled_p ())
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
@@ -5998,17 +6016,10 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       return false;
     }
 
-  /* PHIs should not participate in patterns.  */
-  gcc_assert (!STMT_VINFO_RELATED_STMT (reduc_def_info));
-  enum vect_reduction_type v_reduc_type
-    = STMT_VINFO_REDUC_TYPE (reduc_def_info);
-  stmt_vec_info tmp = STMT_VINFO_REDUC_DEF (reduc_def_info);
-
-  if (!vec_stmt)
-    STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) = v_reduc_type;
+  enum vect_reduction_type v_reduc_type = STMT_VINFO_REDUC_TYPE (phi_info);
+  STMT_VINFO_REDUC_TYPE (reduc_info) = v_reduc_type;
   /* If we have a condition reduction, see if we can simplify it further.  */
-  if (v_reduc_type == COND_REDUCTION
-      && !vec_stmt)
+  if (v_reduc_type == COND_REDUCTION)
     {
       /* TODO: We can't yet handle reduction chains, since we need to treat
 	 each COND_EXPR in the chain specially, not just the last one.
@@ -6037,7 +6048,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			     "optimizing condition reduction with"
 			     " FOLD_EXTRACT_LAST.\n");
-	  STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) = EXTRACT_LAST_REDUCTION;
+	  STMT_VINFO_REDUC_TYPE (reduc_info) = EXTRACT_LAST_REDUCTION;
 	}
       else if (cond_reduc_dt == vect_induction_def)
 	{
@@ -6077,12 +6088,14 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	    }
 	  if (cond_reduc_val)
 	    {
-	      STMT_VINFO_VEC_COND_REDUC_CODE (stmt_info)
-		= cond_reduc_op_code;
-	      STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (stmt_info)
+	      if (dump_enabled_p ())
+		dump_printf_loc (MSG_NOTE, vect_location,
+				 "condition expression based on "
+				 "integer induction.\n");
+	      STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info) = cond_reduc_op_code;
+	      STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info)
 		= cond_reduc_val;
-	      STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-		= INTEGER_INDUC_COND_REDUCTION;
+	      STMT_VINFO_REDUC_TYPE (reduc_info) = INTEGER_INDUC_COND_REDUCTION;
 	    }
 	}
       else if (cond_reduc_dt == vect_constant_def)
@@ -6107,30 +6120,21 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 				     "condition expression based on "
 				     "compile time constant.\n");
 		  /* Record reduction code at analysis stage.  */
-		  STMT_VINFO_VEC_COND_REDUC_CODE (stmt_info)
+		  STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info)
 		    = integer_onep (e) ? MAX_EXPR : MIN_EXPR;
-		  STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-		    = CONST_COND_REDUCTION;
+		  STMT_VINFO_REDUC_TYPE (reduc_info) = CONST_COND_REDUCTION;
 		}
 	    }
 	}
     }
-  if (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) == INTEGER_INDUC_COND_REDUCTION
-      && dump_enabled_p ())
-    dump_printf_loc (MSG_NOTE, vect_location,
-		     "condition expression based on "
-		     "integer induction.\n");
 
-  if (orig_stmt_info)
-    gcc_assert (tmp == orig_stmt_info
-		|| REDUC_GROUP_FIRST_ELEMENT (tmp) == orig_stmt_info);
-  else
+  if (REDUC_GROUP_FIRST_ELEMENT (stmt_info))
     /* We changed STMT to be the first stmt in reduction chain, hence we
        check that in this case the first element in the chain is STMT.  */
-    gcc_assert (tmp == stmt_info
-		|| REDUC_GROUP_FIRST_ELEMENT (tmp) == stmt_info);
+    gcc_assert (REDUC_GROUP_FIRST_ELEMENT (STMT_VINFO_REDUC_DEF (phi_info))
+		== vect_orig_stmt (stmt_info));
 
-  if (STMT_VINFO_LIVE_P (reduc_def_info))
+  if (STMT_VINFO_LIVE_P (phi_info))
     return false;
 
   if (slp_node)
@@ -6140,25 +6144,16 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 
   gcc_assert (ncopies >= 1);
 
-  vec_mode = TYPE_MODE (vectype_in);
   poly_uint64 nunits_out = TYPE_VECTOR_SUBPARTS (vectype_out);
 
   if (nested_cycle)
     {
-      basic_block def_bb = gimple_bb (reduc_def_phi);
-      class loop *def_stmt_loop = def_bb->loop_father;
-      tree def_arg = PHI_ARG_DEF_FROM_EDGE (reduc_def_phi,
-					    loop_preheader_edge (def_stmt_loop));
-      stmt_vec_info def_arg_stmt_info = loop_vinfo->lookup_def (def_arg);
-      if (def_arg_stmt_info
-	  && (STMT_VINFO_DEF_TYPE (def_arg_stmt_info)
-	      == vect_double_reduction_def))
-        double_reduc = true;
-      gcc_assert (!double_reduc || STMT_VINFO_RELEVANT (stmt_info) == vect_used_in_outer_by_reduction);
+      gcc_assert (STMT_VINFO_DEF_TYPE (reduc_info)
+		  == vect_double_reduction_def);
+      double_reduc = true;
     }
 
-  vect_reduction_type reduction_type
-    = STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info);
+  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
   if ((double_reduc || reduction_type != TREE_CODE_REDUCTION)
       && ncopies > 1)
     {
@@ -6169,78 +6164,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       return false;
     }
 
-  if (code == COND_EXPR)
-    {
-      /* Only call during the analysis stage, otherwise we'll lose
-	 STMT_VINFO_TYPE.  */
-      gcc_assert (nested_cycle || reduc_index > 0);
-      if (!vec_stmt && !vectorizable_condition (stmt_info, gsi, NULL,
-						true, reduc_index,
-						NULL, cost_vec))
-        {
-          if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "unsupported condition in reduction\n");
-	  return false;
-        }
-    }
-  else if (code == LSHIFT_EXPR || code == RSHIFT_EXPR
-	   || code == LROTATE_EXPR || code == RROTATE_EXPR)
-    {
-      /* Only call during the analysis stage, otherwise we'll lose
-	 STMT_VINFO_TYPE.  We only support this for nested cycles
-	 without double reductions at the moment.  */
-      if (!nested_cycle
-	  || double_reduc
-	  || (!vec_stmt && !vectorizable_shift (stmt_info, gsi, NULL,
-						NULL, cost_vec)))
-	{
-          if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "unsupported shift or rotation in reduction\n");
-	  return false;
-	}
-    }
-  else
-    {
-      /* 4. Supportable by target?  */
-
-      /* 4.1. check support for the operation in the loop  */
-      optab = optab_for_tree_code (code, vectype_in, optab_default);
-      if (!optab)
-        {
-          if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "no optab.\n");
-
-          return false;
-        }
-
-      if (optab_handler (optab, vec_mode) == CODE_FOR_nothing)
-        {
-          if (dump_enabled_p ())
-            dump_printf (MSG_NOTE, "op not supported by target.\n");
-
-	  if (maybe_ne (GET_MODE_SIZE (vec_mode), UNITS_PER_WORD)
-	      || !vect_worthwhile_without_simd_p (loop_vinfo, code))
-            return false;
-
-          if (dump_enabled_p ())
-  	    dump_printf (MSG_NOTE, "proceeding using word mode.\n");
-        }
-
-      /* Worthwhile without SIMD support?  */
-      if (!VECTOR_MODE_P (TYPE_MODE (vectype_in))
-	  && !vect_worthwhile_without_simd_p (loop_vinfo, code))
-        {
-          if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "not worthwhile without SIMD support.\n");
-
-          return false;
-        }
-    }
-
   /* 4.2. Check support for the epilog operation.
 
           If STMT represents a reduction pattern, then the type of the
@@ -6285,7 +6208,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
          reduction variable, and get the tree-code from orig_stmt.  */
       orig_code = gimple_assign_rhs_code (orig_stmt_info->stmt);
       gcc_assert (vectype_out);
-      vec_mode = TYPE_MODE (vectype_out);
     }
   else
     {
@@ -6301,11 +6223,11 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       if (reduction_type == CONST_COND_REDUCTION
 	  || reduction_type == INTEGER_INDUC_COND_REDUCTION)
 	{
-	  orig_code = STMT_VINFO_VEC_COND_REDUC_CODE (stmt_info);
+	  orig_code = STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info);
 	  gcc_assert (orig_code == MAX_EXPR || orig_code == MIN_EXPR);
 	}
     }
-  STMT_VINFO_REDUC_CODE (stmt_info) = orig_code;
+  STMT_VINFO_REDUC_CODE (reduc_info) = orig_code;
 
   reduc_fn = IFN_LAST;
 
@@ -6353,7 +6275,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 					  OPTIMIZE_FOR_SPEED))
 	reduc_fn = IFN_REDUC_MAX;
     }
-  STMT_VINFO_REDUC_FN (stmt_info) = reduc_fn;
+  STMT_VINFO_REDUC_FN (reduc_info) = reduc_fn;
 
   if (reduction_type != EXTRACT_LAST_REDUCTION
       && (!nested_cycle || double_reduc)
@@ -6436,7 +6358,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	 which each SLP statement has its own initial value and in which
 	 that value needs to be repeated for every instance of the
 	 statement within the initial vector.  */
-      unsigned int group_size = SLP_TREE_SCALAR_STMTS (slp_node).length ();
+      unsigned int group_size = SLP_INSTANCE_GROUP_SIZE (slp_node_instance);
       scalar_mode elt_mode = SCALAR_TYPE_MODE (TREE_TYPE (vectype_out));
       if (!neutral_op
 	  && !can_duplicate_and_interleave_p (group_size, elt_mode))
@@ -6467,22 +6389,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
      constant fits the type in the pattern recognition pass.  */
   if (code == DOT_PROD_EXPR
       && !types_compatible_p (TREE_TYPE (ops[0]), TREE_TYPE (ops[1])))
-    {
-      gcc_unreachable ();
-      /* No testcase for this.  PR49478.  */
-      if (TREE_CODE (ops[0]) == INTEGER_CST)
-        ops[0] = fold_convert (TREE_TYPE (ops[1]), ops[0]);
-      else if (TREE_CODE (ops[1]) == INTEGER_CST)
-        ops[1] = fold_convert (TREE_TYPE (ops[0]), ops[1]);
-      else
-        {
-          if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "invalid types in dot-prod\n");
-
-          return false;
-        }
-    }
+    /* No testcase for this.  PR49478.  */
+    gcc_unreachable ();
 
   if (reduction_type == COND_REDUCTION)
     {
@@ -6551,6 +6459,52 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       && vect_stmt_to_vectorize (use_stmt_info) == stmt_info)
     single_defuse_cycle = true;
 
+  if (single_defuse_cycle
+      || code == DOT_PROD_EXPR
+      || code == WIDEN_SUM_EXPR
+      || code == SAD_EXPR)
+    {
+      gcc_assert (code != COND_EXPR);
+
+      /* 4. Supportable by target?  */
+
+      /* 4.1. check support for the operation in the loop  */
+      optab optab = optab_for_tree_code (code, vectype_in, optab_default);
+      if (!optab)
+        {
+          if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "no optab.\n");
+
+          return false;
+        }
+
+      machine_mode vec_mode = TYPE_MODE (vectype_in);
+      if (optab_handler (optab, vec_mode) == CODE_FOR_nothing)
+        {
+          if (dump_enabled_p ())
+            dump_printf (MSG_NOTE, "op not supported by target.\n");
+
+	  if (maybe_ne (GET_MODE_SIZE (vec_mode), UNITS_PER_WORD)
+	      || !vect_worthwhile_without_simd_p (loop_vinfo, code))
+            return false;
+
+          if (dump_enabled_p ())
+	    dump_printf (MSG_NOTE, "proceeding using word mode.\n");
+        }
+
+      /* Worthwhile without SIMD support?  */
+      if (!VECTOR_MODE_P (TYPE_MODE (vectype_in))
+	  && !vect_worthwhile_without_simd_p (loop_vinfo, code))
+        {
+          if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "not worthwhile without SIMD support.\n");
+
+          return false;
+        }
+    }
+
   /* If the reduction stmt is one of the patterns that have lane
      reduction embedded we cannot handle the case of ! single_defuse_cycle.  */
   if ((ncopies > 1
@@ -6575,10 +6529,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
   bool mask_by_cond_expr = use_mask_by_cond_expr_p (code, cond_fn, vectype_in);
 
-  /* transformation not required.  */
-  gcc_assert (!vec_stmt);
-
-  vect_model_reduction_cost (stmt_info, reduc_fn, ncopies, cost_vec);
+  vect_model_reduction_cost (stmt_info, reduc_fn, reduction_type, ncopies,
+			     cost_vec);
   if (loop_vinfo && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo))
     {
       if (reduction_type != FOLD_LEFT_REDUCTION
@@ -6609,7 +6561,18 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       && reduction_type == FOLD_LEFT_REDUCTION)
     dump_printf_loc (MSG_NOTE, vect_location,
 		     "using an in-order (fold-left) reduction.\n");
-  STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type;
+  STMT_VINFO_TYPE (orig_stmt_of_analysis) = cycle_phi_info_type;
+  /* All but single defuse-cycle optimized, lane-reducing and fold-left
+     reductions go through their own vectorizable_* routines.  */
+  if (!single_defuse_cycle
+      && code != DOT_PROD_EXPR
+      && code != WIDEN_SUM_EXPR
+      && code != SAD_EXPR
+      && reduction_type != FOLD_LEFT_REDUCTION)
+    {
+      STMT_VINFO_DEF_TYPE (stmt_info) = vect_internal_def;
+      STMT_VINFO_DEF_TYPE (vect_orig_stmt (stmt_info)) = vect_internal_def;
+    }
   return true;
 }
 
@@ -6632,13 +6595,15 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   bool single_defuse_cycle = false;
   int j;
   tree ops[3];
-  bool nested_cycle = false;
   int vec_num;
 
+  stmt_vec_info reduc_info = info_for_reduction (stmt_info);
+  gcc_assert (reduc_info->is_reduc_info);
+
   if (nested_in_vect_loop_p (loop, stmt_info))
     {
       loop = loop->inner;
-      nested_cycle = true;
+      gcc_assert (STMT_VINFO_DEF_TYPE (reduc_info) == vect_double_reduction_def);
     }
 
   gassign *stmt = as_a <gassign *> (stmt_info->stmt);
@@ -6674,10 +6639,8 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
      The last use is the reduction variable.  In case of nested cycle this
      assumption is not true: we use reduc_index to record the index of the
      reduction variable.  */
-  stmt_vec_info reduc_def_info
-    = STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info));
-  gcc_assert (reduc_def_info);
-  gphi *reduc_def_phi = as_a <gphi *> (reduc_def_info->stmt);
+  stmt_vec_info phi_info = STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info));
+  gphi *reduc_def_phi = as_a <gphi *> (phi_info->stmt);
   tree reduc_def = PHI_RESULT (reduc_def_phi);
   int reduc_index = -1;
   for (i = 0; i < op_type; i++)
@@ -6718,19 +6681,12 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   if (!vectype_in)
     vectype_in = vectype_out;
 
-  if (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info) == INTEGER_INDUC_COND_REDUCTION
-      && dump_enabled_p ())
-    dump_printf_loc (MSG_NOTE, vect_location,
-		     "condition expression based on "
-		     "integer induction.\n");
-
   if (slp_node)
     ncopies = 1;
   else
     ncopies = vect_get_num_copies (loop_vinfo, vectype_in);
 
-  vect_reduction_type reduction_type
-    = STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info);
+  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
 
   /* In case of widenning multiplication by a constant, we update the type
      of the constant to be the type of the other operand.  We check that the
@@ -6814,18 +6770,16 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 
   if (reduction_type == FOLD_LEFT_REDUCTION)
     {
-      internal_fn reduc_fn = STMT_VINFO_REDUC_FN (stmt_info);
+      internal_fn reduc_fn = STMT_VINFO_REDUC_FN (reduc_info);
       return vectorize_fold_left_reduction
 	  (stmt_info, gsi, vec_stmt, slp_node, reduc_def_phi, code,
 	   reduc_fn, ops, vectype_in, reduc_index, masks);
     }
 
-  if (reduction_type == EXTRACT_LAST_REDUCTION)
-    {
-      gcc_assert (!slp_node && reduc_index > 0);
-      return vectorizable_condition (stmt_info, gsi, vec_stmt,
-				     true, reduc_index, NULL, NULL);
-    }
+  gcc_assert (single_defuse_cycle
+	      || code == DOT_PROD_EXPR
+	      || code == WIDEN_SUM_EXPR
+	      || code == SAD_EXPR);
 
   /* Create the destination vector  */
   tree scalar_dest = gimple_assign_lhs (stmt);
@@ -6842,20 +6796,6 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 
   for (j = 0; j < ncopies; j++)
     {
-      if (code == COND_EXPR)
-        {
-          gcc_assert (!slp_node && (nested_cycle || reduc_index > 0));
-	  vectorizable_condition (stmt_info, gsi, vec_stmt, true,
-				  reduc_index, NULL, NULL);
-          break;
-        }
-      if (code == LSHIFT_EXPR
-	  || code == RSHIFT_EXPR)
-	{
-	  vectorizable_shift (stmt_info, gsi, vec_stmt, slp_node, NULL);
-	  break;
-	}
-
       /* Handle uses.  */
       if (j == 0)
         {
@@ -7015,17 +6955,13 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
   gphi *phi = as_a <gphi *> (stmt_info->stmt);
   tree phi_result = gimple_phi_result (phi);
 
-  if (STMT_VINFO_REDUC_TYPE (stmt_info) == FOLD_LEFT_REDUCTION)
-    /* Leave the scalar phi in place.  Note that checking
-       STMT_VINFO_VEC_REDUCTION_TYPE (as below) only works
-       for reductions involving a single statement.  */
-    return true;
-
   stmt_vec_info reduc_stmt_info = STMT_VINFO_REDUC_DEF (stmt_info);
   reduc_stmt_info = vect_stmt_to_vectorize (reduc_stmt_info);
+  stmt_vec_info reduc_info = info_for_reduction (stmt_info);
+  gcc_assert (reduc_info->is_reduc_info);
 
-  if (STMT_VINFO_VEC_REDUCTION_TYPE (reduc_stmt_info)
-      == EXTRACT_LAST_REDUCTION)
+  if (STMT_VINFO_REDUC_TYPE (reduc_info) == EXTRACT_LAST_REDUCTION
+      || STMT_VINFO_REDUC_TYPE (reduc_info) == FOLD_LEFT_REDUCTION)
     /* Leave the scalar phi in place.  */
     return true;
 
@@ -7091,8 +7027,7 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
       stmt_vec_info first = REDUC_GROUP_FIRST_ELEMENT (reduc_stmt_info);
       tree neutral_op
 	= neutral_op_for_slp_reduction (slp_node,
-					STMT_VINFO_REDUC_CODE
-					  (first ? first : reduc_stmt_info),
+					STMT_VINFO_REDUC_CODE (reduc_info),
 					first != NULL);
       get_initial_defs_for_reduction (slp_node_instance->reduc_phis,
 				      &vec_initial_defs, vec_num,
@@ -7107,27 +7042,20 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
       /* Optimize: if initial_def is for REDUC_MAX smaller than the base
 	 and we can't use zero for induc_val, use initial_def.  Similarly
 	 for REDUC_MIN and initial_def larger than the base.  */
-      if (STMT_VINFO_VEC_REDUCTION_TYPE (reduc_stmt_info)
-	  == INTEGER_INDUC_COND_REDUCTION)
+      if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION)
 	{
-	  tree induc_val
-	    = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_stmt_info);
+	  tree induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info);
 	  if (TREE_CODE (initial_def) == INTEGER_CST
-	      && (STMT_VINFO_VEC_REDUCTION_TYPE (reduc_stmt_info)
-		  == INTEGER_INDUC_COND_REDUCTION)
 	      && !integer_zerop (induc_val)
-	      && (((STMT_VINFO_VEC_COND_REDUC_CODE (reduc_stmt_info)
-		    == MAX_EXPR)
+	      && (((STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info) == MAX_EXPR)
 		   && tree_int_cst_lt (initial_def, induc_val))
-		  || ((STMT_VINFO_VEC_COND_REDUC_CODE (reduc_stmt_info)
-		       == MIN_EXPR)
+		  || ((STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info) == MIN_EXPR)
 		      && tree_int_cst_lt (induc_val, initial_def))))
 	    {
 	      induc_val = initial_def;
 	      /* Communicate we used the initial_def to epilouge
 		 generation.  */
-	      STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_stmt_info)
-		= NULL_TREE;
+	      STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info) = NULL_TREE;
 	    }
 	  vec_initial_def = build_vector_from_val (vectype_out, induc_val);
 	}
@@ -7142,24 +7070,13 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
 	{
 	  tree adjustment_def = NULL_TREE;
 	  tree *adjustment_defp = &adjustment_def;
-	  enum tree_code code = STMT_VINFO_REDUC_CODE (reduc_stmt_info);
-	  /* ???  For the outer loop PHI we have to do a bit of searching
-	     to find the stmt with the code.  reduc_stmt_info here is the
-	     loop-closed PHI of the inner reduction which means we can look
-	     at its single-arg def.  */
+	  enum tree_code code = STMT_VINFO_REDUC_CODE (reduc_info);
 	  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def)
-	    {
-	      tree def = gimple_phi_arg_def
-			   (as_a <gphi *> (reduc_stmt_info->stmt), 0);
-	      code = STMT_VINFO_REDUC_CODE
-		       (vect_stmt_to_vectorize (loop_vinfo->lookup_def (def)));
-	      adjustment_defp = NULL;
-	    }
+	    adjustment_defp = NULL;
 	  vec_initial_def
 	    = get_initial_def_for_reduction (reduc_stmt_info, code,
 					     initial_def, adjustment_defp);
-	  STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_stmt_info)
-	    = adjustment_def;
+	  STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_info) = adjustment_def;
 	}
       vec_initial_defs.create (1);
       vec_initial_defs.quick_push (vec_initial_def);
@@ -7894,30 +7811,26 @@ vectorizable_live_operation (stmt_vec_info stmt_info,
   /* The last stmt of a reduction is live and vectorized via
      vect_create_epilog_for_reduction.  vectorizable_reduction assessed
      validity so just trigger the transform here.  */
-  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_reduction_def
-      || STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def)
+  if (STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info)))
     {
       if (!vec_stmt)
 	return true;
-      if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_reduction_def)
+      if (slp_node)
 	{
-	  if (STMT_VINFO_REDUC_TYPE (stmt_info) == FOLD_LEFT_REDUCTION
-	      || (STMT_VINFO_REDUC_TYPE (stmt_info) == COND_REDUCTION
-		  && (STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info)
-		      == EXTRACT_LAST_REDUCTION)))
+	  /* For reduction chains the meta-info is attached to
+	     the group leader.  */
+	  if (REDUC_GROUP_FIRST_ELEMENT (stmt_info))
+	    stmt_info = REDUC_GROUP_FIRST_ELEMENT (stmt_info);
+	  /* For SLP reductions we vectorize the epilogue for
+	     all involved stmts together.  */
+	  else if (slp_index != 0)
 	    return true;
-	  if (slp_node)
-	    {
-	      /* For reduction chains the meta-info is attached to
-	         the group leader.  */
-	      if (REDUC_GROUP_FIRST_ELEMENT (stmt_info))
-		stmt_info = REDUC_GROUP_FIRST_ELEMENT (stmt_info);
-	      /* For SLP reductions we vectorize the epilogue for
-	         all involved stmts together.  */
-	      else if (slp_index != 0)
-		return true;
-	    }
 	}
+      stmt_vec_info reduc_info = info_for_reduction (stmt_info);
+      gcc_assert (reduc_info->is_reduc_info);
+      if (STMT_VINFO_REDUC_TYPE (reduc_info) == FOLD_LEFT_REDUCTION
+	  || STMT_VINFO_REDUC_TYPE (reduc_info) == EXTRACT_LAST_REDUCTION)
+	return true;
       vect_create_epilog_for_reduction (stmt_info, slp_node,
 					slp_node_instance);
       return true;
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 09db74b..f9c7408 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -838,9 +838,11 @@ vect_convert_output (stmt_vec_info stmt_info, tree type, gimple *pattern_stmt,
 static bool
 vect_reassociating_reduction_p (stmt_vec_info stmt_vinfo)
 {
-  return (STMT_VINFO_DEF_TYPE (stmt_vinfo) == vect_reduction_def
-	  ? STMT_VINFO_REDUC_TYPE (stmt_vinfo) != FOLD_LEFT_REDUCTION
-	  : REDUC_GROUP_FIRST_ELEMENT (stmt_vinfo) != NULL);
+  if (STMT_VINFO_DEF_TYPE (stmt_vinfo) == vect_reduction_def)
+    return (STMT_VINFO_REDUC_TYPE (STMT_VINFO_REDUC_DEF (stmt_vinfo))
+	    != FOLD_LEFT_REDUCTION);
+  else
+    return REDUC_GROUP_FIRST_ELEMENT (stmt_vinfo) != NULL;
 }
 
 /* As above, but also require it to have code CODE and to be a reduction
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 9b86b67..77b18ba 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -3957,17 +3957,6 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance,
   stmt_vec_info last_stmt_info = vect_find_last_scalar_stmt_in_slp (node);
   si = gsi_for_stmt (last_stmt_info->stmt);
 
-  /* Mark the first element of the reduction chain as reduction to properly
-     transform the node.  In the analysis phase only the last element of the
-     chain is marked as reduction.  */
-  if (!STMT_VINFO_GROUPED_ACCESS (stmt_info)
-      && REDUC_GROUP_FIRST_ELEMENT (stmt_info)
-      && REDUC_GROUP_FIRST_ELEMENT (stmt_info) == stmt_info)
-    {
-      STMT_VINFO_DEF_TYPE (stmt_info) = vect_reduction_def;
-      STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type;
-    }
-
   /* Handle two-operation SLP nodes by vectorizing the group with
      both operations and then performing a merge.  */
   if (SLP_TREE_TWO_OPERATORS (node))
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index cac7410..9ebd3e3 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5501,7 +5501,7 @@ vect_supportable_shift (enum tree_code code, tree scalar_type)
    stmt to replace it, put it in VEC_STMT, and insert it at GSI.
    Return true if STMT_INFO is vectorizable in this way.  */
 
-bool
+static bool
 vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 		    stmt_vec_info *vec_stmt, slp_tree slp_node,
 		    stmt_vector_for_cost *cost_vec)
@@ -9776,10 +9776,9 @@ vect_is_simple_cond (tree cond, vec_info *vinfo,
 
    Return true if STMT_INFO is vectorizable in this way.  */
 
-bool
+static bool
 vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
-			stmt_vec_info *vec_stmt, bool for_reduction,
-			int reduc_index,
+			stmt_vec_info *vec_stmt,
 			slp_tree slp_node, stmt_vector_for_cost *cost_vec)
 {
   vec_info *vinfo = stmt_info->vinfo;
@@ -9812,17 +9811,36 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   if (!STMT_VINFO_RELEVANT_P (stmt_info) && !bb_vinfo)
     return false;
 
-  if (for_reduction && STMT_SLP_TYPE (stmt_info))
+  /* Is vectorizable conditional operation?  */
+  gassign *stmt = dyn_cast <gassign *> (stmt_info->stmt);
+  if (!stmt)
     return false;
 
-  vect_reduction_type reduction_type
-    = STMT_VINFO_VEC_REDUCTION_TYPE (stmt_info);
-  if (!for_reduction)
+  code = gimple_assign_rhs_code (stmt);
+  if (code != COND_EXPR)
+    return false;
+
+  stmt_vec_info reduc_info = NULL;
+  int reduc_index = -1;
+  vect_reduction_type reduction_type = TREE_CODE_REDUCTION;
+  bool for_reduction
+    = STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info)) != NULL;
+  if (for_reduction)
+    {
+      if (STMT_SLP_TYPE (stmt_info))
+	return false;
+      reduc_info = info_for_reduction (stmt_info);
+      reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
+      reduc_index = STMT_VINFO_REDUC_IDX (stmt_info);
+      gcc_assert (reduction_type != EXTRACT_LAST_REDUCTION
+		  || reduc_index != -1);
+    }
+  else
     {
       if (STMT_VINFO_DEF_TYPE (stmt_info) != vect_internal_def)
 	return false;
 
-      /* FORNOW: not yet supported.  */
+      /* FORNOW: only supported as part of a reduction.  */
       if (STMT_VINFO_LIVE_P (stmt_info))
 	{
 	  if (dump_enabled_p ())
@@ -9832,16 +9850,6 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	}
     }
 
-  /* Is vectorizable conditional operation?  */
-  gassign *stmt = dyn_cast <gassign *> (stmt_info->stmt);
-  if (!stmt)
-    return false;
-
-  code = gimple_assign_rhs_code (stmt);
-
-  if (code != COND_EXPR)
-    return false;
-
   tree vectype = STMT_VINFO_VECTYPE (stmt_info);
   tree vectype1 = NULL_TREE, vectype2 = NULL_TREE;
 
@@ -10665,12 +10673,10 @@ vect_analyze_stmt (stmt_vec_info stmt_info, bool *need_to_vectorize,
 	  || vectorizable_load (stmt_info, NULL, NULL, node, node_instance,
 				cost_vec)
 	  || vectorizable_store (stmt_info, NULL, NULL, node, cost_vec)
-	  || vectorizable_reduction (stmt_info, NULL, NULL, node,
-				     node_instance, cost_vec)
+	  || vectorizable_reduction (stmt_info, node, node_instance, cost_vec)
 	  || vectorizable_induction (stmt_info, NULL, NULL, node, cost_vec)
 	  || vectorizable_shift (stmt_info, NULL, NULL, node, cost_vec)
-	  || vectorizable_condition (stmt_info, NULL, NULL, false, -1, node,
-				     cost_vec)
+	  || vectorizable_condition (stmt_info, NULL, NULL, node, cost_vec)
 	  || vectorizable_comparison (stmt_info, NULL, NULL, node,
 				      cost_vec)
 	  || vectorizable_lc_phi (stmt_info, NULL, node));
@@ -10689,8 +10695,7 @@ vect_analyze_stmt (stmt_vec_info stmt_info, bool *need_to_vectorize,
 	      || vectorizable_load (stmt_info, NULL, NULL, node, node_instance,
 				    cost_vec)
 	      || vectorizable_store (stmt_info, NULL, NULL, node, cost_vec)
-	      || vectorizable_condition (stmt_info, NULL, NULL, false, -1, node,
-					 cost_vec)
+	      || vectorizable_condition (stmt_info, NULL, NULL, node, cost_vec)
 	      || vectorizable_comparison (stmt_info, NULL, NULL, node,
 					  cost_vec));
     }
@@ -10796,8 +10801,7 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       break;
 
     case condition_vec_info_type:
-      done = vectorizable_condition (stmt_info, gsi, &vec_stmt, false, -1,
-				     slp_node, NULL);
+      done = vectorizable_condition (stmt_info, gsi, &vec_stmt, slp_node, NULL);
       gcc_assert (done);
       break;
 
@@ -10895,20 +10899,22 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   /* If this stmt defines a value used on a backedge, update the
      vectorized PHIs.  */
   stmt_vec_info orig_stmt_info = vect_orig_stmt (stmt_info);
-  if (!slp_node && STMT_VINFO_REDUC_DEF (orig_stmt_info)
-      && STMT_VINFO_REDUC_TYPE (orig_stmt_info) != FOLD_LEFT_REDUCTION
-      && (STMT_VINFO_REDUC_TYPE (orig_stmt_info) != COND_REDUCTION
-	  || (STMT_VINFO_VEC_REDUCTION_TYPE (orig_stmt_info)
-	      != EXTRACT_LAST_REDUCTION))
-      && is_a <gphi *> (STMT_VINFO_REDUC_DEF (orig_stmt_info)->stmt))
-    {
-      gphi *phi = as_a <gphi *> (STMT_VINFO_REDUC_DEF (orig_stmt_info)->stmt);
-      if (dominated_by_p (CDI_DOMINATORS,
-			  gimple_bb (orig_stmt_info->stmt), gimple_bb (phi)))
+  stmt_vec_info reduc_info;
+  if (STMT_VINFO_REDUC_DEF (orig_stmt_info)
+      && (reduc_info = info_for_reduction (orig_stmt_info))
+      && STMT_VINFO_REDUC_TYPE (reduc_info) != FOLD_LEFT_REDUCTION
+      && STMT_VINFO_REDUC_TYPE (reduc_info) != EXTRACT_LAST_REDUCTION)
+    {
+      gphi *phi;
+      if (!slp_node
+	  && (phi = dyn_cast <gphi *>
+		      (STMT_VINFO_REDUC_DEF (orig_stmt_info)->stmt))
+	  && dominated_by_p (CDI_DOMINATORS,
+			     gimple_bb (orig_stmt_info->stmt), gimple_bb (phi)))
 	{
 	  edge e = loop_latch_edge (gimple_bb (phi)->loop_father);
 	  stmt_vec_info phi_info
-	      = STMT_VINFO_VEC_STMT (STMT_VINFO_REDUC_DEF (orig_stmt_info));
+	    = STMT_VINFO_VEC_STMT (STMT_VINFO_REDUC_DEF (orig_stmt_info));
 	  stmt_vec_info vec_stmt = STMT_VINFO_VEC_STMT (stmt_info);
 	  do
 	    {
@@ -10921,24 +10927,19 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	  while (phi_info);
 	  gcc_assert (!vec_stmt);
 	}
-    }
-  else if (slp_node && STMT_VINFO_REDUC_DEF (orig_stmt_info)
-	   /* Going back and forth via STMT_VINFO_REDUC_DEF gets us to the
-	      stmt with the reduction meta in case of reduction groups.  */
-	   && (STMT_VINFO_REDUC_TYPE
-	         (STMT_VINFO_REDUC_DEF (STMT_VINFO_REDUC_DEF (orig_stmt_info)))
-	       != FOLD_LEFT_REDUCTION)
-	   && slp_node != slp_node_instance->reduc_phis)
-    {
-      slp_tree phi_node = slp_node_instance->reduc_phis;
-      gphi *phi = as_a <gphi *> (SLP_TREE_SCALAR_STMTS (phi_node)[0]->stmt);
-      edge e = loop_latch_edge (gimple_bb (phi)->loop_father);
-      gcc_assert (SLP_TREE_VEC_STMTS (phi_node).length ()
-		  == SLP_TREE_VEC_STMTS (slp_node).length ());
-      for (unsigned i = 0; i < SLP_TREE_VEC_STMTS (phi_node).length (); ++i)
-	add_phi_arg (as_a <gphi *> (SLP_TREE_VEC_STMTS (phi_node)[i]->stmt),
-		     gimple_get_lhs (SLP_TREE_VEC_STMTS (slp_node)[i]->stmt),
-		     e, gimple_phi_arg_location (phi, e->dest_idx));
+      else if (slp_node
+	       && slp_node != slp_node_instance->reduc_phis)
+	{
+	  slp_tree phi_node = slp_node_instance->reduc_phis;
+	  gphi *phi = as_a <gphi *> (SLP_TREE_SCALAR_STMTS (phi_node)[0]->stmt);
+	  edge e = loop_latch_edge (gimple_bb (phi)->loop_father);
+	  gcc_assert (SLP_TREE_VEC_STMTS (phi_node).length ()
+		      == SLP_TREE_VEC_STMTS (slp_node).length ());
+	  for (unsigned i = 0; i < SLP_TREE_VEC_STMTS (phi_node).length (); ++i)
+	    add_phi_arg (as_a <gphi *> (SLP_TREE_VEC_STMTS (phi_node)[i]->stmt),
+			 gimple_get_lhs (SLP_TREE_VEC_STMTS (slp_node)[i]->stmt),
+			 e, gimple_phi_arg_location (phi, e->dest_idx));
+	}
     }
 
   /* Handle stmts whose DEF is used outside the loop-nest that is
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 800c99f..3e8637f 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -637,7 +637,7 @@ vec_info::new_stmt_vec_info (gimple *stmt)
   STMT_VINFO_TYPE (res) = undef_vec_info_type;
   STMT_VINFO_RELEVANT (res) = vect_unused_in_scope;
   STMT_VINFO_VECTORIZABLE (res) = true;
-  STMT_VINFO_VEC_REDUCTION_TYPE (res) = TREE_CODE_REDUCTION;
+  STMT_VINFO_REDUC_TYPE (res) = TREE_CODE_REDUCTION;
   STMT_VINFO_VEC_COND_REDUC_CODE (res) = ERROR_MARK;
   STMT_VINFO_REDUC_CODE (res) = ERROR_MARK;
   STMT_VINFO_REDUC_FN (res) = IFN_LAST;
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 837fb5a..71ea6ad 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -933,9 +933,6 @@ public:
      for loop vectorization.  */
   vect_memory_access_type memory_access_type;
 
-  /* For reduction loops, this is the type of reduction.  */
-  enum vect_reduction_type v_reduc_type;
-
   /* For CONST_COND_REDUCTION and INTEGER_INDUC_COND_REDUCTION, the
      reduction code.  */
   enum tree_code cond_reduc_code;
@@ -947,7 +944,7 @@ public:
   tree reduc_epilogue_adjustment;
 
   /* On a reduction PHI the reduction type as detected by
-     vect_force_simple_reduction.  */
+     vect_is_simple_reduction and vectorizable_reduction.  */
   enum vect_reduction_type reduc_type;
 
   /* The original reduction code, to be used in the epilogue.  */
@@ -964,6 +961,9 @@ public:
      corresponding PHI.  */
   stmt_vec_info reduc_def;
 
+  /* Whether on this stmt reduction meta is recorded.  */
+  bool is_reduc_info;
+
   /* The number of scalar stmt references from active SLP instances.  */
   unsigned int num_slp_uses;
 
@@ -1046,7 +1046,6 @@ STMT_VINFO_BB_VINFO (stmt_vec_info stmt_vinfo)
 #define STMT_VINFO_STRIDED_P(S)	   	   (S)->strided_p
 #define STMT_VINFO_MEMORY_ACCESS_TYPE(S)   (S)->memory_access_type
 #define STMT_VINFO_SIMD_LANE_ACCESS_P(S)   (S)->simd_lane_access_p
-#define STMT_VINFO_VEC_REDUCTION_TYPE(S)   (S)->v_reduc_type
 #define STMT_VINFO_VEC_COND_REDUC_CODE(S)  (S)->cond_reduc_code
 #define STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL(S) (S)->induc_cond_initial_val
 #define STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT(S) (S)->reduc_epilogue_adjustment
@@ -1556,12 +1555,6 @@ extern bool vect_transform_stmt (stmt_vec_info, gimple_stmt_iterator *,
 extern void vect_remove_stores (stmt_vec_info);
 extern opt_result vect_analyze_stmt (stmt_vec_info, bool *, slp_tree,
 				     slp_instance, stmt_vector_for_cost *);
-extern bool vectorizable_condition (stmt_vec_info, gimple_stmt_iterator *,
-				    stmt_vec_info *, bool, int, slp_tree,
-				    stmt_vector_for_cost *);
-extern bool vectorizable_shift (stmt_vec_info, gimple_stmt_iterator *,
-				stmt_vec_info *, slp_tree,
-				stmt_vector_for_cost *);
 extern void vect_get_load_cost (stmt_vec_info, int, bool,
 				unsigned int *, unsigned int *,
 				stmt_vector_for_cost *,
@@ -1644,6 +1637,7 @@ extern void vect_record_loop_mask (loop_vec_info, vec_loop_masks *,
 				   unsigned int, tree);
 extern tree vect_get_loop_mask (gimple_stmt_iterator *, vec_loop_masks *,
 				unsigned int, tree, unsigned int);
+extern stmt_vec_info info_for_reduction (stmt_vec_info);
 
 /* Drive for loop transformation stage.  */
 extern class loop *vect_transform_loop (loop_vec_info);
@@ -1653,8 +1647,7 @@ extern bool vectorizable_live_operation (stmt_vec_info, gimple_stmt_iterator *,
 					 slp_tree, slp_instance, int,
 					 stmt_vec_info *,
 					 stmt_vector_for_cost *);
-extern bool vectorizable_reduction (stmt_vec_info, gimple_stmt_iterator *,
-				    stmt_vec_info *, slp_tree, slp_instance,
+extern bool vectorizable_reduction (stmt_vec_info, slp_tree, slp_instance,
 				    stmt_vector_for_cost *);
 extern bool vectorizable_induction (stmt_vec_info, gimple_stmt_iterator *,
 				    stmt_vec_info *, slp_tree,
-- 
cgit v1.1


From 17ce4f48733cdefcd672f8ec5eb104c86984e492 Mon Sep 17 00:00:00 2001
From: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Date: Tue, 8 Oct 2019 15:08:35 +0000
Subject: Change the library search path when using --with-advance-toolchain

From: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>

Remove all -L directories from LINK_OS_EXTRA_SPEC32 and
LINK_OS_EXTRA_SPEC64 so that user directories specified at
build time have higher preference over the advance toolchain libraries.

Set MD_STARTFILE_PREFIX to $prefix/lib/ and MD_STARTFILE_PREFIX_1 to
$at/lib/ so that a compiler library has preference over the Advance
Toolchain libraries.


	* config.gcc: Move -L usage from LINK_OS_EXTRA_SPEC32 and
	LINK_OS_EXTRA_SPEC64 to MD_STARTFILE_PREFIX and
	MD_STARTFILE_PREFIX_1 when using --with-advance-toolchain.

From-SVN: r276702
---
 gcc/ChangeLog  |  6 ++++++
 gcc/config.gcc | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 984a05d..bee9431 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-08  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
+
+	* config.gcc: Move -L usage from LINK_OS_EXTRA_SPEC32 and
+	LINK_OS_EXTRA_SPEC64 to MD_STARTFILE_PREFIX and
+	MD_STARTFILE_PREFIX_1 when using --with-advance-toolchain.
+
 2019-10-08  Richard Biener  <rguenther@suse.de>
 
 	* tree-vectorizer.h (_stmt_vec_info::v_reduc_type): Remove.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 481bc95..511aeb4 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4782,14 +4782,12 @@ case "${target}" in
 			 echo "#undef  LINK_OS_EXTRA_SPEC32"
 			 echo "#define LINK_OS_EXTRA_SPEC32" \
 			      "\"%(link_os_new_dtags)" \
-			      "-rpath $prefix/lib -rpath $at/lib" \
-			      "-L $prefix/lib -L $at/lib\""
+			      "-rpath $prefix/lib -rpath $at/lib\""
 			 echo
 			 echo "#undef  LINK_OS_EXTRA_SPEC64"
 			 echo "#define LINK_OS_EXTRA_SPEC64" \
 			      "\"%(link_os_new_dtags)" \
-			      "-rpath $prefix/lib64 -rpath $at/lib64" \
-			      "-L $prefix/lib64 -L $at/lib64\""
+			      "-rpath $prefix/lib64 -rpath $at/lib64\""
 			 echo
 			 echo "#undef  LINK_OS_NEW_DTAGS_SPEC"
 			 echo "#define LINK_OS_NEW_DTAGS_SPEC" \
@@ -4802,7 +4800,10 @@ case "${target}" in
 			 echo "#define MD_EXEC_PREFIX \"$at/bin/\""
 			 echo
 			 echo "#undef  MD_STARTFILE_PREFIX"
-			 echo "#define MD_STARTFILE_PREFIX \"$at/lib/\"") \
+			 echo "#define MD_STARTFILE_PREFIX \"$prefix/lib/\""
+			 echo
+			 echo "#undef  MD_STARTFILE_PREFIX_1"
+			 echo "#define MD_STARTFILE_PREFIX_1 \"$at/lib/\"") \
 			    > advance-toolchain.h
 		    else
 			echo "Unknown advance-toolchain $with_advance_toolchain"
-- 
cgit v1.1


From 0de558660a7a7b013a857cbb41a02750aad78456 Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Tue, 8 Oct 2019 15:33:50 +0000
Subject: re PR testsuite/92025 (gcc.dg/Wstringop-overflow-12.c XPASSes)

gcc/testsuite/ChangeLog:

	PR tetsuite/92025
	* gcc.dg/Wstringop-overflow-12.c: Remove xfail.

2019-10-08  Richard Biener  <rguenther@suse.de>

From-SVN: r276703
---
 gcc/testsuite/ChangeLog                      | 5 +++++
 gcc/testsuite/gcc.dg/Wstringop-overflow-12.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb2264f..895c06f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Martin Sebor  <msebor@redhat.com>
+
+	PR tetsuite/92025
+	* gcc.dg/Wstringop-overflow-12.c: Remove xfail.
+
 2019-10-08  Richard Biener  <rguenther@suse.de>
 
 	* gcc.dg/vect/pr65947-1.c: Adjust.
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-12.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-12.c
index 04fa114..5a05f5c 100644
--- a/gcc/testsuite/gcc.dg/Wstringop-overflow-12.c
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-12.c
@@ -39,7 +39,7 @@ void test_memcpy_array_cst_range_off (const void *s)
   T (d + SR (-7, -1), 1);
   T (d + SR (-2, -1), 3);     /* { dg-warning "writing 3 bytes into a region of size 2 " "pr85350" { xfail *-*-* } } */
 
-  T (d + UR (1, 2), 1);       /* { dg-warning "writing 1 byte into a region of size 0 " "pr89350" { xfail *-*-* } } */
+  T (d + UR (1, 2), 1);       /* { dg-warning "writing 1 byte into a region of size 0 " } */
 }
 
 
-- 
cgit v1.1


From ff2640e58c4f0dfdb71b1828295f5c186a9685da Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Tue, 8 Oct 2019 16:26:39 +0000
Subject: DR 685 - Integral promotion of enum ignores fixed underlying type.

	* g++.dg/cpp0x/scoped_enum9.C: New test.

From-SVN: r276705
---
 gcc/testsuite/ChangeLog                   |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/scoped_enum9.C | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/scoped_enum9.C

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 895c06f..f3da169 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Marek Polacek  <polacek@redhat.com>
+
+	DR 685 - Integral promotion of enum ignores fixed underlying type.
+	* g++.dg/cpp0x/scoped_enum9.C: New test.
+
 2019-10-08  Martin Sebor  <msebor@redhat.com>
 
 	PR tetsuite/92025
diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum9.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum9.C
new file mode 100644
index 0000000..f38f26d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum9.C
@@ -0,0 +1,11 @@
+// DR 685 - Integral promotion of enumeration ignores fixed underlying type.
+// { dg-do compile { target c++11 } }
+
+enum E: long { e };
+
+void f(int);
+int f(long);
+
+void g() {
+  int k = f(e);
+}
-- 
cgit v1.1


From 8cad1ad5ade3fac0a2a796361bf5400d5f385036 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Tue, 8 Oct 2019 16:31:16 +0000
Subject: re PR fortran/91801 (ICE in gfc_simplify_reshape, at
 fortran/simplify.c:6733)

2019-10-08  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91801
	* simplify.c (gfc_simplify_reshape): Convert a gcc_assert into a
	gfc_error as a user can easily hit the condition.

2019-10-08  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91801
	* gfortran.dg/pr91801.f90: New test.

From-SVN: r276706
---
 gcc/fortran/ChangeLog                 |  6 ++++++
 gcc/fortran/simplify.c                | 10 +++++++++-
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/gfortran.dg/pr91801.f90 |  7 +++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr91801.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b5bef54..7847042 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-08  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91801
+	* simplify.c (gfc_simplify_reshape): Convert a gcc_assert into a
+	gfc_error as a user can easily hit the condition.
+
 2019-10-08  Tobias Burnus  <tobias@codesourcery.com>
 
 	* parse.c (parse_executable): Add missing ST_OMP_TARGET_SIMD.
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 8c1577e..fa5aefe 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -6762,7 +6762,15 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
 
 	  gfc_extract_int (e, &order[i]);
 
-	  gcc_assert (order[i] >= 1 && order[i] <= rank);
+	  if (order[i] < 1 || order[i] > rank)
+	    {
+	      gfc_error ("Element with a value of %d in ORDER at %L must be "
+			 "in the range [1, ..., %d] for the RESHAPE intrinsic "
+			 "near %L", order[i], &order_exp->where, rank,
+			 &shape_exp->where);
+	      return &gfc_bad_expr;
+	    }
+
 	  order[i]--;
 	  if (x[order[i]] != 0)
 	    {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f3da169..cad47cc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/91801
+	* gfortran.dg/pr91801.f90: New test.
+
 2019-10-08  Marek Polacek  <polacek@redhat.com>
 
 	DR 685 - Integral promotion of enum ignores fixed underlying type.
diff --git a/gcc/testsuite/gfortran.dg/pr91801.f90 b/gcc/testsuite/gfortran.dg/pr91801.f90
new file mode 100644
index 0000000..d2d82b8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr91801.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/91801
+! Code contributed by Gerhard Steinmetz
+program p
+   integer, parameter :: a(2) = [2,0]              ! { dg-error "Element with a value of" }
+   print *, reshape([1,2,3,4,5,6], [2,3], order=a) ! { dg-error "for the RESHAPE intrinsic near" }
+end
-- 
cgit v1.1


From fe42ae7cf57616f53a17544b614b425076d694db Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 8 Oct 2019 19:01:55 +0200
Subject: re PR rtl-optimization/91994 (r276327 breaks -mvzeroupper)

	PR target/91994
	* config/i386/i386.c (x86_avx_u128_mode_needed): Use SSE_REG
	instead of ALL_SSE_REG to check if function call preserves some
	256-bit SSE registers.

From-SVN: r276707
---
 gcc/ChangeLog          | 9 ++++++++-
 gcc/config/i386/i386.c | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bee9431..b032263 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-08  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/91994
+	* config/i386/i386.c (x86_avx_u128_mode_needed): Use SSE_REG
+	instead of ALL_SSE_REG to check if function call preserves some
+	256-bit SSE registers.
+
 2019-10-08  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
 
 	* config.gcc: Move -L usage from LINK_OS_EXTRA_SPEC32 and
@@ -116,7 +123,7 @@
 
 	* config/i386/i386-expand.c (ix86_expand_floorceildf_32,
 	ix86_expand_rounddf_32): Reorder functions.
-	* config/i386/i386-protos.h: Update..
+	* config/i386/i386-protos.h: Update.
 
 2019-10-07  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 083e228..1a272d9 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -13530,7 +13530,7 @@ ix86_avx_u128_mode_needed (rtx_insn *insn)
 	 modes wider than 256 bits.  It's only safe to issue a
 	 vzeroupper if all SSE registers are clobbered.  */
       const function_abi &abi = insn_callee_abi (insn);
-      if (!hard_reg_set_subset_p (reg_class_contents[ALL_SSE_REGS],
+      if (!hard_reg_set_subset_p (reg_class_contents[SSE_REGS],
 				  abi.mode_clobbers (V4DImode)))
 	return AVX_U128_ANY;
 
-- 
cgit v1.1


From a3fc4326ca94323e24693b907ce4352a70d4de8f Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Tue, 8 Oct 2019 19:09:04 +0000
Subject: [Darwin, machopic 2/n] Compute and cache indirection rules.

This caches a check for the requirement to indirect a symbol in the Darwin
ABI, and uses it where needed.  We also ensure that we place the indirection
pointers into the non-lazy symbol pointers section.  Other placements have
occurred with various platform toolchains - but these seem to have been
unintentional so we match current platform toolchains.

gcc/ChangeLog:

2019-10-08  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_indirect_data_reference): Check for
	required indirections before making direct access to defined
	values.
	(machopic_output_indirection): Place the indirected pointes for
	required indirections into the non-lazy symbol pointers section.
	(darwin_encode_section_info):
	* config/darwin.h (MACHO_SYMBOL_FLAG_MUST_INDIRECT): New.
	(MACHO_SYMBOL_MUST_INDIRECT_P): New.

From-SVN: r276708
---
 gcc/ChangeLog       | 11 +++++++++++
 gcc/config/darwin.c | 17 +++++++++++++++--
 gcc/config/darwin.h |  9 +++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b032263..823d13d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-08  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (machopic_indirect_data_reference): Check for
+	required indirections before making direct access to defined
+	values.
+	(machopic_output_indirection): Place the indirected pointes for
+	required indirections into the non-lazy symbol pointers section.
+	(darwin_encode_section_info):
+	* config/darwin.h (MACHO_SYMBOL_FLAG_MUST_INDIRECT): New.
+	(MACHO_SYMBOL_MUST_INDIRECT_P): New.
+
 2019-10-08  Uroš Bizjak  <ubizjak@gmail.com>
 
 	PR target/91994
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 869e850..f8d7059 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -665,7 +665,7 @@ machopic_indirect_data_reference (rtx orig, rtx reg)
 	   /* some other cpu -- writeme!  */
 	   gcc_unreachable ();
 	}
-      else if (defined)
+      else if (defined && ! MACHO_SYMBOL_MUST_INDIRECT_P (orig))
 	{
 	  rtx offset = NULL;
 	  if (DARWIN_PPC || HAVE_lo_sum)
@@ -1120,6 +1120,7 @@ machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
       machopic_output_stub (asm_out_file, sym, stub);
     }
   else if (! indirect_data (symbol)
+	   && ! MACHO_SYMBOL_MUST_INDIRECT_P (symbol)
 	   && ! MACHO_SYMBOL_HIDDEN_VIS_P (symbol)
 	   && (machopic_symbol_defined_p (symbol)
 	       || SYMBOL_REF_LOCAL_P (symbol)))
@@ -1238,11 +1239,17 @@ darwin_encode_section_info (tree decl, rtx rtl, int first)
   if (VAR_P (decl))
     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_VARIABLE;
 
+  /* Only really common if there's no initialiser.  */
+  bool really_common_p = (DECL_COMMON (decl)
+			  && (DECL_INITIAL (decl) == NULL
+			      || (!in_lto_p
+				  && DECL_INITIAL (decl) == error_mark_node)));
+
   /* For Darwin, if we have specified visibility and it's not the default
      that's counted 'hidden'.  */
   if (DECL_VISIBILITY_SPECIFIED (decl)
       && DECL_VISIBILITY (decl) != VISIBILITY_DEFAULT)
-     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_HIDDEN_VIS;
+    SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_HIDDEN_VIS;
 
   if (!DECL_EXTERNAL (decl)
       && (!TREE_PUBLIC (decl) || !DECL_WEAK (decl))
@@ -1255,6 +1262,12 @@ darwin_encode_section_info (tree decl, rtx rtl, int first)
 
   if (! TREE_PUBLIC (decl))
     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_STATIC;
+
+  /* Short cut check for Darwin 'must indirect' rules.  */
+  if (really_common_p
+      || (DECL_WEAK (decl) && ! MACHO_SYMBOL_HIDDEN_VIS_P (sym_ref))
+      || lookup_attribute ("weakref", DECL_ATTRIBUTES (decl)))
+     SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_MUST_INDIRECT;
 }
 
 void
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 87e1eb6..7fab869 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -820,6 +820,15 @@ extern GTY(()) section * darwin_sections[NUM_DARWIN_SECTIONS];
 #define MACHO_SYMBOL_VARIABLE_P(RTX) \
   ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_VARIABLE) != 0)
 
+/* Set on a symbol that must be indirected, even when there is a
+   definition in the TU.  The ABI mandates that common symbols are so
+   indirected, as are weak.  If 'fix-and-continue' is operational then
+   data symbols might also be.  */
+
+#define MACHO_SYMBOL_FLAG_MUST_INDIRECT ((SYMBOL_FLAG_SUBT_DEP) << 1)
+#define MACHO_SYMBOL_MUST_INDIRECT_P(RTX) \
+  ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_MUST_INDIRECT) != 0)
+
 /* Set on a symbol with SYMBOL_FLAG_FUNCTION or MACHO_SYMBOL_FLAG_VARIABLE
    to indicate that the function or variable is considered defined in this
    translation unit.  */
-- 
cgit v1.1


From e86fc0d7a8df5799c195cd5ff0486e0bdbe6c661 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Tue, 8 Oct 2019 19:24:22 +0000
Subject: [Darwin] Remove code deprecated in 4.x.

This removes some code that should be dead.
Given no reported problems from the warning since 4.6 this seems reasonable.

gcc/ChangeLog:

2019-10-08  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_select_section): Remove dead code for
	old Objective-C section selection method, replace with unreachable.

From-SVN: r276709
---
 gcc/ChangeLog       |  5 ++++
 gcc/config/darwin.c | 77 +++--------------------------------------------------
 2 files changed, 9 insertions(+), 73 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 823d13d..f82d7f5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-08  Iain Sandoe  <iain@sandoe.co.uk>
 
+	* config/darwin.c (machopic_select_section): Remove dead code for
+	old Objective-C section selection method, replace with unreachable.
+
+2019-10-08  Iain Sandoe  <iain@sandoe.co.uk>
+
 	* config/darwin.c (machopic_indirect_data_reference): Check for
 	required indirections before making direct access to defined
 	values.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index f8d7059..679e0c2 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1696,83 +1696,14 @@ machopic_select_section (tree decl,
       else
 	return base_section;
     }
-  /* c) legacy meta-data selection.  */
-  else if (TREE_CODE (decl) == VAR_DECL
+  else if (flag_next_runtime
+	   && VAR_P (decl)
 	   && DECL_NAME (decl)
 	   && TREE_CODE (DECL_NAME (decl)) == IDENTIFIER_NODE
 	   && IDENTIFIER_POINTER (DECL_NAME (decl))
-	   && flag_next_runtime
 	   && !strncmp (IDENTIFIER_POINTER (DECL_NAME (decl)), "_OBJC_", 6))
-    {
-      const char *name = IDENTIFIER_POINTER (DECL_NAME (decl));
-      static bool warned_objc_46 = false;
-      /* We shall assert that zero-sized objects are an error in ObjC
-         meta-data.  */
-      gcc_assert (tree_to_uhwi (DECL_SIZE_UNIT (decl)) != 0);
-
-      /* ??? This mechanism for determining the metadata section is
-	 broken when LTO is in use, since the frontend that generated
-	 the data is not identified.  We will keep the capability for
-	 the short term - in case any non-Objective-C programs are using
-	 it to place data in specified sections.  */
-      if (!warned_objc_46)
-	{
-	  location_t loc = DECL_SOURCE_LOCATION (decl);
-	  warning_at (loc, 0, "the use of _OBJC_-prefixed variable names"
-		      " to select meta-data sections is deprecated at 4.6"
-		      " and will be removed in 4.7");
-	  warned_objc_46 = true;
-	}
-
-      if (!strncmp (name, "_OBJC_CLASS_METHODS_", 20))
-        return darwin_sections[objc_cls_meth_section];
-      else if (!strncmp (name, "_OBJC_INSTANCE_METHODS_", 23))
-        return darwin_sections[objc_inst_meth_section];
-      else if (!strncmp (name, "_OBJC_CATEGORY_CLASS_METHODS_", 29))
-        return darwin_sections[objc_cat_cls_meth_section];
-      else if (!strncmp (name, "_OBJC_CATEGORY_INSTANCE_METHODS_", 32))
-        return darwin_sections[objc_cat_inst_meth_section];
-      else if (!strncmp (name, "_OBJC_CLASS_VARIABLES_", 22))
-        return darwin_sections[objc_class_vars_section];
-      else if (!strncmp (name, "_OBJC_INSTANCE_VARIABLES_", 25))
-        return darwin_sections[objc_instance_vars_section];
-      else if (!strncmp (name, "_OBJC_CLASS_PROTOCOLS_", 22))
-        return darwin_sections[objc_cat_cls_meth_section];
-      else if (!strncmp (name, "_OBJC_CLASS_NAME_", 17))
-        return darwin_sections[objc_class_names_section];
-      else if (!strncmp (name, "_OBJC_METH_VAR_NAME_", 20))
-        return darwin_sections[objc_meth_var_names_section];
-      else if (!strncmp (name, "_OBJC_METH_VAR_TYPE_", 20))
-        return darwin_sections[objc_meth_var_types_section];
-      else if (!strncmp (name, "_OBJC_CLASS_REFERENCES", 22))
-        return darwin_sections[objc_cls_refs_section];
-      else if (!strncmp (name, "_OBJC_CLASS_", 12))
-        return darwin_sections[objc_class_section];
-      else if (!strncmp (name, "_OBJC_METACLASS_", 16))
-        return darwin_sections[objc_meta_class_section];
-      else if (!strncmp (name, "_OBJC_CATEGORY_", 15))
-        return darwin_sections[objc_category_section];
-      else if (!strncmp (name, "_OBJC_SELECTOR_REFERENCES", 25))
-        return darwin_sections[objc_selector_refs_section];
-      else if (!strncmp (name, "_OBJC_SELECTOR_FIXUP", 20))
-        return darwin_sections[objc_selector_fixup_section];
-      else if (!strncmp (name, "_OBJC_SYMBOLS", 13))
-        return darwin_sections[objc_symbols_section];
-      else if (!strncmp (name, "_OBJC_MODULES", 13))
-        return darwin_sections[objc_module_info_section];
-      else if (!strncmp (name, "_OBJC_IMAGE_INFO", 16))
-        return darwin_sections[objc_image_info_section];
-      else if (!strncmp (name, "_OBJC_PROTOCOL_INSTANCE_METHODS_", 32))
-        return darwin_sections[objc_cat_inst_meth_section];
-      else if (!strncmp (name, "_OBJC_PROTOCOL_CLASS_METHODS_", 29))
-        return darwin_sections[objc_cat_cls_meth_section];
-      else if (!strncmp (name, "_OBJC_PROTOCOL_REFS_", 20))
-        return darwin_sections[objc_cat_cls_meth_section];
-      else if (!strncmp (name, "_OBJC_PROTOCOL_", 15))
-        return darwin_sections[objc_protocol_section];
-      else
-        return base_section;
-    }
+    /* c) legacy meta-data selection was deprecated at 4.6, removed now.  */
+    gcc_unreachable ();
 
   return base_section;
 }
-- 
cgit v1.1


From 7c3ed632601bf485335a7fe00d1db34b23ebacd2 Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Tue, 8 Oct 2019 19:48:27 +0000
Subject: PR middle-end/92026 - gcc.dg/Wstringop-overflow-18.c FAIL

PR middle-end/92026 - gcc.dg/Wstringop-overflow-18.c FAIL
PR middle-end/92014 - bogus warning: writing 8 bytes into a region of size 1 in timezone/zic.c

gcc/ChangeLog:
	* tree-ssa-strlen.c (count_nonzero_bytes): Avoid recursing for MEM_REF
	again once nbytes has been set.  Set the access size when not yet set.

gcc/testsuite/ChangeLog:

	PR middle-end/92014
	* gcc.dg/Wstringop-overflow-19.c: New test.

From-SVN: r276711
---
 gcc/ChangeLog                                |  7 +++++++
 gcc/testsuite/ChangeLog                      |  5 +++++
 gcc/testsuite/gcc.dg/Wstringop-overflow-19.c | 27 +++++++++++++++++++++++++++
 gcc/tree-ssa-strlen.c                        | 28 +++++++++++++++++-----------
 4 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/Wstringop-overflow-19.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f82d7f5..4bf0470 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-08  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/92026
+	PR middle-end/92014
+	* tree-ssa-strlen.c (count_nonzero_bytes): Avoid recursing for MEM_REF
+	again once nbytes has been set.  Set the access size when not yet set.
+
 2019-10-08  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (machopic_select_section): Remove dead code for
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cad47cc..1b6c04a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Martin Sebor  <msebor@redhat.com>
+
+	PR middle-end/92014
+	* gcc.dg/Wstringop-overflow-19.c: New test.
+
 2019-10-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/91801
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-19.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-19.c
new file mode 100644
index 0000000..cf866b3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-19.c
@@ -0,0 +1,27 @@
+/* PR middle-end/92014 - bogus warning: writing 8 bytes into a region
+   of size 1 in timezone/zic.c
+   { dg-do compile }
+   { dg-options "-O2 -Wall" } */
+
+struct
+{
+  char *s1, *s2;
+  char c;
+} z;
+
+
+void f (char **a, int i, int j)
+{
+  char * cp = __builtin_strchr (a[i], '%');
+
+  if (cp && *++cp != 's')
+    return;
+
+  z.s1 = __builtin_strdup (a[i]);
+  if (!z.s1) __builtin_abort ();
+
+  z.s2 = __builtin_strdup (a[j]);
+  if (!z.s2) __builtin_abort ();
+
+  z.c = cp ? *cp : '\0';    // { dg-bogus "\\\[-Wstringop-overflow" }
+}
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index d68df19..c2866e0 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -3741,13 +3741,16 @@ int ssa_name_limit_t::next_ssa_name (tree ssa_name)
   return 0;
 }
 
-/* Determine the minimum and maximum number of leading non-zero bytes
+/* Determines the minimum and maximum number of leading non-zero bytes
    in the representation of EXP and set LENRANGE[0] and LENRANGE[1]
-   to each.  Set LENRANGE[2] to the total number of bytes in
-   the representation.  Set *NULTREM if the representation contains
-   a zero byte, and set *ALLNUL if all the bytes are zero.  Avoid
-   recursing deeper than the limits in SNLIM allow.  Return true
-   on success and false otherwise.  */
+   to each.  Sets LENRANGE[2] to the total number of bytes in
+   the representation.  Sets *NULTREM if the representation contains
+   a zero byte, and sets *ALLNUL if all the bytes are zero.
+   OFFSET and NBYTES are the offset into the representation and
+   the size of the access to it determined from a MEM_REF or zero
+   for other expressions.
+   Avoid recursing deeper than the limits in SNLIM allow.
+   Returns true on success and false otherwise.  */
 
 static bool
 count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
@@ -3769,15 +3772,13 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 	return false;
 
       len -= offset;
-      size -= offset;
-
-      if (size < nbytes)
-	return false;
 
       if (len < lenrange[0])
 	lenrange[0] = len;
       if (lenrange[1] < len)
 	lenrange[1] = len;
+      if (lenrange[2] < nbytes)
+	lenrange[2] = nbytes;
 
       if (!si->full_string_p)
 	*nulterm = false;
@@ -3843,6 +3844,9 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 
   if (TREE_CODE (exp) == MEM_REF)
     {
+      if (nbytes)
+	return false;
+
       tree arg = TREE_OPERAND (exp, 0);
       tree off = TREE_OPERAND (exp, 1);
 
@@ -3910,8 +3914,10 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 	  lenrange[0] = 0;
 	  prep = NULL;
 	}
-      else
+      else if (!nbytes)
 	nbytes = repsize;
+      else if (nbytes < repsize)
+	return false;
     }
 
   if (!nbytes)
-- 
cgit v1.1


From ac87f0f3459a57f03503e51aeffc54bb6ef36b90 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>
Date: Tue, 8 Oct 2019 21:50:05 +0000
Subject: re PR tree-optimization/90836 (Missing popcount pattern matching)

2019-10-08  Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>

	PR tree-optimization/90836
	* gcc/match.pd (popcount): New pattern.

From-SVN: r276721
---
 gcc/ChangeLog |  5 +++++
 gcc/match.pd  | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4bf0470..1045a47 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>
+
+	PR tree-optimization/90836
+	* gcc/match.pd (popcount): New pattern.
+
 2019-10-08  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/92026
diff --git a/gcc/match.pd b/gcc/match.pd
index e3ac06c..2c82287 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -5689,6 +5689,64 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
       (cmp (popcount @0) integer_zerop)
       (rep @0 { build_zero_cst (TREE_TYPE (@0)); }))))
 
+#if GIMPLE
+/* 64- and 32-bits branchless implementations of popcount are detected:
+
+   int popcount64c (uint64_t x)
+   {
+     x -= (x >> 1) & 0x5555555555555555ULL;
+     x = (x & 0x3333333333333333ULL) + ((x >> 2) & 0x3333333333333333ULL);
+     x = (x + (x >> 4)) & 0x0f0f0f0f0f0f0f0fULL;
+     return (x * 0x0101010101010101ULL) >> 56;
+   }
+
+   int popcount32c (uint32_t x)
+   {
+     x -= (x >> 1) & 0x55555555;
+     x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+     x = (x + (x >> 4)) & 0x0f0f0f0f;
+     return (x * 0x01010101) >> 24;
+   }  */
+(simplify
+  (rshift
+    (mult
+      (bit_and
+	(plus:c
+	  (rshift @8 INTEGER_CST@5)
+	  (plus:c@8
+	    (bit_and @6 INTEGER_CST@7)
+	    (bit_and
+	      (rshift
+		(minus@6
+		  @0
+		  (bit_and
+		    (rshift @0 INTEGER_CST@4)
+		    INTEGER_CST@11))
+	      INTEGER_CST@10)
+	    INTEGER_CST@9)))
+	INTEGER_CST@3)
+      INTEGER_CST@2)
+    INTEGER_CST@1)
+  /* Check constants and optab.  */
+  (with
+     {
+       unsigned prec = TYPE_PRECISION (type);
+       int shift = 64 - prec;
+       const unsigned HOST_WIDE_INT c1 = 0x0101010101010101ULL >> shift,
+				    c2 = 0x0F0F0F0F0F0F0F0FULL >> shift,
+				    c3 = 0x3333333333333333ULL >> shift,
+				    c4 = 0x5555555555555555ULL >> shift;
+     }
+    (if (prec <= 64 && TYPE_UNSIGNED (type) && tree_to_uhwi (@4) == 1
+          && tree_to_uhwi (@10) == 2 && tree_to_uhwi (@5) == 4
+          && tree_to_uhwi (@1) == prec - 8 && tree_to_uhwi (@2) == c1
+          && tree_to_uhwi (@3) == c2 && tree_to_uhwi (@9) == c3
+          && tree_to_uhwi (@7) == c3 && tree_to_uhwi (@11) == c4
+          && direct_internal_fn_supported_p (IFN_POPCOUNT, type,
+	    OPTIMIZE_FOR_BOTH))
+        (convert (IFN_POPCOUNT:type @0)))))
+#endif
+
 /* Simplify:
 
      a = a1 op a2
-- 
cgit v1.1


From 0eeb34b29937338a8087216c49d3837b69107238 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>
Date: Tue, 8 Oct 2019 21:53:03 +0000
Subject: re PR tree-optimization/90836 (Missing popcount pattern matching)

2019-10-08  Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>

	PR tree-optimization/90836
	* lib/target-supports.exp (check_effective_target_popcount)
	(check_effective_target_popcountll): New effective targets.
	* gcc.dg/tree-ssa/popcount4.c: New test.
	* gcc.dg/tree-ssa/popcount4l.c: New test.
	* gcc.dg/tree-ssa/popcount4ll.c: New test.

From-SVN: r276722
---
 gcc/testsuite/ChangeLog                     |  9 +++++++++
 gcc/testsuite/gcc.dg/tree-ssa/popcount4.c   | 22 +++++++++++++++++++++
 gcc/testsuite/gcc.dg/tree-ssa/popcount4l.c  | 30 +++++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/tree-ssa/popcount4ll.c | 19 ++++++++++++++++++
 gcc/testsuite/lib/target-supports.exp       | 23 ++++++++++++++++++++++
 5 files changed, 103 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/popcount4.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/popcount4l.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/popcount4ll.c

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1b6c04a..d9d73db 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-08  Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>
+
+	PR tree-optimization/90836
+	* lib/target-supports.exp (check_effective_target_popcount)
+	(check_effective_target_popcountll): New effective targets.
+	* gcc.dg/tree-ssa/popcount4.c: New test.
+	* gcc.dg/tree-ssa/popcount4l.c: New test.
+	* gcc.dg/tree-ssa/popcount4ll.c: New test.
+
 2019-10-08  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/92014
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/popcount4.c b/gcc/testsuite/gcc.dg/tree-ssa/popcount4.c
new file mode 100644
index 0000000..bfb563b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/popcount4.c
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target popcount } */
+/* { dg-require-effective-target int32plus } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+const unsigned m1  = 0x55555555UL;
+const unsigned m2  = 0x33333333UL;
+const unsigned m4  = 0x0F0F0F0FUL;
+const unsigned h01 = 0x01010101UL;
+const int shift = 24;
+
+int popcount64c(unsigned x)
+{
+    x -= (x >> 1) & m1;
+    x = (x & m2) + ((x >> 2) & m2);
+    x = (x + (x >> 4)) & m4;
+    return (x * h01) >> shift;
+}
+
+/* { dg-final { scan-tree-dump-times "\.POPCOUNT" 1 "optimized" } } */
+
+
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/popcount4l.c b/gcc/testsuite/gcc.dg/tree-ssa/popcount4l.c
new file mode 100644
index 0000000..69fb2d1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/popcount4l.c
@@ -0,0 +1,30 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target popcountl } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+#if __SIZEOF_LONG__ == 4
+const unsigned long m1  = 0x55555555UL;
+const unsigned long m2  = 0x33333333UL;
+const unsigned long m4  = 0x0F0F0F0FUL;
+const unsigned long h01 = 0x01010101UL;
+const int shift = 24;
+#else
+const unsigned long m1  = 0x5555555555555555UL;
+const unsigned long m2  = 0x3333333333333333UL;
+const unsigned long m4  = 0x0f0f0f0f0f0f0f0fUL;
+const unsigned long h01 = 0x0101010101010101UL;
+const int shift = 56;
+#endif
+
+
+int popcount64c(unsigned long x)
+{
+    x -= (x >> 1) & m1;
+    x = (x & m2) + ((x >> 2) & m2);
+    x = (x + (x >> 4)) & m4;
+    return (x * h01) >> shift;
+}
+
+/* { dg-final { scan-tree-dump-times "\.POPCOUNT" 1 "optimized" } } */
+
+
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/popcount4ll.c b/gcc/testsuite/gcc.dg/tree-ssa/popcount4ll.c
new file mode 100644
index 0000000..191d957
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/popcount4ll.c
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target popcountll } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+const unsigned long long m1  = 0x5555555555555555ULL;
+const unsigned long long m2  = 0x3333333333333333ULL;
+const unsigned long long m4  = 0x0F0F0F0F0F0F0F0FULL;
+const unsigned long long h01 = 0x0101010101010101ULL;
+const int shift = 56;
+
+int popcount64c(unsigned long long x)
+{
+    x -= (x >> 1) & m1;
+    x = (x & m2) + ((x >> 2) & m2);
+    x = (x + (x >> 4)) & m4;
+    return (x * h01) >> shift;
+}
+
+/* { dg-final { scan-tree-dump-times "\.POPCOUNT" 1 "optimized" } } */
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index a7b76b6..179202f 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -6933,6 +6933,29 @@ proc check_effective_target_popcountl { } {
     } "" ]
 }
 
+# Return 1 if the target supports popcount on long long.
+
+proc check_effective_target_popcountll { } {
+    return [check_no_messages_and_pattern popcountll "!\\(call" rtl-expand {
+        int foo (long long b)
+          {
+            return __builtin_popcountll (b);
+          }
+    } "" ]
+}
+
+
+# Return 1 if the target supports popcount on int.
+
+proc check_effective_target_popcount { } {
+    return [check_no_messages_and_pattern popcount "!\\(call" rtl-expand {
+        int foo (int b)
+          {
+            return __builtin_popcount (b);
+          }
+    } "" ]
+}
+
 # Return 1 if the target supports atomic operations on "long long"
 # and can execute them.
 #
-- 
cgit v1.1


From d470060d06c45592514858b0a4c87bd71cd91c9b Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Tue, 8 Oct 2019 22:12:54 +0000
Subject: PR c++/92001 - missing -Wclass-memaccess with array as first argument
 to memset

gcc/cp/ChangeLog:

	PR c++/92001
	* call.c (maybe_warn_class_memaccess): Handle arrays.

gcc/testsuite/ChangeLog:

	PR c++/92001
	* g++.dg/Wclass-memaccess-5.C: New test.

From-SVN: r276725
---
 gcc/cp/ChangeLog                          |  5 +++++
 gcc/cp/call.c                             |  4 +++-
 gcc/testsuite/ChangeLog                   |  5 +++++
 gcc/testsuite/g++.dg/Wclass-memaccess-5.C | 18 ++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/Wclass-memaccess-5.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 90cab94..0e8d930 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/92001
+	* call.c (maybe_warn_class_memaccess): Handle arrays.
+
 2019-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* call.c (resolve_args): Use cp_expr_loc_or_input_loc in one place.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 6c9acac..4ed424f 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -8911,7 +8911,9 @@ maybe_warn_class_memaccess (location_t loc, tree fndecl,
   unsigned srcidx = !dstidx;
 
   tree dest = (*args)[dstidx];
-  if (!TREE_TYPE (dest) || !INDIRECT_TYPE_P (TREE_TYPE (dest)))
+  if (!TREE_TYPE (dest)
+      || (TREE_CODE (TREE_TYPE (dest)) != ARRAY_TYPE
+	  && !INDIRECT_TYPE_P (TREE_TYPE (dest))))
     return;
 
   tree srctype = NULL_TREE;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d9d73db..3f189e3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Martin Sebor  <msebor@redhat.com>
+
+	PR c++/92001
+	* g++.dg/Wclass-memaccess-5.C: New test.
+
 2019-10-08  Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>
 
 	PR tree-optimization/90836
diff --git a/gcc/testsuite/g++.dg/Wclass-memaccess-5.C b/gcc/testsuite/g++.dg/Wclass-memaccess-5.C
new file mode 100644
index 0000000..d0fffea
--- /dev/null
+++ b/gcc/testsuite/g++.dg/Wclass-memaccess-5.C
@@ -0,0 +1,18 @@
+/* PR c++/92001 - missing -Wclass-memaccess with array as first argument
+   to memset
+   { dg-do compile }
+   { dg-options "-Wall" } */
+
+extern "C" void* memset (void*, int, __SIZE_TYPE__);
+
+struct S { S (); };
+
+void test_array_access (S *p, S (*pa)[2], S (&r)[3])
+{
+  S a[1];
+  memset (a, 0, sizeof a);        // { dg-warning "-Wclass-memaccess" }
+
+  memset (*pa, 0, sizeof *pa);    // { dg-warning "-Wclass-memaccess" }
+
+  memset (r, 0, sizeof r);        // { dg-warning "-Wclass-memaccess" }
+}
-- 
cgit v1.1


From ffbef318488159e807d93c0cf43f0d72417e5dfc Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Wed, 9 Oct 2019 00:16:22 +0000
Subject: Daily bump.

From-SVN: r276750
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index c440771..70f16fc 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191008
+20191009
-- 
cgit v1.1


From 4e78c6883f97bf45eeb1ad3041dcf2e2de01912c Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@adacore.com>
Date: Wed, 9 Oct 2019 01:14:02 +0000
Subject: use call-clobbered reg to disalign the stack

Some x86 tests of stack realignment, that disaligned the stack with
pushes and pops, failed when the compiler was configured to tune for a
target that preferred to accumulate outgoing arguments: the stack
space is reserved before the asm push, the call sequence overwrites
the saved register, and then the asm pop restores the overwritten
value.  Since that's a call-preserved register in 32-bit mode, it
should be preserved unchanged, but isn't.

Merely changing the register to a call-clobbered one would be enough,
but the tests would remain fragile and prone to failure due to other
optimizations, so I arranged for the compiler to be made aware of the
register used for the push and the pop, so it won't use it for
something else, and forced the function to use a frame pointer, so
that it won't use stack pointer offsets for local variables: the
offsets would likely be wrong between the asm push and pop.


for  gcc/testsuite/ChangeLog

	* gcc.target/i386/20060512-1.c (sse2_test): Use a
	call-clobbered register variable for stack-disaligning push
	and pop.  Require a frame pointer.
	* gcc.target/i386/20060512-3.c (sse2_test): Likewise.

From-SVN: r276751
---
 gcc/testsuite/ChangeLog                    |  7 +++++++
 gcc/testsuite/gcc.target/i386/20060512-1.c | 16 +++++++++-------
 gcc/testsuite/gcc.target/i386/20060512-3.c |  7 ++++---
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f189e3..a1f3966 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-08  Alexandre Oliva <oliva@adacore.com>
+
+	* gcc.target/i386/20060512-1.c (sse2_test): Use a
+	call-clobbered register variable for stack-disaligning push
+	and pop.  Require a frame pointer.
+	* gcc.target/i386/20060512-3.c (sse2_test): Likewise.
+
 2019-10-08  Martin Sebor  <msebor@redhat.com>
 
 	PR c++/92001
diff --git a/gcc/testsuite/gcc.target/i386/20060512-1.c b/gcc/testsuite/gcc.target/i386/20060512-1.c
index ec163a9..fe95f6d 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-1.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-1.c
@@ -7,11 +7,11 @@
 #include <emmintrin.h>
 
 #ifdef __x86_64__
-# define PUSH "pushq %rsi"
-# define POP "popq %rsi"
+# define REG "rcx"
+# define WIDTH "q"
 #else
-# define PUSH "pushl %esi"
-# define POP "popl %esi"
+# define REG "ecx"
+# define WIDTH "l"
 #endif
 
 __m128i __attribute__ ((__noinline__))
@@ -30,13 +30,15 @@ self_aligning_function (int x, int y)
 int g_1 = 20;
 int g_2 = 22;
 
-static void
+static void __attribute__ ((__optimize__ ("-fno-omit-frame-pointer")))
 sse2_test (void)
 {
   int result;
-  asm (PUSH);                  /* Misalign runtime stack.  */
+  register int __attribute__ ((__mode__ (__word__))) reg asm (REG);
+  asm volatile ("push" WIDTH "\t%0"  /* Disalign runtime stack.  */
+		: : "r" (reg) : "memory");
   result = self_aligning_function (g_1, g_2);
   if (result != 42)
     abort ();
-  asm (POP);
+  asm volatile ("pop" WIDTH "\t%0" : "=r" (reg));
 }
diff --git a/gcc/testsuite/gcc.target/i386/20060512-3.c b/gcc/testsuite/gcc.target/i386/20060512-3.c
index 3370b9e..0cebb47 100644
--- a/gcc/testsuite/gcc.target/i386/20060512-3.c
+++ b/gcc/testsuite/gcc.target/i386/20060512-3.c
@@ -23,13 +23,14 @@ self_aligning_function (int x, int y)
 int g_1 = 20;
 int g_2 = 22;
 
-static void
+static void __attribute__ ((__optimize__ ("-fno-omit-frame-pointer")))
 sse2_test (void)
 {
   int result;
-  asm ("pushl %esi");		/* Disalign runtime stack.  */
+  register int reg asm ("ecx");
+  asm ("pushl\t%0": : "r" (reg) : "memory"); /* Disalign runtime stack.  */
   result = self_aligning_function (g_1, g_2);
   if (result != 42)
     abort ();
-  asm ("popl %esi");
+  asm ("popl\t%0" : "=r" (reg));
 }
-- 
cgit v1.1


From f78347996e02a8a767a525bfb764e769afe29d67 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 9 Oct 2019 07:02:22 +0000
Subject: tree-vectorizer.h (_stmt_vec_info::reduc_vectype_in): New.

2019-10-08  Richard Biener  <rguenther@suse.de>

	* tree-vectorizer.h (_stmt_vec_info::reduc_vectype_in): New.
	(_stmt_vec_info::force_single_cycle): Likewise.
	(STMT_VINFO_FORCE_SINGLE_CYCLE): New.
	(STMT_VINFO_REDUC_VECTYPE_IN): Likewise.
	* tree-vect-loop.c (vectorizable_reduction): Set
	STMT_VINFO_REDUC_VECTYPE_IN and STMT_VINFO_FORCE_SINGLE_CYCLE.
	(vect_transform_reduction): Use them to remove redundant code.
	(vect_transform_cycle_phi): Likewise.

From-SVN: r276752
---
 gcc/ChangeLog         |  11 +++
 gcc/tree-vect-loop.c  | 188 ++++++++------------------------------------------
 gcc/tree-vectorizer.h |   8 +++
 3 files changed, 49 insertions(+), 158 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1045a47..0214310 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-08  Richard Biener  <rguenther@suse.de>
+
+	* tree-vectorizer.h (_stmt_vec_info::reduc_vectype_in): New.
+	(_stmt_vec_info::force_single_cycle): Likewise.
+	(STMT_VINFO_FORCE_SINGLE_CYCLE): New.
+	(STMT_VINFO_REDUC_VECTYPE_IN): Likewise.
+	* tree-vect-loop.c (vectorizable_reduction): Set
+	STMT_VINFO_REDUC_VECTYPE_IN and STMT_VINFO_FORCE_SINGLE_CYCLE.
+	(vect_transform_reduction): Use them to remove redundant code.
+	(vect_transform_cycle_phi): Likewise.
+
 2019-10-08  Dmitrij Pochepko <dmitrij.pochepko@bell-sw.com>
 
 	PR tree-optimization/90836
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index f63bb85..a9ea0ca 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -5983,9 +5983,13 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 	    }
 	}
     }
-
   if (!vectype_in)
     vectype_in = vectype_out;
+  STMT_VINFO_REDUC_VECTYPE_IN (reduc_info) = vectype_in;
+  /* For the SSA cycle we store on each participating stmt the operand index
+     where the cycle continues.  Store the one relevant for the actual
+     operation in the reduction meta.  */
+  STMT_VINFO_REDUC_IDX (reduc_info) = reduc_index;
 
   /* When vectorizing a reduction chain w/o SLP the reduction PHI is not
      directy used in stmt.  */
@@ -6457,7 +6461,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       && (!STMT_VINFO_IN_PATTERN_P (use_stmt_info)
 	  || !STMT_VINFO_PATTERN_DEF_SEQ (use_stmt_info))
       && vect_stmt_to_vectorize (use_stmt_info) == stmt_info)
-    single_defuse_cycle = true;
+    STMT_VINFO_FORCE_SINGLE_CYCLE (reduc_info) = single_defuse_cycle = true;
 
   if (single_defuse_cycle
       || code == DOT_PROD_EXPR
@@ -6584,17 +6588,11 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 			  stmt_vec_info *vec_stmt, slp_tree slp_node)
 {
   tree vectype_out = STMT_VINFO_VECTYPE (stmt_info);
-  tree vectype_in = NULL_TREE;
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
-  enum tree_code code;
-  int op_type;
-  bool is_simple_use;
   int i;
   int ncopies;
-  bool single_defuse_cycle = false;
   int j;
-  tree ops[3];
   int vec_num;
 
   stmt_vec_info reduc_info = info_for_reduction (stmt_info);
@@ -6607,30 +6605,20 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
     }
 
   gassign *stmt = as_a <gassign *> (stmt_info->stmt);
+  enum tree_code code = gimple_assign_rhs_code (stmt);
+  int op_type = TREE_CODE_LENGTH (code);
 
   /* Flatten RHS.  */
-  switch (get_gimple_rhs_class (gimple_assign_rhs_code (stmt)))
+  tree ops[3];
+  switch (get_gimple_rhs_class (code))
     {
-    case GIMPLE_BINARY_RHS:
-      code = gimple_assign_rhs_code (stmt);
-      op_type = TREE_CODE_LENGTH (code);
-      gcc_assert (op_type == binary_op);
-      ops[0] = gimple_assign_rhs1 (stmt);
-      ops[1] = gimple_assign_rhs2 (stmt);
-      break;
-
     case GIMPLE_TERNARY_RHS:
-      code = gimple_assign_rhs_code (stmt);
-      op_type = TREE_CODE_LENGTH (code);
-      gcc_assert (op_type == ternary_op);
+      ops[2] = gimple_assign_rhs3 (stmt);
+      /* Fall thru.  */
+    case GIMPLE_BINARY_RHS:
       ops[0] = gimple_assign_rhs1 (stmt);
       ops[1] = gimple_assign_rhs2 (stmt);
-      ops[2] = gimple_assign_rhs3 (stmt);
       break;
-
-    case GIMPLE_UNARY_RHS:
-      return false;
-
     default:
       gcc_unreachable ();
     }
@@ -6641,110 +6629,19 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
      reduction variable.  */
   stmt_vec_info phi_info = STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info));
   gphi *reduc_def_phi = as_a <gphi *> (phi_info->stmt);
-  tree reduc_def = PHI_RESULT (reduc_def_phi);
-  int reduc_index = -1;
-  for (i = 0; i < op_type; i++)
-    {
-      /* The condition of COND_EXPR is checked in vectorizable_condition().  */
-      if (i == 0 && code == COND_EXPR)
-        continue;
-
-      stmt_vec_info def_stmt_info;
-      enum vect_def_type dt;
-      tree tem;
-      is_simple_use = vect_is_simple_use (ops[i], loop_vinfo, &dt, &tem,
-					  &def_stmt_info);
-      gcc_assert (is_simple_use);
-      if (dt == vect_reduction_def
-	  && ops[i] == reduc_def)
-	{
-	  reduc_index = i;
-	  continue;
-	}
-      else if (tem)
-	{
-	  /* To properly compute ncopies we are interested in the widest
-	     input type in case we're looking at a widening accumulation.  */
-	  if (!vectype_in
-	      || (GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (vectype_in)))
-		  < GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (tem)))))
-	    vectype_in = tem;
-	}
-
-      if (dt == vect_nested_cycle
-	  && ops[i] == reduc_def)
-	{
-	  reduc_index = i;
-	}
-    }
-
-  if (!vectype_in)
-    vectype_in = vectype_out;
+  int reduc_index = STMT_VINFO_REDUC_IDX (reduc_info);
+  tree vectype_in = STMT_VINFO_REDUC_VECTYPE_IN (reduc_info);
 
   if (slp_node)
-    ncopies = 1;
-  else
-    ncopies = vect_get_num_copies (loop_vinfo, vectype_in);
-
-  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
-
-  /* In case of widenning multiplication by a constant, we update the type
-     of the constant to be the type of the other operand.  We check that the
-     constant fits the type in the pattern recognition pass.  */
-  if (code == DOT_PROD_EXPR
-      && !types_compatible_p (TREE_TYPE (ops[0]), TREE_TYPE (ops[1])))
     {
-      gcc_unreachable ();
-      /* No testcase for this.  PR49478.  */
-      if (TREE_CODE (ops[0]) == INTEGER_CST)
-        ops[0] = fold_convert (TREE_TYPE (ops[1]), ops[0]);
-      else if (TREE_CODE (ops[1]) == INTEGER_CST)
-        ops[1] = fold_convert (TREE_TYPE (ops[0]), ops[1]);
+      ncopies = 1;
+      vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
     }
-
-  /* In case the vectorization factor (VF) is bigger than the number
-     of elements that we can fit in a vectype (nunits), we have to generate
-     more than one vector stmt - i.e - we need to "unroll" the
-     vector stmt by a factor VF/nunits.  For more details see documentation
-     in vectorizable_operation.  */
-
-  /* If the reduction is used in an outer loop we need to generate
-     VF intermediate results, like so (e.g. for ncopies=2):
-	r0 = phi (init, r0)
-	r1 = phi (init, r1)
-	r0 = x0 + r0;
-        r1 = x1 + r1;
-    (i.e. we generate VF results in 2 registers).
-    In this case we have a separate def-use cycle for each copy, and therefore
-    for each copy we get the vector def for the reduction variable from the
-    respective phi node created for this copy.
-
-    Otherwise (the reduction is unused in the loop nest), we can combine
-    together intermediate results, like so (e.g. for ncopies=2):
-	r = phi (init, r)
-	r = x0 + r;
-	r = x1 + r;
-   (i.e. we generate VF/2 results in a single register).
-   In this case for each copy we get the vector def for the reduction variable
-   from the vectorized reduction operation generated in the previous iteration.
-
-   This only works when we see both the reduction PHI and its only consumer
-   in vectorizable_reduction and there are no intermediate stmts
-   participating.  */
-  stmt_vec_info use_stmt_info;
-  tree reduc_phi_result = gimple_phi_result (reduc_def_phi);
-  if (ncopies > 1
-      && (STMT_VINFO_RELEVANT (stmt_info) <= vect_used_only_live)
-      && (use_stmt_info = loop_vinfo->lookup_single_use (reduc_phi_result))
-      && (!STMT_VINFO_IN_PATTERN_P (use_stmt_info)
-	  || !STMT_VINFO_PATTERN_DEF_SEQ (use_stmt_info))
-      && vect_stmt_to_vectorize (use_stmt_info) == stmt_info)
-    single_defuse_cycle = true;
-
-  if (slp_node)
-    vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
   else
-    vec_num = 1;
+    {
+      ncopies = vect_get_num_copies (loop_vinfo, vectype_in);
+      vec_num = 1;
+    }
 
   internal_fn cond_fn = get_conditional_internal_fn (code);
   vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
@@ -6768,6 +6665,7 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 
   bool masked_loop_p = LOOP_VINFO_FULLY_MASKED_P (loop_vinfo);
 
+  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
   if (reduction_type == FOLD_LEFT_REDUCTION)
     {
       internal_fn reduc_fn = STMT_VINFO_REDUC_FN (reduc_info);
@@ -6776,6 +6674,7 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	   reduc_fn, ops, vectype_in, reduc_index, masks);
     }
 
+  bool single_defuse_cycle = STMT_VINFO_FORCE_SINGLE_CYCLE (reduc_info);
   gcc_assert (single_defuse_cycle
 	      || code == DOT_PROD_EXPR
 	      || code == WIDEN_SUM_EXPR
@@ -6935,10 +6834,8 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
 			  slp_tree slp_node, slp_instance slp_node_instance)
 {
   tree vectype_out = STMT_VINFO_VECTYPE (stmt_info);
-  tree vectype_in = NULL_TREE;
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
-  enum vect_def_type dt;
   int i;
   int ncopies;
   stmt_vec_info prev_phi_info;
@@ -6952,9 +6849,6 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
       nested_cycle = true;
     }
 
-  gphi *phi = as_a <gphi *> (stmt_info->stmt);
-  tree phi_result = gimple_phi_result (phi);
-
   stmt_vec_info reduc_stmt_info = STMT_VINFO_REDUC_DEF (stmt_info);
   reduc_stmt_info = vect_stmt_to_vectorize (reduc_stmt_info);
   stmt_vec_info reduc_info = info_for_reduction (stmt_info);
@@ -6965,26 +6859,8 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
     /* Leave the scalar phi in place.  */
     return true;
 
-  if (gassign *reduc_stmt = dyn_cast <gassign *> (reduc_stmt_info->stmt))
-    for (unsigned k = 1; k < gimple_num_ops (reduc_stmt); ++k)
-      {
-	tree op = gimple_op (reduc_stmt, k);
-	if (op == phi_result)
-	  continue;
-	if (k == 1 && gimple_assign_rhs_code (reduc_stmt) == COND_EXPR)
-	  continue;
-	bool is_simple_use = vect_is_simple_use (op, loop_vinfo, &dt);
-	gcc_assert (is_simple_use);
-	if (dt == vect_constant_def || dt == vect_external_def)
-	  continue;
-	if (!vectype_in
-	    || (GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (vectype_in)))
-		< GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (op)))))
-	  vectype_in = get_vectype_for_scalar_type (TREE_TYPE (op));
-	break;
-      }
-  /* For a nested cycle we might end up with an operation like
-     phi_result * phi_result.  */
+  tree vectype_in = STMT_VINFO_REDUC_VECTYPE_IN (reduc_info);
+  /* For a nested cycle we do not fill the above.  */
   if (!vectype_in)
     vectype_in = STMT_VINFO_VECTYPE (stmt_info);
   gcc_assert (vectype_in);
@@ -7003,19 +6879,15 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
       ncopies = vect_get_num_copies (loop_vinfo, vectype_in);
     }
 
-  /* Check whether we can use a single PHI node and accumulate
+  /* Check whether we should use a single PHI node and accumulate
      vectors to one before the backedge.  */
-  stmt_vec_info use_stmt_info;
-  if (ncopies > 1
-      && STMT_VINFO_RELEVANT (reduc_stmt_info) <= vect_used_only_live
-      && (use_stmt_info = loop_vinfo->lookup_single_use (phi_result))
-      && (!STMT_VINFO_IN_PATTERN_P (use_stmt_info)
-	  || !STMT_VINFO_PATTERN_DEF_SEQ (use_stmt_info))
-      && vect_stmt_to_vectorize (use_stmt_info) == reduc_stmt_info)
+  if (STMT_VINFO_FORCE_SINGLE_CYCLE (reduc_info))
     ncopies = 1;
 
   /* Create the destination vector  */
-  tree vec_dest = vect_create_destination_var (phi_result, vectype_out);
+  gphi *phi = as_a <gphi *> (stmt_info->stmt);
+  tree vec_dest = vect_create_destination_var (gimple_phi_result (phi),
+					       vectype_out);
 
   /* Get the loop-entry arguments.  */
   tree vec_initial_def;
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 71ea6ad..484de4f 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -961,6 +961,12 @@ public:
      corresponding PHI.  */
   stmt_vec_info reduc_def;
 
+  /* The vector input type relevant for reduction vectorization.  */
+  tree reduc_vectype_in;
+
+  /* Whether we force a single cycle PHI during reduction vectorization.  */
+  bool force_single_cycle;
+
   /* Whether on this stmt reduction meta is recorded.  */
   bool is_reduc_info;
 
@@ -1050,6 +1056,7 @@ STMT_VINFO_BB_VINFO (stmt_vec_info stmt_vinfo)
 #define STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL(S) (S)->induc_cond_initial_val
 #define STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT(S) (S)->reduc_epilogue_adjustment
 #define STMT_VINFO_REDUC_IDX(S)		   (S)->reduc_idx
+#define STMT_VINFO_FORCE_SINGLE_CYCLE(S)   (S)->force_single_cycle
 
 #define STMT_VINFO_DR_WRT_VEC_LOOP(S)      (S)->dr_wrt_vec_loop
 #define STMT_VINFO_DR_BASE_ADDRESS(S)      (S)->dr_wrt_vec_loop.base_address
@@ -1083,6 +1090,7 @@ STMT_VINFO_BB_VINFO (stmt_vec_info stmt_vinfo)
 #define STMT_VINFO_REDUC_CODE(S)	(S)->reduc_code
 #define STMT_VINFO_REDUC_FN(S)		(S)->reduc_fn
 #define STMT_VINFO_REDUC_DEF(S)		(S)->reduc_def
+#define STMT_VINFO_REDUC_VECTYPE_IN(S)  (S)->reduc_vectype_in
 #define STMT_VINFO_SLP_VECT_ONLY(S)     (S)->slp_vect_only_p
 
 #define DR_GROUP_FIRST_ELEMENT(S) \
-- 
cgit v1.1


From 34a829a041ae0b8e002c20b9ee8c7497efd862d2 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <gjl@gcc.gnu.org>
Date: Wed, 9 Oct 2019 08:49:08 +0000
Subject: * config/avr/avr.md: Fix typo in a comment.

From-SVN: r276755
---
 gcc/config/avr/avr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md
index e85bf49..f711d4e 100644
--- a/gcc/config/avr/avr.md
+++ b/gcc/config/avr/avr.md
@@ -344,7 +344,7 @@
   })
 
 
-;; Defining nonlocal_goto_receiver means we must also define this.
+;; Defining nonlocal_goto_receiver means we must also define this
 ;; even though its function is identical to that in builtins.c
 
 (define_expand "nonlocal_goto"
-- 
cgit v1.1


From e3423d768d880f6a9687c2ee0c2e44b8292d44ad Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <gjl@gcc.gnu.org>
Date: Wed, 9 Oct 2019 09:05:04 +0000
Subject: avr-mmcu.texi: Re-generate because config/avr/avr-devices.c was
 changed in r269487.

	* doc/avr-mmcu.texi: Re-generate because config/avr/avr-devices.c
	was changed in r269487.

From-SVN: r276756
---
 gcc/doc/avr-mmcu.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/doc/avr-mmcu.texi b/gcc/doc/avr-mmcu.texi
index ea0161e..99cd93c 100644
--- a/gcc/doc/avr-mmcu.texi
+++ b/gcc/doc/avr-mmcu.texi
@@ -21,7 +21,7 @@
 @*@var{mcu}@tie{}= @code{ata5272}, @code{ata6616c}, @code{attiny13}, @code{attiny13a}, @code{attiny2313}, @code{attiny2313a}, @code{attiny24}, @code{attiny24a}, @code{attiny25}, @code{attiny261}, @code{attiny261a}, @code{attiny43u}, @code{attiny4313}, @code{attiny44}, @code{attiny44a}, @code{attiny441}, @code{attiny45}, @code{attiny461}, @code{attiny461a}, @code{attiny48}, @code{attiny828}, @code{attiny84}, @code{attiny84a}, @code{attiny841}, @code{attiny85}, @code{attiny861}, @code{attiny861a}, @code{attiny87}, @code{attiny88}, @code{at86rf401}.
 
 @item avr3
-``Classic'' devices with 16@tie{}KiB up to 64@tie{}KiB of  program memory.
+``Classic'' devices with 16@tie{}KiB up to 64@tie{}KiB of program memory.
 @*@var{mcu}@tie{}= @code{at43usb355}, @code{at76c711}.
 
 @item avr31
-- 
cgit v1.1


From 4a8841c0413d52261a8d024577381582d07a866a Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 9 Oct 2019 13:36:33 +0000
Subject: tree-vect-loop.c (vect_is_simple_reduction): Simplify and allow stmts
 other than GIMPLE_ASSIGN in nested cycles.

2019-10-09  Richard Biener  <rguenther@suse.de>

	* tree-vect-loop.c (vect_is_simple_reduction): Simplify and
	allow stmts other than GIMPLE_ASSIGN in nested cycles.

	* gcc.dg/vect/vect-outer-call-1.c: New testcase.

From-SVN: r276760
---
 gcc/ChangeLog                                 |  5 ++
 gcc/testsuite/ChangeLog                       |  4 ++
 gcc/testsuite/gcc.dg/vect/vect-outer-call-1.c | 22 +++++++
 gcc/tree-vect-loop.c                          | 89 +++++++++------------------
 4 files changed, 59 insertions(+), 61 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/vect/vect-outer-call-1.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0214310..330e13b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-09  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-loop.c (vect_is_simple_reduction): Simplify and
+	allow stmts other than GIMPLE_ASSIGN in nested cycles.
+
 2019-10-08  Richard Biener  <rguenther@suse.de>
 
 	* tree-vectorizer.h (_stmt_vec_info::reduc_vectype_in): New.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a1f3966..4c7dfe7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-09  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/vect-outer-call-1.c: New testcase.
+
 2019-10-08  Alexandre Oliva <oliva@adacore.com>
 
 	* gcc.target/i386/20060512-1.c (sse2_test): Use a
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-call-1.c b/gcc/testsuite/gcc.dg/vect/vect-outer-call-1.c
new file mode 100644
index 0000000..f26d422
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-call-1.c
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-math-errno" } */
+
+void
+foo (float * __restrict x, float *y, int n, int m)
+{
+  if (m > 0)
+    for (int i = 0; i < n; ++i)
+      {
+	float tem = x[i], tem1;
+	for (int j = 0; j < m; ++j)
+	  {
+	    tem += y[j];
+	    tem1 = tem;
+	    tem = __builtin_sqrtf (tem);
+	  }
+	x[i] = tem - tem1;
+      }
+}
+
+/* { dg-final { scan-tree-dump "OUTER LOOP VECTORIZED" "vect" { target { vect_call_sqrtf } } } } */
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index a9ea0ca..1435210 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2756,10 +2756,8 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
   enum tree_code orig_code, code;
   tree op1, op2, op3 = NULL_TREE, op4 = NULL_TREE;
   tree type;
-  tree name;
   imm_use_iterator imm_iter;
   use_operand_p use_p;
-  bool phi_def;
 
   *double_reduc = false;
   STMT_VINFO_REDUC_TYPE (phi_info) = TREE_CODE_REDUCTION;
@@ -2791,44 +2789,24 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       phi_use_stmt = use_stmt;
     }
 
-  edge latch_e = loop_latch_edge (loop);
-  tree loop_arg = PHI_ARG_DEF_FROM_EDGE (phi, latch_e);
-  if (TREE_CODE (loop_arg) != SSA_NAME)
+  tree latch_def = PHI_ARG_DEF_FROM_EDGE (phi, loop_latch_edge (loop));
+  if (TREE_CODE (latch_def) != SSA_NAME)
     {
       if (dump_enabled_p ())
 	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			 "reduction: not ssa_name: %T\n", loop_arg);
+			 "reduction: not ssa_name: %T\n", latch_def);
       return NULL;
     }
 
-  stmt_vec_info def_stmt_info = loop_info->lookup_def (loop_arg);
+  stmt_vec_info def_stmt_info = loop_info->lookup_def (latch_def);
   if (!def_stmt_info
       || !flow_bb_inside_loop_p (loop, gimple_bb (def_stmt_info->stmt)))
     return NULL;
 
-  if (gassign *def_stmt = dyn_cast <gassign *> (def_stmt_info->stmt))
-    {
-      name = gimple_assign_lhs (def_stmt);
-      phi_def = false;
-    }
-  else if (gphi *def_stmt = dyn_cast <gphi *> (def_stmt_info->stmt))
-    {
-      name = PHI_RESULT (def_stmt);
-      phi_def = true;
-    }
-  else
-    {
-      if (dump_enabled_p ())
-	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			 "reduction: unhandled reduction operation: %G",
-			 def_stmt_info->stmt);
-      return NULL;
-    }
-
   unsigned nlatch_def_loop_uses = 0;
   auto_vec<gphi *, 3> lcphis;
   bool inner_loop_of_double_reduc = false;
-  FOR_EACH_IMM_USE_FAST (use_p, imm_iter, name)
+  FOR_EACH_IMM_USE_FAST (use_p, imm_iter, latch_def)
     {
       gimple *use_stmt = USE_STMT (use_p);
       if (is_gimple_debug (use_stmt))
@@ -2846,11 +2824,21 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 	}
     }
 
+  /* If we are vectorizing an inner reduction we are executing that
+     in the original order only in case we are not dealing with a
+     double reduction.  */
+  if (nested_in_vect_loop && !inner_loop_of_double_reduc)
+    {
+      if (dump_enabled_p ())
+	report_vect_op (MSG_NOTE, def_stmt_info->stmt,
+			"detected nested cycle: ");
+      return def_stmt_info;
+    }
+
   /* If this isn't a nested cycle or if the nested cycle reduction value
      is used ouside of the inner loop we cannot handle uses of the reduction
      value.  */
-  if ((!nested_in_vect_loop || inner_loop_of_double_reduc)
-      && (nlatch_def_loop_uses > 1 || nphi_def_loop_uses > 1))
+  if (nlatch_def_loop_uses > 1 || nphi_def_loop_uses > 1)
     {
       if (dump_enabled_p ())
 	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
@@ -2860,9 +2848,8 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 
   /* If DEF_STMT is a phi node itself, we expect it to have a single argument
      defined in the inner loop.  */
-  if (phi_def)
+  if (gphi *def_stmt = dyn_cast <gphi *> (def_stmt_info->stmt))
     {
-      gphi *def_stmt = as_a <gphi *> (def_stmt_info->stmt);
       op1 = PHI_ARG_DEF (def_stmt, 0);
 
       if (gimple_phi_num_args (def_stmt) != 1
@@ -2895,35 +2882,16 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       return NULL;
     }
 
-  /* If we are vectorizing an inner reduction we are executing that
-     in the original order only in case we are not dealing with a
-     double reduction.  */
-  bool check_reduction = true;
-  if (flow_loop_nested_p (vect_loop, loop))
-    {
-      gphi *lcphi;
-      unsigned i;
-      check_reduction = false;
-      FOR_EACH_VEC_ELT (lcphis, i, lcphi)
-	FOR_EACH_IMM_USE_FAST (use_p, imm_iter, gimple_phi_result (lcphi))
-	  {
-	    gimple *use_stmt = USE_STMT (use_p);
-	    if (is_gimple_debug (use_stmt))
-	      continue;
-	    if (! flow_bb_inside_loop_p (vect_loop, gimple_bb (use_stmt)))
-	      check_reduction = true;
-	  }
-    }
-
-  gassign *def_stmt = as_a <gassign *> (def_stmt_info->stmt);
-  code = orig_code = gimple_assign_rhs_code (def_stmt);
-
-  if (nested_in_vect_loop && !check_reduction)
+  gassign *def_stmt = dyn_cast <gassign *> (def_stmt_info->stmt);
+  if (!def_stmt)
     {
       if (dump_enabled_p ())
-	report_vect_op (MSG_NOTE, def_stmt, "detected nested cycle: ");
-      return def_stmt_info;
+	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			 "reduction: unhandled reduction operation: %G",
+			 def_stmt_info->stmt);
+      return NULL;
     }
+  code = orig_code = gimple_assign_rhs_code (def_stmt);
 
   /* We can handle "res -= x[i]", which is non-associative by
      simply rewriting this into "res += -x[i]".  Avoid changing
@@ -3018,8 +2986,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
      vectorizing an outer-loop: the inner-loop is executed sequentially,
      and therefore vectorizing reductions in the inner-loop during
      outer-loop vectorization is safe.  */
-  if (check_reduction
-      && STMT_VINFO_REDUC_TYPE (phi_info) == TREE_CODE_REDUCTION
+  if (STMT_VINFO_REDUC_TYPE (phi_info) == TREE_CODE_REDUCTION
       && needs_fold_left_reduction_p (type, code))
     STMT_VINFO_REDUC_TYPE (phi_info) = FOLD_LEFT_REDUCTION;
 
@@ -3066,9 +3033,9 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       return def_stmt_info;
     }
 
-  /* Look for the expression computing loop_arg from loop PHI result.  */
+  /* Look for the expression computing latch_def from loop PHI result.  */
   auto_vec<std::pair<ssa_op_iter, use_operand_p> > path;
-  if (check_reduction_path (vect_location, loop, phi, loop_arg, code,
+  if (check_reduction_path (vect_location, loop, phi, latch_def, code,
 			    path))
     {
       /* Try building an SLP reduction chain for which the additional
-- 
cgit v1.1


From 8cb6a77590957942e124b34e0bb0827d1404f341 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 9 Oct 2019 17:17:19 +0000
Subject: decl.c (grok_ctor_properties): Use DECL_SOURCE_LOCATION.

/cp
2019-10-09  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grok_ctor_properties): Use DECL_SOURCE_LOCATION.
	* typeck.c (cp_build_binary_op): Use the op_location_t argument
	in many error messages.

/testsuite
2019-10-09  Paolo Carlini  <paolo.carlini@oracle.com>

	* c-c++-common/Waddress-1.c: Test locations too.
	* c-c++-common/Wpointer-compare-1.c: Likewise.
	* c-c++-common/Wshift-count-negative-1.c: Likewise.
	* c-c++-common/Wshift-count-overflow-1.c: Likewise.
	* c-c++-common/Wshift-negative-value-1.c: Likewise.
	* c-c++-common/Wshift-negative-value-2.c: Likewise.
	* c-c++-common/Wshift-negative-value-5.c: Likewise.
	* c-c++-common/pr48418.c: Likewise.
	* c-c++-common/pr65830.c: Likewise.
	* c-c++-common/pr69764.c: Likewise.
	* g++.dg/cpp0x/constexpr-array-ptr10.C: Likewise.
	* g++.dg/cpp0x/nullptr37.C: Likewise.
	* g++.dg/template/crash126.C: Likewise.
	* g++.dg/template/crash129.C: Likewise.
	* g++.dg/warn/Wextra-3.C: Likewise.
	* g++.dg/warn/Wfloat-equal-1.C: Likewise.
	* g++.dg/warn/Wstring-literal-comparison-1.C: Likewise.
	* g++.dg/warn/Wstring-literal-comparison-2.C: Likewise.
	* g++.dg/warn/pointer-integer-comparison.C: Likewise.
	* g++.old-deja/g++.jason/crash8.C: Likewise.

From-SVN: r276763
---
 gcc/cp/ChangeLog                                   |  6 ++
 gcc/cp/decl.c                                      |  3 +-
 gcc/cp/typeck.c                                    | 81 ++++++++++++----------
 gcc/testsuite/ChangeLog                            | 23 ++++++
 gcc/testsuite/c-c++-common/Waddress-1.c            |  8 +--
 gcc/testsuite/c-c++-common/Wpointer-compare-1.c    | 40 +++++------
 .../c-c++-common/Wshift-count-negative-1.c         |  4 +-
 .../c-c++-common/Wshift-count-overflow-1.c         |  4 +-
 .../c-c++-common/Wshift-negative-value-1.c         |  6 +-
 .../c-c++-common/Wshift-negative-value-2.c         |  6 +-
 .../c-c++-common/Wshift-negative-value-5.c         |  6 +-
 gcc/testsuite/c-c++-common/pr48418.c               | 16 ++---
 gcc/testsuite/c-c++-common/pr65830.c               |  8 +--
 gcc/testsuite/c-c++-common/pr69764.c               | 12 ++--
 gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr10.C | 16 ++---
 gcc/testsuite/g++.dg/cpp0x/nullptr37.C             | 72 +++++++++----------
 gcc/testsuite/g++.dg/template/crash126.C           |  2 +-
 gcc/testsuite/g++.dg/template/crash129.C           |  2 +-
 gcc/testsuite/g++.dg/warn/Wextra-3.C               |  8 +--
 gcc/testsuite/g++.dg/warn/Wfloat-equal-1.C         |  8 +--
 .../g++.dg/warn/Wstring-literal-comparison-1.C     |  2 +-
 .../g++.dg/warn/Wstring-literal-comparison-2.C     |  2 +-
 .../g++.dg/warn/pointer-integer-comparison.C       | 12 ++--
 gcc/testsuite/g++.old-deja/g++.jason/crash8.C      |  2 +-
 24 files changed, 194 insertions(+), 155 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0e8d930..d75ea5d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* decl.c (grok_ctor_properties): Use DECL_SOURCE_LOCATION.
+	* typeck.c (cp_build_binary_op): Use the op_location_t argument
+	in many error messages.
+
 2019-10-08  Martin Sebor  <msebor@redhat.com>
 
 	PR c++/92001
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index e405367..72c02af 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -13738,7 +13738,8 @@ grok_ctor_properties (const_tree ctype, const_tree decl)
 	 or implicitly defined), there's no need to worry about their
 	 existence.  Theoretically, they should never even be
 	 instantiated, but that's hard to forestall.  */
-      error ("invalid constructor; you probably meant %<%T (const %T&)%>",
+      error_at (DECL_SOURCE_LOCATION (decl),
+		"invalid constructor; you probably meant %<%T (const %T&)%>",
 		ctype, ctype);
       return false;
     }
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index d549450..1d9e9b8 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4475,7 +4475,8 @@ cp_build_binary_op (const op_location_t &location,
       if (t != error_mark_node)
 	{
 	  if (complain & tf_error)
-	    permerror (input_location, "assuming cast to type %qT from overloaded function",
+	    permerror (location,
+		       "assuming cast to type %qT from overloaded function",
 		       TREE_TYPE (t));
 	  op0 = t;
 	}
@@ -4486,7 +4487,8 @@ cp_build_binary_op (const op_location_t &location,
       if (t != error_mark_node)
 	{
 	  if (complain & tf_error)
-	    permerror (input_location, "assuming cast to type %qT from overloaded function",
+	    permerror (location,
+		       "assuming cast to type %qT from overloaded function",
 		       TREE_TYPE (t));
 	  op1 = t;
 	}
@@ -4809,16 +4811,16 @@ cp_build_binary_op (const op_location_t &location,
 		{
 		  if ((complain & tf_warning)
 		      && c_inhibit_evaluation_warnings == 0)
-		    warning (OPT_Wshift_count_negative,
-			     "right shift count is negative");
+		    warning_at (location, OPT_Wshift_count_negative,
+				"right shift count is negative");
 		}
 	      else
 		{
 		  if (compare_tree_int (const_op1, TYPE_PRECISION (type0)) >= 0
 		      && (complain & tf_warning)
 		      && c_inhibit_evaluation_warnings == 0)
-		    warning (OPT_Wshift_count_overflow,
-			     "right shift count >= width of type");
+		    warning_at (location, OPT_Wshift_count_overflow,
+				"right shift count >= width of type");
 		}
 	    }
 	  /* Avoid converting op1 to result_type later.  */
@@ -4856,24 +4858,24 @@ cp_build_binary_op (const op_location_t &location,
 	      && tree_int_cst_sgn (const_op0) < 0
 	      && (complain & tf_warning)
 	      && c_inhibit_evaluation_warnings == 0)
-	    warning (OPT_Wshift_negative_value,
-		     "left shift of negative value");
+	    warning_at (location, OPT_Wshift_negative_value,
+			"left shift of negative value");
 	  if (TREE_CODE (const_op1) == INTEGER_CST)
 	    {
 	      if (tree_int_cst_lt (const_op1, integer_zero_node))
 		{
 		  if ((complain & tf_warning)
 		      && c_inhibit_evaluation_warnings == 0)
-		    warning (OPT_Wshift_count_negative,
-			     "left shift count is negative");
+		    warning_at (location, OPT_Wshift_count_negative,
+				"left shift count is negative");
 		}
 	      else if (compare_tree_int (const_op1,
 					 TYPE_PRECISION (type0)) >= 0)
 		{
 		  if ((complain & tf_warning)
 		      && c_inhibit_evaluation_warnings == 0)
-		    warning (OPT_Wshift_count_overflow,
-			     "left shift count >= width of type");
+		    warning_at (location, OPT_Wshift_count_overflow,
+				"left shift count >= width of type");
 		}
 	      else if (TREE_CODE (const_op0) == INTEGER_CST
 		       && (complain & tf_warning))
@@ -4920,8 +4922,9 @@ cp_build_binary_op (const op_location_t &location,
       if ((complain & tf_warning)
 	  && c_inhibit_evaluation_warnings == 0
 	  && (FLOAT_TYPE_P (type0) || FLOAT_TYPE_P (type1)))
-	warning (OPT_Wfloat_equal,
-		 "comparing floating-point with %<==%> or %<!=%> is unsafe");
+	warning_at (location, OPT_Wfloat_equal,
+		    "comparing floating-point with %<==%> "
+		    "or %<!=%> is unsafe");
       if (complain & tf_warning)
 	{
 	  tree stripped_orig_op0 = tree_strip_any_location_wrapper (orig_op0);
@@ -4930,8 +4933,9 @@ cp_build_binary_op (const op_location_t &location,
 	       && !integer_zerop (cp_fully_fold (op1)))
 	      || (TREE_CODE (stripped_orig_op1) == STRING_CST
 		  && !integer_zerop (cp_fully_fold (op0))))
-	    warning (OPT_Waddress, "comparison with string literal results "
-		     "in unspecified behavior");
+	    warning_at (location, OPT_Waddress,
+			"comparison with string literal results in "
+			"unspecified behavior");
 	}
 
       build_type = boolean_type_node;
@@ -4955,11 +4959,11 @@ cp_build_binary_op (const op_location_t &location,
 	  if (char_type_p (TREE_TYPE (orig_op1)))
 	    {
 	      auto_diagnostic_group d;
-	      if (warning (OPT_Wpointer_compare,
-			     "comparison between pointer and zero character "
-			     "constant"))
-		inform (input_location,
-			  "did you mean to dereference the pointer?");
+	      if (warning_at (location, OPT_Wpointer_compare,
+			      "comparison between pointer and zero character "
+			      "constant"))
+		inform (location,
+			"did you mean to dereference the pointer?");
 	    }
 	  warn_for_null_address (location, op0, complain);
 	}
@@ -4978,10 +4982,10 @@ cp_build_binary_op (const op_location_t &location,
 	  if (char_type_p (TREE_TYPE (orig_op0)))
 	    {
 	      auto_diagnostic_group d;
-	      if (warning (OPT_Wpointer_compare,
+	      if (warning_at (location, OPT_Wpointer_compare,
 			     "comparison between pointer and zero character "
 			     "constant"))
-		inform (input_location,
+		inform (location,
 			"did you mean to dereference the pointer?");
 	    }
 	  warn_for_null_address (location, op1, complain);
@@ -4996,8 +5000,9 @@ cp_build_binary_op (const op_location_t &location,
       else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
 	{
 	  result_type = type0;
-	  if (complain & tf_error) 
-            permerror (input_location, "ISO C++ forbids comparison between pointer and integer");
+	  if (complain & tf_error)
+	    permerror (location, "ISO C++ forbids comparison between "
+		       "pointer and integer");
           else
             return error_mark_node;
 	}
@@ -5005,7 +5010,8 @@ cp_build_binary_op (const op_location_t &location,
 	{
 	  result_type = type1;
 	  if (complain & tf_error)
-	    permerror (input_location, "ISO C++ forbids comparison between pointer and integer");
+	    permerror (location, "ISO C++ forbids comparison between "
+		       "pointer and integer");
           else
             return error_mark_node;
 	}
@@ -5191,8 +5197,9 @@ cp_build_binary_op (const op_location_t &location,
 	  || TREE_CODE (orig_op1) == STRING_CST)
 	{
 	  if (complain & tf_warning)
-	    warning (OPT_Waddress, "comparison with string literal results "
-				   "in unspecified behavior");
+	    warning_at (location, OPT_Waddress,
+			"comparison with string literal results "
+			"in unspecified behavior");
 	}
 
       if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE)
@@ -5267,15 +5274,15 @@ cp_build_binary_op (const op_location_t &location,
 	{
 	  result_type = type0;
 	  if (extra_warnings && (complain & tf_warning))
-	    warning (OPT_Wextra,
-		     "ordered comparison of pointer with integer zero");
+	    warning_at (location, OPT_Wextra,
+			"ordered comparison of pointer with integer zero");
 	}
       else if (code1 == POINTER_TYPE && null_ptr_cst_p (orig_op0))
 	{
 	  result_type = type1;
 	  if (extra_warnings && (complain & tf_warning))
-	    warning (OPT_Wextra,
-		     "ordered comparison of pointer with integer zero");
+	    warning_at (location, OPT_Wextra,
+			"ordered comparison of pointer with integer zero");
 	}
       else if (null_ptr_cst_p (orig_op0) && null_ptr_cst_p (orig_op1))
 	/* One of the operands must be of nullptr_t type.  */
@@ -5284,16 +5291,18 @@ cp_build_binary_op (const op_location_t &location,
 	{
 	  result_type = type0;
 	  if (complain & tf_error)
-	    permerror (input_location, "ISO C++ forbids comparison between pointer and integer");
-          else
+	    permerror (location, "ISO C++ forbids comparison between "
+		       "pointer and integer");
+	  else
             return error_mark_node;
 	}
       else if (code0 == INTEGER_TYPE && code1 == POINTER_TYPE)
 	{
 	  result_type = type1;
 	  if (complain & tf_error)
-	    permerror (input_location, "ISO C++ forbids comparison between pointer and integer");
-          else
+	    permerror (location, "ISO C++ forbids comparison between "
+		       "pointer and integer");
+	  else
             return error_mark_node;
 	}
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4c7dfe7..26a3fcc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,26 @@
+2019-10-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* c-c++-common/Waddress-1.c: Test locations too.
+	* c-c++-common/Wpointer-compare-1.c: Likewise.
+	* c-c++-common/Wshift-count-negative-1.c: Likewise.
+	* c-c++-common/Wshift-count-overflow-1.c: Likewise.
+	* c-c++-common/Wshift-negative-value-1.c: Likewise.
+	* c-c++-common/Wshift-negative-value-2.c: Likewise.
+	* c-c++-common/Wshift-negative-value-5.c: Likewise.
+	* c-c++-common/pr48418.c: Likewise.
+	* c-c++-common/pr65830.c: Likewise.
+	* c-c++-common/pr69764.c: Likewise.
+	* g++.dg/cpp0x/constexpr-array-ptr10.C: Likewise.
+	* g++.dg/cpp0x/nullptr37.C: Likewise.
+	* g++.dg/template/crash126.C: Likewise.
+	* g++.dg/template/crash129.C: Likewise.
+	* g++.dg/warn/Wextra-3.C: Likewise.
+	* g++.dg/warn/Wfloat-equal-1.C: Likewise.
+	* g++.dg/warn/Wstring-literal-comparison-1.C: Likewise.
+	* g++.dg/warn/Wstring-literal-comparison-2.C: Likewise.
+	* g++.dg/warn/pointer-integer-comparison.C: Likewise.
+	* g++.old-deja/g++.jason/crash8.C: Likewise.
+
 2019-10-09  Richard Biener  <rguenther@suse.de>
 
 	* gcc.dg/vect/vect-outer-call-1.c: New testcase.
diff --git a/gcc/testsuite/c-c++-common/Waddress-1.c b/gcc/testsuite/c-c++-common/Waddress-1.c
index 8df5d2f..9790a31 100644
--- a/gcc/testsuite/c-c++-common/Waddress-1.c
+++ b/gcc/testsuite/c-c++-common/Waddress-1.c
@@ -8,8 +8,8 @@ int
 foo ()
 {
   return "foo1" != (void *) 0	/* { dg-bogus "comparison with string literal results in unspecified behavior" } */
-	 && "foo2" != (const char *) ((void *) 0)	/* { dg-bogus "comparison with string literal results in unspecified behavior" } */
-	 && "foo3" != (const char *) ((void *) (10 - 10))	/* { dg-bogus "comparison with string literal results in unspecified behavior" } */
-	 && "foo4" != (const char *) ((void *) (&e - &e))	/* { dg-warning "comparison with string literal results in unspecified behavior" "" { target c } } */
-	 && "foo5" != "foo6";	/* { dg-warning "comparison with string literal results in unspecified behavior" } */
+    && "foo2" != (const char *) ((void *) 0)	/* { dg-bogus "comparison with string literal results in unspecified behavior" } */
+    && "foo3" != (const char *) ((void *) (10 - 10))	/* { dg-bogus "comparison with string literal results in unspecified behavior" } */
+    && "foo4" != (const char *) ((void *) (&e - &e))	/* { dg-warning "15:comparison with string literal results in unspecified behavior" "" { target c } } */
+    && "foo5" != "foo6";	/* { dg-warning "15:comparison with string literal results in unspecified behavior" } */
 }
diff --git a/gcc/testsuite/c-c++-common/Wpointer-compare-1.c b/gcc/testsuite/c-c++-common/Wpointer-compare-1.c
index 440341e..808a0fd 100644
--- a/gcc/testsuite/c-c++-common/Wpointer-compare-1.c
+++ b/gcc/testsuite/c-c++-common/Wpointer-compare-1.c
@@ -8,25 +8,25 @@ f1 (int *p, int **q)
 {
   int r = 0;
 
-  r += p == '\0'; /* { dg-warning "comparison between pointer and zero character" } */
-  r += p == L'\0'; /* { dg-warning "comparison between pointer and zero character" } */
-  r += p != '\0'; /* { dg-warning "comparison between pointer and zero character" } */
-  r += p != L'\0'; /* { dg-warning "comparison between pointer and zero character" } */
+  r += p == '\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += p == L'\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += p != '\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += p != L'\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
 
-  r += '\0' == p; /* { dg-warning "comparison between pointer and zero character" } */
-  r += L'\0' == p; /* { dg-warning "comparison between pointer and zero character" } */
-  r += '\0' != p; /* { dg-warning "comparison between pointer and zero character" } */
-  r += L'\0' != p; /* { dg-warning "comparison between pointer and zero character" } */
+  r += '\0' == p; /* { dg-warning "13:comparison between pointer and zero character" } */
+  r += L'\0' == p; /* { dg-warning "14:comparison between pointer and zero character" } */
+  r += '\0' != p; /* { dg-warning "13:comparison between pointer and zero character" } */
+  r += L'\0' != p; /* { dg-warning "14:comparison between pointer and zero character" } */
 
-  r += q == '\0'; /* { dg-warning "comparison between pointer and zero character" } */
-  r += q == L'\0'; /* { dg-warning "comparison between pointer and zero character" } */
-  r += q != '\0'; /* { dg-warning "comparison between pointer and zero character" } */
-  r += q != L'\0'; /* { dg-warning "comparison between pointer and zero character" } */
+  r += q == '\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += q == L'\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += q != '\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += q != L'\0'; /* { dg-warning "10:comparison between pointer and zero character" } */
 
-  r += '\0' == q; /* { dg-warning "comparison between pointer and zero character" } */
-  r += L'\0' == q; /* { dg-warning "comparison between pointer and zero character" } */
-  r += '\0' != q; /* { dg-warning "comparison between pointer and zero character" } */
-  r += L'\0' != q; /* { dg-warning "comparison between pointer and zero character" } */
+  r += '\0' == q; /* { dg-warning "13:comparison between pointer and zero character" } */
+  r += L'\0' == q; /* { dg-warning "14:comparison between pointer and zero character" } */
+  r += '\0' != q; /* { dg-warning "13:comparison between pointer and zero character" } */
+  r += L'\0' != q; /* { dg-warning "14:comparison between pointer and zero character" } */
 
   return r;
 }
@@ -55,11 +55,11 @@ f3 (int *p)
 {
   int r = 0;
 
-  r += p == (char) 0; /* { dg-warning "comparison between pointer and zero character" } */
-  r += p != (char) 0; /* { dg-warning "comparison between pointer and zero character" } */
+  r += p == (char) 0; /* { dg-warning "10:comparison between pointer and zero character" } */
+  r += p != (char) 0; /* { dg-warning "10:comparison between pointer and zero character" } */
 
-  r += (char) 0 == p; /* { dg-warning "comparison between pointer and zero character" } */
-  r += (char) 0 != p; /* { dg-warning "comparison between pointer and zero character" } */
+  r += (char) 0 == p; /* { dg-warning "17:comparison between pointer and zero character" } */
+  r += (char) 0 != p; /* { dg-warning "17:comparison between pointer and zero character" } */
 
   return r;
 }
diff --git a/gcc/testsuite/c-c++-common/Wshift-count-negative-1.c b/gcc/testsuite/c-c++-common/Wshift-count-negative-1.c
index d883393..6807b98 100644
--- a/gcc/testsuite/c-c++-common/Wshift-count-negative-1.c
+++ b/gcc/testsuite/c-c++-common/Wshift-count-negative-1.c
@@ -3,6 +3,6 @@
 
 void foo()
 {
-  unsigned i1 = 1U << -1; /* { dg-warning "left shift count is negative" } */
-  unsigned i2 = 1U >> -1; /* { dg-warning "right shift count is negative" } */
+  unsigned i1 = 1U << -1; /* { dg-warning "20:left shift count is negative" } */
+  unsigned i2 = 1U >> -1; /* { dg-warning "20:right shift count is negative" } */
 }
diff --git a/gcc/testsuite/c-c++-common/Wshift-count-overflow-1.c b/gcc/testsuite/c-c++-common/Wshift-count-overflow-1.c
index 4d29d57..47225e4 100644
--- a/gcc/testsuite/c-c++-common/Wshift-count-overflow-1.c
+++ b/gcc/testsuite/c-c++-common/Wshift-count-overflow-1.c
@@ -3,6 +3,6 @@
 
 void foo()
 {
-  unsigned i1 = 1U << (sizeof(unsigned) * __CHAR_BIT__); /* { dg-warning "left shift count >= width of type" } */
-  unsigned i2 = 1U >> (sizeof(unsigned) * __CHAR_BIT__); /* { dg-warning "right shift count >= width of type" } */
+  unsigned i1 = 1U << (sizeof(unsigned) * __CHAR_BIT__); /* { dg-warning "20:left shift count >= width of type" } */
+  unsigned i2 = 1U >> (sizeof(unsigned) * __CHAR_BIT__); /* { dg-warning "20:right shift count >= width of type" } */
 }
diff --git a/gcc/testsuite/c-c++-common/Wshift-negative-value-1.c b/gcc/testsuite/c-c++-common/Wshift-negative-value-1.c
index 7df1804..d58d8b9 100644
--- a/gcc/testsuite/c-c++-common/Wshift-negative-value-1.c
+++ b/gcc/testsuite/c-c++-common/Wshift-negative-value-1.c
@@ -6,7 +6,7 @@
 enum E {
   A = 0 << 1,
   B = 1 << 1,
-  C = -1 << 1, /* { dg-warning "left shift of negative value|not an integer constant" } */
+  C = -1 << 1, /* { dg-warning "10:left shift of negative value|not an integer constant" } */
   /* { dg-error "left operand of shift expression" "shift" { target c++ } .-1 } */
   D = 0 >> 1,
   E = 1 >> 1,
@@ -23,10 +23,10 @@ left (int x)
   int r = 0;
   r += z << x;
   r += o << x;
-  r += m << x; /* { dg-warning "left shift of negative value" } */
+  r += m << x; /* { dg-warning "10:left shift of negative value" } */
   r += 0 << x;
   r += 1 << x;
-  r += -1 << x; /* { dg-warning "left shift of negative value" } */
+  r += -1 << x; /* { dg-warning "11:left shift of negative value" } */
   r += -1U << x;
   return r;
 }
diff --git a/gcc/testsuite/c-c++-common/Wshift-negative-value-2.c b/gcc/testsuite/c-c++-common/Wshift-negative-value-2.c
index 3a60ed7e..9f435e8 100644
--- a/gcc/testsuite/c-c++-common/Wshift-negative-value-2.c
+++ b/gcc/testsuite/c-c++-common/Wshift-negative-value-2.c
@@ -6,7 +6,7 @@
 enum E {
   A = 0 << 1,
   B = 1 << 1,
-  C = -1 << 1, /* { dg-warning "left shift of negative value" } */
+  C = -1 << 1, /* { dg-warning "10:left shift of negative value" } */
   /* { dg-error "not an integer constant" "no constant" { target c++ } .-1 } */
   /* { dg-error "left operand of shift expression" "shift" { target c++ } .-2 } */
   D = 0 >> 1,
@@ -24,10 +24,10 @@ left (int x)
   int r = 0;
   r += z << x;
   r += o << x;
-  r += m << x; /* { dg-warning "left shift of negative value" } */
+  r += m << x; /* { dg-warning "10:left shift of negative value" } */
   r += 0 << x;
   r += 1 << x;
-  r += -1 << x; /* { dg-warning "left shift of negative value" } */
+  r += -1 << x; /* { dg-warning "11:left shift of negative value" } */
   r += -1U << x;
   return r;
 }
diff --git a/gcc/testsuite/c-c++-common/Wshift-negative-value-5.c b/gcc/testsuite/c-c++-common/Wshift-negative-value-5.c
index 74ecd1e..3c3e74c 100644
--- a/gcc/testsuite/c-c++-common/Wshift-negative-value-5.c
+++ b/gcc/testsuite/c-c++-common/Wshift-negative-value-5.c
@@ -7,7 +7,7 @@
 enum E {
   A = 0 << 1,
   B = 1 << 1,
-  C = -1 << 1, /* { dg-warning "left shift of negative value" } */
+  C = -1 << 1, /* { dg-warning "10:left shift of negative value" } */
   D = 0 >> 1,
   E = 1 >> 1,
   F = -1 >> 1
@@ -23,10 +23,10 @@ left (int x)
   int r = 0;
   r += z << x;
   r += o << x;
-  r += m << x; /* { dg-warning "left shift of negative value" } */
+  r += m << x; /* { dg-warning "10:left shift of negative value" } */
   r += 0 << x;
   r += 1 << x;
-  r += -1 << x; /* { dg-warning "left shift of negative value" } */
+  r += -1 << x; /* { dg-warning "11:left shift of negative value" } */
   r += -1U << x;
   return r;
 }
diff --git a/gcc/testsuite/c-c++-common/pr48418.c b/gcc/testsuite/c-c++-common/pr48418.c
index 95ff855..1732854 100644
--- a/gcc/testsuite/c-c++-common/pr48418.c
+++ b/gcc/testsuite/c-c++-common/pr48418.c
@@ -8,13 +8,13 @@ foo (int x)
   const int a = sizeof (int) * __CHAR_BIT__;
   const int b = -7;
   int c = 0;
-  c += x << a;				   /* { dg-warning "left shift count >= width of type" } */
-  c += x << b;				   /* { dg-warning "left shift count is negative" } */
-  c += x << (sizeof (int) * __CHAR_BIT__); /* { dg-warning "left shift count >= width of type" } */
-  c += x << -7;				   /* { dg-warning "left shift count is negative" } */
-  c += x >> a;				   /* { dg-warning "right shift count >= width of type" } */
-  c += x >> b;				   /* { dg-warning "right shift count is negative" } */
-  c += x >> (sizeof (int) * __CHAR_BIT__); /* { dg-warning "right shift count >= width of type" } */
-  c += x >> -7;				   /* { dg-warning "right shift count is negative" } */
+  c += x << a;				   /* { dg-warning "10:left shift count >= width of type" } */
+  c += x << b;				   /* { dg-warning "10:left shift count is negative" } */
+  c += x << (sizeof (int) * __CHAR_BIT__); /* { dg-warning "10:left shift count >= width of type" } */
+  c += x << -7;				   /* { dg-warning "10:left shift count is negative" } */
+  c += x >> a;				   /* { dg-warning "10:right shift count >= width of type" } */
+  c += x >> b;				   /* { dg-warning "10:right shift count is negative" } */
+  c += x >> (sizeof (int) * __CHAR_BIT__); /* { dg-warning "10:right shift count >= width of type" } */
+  c += x >> -7;				   /* { dg-warning "10:right shift count is negative" } */
   return c;
 }
diff --git a/gcc/testsuite/c-c++-common/pr65830.c b/gcc/testsuite/c-c++-common/pr65830.c
index e115f18..73eb97c 100644
--- a/gcc/testsuite/c-c++-common/pr65830.c
+++ b/gcc/testsuite/c-c++-common/pr65830.c
@@ -8,9 +8,9 @@ foo (int x)
   const int a = sizeof (int) * __CHAR_BIT__;
   const int b = -7;
   int c = 0;
-  c += x << a;	/* { dg-bogus "left shift count >= width of type" } */
-  c += x << b;	/* { dg-bogus "left shift count is negative" } */
-  c += x >> a;	/* { dg-bogus "right shift count >= width of type" } */
-  c += x >> b;  /* { dg-bogus "right shift count is negative" } */
+  c += x << a;	/* { dg-bogus "10:left shift count >= width of type" } */
+  c += x << b;	/* { dg-bogus "10:left shift count is negative" } */
+  c += x >> a;	/* { dg-bogus "10:right shift count >= width of type" } */
+  c += x >> b;  /* { dg-bogus "10:right shift count is negative" } */
   return c;
 }
diff --git a/gcc/testsuite/c-c++-common/pr69764.c b/gcc/testsuite/c-c++-common/pr69764.c
index 79623ec..146f258 100644
--- a/gcc/testsuite/c-c++-common/pr69764.c
+++ b/gcc/testsuite/c-c++-common/pr69764.c
@@ -4,35 +4,35 @@
 unsigned char
 fn1 (unsigned char a)
 {
-  return a >> ~6;	/* { dg-warning "right shift count is negative" } */
+  return a >> ~6;	/* { dg-warning "12:right shift count is negative" } */
 }
 
 unsigned short
 fn2 (unsigned short a)
 {
-  return a >> ~6;	/* { dg-warning "right shift count is negative" } */
+  return a >> ~6;	/* { dg-warning "12:right shift count is negative" } */
 }
 
 unsigned int
 fn3 (unsigned int a)
 {
-  return a >> ~6;	/* { dg-warning "right shift count is negative" } */
+  return a >> ~6;	/* { dg-warning "12:right shift count is negative" } */
 }
 
 unsigned char
 fn4 (unsigned char a)
 {
-  return a >> 0xff03;	/* { dg-warning "right shift count >= width of type" } */
+  return a >> 0xff03;	/* { dg-warning "12:right shift count >= width of type" } */
 }
 
 unsigned short
 fn5 (unsigned short a)
 {
-  return a >> 0xff03;	/* { dg-warning "right shift count >= width of type" } */
+  return a >> 0xff03;	/* { dg-warning "12:right shift count >= width of type" } */
 }
 
 unsigned int
 fn6 (unsigned int a)
 {
-  return a >> 0xff03;	/* { dg-warning "right shift count >= width of type" } */
+  return a >> 0xff03;	/* { dg-warning "12:right shift count >= width of type" } */
 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr10.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr10.C
index 2ff7c4d..b1d47cf 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr10.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr10.C
@@ -19,18 +19,18 @@ constexpr int *p0 = &i;
 constexpr bool b0  = p0;        // { dg-warning "address of .A::i." }
 constexpr bool b1  = p0 == 0;   // { dg-warning "address of .A::i." }
 constexpr bool b2  = p0 != 0;   // { dg-warning "address of .A::i." }
-constexpr bool b3  = p0 <  0;   // { dg-warning "ordered comparison" }
-constexpr bool b4  = p0 <= 0;   // { dg-warning "ordered comparison" }
-constexpr bool b5  = p0 >  0;   // { dg-warning "ordered comparison" }
-constexpr bool b6  = p0 >= 0;   // { dg-warning "ordered comparison" }
+constexpr bool b3  = p0 <  0;   // { dg-warning "25:ordered comparison" }
+constexpr bool b4  = p0 <= 0;   // { dg-warning "25:ordered comparison" }
+constexpr bool b5  = p0 >  0;   // { dg-warning "25:ordered comparison" }
+constexpr bool b6  = p0 >= 0;   // { dg-warning "25:ordered comparison" }
 
 constexpr bool b7  = !p0;       // { dg-warning "address of .A::i." }
 constexpr bool b8  = 0 == p0;   // { dg-warning "address of .A::i." }
 constexpr bool b9  = 0 != p0;   // { dg-warning "address of .A::i." }
-constexpr bool b10 = 0 <  p0;   // { dg-warning "ordered comparison" }
-constexpr bool b11 = 0 <= p0;   // { dg-warning "ordered comparison" }
-constexpr bool b12 = 0 >  p0;   // { dg-warning "ordered comparison" }
-constexpr bool b13 = 0 >= p0;   // { dg-warning "ordered comparison" }
+constexpr bool b10 = 0 <  p0;   // { dg-warning "24:ordered comparison" }
+constexpr bool b11 = 0 <= p0;   // { dg-warning "24:ordered comparison" }
+constexpr bool b12 = 0 >  p0;   // { dg-warning "24:ordered comparison" }
+constexpr bool b13 = 0 >= p0;   // { dg-warning "24:ordered comparison" }
 
 }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr37.C b/gcc/testsuite/g++.dg/cpp0x/nullptr37.C
index e746a28..6bcc8e81 100644
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr37.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr37.C
@@ -6,41 +6,41 @@ f1 (int *p, int **q)
 {
   int r = 0;
 
-  r += p == '\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p == L'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p == u'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p == U'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p != '\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p != L'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p != u'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p != U'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p == '\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p == L'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p == u'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p == U'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p != '\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p != L'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p != u'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p != U'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
 
-  r += '\0' == p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += L'\0' == p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += u'\0' == p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += U'\0' == p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += '\0' != p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += L'\0' != p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += u'\0' != p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += U'\0' != p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += '\0' == p; // { dg-error "13:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += L'\0' == p; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += u'\0' == p; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += U'\0' == p; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += '\0' != p; // { dg-error "13:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += L'\0' != p; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += u'\0' != p; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += U'\0' != p; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
 
-  r += q == '\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q == L'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q == u'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q == U'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q != '\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q != L'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q != u'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += q != U'\0'; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q == '\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q == L'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q == u'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q == U'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q != '\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q != L'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q != u'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += q != U'\0'; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
 
-  r += '\0' == q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += L'\0' == q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += u'\0' == q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += U'\0' == q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += '\0' != q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += L'\0' != q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += u'\0' != q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += U'\0' != q; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += '\0' == q; // { dg-error "13:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += L'\0' == q; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += u'\0' == q; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += U'\0' == q; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += '\0' != q; // { dg-error "13:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += L'\0' != q; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += u'\0' != q; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += U'\0' != q; // { dg-error "14:ISO C\\+\\+ forbids comparison between pointer and integer" }
 
   return r;
 }
@@ -68,11 +68,11 @@ f3 (int *p)
 {
   int r = 0;
 
-  r += p == (char) 0; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += p != (char) 0; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p == (char) 0; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += p != (char) 0; // { dg-error "10:ISO C\\+\\+ forbids comparison between pointer and integer" }
 
-  r += (char) 0 == p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
-  r += (char) 0 != p; // { dg-error "ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += (char) 0 == p; // { dg-error "17:ISO C\\+\\+ forbids comparison between pointer and integer" }
+  r += (char) 0 != p; // { dg-error "17:ISO C\\+\\+ forbids comparison between pointer and integer" }
 
   return r;
 }
diff --git a/gcc/testsuite/g++.dg/template/crash126.C b/gcc/testsuite/g++.dg/template/crash126.C
index 903cab8..892bc45 100644
--- a/gcc/testsuite/g++.dg/template/crash126.C
+++ b/gcc/testsuite/g++.dg/template/crash126.C
@@ -4,7 +4,7 @@ template < class T, class > struct A
 {
   A ();
   A (A &);
-  A (A < T, T >);  // { dg-error "invalid constructor" }
+  A (A < T, T >);  // { dg-error "3:invalid constructor" }
 };
 
 void f () 
diff --git a/gcc/testsuite/g++.dg/template/crash129.C b/gcc/testsuite/g++.dg/template/crash129.C
index 9f56b80..3bb9e57 100644
--- a/gcc/testsuite/g++.dg/template/crash129.C
+++ b/gcc/testsuite/g++.dg/template/crash129.C
@@ -1,5 +1,5 @@
 // PR c++/79626
 
 template <class a, class> struct b
-{ b(); b(b &); b(b< a, a >); };  // { dg-error "invalid constructor" }
+{ b(); b(b &); b(b< a, a >); };  // { dg-error "16:invalid constructor" }
 int c(b< int, int >(b< int, int >());  // { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/warn/Wextra-3.C b/gcc/testsuite/g++.dg/warn/Wextra-3.C
index 04fdbba..1bf2a6e 100644
--- a/gcc/testsuite/g++.dg/warn/Wextra-3.C
+++ b/gcc/testsuite/g++.dg/warn/Wextra-3.C
@@ -3,7 +3,7 @@
 
 extern void* p;
 
-int f1() { return ( p <  0 ? 1 : 0 ); } // { dg-warning "ordered comparison" }
-int f2() { return ( p <= 0 ? 1 : 0 ); } // { dg-warning "ordered comparison" }
-int f3() { return ( p >  0 ? 1 : 0 ); } // { dg-warning "ordered comparison" }
-int f4() { return ( p >= 0 ? 1 : 0 ); } // { dg-warning "ordered comparison" }
+int f1() { return ( p <  0 ? 1 : 0 ); } // { dg-warning "23:ordered comparison" }
+int f2() { return ( p <= 0 ? 1 : 0 ); } // { dg-warning "23:ordered comparison" }
+int f3() { return ( p >  0 ? 1 : 0 ); } // { dg-warning "23:ordered comparison" }
+int f4() { return ( p >= 0 ? 1 : 0 ); } // { dg-warning "23:ordered comparison" }
diff --git a/gcc/testsuite/g++.dg/warn/Wfloat-equal-1.C b/gcc/testsuite/g++.dg/warn/Wfloat-equal-1.C
index 1b23611..1da0488 100644
--- a/gcc/testsuite/g++.dg/warn/Wfloat-equal-1.C
+++ b/gcc/testsuite/g++.dg/warn/Wfloat-equal-1.C
@@ -4,7 +4,7 @@
 
 double a, b;
 _Complex double c, d;
-int f(void) { return a == b; } /* { dg-warning "comparing floating-point" } */
-int g(void) { return c == d; } /* { dg-warning "comparing floating-point" } */
-int h(void) { return a != b; } /* { dg-warning "comparing floating-point" } */
-int i(void) { return c != d; } /* { dg-warning "comparing floating-point" } */
+int f(void) { return a == b; } /* { dg-warning "24:comparing floating-point" } */
+int g(void) { return c == d; } /* { dg-warning "24:comparing floating-point" } */
+int h(void) { return a != b; } /* { dg-warning "24:comparing floating-point" } */
+int i(void) { return c != d; } /* { dg-warning "24:comparing floating-point" } */
diff --git a/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-1.C b/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-1.C
index 97e3176..8663642 100644
--- a/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-1.C
+++ b/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-1.C
@@ -4,7 +4,7 @@
 
 int test1(char *ptr)
 {
-  return ptr == "foo";  /* { dg-warning "comparison with string" } */
+  return ptr == "foo";  /* { dg-warning "14:comparison with string" } */
 }
 
 int test2()
diff --git a/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-2.C b/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-2.C
index 3eb91ee..fed4c5a 100644
--- a/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-2.C
+++ b/gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-2.C
@@ -4,7 +4,7 @@
 
 int test1(char *ptr)
 {
-  return ptr == "foo";  /* { dg-warning "comparison with string" } */
+  return ptr == "foo";  /* { dg-warning "14:comparison with string" } */
 }
 
 int test2()
diff --git a/gcc/testsuite/g++.dg/warn/pointer-integer-comparison.C b/gcc/testsuite/g++.dg/warn/pointer-integer-comparison.C
index c6b75a7..a0683ca 100644
--- a/gcc/testsuite/g++.dg/warn/pointer-integer-comparison.C
+++ b/gcc/testsuite/g++.dg/warn/pointer-integer-comparison.C
@@ -3,24 +3,24 @@
 
 int foo (int i, void *p)
 {
-  if (i == p) // { dg-warning "ISO C.. forbids comparison between pointer and integer" }
+  if (i == p) // { dg-warning "9:ISO C.. forbids comparison between pointer and integer" }
     return 0;
-  else if (i != p) // { dg-warning "ISO C.. forbids comparison between pointer and integer" }
+  else if (i != p) // { dg-warning "14:ISO C.. forbids comparison between pointer and integer" }
     return 1;
 }
 
 int bar (int i, void *p)
 {
-  if (i < p) // { dg-warning "ISO C.. forbids comparison between pointer and integer" }
+  if (i < p) // { dg-warning "9:ISO C.. forbids comparison between pointer and integer" }
     return 0;
-  else if (i >= p) // { dg-warning "ISO C.. forbids comparison between pointer and integer" }
+  else if (i >= p) // { dg-warning "14:ISO C.. forbids comparison between pointer and integer" }
     return 1;
 }
 
 int baz (int i, void *p)
 {
-  if (i <= p) // { dg-warning "ISO C.. forbids comparison between pointer and integer" }
+  if (i <= p) // { dg-warning "9:ISO C.. forbids comparison between pointer and integer" }
     return 0;
-  else if (i > p) // { dg-warning "ISO C.. forbids comparison between pointer and integer" }
+  else if (i > p) // { dg-warning "14:ISO C.. forbids comparison between pointer and integer" }
     return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/crash8.C b/gcc/testsuite/g++.old-deja/g++.jason/crash8.C
index 061652d..317627a 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/crash8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/crash8.C
@@ -1,7 +1,7 @@
 // { dg-do assemble  }
 struct A {
   A();
-  A(A);				// { dg-error "" } copy ctor must take reference
+  A(A);				// { dg-error "3:invalid constructor" } copy ctor must take reference
 };
 int main()
 {
-- 
cgit v1.1


From cb57504a550158913258e5be8ddb991376475efb Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Wed, 9 Oct 2019 13:20:32 -0400
Subject: Update the concepts implementation to conform to C++20.

gcc/c-family/
	* c-cppbuiltin.c (c_cpp_builtins): Use new feature test values for
	concepts when -std=c++2a. Bump __cpp_concepts to 201907.
	* c.opt: Add -Wconcepts-ts.
	* c-opts.c (c_common_post_options): Warn when -fconcepts is used
	with -std=c++2a. Disable warning for -fconcepts in C++20 mode.
	(set_std_cxx2a): Enable concepts by default.
gcc/cp/
	* call.c (build_new_function_call): Don't evaluate concepts here.
	(constraint_failure): Don't record the template.
	(print_z_candidate): Don't extract the template.
	* class.c (add_method): When overloading, hide ineligible special
	member fns.
	(check_methods): Set TYPE_HAS_COMPLEX_* here.
	* constexpr.c (cxx_eval_constant_expression): Evaluate concepts.
	(maybe_initialize_fundef_copies_table): Remove.
	(get_fundef_copy): Use hash_map_safe_get_or_insert.
	(clear_cv_and_fold_caches): Clear the satisfaction cache.
	* constraint.cc (known_non_bool_p): New.
	(parsing_constraint_expression_sentinel): Renamed from
	expanding_constraint_sentinel.
	(check_constraint_operands): New.
	(check_constraint_atom): New.
	(finish_constraint_binary_op): New.
	(finish_constraint_or_expr): Likewise.
	(finish_constraint_and_expr): Likewise.
	(finish_constraint_primary_expr): Likewise.
	(combine_constraint_expressions): New.
	(finish_requires_expr): Add location parm.
	(get_concept_definition): Return the initializer of concept definitions.
	(get_template_head_requirements): New.
	(get_trailing_function_requirements): New.
	(deduce_constrained_parameter): Check if the identifier or template-id
	is a concept definition.
	(resolve_concept_definition_check): Removed.
	(resolve_variable_concept_check): Removed.
	(resolve_concept_check): New.
	(resolve_constraint_check): Handle concept definitions.
	converting arguments.
	(function_concept_check_p): Removed.
	(variable_concept_check_p): Removed.
	(unpack_concept_check): New.
	(get_concept_check_template): New.
	(build_call_check): Moved and renamed to build_function_check.
	(build_concept_check_arguments): make static.
	(build_function_check): Always do overload resolution
	in order to force conversion of template arguments (i.e., actually
	check that the use of a concept is valid).
	(build_standard_check): Renamed from build_real_concept_check.
	(build_real_concept_check): Build checks for C++2a concepts by
	(build_wildcard_concept_check): New.
	(build_concept_check): Use build_real_concept_check. New overload.
	(build_constraints): Save expressions, not normalized constraints.
	(build_concept_id): New. Pass tf_warning_or_error.
	(build_type_constraint): New.
	(finish_type_constraints): New.
	(associate_classtype_constraints): Also add constraints to union
	types. Note the original declaration in errors. Don't return
	error_mark_node in order to avoid an assertion later.
	(push_down_pack_expansion): Remove.
	(finish_shorthand_constraint): Make fold expressions, not naked
	parameter packs. Always apply the constraint to each template argument.
	(check_introduction_list): New. Fail if not enough
	names are introduced.
	(finish_template_introduction): Don't normalize constraints. Pass
	tsubst flags. Check for insufficient introductions.
	(placeholder_extract_concept_and_args): Handle the template-id case.
	Unpack function concept checks correctly.
	(tsubst_simple_requirement): Return errors if they occur. Don't
	process as a template.
	(tsubst_type_requirement): Likewise.
	(type_deducible_p): New. Wrap the input expression in parens for the
	purpose of deduction.
	(expression_convertible_t): New.
	(tsubst_compound_requirement): Use new deduction, conversion predicates.
	(tsubst_nested_requirement): Return errors if they occur. Don't
	process as a template. Instantiate and evaluate the nested requirement.
	(tsubst_valid_expression_requirement): New.
	(tsubst_simple_requirement): Use tsubst_valid_expression_requirement.
	(tsubst_compound_requirement): Use tsubst_valid_expression_requirement.
	(check_constaint_variables): New.
	(tsubst_constraint_variables): Check that type substitutions are valid.
	(tsubst_requires_expr): Likewise. Produce new requires-exprs during
	template substitution. Copy the previous local specialization stack,
	so references to non-local parameters can be found. Use cp_unevaluated.
	(tsubst_constraint): New. Don't evaluate concept checks.
	(subst_info): New.
	(norm_info): New. Used to build a normalization tree for concept check
	diagnostics.
	(debug_parameter_mapping): New.
	(debug_argument_list): New.
	(expand_concept): Removed.
	(normalize_logical_operation): Pass subst_info through call.
	(normalize_pack_expansion): Remove.
	(normalize_simple_requirement): Removed
	(normalize_type_requirement): Removed
	(normalize_compound_requirement): Removed
	(normalize_nested_requirement): Removed
	(normalize_requirement): Removed
	(normalize_requirements): Removed
	(normalize_requires_expression): Removed
	(normalize_variable_concept_check): Removed.
	(normalize_function_concept_check): Removed.
	(normalize_concept_check): Merged all normalize_*_check here.
	Substitute through written template arguments before normalizing the
	definition. Only substitute the innermost template arguments.
	(check_for_logical_overloads): Delete.
	(map_arguments): New. Associate template parameters with arguments.
	(build_parameter_mapping): New. Extract used parameters.
	(normalize_expression): Rewrite.
	(normalize_conjunction): Removed
	(normalize_disjunction): Removed
	(normalize_predicate_constraint): Removed
	(normalize_parameterized_constraint): Removed
	(normalized_map): New variable.
	(get_normalized_constraints): New entry point for normalization.
	Establishes a timer.
	(get_normalized_constraints_from_info): New.
	(get_normalized_constraints_from_decl): New. Turn on template processing
	prior to normalization. Handle inheriting ctors. Build the
	normalization arguments from the full set of template parameters of the
	most general template. This guarantees that we have no concrete arguments
	in the parameter mapping (e.g., from template members of class
	templates). Cache normalizations.
	(normalize_concept_definition): New. Cache normalizations.
	(normalize_template_requirements): New.
	(normalize_nontemplate_requirements): New.
	(normalize_constraint_expression): New.
	(tsubst_parameter_mapping): New.
	(get_mapped_args): New.
	(parameter_mapping_equivalent_p): New. Use template_args_equal.
	(atomic_constraints_identical_p): New.
	(hash_atomic_constraint): New.
	(satisfying_constraint_p): New. Guard against recursive evaluation of
	constraints during satisfaction.
	(satisfy_conjunction): New.
	(satisfy_disjunction): New.
	(sat_entry): New class for hashing satisfaction results.
	(sat_hasher): New hash traits.
	(sat_cache): New.
	(get_satisfaction): New. Returns cached satisfaction result.
	(save_satisfaction): New. Caches a satisfaction result.
	(clear_satisfaction_cache): New.
	(satisfaction_cache): New. Helps manage satisfaction cache requests.
	(decl_satisfied_cache): New.
	(satisfy_atom): New.
	(satisfy_constraint_r): New.
	(satisfy_constraint): Use new satisfaction algorithm.
	(evaluate_concept_check): New.
	(evaluate_concept): Removed.
	(evaluate_function_concept): Removed.
	(evaluate_variable_concept): Removed.
	(satisfy_constraint_expression): New.
	(constraint_expression_satisfied_p): New.
	(constraints_satisfied_p): Use strip_inheriting_ctors. Use
	push_/pop_access_scope.
	(more_constrained): Normalize before calling out to subsumption. Allow
	classes as arguments.
	(strictly_subsumes): Allow non-templates as arguments. Accept a new
	template argument.
	(weakly_subsumes): New.
	(at_least_as_constrained): Removed.
	(diagnose_other_expression): Removed.
	(diagnose_predicate_constraint): Removed.
	(diagnose_pack_expansion): Removed.
	(diagnose_check_constraint): Removed.
	(diagnose_logical_constraint): Removed.
	(diagnose_expression_constraint): Removed.
	(diagnose_type_constraint): Removed.
	(diagnose_implicit_conversion_constraint): Removed.
	(diagnose_argument_deduction_constraint): Removed.
	(diagnose_exception_constraint): Removed.
	(diagnose_parameterized_constraint): Removed.
	(diagnose_argument_deduction_constraint): Removed.
	(diagnose_argument_deduction_constraint): Removed.
	(diagnose_argument_deduction_constraint): Removed.
	(diagnose_trait_expr): New.
	(diagnose_requires_expr): New.
	(diagnose_atomic_constraint): New.
	(diagnose_valid_expression) Stop wrongly diagnosing valid expressions.
	Don't substitute as if in template decls. This causes substitution
	to generate expressions that aren't suitable for use with the noexcept
	routines.
	(diagnose_valid_type) Likewise.
	(diagnose_compound_requirement) Actually emit diagnostics for
	the causes of errors.Call force_paren_expr_uneval.
	(diagnose_declaration_constraints): Turn on template processing to
	suppress certain analyses.
	* cp-objcp-common.c (cp_common_init_ts): Make concepts typed.
	(cp_get_debug_type): Use hash_map_safe_*.
	* cp-tree.h: New function declarations for semantic actions, other
	facilities. Remove declaration no longer used or needed. Remove
	unused _CONSTR macros.
	(LANG_DECL_HAS_MIN): Add CONCEPT_DECL.
	(template_info_decl_check): Factor macro check into an inline function.
	(DECL_TEMPLATE_INFO): Use new check facility.
	(finish_concept_definition): New. Don't invalid concept declarations
	with invalid initializers.
	(find_template_parameters): New.
	(concept_definition_p): New.
	(concept_check_p): New.
	(variable_concept_check_p): New.
	(force_paren_expr_uneval): New.
	(ovl_iterator::using_p): A USING_DECL by itself was also
	introduced by a using-declaration.
	(struct tree_template_info): Use tree_base instead of
	tree_common. Add tmpl and args fields.
	(TI_TEMPLATE, TI_ARGS): Adjust.
	(DECLTYPE_FOR_INIT_CAPTURE): Remove.
	(CONSTR_CHECK, CONSTR_INFO, CONSTR_EXPR, CONSTR_CONTEXT): New.
	(ATOMIC_CONSTR_MAP, TRAIT_EXPR_LOCATION): New.
	(struct tree_trait_expr): Add locus field.
	(enum tsubst_flags): Add tf_norm as a hint to generate normalization
	context when diagnosing constraint failure.
	* cp-tree.def: Remove unused _CONSTR nodes and rename PRED_CONSTR
	to ATOMIC_CONSTR.
	(CONCEPT_DECL): New.
	* cxx-pretty-print.c: Remove constraint printing code.
	(pp_cxx_concept_definition): New.
	(pp_cxx_template_declaration): Print concept definitions.
	(pp_cxx_check_constraint): Update printing for concept definitions.
	(pp_cxx_nested_name_specifier): Fix a weird
	case where we're printing '::::' for concepts.
	(simple_type_specifier): Print requirements for placeholder types.
	(pp_cxx_constrained_type_spec): Print the associated requirements of
	a placeholder type.
	(pp_cxx_compound_requirement): Add space before the '->'.
	(pp_cxx_parameter_mapping): Print the parameter mapping.
	(pp_cxx_atomic_constraint): Use the function above.
	* decl.c (redeclaration_error_message): New error for concepts.
	(grokdeclarator): Check for and disallow decltype(auto) in parameter
	declarations.
	(grokfndecl): Don't normalize constraints. Add check for constraints
	on declaration.
	(grokvardecl): Don't normalize constraints.
	(grok_special_member_properties): Don't set TYPE_HAS_COMPLEX_*.
	(function_requirements_equivalent_p): New. Compare trailing
	requires clauses. Compare combined constraints in pre-C++20 mode.
	(decls_match): Compare trailing requires clauses. Compare template
	heads for function templates. Remove old constraint comparison.
	Simplify comparison of functions, function templates.
	(duplicate_function_template_decls): New. Refactor a nasty if
	condition into a single predicate.
	(require_deduced_type): Don't complain if we already complained about
	deduction failure.
	(finish_function): Perform auto deduction to ensure that constraints
	are checked even when functions contain no return statements. Only do
	auto deduction if we haven't previously seen any return statements.
	This prevents multiple diagnostics of the same error.
	(store_decomp_type): Remove.
	(cp_finish_decomp): Use hash_map_safe_put.
	* error.c: Remove constraint printing code.
	(dump_decl): Dump concept definitions. Handle wildcard declarations.
	(dump_template_decl): Likewise.
	(dump_type): Print associated requirements for placeholder
	types.
	(rebuild_concept_check): New.
	(maybe_print_single_constraint_context): New.
	(maybe_print_constraint_context): Recursively print nested contexts.
	* init.c (get_nsdmi): Use hash_map_safe_*.
	* lambda.c (maybe_add_lambda_conv_op): Bail if deduction failed.
	(add_capture): Copy parameter packs from init.
	(lambda_capture_field_type): Always use auto for init-capture.
	* logic.cc: Completely rewrite.
	(constraint_hash): New.
	(clause/ctor): Save atoms in the hash table.
	(replace): Save atoms during replacement.
	(insert): Save atoms during insertion.
	(contains): Only search the hash table for containment.
	(clause): Keep a hash of atomic constraints.
	(clause::clause): Explicitly copy the hash table when copying.
	(disjunction_p, conjunction_p, atomic_p, dnf_size, cnf_size): New.
	(diagnose_constraint_size): New.
	(subsumes_constraints_nonnull): Compare the sizes of normalized formula
	to determine the cheapest decomposition.
	* name-lookup.c (diagnose_name_conflict): Diagnose name issues with
	concepts.
	(matching_fn_p): Check constraints.
	(push_class_level_binding_1): Move overloaded functions case down,
	accept FUNCTION_DECL as target_decl.
	* parser.c (enum required_token): New required token for auto.
	(make_location): Add overload taking lexer as last parm.
	(cp_parser_required_error): Diagnose missing auto.
	(cp_parser_diagnose_ungrouped_constraint_plain): New.
	(cp_parser_diagnose_ungrouped_constraint_plain): New.
	(cp_parser_constraint_primary_expression): New. Tentatively parse the
	primary expression. If that fails tentatively parse a lower
	precedence expression in order to diagnose the error.
	(cp_parser_check_non_logical_constraint): New. Performs a trial
	parse of the right-hand-side of non-logical operators in order to
	generate good diagnostics.
	(cp_parser_constraint_logical_and_expression): New.
	(cp_parser_constraint_logical_or_expression): New.
	(cp_parser_requires_clause_expression): New.
	(cp_parser_requires_clause): Renamed to cp_parser_constraint_expression.
	(cp_parser_requires_clause_opt): Parse the requires-clause differently
	in -fconcepts and -std=c++2a modes.
	(cp_parser_requirement_list): Rename to cp_parser_requirement_seq.
	Rewrite so that semicolons are parsed
	along with requirements, not the sequence.
	(cp_parser_simple_requirement): Expect a semicolon at end.
	(cp_parser_compound_requirement): Expect a semicolon at end. Only
	allow trailing-return-type with -fconcepts-ts.
	(cp_parser_nested_requirement): Expect a semicolon at end. Parse
	constraint-expressions.
	(cp_parser_concept_definition): New. Don't fail parsing the concept
	definition if the initializer is ill-formed. Don't declare the concept
	before parsing the initializer.
	(cp_parser_constraint_expression): Declare earlier.
	(cp_parser_type_requirement): Current scope is not valid.
	(cp_parser_requires_expression): Commit to the tentative parse.
	(cp_parser_decl_specifier_seq): Warn when concept appears to be used
	as a decl-specifier.
	(cp_parser_template_declaration_after_parameters): Parse concept
	definitions.
	(cp_parser_template_id): Don't try to resolve a concept template-id yet.
	(cp_parser_template_id_expr): Resolve it as a concept check.
	(cp_parser_decl_specifier_seq): Warn on 'concept bool'.
	(cp_parser_type_parameter): Combine expressions not
	constraints.
	(cp_parser_explicit_template_declaration): Combine expressions not
	constraints.
	(cp_parser_maybe_concept_name): Removed.
	(cp_parser_simple_type_specifier): Handle an error condition of
	a bad constrained type specifier. Expect auto or decltype after
	a concept name. Also handle the case where we have a template-id
	as a concept check.
	(cp_parser_template_introduction): Diagnose errors on invalid
	introductions. Give up if it doesn't start with a concept name.
	Pedwarn if not -fconcepts-ts.
	(synthesize_implicit_template_parm): Don't do consistent binding.
	Use a new flag for constrained parameters. Combine expressions,
	not constraints. Fail if we get a placeholder in block scope.
	Placeholders that do not constrain types are not allowed in parameter
	declarations, so don't handle them.
	(cp_parser_placeholder_type_specifier): New. Implement parsing of
	placeholder type specifiers following a concept name or partial
	concept check. Disallow decltype(auto) parameters.
	(cp_parser_nested_name_specifier_opt): If the token is already
	CPP_NESTED_NAME_SPECIFIER, leave it alone.
	(cp_parser_id_expression, cp_parser_unqualified_id): Call
	cp_parser_template_id_expr.
	(cp_parser_placeholder_type_specifier): Add tentative parm.  Don't
	expect a WILDCARD_DECL.
	(cp_parser_trait_expr): Pass trait_loc down.
	(cp_parser_postfix_expression): Do set location of dependent member
	call.
	* pt.c (finish_concept_definition): New.
	(push_template_decl_real): Handle concept definitions.
	(start_concept_definition): Let push_template_decl_real handle the
	creation of the template.
	(get_constraints): Return null if the table hasn't been initialized.
	(tsubst_copy_and_build): Build template-id expressions for concept
	checks.
	[TRAIT_EXPR]: Pass trait_loc down.
	(lookup_template_class_1): Add the template name to the constraint
	failure diagnostic.
	(lookup_and_finish_template_variable): Build concept checks
	with the correct arguments.
	(tsubst_function_decl): Don't substitute through constraints.
	Always associate constraints with functions.
	(template_parm_level_and_index): Make non-static.
	(for_each_template_parm_r): Handle requires expressions.
	(keep_template_parm): New.
	(find_template_parameters): New.
	(more_specialized_fn): Change how winners and losers are chosen.
	(make_constrained_auto): Don't normalize constraints.
	(template_parameters_equivalent_p): New. Compare template
	parameters. Add a comparison for implicitly vs. explicitly declared
	parameters.
	(template_parameter_lists_equivalent_p): New. Compare template
	parameter lists.
	(template_requirements_equivalent_p): New.
	(template_heads_equivalent_p): New. Compare template heads.
	(template_parameter_constraints_equivalent_p): New.
	(is_compatible_template_arg): Use weakly_subsumes.
	(maybe_new_partial_specialization): Use new constraint comparison
	for finding specializations.
	(process_partial_specialization): Pass main template as argument.
	(more_specialized_partial_spec): Don't immediately return when
	detecting a winner.
	(make_constrained_auto): Handle concept definitions.
	(do_auto_deduction): Update auto deduction for new concept model.
	Extract the function concept correctly; rename constr to check to
	reflect the kind of node.
	(tsubst): Adjust wildcard argument during substitution.
	[DECLTYPE_TYPE]: Remove init-capture handling.
	(tsubst_copy_and_build): Build concept checks, not template ids.
	Defer checks of function concepts. Handle concepts before variable
	templates. Handle calls to function concepts explicitly.
	(coerce_template_parms): Use concept_definition_p. Handle a deduction
	error where a potentially empty pack can be supplied after the last
	parameter of a concept.
	(finish_template_variable): Don't process concepts here.
	(instantiation_dependent_r): Use concept_check_p.
	(tsubst_template_args): Make non-static.
	(make_constrained_placeholder_type): New. Refactored from
	make_constrained_auto.
	(make_constrained_auto) Use make_constrained_placeholder_type.
	(make_constrained_decltype_auto) New.
	(tsubst_function_parms): New.
	(value_dependent_expression_p) [TEMPLATE_ID_EXPR]: Use
	concept_definition_p.
	(push_access_scope, pop_access_scope): No longer static.
	(tsubst_template_parm): Substitute TEMPLATE_PARM_CONSTRAINTS.
	(tsubst_friend_function): Use tsubst_constraint. Use generic_targs_for.
	(get_underlying_template) Use generic_targs_for.
	(uses_parameter_packs): Return tree.
	(gen_elem_of_pack_expansion_instantiation): Don't push
	local_specialization_stack.
	(prepend_one_capture): New.
	(tsubst_lambda_expr): Use prepend_one_capture.	Don't touch
	local_specializations.
	(template_parms_level_to_args): No longer static.
	(add_outermost_template_args): Likewise.
	(find_template_parameter_info): New. Provide context for finding
	template parameters.
	(keep_template_parm): Don't keep parameters declared at depth levels
	greater than those of the template parameters of the source declaration.
	Don't propagate cv-qualified types. Return 0, so we find all template
	parameters, not the just first.
	(any_template_parm_r): New. Handle cases that are mishandled by
	for_each_template_parm_r.
	(generic_targs_for): Factor out of coerce_template_args_for_ttp.
	(tsubst_argument_pack): Factor out of tsubst_template_args.
	(constraint_sat_entry): Removed.
	(constraint_sat_hasher): Removed.
	(concept_spec_entry): Removed.
	(concept_spec_hasher): Removed.
	(constraint_memos): Removed.
	(concept_memos): Removed.
	(lookup_constraint_satisfaction): Removed.
	(memoize_constraint_satisfaction): Removed.
	(lookup_concept_satisfaction): Removed.
	(memoize_concept_satisfaction): Removed.
	(concept_expansions): Removed.
	(get_concept_expansion): Removed.
	(save_concept_expansion): Removed.
	(init_constraint_processing): Remove initialization of non-existing
	resources.
	(find_template_requirement): New. Search for the sub-requirement
	within the associated constraints.
	(convert_generic_types_to_packs): Also transform the associated
	constraint and update the current template requirements.
	(store_defaulted_ttp, lookup_defaulted_ttp): Remove.
	(add_defaults_to_ttp): Use hash_map_safe_*.
	* semantics.c (finish_call_expr): Diagnose calls to concepts.
	Handle concept checks explicitly.
	(finish_id_expression): Evaluate variable concepts as part of
	id-expression processing. Don't treat variable concepts as variables,
	and don't process function concepts as plain id-expressions.
	(force_paren_expr): Add even_uneval parm.
	(finish_trait_expr): Add location parm.
	* tree.c (special_memfn_p): New.
	(cp_expr_location): Handle TRAIT_EXPR.
	* typeck.c (check_return_expr): Actually use the diagnostic kind
	when performing return-type deduction.
	* typeck2.c (build_functional_cast): Don't rely on the location of
	'auto'.
gcc/testsuite/
	* lib/target-supports.exp (check_effective_target_concepts): Check
	for std=c++2a.
gcc/
	* doc/invoke.texi: Document -fconcepts-ts.

From-SVN: r276764
---
 gcc/ChangeLog                                      |    4 +
 gcc/c-family/ChangeLog                             |   14 +
 gcc/c-family/c-cppbuiltin.c                        |    8 +-
 gcc/c-family/c-opts.c                              |   11 +
 gcc/c-family/c.opt                                 |    4 +
 gcc/cp/ChangeLog                                   |  458 +++
 gcc/cp/call.c                                      |   54 +-
 gcc/cp/class.c                                     |    3 +
 gcc/cp/config-lang.in                              |    1 +
 gcc/cp/constexpr.c                                 |   22 +-
 gcc/cp/constraint.cc                               | 3769 ++++++++++----------
 gcc/cp/cp-objcp-common.c                           |    9 +-
 gcc/cp/cp-tree.def                                 |   72 +-
 gcc/cp/cp-tree.h                                   |  358 +-
 gcc/cp/cxx-pretty-print.c                          |  197 +-
 gcc/cp/decl.c                                      |  172 +-
 gcc/cp/error.c                                     |  202 +-
 gcc/cp/lambda.c                                    |    4 +-
 gcc/cp/logic.cc                                    | 1183 +++---
 gcc/cp/name-lookup.c                               |   11 +-
 gcc/cp/parser.c                                    |  951 +++--
 gcc/cp/pt.c                                        |  956 +++--
 gcc/cp/search.c                                    |    5 +-
 gcc/cp/semantics.c                                 |   55 +-
 gcc/cp/typeck.c                                    |    3 +-
 gcc/cp/typeck2.c                                   |    5 +-
 gcc/doc/invoke.texi                                |   17 +-
 gcc/testsuite/ChangeLog                            |    5 +
 gcc/testsuite/g++.dg/concepts/alias1.C             |   16 -
 gcc/testsuite/g++.dg/concepts/alias2.C             |   14 -
 gcc/testsuite/g++.dg/concepts/alias3.C             |   14 -
 gcc/testsuite/g++.dg/concepts/alias4.C             |   20 -
 gcc/testsuite/g++.dg/concepts/auto1.C              |    2 +-
 gcc/testsuite/g++.dg/concepts/auto3.C              |    2 +-
 gcc/testsuite/g++.dg/concepts/auto4.C              |    4 +-
 gcc/testsuite/g++.dg/concepts/class-deduction1.C   |    2 +-
 gcc/testsuite/g++.dg/concepts/class-deduction2.C   |   10 -
 gcc/testsuite/g++.dg/concepts/class.C              |   53 -
 gcc/testsuite/g++.dg/concepts/class1.C             |   15 -
 gcc/testsuite/g++.dg/concepts/class2.C             |   15 -
 gcc/testsuite/g++.dg/concepts/class3.C             |   15 -
 gcc/testsuite/g++.dg/concepts/class4.C             |   22 -
 gcc/testsuite/g++.dg/concepts/class5.C             |    2 +-
 gcc/testsuite/g++.dg/concepts/class6.C             |    4 +-
 gcc/testsuite/g++.dg/concepts/constrained-parm.C   |   14 -
 gcc/testsuite/g++.dg/concepts/debug1.C             |    8 +-
 gcc/testsuite/g++.dg/concepts/decl-diagnose.C      |    8 +-
 .../g++.dg/concepts/deduction-constraint1.C        |    2 +-
 gcc/testsuite/g++.dg/concepts/diagnostic1.C        |   12 +-
 gcc/testsuite/g++.dg/concepts/disjunction1.C       |   60 -
 gcc/testsuite/g++.dg/concepts/dr1430.C             |    9 +-
 gcc/testsuite/g++.dg/concepts/equiv.C              |    2 +-
 gcc/testsuite/g++.dg/concepts/equiv2.C             |   12 +-
 gcc/testsuite/g++.dg/concepts/explicit-inst1.C     |   22 -
 gcc/testsuite/g++.dg/concepts/explicit-inst2.C     |   25 -
 gcc/testsuite/g++.dg/concepts/explicit-inst3.C     |   28 -
 gcc/testsuite/g++.dg/concepts/explicit-inst4.C     |   18 -
 gcc/testsuite/g++.dg/concepts/explicit-spec1.C     |   32 -
 gcc/testsuite/g++.dg/concepts/explicit-spec2.C     |   14 -
 gcc/testsuite/g++.dg/concepts/explicit-spec3.C     |   14 -
 gcc/testsuite/g++.dg/concepts/explicit-spec4.C     |   51 -
 gcc/testsuite/g++.dg/concepts/explicit-spec5.C     |   22 -
 gcc/testsuite/g++.dg/concepts/explicit-spec6.C     |   19 -
 gcc/testsuite/g++.dg/concepts/expression.C         |   12 +-
 gcc/testsuite/g++.dg/concepts/expression2.C        |   12 +-
 gcc/testsuite/g++.dg/concepts/expression3.C        |    2 +-
 gcc/testsuite/g++.dg/concepts/feature-macro.C      |    6 -
 gcc/testsuite/g++.dg/concepts/fn-concept1.C        |    2 +-
 gcc/testsuite/g++.dg/concepts/fn-concept2.C        |    2 +-
 .../g++.dg/concepts/fn-generic-member-ool.C        |    1 -
 gcc/testsuite/g++.dg/concepts/fn1.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn10.C               |    4 +-
 gcc/testsuite/g++.dg/concepts/fn2.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn3.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn4.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn5.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn6.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn7.C                |    4 +-
 gcc/testsuite/g++.dg/concepts/fn8.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/fn9.C                |    2 +-
 gcc/testsuite/g++.dg/concepts/friend1.C            |   35 -
 gcc/testsuite/g++.dg/concepts/friend2.C            |   21 -
 gcc/testsuite/g++.dg/concepts/generic-fn-err.C     |    8 +-
 gcc/testsuite/g++.dg/concepts/generic-fn.C         |    2 +-
 gcc/testsuite/g++.dg/concepts/iconv1.C             |   21 -
 gcc/testsuite/g++.dg/concepts/inherit-ctor1.C      |   28 +-
 gcc/testsuite/g++.dg/concepts/inherit-ctor2.C      |   19 -
 gcc/testsuite/g++.dg/concepts/inherit-ctor3.C      |    9 +-
 gcc/testsuite/g++.dg/concepts/inherit-ctor4.C      |   19 -
 gcc/testsuite/g++.dg/concepts/intro1.C             |    2 +-
 gcc/testsuite/g++.dg/concepts/intro2.C             |    2 +-
 gcc/testsuite/g++.dg/concepts/intro3.C             |    2 +-
 gcc/testsuite/g++.dg/concepts/intro4.C             |   12 +-
 gcc/testsuite/g++.dg/concepts/intro5.C             |    9 +-
 gcc/testsuite/g++.dg/concepts/intro6.C             |    2 +-
 gcc/testsuite/g++.dg/concepts/intro7.C             |    6 +-
 gcc/testsuite/g++.dg/concepts/lambda1.C            |   32 -
 gcc/testsuite/g++.dg/concepts/locations1.C         |    4 +-
 gcc/testsuite/g++.dg/concepts/member-concept.C     |   10 -
 gcc/testsuite/g++.dg/concepts/memfun-err.C         |   37 -
 gcc/testsuite/g++.dg/concepts/memfun.C             |  112 -
 gcc/testsuite/g++.dg/concepts/memfun2.C            |   22 -
 gcc/testsuite/g++.dg/concepts/memtmpl1.C           |   16 -
 .../g++.dg/concepts/partial-concept-id1.C          |   33 +-
 .../g++.dg/concepts/partial-concept-id2.C          |    2 +-
 gcc/testsuite/g++.dg/concepts/partial-spec.C       |   16 -
 gcc/testsuite/g++.dg/concepts/partial-spec2.C      |   33 -
 gcc/testsuite/g++.dg/concepts/partial-spec3.C      |    8 -
 gcc/testsuite/g++.dg/concepts/partial-spec4.C      |   50 -
 gcc/testsuite/g++.dg/concepts/partial-spec5.C      |    2 +-
 gcc/testsuite/g++.dg/concepts/partial-spec6.C      |   25 -
 gcc/testsuite/g++.dg/concepts/placeholder1.C       |   35 -
 gcc/testsuite/g++.dg/concepts/placeholder2.C       |   23 +-
 gcc/testsuite/g++.dg/concepts/placeholder3.C       |    6 +-
 gcc/testsuite/g++.dg/concepts/placeholder4.C       |    6 +-
 gcc/testsuite/g++.dg/concepts/placeholder5.C       |    8 +-
 gcc/testsuite/g++.dg/concepts/placeholder6.C       |    7 +-
 gcc/testsuite/g++.dg/concepts/pr58500.C            |    7 -
 gcc/testsuite/g++.dg/concepts/pr58534.C            |    7 -
 gcc/testsuite/g++.dg/concepts/pr58535.C            |    7 -
 gcc/testsuite/g++.dg/concepts/pr58536.C            |   10 -
 gcc/testsuite/g++.dg/concepts/pr58548.C            |    8 -
 gcc/testsuite/g++.dg/concepts/pr58549.C            |    8 -
 gcc/testsuite/g++.dg/concepts/pr60052.C            |   15 -
 gcc/testsuite/g++.dg/concepts/pr60053.C            |   15 -
 gcc/testsuite/g++.dg/concepts/pr60064.C            |   21 -
 gcc/testsuite/g++.dg/concepts/pr60065.C            |    8 -
 gcc/testsuite/g++.dg/concepts/pr60377.C            |    9 -
 gcc/testsuite/g++.dg/concepts/pr60390.C            |   26 -
 gcc/testsuite/g++.dg/concepts/pr60391.C            |    9 -
 gcc/testsuite/g++.dg/concepts/pr60573.C            |   28 -
 gcc/testsuite/g++.dg/concepts/pr65552.C            |   20 -
 gcc/testsuite/g++.dg/concepts/pr65575.C            |   24 -
 gcc/testsuite/g++.dg/concepts/pr65634.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr65636.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr65681.C            |   65 +-
 gcc/testsuite/g++.dg/concepts/pr65848.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr65854.C            |   25 -
 gcc/testsuite/g++.dg/concepts/pr66091.C            |   20 -
 gcc/testsuite/g++.dg/concepts/pr67249.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr67544.C            |    3 +-
 gcc/testsuite/g++.dg/concepts/pr67595.C            |    8 +-
 gcc/testsuite/g++.dg/concepts/pr67655.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr68434.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr68683.C            |   25 -
 gcc/testsuite/g++.dg/concepts/pr71127.C            |    7 +-
 gcc/testsuite/g++.dg/concepts/pr71128.C            |    4 +-
 gcc/testsuite/g++.dg/concepts/pr71131.C            |    7 +-
 gcc/testsuite/g++.dg/concepts/pr71368.C            |   26 -
 gcc/testsuite/g++.dg/concepts/pr71385.C            |    2 +-
 gcc/testsuite/g++.dg/concepts/pr71965.C            |   27 -
 gcc/testsuite/g++.dg/concepts/pr80471.C            |   23 -
 gcc/testsuite/g++.dg/concepts/pr84330.C            |    7 +-
 gcc/testsuite/g++.dg/concepts/pr84979-2.C          |   41 -
 gcc/testsuite/g++.dg/concepts/pr84979-3.C          |   45 -
 gcc/testsuite/g++.dg/concepts/pr84979.C            |    9 -
 gcc/testsuite/g++.dg/concepts/pr84980.C            |    6 -
 gcc/testsuite/g++.dg/concepts/pr85065.C            |    6 +-
 gcc/testsuite/g++.dg/concepts/pr85265.C            |    6 -
 .../g++.dg/concepts/regress/alias-decl-42.C        |   18 -
 gcc/testsuite/g++.dg/concepts/req-neg1.C           |   11 -
 gcc/testsuite/g++.dg/concepts/req1.C               |   29 -
 gcc/testsuite/g++.dg/concepts/req10.C              |   19 -
 gcc/testsuite/g++.dg/concepts/req11.C              |   29 -
 gcc/testsuite/g++.dg/concepts/req12.C              |   26 -
 gcc/testsuite/g++.dg/concepts/req13.C              |   14 -
 gcc/testsuite/g++.dg/concepts/req14.C              |   15 -
 gcc/testsuite/g++.dg/concepts/req15.C              |   22 -
 gcc/testsuite/g++.dg/concepts/req16.C              |   20 -
 gcc/testsuite/g++.dg/concepts/req17.C              |   21 -
 gcc/testsuite/g++.dg/concepts/req18.C              |   18 -
 gcc/testsuite/g++.dg/concepts/req19.C              |   14 -
 gcc/testsuite/g++.dg/concepts/req2.C               |   20 -
 gcc/testsuite/g++.dg/concepts/req20.C              |   21 -
 gcc/testsuite/g++.dg/concepts/req3.C               |   17 -
 gcc/testsuite/g++.dg/concepts/req4.C               |   19 -
 gcc/testsuite/g++.dg/concepts/req5.C               |   19 -
 gcc/testsuite/g++.dg/concepts/req6.C               |   19 -
 gcc/testsuite/g++.dg/concepts/req7.C               |   25 -
 gcc/testsuite/g++.dg/concepts/req8.C               |   17 -
 gcc/testsuite/g++.dg/concepts/req9.C               |   25 -
 gcc/testsuite/g++.dg/concepts/template-parm1.C     |   35 -
 gcc/testsuite/g++.dg/concepts/template-parm10.C    |   18 -
 gcc/testsuite/g++.dg/concepts/template-parm11.C    |    2 +-
 gcc/testsuite/g++.dg/concepts/template-parm12.C    |    4 +-
 gcc/testsuite/g++.dg/concepts/template-parm2.C     |    2 +-
 gcc/testsuite/g++.dg/concepts/template-parm3.C     |    2 +-
 gcc/testsuite/g++.dg/concepts/template-parm4.C     |    2 +-
 gcc/testsuite/g++.dg/concepts/template-parm5.C     |   20 -
 gcc/testsuite/g++.dg/concepts/template-parm6.C     |   42 -
 gcc/testsuite/g++.dg/concepts/template-parm7.C     |   45 -
 gcc/testsuite/g++.dg/concepts/template-parm8.C     |   22 -
 gcc/testsuite/g++.dg/concepts/template-parm9.C     |   19 -
 .../g++.dg/concepts/template-template-parm1.C      |    2 +-
 gcc/testsuite/g++.dg/concepts/traits1.C            |   98 -
 gcc/testsuite/g++.dg/concepts/traits2.C            |   99 -
 gcc/testsuite/g++.dg/concepts/var-concept1.C       |    2 +-
 gcc/testsuite/g++.dg/concepts/var-concept2.C       |    2 +-
 gcc/testsuite/g++.dg/concepts/var-concept3.C       |   15 +-
 gcc/testsuite/g++.dg/concepts/var-concept4.C       |    2 +-
 gcc/testsuite/g++.dg/concepts/var-concept5.C       |    6 +-
 gcc/testsuite/g++.dg/concepts/var-concept6.C       |    2 +-
 gcc/testsuite/g++.dg/concepts/var-concept7.C       |    4 +-
 gcc/testsuite/g++.dg/concepts/var-templ1.C         |    2 +-
 gcc/testsuite/g++.dg/concepts/var-templ2.C         |    2 +-
 gcc/testsuite/g++.dg/concepts/var-templ3.C         |    2 +-
 gcc/testsuite/g++.dg/concepts/variadic1.C          |    2 +-
 gcc/testsuite/g++.dg/concepts/variadic2.C          |    9 +-
 gcc/testsuite/g++.dg/concepts/variadic3.C          |    2 +-
 gcc/testsuite/g++.dg/concepts/variadic4.C          |   11 +-
 gcc/testsuite/g++.dg/cpp0x/auto52.C                |    2 +-
 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err2.C    |    2 +-
 gcc/testsuite/g++.dg/cpp2a/concepts-access1.C      |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-alias.C        |   25 +
 gcc/testsuite/g++.dg/cpp2a/concepts-alias2.C       |   12 +
 gcc/testsuite/g++.dg/cpp2a/concepts-class.C        |  115 +
 gcc/testsuite/g++.dg/cpp2a/concepts-cmath.C        |    4 +
 gcc/testsuite/g++.dg/cpp2a/concepts-complete1.C    |   11 +
 .../g++.dg/cpp2a/concepts-constrained-parm.C       |   13 +
 gcc/testsuite/g++.dg/cpp2a/concepts-decltype.C     |   67 +
 gcc/testsuite/g++.dg/cpp2a/concepts-defarg1.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-dep1.C         |    5 +
 gcc/testsuite/g++.dg/cpp2a/concepts-dr1430.C       |   14 +
 .../g++.dg/cpp2a/concepts-explicit-inst1.C         |   23 +
 .../g++.dg/cpp2a/concepts-explicit-inst2.C         |   24 +
 .../g++.dg/cpp2a/concepts-explicit-inst3.C         |   27 +
 .../g++.dg/cpp2a/concepts-explicit-inst4.C         |   17 +
 .../g++.dg/cpp2a/concepts-explicit-spec1.C         |   31 +
 .../g++.dg/cpp2a/concepts-explicit-spec2.C         |   13 +
 .../g++.dg/cpp2a/concepts-explicit-spec3.C         |   13 +
 .../g++.dg/cpp2a/concepts-explicit-spec4.C         |   50 +
 .../g++.dg/cpp2a/concepts-explicit-spec5.C         |   21 +
 .../g++.dg/cpp2a/concepts-explicit-spec6.C         |   18 +
 .../g++.dg/cpp2a/concepts-feature-macro.C          |    5 +
 gcc/testsuite/g++.dg/cpp2a/concepts-fn1.C          |  248 ++
 gcc/testsuite/g++.dg/cpp2a/concepts-fn2.C          |  111 +
 gcc/testsuite/g++.dg/cpp2a/concepts-fn3.C          |   49 +
 gcc/testsuite/g++.dg/cpp2a/concepts-fnparm1.C      |   10 +
 gcc/testsuite/g++.dg/cpp2a/concepts-friend1.C      |   34 +
 gcc/testsuite/g++.dg/cpp2a/concepts-friend2.C      |   20 +
 gcc/testsuite/g++.dg/cpp2a/concepts-friend3.C      |   20 +
 gcc/testsuite/g++.dg/cpp2a/concepts-iconv1.C       |   22 +
 .../g++.dg/cpp2a/concepts-inherit-ctor2.C          |   18 +
 .../g++.dg/cpp2a/concepts-inherit-ctor4.C          |   18 +
 .../g++.dg/cpp2a/concepts-inherit-ctor5.C          |   18 +
 gcc/testsuite/g++.dg/cpp2a/concepts-lambda1.C      |   33 +
 gcc/testsuite/g++.dg/cpp2a/concepts-locations1.C   |   22 +
 .../g++.dg/cpp2a/concepts-member-concept.C         |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-memfun-err.C   |   35 +
 gcc/testsuite/g++.dg/cpp2a/concepts-memfun.C       |  111 +
 gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl1.C     |   17 +
 gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl2.C     |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-nested1.C      |   13 +
 gcc/testsuite/g++.dg/cpp2a/concepts-noexcept1.C    |   25 +
 gcc/testsuite/g++.dg/cpp2a/concepts-p1141.C        |   98 +
 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec.C |   16 +
 .../g++.dg/cpp2a/concepts-partial-spec2.C          |   38 +
 .../g++.dg/cpp2a/concepts-partial-spec3.C          |    8 +
 .../g++.dg/cpp2a/concepts-partial-spec4.C          |   49 +
 .../g++.dg/cpp2a/concepts-partial-spec5.C          |   12 +
 .../g++.dg/cpp2a/concepts-partial-spec6.C          |   24 +
 gcc/testsuite/g++.dg/cpp2a/concepts-placeholder1.C |   14 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr58500.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr58534.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr58535.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr58536.C      |   10 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr58548.C      |    8 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr58549.C      |    8 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr59200.C      |   19 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60052.C      |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60053.C      |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60064.C      |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60065.C      |    8 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60377.C      |    9 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60390.C      |   26 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60391.C      |    9 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr60573.C      |   28 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr65552.C      |   18 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr65575.C      |   23 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr65634.C      |   18 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr65636.C      |    8 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr65848.C      |   59 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr65854.C      |   22 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr66091.C      |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr66844.C      |   16 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr66962.C      |   80 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67070.C      |   51 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67147.C      |   25 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67148.C      |  121 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67178.C      |   26 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67210.C      |   10 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67217.C      |    8 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-1.C    |   32 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-2.C    |   36 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-3.C    |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-4.C    |   14 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-5.C    |   17 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67319.C      |   24 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67427.C      |   22 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67654.C      |   30 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67658.C      |   14 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67684.C      |   63 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67685.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67692.C      |   13 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67697.C      |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67719.C      |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67774.C      |   26 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67825.C      |   20 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67860.C      |   61 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67862.C      |  162 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr67969.C      |   32 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-1.C    |   13 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-2.C    |   14 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr68372.C      |   48 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr68434.C      |   18 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr68683.C      |   25 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr68812.C      |   34 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr69235.C      |   48 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr71368.C      |   28 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr71385.C      |   14 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr71965.C      |   24 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr72415.C      |   22 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr78752.C      |   18 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr79759.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr80471.C      |   23 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr80746.C      |   14 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr80773.C      |   33 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr82507.C      |   17 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr82740.C      |   32 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr84140.C      |   38 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr84551.C      |   11 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-2.C    |   41 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-3.C    |   45 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr84979.C      |    9 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr84980.C      |    4 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr85265.C      |    7 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr85706.C      |   10 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr85808.C      |   19 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr86269.C      |   19 +
 gcc/testsuite/g++.dg/cpp2a/concepts-pr87441.C      |   10 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires1.C    |   71 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires10.C   |   32 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires11.C   |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires12.C   |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires13.C   |   20 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires14.C   |   24 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires15.C   |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires16.C   |   47 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires17.C   |   11 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires2.C    |   74 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires3.C    |   32 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires4.C    |   15 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires5.C    |   45 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires6.C    |   34 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires7.C    |   16 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires8.C    |   17 +
 gcc/testsuite/g++.dg/cpp2a/concepts-requires9.C    |   21 +
 gcc/testsuite/g++.dg/cpp2a/concepts-sfinae1.C      |   10 +
 .../g++.dg/cpp2a/concepts-template-parm1.C         |   19 +
 .../g++.dg/cpp2a/concepts-template-parm10.C        |   10 +
 .../g++.dg/cpp2a/concepts-template-parm2.C         |   15 +
 .../g++.dg/cpp2a/concepts-template-parm5.C         |    9 +
 .../g++.dg/cpp2a/concepts-template-parm6.C         |   44 +
 .../g++.dg/cpp2a/concepts-template-parm8.C         |   21 +
 .../g++.dg/cpp2a/concepts-template-parm9.C         |   18 +
 gcc/testsuite/g++.dg/cpp2a/concepts-traits1.C      |   97 +
 gcc/testsuite/g++.dg/cpp2a/concepts-traits2.C      |   98 +
 gcc/testsuite/g++.dg/cpp2a/concepts-ts1.C          |   49 +
 gcc/testsuite/g++.dg/cpp2a/concepts-ts2.C          |  260 ++
 gcc/testsuite/g++.dg/cpp2a/concepts-ts3.C          |  251 ++
 gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C          |   34 +
 gcc/testsuite/g++.dg/cpp2a/concepts-ts5.C          |   10 +
 gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C          |   72 +
 gcc/testsuite/g++.dg/cpp2a/concepts-using1.C       |   17 +
 gcc/testsuite/g++.dg/cpp2a/concepts.C              |   57 +
 gcc/testsuite/g++.dg/cpp2a/concepts1.C             |   27 +
 gcc/testsuite/g++.dg/cpp2a/concepts2.C             |   69 +
 gcc/testsuite/g++.dg/cpp2a/concepts3.C             |   48 +
 gcc/testsuite/g++.dg/cpp2a/concepts4.C             |   10 +
 gcc/testsuite/g++.dg/cpp2a/cond-triv2.C            |   30 +
 gcc/testsuite/lib/g++-dg.exp                       |    2 +-
 gcc/testsuite/lib/target-supports.exp              |    2 +-
 gcc/timevar.def                                    |    5 +-
 383 files changed, 10769 insertions(+), 6045 deletions(-)
 delete mode 100644 gcc/testsuite/g++.dg/concepts/alias1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/alias2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/alias3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/alias4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/class-deduction2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/class.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/class1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/class2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/class3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/class4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/constrained-parm.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/disjunction1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-inst1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-inst2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-inst3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-inst4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-spec1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-spec2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-spec3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-spec4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-spec5.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/explicit-spec6.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/feature-macro.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/friend1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/friend2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/iconv1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/inherit-ctor2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/inherit-ctor4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/lambda1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/member-concept.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/memfun-err.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/memfun.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/memfun2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/memtmpl1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/partial-spec.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/partial-spec2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/partial-spec3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/partial-spec4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/partial-spec6.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/placeholder1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr58500.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr58534.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr58535.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr58536.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr58548.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr58549.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60052.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60053.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60064.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60065.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60377.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60390.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60391.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr60573.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr65552.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr65575.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr65854.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr66091.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr68683.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr71368.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr71965.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr80471.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr84979-2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr84979-3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr84979.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr84980.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/pr85265.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/regress/alias-decl-42.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req-neg1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req10.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req11.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req12.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req13.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req14.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req15.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req16.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req17.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req18.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req19.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req2.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req20.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req3.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req4.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req5.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req6.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req7.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req8.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/req9.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm10.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm5.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm6.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm7.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm8.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/template-parm9.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/traits1.C
 delete mode 100644 gcc/testsuite/g++.dg/concepts/traits2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-access1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-alias.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-alias2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-class.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-cmath.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-complete1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-constrained-parm.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-decltype.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-defarg1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-dep1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-dr1430.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-feature-macro.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-fn1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-fn2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-fn3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-fnparm1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-friend1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-friend2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-friend3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-iconv1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-lambda1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-locations1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-member-concept.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-memfun-err.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-memfun.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-nested1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-noexcept1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-p1141.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-placeholder1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr58500.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr58534.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr58535.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr58536.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr58548.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr58549.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr59200.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60052.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60053.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60064.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60065.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60377.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60390.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60391.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr60573.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr65552.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr65575.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr65634.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr65636.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr65848.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr65854.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr66091.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr66844.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr66962.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67070.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67147.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67148.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67178.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67210.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67217.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67319.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67427.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67654.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67658.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67684.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67685.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67692.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67697.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67719.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67774.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67825.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67860.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67862.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr67969.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr68372.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr68434.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr68683.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr68812.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr69235.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr71368.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr71385.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr71965.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr72415.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr78752.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr79759.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr80471.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr80746.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr80773.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr82507.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr82740.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr84140.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr84551.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr84979.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr84980.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr85265.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr85706.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr85808.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr86269.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr87441.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires10.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires11.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires12.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires13.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires14.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires15.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires16.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires17.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires7.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires8.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-requires9.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-sfinae1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm10.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm8.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm9.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-traits1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-traits2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-ts1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-ts2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-ts3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-ts5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-using1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/cond-triv2.C

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 330e13b..a02d211 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-08  Jason Merrill  <jason@redhat.com>
+
+	* doc/invoke.texi: Document -fconcepts-ts.
+
 2019-10-09  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-loop.c (vect_is_simple_reduction): Simplify and
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 93077ff..3012f8b 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,17 @@
+2019-10-08  Andrew Sutton  <asutton@lock3software.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	Update the concepts implementation to conform to the C++20
+	specification, improve compile times, and generally clean up
+	the implementation.
+
+	* c-cppbuiltin.c (c_cpp_builtins): Use new feature test values for
+	concepts when -std=c++2a. Bump __cpp_concepts to 201907.
+	* c.opt: Add -Wconcepts-ts.
+	* c-opts.c (c_common_post_options): Warn when -fconcepts is used
+	with -std=c++2a. Disable warning for -fconcepts in C++20 mode.
+	(set_std_cxx2a): Enable concepts by default.
+
 2019-10-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* c-opts.c (c_common_post_options): Set
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 9e0ce42..d9941e7 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -992,7 +992,13 @@ c_cpp_builtins (cpp_reader *pfile)
 	  cpp_define (pfile, "__cpp_constexpr_dynamic_alloc=201907");
 	}
       if (flag_concepts)
-	cpp_define (pfile, "__cpp_concepts=201507");
+        {
+          if (cxx_dialect >= cxx2a)
+            /* FIXME: Update this to the value required by the IS.  */
+            cpp_define (pfile, "__cpp_concepts=201907");
+          else
+            cpp_define (pfile, "__cpp_concepts=201507");
+        }
       if (flag_tm)
 	/* Use a value smaller than the 201505 specified in
 	   the TS, since we don't yet support atomic_cancel.  */
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 4ad24bd..0fffe60 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -1034,6 +1034,16 @@ c_common_post_options (const char **pfilename)
   if (warn_return_type == -1 && c_dialect_cxx ())
     warn_return_type = 1;
 
+  /* C++2a is the final version of concepts. We still use -fconcepts
+     to know when concepts are enabled. Note that -fconcepts-ts can
+     be used to include additional features, although modified to
+     work with the standard.  */
+  if (cxx_dialect >= cxx2a)
+    flag_concepts = 1;
+  else if (flag_concepts)
+    /* For -std=c++17 -fconcepts, imply -fconcepts-ts.  */
+    flag_concepts_ts = 1;
+
   if (num_in_fnames > 1)
     error ("too many filenames given; type %<%s %s%> for usage",
 	   progname, "--help");
@@ -1713,6 +1723,7 @@ set_std_cxx2a (int iso)
   flag_isoc94 = 1;
   flag_isoc99 = 1;
   flag_isoc11 = 1;
+  /* C++2a includes concepts. */
   cxx_dialect = cxx2a;
   lang_hooks.name = "GNU C++17"; /* Pretend C++17 until standardization.  */
 }
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 88bbe2e..8f6867b 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1427,6 +1427,10 @@ fconcepts
 C++ ObjC++ Var(flag_concepts)
 Enable support for C++ concepts.
 
+fconcepts-ts
+C++ ObjC++ Var(flag_concepts_ts) Init(0)
+Enable certain features present in the Concepts TS.
+
 fcond-mismatch
 C ObjC C++ ObjC++
 Allow the arguments of the '?' operator to have different types.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d75ea5d..e633823 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,461 @@
+2019-10-08  Andrew Sutton  <asutton@lock3software.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	Update the concepts implementation to conform to the C++20
+	specification, improve compile times, and generally clean up
+	the implementation.
+	* call.c (build_new_function_call): Don't evaluate concepts here.
+	(constraint_failure): Don't record the template.
+	(print_z_candidate): Don't extract the template.
+	* class.c (add_method): When overloading, hide ineligible special
+	member fns.
+	(check_methods): Set TYPE_HAS_COMPLEX_* here.
+	* constexpr.c (cxx_eval_constant_expression): Evaluate concepts.
+	(maybe_initialize_fundef_copies_table): Remove.
+	(get_fundef_copy): Use hash_map_safe_get_or_insert.
+	(clear_cv_and_fold_caches): Clear the satisfaction cache.
+	* constraint.cc (known_non_bool_p): New.
+	(parsing_constraint_expression_sentinel): Renamed from
+	expanding_constraint_sentinel.
+	(check_constraint_operands): New.
+	(check_constraint_atom): New.
+	(finish_constraint_binary_op): New.
+	(finish_constraint_or_expr): Likewise.
+	(finish_constraint_and_expr): Likewise.
+	(finish_constraint_primary_expr): Likewise.
+	(combine_constraint_expressions): New.
+	(finish_requires_expr): Add location parm.
+	(get_concept_definition): Return the initializer of concept definitions.
+	(get_template_head_requirements): New.
+	(get_trailing_function_requirements): New.
+	(deduce_constrained_parameter): Check if the identifier or template-id
+	is a concept definition.
+	(resolve_concept_definition_check): Removed.
+	(resolve_variable_concept_check): Removed.
+	(resolve_concept_check): New.
+	(resolve_constraint_check): Handle concept definitions.
+	converting arguments.
+	(function_concept_check_p): Removed.
+	(variable_concept_check_p): Removed.
+	(unpack_concept_check): New.
+	(get_concept_check_template): New.
+	(build_call_check): Moved and renamed to build_function_check.
+	(build_concept_check_arguments): make static.
+	(build_function_check): Always do overload resolution
+	in order to force conversion of template arguments (i.e., actually
+	check that the use of a concept is valid).
+	(build_standard_check): Renamed from build_real_concept_check.
+	(build_real_concept_check): Build checks for C++2a concepts by
+	(build_wildcard_concept_check): New.
+	(build_concept_check): Use build_real_concept_check. New overload.
+	(build_constraints): Save expressions, not normalized constraints.
+	(build_concept_id): New. Pass tf_warning_or_error.
+	(build_type_constraint): New.
+	(finish_type_constraints): New.
+	(associate_classtype_constraints): Also add constraints to union
+	types. Note the original declaration in errors. Don't return
+	error_mark_node in order to avoid an assertion later.
+	(push_down_pack_expansion): Remove.
+	(finish_shorthand_constraint): Make fold expressions, not naked
+	parameter packs. Always apply the constraint to each template argument.
+	(check_introduction_list): New. Fail if not enough
+	names are introduced.
+	(finish_template_introduction): Don't normalize constraints. Pass
+	tsubst flags. Check for insufficient introductions.
+	(placeholder_extract_concept_and_args): Handle the template-id case.
+	Unpack function concept checks correctly.
+	(tsubst_simple_requirement): Return errors if they occur. Don't
+	process as a template.
+	(tsubst_type_requirement): Likewise.
+	(type_deducible_p): New. Wrap the input expression in parens for the
+	purpose of deduction.
+	(expression_convertible_t): New.
+	(tsubst_compound_requirement): Use new deduction, conversion predicates.
+	(tsubst_nested_requirement): Return errors if they occur. Don't
+	process as a template. Instantiate and evaluate the nested requirement.
+	(tsubst_valid_expression_requirement): New.
+	(tsubst_simple_requirement): Use tsubst_valid_expression_requirement.
+	(tsubst_compound_requirement): Use tsubst_valid_expression_requirement.
+	(check_constaint_variables): New.
+	(tsubst_constraint_variables): Check that type substitutions are valid.
+	(tsubst_requires_expr): Likewise. Produce new requires-exprs during
+	template substitution. Copy the previous local specialization stack,
+	so references to non-local parameters can be found. Use cp_unevaluated.
+	(tsubst_constraint): New. Don't evaluate concept checks.
+	(subst_info): New.
+	(norm_info): New. Used to build a normalization tree for concept check
+	diagnostics.
+	(debug_parameter_mapping): New.
+	(debug_argument_list): New.
+	(expand_concept): Removed.
+	(normalize_logical_operation): Pass subst_info through call.
+	(normalize_pack_expansion): Remove.
+	(normalize_simple_requirement): Removed
+	(normalize_type_requirement): Removed
+	(normalize_compound_requirement): Removed
+	(normalize_nested_requirement): Removed
+	(normalize_requirement): Removed
+	(normalize_requirements): Removed
+	(normalize_requires_expression): Removed
+	(normalize_variable_concept_check): Removed.
+	(normalize_function_concept_check): Removed.
+	(normalize_concept_check): Merged all normalize_*_check here.
+	Substitute through written template arguments before normalizing the
+	definition. Only substitute the innermost template arguments.
+	(check_for_logical_overloads): Delete.
+	(map_arguments): New. Associate template parameters with arguments.
+	(build_parameter_mapping): New. Extract used parameters.
+	(normalize_expression): Rewrite.
+	(normalize_conjunction): Removed
+	(normalize_disjunction): Removed
+	(normalize_predicate_constraint): Removed
+	(normalize_parameterized_constraint): Removed
+	(normalized_map): New variable.
+	(get_normalized_constraints): New entry point for normalization.
+	Establishes a timer.
+	(get_normalized_constraints_from_info): New.
+	(get_normalized_constraints_from_decl): New. Turn on template processing
+	prior to normalization. Handle inheriting ctors. Build the
+	normalization arguments from the full set of template parameters of the
+	most general template. This guarantees that we have no concrete arguments
+	in the parameter mapping (e.g., from template members of class
+	templates). Cache normalizations.
+	(normalize_concept_definition): New. Cache normalizations.
+	(normalize_template_requirements): New.
+	(normalize_nontemplate_requirements): New.
+	(normalize_constraint_expression): New.
+	(tsubst_parameter_mapping): New.
+	(get_mapped_args): New.
+	(parameter_mapping_equivalent_p): New. Use template_args_equal.
+	(atomic_constraints_identical_p): New.
+	(hash_atomic_constraint): New.
+	(satisfying_constraint_p): New. Guard against recursive evaluation of
+	constraints during satisfaction.
+	(satisfy_conjunction): New.
+	(satisfy_disjunction): New.
+	(sat_entry): New class for hashing satisfaction results.
+	(sat_hasher): New hash traits.
+	(sat_cache): New.
+	(get_satisfaction): New. Returns cached satisfaction result.
+	(save_satisfaction): New. Caches a satisfaction result.
+	(clear_satisfaction_cache): New.
+	(satisfaction_cache): New. Helps manage satisfaction cache requests.
+	(decl_satisfied_cache): New.
+	(satisfy_atom): New.
+	(satisfy_constraint_r): New.
+	(satisfy_constraint): Use new satisfaction algorithm.
+	(evaluate_concept_check): New.
+	(evaluate_concept): Removed.
+	(evaluate_function_concept): Removed.
+	(evaluate_variable_concept): Removed.
+	(satisfy_constraint_expression): New.
+	(constraint_expression_satisfied_p): New.
+	(constraints_satisfied_p): Use strip_inheriting_ctors. Use
+	push_/pop_access_scope.
+	(more_constrained): Normalize before calling out to subsumption. Allow
+	classes as arguments.
+	(strictly_subsumes): Allow non-templates as arguments. Accept a new
+	template argument.
+	(weakly_subsumes): New.
+	(at_least_as_constrained): Removed.
+	(diagnose_other_expression): Removed.
+	(diagnose_predicate_constraint): Removed.
+	(diagnose_pack_expansion): Removed.
+	(diagnose_check_constraint): Removed.
+	(diagnose_logical_constraint): Removed.
+	(diagnose_expression_constraint): Removed.
+	(diagnose_type_constraint): Removed.
+	(diagnose_implicit_conversion_constraint): Removed.
+	(diagnose_argument_deduction_constraint): Removed.
+	(diagnose_exception_constraint): Removed.
+	(diagnose_parameterized_constraint): Removed.
+	(diagnose_argument_deduction_constraint): Removed.
+	(diagnose_argument_deduction_constraint): Removed.
+	(diagnose_argument_deduction_constraint): Removed.
+	(diagnose_trait_expr): New.
+	(diagnose_requires_expr): New.
+	(diagnose_atomic_constraint): New.
+	(diagnose_valid_expression) Stop wrongly diagnosing valid expressions.
+	Don't substitute as if in template decls. This causes substitution
+	to generate expressions that aren't suitable for use with the noexcept
+	routines.
+	(diagnose_valid_type) Likewise.
+	(diagnose_compound_requirement) Actually emit diagnostics for
+	the causes of errors.Call force_paren_expr_uneval.
+	(diagnose_declaration_constraints): Turn on template processing to
+	suppress certain analyses.
+	* cp-objcp-common.c (cp_common_init_ts): Make concepts typed.
+	(cp_get_debug_type): Use hash_map_safe_*.
+	* cp-tree.h: New function declarations for semantic actions, other
+	facilities. Remove declaration no longer used or needed. Remove
+	unused _CONSTR macros.
+	(LANG_DECL_HAS_MIN): Add CONCEPT_DECL.
+	(template_info_decl_check): Factor macro check into an inline function.
+	(DECL_TEMPLATE_INFO): Use new check facility.
+	(finish_concept_definition): New. Don't invalid concept declarations
+	with invalid initializers.
+	(find_template_parameters): New.
+	(concept_definition_p): New.
+	(concept_check_p): New.
+	(variable_concept_check_p): New.
+	(force_paren_expr_uneval): New.
+	(ovl_iterator::using_p): A USING_DECL by itself was also
+	introduced by a using-declaration.
+	(struct tree_template_info): Use tree_base instead of
+	tree_common. Add tmpl and args fields.
+	(TI_TEMPLATE, TI_ARGS): Adjust.
+	(DECLTYPE_FOR_INIT_CAPTURE): Remove.
+	(CONSTR_CHECK, CONSTR_INFO, CONSTR_EXPR, CONSTR_CONTEXT): New.
+	(ATOMIC_CONSTR_MAP, TRAIT_EXPR_LOCATION): New.
+	(struct tree_trait_expr): Add locus field.
+	(enum tsubst_flags): Add tf_norm as a hint to generate normalization
+	context when diagnosing constraint failure.
+	* cp-tree.def: Remove unused _CONSTR nodes and rename PRED_CONSTR
+	to ATOMIC_CONSTR.
+	(CONCEPT_DECL): New.
+	* cxx-pretty-print.c: Remove constraint printing code.
+	(pp_cxx_concept_definition): New.
+	(pp_cxx_template_declaration): Print concept definitions.
+	(pp_cxx_check_constraint): Update printing for concept definitions.
+	(pp_cxx_nested_name_specifier): Fix a weird
+	case where we're printing '::::' for concepts.
+	(simple_type_specifier): Print requirements for placeholder types.
+	(pp_cxx_constrained_type_spec): Print the associated requirements of
+	a placeholder type.
+	(pp_cxx_compound_requirement): Add space before the '->'.
+	(pp_cxx_parameter_mapping): Print the parameter mapping.
+	(pp_cxx_atomic_constraint): Use the function above.
+	* decl.c (redeclaration_error_message): New error for concepts.
+	(grokdeclarator): Check for and disallow decltype(auto) in parameter
+	declarations.
+	(grokfndecl): Don't normalize constraints. Add check for constraints
+	on declaration.
+	(grokvardecl): Don't normalize constraints.
+	(grok_special_member_properties): Don't set TYPE_HAS_COMPLEX_*.
+	(function_requirements_equivalent_p): New. Compare trailing
+	requires clauses. Compare combined constraints in pre-C++20 mode.
+	(decls_match): Compare trailing requires clauses. Compare template
+	heads for function templates. Remove old constraint comparison.
+	Simplify comparison of functions, function templates.
+	(duplicate_function_template_decls): New. Refactor a nasty if
+	condition into a single predicate.
+	(require_deduced_type): Don't complain if we already complained about
+	deduction failure.
+	(finish_function): Perform auto deduction to ensure that constraints
+	are checked even when functions contain no return statements. Only do
+	auto deduction if we haven't previously seen any return statements.
+	This prevents multiple diagnostics of the same error.
+	(store_decomp_type): Remove.
+	(cp_finish_decomp): Use hash_map_safe_put.
+	* error.c: Remove constraint printing code.
+	(dump_decl): Dump concept definitions. Handle wildcard declarations.
+	(dump_template_decl): Likewise.
+	(dump_type): Print associated requirements for placeholder
+	types.
+	(rebuild_concept_check): New.
+	(maybe_print_single_constraint_context): New.
+	(maybe_print_constraint_context): Recursively print nested contexts.
+	* init.c (get_nsdmi): Use hash_map_safe_*.
+	* lambda.c (maybe_add_lambda_conv_op): Bail if deduction failed.
+	(add_capture): Copy parameter packs from init.
+	(lambda_capture_field_type): Always use auto for init-capture.
+	* logic.cc: Completely rewrite.
+	(constraint_hash): New.
+	(clause/ctor): Save atoms in the hash table.
+	(replace): Save atoms during replacement.
+	(insert): Save atoms during insertion.
+	(contains): Only search the hash table for containment.
+	(clause): Keep a hash of atomic constraints.
+	(clause::clause): Explicitly copy the hash table when copying.
+	(disjunction_p, conjunction_p, atomic_p, dnf_size, cnf_size): New.
+	(diagnose_constraint_size): New.
+	(subsumes_constraints_nonnull): Compare the sizes of normalized formula
+	to determine the cheapest decomposition.
+	* name-lookup.c (diagnose_name_conflict): Diagnose name issues with
+	concepts.
+	(matching_fn_p): Check constraints.
+	(push_class_level_binding_1): Move overloaded functions case down,
+	accept FUNCTION_DECL as target_decl.
+	* parser.c (enum required_token): New required token for auto.
+	(make_location): Add overload taking lexer as last parm.
+	(cp_parser_required_error): Diagnose missing auto.
+	(cp_parser_diagnose_ungrouped_constraint_plain): New.
+	(cp_parser_diagnose_ungrouped_constraint_plain): New.
+	(cp_parser_constraint_primary_expression): New. Tentatively parse the
+	primary expression. If that fails tentatively parse a lower
+	precedence expression in order to diagnose the error.
+	(cp_parser_check_non_logical_constraint): New. Performs a trial
+	parse of the right-hand-side of non-logical operators in order to
+	generate good diagnostics.
+	(cp_parser_constraint_logical_and_expression): New.
+	(cp_parser_constraint_logical_or_expression): New.
+	(cp_parser_requires_clause_expression): New.
+	(cp_parser_requires_clause): Renamed to cp_parser_constraint_expression.
+	(cp_parser_requires_clause_opt): Parse the requires-clause differently
+	in -fconcepts and -std=c++2a modes.
+	(cp_parser_requirement_list): Rename to cp_parser_requirement_seq.
+	Rewrite so that semicolons are parsed
+	along with requirements, not the sequence.
+	(cp_parser_simple_requirement): Expect a semicolon at end.
+	(cp_parser_compound_requirement): Expect a semicolon at end. Only
+	allow trailing-return-type with -fconcepts-ts.
+	(cp_parser_nested_requirement): Expect a semicolon at end. Parse
+	constraint-expressions.
+	(cp_parser_concept_definition): New. Don't fail parsing the concept
+	definition if the initializer is ill-formed. Don't declare the concept
+	before parsing the initializer.
+	(cp_parser_constraint_expression): Declare earlier.
+	(cp_parser_type_requirement): Current scope is not valid.
+	(cp_parser_requires_expression): Commit to the tentative parse.
+	(cp_parser_decl_specifier_seq): Warn when concept appears to be used
+	as a decl-specifier.
+	(cp_parser_template_declaration_after_parameters): Parse concept
+	definitions.
+	(cp_parser_template_id): Don't try to resolve a concept template-id yet.
+	(cp_parser_template_id_expr): Resolve it as a concept check.
+	(cp_parser_decl_specifier_seq): Warn on 'concept bool'.
+	(cp_parser_type_parameter): Combine expressions not
+	constraints.
+	(cp_parser_explicit_template_declaration): Combine expressions not
+	constraints.
+	(cp_parser_maybe_concept_name): Removed.
+	(cp_parser_simple_type_specifier): Handle an error condition of
+	a bad constrained type specifier. Expect auto or decltype after
+	a concept name. Also handle the case where we have a template-id
+	as a concept check.
+	(cp_parser_template_introduction): Diagnose errors on invalid
+	introductions. Give up if it doesn't start with a concept name.
+	Pedwarn if not -fconcepts-ts.
+	(synthesize_implicit_template_parm): Don't do consistent binding.
+	Use a new flag for constrained parameters. Combine expressions,
+	not constraints. Fail if we get a placeholder in block scope.
+	Placeholders that do not constrain types are not allowed in parameter
+	declarations, so don't handle them.
+	(cp_parser_placeholder_type_specifier): New. Implement parsing of
+	placeholder type specifiers following a concept name or partial
+	concept check. Disallow decltype(auto) parameters.
+	(cp_parser_nested_name_specifier_opt): If the token is already
+	CPP_NESTED_NAME_SPECIFIER, leave it alone.
+	(cp_parser_id_expression, cp_parser_unqualified_id): Call
+	cp_parser_template_id_expr.
+	(cp_parser_placeholder_type_specifier): Add tentative parm.  Don't
+	expect a WILDCARD_DECL.
+	(cp_parser_trait_expr): Pass trait_loc down.
+	(cp_parser_postfix_expression): Do set location of dependent member
+	call.
+	* pt.c (finish_concept_definition): New.
+	(push_template_decl_real): Handle concept definitions.
+	(start_concept_definition): Let push_template_decl_real handle the
+	creation of the template.
+	(get_constraints): Return null if the table hasn't been initialized.
+	(tsubst_copy_and_build): Build template-id expressions for concept
+	checks.
+	[TRAIT_EXPR]: Pass trait_loc down.
+	(lookup_template_class_1): Add the template name to the constraint
+	failure diagnostic.
+	(lookup_and_finish_template_variable): Build concept checks
+	with the correct arguments.
+	(tsubst_function_decl): Don't substitute through constraints.
+	Always associate constraints with functions.
+	(template_parm_level_and_index): Make non-static.
+	(for_each_template_parm_r): Handle requires expressions.
+	(keep_template_parm): New.
+	(find_template_parameters): New.
+	(more_specialized_fn): Change how winners and losers are chosen.
+	(make_constrained_auto): Don't normalize constraints.
+	(template_parameters_equivalent_p): New. Compare template
+	parameters. Add a comparison for implicitly vs. explicitly declared
+	parameters.
+	(template_parameter_lists_equivalent_p): New. Compare template
+	parameter lists.
+	(template_requirements_equivalent_p): New.
+	(template_heads_equivalent_p): New. Compare template heads.
+	(template_parameter_constraints_equivalent_p): New.
+	(is_compatible_template_arg): Use weakly_subsumes.
+	(maybe_new_partial_specialization): Use new constraint comparison
+	for finding specializations.
+	(process_partial_specialization): Pass main template as argument.
+	(more_specialized_partial_spec): Don't immediately return when
+	detecting a winner.
+	(make_constrained_auto): Handle concept definitions.
+	(do_auto_deduction): Update auto deduction for new concept model.
+	Extract the function concept correctly; rename constr to check to
+	reflect the kind of node.
+	(tsubst): Adjust wildcard argument during substitution.
+	[DECLTYPE_TYPE]: Remove init-capture handling.
+	(tsubst_copy_and_build): Build concept checks, not template ids.
+	Defer checks of function concepts. Handle concepts before variable
+	templates. Handle calls to function concepts explicitly.
+	(coerce_template_parms): Use concept_definition_p. Handle a deduction
+	error where a potentially empty pack can be supplied after the last
+	parameter of a concept.
+	(finish_template_variable): Don't process concepts here.
+	(instantiation_dependent_r): Use concept_check_p.
+	(tsubst_template_args): Make non-static.
+	(make_constrained_placeholder_type): New. Refactored from
+	make_constrained_auto.
+	(make_constrained_auto) Use make_constrained_placeholder_type.
+	(make_constrained_decltype_auto) New.
+	(tsubst_function_parms): New.
+	(value_dependent_expression_p) [TEMPLATE_ID_EXPR]: Use
+	concept_definition_p.
+	(push_access_scope, pop_access_scope): No longer static.
+	(tsubst_template_parm): Substitute TEMPLATE_PARM_CONSTRAINTS.
+	(tsubst_friend_function): Use tsubst_constraint. Use generic_targs_for.
+	(get_underlying_template) Use generic_targs_for.
+	(uses_parameter_packs): Return tree.
+	(gen_elem_of_pack_expansion_instantiation): Don't push
+	local_specialization_stack.
+	(prepend_one_capture): New.
+	(tsubst_lambda_expr): Use prepend_one_capture.	Don't touch
+	local_specializations.
+	(template_parms_level_to_args): No longer static.
+	(add_outermost_template_args): Likewise.
+	(find_template_parameter_info): New. Provide context for finding
+	template parameters.
+	(keep_template_parm): Don't keep parameters declared at depth levels
+	greater than those of the template parameters of the source declaration.
+	Don't propagate cv-qualified types. Return 0, so we find all template
+	parameters, not the just first.
+	(any_template_parm_r): New. Handle cases that are mishandled by
+	for_each_template_parm_r.
+	(generic_targs_for): Factor out of coerce_template_args_for_ttp.
+	(tsubst_argument_pack): Factor out of tsubst_template_args.
+	(constraint_sat_entry): Removed.
+	(constraint_sat_hasher): Removed.
+	(concept_spec_entry): Removed.
+	(concept_spec_hasher): Removed.
+	(constraint_memos): Removed.
+	(concept_memos): Removed.
+	(lookup_constraint_satisfaction): Removed.
+	(memoize_constraint_satisfaction): Removed.
+	(lookup_concept_satisfaction): Removed.
+	(memoize_concept_satisfaction): Removed.
+	(concept_expansions): Removed.
+	(get_concept_expansion): Removed.
+	(save_concept_expansion): Removed.
+	(init_constraint_processing): Remove initialization of non-existing
+	resources.
+	(find_template_requirement): New. Search for the sub-requirement
+	within the associated constraints.
+	(convert_generic_types_to_packs): Also transform the associated
+	constraint and update the current template requirements.
+	(store_defaulted_ttp, lookup_defaulted_ttp): Remove.
+	(add_defaults_to_ttp): Use hash_map_safe_*.
+	* semantics.c (finish_call_expr): Diagnose calls to concepts.
+	Handle concept checks explicitly.
+	(finish_id_expression): Evaluate variable concepts as part of
+	id-expression processing. Don't treat variable concepts as variables,
+	and don't process function concepts as plain id-expressions.
+	(force_paren_expr): Add even_uneval parm.
+	(finish_trait_expr): Add location parm.
+	* tree.c (special_memfn_p): New.
+	(cp_expr_location): Handle TRAIT_EXPR.
+	* typeck.c (check_return_expr): Actually use the diagnostic kind
+	when performing return-type deduction.
+	* typeck2.c (build_functional_cast): Don't rely on the location of
+	'auto'.
+
 2019-10-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* decl.c (grok_ctor_properties): Use DECL_SOURCE_LOCATION.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4ed424f..d36564d 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -717,24 +717,12 @@ inherited_ctor_rejection (void)
   return r;
 }
 
-// Build a constraint failure record, saving information into the
-// template_instantiation field of the rejection. If FN is not a template
-// declaration, the TMPL member is the FN declaration and TARGS is empty.
+/* Build a constraint failure record.  */
 
 static struct rejection_reason *
-constraint_failure (tree fn)
+constraint_failure (void)
 {
   struct rejection_reason *r = alloc_rejection (rr_constraint_failure);
-  if (tree ti = DECL_TEMPLATE_INFO (fn))
-    {
-      r->u.template_instantiation.tmpl = TI_TEMPLATE (ti);
-      r->u.template_instantiation.targs = TI_ARGS (ti);
-    }
-  else
-    {
-      r->u.template_instantiation.tmpl = fn;
-      r->u.template_instantiation.targs = NULL_TREE;
-    }
   return r;
 }
 
@@ -2251,10 +2239,9 @@ add_function_candidate (struct z_candidate **candidates,
 
   /* Second, for a function to be viable, its constraints must be
      satisfied. */
-  if (flag_concepts && viable
-      && !constraints_satisfied_p (fn))
+  if (flag_concepts && viable && !constraints_satisfied_p (fn))
     {
-      reason = constraint_failure (fn);
+      reason = constraint_failure ();
       viable = false;
     }
 
@@ -3729,11 +3716,7 @@ print_z_candidate (location_t loc, const char *msgstr,
 		  "class type is invalid");
 	  break;
 	case rr_constraint_failure:
-	  {
-	    tree tmpl = r->u.template_instantiation.tmpl;
-	    tree args = r->u.template_instantiation.targs;
-	    diagnose_constraints (cloc, tmpl, args);
-	  }
+	  diagnose_constraints (cloc, fn, NULL_TREE);
 	  break;
 	case rr_inherited_ctor:
 	  inform (cloc, "  an inherited constructor is not a candidate for "
@@ -4532,25 +4515,7 @@ build_new_function_call (tree fn, vec<tree, va_gc> **args,
          through flags so that later we can use it to decide whether to warn
          about peculiar null pointer conversion.  */
       if (TREE_CODE (fn) == TEMPLATE_ID_EXPR)
-        {
-          /* If overload resolution selects a specialization of a
-             function concept for non-dependent template arguments,
-             the expression is true if the constraints are satisfied
-             and false otherwise.
-
-             NOTE: This is an extension of Concepts Lite TS that
-             allows constraints to be used in expressions. */
-          if (flag_concepts && !processing_template_decl)
-            {
-              tree tmpl = DECL_TI_TEMPLATE (cand->fn);
-              tree targs = DECL_TI_ARGS (cand->fn);
-              tree decl = DECL_TEMPLATE_RESULT (tmpl);
-              if (DECL_DECLARED_CONCEPT_P (decl))
-                return evaluate_function_concept (decl, targs);
-            }
-
-          flags |= LOOKUP_EXPLICIT_TMPL_ARGS;
-        }
+        flags |= LOOKUP_EXPLICIT_TMPL_ARGS;
 
       result = build_over_call (cand, flags, complain);
     }
@@ -10828,8 +10793,11 @@ joust (struct z_candidate *cand1, struct z_candidate *cand2, bool warn,
 	return winner;
     }
 
-  // C++ Concepts
-  // or, if not that, F1 is more constrained than F2.
+  /* Concepts: ... or, if not that, F1 is more constrained than F2.
+
+     FIXME: For function templates with no winner, this subsumption may
+     be computed a separate time.  This needs to be validated, and if
+     so, the redundant check removed.  */
   if (flag_concepts && DECL_P (cand1->fn) && DECL_P (cand2->fn))
     {
       winner = more_constrained (cand1->fn, cand2->fn);
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 4abcfaf..b6afdc4 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -7189,6 +7189,9 @@ finish_struct_1 (tree t)
   /* Finish debugging output for this type.  */
   rest_of_type_compilation (t, ! LOCAL_CLASS_P (t));
 
+  /* Recalculate satisfaction that might depend on completeness.  */
+  clear_satisfaction_cache ();
+
   if (TYPE_TRANSPARENT_AGGR (t))
     {
       tree field = first_field (t);
diff --git a/gcc/cp/config-lang.in b/gcc/cp/config-lang.in
index 6e5f046..adfe1b2 100644
--- a/gcc/cp/config-lang.in
+++ b/gcc/cp/config-lang.in
@@ -39,6 +39,7 @@ gtfiles="\
 \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-format.c \
 \$(srcdir)/c-family/c-cppbuiltin.c \$(srcdir)/c-family/c-pragma.c \
 \$(srcdir)/cp/call.c \$(srcdir)/cp/class.c \$(srcdir)/cp/constexpr.c \
+\$(srcdir)/cp/constraint.cc \
 \$(srcdir)/cp/cp-gimplify.c \
 \$(srcdir)/cp/cp-lang.c \$(srcdir)/cp/cp-objcp-common.c \
 \$(srcdir)/cp/decl.c \$(srcdir)/cp/decl2.c \
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index f50cc04..ea50234 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -5523,7 +5523,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
          '!requires (T t) { ... }' which is not transformed into
          a constraint.  */
       if (!processing_template_decl)
-        return evaluate_constraint_expression (t, NULL_TREE);
+        return satisfy_constraint_expression (t);
       else
         *non_constant_p = true;
       return t;
@@ -5539,6 +5539,20 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
       r = void_node;
       break;
 
+    case TEMPLATE_ID_EXPR:
+      {
+        /* We can evaluate template-id that refers to a concept only if
+	   the template arguments are non-dependent.  */
+	if (!concept_definition_p (TREE_OPERAND (t, 0)))
+	  internal_error ("unexpected template-id %qE", t);
+
+	if (!processing_template_decl)
+	  return satisfy_constraint_expression (t);
+	else
+	  *non_constant_p = true;
+	return t;
+      }
+
     case ASM_EXPR:
       if (!ctx->quiet)
 	inline_asm_in_constexpr_error (cp_expr_loc_or_input_loc (t));
@@ -5980,13 +5994,15 @@ clear_cv_cache (void)
     cv_cache->empty ();
 }
 
-/* Dispose of the whole CV_CACHE and FOLD_CACHE.  */
+/* Dispose of the whole CV_CACHE, FOLD_CACHE, and satisfaction caches.  */
 
 void
-clear_cv_and_fold_caches (void)
+clear_cv_and_fold_caches (bool sat /*= true*/)
 {
   clear_cv_cache ();
   clear_fold_cache ();
+  if (sat)
+    clear_satisfaction_cache ();
 }
 
 /* Internal function handling expressions in templates for
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index c7a172c..db4a818 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -46,89 +46,189 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "type-utils.h"
 
+static tree satisfaction_value (tree t);
+
+/* When we're parsing or substuting a constraint expression, we have slightly
+   different expression semantics.  In particular, we don't want to reduce a
+   concept-id to a satisfaction value.  */
+
+processing_constraint_expression_sentinel::
+processing_constraint_expression_sentinel ()
+{
+  ++scope_chain->x_processing_constraint;
+}
+
+processing_constraint_expression_sentinel::
+~processing_constraint_expression_sentinel ()
+{
+  --scope_chain->x_processing_constraint;
+}
+
+bool
+processing_constraint_expression_p ()
+{
+  return scope_chain->x_processing_constraint != 0;
+}
+
 /*---------------------------------------------------------------------------
-                       Operations on constraints
+		       Constraint expressions
 ---------------------------------------------------------------------------*/
 
-/* Returns true if C is a constraint tree code. Note that ERROR_MARK
-   is a valid constraint.  */
+/* Information provided to substitution.  */
+
+struct subst_info
+{
+  subst_info (tsubst_flags_t cmp, tree in)
+    : complain (cmp), in_decl (in)
+  { }
+
+  /* True if we should not diagnose errors.  */
+  bool quiet() const
+  {
+    return complain == tf_none;
+  }
+
+  /* True if we should diagnose errors.  */
+  bool noisy() const
+  {
+    return !quiet ();
+  }
+
+  tsubst_flags_t complain;
+  tree in_decl;
+};
+
+/* True if T is known to be some type other than bool. Note that this
+   is false for dependent types and errors.  */
 
 static inline bool
-constraint_p (tree_code c)
+known_non_bool_p (tree t)
 {
-  return ((PRED_CONSTR <= c && c <= DISJ_CONSTR)
-          || c == EXPR_PACK_EXPANSION
-          || c == ERROR_MARK);
+  return (t && !WILDCARD_TYPE_P (t) && TREE_CODE (t) != BOOLEAN_TYPE);
 }
 
-/* Returns true if T is a constraint. Note that error_mark_node
-   is a valid constraint.  */
+static bool
+check_constraint_atom (cp_expr expr)
+{
+  if (known_non_bool_p (TREE_TYPE (expr)))
+    {
+      error_at (expr.get_location (),
+		"constraint expression does not have type %<bool%>");
+      return false;
+    }
 
-bool
-constraint_p (tree t)
+  /* Check that we're using function concepts correctly.  */
+  if (concept_check_p (expr))
+    {
+      tree id = unpack_concept_check (expr);
+      tree tmpl = TREE_OPERAND (id, 0);
+      if (OVL_P (tmpl) && TREE_CODE (expr) == TEMPLATE_ID_EXPR)
+        {
+	  error_at (EXPR_LOC_OR_LOC (expr, input_location),
+		    "function concept must be called");
+	  return false;
+	}
+    }
+
+  return true;
+}
+
+static bool
+check_constraint_operands (location_t, cp_expr lhs, cp_expr rhs)
 {
-  return constraint_p (TREE_CODE (t));
+  return check_constraint_atom (lhs) && check_constraint_atom (rhs);
 }
 
-/* Returns the conjunction of two constraints A and B. Note that
-   conjoining a non-null constraint with NULL_TREE is an identity
-   operation. That is, for non-null A,
+/* Validate the semantic properties of the constraint expression.  */
+
+static cp_expr
+finish_constraint_binary_op (location_t loc,
+			     tree_code code,
+			     cp_expr lhs,
+			     cp_expr rhs)
+{
+  gcc_assert (processing_constraint_expression_p ());
+  if (lhs == error_mark_node || rhs == error_mark_node)
+    return error_mark_node;
+  if (!check_constraint_operands (loc, lhs, rhs))
+    return error_mark_node;
+  tree overload;
+  tree expr = build_x_binary_op (loc, code,
+				 lhs, TREE_CODE (lhs),
+				 rhs, TREE_CODE (rhs),
+				 &overload, tf_none);
+  /* When either operand is dependent, the overload set may be non-empty.  */
+  if (expr == error_mark_node)
+    return error_mark_node;
+  SET_EXPR_LOCATION (expr, loc);
+  return expr;
+}
 
-      conjoin_constraints(a, NULL_TREE) == a
+cp_expr
+finish_constraint_or_expr (location_t loc, cp_expr lhs, cp_expr rhs)
+{
+  return finish_constraint_binary_op (loc, TRUTH_ORIF_EXPR, lhs, rhs);
+}
 
-   and
+cp_expr
+finish_constraint_and_expr (location_t loc, cp_expr lhs, cp_expr rhs)
+{
+  return finish_constraint_binary_op (loc, TRUTH_ANDIF_EXPR, lhs, rhs);
+}
 
-      conjoin_constraints (NULL_TREE, a) == a
+cp_expr
+finish_constraint_primary_expr (cp_expr expr)
+{
+  if (expr == error_mark_node)
+    return error_mark_node;
+  if (!check_constraint_atom (expr))
+    return cp_expr (error_mark_node, expr.get_location ());
+  return expr;
+}
 
-   If both A and B are NULL_TREE, the result is also NULL_TREE. */
+/* Combine two constraint-expressions with a logical-and.  */
 
 tree
-conjoin_constraints (tree a, tree b)
-{
-  gcc_assert (a ? constraint_p (a) : true);
-  gcc_assert (b ? constraint_p (b) : true);
-  if (a)
-    return b ? build_nt (CONJ_CONSTR, a, b) : a;
-  else if (b)
-    return b;
-  else
-    return NULL_TREE;
+combine_constraint_expressions (tree lhs, tree rhs)
+{
+  processing_constraint_expression_sentinel pce;
+  if (!lhs)
+    return rhs;
+  if (!rhs)
+    return lhs;
+  return finish_constraint_and_expr (input_location, lhs, rhs);
 }
 
-/* Transform the vector of expressions in the T into a conjunction
-   of requirements. T must be a TREE_VEC. */
+/* Extract the template-id from a concept check. For standard and variable
+   checks, this is simply T. For function concept checks, this is the
+   called function.  */
 
 tree
-conjoin_constraints (tree t)
+unpack_concept_check (tree t)
 {
-  gcc_assert (TREE_CODE (t) == TREE_VEC);
-  tree r = NULL_TREE;
-  for (int i = 0; i < TREE_VEC_LENGTH (t); ++i)
-    r = conjoin_constraints (r, TREE_VEC_ELT (t, i));
-  return r;
+  gcc_assert (concept_check_p (t));
+
+  if (TREE_CODE (t) == CALL_EXPR)
+    t = CALL_EXPR_FN (t);
+
+  gcc_assert (TREE_CODE (t) == TEMPLATE_ID_EXPR);
+  return t;
 }
 
-/* Returns true if T is a call expression to a function
-   concept. */
+/* Extract the TEMPLATE_DECL from a concept check.  */
 
-bool
-function_concept_check_p (tree t)
+tree
+get_concept_check_template (tree t)
 {
-  gcc_assert (TREE_CODE (t) == CALL_EXPR);
-  tree fn = CALL_EXPR_FN (t);
-  if (fn != NULL_TREE
-      && TREE_CODE (fn) == TEMPLATE_ID_EXPR)
-    {
-      tree f1 = OVL_FIRST (TREE_OPERAND (fn, 0));
-      if (TREE_CODE (f1) == TEMPLATE_DECL
-	  && DECL_DECLARED_CONCEPT_P (DECL_TEMPLATE_RESULT (f1)))
-        return true;
-    }
-  return false;
+  tree id = unpack_concept_check (t);
+  tree tmpl = TREE_OPERAND (id, 0);
+  if (OVL_P (tmpl))
+    tmpl = OVL_FIRST (tmpl);
+  return tmpl;
 }
 
-/* Returns true if any of the arguments in the template
-   argument list is a wildcard or wildcard pack.  */
+/* Returns true if any of the arguments in the template argument list is
+   a wildcard or wildcard pack.  */
 
 bool
 contains_wildcard_p (tree args)
@@ -142,38 +242,6 @@ contains_wildcard_p (tree args)
   return false;
 }
 
-/* Build a new call expression, but don't actually generate a
-   new function call. We just want the tree, not the semantics.  */
-
-inline tree
-build_call_check (tree id)
-{
-  ++processing_template_decl;
-  vec<tree, va_gc> *fargs = make_tree_vector();
-  tree call = finish_call_expr (id, &fargs, false, false, tf_none);
-  release_tree_vector (fargs);
-  --processing_template_decl;
-  return call;
-}
-
-/* Build an expression that will check a variable concept. If any
-   argument contains a wildcard, don't try to finish the variable
-   template because we can't substitute into a non-existent
-   declaration.  */
-
-tree
-build_variable_check (tree id)
-{
-  gcc_assert (TREE_CODE (id) == TEMPLATE_ID_EXPR);
-  if (contains_wildcard_p (TREE_OPERAND (id, 1)))
-    return id;
-
-  ++processing_template_decl;
-  tree var = finish_template_variable (id);
-  --processing_template_decl;
-  return var;
-}
-
 /*---------------------------------------------------------------------------
                     Resolution of qualified concept names
 ---------------------------------------------------------------------------*/
@@ -200,13 +268,12 @@ build_variable_check (tree id)
    the complete set of arguments substituted into the parameter list.  */
 
 static tree
-resolve_constraint_check (tree ovl, tree args)
+resolve_function_concept_overload (tree ovl, tree args)
 {
   int nerrs = 0;
   tree cands = NULL_TREE;
   for (lkp_iterator iter (ovl); iter; ++iter)
     {
-      // Get the next template overload.
       tree tmpl = *iter;
       if (TREE_CODE (tmpl) != TEMPLATE_DECL)
         continue;
@@ -252,7 +319,7 @@ resolve_constraint_check (tree ovl, tree args)
    does not denote a constraint check, return NULL.  */
 
 tree
-resolve_constraint_check (tree call)
+resolve_function_concept_check (tree call)
 {
   gcc_assert (TREE_CODE (call) == CALL_EXPR);
 
@@ -279,37 +346,40 @@ resolve_constraint_check (tree call)
     }
 
   tree args = TREE_OPERAND (target, 1);
-  return resolve_constraint_check (ovl, args);
+  return resolve_function_concept_overload (ovl, args);
 }
 
-/* Returns a pair containing the checked variable concept
-   and its associated prototype parameter.  The result
-   is a TREE_LIST whose TREE_VALUE is the variable concept
-   and whose TREE_PURPOSE is the prototype parameter.  */
+/* Returns a pair containing the checked concept and its associated
+   prototype parameter. The result is a TREE_LIST whose TREE_VALUE
+   is the concept (non-template) and whose TREE_PURPOSE contains
+   the converted template arguments, including the deduced prototype
+   parameter (in position 0). */
 
 tree
-resolve_variable_concept_check (tree id)
+resolve_concept_check (tree check)
 {
+  gcc_assert (concept_check_p (check));
+  tree id = unpack_concept_check (check);
   tree tmpl = TREE_OPERAND (id, 0);
-  tree args = TREE_OPERAND (id, 1);
 
-  if (!variable_concept_p (tmpl))
-    return NULL_TREE;
+  /* If this is an overloaded function concept, perform overload
+     resolution (this only happens when deducing prototype parameters
+     and template introductions).  */
+  if (TREE_CODE (tmpl) == OVERLOAD)
+    {
+      if (OVL_CHAIN (tmpl))
+	return resolve_function_concept_check (check);
+      tmpl = OVL_FIRST (tmpl);
+    }
 
-  /* Make sure that we have the right parameters before
-     assuming that it works.  Note that failing to deduce
-     will result in diagnostics.  */
+  tree args = TREE_OPERAND (id, 1);
   tree parms = INNERMOST_TEMPLATE_PARMS (DECL_TEMPLATE_PARMS (tmpl));
   ++processing_template_decl;
   tree result = coerce_template_parms (parms, args, tmpl);
   --processing_template_decl;
-  if (result != error_mark_node)
-    {
-      tree decl = DECL_TEMPLATE_RESULT (tmpl);
-      return build_tree_list (result, decl);
-    }
-  else
+  if (result == error_mark_node)
     return error_mark_node;
+  return build_tree_list (result, DECL_TEMPLATE_RESULT (tmpl));
 }
 
 /* Given a call expression or template-id expression to a concept EXPR
@@ -321,14 +391,7 @@ resolve_variable_concept_check (tree id)
 bool
 deduce_constrained_parameter (tree expr, tree& check, tree& proto)
 {
-  tree info = NULL_TREE;
-  if (TREE_CODE (expr) == TEMPLATE_ID_EXPR)
-    info = resolve_variable_concept_check (expr);
-  else if (TREE_CODE (expr) == CALL_EXPR)
-    info = resolve_constraint_check (expr);
-  else
-    gcc_unreachable ();
-
+  tree info = resolve_concept_check (expr);
   if (info && info != error_mark_node)
     {
       check = TREE_VALUE (info);
@@ -338,6 +401,7 @@ deduce_constrained_parameter (tree expr, tree& check, tree& proto)
       proto = TREE_TYPE (arg);
       return true;
     }
+
   check = proto = NULL_TREE;
   return false;
 }
@@ -346,127 +410,39 @@ deduce_constrained_parameter (tree expr, tree& check, tree& proto)
    deduce the concept being checked and return the template arguments.
    Returns NULL_TREE if deduction fails.  */
 static tree
-deduce_concept_introduction (tree expr)
+deduce_concept_introduction (tree check)
 {
-  tree info = NULL_TREE;
-  if (TREE_CODE (expr) == TEMPLATE_ID_EXPR)
-    info = resolve_variable_concept_check (expr);
-  else if (TREE_CODE (expr) == CALL_EXPR)
-    info = resolve_constraint_check (expr);
-  else
-    gcc_unreachable ();
-
+  tree info = resolve_concept_check (check);
   if (info && info != error_mark_node)
     return TREE_PURPOSE (info);
   return NULL_TREE;
 }
 
-namespace {
-
-/*---------------------------------------------------------------------------
-                       Constraint implication learning
----------------------------------------------------------------------------*/
-
-/* The implication context determines how we memoize concept checks.
-   Given two checks C1 and C2, the direction of implication depends
-   on whether we are learning implications of a conjunction or disjunction.
-   For example:
-
-      template<typename T> concept bool C = ...;
-      template<typenaem T> concept bool D = C<T> && true;
-
-   From this, we can learn that D<T> implies C<T>. We cannot learn,
-   without further testing, that C<T> does not imply D<T>. If, for
-   example, C<T> were defined as true, then these constraints would
-   be logically equivalent.
-
-   In rare cases, we may start with a logical equivalence. For example:
-
-      template<typename T> concept bool C = ...;
-      template<typename T> concept bool D = C<T>;
+/* Build a constrained placeholder type where SPEC is a type-constraint.
+   SPEC can be anything were concept_definition_p is true.
 
-   Here, we learn that C<T> implies D<T> and vice versa.   */
-
-enum implication_context
-{
-  conjunction_cxt, /* C1 implies C2. */
-  disjunction_cxt, /* C2 implies C1. */
-  equivalence_cxt  /* C1 implies C2, C2 implies C1. */
-};
-
-void learn_implications(tree, tree, implication_context);
-
-void
-learn_implication (tree parent, tree child, implication_context cxt)
-{
-  switch (cxt)
-    {
-      case conjunction_cxt:
-        save_subsumption_result (parent, child, true);
-        break;
-      case disjunction_cxt:
-        save_subsumption_result (child, parent, true);
-        break;
-      case equivalence_cxt:
-        save_subsumption_result (parent, child, true);
-        save_subsumption_result (child, parent, true);
-        break;
-    }
-}
+   If DECLTYPE_P is true, then the placeholder is decltype(auto).
 
-void
-learn_logical_operation (tree parent, tree constr, implication_context cxt)
-{
-  learn_implications (parent, TREE_OPERAND (constr, 0), cxt);
-  learn_implications (parent, TREE_OPERAND (constr, 1), cxt);
-}
+   Returns a pair whose FIRST is the concept being checked and whose
+   SECOND is the prototype parameter.  */
 
-void
-learn_implications (tree parent, tree constr, implication_context cxt)
+tree_pair
+finish_type_constraints (tree spec, tree args, tsubst_flags_t complain)
 {
-  switch (TREE_CODE (constr))
-    {
-      case CHECK_CONSTR:
-        return learn_implication (parent, constr, cxt);
-
-      case CONJ_CONSTR:
-        if (cxt == disjunction_cxt)
-          return;
-        return learn_logical_operation (parent, constr, cxt);
+  gcc_assert (concept_definition_p (spec));
 
-      case DISJ_CONSTR:
-        if (cxt == conjunction_cxt)
-          return;
-        return learn_logical_operation (parent, constr, cxt);
-
-      default:
-        break;
-    }
-}
-
-/* Quickly scan the top-level constraints of CONSTR to learn and
-   cache logical relations between concepts.  The search does not
-   include conjunctions of disjunctions or vice versa.  */
-
-void
-learn_implications (tree tmpl, tree args, tree constr)
-{
-  /* Don't memoize relations between non-dependent arguemnts. It's not
-     helpful. */
-  if (!uses_template_parms (args))
-    return;
+  /* Build an initial concept check.  */
+  tree check = build_type_constraint (spec, args, complain);
+  if (check == error_mark_node)
+    return std::make_pair (error_mark_node, NULL_TREE);
 
-  /* Build a check constraint for the purpose of caching. */
-  tree parent = build_nt (CHECK_CONSTR, tmpl, args);
+  /* Extract the concept and prototype parameter from the check. */
+  tree con;
+  tree proto;
+  if (!deduce_constrained_parameter (check, con, proto))
+    return std::make_pair (error_mark_node, NULL_TREE);
 
-  /* Start learning based on the kind of the top-level contraint. */
-  if (TREE_CODE (constr) == CONJ_CONSTR)
-    return learn_logical_operation (parent, constr, conjunction_cxt);
-  else if (TREE_CODE (constr) == DISJ_CONSTR)
-    return learn_logical_operation (parent, constr, disjunction_cxt);
-  else if (TREE_CODE (constr) == CHECK_CONSTR)
-    /* This is the rare concept alias case. */
-    return learn_implication (parent, constr, equivalence_cxt);
+  return std::make_pair (con, proto);
 }
 
 /*---------------------------------------------------------------------------
@@ -475,7 +451,7 @@ learn_implications (tree tmpl, tree args, tree constr)
 
 /* Returns the expression of a function concept. */
 
-tree
+static tree
 get_returned_expression (tree fn)
 {
   /* Extract the body of the function minus the return expression.  */
@@ -492,594 +468,468 @@ get_returned_expression (tree fn)
 
 /* Returns the initializer of a variable concept. */
 
-tree
+static tree
 get_variable_initializer (tree var)
 {
   tree init = DECL_INITIAL (var);
   if (!init)
     return error_mark_node;
+  if (BRACE_ENCLOSED_INITIALIZER_P (init)
+      && CONSTRUCTOR_NELTS (init) == 1)
+    init = CONSTRUCTOR_ELT (init, 0)->value;
   return init;
 }
 
 /* Returns the definition of a variable or function concept.  */
 
-tree
+static tree
 get_concept_definition (tree decl)
 {
+  if (TREE_CODE (decl) == OVERLOAD)
+    decl = OVL_FIRST (decl);
+
+  if (TREE_CODE (decl) == TEMPLATE_DECL)
+    decl = DECL_TEMPLATE_RESULT (decl);
+
+  if (TREE_CODE (decl) == CONCEPT_DECL)
+    return DECL_INITIAL (decl);
   if (VAR_P (decl))
     return get_variable_initializer (decl);
-  else if (TREE_CODE (decl) == FUNCTION_DECL)
+  if (TREE_CODE (decl) == FUNCTION_DECL)
     return get_returned_expression (decl);
   gcc_unreachable ();
 }
 
-int expansion_level = 0;
+/*---------------------------------------------------------------------------
+		      Normalization of expressions
+
+This set of functions will transform an expression into a constraint
+in a sequence of steps.
+---------------------------------------------------------------------------*/
 
-class expanding_concept_sentinel
+void
+debug_parameter_mapping (tree map)
 {
-public:
-  expanding_concept_sentinel ()
-  {
-    ++expansion_level;
-  }
+  for (tree p = map; p; p = TREE_CHAIN (p))
+    {
+      tree parm = TREE_VALUE (p);
+      tree arg = TREE_PURPOSE (p);
+      if (TYPE_P (parm))
+	verbatim ("MAP %qD TO %qT", TEMPLATE_TYPE_DECL (parm), arg);
+      else
+	verbatim ("MAP %qD TO %qE", TEMPLATE_PARM_DECL (parm), arg);
+      // debug_tree (parm);
+      // debug_tree (arg);
+    }
+}
 
-  ~expanding_concept_sentinel()
-  {
-    --expansion_level;
-  }
-};
+void
+debug_argument_list (tree args)
+{
+  for (int i = 0; i < TREE_VEC_LENGTH (args); ++i)
+    {
+      tree arg = TREE_VEC_ELT (args, i);
+      if (TYPE_P (arg))
+	verbatim ("ARG %qT", arg);
+      else
+	verbatim ("ARG %qE", arg);
+    }
+}
 
+/* Associate each parameter in PARMS with its corresponding template
+   argument in ARGS.  */
 
-} /* namespace */
+static tree
+map_arguments (tree parms, tree args)
+{
+  for (tree p = parms; p; p = TREE_CHAIN (p))
+    {
+      int level;
+      int index;
+      template_parm_level_and_index (TREE_VALUE (p), &level, &index);
+      TREE_PURPOSE (p) = TMPL_ARG (args, level, index);
+    }
+  return parms;
+}
 
-/* Returns true when a concept is being expanded.  */
+/* Build the parameter mapping for EXPR using ARGS.  */
 
-bool
-expanding_concept()
+static tree
+build_parameter_mapping (tree expr, tree args, tree decl)
 {
-  return expansion_level > 0;
+  int depth = 0;
+  if (decl)
+    {
+      gcc_assert (TREE_CODE (decl) == TEMPLATE_DECL);
+      tree parms = DECL_TEMPLATE_PARMS (decl);
+      depth = TREE_INT_CST_LOW (TREE_PURPOSE (parms));
+    }
+  tree parms = find_template_parameters (expr, depth);
+  tree map = map_arguments (parms, args);
+  return map;
 }
 
-/* Expand a concept declaration (not a template) and its arguments to
-   a constraint defined by the concept's initializer or definition.  */
+/* True if the parameter mappings of two atomic constraints are equivalent.  */
 
-tree
-expand_concept (tree decl, tree args)
+static bool
+parameter_mapping_equivalent_p (tree t1, tree t2)
 {
-  expanding_concept_sentinel sentinel;
+  tree map1 = ATOMIC_CONSTR_MAP (t1);
+  tree map2 = ATOMIC_CONSTR_MAP (t2);
+  while (map1 && map2)
+    {
+      tree arg1 = TREE_PURPOSE (map1);
+      tree arg2 = TREE_PURPOSE (map2);
+      if (!template_args_equal (arg1, arg2))
+        return false;
+      map1 = TREE_CHAIN (map1);
+      map2 = TREE_CHAIN (map2);
+    }
+  return true;
+}
 
-  if (TREE_CODE (decl) == TEMPLATE_DECL)
-    decl = DECL_TEMPLATE_RESULT (decl);
-  tree tmpl = DECL_TI_TEMPLATE (decl);
+/* Provides additional context for normalization.  */
 
-  /* Check for a previous specialization. */
-  if (tree spec = get_concept_expansion (tmpl, args))
-    return spec;
+struct norm_info : subst_info
+{
+  norm_info(tsubst_flags_t complain)
+    : subst_info (tf_warning_or_error | complain, NULL_TREE),
+      context()
+  {}
 
-  /* Substitute the arguments to form a new definition expression.  */
-  tree def = get_concept_definition (decl);
+  /* Construct a top-level context for DECL.  */
 
-  ++processing_template_decl;
-  tree result = tsubst_expr (def, args, tf_none, NULL_TREE, true);
-  --processing_template_decl;
-  if (result == error_mark_node)
-    return error_mark_node;
+  norm_info (tree in_decl, tsubst_flags_t complain)
+    : subst_info (tf_warning_or_error | complain, in_decl),
+      context (make_context (in_decl))
+  {}
 
-  /* And lastly, normalize it, check for implications, and save
-     the specialization for later.  */
-  tree norm = normalize_expression (result);
-  learn_implications (tmpl, args, norm);
-  return save_concept_expansion (tmpl, args, norm);
-}
+  bool generate_diagnostics() const
+  {
+    return complain & tf_norm;
+  }
 
+  tree make_context(tree in_decl)
+  {
+    if (generate_diagnostics ())
+      return build_tree_list (NULL_TREE, in_decl);
+    return NULL_TREE;
+  }
 
-/*---------------------------------------------------------------------------
-                Stepwise normalization of expressions
+  void update_context(tree expr, tree args)
+  {
+    if (generate_diagnostics ())
+      {
+	tree map = build_parameter_mapping (expr, args, in_decl);
+	context = tree_cons (map, expr, context);
+      }
+    in_decl = get_concept_check_template (expr);
+  }
 
-This set of functions will transform an expression into a constraint
-in a sequence of steps. Normalization does not not look into concept
-definitions.
----------------------------------------------------------------------------*/
+  /* Provides information about the source of a constraint. This is a
+     TREE_LIST whose VALUE is either a concept check or a constrained
+     declaration. The PURPOSE, for concept checks is a parameter mapping
+     for that check.  */
 
-/* Transform a logical-or or logical-and expression into either
-   a conjunction or disjunction. */
+  tree context;
+};
 
-tree
-normalize_logical_operation (tree t, tree_code c)
-{
-  tree t0 = normalize_expression (TREE_OPERAND (t, 0));
-  tree t1 = normalize_expression (TREE_OPERAND (t, 1));
-  return build_nt (c, t0, t1);
-}
+static tree normalize_expression (tree, tree, norm_info);
 
-/* A simple requirement T introduces an expression constraint
-   for its expression. */
+/* Transform a logical-or or logical-and expression into either
+   a conjunction or disjunction. */
 
-inline tree
-normalize_simple_requirement (tree t)
+static tree
+normalize_logical_operation (tree t, tree args, tree_code c, norm_info info)
 {
-  return build_nt (EXPR_CONSTR, TREE_OPERAND (t, 0));
-}
+  tree t0 = normalize_expression (TREE_OPERAND (t, 0), args, info);
+  tree t1 = normalize_expression (TREE_OPERAND (t, 1), args, info);
 
-/* A type requirement T introduce a type constraint for its type.  */
+  /* Build a new info object for the constraint.  */
+  tree ci = info.generate_diagnostics()
+    ? build_tree_list (t, info.context)
+    : NULL_TREE;
 
-inline tree
-normalize_type_requirement (tree t)
-{
-  return build_nt (TYPE_CONSTR, TREE_OPERAND (t, 0));
+  return build2 (c, ci, t0, t1);
 }
 
-/* A compound requirement T introduces a conjunction of constraints
-   depending on its form.  The conjunction always includes an
-   expression constraint for the expression of the requirement.
-   If a trailing return type was specified, the conjunction includes
-   either an implicit conversion constraint or an argument deduction
-   constraint.  If the noexcept specifier is present, the conjunction
-   includes an exception constraint.  */
-
-tree
-normalize_compound_requirement (tree t)
+static tree
+normalize_concept_check (tree check, tree args, norm_info info)
 {
-  tree expr = TREE_OPERAND (t, 0);
-  tree constr = build_nt (EXPR_CONSTR, TREE_OPERAND (t, 0));
-
-  /* If a type is given, append an implicit conversion or
-     argument deduction constraint.  */
-  if (tree type = TREE_OPERAND (t, 1))
-    {
-      tree type_constr;
-      /* TODO: We should be extracting a list of auto nodes
-         from type_uses_auto, not a single node */
-      if (tree placeholder = type_uses_auto (type))
-        type_constr = build_nt (DEDUCT_CONSTR, expr, type, placeholder);
-      else
-        type_constr = build_nt (ICONV_CONSTR, expr, type);
-      constr = conjoin_constraints (constr, type_constr);
-    }
+  tree id = unpack_concept_check (check);
+  tree tmpl = TREE_OPERAND (id, 0);
+  tree targs = TREE_OPERAND (id, 1);
 
-  /* If noexcept is present, append an exception constraint. */
-  if (COMPOUND_REQ_NOEXCEPT_P (t))
+  /* A function concept is wrapped in an overload.  */
+  if (TREE_CODE (tmpl) == OVERLOAD)
     {
-      tree except = build_nt (EXCEPT_CONSTR, expr);
-      constr = conjoin_constraints (constr, except);
+      /* TODO: Can we diagnose this error during parsing?  */
+      if (TREE_CODE (check) == TEMPLATE_ID_EXPR)
+	error_at (EXPR_LOC_OR_LOC (check, input_location),
+		  "function concept must be called");
+      tmpl = OVL_FIRST (tmpl);
     }
 
-  return constr;
-}
+  /* Substitute through the arguments of the concept check. */
+  targs = tsubst_template_args (targs, args, info.complain, info.in_decl);
+  if (targs == error_mark_node)
+    return error_mark_node;
 
-/* A nested requirement T introduces a conjunction of constraints
-   corresponding to its constraint-expression.
+  /* Build the substitution for the concept definition.  */
+  tree parms = TREE_VALUE (DECL_TEMPLATE_PARMS (tmpl));
+  /* Turn on template processing; coercing non-type template arguments
+     will automatically assume they're non-dependent.  */
+  ++processing_template_decl;
+  tree subst = coerce_template_parms (parms, targs, tmpl);
+  --processing_template_decl;
+  if (subst == error_mark_node)
+    return error_mark_node;
 
-   If the result of transforming T is error_mark_node, the resulting
-   constraint is a predicate constraint whose operand is also
-   error_mark_node. This preserves the constraint structure, but
-   will guarantee that the constraint is never satisfied.  */
+  /* The concept may have been ill-formed.  */
+  tree def = get_concept_definition (DECL_TEMPLATE_RESULT (tmpl));
+  if (def == error_mark_node)
+    return error_mark_node;
 
-inline tree
-normalize_nested_requirement (tree t)
-{
-  return normalize_expression (TREE_OPERAND (t, 0));
+  info.update_context (check, args);
+  return normalize_expression (def, subst, info);
 }
 
-/* Transform a requirement T into one or more constraints.  */
+/* The normal form of an atom depends on the expression. The normal
+   form of a function call to a function concept is a check constraint
+   for that concept. The normal form of a reference to a variable
+   concept is a check constraint for that concept. Otherwise, the
+   constraint is a predicate constraint.  */
 
-tree
-normalize_requirement (tree t)
+static tree
+normalize_atom (tree t, tree args, norm_info info)
 {
-  switch (TREE_CODE (t))
-    {
-    case SIMPLE_REQ:
-      return normalize_simple_requirement (t);
+  /* Concept checks are not atomic.  */
+  if (concept_check_p (t))
+    return normalize_concept_check (t, args, info);
 
-    case TYPE_REQ:
-      return normalize_type_requirement (t);
+  /* Build the parameter mapping for the atom.  */
+  tree map = build_parameter_mapping (t, args, info.in_decl);
 
-    case COMPOUND_REQ:
-      return normalize_compound_requirement (t);
+  /* Build a new info object for the atom.  */
+  tree ci = build_tree_list (t, info.context);
 
-    case NESTED_REQ:
-      return normalize_nested_requirement (t);
+  return build1 (ATOMIC_CONSTR, ci, map);
+}
+
+/* Returns the normal form of an expression. */
 
+static tree
+normalize_expression (tree t, tree args, norm_info info)
+{
+  if (!t)
+    return NULL_TREE;
+
+  if (t == error_mark_node)
+    return error_mark_node;
+
+  switch (TREE_CODE (t))
+    {
+    case TRUTH_ANDIF_EXPR:
+      return normalize_logical_operation (t, args, CONJ_CONSTR, info);
+    case TRUTH_ORIF_EXPR:
+      return normalize_logical_operation (t, args, DISJ_CONSTR, info);
     default:
-      gcc_unreachable ();
+      return normalize_atom (t, args, info);
     }
-  return error_mark_node;
 }
 
-/* Transform a sequence of requirements into a conjunction of
-   constraints. */
+/* Cache of the normalized form of constraints.  Marked as deletable because it
+   can all be recalculated.  */
+static GTY((deletable)) hash_map<tree,tree> *normalized_map;
 
-tree
-normalize_requirements (tree t)
+static tree
+get_normalized_constraints (tree t, tree args, norm_info info)
 {
-  tree result = NULL_TREE;
-  for (; t; t = TREE_CHAIN (t))
-    {
-      tree constr = normalize_requirement (TREE_VALUE (t));
-      result = conjoin_constraints (result, constr);
-    }
-  return result;
-}
-
-/* The normal form of a requires-expression is a parameterized
-   constraint having the same parameters and a conjunction of
-   constraints representing the normal form of requirements.  */
-
-tree
-normalize_requires_expression (tree t)
-{
-  tree operand = normalize_requirements (TREE_OPERAND (t, 1));
-  if (tree parms = TREE_OPERAND (t, 0))
-    return build_nt (PARM_CONSTR, parms, operand);
-  else
-    return operand;
+  auto_timevar time (TV_CONSTRAINT_NORM);
+  return normalize_expression (t, args, info);
 }
 
-/* For a template-id referring to a variable concept, returns
-   a check constraint. Otherwise, returns a predicate constraint. */
+/* Returns the normalized constraints from a constraint-info object
+   or NULL_TREE if the constraints are null. ARGS provide the initial
+   arguments for normalization and IN_DECL provides the declaration
+   to which the constraints belong.  */
 
-tree
-normalize_template_id_expression (tree t)
+static tree
+get_normalized_constraints_from_info (tree ci, tree args, tree in_decl,
+				      bool diag = false)
 {
-  if (tree info = resolve_variable_concept_check (t))
-    {
-      if (info == error_mark_node)
-        {
-          /* We get this when the template arguments don't match
-             the variable concept. */
-          error ("invalid reference to concept %qE", t);
-          return error_mark_node;
-        }
-
-      tree decl = TREE_VALUE (info);
-      tree args = TREE_PURPOSE (info);
-      return build_nt (CHECK_CONSTR, decl, args);
-    }
-
-  /* Check that we didn't refer to a function concept like a variable.  */
-  tree fn = OVL_FIRST (TREE_OPERAND (t, 0));
-  if (TREE_CODE (fn) == TEMPLATE_DECL
-      && DECL_DECLARED_CONCEPT_P (DECL_TEMPLATE_RESULT (fn)))
-    {
-      error_at (location_of (t),
-		"invalid reference to function concept %qD", fn);
-      return error_mark_node;
-    }
-
-  return build_nt (PRED_CONSTR, t);
-}
-
-/* For a call expression to a function concept, returns a check
-   constraint. Otherwise, returns a predicate constraint. */
+  if (ci == NULL_TREE)
+    return NULL_TREE;
 
-tree
-normalize_call_expression (tree t)
-{
-  /* Try to resolve this function call as a concept.  If not, then
-     it can be returned as a predicate constraint.  */
-  tree check = resolve_constraint_check (t);
-  if (!check)
-    return build_nt (PRED_CONSTR, t);
-  if (check == error_mark_node)
-    {
-      /* TODO: Improve diagnostics. We could report why the reference
-         is invalid. */
-      error ("invalid reference to concept %qE", t);
-      return error_mark_node;
-    }
+  /* Substitution errors during normalization are fatal.  */
+  ++processing_template_decl;
+  norm_info info (in_decl, diag ? tf_norm : tf_none);
+  tree t = get_normalized_constraints (CI_ASSOCIATED_CONSTRAINTS (ci),
+				       args, info);
+  --processing_template_decl;
 
-  tree fn = TREE_VALUE (check);
-  tree args = TREE_PURPOSE (check);
-  return build_nt (CHECK_CONSTR, fn, args);
+  return t;
 }
 
-/* If T is a call to an overloaded && or || operator, diagnose that
-   as a non-SFINAEable error.  Returns true if an error is emitted.
-
-   TODO: It would be better to diagnose this at the point of definition,
-   if possible. Perhaps we should immediately do a first-pass normalization
-   of a concept definition to catch obvious non-dependent errors like
-   this.  */
+/* Returns the normalized constraints for the declaration D.  */
 
-bool
-check_for_logical_overloads (tree t)
+static tree
+get_normalized_constraints_from_decl (tree d, bool diag = false)
 {
-  if (TREE_CODE (t) != CALL_EXPR)
-    return false;
+  tree tmpl;
+  tree decl;
 
-  tree fn = CALL_EXPR_FN (t);
+  /* For inherited constructors, consider the original declaration;
+     it has the correct template information attached. */
+  d = strip_inheriting_ctors (d);
 
-  /* For member calls, try extracting the function from the
-     component ref.  */
-  if (TREE_CODE (fn) == COMPONENT_REF)
+  if (TREE_CODE (d) == TEMPLATE_DECL)
     {
-      fn = TREE_OPERAND (fn, 1);
-      if (TREE_CODE (fn) == BASELINK)
-        fn = BASELINK_FUNCTIONS (fn);
+      tmpl = d;
+      decl = DECL_TEMPLATE_RESULT (tmpl);
     }
-
-  if (TREE_CODE (fn) != FUNCTION_DECL)
-    return false;
-
-  if (DECL_OVERLOADED_OPERATOR_P (fn))
+  else
     {
-      location_t loc = cp_expr_loc_or_input_loc (t);
-      error_at (loc, "constraint %qE, uses overloaded operator", t);
-      return true;
+      if (tree ti = DECL_TEMPLATE_INFO (d))
+	tmpl = TI_TEMPLATE (ti);
+      else
+	tmpl = NULL_TREE;
+      decl = d;
     }
 
-  return false;
-}
+  /* Get the most general template for the declaration, and compute
+     arguments from that. This ensures that the arguments used for
+     normalization are always template parameters and not arguments
+     used for outer specializations.  For example:
 
-/* The normal form of an atom depends on the expression. The normal
-   form of a function call to a function concept is a check constraint
-   for that concept. The normal form of a reference to a variable
-   concept is a check constraint for that concept. Otherwise, the
-   constraint is a predicate constraint.  */
+        template<typename T>
+        struct S {
+	  template<typename U> requires C<T, U> void f(U);
+        };
 
-tree
-normalize_atom (tree t)
-{
-  /* We can get constraints pushed down through pack expansions, so
-     just return them. */
-  if (constraint_p (t))
-    return t;
+        S<int>::f(0);
 
-  tree type = TREE_TYPE (t);
-  if (!type || type_unknown_p (t) || TREE_CODE (type) == TEMPLATE_TYPE_PARM)
-    ;
-  else if (!dependent_type_p (type))
-    {
-      if (check_for_logical_overloads (t))
-        return error_mark_node;
+     When we normalize the requirements for S<int>::f, we want the
+     arguments to be {T, U}, not {int, U}. One reason for this is that
+     accepting the latter causes the template parameter level of U
+     to be reduced in a way that makes it overly difficult substitute
+     concrete arguments (i.e., eventually {int, int} during satisfaction.  */
+  if (tmpl)
+  {
+    if (DECL_LANG_SPECIFIC(tmpl) && !DECL_TEMPLATE_SPECIALIZATION (tmpl))
+      tmpl = most_general_template (tmpl);
+  }
 
-      type = cv_unqualified (type);
-      if (!same_type_p (type, boolean_type_node))
-	{
-	  error ("predicate constraint %q+E does not have type %<bool%>", t);
-	  return error_mark_node;
-	}
-    }
+  /* If we're not diagnosing errors, use cached constraints, if any.  */
+  if (!diag)
+    if (tree *p = hash_map_safe_get (normalized_map, tmpl))
+      return *p;
 
-  if (TREE_CODE (t) == TEMPLATE_ID_EXPR)
-    return normalize_template_id_expression (t);
-  if (TREE_CODE (t) == CALL_EXPR)
-    return normalize_call_expression (t);
-  return build_nt (PRED_CONSTR, t);
-}
+  tree args = generic_targs_for (tmpl);
+  tree ci = get_constraints (decl);
+  tree norm = get_normalized_constraints_from_info (ci, args, tmpl, diag);
 
-/* Push down the pack expansion EXP into the leaves of the constraint PAT.  */
+  if (!diag)
+    hash_map_safe_put<hm_ggc> (normalized_map, tmpl, norm);
 
-tree
-push_down_pack_expansion (tree exp, tree pat)
-{
-  switch (TREE_CODE (pat))
-    {
-    case CONJ_CONSTR:
-    case DISJ_CONSTR:
-      {
-	pat = copy_node (pat);
-	TREE_OPERAND (pat, 0)
-	  = push_down_pack_expansion (exp, TREE_OPERAND (pat, 0));
-	TREE_OPERAND (pat, 1)
-	  = push_down_pack_expansion (exp, TREE_OPERAND (pat, 1));
-	return pat;
-      }
-    default:
-      {
-	exp = copy_node (exp);
-	SET_PACK_EXPANSION_PATTERN (exp, pat);
-	return exp;
-      }
-    }
+  return norm;
 }
 
-/* Transform a pack expansion into a constraint.  First we transform the
-   pattern of the pack expansion, then we push the pack expansion down into the
-   leaves of the constraint so that partial ordering will work.  */
+/* Returns the normal form of TMPL's definition.  */
 
-tree
-normalize_pack_expansion (tree t)
-{
-  tree pat = normalize_expression (PACK_EXPANSION_PATTERN (t));
-  return push_down_pack_expansion (t, pat);
+static tree
+normalize_concept_definition (tree tmpl)
+{
+  if (tree *p = hash_map_safe_get (normalized_map, tmpl))
+    return *p;
+  gcc_assert (concept_definition_p (tmpl));
+  if (OVL_P (tmpl))
+    tmpl = OVL_FIRST (tmpl);
+  gcc_assert (TREE_CODE (tmpl) == TEMPLATE_DECL);
+  tree args = generic_targs_for (tmpl);
+  tree def = get_concept_definition (DECL_TEMPLATE_RESULT (tmpl));
+  ++processing_template_decl;
+  norm_info info (tmpl, tf_none);
+  tree norm = get_normalized_constraints (def, args, info);
+  --processing_template_decl;
+  hash_map_safe_put<hm_ggc> (normalized_map, tmpl, norm);
+  return norm;
 }
 
-/* Transform an expression into a constraint.  */
-
-tree
-normalize_any_expression (tree t)
-{
-  switch (TREE_CODE (t))
-    {
-    case TRUTH_ANDIF_EXPR:
-      return normalize_logical_operation (t, CONJ_CONSTR);
-
-    case TRUTH_ORIF_EXPR:
-      return normalize_logical_operation (t, DISJ_CONSTR);
-
-    case REQUIRES_EXPR:
-      return normalize_requires_expression (t);
-
-    case BIND_EXPR:
-      return normalize_expression (BIND_EXPR_BODY (t));
-
-    case EXPR_PACK_EXPANSION:
-      return normalize_pack_expansion (t);
-
-    default:
-      /* All other constraints are atomic. */
-      return normalize_atom (t);
-    }
-}
+/* Returns the normal form of TMPL's requirements.  */
 
-/* Transform a statement into an expression.  */
-tree
-normalize_any_statement (tree t)
+static tree
+normalize_template_requirements (tree tmpl, bool diag = false)
 {
-  switch (TREE_CODE (t))
-    {
-    case RETURN_EXPR:
-      return normalize_expression (TREE_OPERAND (t, 0));
-    default:
-      gcc_unreachable ();
-    }
-  return error_mark_node;
+  return get_normalized_constraints_from_decl (tmpl, diag);
 }
 
-/* Reduction rules for the declaration T.  */
+/* Returns the normal form of TMPL's requirements.  */
 
-tree
-normalize_any_declaration (tree t)
+static tree
+normalize_nontemplate_requirements (tree decl, bool diag = false)
 {
-  switch (TREE_CODE (t))
-    {
-    case VAR_DECL:
-      return normalize_atom (t);
-    default:
-      gcc_unreachable ();
-    }
-  return error_mark_node;
+  return get_normalized_constraints_from_decl (decl, diag);
 }
 
-/* Returns the normal form of a constraint expression. */
+/* Normalize an EXPR as a constraint.  */
 
-tree
-normalize_expression (tree t)
+static tree
+normalize_constraint_expression (tree expr, bool diag = false)
 {
-  if (!t)
-    return NULL_TREE;
-
-  if (t == error_mark_node)
-    return error_mark_node;
+  if (!expr || expr == error_mark_node)
+    return expr;
 
-  switch (TREE_CODE_CLASS (TREE_CODE (t)))
+  /* For concept checks, use the supplied template arguments as those used
+     for normalization. Otherwise, there are no template arguments.  */
+  tree args;
+  if (concept_check_p (expr))
     {
-    case tcc_unary:
-    case tcc_binary:
-    case tcc_expression:
-    case tcc_vl_exp:
-      return normalize_any_expression (t);
-
-    case tcc_statement:
-      return normalize_any_statement (t);
-
-    case tcc_declaration:
-      return normalize_any_declaration (t);
-
-    case tcc_exceptional:
-    case tcc_constant:
-    case tcc_reference:
-    case tcc_comparison:
-      /* These are all atomic predicate constraints. */
-      return normalize_atom (t);
-
-    default:
-      /* Unhandled node kind. */
-      gcc_unreachable ();
+      tree id = unpack_concept_check (expr);
+      args = TREE_OPERAND (id, 1);
     }
-  return error_mark_node;
-}
-
-
-/*---------------------------------------------------------------------------
-                        Constraint normalization
----------------------------------------------------------------------------*/
-
-tree normalize_constraint (tree);
-
-/* The normal form of the disjunction T0 /\ T1 is the conjunction
-   of the normal form of T0 and the normal form of T1.  */
-
-inline tree
-normalize_conjunction (tree t)
-{
-  tree t0 = normalize_constraint (TREE_OPERAND (t, 0));
-  tree t1 = normalize_constraint (TREE_OPERAND (t, 1));
-  return build_nt (CONJ_CONSTR, t0, t1);
-}
-
-/* The normal form of the disjunction T0 \/ T1 is the disjunction
-   of the normal form of T0 and the normal form of T1.  */
-
-inline tree
-normalize_disjunction (tree t)
-{
-  tree t0 = normalize_constraint (TREE_OPERAND (t, 0));
-  tree t1 = normalize_constraint (TREE_OPERAND (t, 1));
-  return build_nt (DISJ_CONSTR, t0, t1);
-}
-
-/* A predicate constraint is normalized in two stages.  First all
-   references specializations of concepts are replaced by their
-   substituted definitions.  Then, the resulting expression is
-   transformed into a constraint by transforming && expressions
-   into conjunctions and || into disjunctions.  */
+  else
+    args = NULL_TREE;
 
-tree
-normalize_predicate_constraint (tree t)
-{
   ++processing_template_decl;
-  tree expr = PRED_CONSTR_EXPR (t);
-  tree constr = normalize_expression (expr);
+  norm_info info (diag ? tf_norm : tf_none);
+  tree norm = get_normalized_constraints (expr, args, info);
   --processing_template_decl;
-  return constr;
+  return norm;
 }
 
-/* The normal form of a parameterized constraint is the normal
-   form of its operand.  */
+/* 17.4.1.2p2. Two constraints are identical if they are formed
+   from the same expression and the targets of the parameter mapping
+   are equivalent.  */
 
-tree
-normalize_parameterized_constraint (tree t)
+bool
+atomic_constraints_identical_p (tree t1, tree t2)
 {
-  tree parms = PARM_CONSTR_PARMS (t);
-  tree operand = normalize_constraint (PARM_CONSTR_OPERAND (t));
-  return build_nt (PARM_CONSTR, parms, operand);
-}
+  if (ATOMIC_CONSTR_EXPR (t1) != ATOMIC_CONSTR_EXPR (t2))
+    return false;
 
-/* Normalize the constraint T by reducing it so that it is
-   comprised of only conjunctions and disjunctions of atomic
-   constraints.  */
+  if (!parameter_mapping_equivalent_p (t1, t2))
+    return false;
 
-tree
-normalize_constraint (tree t)
-{
-  if (!t)
-    return NULL_TREE;
+  return true;
+}
 
-  if (t == error_mark_node)
-    return t;
+hashval_t
+hash_atomic_constraint (tree t)
+{
+  /* Hash the identity of the expression.  */
+  hashval_t val = htab_hash_pointer (ATOMIC_CONSTR_EXPR (t));
 
-  switch (TREE_CODE (t))
+  /* Hash the targets of the parameter map.  */
+  tree p = ATOMIC_CONSTR_MAP (t);
+  while (p)
     {
-      case CONJ_CONSTR:
-        return normalize_conjunction (t);
-
-      case DISJ_CONSTR:
-        return normalize_disjunction (t);
-
-      case PRED_CONSTR:
-        return normalize_predicate_constraint (t);
-
-      case PARM_CONSTR:
-        return normalize_parameterized_constraint (t);
-
-      case EXPR_CONSTR:
-      case TYPE_CONSTR:
-      case ICONV_CONSTR:
-      case DEDUCT_CONSTR:
-      case EXCEPT_CONSTR:
-        /* These constraints are defined to be atomic. */
-        return t;
-
-      default:
-        /* CONSTR was not a constraint. */
-        gcc_unreachable();
+      val = iterative_hash_template_arg (TREE_PURPOSE (p), val);
+      p = TREE_CHAIN (p);
     }
-  return error_mark_node;
-}
-
 
+  return val;
+}
 
 // -------------------------------------------------------------------------- //
 // Constraint Semantic Processing
@@ -1093,7 +943,7 @@ current_template_constraints (void)
 {
   if (!current_template_parms)
     return NULL_TREE;
-  tree tmpl_constr = TEMPLATE_PARM_CONSTRAINTS (current_template_parms);
+  tree tmpl_constr = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
   return build_constraints (tmpl_constr, NULL_TREE);
 }
 
@@ -1104,7 +954,7 @@ current_template_constraints (void)
 tree
 associate_classtype_constraints (tree type)
 {
-  if (!type || type == error_mark_node || TREE_CODE (type) != RECORD_TYPE)
+  if (!type || type == error_mark_node || !CLASS_TYPE_P (type))
     return type;
 
   /* An explicit class template specialization has no template parameters.  */
@@ -1124,9 +974,11 @@ associate_classtype_constraints (tree type)
         {
           if (!equivalent_constraints (ci, orig_ci))
             {
-              // FIXME: Improve diagnostics.
-              error ("%qT does not match any declaration", type);
-              return error_mark_node;
+	      error ("%qT does not match original declaration", type);
+	      tree tmpl = CLASSTYPE_TI_TEMPLATE (type);
+	      location_t loc = DECL_SOURCE_LOCATION (tmpl);
+	      inform (loc, "original template declaration here");
+	      /* Fall through, so that we define the type anyway.  */
             }
           return type;
         }
@@ -1135,17 +987,14 @@ associate_classtype_constraints (tree type)
   return type;
 }
 
-namespace {
+/* Create an empty constraint info block.  */
 
-// Create an empty constraint info block.
-inline tree_constraint_info*
+static inline tree_constraint_info*
 build_constraint_info ()
 {
   return (tree_constraint_info *)make_node (CONSTRAINT_INFO);
 }
 
-} // namespace
-
 /* Build a constraint-info object that contains the associated constraints
    of a declaration.  This also includes the declaration's template
    requirements (TREQS) and any trailing requirements for a function
@@ -1155,27 +1004,46 @@ build_constraint_info ()
    this returns NULL_TREE, indicating an unconstrained declaration.  */
 
 tree
-build_constraints (tree tmpl_reqs, tree decl_reqs)
+build_constraints (tree tr, tree dr)
 {
-  gcc_assert (tmpl_reqs ? constraint_p (tmpl_reqs) : true);
-  gcc_assert (decl_reqs ? constraint_p (decl_reqs) : true);
-
-  if (!tmpl_reqs && !decl_reqs)
+  if (!tr && !dr)
     return NULL_TREE;
 
   tree_constraint_info* ci = build_constraint_info ();
-  ci->template_reqs = tmpl_reqs;
-  ci->declarator_reqs = decl_reqs;
-  ci->associated_constr = conjoin_constraints (tmpl_reqs, decl_reqs);
+  ci->template_reqs = tr;
+  ci->declarator_reqs = dr;
+  ci->associated_constr = combine_constraint_expressions (tr, dr);
 
   return (tree)ci;
 }
 
-namespace {
+/* Returns the template-head requires clause for the template
+   declaration T or NULL_TREE if none.  */
+
+tree
+get_template_head_requirements (tree t)
+{
+  tree ci = get_constraints (t);
+  if (!ci)
+    return NULL_TREE;
+  return CI_TEMPLATE_REQS (ci);
+}
+
+/* Returns the trailing requires clause of the declarator of
+   a template declaration T or NULL_TREE if none.  */
+
+tree
+get_trailing_function_requirements (tree t)
+{
+  tree ci = get_constraints (t);
+  if (!ci)
+    return NULL_TREE;
+  return CI_DECLARATOR_REQS (ci);
+}
 
 /* Construct a sequence of template arguments by prepending
    ARG to REST. Either ARG or REST may be null. */
-tree
+static tree
 build_concept_check_arguments (tree arg, tree rest)
 {
   gcc_assert (rest ? TREE_CODE (rest) == TREE_VEC : true);
@@ -1199,27 +1067,155 @@ build_concept_check_arguments (tree arg, tree rest)
   return args;
 }
 
-} // namespace
+/* Builds an id-expression of the form `C<Args...>()` where C is a function
+   concept.  */
+
+static tree
+build_function_check (tree tmpl, tree args, tsubst_flags_t /*complain*/)
+{
+  if (TREE_CODE (tmpl) == TEMPLATE_DECL)
+    {
+      /* If we just got a template, wrap it in an overload so it looks like any
+	 other template-id. */
+      tmpl = ovl_make (tmpl);
+      TREE_TYPE (tmpl) = boolean_type_node;
+    }
+
+  /* Perform function concept resolution now so we always have a single
+     function of the overload set (even if we started with only one; the
+     resolution function converts template arguments). Note that we still
+     wrap this in an overload set so we don't upset other parts of the
+     compiler that expect template-ids referring to function concepts
+     to have an overload set.  */
+  tree info = resolve_function_concept_overload (tmpl, args);
+  if (info == error_mark_node)
+    return error_mark_node;
+  if (!info)
+    {
+      error ("no matching concepts for %qE", tmpl);
+      return error_mark_node;
+    }
+  args = TREE_PURPOSE (info);
+  tmpl = DECL_TI_TEMPLATE (TREE_VALUE (info));
+
+  /* Rebuild the singleton overload set; mark the type bool.  */
+  tmpl = ovl_make (tmpl, NULL_TREE);
+  TREE_TYPE (tmpl) = boolean_type_node;
+
+  /* Build the id-expression around the overload set.  */
+  tree id = build2 (TEMPLATE_ID_EXPR, boolean_type_node, tmpl, args);
+
+  /* Finally, build the call expression around the overload.  */
+  ++processing_template_decl;
+  vec<tree, va_gc> *fargs = make_tree_vector ();
+  tree call = build_min_nt_call_vec (id, fargs);
+  release_tree_vector (fargs);
+  --processing_template_decl;
+
+  return call;
+}
+
+/* Builds an id-expression of the form `C<Args...>` where C is a variable
+   concept.  */
+
+static tree
+build_variable_check (tree tmpl, tree args, tsubst_flags_t complain)
+{
+  gcc_assert (variable_concept_p (tmpl));
+  gcc_assert (TREE_CODE (tmpl) == TEMPLATE_DECL);
+  tree parms = INNERMOST_TEMPLATE_PARMS (DECL_TEMPLATE_PARMS (tmpl));
+  args = coerce_template_parms (parms, args, tmpl, complain);
+  if (args == error_mark_node)
+    return error_mark_node;
+  return build2 (TEMPLATE_ID_EXPR, boolean_type_node, tmpl, args);
+}
+
+/* Builds an id-expression of the form `C<Args...>` where C is a standard
+   concept.  */
+
+static tree
+build_standard_check (tree tmpl, tree args, tsubst_flags_t complain)
+{
+  gcc_assert (standard_concept_p (tmpl));
+  gcc_assert (TREE_CODE (tmpl) == TEMPLATE_DECL);
+  tree parms = INNERMOST_TEMPLATE_PARMS (DECL_TEMPLATE_PARMS (tmpl));
+  args = coerce_template_parms (parms, args, tmpl, complain);
+  if (args == error_mark_node)
+    return error_mark_node;
+  return build2 (TEMPLATE_ID_EXPR, boolean_type_node, tmpl, args);
+}
+
+/* Construct an expression that checks TARGET using ARGS.  */
 
-/* Construct an expression that checks the concept given by
-   TARGET. The TARGET must be:
+tree
+build_concept_check (tree target, tree args, tsubst_flags_t complain)
+{
+  return build_concept_check (target, NULL_TREE, args, complain);
+}
 
-   - an OVERLOAD referring to one or more function concepts
-   - a BASELINK referring to an overload set of the above, or
-   - a TEMPLTATE_DECL referring to a variable concept.
+/* Construct an expression that checks the concept given by DECL. If
+   concept_definition_p (DECL) is false, this returns null.  */
 
-   ARG and REST are the explicit template arguments for the
-   eventual concept check. */
 tree
-build_concept_check (tree target, tree arg, tree rest)
+build_concept_check (tree decl, tree arg, tree rest, tsubst_flags_t complain)
 {
+  if (arg == NULL_TREE && rest == NULL_TREE)
+    {
+      tree id = build_nt (TEMPLATE_ID_EXPR, decl, rest);
+      error ("invalid use concept %qE", id);
+      return error_mark_node;
+    }
+
   tree args = build_concept_check_arguments (arg, rest);
-  if (variable_template_p (target))
-    return build_variable_check (lookup_template_variable (target, args));
-  else
-    return build_call_check (lookup_template_function (target, args));
+
+  if (standard_concept_p (decl))
+    return build_standard_check (decl, args, complain);
+  if (variable_concept_p (decl))
+    return build_variable_check (decl, args, complain);
+  if (function_concept_p (decl))
+    return build_function_check (decl, args, complain);
+
+  return error_mark_node;
+}
+
+/* Build a template-id that can participate in a concept check.  */
+
+static tree
+build_concept_id (tree decl, tree args)
+{
+  tree check = build_concept_check (decl, args, tf_warning_or_error);
+  if (check == error_mark_node)
+    return error_mark_node;
+  return unpack_concept_check (check);
+}
+
+/* Build a template-id that can participate in a concept check, preserving
+   the source location of the original template-id.  */
+
+tree
+build_concept_id (tree expr)
+{
+  gcc_assert (TREE_CODE (expr) == TEMPLATE_ID_EXPR);
+  tree id = build_concept_id (TREE_OPERAND (expr, 0), TREE_OPERAND (expr, 1));
+  protected_set_expr_location (id, cp_expr_location (expr));
+  return id;
 }
 
+/* Build as template-id with a placeholder that can be used as a
+   type constraint.
+
+   Note that this will diagnose errors if the initial concept check
+   cannot be built.  */
+
+tree
+build_type_constraint (tree decl, tree args, tsubst_flags_t complain)
+{
+  tree wildcard = build_nt (WILDCARD_DECL);
+  tree check = build_concept_check (decl, wildcard, args, complain);
+  if (check == error_mark_node)
+    return error_mark_node;
+  return unpack_concept_check (check);
+}
 
 /* Returns a TYPE_DECL that contains sufficient information to
    build a template parameter of the same kind as PROTO and
@@ -1240,17 +1236,13 @@ build_constrained_parameter (tree cnc, tree proto, tree args)
   return decl;
 }
 
-/* Create a constraint expression for the given DECL that
-   evaluates the requirements specified by CONSTR, a TYPE_DECL
-   that contains all the information necessary to build the
-   requirements (see finish_concept_name for the layout of
-   that TYPE_DECL).
-
-   Note that the constraints are neither reduced nor decomposed.
-   That is done only after the requires clause has been parsed
-   (or not).
+/* Create a constraint expression for the given DECL that evaluates the
+   requirements specified by CONSTR, a TYPE_DECL that contains all the
+   information necessary to build the requirements (see finish_concept_name
+   for the layout of that TYPE_DECL).
 
-   This will always return a CHECK_CONSTR. */
+   Note that the constraints are neither reduced nor decomposed. That is
+   done only after the requires clause has been parsed (or not).  */
 tree
 finish_shorthand_constraint (tree decl, tree constr)
 {
@@ -1265,41 +1257,46 @@ finish_shorthand_constraint (tree decl, tree constr)
   tree con = CONSTRAINED_PARM_CONCEPT (constr);
   tree args = CONSTRAINED_PARM_EXTRA_ARGS (constr);
 
-  /* If the parameter declaration is variadic, but the concept
-     is not then we need to apply the concept to every element
-     in the pack.  */
-  bool is_proto_pack = template_parameter_pack_p (proto);
-  bool is_decl_pack = template_parameter_pack_p (decl);
-  bool apply_to_all_p = is_decl_pack && !is_proto_pack;
+  /* The TS lets use shorthand to constrain a pack of arguments, but the
+     standard does not.
+
+     For the TS, consider:
+
+	template<C... Ts> struct s;
+
+     If C is variadic (and because Ts is a pack), we associate the
+     constraint C<Ts...>. In all other cases, we associate
+     the constraint (C<Ts> && ...).
+
+     The standard behavior cannot be overridden by -fconcepts-ts.  */
+  bool variadic_concept_p = template_parameter_pack_p (proto);
+  bool declared_pack_p = template_parameter_pack_p (decl);
+  bool apply_to_each_p = (cxx_dialect >= cxx2a) ? true : !variadic_concept_p;
 
   /* Get the argument and overload used for the requirement
      and adjust it if we're going to expand later.  */
   tree arg = template_parm_to_arg (build_tree_list (NULL_TREE, decl));
-  if (apply_to_all_p)
+  if (apply_to_each_p && declared_pack_p)
     arg = PACK_EXPANSION_PATTERN (TREE_VEC_ELT (ARGUMENT_PACK_ARGS (arg), 0));
 
-  /* Build the concept check. If it the constraint needs to be
-     applied to all elements of the parameter pack, then make
-     the constraint an expansion. */
+  /* Build the concept constraint-expression.  */
   tree tmpl = DECL_TI_TEMPLATE (con);
-  tree check = VAR_P (con) ? tmpl : ovl_make (tmpl);
-  check = build_concept_check (check, arg, args);
+  tree check = tmpl;
+  if (TREE_CODE (con) == FUNCTION_DECL)
+    check = ovl_make (tmpl);
+  check = build_concept_check (check, arg, args, tf_warning_or_error);
 
-  /* Make the check a pack expansion if needed.
+  /* Make the check a fold-expression if needed.  */
+  if (apply_to_each_p && declared_pack_p)
+    check = finish_left_unary_fold_expr (check, TRUTH_ANDIF_EXPR);
 
-     FIXME: We should be making a fold expression. */
-  if (apply_to_all_p)
-    {
-      check = make_pack_expansion (check);
-      TREE_TYPE (check) = boolean_type_node;
-    }
-
-  return normalize_expression (check);
+  return check;
 }
 
 /* Returns a conjunction of shorthand requirements for the template
    parameter list PARMS. Note that the requirements are stored in
    the TYPE of each tree node. */
+
 tree
 get_shorthand_constraints (tree parms)
 {
@@ -1309,94 +1306,219 @@ get_shorthand_constraints (tree parms)
     {
       tree parm = TREE_VEC_ELT (parms, i);
       tree constr = TEMPLATE_PARM_CONSTRAINTS (parm);
-      result = conjoin_constraints (result, constr);
+      result = combine_constraint_expressions (result, constr);
     }
   return result;
 }
 
-// Returns and chains a new parameter for PARAMETER_LIST which will conform
-// to the prototype given by SRC_PARM.  The new parameter will have its
-// identifier and location set according to IDENT and PARM_LOC respectively.
+/* Get the deduced wildcard from a DEDUCED placeholder.  If the deduced
+   wildcard is a pack, return the first argument of that pack.  */
+
 static tree
-process_introduction_parm (tree parameter_list, tree src_parm)
+get_deduced_wildcard (tree wildcard)
 {
-  // If we have a pack, we should have a single pack argument which is the
-  // placeholder we want to look at.
-  bool is_parameter_pack = ARGUMENT_PACK_P (src_parm);
-  if (is_parameter_pack)
-    src_parm = TREE_VEC_ELT (ARGUMENT_PACK_ARGS (src_parm), 0);
+  if (ARGUMENT_PACK_P (wildcard))
+    wildcard = TREE_VEC_ELT (ARGUMENT_PACK_ARGS (wildcard), 0);
+  gcc_assert (TREE_CODE (wildcard) == WILDCARD_DECL);
+  return wildcard;
+}
 
-  // At this point we should have a wildcard, but we want to
-  // grab the associated decl from it.  Also grab the stored
-  // identifier and location that should be chained to it in
-  // a PARM_DECL.
-  gcc_assert (TREE_CODE (src_parm) == WILDCARD_DECL);
+/* Returns the prototype parameter for the nth deduced wildcard.  */
 
-  tree ident = DECL_NAME (src_parm);
-  location_t parm_loc = DECL_SOURCE_LOCATION (src_parm);
+static tree
+get_introduction_prototype (tree wildcards, int index)
+{
+  return TREE_TYPE (get_deduced_wildcard (TREE_VEC_ELT (wildcards, index)));
+}
 
-  // If we expect a pack and the deduced template is not a pack, or if the
-  // template is using a pack and we didn't declare a pack, throw an error.
-  if (is_parameter_pack != WILDCARD_PACK_P (src_parm))
-    {
-      error_at (parm_loc, "cannot match pack for introduced parameter");
-      tree err_parm = build_tree_list (error_mark_node, error_mark_node);
-      return chainon (parameter_list, err_parm);
-    }
+/* Introduce a type template parameter.  */
 
-  src_parm = TREE_TYPE (src_parm);
+static tree
+introduce_type_template_parameter (tree wildcard, bool& non_type_p)
+{
+  non_type_p = false;
+  return finish_template_type_parm (class_type_node, DECL_NAME (wildcard));
+}
+
+/* Introduce a template template parameter.  */
+
+static tree
+introduce_template_template_parameter (tree wildcard, bool& non_type_p)
+{
+  non_type_p = false;
+  begin_template_parm_list ();
+  current_template_parms = DECL_TEMPLATE_PARMS (TREE_TYPE (wildcard));
+  end_template_parm_list ();
+  return finish_template_template_parm (class_type_node, DECL_NAME (wildcard));
+}
+
+/* Introduce a template non-type parameter.  */
+
+static tree
+introduce_nontype_template_parameter (tree wildcard, bool& non_type_p)
+{
+  non_type_p = true;
+  tree parm = copy_decl (TREE_TYPE (wildcard));
+  DECL_NAME (parm) = DECL_NAME (wildcard);
+  return parm;
+}
+
+/* Introduce a single template parameter.  */
+
+static tree
+build_introduced_template_parameter (tree wildcard, bool& non_type_p)
+{
+  tree proto = TREE_TYPE (wildcard);
 
   tree parm;
-  bool is_non_type;
-  if (TREE_CODE (src_parm) == TYPE_DECL)
+  if (TREE_CODE (proto) == TYPE_DECL)
+    parm = introduce_type_template_parameter (wildcard, non_type_p);
+  else if (TREE_CODE (proto) == TEMPLATE_DECL)
+    parm = introduce_template_template_parameter (wildcard, non_type_p);
+  else
+    parm = introduce_nontype_template_parameter (wildcard, non_type_p);
+
+  /* Wrap in a TREE_LIST for process_template_parm. Note that introduced
+     parameters do not retain the defaults from the source parameter.  */
+  return build_tree_list (NULL_TREE, parm);
+}
+
+/* Introduce a single template parameter.  */
+
+static tree
+introduce_template_parameter (tree parms, tree wildcard)
+{
+  gcc_assert (!ARGUMENT_PACK_P (wildcard));
+  tree proto = TREE_TYPE (wildcard);
+  location_t loc = DECL_SOURCE_LOCATION (wildcard);
+
+  /* Diagnose the case where we have C{...Args}.  */
+  if (WILDCARD_PACK_P (wildcard))
     {
-      is_non_type = false;
-      parm = finish_template_type_parm (class_type_node, ident);
+      tree id = DECL_NAME (wildcard);
+      error_at (loc, "%qE cannot be introduced with an ellipsis %<...%>", id);
+      inform (DECL_SOURCE_LOCATION (proto), "prototype declared here");
     }
-  else if (TREE_CODE (src_parm) == TEMPLATE_DECL)
+
+  bool non_type_p;
+  tree parm = build_introduced_template_parameter (wildcard, non_type_p);
+  return process_template_parm (parms, loc, parm, non_type_p, false);
+}
+
+/* Introduce a template parameter pack.  */
+
+static tree
+introduce_template_parameter_pack (tree parms, tree wildcard)
+{
+  bool non_type_p;
+  tree parm = build_introduced_template_parameter (wildcard, non_type_p);
+  location_t loc = DECL_SOURCE_LOCATION (wildcard);
+  return process_template_parm (parms, loc, parm, non_type_p, true);
+}
+
+/* Introduce the nth template parameter.  */
+
+static tree
+introduce_template_parameter (tree parms, tree wildcards, int& index)
+{
+  tree deduced = TREE_VEC_ELT (wildcards, index++);
+  return introduce_template_parameter (parms, deduced);
+}
+
+/* Introduce either a template parameter pack or a list of template
+   parameters.  */
+
+static tree
+introduce_template_parameters (tree parms, tree wildcards, int& index)
+{
+  /* If the prototype was a parameter, we better have deduced an
+     argument pack, and that argument must be the last deduced value
+     in the wildcard vector.  */
+  tree deduced = TREE_VEC_ELT (wildcards, index++);
+  gcc_assert (ARGUMENT_PACK_P (deduced));
+  gcc_assert (index == TREE_VEC_LENGTH (wildcards));
+
+  /* Introduce each element in the pack.  */
+  tree args = ARGUMENT_PACK_ARGS (deduced);
+  for (int i = 0; i < TREE_VEC_LENGTH (args); ++i)
     {
-      is_non_type = false;
-      begin_template_parm_list ();
-      current_template_parms = DECL_TEMPLATE_PARMS (src_parm);
-      end_template_parm_list ();
-      parm = finish_template_template_parm (class_type_node, ident);
+      tree arg = TREE_VEC_ELT (args, i);
+      if (WILDCARD_PACK_P (arg))
+	parms = introduce_template_parameter_pack (parms, arg);
+      else
+	parms = introduce_template_parameter (parms, arg);
     }
+
+  return parms;
+}
+
+/* Builds the template parameter list PARMS by chaining introduced
+   parameters from the WILDCARD vector.  INDEX is the position of
+   the current parameter.  */
+
+static tree
+process_introduction_parms (tree parms, tree wildcards, int& index)
+{
+  tree proto = get_introduction_prototype (wildcards, index);
+  if (template_parameter_pack_p (proto))
+    return introduce_template_parameters (parms, wildcards, index);
   else
-    {
-      is_non_type = true;
+    return introduce_template_parameter (parms, wildcards, index);
+}
 
-      // Since we don't have a declarator, so we can copy the source
-      // parameter and change the name and eventually the location.
-      parm = copy_decl (src_parm);
-      DECL_NAME (parm) = ident;
-    }
+/* Ensure that all template parameters have been introduced for the concept
+   named in CHECK.  If not, emit a diagnostic.
 
-  // Wrap in a TREE_LIST for process_template_parm.  Introductions do not
-  // retain the defaults from the source template.
-  parm = build_tree_list (NULL_TREE, parm);
+   Note that implicitly introducing a parameter with a default argument
+     creates a case where a parameter is declared, but unnamed, making
+     it unusable in the definition.  */
 
-  return process_template_parm (parameter_list, parm_loc, parm,
-                                is_non_type, is_parameter_pack);
+static bool
+check_introduction_list (tree intros, tree check)
+{
+  check = unpack_concept_check (check);
+  tree tmpl = TREE_OPERAND (check, 0);
+  if (OVL_P (tmpl))
+    tmpl = OVL_FIRST (tmpl);
+
+  tree parms = DECL_INNERMOST_TEMPLATE_PARMS (tmpl);
+  if (TREE_VEC_LENGTH (intros) < TREE_VEC_LENGTH (parms))
+    {
+      error_at (input_location, "all template parameters of %qD must "
+				"be introduced", tmpl);
+      return false;
+    }
+
+   return true;
 }
 
-/* Associates a constraint check to the current template based
-   on the introduction parameters.  INTRO_LIST must be a TREE_VEC
-   of WILDCARD_DECLs containing a chained PARM_DECL which
-   contains the identifier as well as the source location.
-   TMPL_DECL is the decl for the concept being used.  If we
-   take a concept, C, this will form a check in the form of
-   C<INTRO_LIST> filling in any extra arguments needed by the
-   defaults deduced.
+/* Associates a constraint check to the current template based on the
+   introduction parameters.  INTRO_LIST must be a TREE_VEC of WILDCARD_DECLs
+   containing a chained PARM_DECL which contains the identifier as well as
+   the source location. TMPL_DECL is the decl for the concept being used.
+   If we take a concept, C, this will form a check in the form of
+   C<INTRO_LIST> filling in any extra arguments needed by the defaults
+   deduced.
+
+   Returns NULL_TREE if no concept could be matched and error_mark_node if
+   an error occurred when matching.  */
 
-   Returns NULL_TREE if no concept could be matched and
-   error_mark_node if an error occurred when matching.  */
 tree
-finish_template_introduction (tree tmpl_decl, tree intro_list)
+finish_template_introduction (tree tmpl_decl,
+			      tree intro_list,
+			      location_t intro_loc)
 {
-  /* Deduce the concept check.  */
-  tree expr = build_concept_check (tmpl_decl, NULL_TREE, intro_list);
+  /* Build a concept check to deduce the actual parameters.  */
+  tree expr = build_concept_check (tmpl_decl, intro_list, tf_none);
   if (expr == error_mark_node)
-    return NULL_TREE;
+    {
+      error_at (intro_loc, "cannot deduce template parameters from "
+			   "introduction list");
+      return error_mark_node;
+    }
+
+  if (!check_introduction_list (intro_list, expr))
+    return error_mark_node;
 
   tree parms = deduce_concept_introduction (expr);
   if (!parms)
@@ -1406,9 +1528,15 @@ finish_template_introduction (tree tmpl_decl, tree intro_list)
   tree parm_list = NULL_TREE;
   begin_template_parm_list ();
   int nargs = MIN (TREE_VEC_LENGTH (parms), TREE_VEC_LENGTH (intro_list));
-  for (int n = 0; n < nargs; ++n)
-    parm_list = process_introduction_parm (parm_list, TREE_VEC_ELT (parms, n));
+  for (int n = 0; n < nargs; )
+    parm_list = process_introduction_parms (parm_list, parms, n);
   parm_list = end_template_parm_list (parm_list);
+
+  /* Update the number of arguments to reflect the number of deduced
+     template parameter introductions.  */
+  nargs = TREE_VEC_LENGTH (parm_list);
+
+  /* Determine if any errors occurred during matching.  */
   for (int i = 0; i < TREE_VEC_LENGTH (parm_list); ++i)
     if (TREE_VALUE (TREE_VEC_ELT (parm_list, i)) == error_mark_node)
       {
@@ -1417,7 +1545,7 @@ finish_template_introduction (tree tmpl_decl, tree intro_list)
       }
 
   /* Build a concept check for our constraint.  */
-  tree check_args = make_tree_vec (TREE_VEC_LENGTH (parms));
+  tree check_args = make_tree_vec (nargs);
   int n = 0;
   for (; n < TREE_VEC_LENGTH (parm_list); ++n)
     {
@@ -1431,22 +1559,33 @@ finish_template_introduction (tree tmpl_decl, tree intro_list)
   for (; n < TREE_VEC_LENGTH (parms); ++n)
     TREE_VEC_ELT (check_args, n) = TREE_VEC_ELT (parms, n);
 
-  /* Associate the constraint. */
-  tree check = build_concept_check (tmpl_decl, NULL_TREE, check_args);
-  tree constr = normalize_expression (check);
-  TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = constr;
+  /* Associate the constraint.  */
+  tree check = build_concept_check (tmpl_decl,
+				    check_args,
+				    tf_warning_or_error);
+  TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = check;
 
   return parm_list;
 }
 
 
-/* Given the predicate constraint T from a constrained-type-specifier, extract
+/* Given the concept check T from a constrained-type-specifier, extract
    its TMPL and ARGS.  FIXME why do we need two different forms of
    constrained-type-specifier?  */
 
 void
 placeholder_extract_concept_and_args (tree t, tree &tmpl, tree &args)
 {
+  if (concept_check_p (t))
+    {
+      t = unpack_concept_check (t);
+      tmpl = TREE_OPERAND (t, 0);
+      if (TREE_CODE (tmpl) == OVERLOAD)
+        tmpl = OVL_FIRST (tmpl);
+      args = TREE_OPERAND (t, 1);
+      return;
+    }
+
   if (TREE_CODE (t) == TYPE_DECL)
     {
       /* A constrained parameter.  Build a constraint check
@@ -1457,20 +1596,10 @@ placeholder_extract_concept_and_args (tree t, tree &tmpl, tree &args)
       placeholder_extract_concept_and_args (check, tmpl, args);
       return;
     }
-
-  if (TREE_CODE (t) == CHECK_CONSTR)
-    {
-      tree decl = CHECK_CONSTR_CONCEPT (t);
-      tmpl = DECL_TI_TEMPLATE (decl);
-      args = CHECK_CONSTR_ARGS (t);
-      return;
-    }
-
-    gcc_unreachable ();
 }
 
 /* Returns true iff the placeholders C1 and C2 are equivalent.  C1
-   and C2 can be either CHECK_CONSTR or TEMPLATE_TYPE_PARM.  */
+   and C2 can be either TEMPLATE_TYPE_PARM or template-ids.  */
 
 bool
 equivalent_placeholder_constraints (tree c1, tree c2)
@@ -1515,7 +1644,7 @@ equivalent_placeholder_constraints (tree c1, tree c2)
   return true;
 }
 
-/* Return a hash value for the placeholder PRED_CONSTR C.  */
+/* Return a hash value for the placeholder ATOMIC_CONSTR C.  */
 
 hashval_t
 hash_placeholder_constraint (tree c)
@@ -1532,178 +1661,215 @@ hash_placeholder_constraint (tree c)
   return val;
 }
 
-/*---------------------------------------------------------------------------
-                        Constraint substitution
----------------------------------------------------------------------------*/
+/* Substitute through the simple requirement.  */
 
-/* The following functions implement substitution rules for constraints.
-   Substitution without checking constraints happens only in the
-   instantiation of class templates. For example:
+static tree
+tsubst_valid_expression_requirement (tree t, tree args, subst_info info)
+{
+  return tsubst_expr (t, args, info.complain, info.in_decl, false);
+}
 
-      template<C1 T> struct S {
-        void f(T) requires C2<T>;
-        void g(T) requires T::value;
-      };
 
-      S<int> s; // error instantiating S<int>::g(T)
+/* Substitute through the simple requirement.  */
 
-   When we instantiate S, we substitute into its member declarations,
-   including their constraints. However, those constraints are not
-   checked. Substituting int into C2<T> yields C2<int>, and substituting
-   into T::value yields a substitution failure, making the program
-   ill-formed.
+static tree
+tsubst_simple_requirement (tree t, tree args, subst_info info)
+{
+  tree t0 = TREE_OPERAND (t, 0);
+  tree expr = tsubst_valid_expression_requirement (t0, args, info);
+  if (expr == error_mark_node)
+    return error_mark_node;
+  return finish_simple_requirement (EXPR_LOCATION (t), expr);
+}
 
-   Note that we only ever substitute into the associated constraints
-   of a declaration. That is, substitution is defined only for predicate
-   constraints and conjunctions. */
+/* Substitute through the type requirement.  */
 
-/* Substitute into the predicate constraints. Returns error_mark_node
-   if the substitution into the expression fails. */
-tree
-tsubst_predicate_constraint (tree t, tree args,
-                             tsubst_flags_t complain, tree in_decl)
+static tree
+tsubst_type_requirement (tree t, tree args, subst_info info)
 {
-  tree expr = PRED_CONSTR_EXPR (t);
-  ++processing_template_decl;
-  tree result = tsubst_expr (expr, args, complain, in_decl, false);
-  --processing_template_decl;
-  return build_nt (PRED_CONSTR, result);
+  tree t0 = TREE_OPERAND (t, 0);
+  tree type = tsubst (t0, args, info.complain, info.in_decl);
+  if (type == error_mark_node)
+    return error_mark_node;
+  return finish_type_requirement (EXPR_LOCATION (t), type);
 }
 
-/* Substitute into a check constraint. */
+/* True if TYPE can be deduced from EXPR.
 
-tree
-tsubst_check_constraint (tree t, tree args,
-                         tsubst_flags_t complain, tree in_decl)
+   FIXME: C++20 compound requirement constraints should be normalized and then
+   satisfied rather than substituted.  */
+
+static bool
+type_deducible_p (tree expr, tree type, tree placeholder, tree args,
+                  subst_info info)
 {
-  tree decl = CHECK_CONSTR_CONCEPT (t);
-  tree tmpl = DECL_TI_TEMPLATE (decl);
-  tree targs = CHECK_CONSTR_ARGS (t);
+  /* Make sure deduction is performed against ( EXPR ), so that
+     references are preserved in the result.  */
+  expr = force_paren_expr_uneval (expr);
 
-  /* Substitute through by building an template-id expression
-     and then substituting into that. */
-  tree expr = build_nt (TEMPLATE_ID_EXPR, tmpl, targs);
-  ++processing_template_decl;
-  tree result = tsubst_expr (expr, args, complain, in_decl, false);
-  --processing_template_decl;
+  /* Replace the constraints with the instantiated constraints. This
+     substitutes args into any template parameters in the trailing
+     result type.  */
+  tree saved_constr = PLACEHOLDER_TYPE_CONSTRAINTS (placeholder);
+  PLACEHOLDER_TYPE_CONSTRAINTS (placeholder)
+    = tsubst_constraint (saved_constr,
+			 args,
+			 info.complain | tf_partial,
+			 info.in_decl);
 
-  if (result == error_mark_node)
-    return error_mark_node;
+  /* Temporarily unlink the canonical type.  */
+  tree saved_type = TYPE_CANONICAL (placeholder);
+  TYPE_CANONICAL (placeholder) = NULL_TREE;
 
-  /* Extract the results and rebuild the check constraint. */
-  decl = DECL_TEMPLATE_RESULT (TREE_OPERAND (result, 0));
-  args = TREE_OPERAND (result, 1);
+  tree deduced_type
+    = do_auto_deduction (type,
+			 expr,
+			 placeholder,
+			 info.complain,
+			 adc_requirement);
+
+  PLACEHOLDER_TYPE_CONSTRAINTS (placeholder) = saved_constr;
+  TYPE_CANONICAL (placeholder) = saved_type;
+
+  if (deduced_type == error_mark_node)
+    return false;
 
-  return build_nt (CHECK_CONSTR, decl, args);
+  return true;
 }
 
-/* Substitute into the conjunction of constraints. Returns
-   error_mark_node if substitution into either operand fails. */
+/* True if EXPR can not be converted to TYPE.  */
 
-tree
-tsubst_logical_operator (tree t, tree args,
-			 tsubst_flags_t complain, tree in_decl)
+static bool
+expression_convertible_p (tree expr, tree type, subst_info info)
 {
-  tree t0 = TREE_OPERAND (t, 0);
-  tree r0 = tsubst_constraint (t0, args, complain, in_decl);
-  if (r0 == error_mark_node)
-    return error_mark_node;
-  tree t1 = TREE_OPERAND (t, 1);
-  tree r1 = tsubst_constraint (t1, args, complain, in_decl);
-  if (r1 == error_mark_node)
-    return error_mark_node;
-  return build_nt (TREE_CODE (t), r0, r1);
+  tree conv =
+    perform_direct_initialization_if_possible (type, expr, false,
+					       info.complain);
+  if (conv == error_mark_node)
+    return false;
+  if (conv == NULL_TREE)
+    {
+      if (info.complain & tf_error)
+        {
+          location_t loc = EXPR_LOC_OR_LOC (expr, input_location);
+          error_at (loc, "cannot convert %qE to %qT", expr, type);
+        }
+      return false;
+    }
+  return true;
 }
 
-namespace {
 
-/* Substitute ARGS into the expression constraint T.  */
+/* Substitute through the compound requirement.  */
 
-tree
-tsubst_expr_constr (tree t, tree args, tsubst_flags_t complain, tree in_decl)
+static tree
+tsubst_compound_requirement (tree t, tree args, subst_info info)
 {
-  cp_unevaluated guard;
-  tree expr = EXPR_CONSTR_EXPR (t);
-  tree ret = tsubst_expr (expr, args, complain, in_decl, false);
-  if (ret == error_mark_node)
+  tree t0 = TREE_OPERAND (t, 0);
+  tree t1 = TREE_OPERAND (t, 1);
+  tree expr = tsubst_valid_expression_requirement (t0, args, info);
+  if (expr == error_mark_node)
     return error_mark_node;
-  return build_nt (EXPR_CONSTR, ret);
-}
 
-/* Substitute ARGS into the type constraint T.  */
+  /* Check the noexcept condition.  */
+  bool noexcept_p = COMPOUND_REQ_NOEXCEPT_P (t);
+  if (noexcept_p && !expr_noexcept_p (expr, tf_none))
+    return error_mark_node;
 
-tree
-tsubst_type_constr (tree t, tree args, tsubst_flags_t complain, tree in_decl)
-{
-  tree type = TYPE_CONSTR_TYPE (t);
-  tree ret = tsubst (type, args, complain, in_decl);
-  if (ret == error_mark_node)
+  /* Substitute through the type expression, if any.  */
+  tree type = tsubst (t1, args, info.complain, info.in_decl);
+  if (type == error_mark_node)
     return error_mark_node;
-  return build_nt (TYPE_CONSTR, ret);
-}
 
-/* Substitute ARGS into the implicit conversion constraint T.  */
+  /* Check expression against the result type.  */
+  if (type)
+    {
+      if (tree placeholder = type_uses_auto (type))
+	{
+	  if (!type_deducible_p (expr, type, placeholder, args, info))
+	    return error_mark_node;
+	}
+      else if (!expression_convertible_p (expr, type, info))
+	return error_mark_node;
+    }
 
-tree
-tsubst_implicit_conversion_constr (tree t, tree args, tsubst_flags_t complain,
-                                   tree in_decl)
-{
-  cp_unevaluated guard;
-  tree expr = ICONV_CONSTR_EXPR (t);
-  tree type = ICONV_CONSTR_TYPE (t);
-  tree new_expr = tsubst_expr (expr, args, complain, in_decl, false);
-  if (new_expr == error_mark_node)
-    return error_mark_node;
-  tree new_type = tsubst (type, args, complain, in_decl);
-  if (new_type == error_mark_node)
-    return error_mark_node;
-  return build_nt (ICONV_CONSTR, new_expr, new_type);
+  return finish_compound_requirement (EXPR_LOCATION (t),
+				      expr, type, noexcept_p);
 }
 
-/* Substitute ARGS into the argument deduction constraint T.  */
-
-tree
-tsubst_argument_deduction_constr (tree t, tree args, tsubst_flags_t complain,
-                                  tree in_decl)
-{
-  cp_unevaluated guard;
-  tree expr = DEDUCT_CONSTR_EXPR (t);
-  tree pattern = DEDUCT_CONSTR_PATTERN (t);
-  tree autos = DEDUCT_CONSTR_PLACEHOLDER(t);
-  tree new_expr = tsubst_expr (expr, args, complain, in_decl, false);
-  if (new_expr == error_mark_node)
-    return error_mark_node;
-  /* It seems like substituting through the pattern will not affect the
-     placeholders.  We should (?) be able to reuse the existing list
-     without any problems.  If not, then we probably want to create a
-     new list of placeholders and then instantiate the pattern using
-     those.  */
-  tree new_pattern = tsubst (pattern, args, complain, in_decl);
-  if (new_pattern == error_mark_node)
+static tree
+tsubst_nested_requirement (tree t, tree args, subst_info info)
+{
+  tree t0 = TREE_OPERAND (t, 0);
+  tree expr = tsubst_expr (t0, args, info.complain, info.in_decl, false);
+  if (expr == error_mark_node)
     return error_mark_node;
-  return build_nt (DEDUCT_CONSTR, new_expr, new_pattern, autos);
+
+  /* Ensure that concrete results are satisfied.  */
+  if (!uses_template_parms (args))
+    {
+      /* FIXME satisfy_constraint_expression (t0, args, info) */
+
+      /* [17.4.1.2] ... lvalue-to-value conversion is performed as necessary,
+         and EXPR shall be a constant expression of type bool.  */
+      tree result = force_rvalue (expr, tf_error);
+      if (result == error_mark_node)
+        return error_mark_node;
+
+      /* FIXME: The expression must have boolean type.  */
+      if (cv_unqualified (TREE_TYPE (result)) != boolean_type_node)
+        return error_mark_node;
+
+      /* Compute the value of the expression.  */
+      result = satisfaction_value (cxx_constant_value (result));
+      if (result == error_mark_node || result == boolean_false_node)
+        return error_mark_node;
+    }
+
+  return finish_nested_requirement (EXPR_LOCATION (t), expr);
 }
 
-/* Substitute ARGS into the exception constraint T.  */
+/* Substitute ARGS into the requirement T.  */
 
-tree
-tsubst_exception_constr (tree t, tree args, tsubst_flags_t complain,
-			 tree in_decl)
+static tree
+tsubst_requirement (tree t, tree args, subst_info info)
 {
-  cp_unevaluated guard;
-  tree expr = EXCEPT_CONSTR_EXPR (t);
-  tree ret = tsubst_expr (expr, args, complain, in_decl, false);
-  if (ret == error_mark_node)
-    return error_mark_node;
-  return build_nt (EXCEPT_CONSTR, ret);
+  iloc_sentinel loc_s (cp_expr_location (t));
+  switch (TREE_CODE (t))
+    {
+    case SIMPLE_REQ:
+      return tsubst_simple_requirement (t, args, info);
+    case TYPE_REQ:
+      return tsubst_type_requirement (t, args, info);
+    case COMPOUND_REQ:
+      return tsubst_compound_requirement (t, args, info);
+    case NESTED_REQ:
+      return tsubst_nested_requirement (t, args, info);
+    default:
+      break;
+    }
+  gcc_unreachable ();
 }
 
-/* A subroutine of tsubst_constraint_variables. Register local
-   specializations for each of parameter in PARMS and its
-   corresponding substituted constraint variable in VARS.
-   Returns VARS. */
+/* Substitute ARGS into the list of requirements T. Note that
+   substitution failures here result in ill-formed programs. */
 
-tree
+static tree
+tsubst_requirement_body (tree t, tree args, subst_info info)
+{
+  tree result = NULL_TREE;
+  while (t)
+    {
+      tree req = tsubst_requirement (TREE_VALUE (t), args, info);
+      if (req == error_mark_node)
+	return error_mark_node;
+      result = tree_cons (NULL_TREE, req, result);
+      t = TREE_CHAIN (t);
+    }
+  return nreverse (result);
+}
+
+static tree
 declare_constraint_vars (tree parms, tree vars)
 {
   tree s = vars;
@@ -1723,6 +1889,24 @@ declare_constraint_vars (tree parms, tree vars)
   return vars;
 }
 
+/* Substitute through as if checking function parameter types. This
+   will diagnose common parameter type errors.  Returns error_mark_node
+   if an error occurred.  */
+
+static tree
+check_constaint_variables (tree t, tree args, subst_info info)
+{
+  tree types = NULL_TREE;
+  tree p = t;
+  while (p && !VOID_TYPE_P (p))
+    {
+      types = tree_cons (NULL_TREE, TREE_TYPE (p), types);
+      p = TREE_CHAIN (p);
+    }
+  types = chainon (nreverse (types), void_list_node);
+  return tsubst_function_parms (types, args, info.complain, info.in_decl);
+}
+
 /* A subroutine of tsubst_parameterized_constraint. Substitute ARGS
    into the parameter list T, producing a sequence of constraint
    variables, declared in the current scope.
@@ -1731,171 +1915,81 @@ declare_constraint_vars (tree parms, tree vars)
    prior to calling this function since this substitution will
    declare the substituted parameters. */
 
-tree
-tsubst_constraint_variables (tree t, tree args,
-                             tsubst_flags_t complain, tree in_decl)
+static tree
+tsubst_constraint_variables (tree t, tree args, subst_info info)
 {
+  /* Perform a trial substitution to check for type errors.  */
+  tree parms = check_constaint_variables (t, args, info);
+  if (parms == error_mark_node)
+    return error_mark_node;
+
   /* Clear cp_unevaluated_operand across tsubst so that we get a proper chain
      of PARM_DECLs.  */
   int saved_unevaluated_operand = cp_unevaluated_operand;
   cp_unevaluated_operand = 0;
-  tree vars = tsubst (t, args, complain, in_decl);
+  tree vars = tsubst (t, args, info.complain, info.in_decl);
   cp_unevaluated_operand = saved_unevaluated_operand;
   if (vars == error_mark_node)
     return error_mark_node;
   return declare_constraint_vars (t, vars);
 }
 
-/* Substitute ARGS into the parameterized constraint T.  */
+/* Substitute ARGS into the requires-expression T. [8.4.7]p6. The
+   substitution of template arguments into a requires-expression
+   may result in the formation of invalid types or expressions
+   in its requirements ... In such cases, the expression evaluates
+   to false; it does not cause the program to be ill-formed.
 
-tree
-tsubst_parameterized_constraint (tree t, tree args,
-				 tsubst_flags_t complain, tree in_decl)
-{
-  local_specialization_stack stack;
-  tree vars = tsubst_constraint_variables (PARM_CONSTR_PARMS (t),
-					   args, complain, in_decl);
-  if (vars == error_mark_node)
-    return error_mark_node;
-  tree expr = tsubst_constraint (PARM_CONSTR_OPERAND (t), args,
-				 complain, in_decl);
-  if (expr == error_mark_node)
-    return error_mark_node;
-  return build_nt (PARM_CONSTR, vars, expr);
-}
-
-/* Substitute ARGS into the simple requirement T. Note that
-   substitution may result in an ill-formed expression without
-   causing the program to be ill-formed. In such cases, the
-   requirement wraps an error_mark_node. */
+   However, there are cases where substitution must produce a
+   new requires-expression, that is not a template constraint.
+   For example:
 
-inline tree
-tsubst_simple_requirement (tree t, tree args,
-                           tsubst_flags_t complain, tree in_decl)
-{
-  ++processing_template_decl;
-  tree expr = tsubst_expr (TREE_OPERAND (t, 0), args, complain, in_decl, false);
-  --processing_template_decl;
-  return finish_simple_requirement (expr);
-}
+        template<typename T>
+        class X {
+          template<typename U>
+          static constexpr bool var = requires (U u) { T::fn(u); };
+        };
 
-/* Substitute ARGS into the type requirement T. Note that
-   substitution may result in an ill-formed type without
-   causing the program to be ill-formed. In such cases, the
-   requirement wraps an error_mark_node. */
-
-inline tree
-tsubst_type_requirement (tree t, tree args,
-                         tsubst_flags_t complain, tree in_decl)
-{
-  ++processing_template_decl;
-  tree type = tsubst (TREE_OPERAND (t, 0), args, complain, in_decl);
-  --processing_template_decl;
-  return finish_type_requirement (type);
-}
-
-/* Substitute args into the compound requirement T. If substituting
-   into either the expression or the type fails, the corresponding
-   operands in the resulting node will be error_mark_node. This
-   preserves a requirement for the purpose of partial ordering, but
-   it will never be satisfied. */
+   In the instantiation of X<Y> (assuming Y defines fn), then the
+   instantiated requires-expression would include Y::fn(u). If any
+   substitution in the requires-expression fails, we can immediately
+   fold the expression to false, as would be the case e.g., when
+   instantiation X<int>.  */
 
 tree
-tsubst_compound_requirement (tree t, tree args,
-                             tsubst_flags_t complain, tree in_decl)
+tsubst_requires_expr (tree t, tree args,
+		      tsubst_flags_t complain, tree in_decl)
 {
-  ++processing_template_decl;
-  tree expr = tsubst_expr (TREE_OPERAND (t, 0), args, complain, in_decl, false);
-  tree type = tsubst (TREE_OPERAND (t, 1), args, complain, in_decl);
-  --processing_template_decl;
-  bool noexcept_p = COMPOUND_REQ_NOEXCEPT_P (t);
-  return finish_compound_requirement (expr, type, noexcept_p);
-}
+  local_specialization_stack stack (lss_copy);
 
-/* Substitute ARGS into the nested requirement T. */
+  subst_info info (complain, in_decl);
 
-tree
-tsubst_nested_requirement (tree t, tree args,
-                           tsubst_flags_t complain, tree in_decl)
-{
-  ++processing_template_decl;
-  tree expr = tsubst_expr (TREE_OPERAND (t, 0), args, complain, in_decl, false);
-  --processing_template_decl;
-  return finish_nested_requirement (expr);
-}
-
-/* Substitute ARGS into the requirement T.  */
-
-inline tree
-tsubst_requirement (tree t, tree args, tsubst_flags_t complain, tree in_decl)
-{
-  switch (TREE_CODE (t))
-    {
-    case SIMPLE_REQ:
-      return tsubst_simple_requirement (t, args, complain, in_decl);
-    case TYPE_REQ:
-      return tsubst_type_requirement (t, args, complain, in_decl);
-    case COMPOUND_REQ:
-      return tsubst_compound_requirement (t, args, complain, in_decl);
-    case NESTED_REQ:
-      return tsubst_nested_requirement (t, args, complain, in_decl);
-    default:
-      gcc_unreachable ();
-    }
-  return error_mark_node;
-}
-
-/* Substitute ARGS into the list of requirements T. Note that
-   substitution failures here result in ill-formed programs. */
-
-tree
-tsubst_requirement_body (tree t, tree args,
-                         tsubst_flags_t complain, tree in_decl)
-{
-  tree r = NULL_TREE;
-  while (t)
-    {
-      tree e = tsubst_requirement (TREE_VALUE (t), args, complain, in_decl);
-      if (e == error_mark_node)
-        return error_mark_node;
-      r = tree_cons (NULL_TREE, e, r);
-      t = TREE_CHAIN (t);
-    }
-  /* Ensure that the order of constraints is the same as the original.  */
-  return nreverse (r);
-}
-
-} /* namespace */
-
-/* Substitute ARGS into the requires expression T. Note that this
-   results in the re-declaration of local parameters when
-   substituting through the parameter list. If either substitution
-   fails, the program is ill-formed. */
-
-tree
-tsubst_requires_expr (tree t, tree args,
-                      tsubst_flags_t complain, tree in_decl)
-{
-  local_specialization_stack stack;
+  /* A requires-expression is an unevaluated context.  */
+  cp_unevaluated u;
 
   tree parms = TREE_OPERAND (t, 0);
   if (parms)
     {
-      parms = tsubst_constraint_variables (parms, args, complain, in_decl);
+      parms = tsubst_constraint_variables (parms, args, info);
       if (parms == error_mark_node)
-        return error_mark_node;
+	return boolean_false_node;
     }
 
   tree reqs = TREE_OPERAND (t, 1);
-  reqs = tsubst_requirement_body (reqs, args, complain, in_decl);
+  reqs = tsubst_requirement_body (reqs, args, info);
   if (reqs == error_mark_node)
-    return error_mark_node;
+    return boolean_false_node;
+
+  /* In certain cases, produce a new requires-expression.
+     Otherwise the value of the expression is true.  */
+  if (processing_template_decl && uses_template_parms (args))
+    return finish_requires_expr (cp_expr_location (t), parms, reqs);
 
-  return finish_requires_expr (parms, reqs);
+  return boolean_true_node;
 }
 
 /* Substitute ARGS into the constraint information CI, producing a new
-   constraint record. */
+   constraint record.  */
 
 tree
 tsubst_constraint_info (tree t, tree args,
@@ -1904,378 +1998,418 @@ tsubst_constraint_info (tree t, tree args,
   if (!t || t == error_mark_node || !check_constraint_info (t))
     return NULL_TREE;
 
-  tree tmpl_constr = NULL_TREE;
-  if (tree r = CI_TEMPLATE_REQS (t))
-    tmpl_constr = tsubst_constraint (r, args, complain, in_decl);
+  tree tr = tsubst_constraint (CI_TEMPLATE_REQS (t), args, complain, in_decl);
+  tree dr = tsubst_constraint (CI_DECLARATOR_REQS (t), args, complain, in_decl);
+  return build_constraints (tr, dr);
+}
 
-  tree decl_constr = NULL_TREE;
-  if (tree r = CI_DECLARATOR_REQS (t))
-    decl_constr = tsubst_constraint (r, args, complain, in_decl);
+/* Substitute through a parameter mapping, in order to get the actual
+   arguments used to instantiate an atomic constraint.  This may fail
+   if the substitution into arguments produces something ill-formed.  */
 
-  return build_constraints (tmpl_constr, decl_constr);
-}
+static tree
+tsubst_parameter_mapping (tree map, tree args, subst_info info)
+{
+  if (!map)
+    return NULL_TREE;
+
+  tsubst_flags_t complain = info.complain;
+  tree in_decl = info.in_decl;
 
-/* Substitute ARGS into the constraint T. */
+  tree result = NULL_TREE;
+  for (tree p = map; p; p = TREE_CHAIN (p))
+    {
+      if (p == error_mark_node)
+        return error_mark_node;
+      tree parm = TREE_VALUE (p);
+      tree arg = TREE_PURPOSE (p);
+      tree new_arg = NULL_TREE;
+      if (TYPE_P (arg))
+        {
+          /* If a template parameter is declared with a placeholder, we can
+             get those in the argument list if decltype is applied to the
+             placeholder. For example:
+
+		template<auto T>
+		  requires C<decltype(T)>
+		void f() { }
+
+	     The normalized argument for C will be an auto type, so we'll
+             need to deduce the actual argument from the corresponding
+             initializer (whatever argument is provided for T), and use
+             that result in the instantiated parameter mapping.  */
+          if (tree auto_node = type_uses_auto (arg))
+            {
+              int level;
+              int index;
+	      template_parm_level_and_index (parm, &level, &index);
+	      tree init = TMPL_ARG (args, level, index);
+              new_arg = do_auto_deduction (arg, init, auto_node,
+					   complain, adc_variable_type,
+					   make_tree_vec (0));
+            }
+        }
+      else if (ARGUMENT_PACK_P (arg))
+	new_arg = tsubst_argument_pack (arg, args, complain, in_decl);
+      if (!new_arg)
+	new_arg = tsubst_template_arg (arg, args, complain, in_decl);
+      if (new_arg == error_mark_node)
+	return error_mark_node;
+
+      result = tree_cons (new_arg, parm, result);
+    }
+  return nreverse (result);
+}
 
 tree
-tsubst_constraint (tree t, tree args, tsubst_flags_t complain, tree in_decl)
+tsubst_parameter_mapping (tree map, tree args, tsubst_flags_t complain, tree in_decl)
 {
-  if (t == NULL_TREE || t == error_mark_node)
-    return t;
-  switch (TREE_CODE (t))
-  {
-  case PRED_CONSTR:
-    return tsubst_predicate_constraint (t, args, complain, in_decl);
-  case CHECK_CONSTR:
-    return tsubst_check_constraint (t, args, complain, in_decl);
-  case CONJ_CONSTR:
-  case DISJ_CONSTR:
-    return tsubst_logical_operator (t, args, complain, in_decl);
-  case PARM_CONSTR:
-    return tsubst_parameterized_constraint (t, args, complain, in_decl);
-  case EXPR_CONSTR:
-    return tsubst_expr_constr (t, args, complain, in_decl);
-  case TYPE_CONSTR:
-    return tsubst_type_constr (t, args, complain, in_decl);
-  case ICONV_CONSTR:
-    return tsubst_implicit_conversion_constr (t, args, complain, in_decl);
-  case DEDUCT_CONSTR:
-    return tsubst_argument_deduction_constr (t, args, complain, in_decl);
-  case EXCEPT_CONSTR:
-    return tsubst_exception_constr (t, args, complain, in_decl);
-  default:
-    gcc_unreachable ();
-  }
-  return error_mark_node;
+  return tsubst_parameter_mapping (map, args, subst_info (complain, in_decl));
 }
 
 /*---------------------------------------------------------------------------
                         Constraint satisfaction
 ---------------------------------------------------------------------------*/
 
-/* The following functions determine if a constraint, when
-   substituting template arguments, is satisfied. For convenience,
-   satisfaction reduces a constraint to either true or false (and
-   nothing else). */
-
-namespace {
-
-tree satisfy_constraint_1 (tree, tree, tsubst_flags_t, tree);
+/* Hash functions for satisfaction entries.  */
 
-/* Check the constraint pack expansion.  */
-
-tree
-satisfy_pack_expansion (tree t, tree args,
-                      tsubst_flags_t complain, tree in_decl)
+struct GTY((for_user)) sat_entry
 {
-  /* Get the vector of satisfaction results.
-     gen_elem_of_pack_expansion_instantiation will check that each element of
-     the expansion is satisfied.  */
-  tree exprs = tsubst_pack_expansion (t, args, complain, in_decl);
+  tree constr;
+  tree args;
+  tree result;
+};
 
-  if (exprs == error_mark_node)
-    return boolean_false_node;
+struct sat_hasher : ggc_ptr_hash<sat_entry>
+{
+  static hashval_t hash (sat_entry *e)
+  {
+    hashval_t value = hash_atomic_constraint (e->constr);
+    return iterative_hash_template_arg (e->args, value);
+  }
 
-  /* TODO: It might be better to normalize each expanded term
-     and evaluate them separately. That would provide better
-     opportunities for diagnostics.  */
-  for (int i = 0; i < TREE_VEC_LENGTH (exprs); ++i)
-    if (TREE_VEC_ELT (exprs, i) != boolean_true_node)
-      return boolean_false_node;
-  return boolean_true_node;
-}
+  static bool equal (sat_entry *e1, sat_entry *e2)
+  {
+    if (!atomic_constraints_identical_p (e1->constr, e2->constr))
+      return false;
+    return template_args_equal (e1->args, e2->args);
+  }
+};
 
-/* A predicate constraint is satisfied if its expression evaluates
-   to true. If substitution into that node fails, the constraint
-   is not satisfied ([temp.constr.pred]).
+/* Cache the result of satisfy_atom.  */
+static GTY((deletable)) hash_table<sat_hasher> *sat_cache;
 
-   Note that a predicate constraint is a constraint expression
-   of type bool. If neither of those are true, the program is
-   ill-formed; they are not SFINAE'able errors. */
+/* Cache the result of constraints_satisfied_p.  */
+static GTY((deletable)) hash_map<tree,bool> *decl_satisfied_cache;
 
-tree
-satisfy_predicate_constraint (tree t, tree args,
-                              tsubst_flags_t complain, tree in_decl)
+static tree
+get_satisfaction (tree constr, tree args)
 {
-  tree expr = TREE_OPERAND (t, 0);
-
-  /* We should never have a naked pack expansion in a predicate constraint.  */
-  gcc_assert (TREE_CODE (expr) != EXPR_PACK_EXPANSION);
-
-  /* If substitution into the expression fails, the constraint
-     is not satisfied.  */
-  expr = tsubst_expr (expr, args, complain, in_decl, false);
-  if (expr == error_mark_node)
-    return boolean_false_node;
+  if (!sat_cache)
+    return NULL_TREE;
+  sat_entry elt = { constr, args, NULL_TREE };
+  sat_entry* found = sat_cache->find (&elt);
+  if (found)
+    return found->result;
+  else
+    return NULL_TREE;
+}
 
-  /* A predicate constraint shall have type bool. In some
-     cases, substitution gives us const-qualified bool, which
-     is also acceptable.  */
-  tree type = cv_unqualified (TREE_TYPE (expr));
-  if (!same_type_p (type, boolean_type_node))
-    {
-      error_at (cp_expr_loc_or_input_loc (expr),
-                "constraint %qE does not have type %qT",
-                expr, boolean_type_node);
-      return boolean_false_node;
-    }
+static void
+save_satisfaction (tree constr, tree args, tree result)
+{
+  if (!sat_cache)
+    sat_cache = hash_table<sat_hasher>::create_ggc (31);
+  sat_entry elt = {constr, args, result};
+  sat_entry** slot = sat_cache->find_slot (&elt, INSERT);
+  sat_entry* entry = ggc_alloc<sat_entry> ();
+  *entry = elt;
+  *slot = entry;
+}
 
-  return cxx_constant_value (expr);
+void
+clear_satisfaction_cache ()
+{
+  if (sat_cache)
+    sat_cache->empty ();
+  if (decl_satisfied_cache)
+    decl_satisfied_cache->empty ();
 }
 
-/* A concept check constraint like C<CARGS> is satisfied if substituting ARGS
-   into CARGS succeeds and C is satisfied for the resulting arguments.  */
+/* A tool to help manage satisfaction caching in satisfy_constraint_r.
+   Note the cache is only used when not diagnosing errors.  */
 
-tree
-satisfy_check_constraint (tree t, tree args,
-                          tsubst_flags_t complain, tree in_decl)
+struct satisfaction_cache
 {
-  tree decl = CHECK_CONSTR_CONCEPT (t);
-  tree tmpl = DECL_TI_TEMPLATE (decl);
-  tree cargs = CHECK_CONSTR_ARGS (t);
+  satisfaction_cache (tree constr, tree args, tsubst_flags_t complain)
+    : constr(constr), args(args), complain(complain)
+  { }
 
-  /* Instantiate the concept check arguments.  */
-  tree targs = tsubst (cargs, args, tf_none, NULL_TREE);
-  if (targs == error_mark_node)
-    return boolean_false_node;
+  tree get ()
+  {
+    if (complain == tf_none)
+      return get_satisfaction (constr, args);
+    return NULL_TREE;
+  }
 
-  /* Search for a previous value.  */
-  if (tree prev = lookup_concept_satisfaction (tmpl, targs))
-    return prev;
+  tree save (tree result)
+  {
+    if (complain == tf_none)
+      save_satisfaction (constr, args, result);
+    return result;
+  }
 
-  /* Expand the concept; failure here implies non-satisfaction.  */
-  tree def = expand_concept (decl, targs);
-  if (def == error_mark_node)
-    return memoize_concept_satisfaction (tmpl, args, boolean_false_node);
+  tree constr;
+  tree args;
+  tsubst_flags_t complain;
+};
 
-  /* Recursively satisfy the constraint.  */
-  tree result = satisfy_constraint_1 (def, targs, complain, in_decl);
-  return memoize_concept_satisfaction (tmpl, targs, result);
-}
+static int satisfying_constraint = 0;
 
-/* Check an expression constraint. The constraint is satisfied if
-   substitution succeeds ([temp.constr.expr]).
+/* Returns true if we are currently satisfying a constraint.
 
-   Note that the expression is unevaluated. */
+   This is used to guard against recursive calls to evaluate_concept_check
+   during template argument substitution.
 
-tree
-satisfy_expression_constraint (tree t, tree args,
-                               tsubst_flags_t complain, tree in_decl)
-{
-  cp_unevaluated guard;
-  deferring_access_check_sentinel deferring;
+   TODO: Do we need this now that we fully normalize prior to evaluation?
+   I think not. */
 
-  tree expr = EXPR_CONSTR_EXPR (t);
-  tree check = tsubst_expr (expr, args, complain, in_decl, false);
-  if (check == error_mark_node)
-    return boolean_false_node;
-  if (!perform_deferred_access_checks (tf_none))
-    return boolean_false_node;
-  return boolean_true_node;
+bool
+satisfying_constraint_p ()
+{
+  return satisfying_constraint;
 }
 
-/* Check a type constraint. The constraint is satisfied if
-   substitution succeeds. */
+/* Substitute ARGS into constraint-expression T during instantiation of
+   a member of a class template.  */
 
-inline tree
-satisfy_type_constraint (tree t, tree args,
-                         tsubst_flags_t complain, tree in_decl)
+tree
+tsubst_constraint (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 {
-  deferring_access_check_sentinel deferring;
-  tree type = TYPE_CONSTR_TYPE (t);
-  gcc_assert (TYPE_P (type) || type == error_mark_node);
-  tree check = tsubst (type, args, complain, in_decl);
-  if (error_operand_p (check))
-    return boolean_false_node;
-  if (!perform_deferred_access_checks (complain))
-    return boolean_false_node;
-  return boolean_true_node;
+  /* We also don't want to evaluate concept-checks when substituting the
+     constraint-expressions of a declaration.  */
+  processing_constraint_expression_sentinel s;
+  tree expr = tsubst_expr (t, args, complain, in_decl, false);
+  return expr;
 }
 
-/* Check an implicit conversion constraint.  */
+static tree satisfy_constraint_r (tree, tree, subst_info info);
 
-tree
-satisfy_implicit_conversion_constraint (tree t, tree args,
-                                        tsubst_flags_t complain, tree in_decl)
-{
-  /* Don't tsubst as if we're processing a template. If we try
-     to we can end up generating template-like expressions
-     (e.g., modop-exprs) that aren't properly typed.  */
-  tree expr =
-    tsubst_expr (ICONV_CONSTR_EXPR (t), args, complain, in_decl, false);
-  if (expr == error_mark_node)
-    return boolean_false_node;
+/* Compute the satisfaction of a conjunction.  */
 
-  /* Get the transformed target type.  */
-  tree type = tsubst (ICONV_CONSTR_TYPE (t), args, complain, in_decl);
-  if (type == error_mark_node)
-    return boolean_false_node;
-
-  /* Attempt the conversion as a direct initialization
-     of the form TYPE <unspecified> = EXPR.  */
-  tree conv =
-    perform_direct_initialization_if_possible (type, expr, false, complain);
-  if (conv == NULL_TREE || conv == error_mark_node)
-    return boolean_false_node;
-  else
-    return boolean_true_node;
+static tree
+satisfy_conjunction (tree t, tree args, subst_info info)
+{
+  tree lhs = satisfy_constraint_r (TREE_OPERAND (t, 0), args, info);
+  if (lhs == error_mark_node || lhs == boolean_false_node)
+    return lhs;
+  return satisfy_constraint_r (TREE_OPERAND (t, 1), args, info);
 }
 
-/* Check an argument deduction constraint. */
+/* Compute the satisfaction of a disjunction.  */
 
-tree
-satisfy_argument_deduction_constraint (tree t, tree args,
-                                       tsubst_flags_t complain, tree in_decl)
+static tree
+satisfy_disjunction (tree t, tree args, subst_info info)
 {
-  /* Substitute through the expression. */
-  tree expr = DEDUCT_CONSTR_EXPR (t);
-  tree init = tsubst_expr (expr, args, complain, in_decl, false);
-  if (expr == error_mark_node)
-    return boolean_false_node;
+  /* Evaluate the operands quietly.  */
+  subst_info quiet (tf_none, NULL_TREE);
 
-  /* Perform auto or decltype(auto) deduction to get the result. */
-  tree pattern = DEDUCT_CONSTR_PATTERN (t);
-  tree placeholder = DEDUCT_CONSTR_PLACEHOLDER (t);
-  tree constr = PLACEHOLDER_TYPE_CONSTRAINTS (placeholder);
-  tree type_canonical = TYPE_CANONICAL (placeholder);
-  PLACEHOLDER_TYPE_CONSTRAINTS (placeholder)
-    = tsubst_constraint (constr, args, complain|tf_partial, in_decl);
-  TYPE_CANONICAL (placeholder) = NULL_TREE;
-  tree type = do_auto_deduction (pattern, init, placeholder,
-                                 complain, adc_requirement);
-  PLACEHOLDER_TYPE_CONSTRAINTS (placeholder) = constr;
-  TYPE_CANONICAL (placeholder) = type_canonical;
-  if (type == error_mark_node)
-    return boolean_false_node;
+  /* Register the constraint for diagnostics, if needed.  */
+  diagnosing_failed_constraint failure (t, args, info.noisy ());
 
-  return boolean_true_node;
+  tree lhs = satisfy_constraint_r (TREE_OPERAND (t, 0), args, quiet);
+  if (lhs == boolean_true_node)
+    return boolean_true_node;
+  tree rhs = satisfy_constraint_r (TREE_OPERAND (t, 1), args, quiet);
+  if (rhs != boolean_true_node && info.noisy ())
+    {
+      location_t loc = cp_expr_location (CONSTR_EXPR (t));
+      inform (loc, "neither operand of the disjunction is satisfied");
+      /* TODO: Replay the LHS and RHS to find failures in both branches.  */
+      // satisfy_constraint_r (TREE_OPERAND (t, 0), args, info);
+      // satisfy_constraint_r (TREE_OPERAND (t, 1), args, info);
+    }
+  return rhs;
 }
 
-/* Check an exception constraint. An exception constraint for an
-   expression e is satisfied when noexcept(e) is true. */
+/* Ensures that T is a truth value and not (accidentally, as sometimes
+   happens) an integer value.  */
 
 tree
-satisfy_exception_constraint (tree t, tree args,
-                              tsubst_flags_t complain, tree in_decl)
+satisfaction_value (tree t)
 {
-  tree expr = EXCEPT_CONSTR_EXPR (t);
-  tree check = tsubst_expr (expr, args, complain, in_decl, false);
-  if (check == error_mark_node)
-    return boolean_false_node;
-
-  if (expr_noexcept_p (check, complain))
+  if (t == error_mark_node)
+    return t;
+  if (t == boolean_true_node || t == integer_one_node)
     return boolean_true_node;
-  else
+  if (t == boolean_false_node || t == integer_zero_node)
     return boolean_false_node;
+
+  /* Anything else should be invalid.  */
+  gcc_assert (false);
 }
 
-/* Check a parameterized constraint. */
+/* Build a new template argument list with template arguments corresponding
+   to the parameters used in an atomic constraint.  */
 
 tree
-satisfy_parameterized_constraint (tree t, tree args,
-                                  tsubst_flags_t complain, tree in_decl)
+get_mapped_args (tree map)
 {
-  local_specialization_stack stack;
-  tree parms = PARM_CONSTR_PARMS (t);
-  tree vars = tsubst_constraint_variables (parms, args, complain, in_decl);
-  if (vars == error_mark_node)
-    return boolean_false_node;
-  tree constr = PARM_CONSTR_OPERAND (t);
-  return satisfy_constraint_1 (constr, args, complain, in_decl);
-}
-
-/* Check that the conjunction of constraints is satisfied. Note
-   that if left operand is not satisfied, the right operand
-   is not checked.
+  /* If there's no map, then there are no arguments.  */
+  if (!map)
+    return NULL_TREE;
 
-   FIXME: Check that this wouldn't result in a user-defined
-   operator. Note that this error is partially diagnosed in
-   satisfy_predicate_constraint. It would be nice to diagnose
-   the overload, but I don't think it's strictly necessary.  */
+  /* Find the mapped parameter with the highest level.  */
+  int count = 0;
+  for (tree p = map; p; p = TREE_CHAIN (p))
+    {
+      int level;
+      int index;
+      template_parm_level_and_index (TREE_VALUE (p), &level, &index);
+      if (level > count)
+        count = level;
+    }
 
-tree
-satisfy_conjunction (tree t, tree args, tsubst_flags_t complain, tree in_decl)
-{
-  tree t0 = satisfy_constraint_1 (TREE_OPERAND (t, 0), args, complain, in_decl);
-  if (t0 == boolean_false_node)
-    return boolean_false_node;
-  return satisfy_constraint_1 (TREE_OPERAND (t, 1), args, complain, in_decl);
-}
+  /* Place each argument at its corresponding position in the argument
+     list. Note that the list will be sparse (not all arguments supplied),
+     but instantiation is guaranteed to only use the parameters in the
+     mapping, so null arguments would never be used.  */
+  auto_vec< auto_vec<tree> > lists (count);
+  lists.quick_grow_cleared (count);
+  for (tree p = map; p; p = TREE_CHAIN (p))
+    {
+      int level;
+      int index;
+      template_parm_level_and_index (TREE_VALUE (p), &level, &index);
+
+      /* Insert the argument into its corresponding position.  */
+      auto_vec<tree> &list = lists[level - 1];
+      if (index >= (int)list.length ())
+	list.safe_grow_cleared (index + 1);
+      list[index] = TREE_PURPOSE (p);
+    }
 
-/* Check that the disjunction of constraints is satisfied. Note
-   that if the left operand is satisfied, the right operand is not
-   checked.  */
+  /* Build the actual argument list.  */
+  tree args = make_tree_vec (lists.length ());
+  for (unsigned i = 0; i != lists.length (); ++i)
+    {
+      auto_vec<tree> &list = lists[i];
+      tree level = make_tree_vec (list.length ());
+      for (unsigned j = 0; j < list.length(); ++j)
+	TREE_VEC_ELT (level, j) = list[j];
+      SET_TMPL_ARGS_LEVEL (args, i + 1, level);
+    }
+  SET_NON_DEFAULT_TEMPLATE_ARGS_COUNT (args, 0);
 
-tree
-satisfy_disjunction (tree t, tree args, tsubst_flags_t complain, tree in_decl)
-{
-  tree t0 = satisfy_constraint_1 (TREE_OPERAND (t, 0), args, complain, in_decl);
-  if (t0 == boolean_true_node)
-    return boolean_true_node;
-  return satisfy_constraint_1 (TREE_OPERAND (t, 1), args, complain, in_decl);
+  return args;
 }
 
-/* Dispatch to an appropriate satisfaction routine depending on the
-   tree code of T.  */
+static void diagnose_atomic_constraint (tree, tree, subst_info);
 
-tree
-satisfy_constraint_1 (tree t, tree args, tsubst_flags_t complain, tree in_decl)
-{
-  gcc_assert (!processing_template_decl);
+/* Compute the satisfaction of an atomic constraint.  */
 
-  if (!t)
-    return boolean_false_node;
+static tree
+satisfy_atom (tree t, tree args, subst_info info)
+{
+  satisfaction_cache cache (t, args, info.complain);
+  if (tree r = cache.get ())
+    return r;
 
-  if (t == error_mark_node)
-    return boolean_false_node;
+  /* Perform substitution quietly.  */
+  subst_info quiet (tf_none, NULL_TREE);
 
-  switch (TREE_CODE (t))
-  {
-  case PRED_CONSTR:
-    return satisfy_predicate_constraint (t, args, complain, in_decl);
+  /* In case there is a diagnostic, we want to establish the context
+     prior to printing errors.  If no errors occur, this context is
+     removed before returning.  */
+  diagnosing_failed_constraint failure (t, args, info.noisy ());
 
-  case CHECK_CONSTR:
-    return satisfy_check_constraint (t, args, complain, in_decl);
+  /* Instantiate the parameter mapping, so that we map directly to
+     the arguments provided to the instantiation.  */
+  tree map = tsubst_parameter_mapping (ATOMIC_CONSTR_MAP (t), args, quiet);
+  if (map == error_mark_node)
+    {
+      /* If instantiation of the parameter mapping fails, the program
+         is ill-formed.  */
+      if (info.noisy())
+	tsubst_parameter_mapping (ATOMIC_CONSTR_MAP (t), args, info);
+      return cache.save (boolean_false_node);
+    }
 
-  case EXPR_CONSTR:
-    return satisfy_expression_constraint (t, args, complain, in_decl);
+  /* Rebuild the argument vector from the parameter mapping.  */
+  args = get_mapped_args (map);
 
-  case TYPE_CONSTR:
-    return satisfy_type_constraint (t, args, complain, in_decl);
+  /* Apply the parameter mapping (i.e., just substitute).  */
+  tree expr = ATOMIC_CONSTR_EXPR (t);
+  tree result = tsubst_expr (expr, args, quiet.complain, quiet.in_decl, false);
+  if (result == error_mark_node)
+    {
+      /* If substitution results in an invalid type or expression, the constraint
+	 is not satisfied. Replay the substitution.  */
+      if (info.noisy ())
+	tsubst_expr (expr, args, info.complain, info.in_decl, false);
+      return cache.save (boolean_false_node);
+    }
 
-  case ICONV_CONSTR:
-    return satisfy_implicit_conversion_constraint (t, args, complain, in_decl);
+  location_t loc = cp_expr_location (expr);
 
-  case DEDUCT_CONSTR:
-    return satisfy_argument_deduction_constraint (t, args, complain, in_decl);
+  /* [17.4.1.2] ... lvalue-to-value conversion is performed as necessary,
+     and EXPR shall be a constant expression of type bool.  */
+  result = force_rvalue (result, tf_error);
+  if (result == error_mark_node)
+    {
+      if (info.noisy ())
+        inform (loc, "cannot convert constraint to rvalue");
+      return cache.save (error_mark_node);
+    }
+  if (!same_type_p (TREE_TYPE (result), boolean_type_node))
+    {
+      if (info.noisy ())
+	inform (loc, "constraint does not have type %<bool%>");
+      return cache.save (error_mark_node);
+    }
 
-  case EXCEPT_CONSTR:
-    return satisfy_exception_constraint (t, args, complain, in_decl);
+  /* Compute the value of the constraint.  */
+  result = satisfaction_value (cxx_constant_value (result));
+  if (result == boolean_false_node && info.noisy ())
+    diagnose_atomic_constraint (t, args, info);
 
-  case PARM_CONSTR:
-    return satisfy_parameterized_constraint (t, args, complain, in_decl);
+  return cache.save (result);
+}
 
-  case CONJ_CONSTR:
-    return satisfy_conjunction (t, args, complain, in_decl);
+/* Determine if the normalized constraint T is satisfied.
+   Returns boolean_true_node if the expression/constraint is
+   satisfied, boolean_false_node if not, and error_mark_node
+   if the there was an error evaluating the constraint.
 
-  case DISJ_CONSTR:
-    return satisfy_disjunction (t, args, complain, in_decl);
+   The parameter mapping of atomic constraints is simply the
+   set of template arguments that will be substituted into
+   the expression, regardless of template parameters appearing
+   withing. Whether a template argument is used in the atomic
+   constraint only matters for subsumption.  */
 
-  case EXPR_PACK_EXPANSION:
-    return satisfy_pack_expansion (t, args, complain, in_decl);
+static tree
+satisfy_constraint_r (tree t, tree args, subst_info info)
+{
+  if (t == error_mark_node)
+    return error_mark_node;
 
-  default:
-    gcc_unreachable ();
-  }
-  return boolean_false_node;
+  switch (TREE_CODE (t))
+    {
+    case CONJ_CONSTR:
+      return satisfy_conjunction (t, args, info);
+    case DISJ_CONSTR:
+      return satisfy_disjunction (t, args, info);
+    case ATOMIC_CONSTR:
+      return satisfy_atom (t, args, info);
+    default:
+      gcc_unreachable ();
+    }
 }
 
-/* Check that the constraint is satisfied, according to the rules
-   for that constraint. Note that each satisfy_* function returns
-   true or false, depending on whether it is satisfied or not.  */
+/* Check that the normalized constraint T is satisfied for ARGS.  */
 
-tree
-satisfy_constraint (tree t, tree args)
+static tree
+satisfy_constraint (tree t, tree args, subst_info info)
 {
   auto_timevar time (TV_CONSTRAINT_SAT);
 
@@ -2283,146 +2417,199 @@ satisfy_constraint (tree t, tree args)
      to non-dependent terms, so we want to ensure full checking here.  */
   processing_template_decl_sentinel proc (true);
 
-  /* Avoid early exit in tsubst and tsubst_copy from null args; since earlier
-     substitution was done with processing_template_decl forced on, there will
-     be expressions that still need semantic processing, possibly buried in
-     decltype or a template argument.  */
+  /* We need to check access during satisfaction.  */
+  deferring_access_check_sentinel acs (dk_no_deferred);
+
+  /* Avoid early exit in tsubst and tsubst_copy from null args.  */
   if (args == NULL_TREE)
     args = make_tree_vec (1);
 
-  return satisfy_constraint_1 (t, args, tf_none, NULL_TREE);
+  return satisfy_constraint_r (t, args, info);
 }
 
-/* Check the associated constraints in CI against the given
-   ARGS, returning true when the constraints are satisfied
-   and false otherwise.  */
+/* Check the normalized constraints T against ARGS, returning a satisfaction
+   value (either true, false, or error).  */
 
-tree
-satisfy_associated_constraints (tree ci, tree args)
+static tree
+satisfy_associated_constraints (tree t, tree args, subst_info info)
 {
   /* If there are no constraints then this is trivially satisfied. */
-  if (!ci)
+  if (!t)
     return boolean_true_node;
 
   /* If any arguments depend on template parameters, we can't
-     check constraints. */
+     check constraints. Pretend they're satisfied for now.  */
   if (args && uses_template_parms (args))
     return boolean_true_node;
 
-  /* Check if we've seen a previous result. */
-  if (tree prev = lookup_constraint_satisfaction (ci, args))
-    return prev;
-
-  /* Actually test for satisfaction. */
-  tree result = satisfy_constraint (CI_ASSOCIATED_CONSTRAINTS (ci), args);
-  return memoize_constraint_satisfaction (ci, args, result);
+  return satisfy_constraint (t, args, info);
 }
 
-} /* namespace */
+/* Evaluate EXPR as a constraint expression using ARGS, returning a
+   satisfaction value. */
 
-/* Evaluate the given constraint, returning boolean_true_node
-   if the constraint is satisfied and boolean_false_node
-   otherwise. */
-
-tree
-evaluate_constraints (tree constr, tree args)
+static tree
+satisfy_constraint_expression (tree expr, tree args, subst_info info)
 {
-  gcc_assert (constraint_p (constr));
-  return satisfy_constraint (constr, args);
+  /* Normalize the expression before satisfaction testing.  */
+  tree norm;
+  if (args == NULL_TREE && concept_check_p (expr))
+    {
+      tree id = unpack_concept_check (expr);
+      args = TREE_OPERAND (id, 1);
+      tree tmpl = get_concept_check_template (id);
+      norm = normalize_concept_definition (tmpl);
+    }
+  else
+    norm = normalize_constraint_expression (expr);
+  return satisfy_constraint (norm, args, info);
 }
 
-/* Evaluate the function concept FN by substituting its own args
-   into its definition and evaluating that as the result. Returns
-   boolean_true_node if the constraints are satisfied and
-   boolean_false_node otherwise.  */
+/* Used to evaluate concept checks and requires-expressions during
+   constant expression evaluation.  */
 
 tree
-evaluate_function_concept (tree fn, tree args)
+satisfy_constraint_expression (tree expr)
 {
-  tree constr = build_nt (CHECK_CONSTR, fn, args);
-  return satisfy_constraint (constr, args);
+  subst_info info (tf_none, NULL_TREE);
+  return satisfy_constraint_expression (expr, NULL_TREE, info);
 }
 
-/* Evaluate the variable concept VAR by substituting its own args into
-   its initializer and checking the resulting constraint. Returns
-   boolean_true_node if the constraints are satisfied and
-   boolean_false_node otherwise.  */
+/* True if T is satisfied for ARGS.  */
 
-tree
-evaluate_variable_concept (tree var, tree args)
+static bool
+constraint_expression_satisfied_p (tree t, tree args, subst_info info)
 {
-  tree constr = build_nt (CHECK_CONSTR, var, args);
-  return satisfy_constraint (constr, args);
+  tree r = satisfy_constraint_expression (t, args, info);
+  return r == boolean_true_node;
 }
 
-/* Evaluate the given expression as if it were a predicate
-   constraint. Returns boolean_true_node if the constraint
-   is satisfied and boolean_false_node otherwise. */
-
-tree
-evaluate_constraint_expression (tree expr, tree args)
+static bool
+constraints_satisfied_p (tree t, subst_info info)
 {
-  tree constr = normalize_expression (expr);
-  return satisfy_constraint (constr, args);
-}
+  if (!DECL_P (t))
+    return constraint_expression_satisfied_p (t, NULL_TREE, info);
 
-/* Returns true if the DECL's constraints are satisfied.
-   This is used in cases where a declaration is formed but
-   before it is used (e.g., overload resolution). */
+  /* For inherited constructors, consider the original declaration;
+     it has the correct template information attached. */
+  if (flag_new_inheriting_ctors)
+    t = strip_inheriting_ctors (t);
+
+  /* Update the declaration for diagnostics.  */
+  info.in_decl = t;
+
+  if (info.quiet ())
+    if (bool *p = hash_map_safe_get (decl_satisfied_cache, t))
+      return *p;
 
-bool
-constraints_satisfied_p (tree decl)
-{
   /* Get the constraints to check for satisfaction. This depends
      on whether we're looking at a template specialization or not. */
-  tree ci;
+  tree norm = NULL_TREE;
   tree args = NULL_TREE;
-  if (tree ti = DECL_TEMPLATE_INFO (decl))
+  tree ti = DECL_TEMPLATE_INFO (t);
+  if (ti)
     {
       tree tmpl = TI_TEMPLATE (ti);
-      ci = get_constraints (tmpl);
-      int depth = TMPL_PARMS_DEPTH (DECL_TEMPLATE_PARMS (tmpl));
-      args = get_innermost_template_args (TI_ARGS (ti), depth);
+      norm = normalize_template_requirements (tmpl, info.noisy ());
+
+      /* The initial parameter mapping is the complete set of
+         template arguments substituted into the declaration.  */
+      args = TI_ARGS (ti);
     }
   else
     {
-      ci = get_constraints (decl);
+      /* These should be empty until we allow constraints on non-templates.  */
+      norm = normalize_nontemplate_requirements (t, info.noisy ());
+    }
+
+  bool r = true;
+  if (norm)
+    {
+      push_access_scope (t);
+      tree eval = satisfy_associated_constraints (norm, args, info);
+      pop_access_scope (t);
+      r = (eval == boolean_true_node);
     }
 
-  tree eval = satisfy_associated_constraints (ci, args);
-  return eval == boolean_true_node;
+  if (info.quiet ())
+    hash_map_safe_put<hm_ggc> (decl_satisfied_cache, t, r);
+
+  return r;
 }
 
-/* Returns true if the constraints are satisfied by ARGS.
-   Here, T can be either a constraint or a constrained
-   declaration.  */
+/* Returns true if the T's constraints are satisfied, of if T is an expression,
+   if T is satisfied. This is used in cases where the arguments can be
+   determined from the declaration or expression.
+
+   Note that T is typically a template specialization.  */
 
 bool
-constraints_satisfied_p (tree t, tree args)
+constraints_satisfied_p (tree t)
 {
-  tree eval;
-  if (constraint_p (t))
-    eval = evaluate_constraints (t, args);
-  else
-    eval = satisfy_associated_constraints (get_constraints (t), args);
-  return eval == boolean_true_node;
+  subst_info info (tf_none, NULL_TREE);
+  return constraints_satisfied_p (t, info);
 }
 
-namespace
+/* Returns true if the expression or constrained declaration T is
+   satisfied by ARGS.  In this case, we don't have a specialization
+   where we can cache the results (e.g., alias templates).  */
+
+static bool
+constraints_satisfied_p (tree t, tree args, subst_info info)
 {
+  if (!DECL_P (t))
+    return constraint_expression_satisfied_p (t, args, info);
+
+  /* Update the declaration for diagnostics.  */
+  info.in_decl = t;
+
+  gcc_assert (TREE_CODE (t) == TEMPLATE_DECL);
+  if (tree norm = normalize_template_requirements (t, info.noisy ()))
+    {
+      tree pattern = DECL_TEMPLATE_RESULT (t);
+      push_access_scope (pattern);
+      tree eval = satisfy_associated_constraints (norm, args, info);
+      pop_access_scope (pattern);
+      return eval == boolean_true_node;
+    }
 
-/* Normalize EXPR and determine if the resulting constraint is
-   satisfied by ARGS. Returns true if and only if the constraint
-   is satisfied.  This is used extensively by diagnostics to
-   determine causes for failure.  */
+  return true;
+}
 
-inline bool
-constraint_expression_satisfied_p (tree expr, tree args)
+bool
+constraints_satisfied_p (tree t, tree args)
 {
-  return evaluate_constraint_expression (expr, args) == boolean_true_node;
+  subst_info info (tf_none, NULL);
+  return constraints_satisfied_p (t, args, info);
 }
 
-} /* namespace */
+/* Evaluate a concept check of the form C<ARGS>, returning either TRUE
+   or FALSE. If ARGS contains any template parameters, this returns the
+   check. If satisfaction yields a hard error, diagnose the error.  */
+
+tree
+evaluate_concept_check (tree check, tsubst_flags_t complain)
+{
+  /* FIXME we ought to be able to pass complain into subst_info rather
+     than repeat satisfaction, but currently that will complain about
+     non-satisfaction as well as errors.  */
+  if (check == error_mark_node)
+    return error_mark_node;
+
+  gcc_assert (concept_check_p (check));
+
+  subst_info info (tf_none, NULL_TREE);
+  tree result = satisfy_constraint_expression (check, NULL_TREE, info);
+  if (result == error_mark_node && (complain & tf_error))
+    {
+      location_t loc = cp_expr_loc_or_input_loc (check);
+      error_at (loc, "concept satisfaction failed");
+      info.complain = complain;
+      satisfy_constraint_expression (check, NULL_TREE, info);
+    }
+
+  return result;
+}
 
 /*---------------------------------------------------------------------------
                 Semantic analysis of requires-expressions
@@ -2430,8 +2617,9 @@ constraint_expression_satisfied_p (tree expr, tree args)
 
 /* Finish a requires expression for the given PARMS (possibly
    null) and the non-empty sequence of requirements.  */
+
 tree
-finish_requires_expr (tree parms, tree reqs)
+finish_requires_expr (location_t loc, tree parms, tree reqs)
 {
   /* Modify the declared parameters by removing their context
      so they don't refer to the enclosing scope and explicitly
@@ -2446,41 +2634,53 @@ finish_requires_expr (tree parms, tree reqs)
   tree r = build_min (REQUIRES_EXPR, boolean_type_node, parms, reqs);
   TREE_SIDE_EFFECTS (r) = false;
   TREE_CONSTANT (r) = true;
+  SET_EXPR_LOCATION (r, loc);
   return r;
 }
 
-/* Construct a requirement for the validity of EXPR. */
+/* Construct a requirement for the validity of EXPR.   */
+
 tree
-finish_simple_requirement (tree expr)
+finish_simple_requirement (location_t loc, tree expr)
 {
-  return build_nt (SIMPLE_REQ, expr);
+  tree r = build_nt (SIMPLE_REQ, expr);
+  SET_EXPR_LOCATION (r, loc);
+  return r;
 }
 
-/* Construct a requirement for the validity of TYPE. */
+/* Construct a requirement for the validity of TYPE.  */
+
 tree
-finish_type_requirement (tree type)
+finish_type_requirement (location_t loc, tree type)
 {
-  return build_nt (TYPE_REQ, type);
+  tree r = build_nt (TYPE_REQ, type);
+  SET_EXPR_LOCATION (r, loc);
+  return r;
 }
 
 /* Construct a requirement for the validity of EXPR, along with
    its properties. if TYPE is non-null, then it specifies either
    an implicit conversion or argument deduction constraint,
    depending on whether any placeholders occur in the type name.
-   NOEXCEPT_P is true iff the noexcept keyword was specified. */
+   NOEXCEPT_P is true iff the noexcept keyword was specified.  */
+
 tree
-finish_compound_requirement (tree expr, tree type, bool noexcept_p)
+finish_compound_requirement (location_t loc, tree expr, tree type, bool noexcept_p)
 {
   tree req = build_nt (COMPOUND_REQ, expr, type);
+  SET_EXPR_LOCATION (req, loc);
   COMPOUND_REQ_NOEXCEPT_P (req) = noexcept_p;
   return req;
 }
 
-/* Finish a nested requirement. */
+/* Finish a nested requirement.  */
+
 tree
-finish_nested_requirement (tree expr)
+finish_nested_requirement (location_t loc, tree expr)
 {
-  return build_nt (NESTED_REQ, expr);
+  tree r = build_nt (NESTED_REQ, expr);
+  SET_EXPR_LOCATION (r, loc);
+  return r;
 }
 
 /* Check that FN satisfies the structural requirements of a
@@ -2500,7 +2700,7 @@ check_function_concept (tree fn)
   if (TREE_CODE (body) == CLEANUP_POINT_EXPR)
     body = TREE_OPERAND (body, 0);
 
-  /* Check that the definition is written correctly. */
+  /* Check that the definition is written correctly.  */
   if (TREE_CODE (body) != RETURN_EXPR)
     {
       location_t loc = DECL_SOURCE_LOCATION (fn);
@@ -2580,108 +2780,93 @@ subsumes_constraints (tree a, tree b)
   return subsumes (a, b);
 }
 
-/* Returns true when the the constraints in A subsume those in B, but
-   the constraints in B do not subsume the constraints in A.  */
+/* Returns true when the the constraints in CI (with arguments
+   ARGS) strictly subsume the associated constraints of TMPL.  */
+
+bool
+strictly_subsumes (tree ci, tree args, tree tmpl)
+{
+  tree n1 = get_normalized_constraints_from_info (ci, args, NULL_TREE);
+  tree n2 = get_normalized_constraints_from_decl (tmpl);
+
+  return subsumes (n1, n2) && !subsumes (n2, n1);
+}
+
+/* REturns true when the constraints in CI (with arguments ARGS) subsume
+   the associated constraints of TMPL.  */
 
 bool
-strictly_subsumes (tree a, tree b)
+weakly_subsumes (tree ci, tree args, tree tmpl)
 {
-  return subsumes (a, b) && !subsumes (b, a);
+  tree n1 = get_normalized_constraints_from_info (ci, args, NULL_TREE);
+  tree n2 = get_normalized_constraints_from_decl (tmpl);
+
+  return subsumes (n1, n2);
 }
 
 /* Determines which of the declarations, A or B, is more constrained.
    That is, which declaration's constraints subsume but are not subsumed
    by the other's?
 
-   Returns 1 if A is more constrained than B, -1 if B is more constrained
-   than A, and 0 otherwise. */
+   Returns 1 if D1 is more constrained than D2, -1 if D2 is more constrained
+   than D1, and 0 otherwise. */
 
 int
 more_constrained (tree d1, tree d2)
 {
-  tree c1 = get_constraints (d1);
-  tree c2 = get_constraints (d2);
+  tree n1 = get_normalized_constraints_from_decl (d1);
+  tree n2 = get_normalized_constraints_from_decl (d2);
+
   int winner = 0;
-  if (subsumes_constraints (c1, c2))
+  if (subsumes (n1, n2))
     ++winner;
-  if (subsumes_constraints (c2, c1))
+  if (subsumes (n2, n1))
     --winner;
   return winner;
 }
 
-/* Returns true if D1 is at least as constrained as D2. That is, the
-   associated constraints of D1 subsume those of D2, or both declarations
-   are unconstrained. */
-
-bool
-at_least_as_constrained (tree d1, tree d2)
-{
-  tree c1 = get_constraints (d1);
-  tree c2 = get_constraints (d2);
-  return subsumes_constraints (c1, c2);
-}
-
-
 /*---------------------------------------------------------------------------
                         Constraint diagnostics
-
-FIXME: Normalize expressions into constraints before evaluating them.
-This should be the general pattern for all such diagnostics.
 ---------------------------------------------------------------------------*/
 
-/* The number of detailed constraint failures.  */
-
-int constraint_errors = 0;
-
-/* Do not generate errors after diagnosing this number of constraint
-   failures.
-
-   FIXME: This is a really arbitrary number. Provide better control of
-   constraint diagnostics with a command line option.  */
-
-int constraint_thresh = 20;
-
-
-/* Returns true if we should elide the diagnostic for a constraint failure.
-   This is the case when the number of errors has exceeded the pre-configured
-   threshold.  */
-
-inline bool
-elide_constraint_failure_p ()
-{
-  bool ret = constraint_thresh <= constraint_errors;
-  ++constraint_errors;
-  return ret;
-}
-
-/* Returns the number of undiagnosed errors. */
-
-inline int
-undiagnosed_constraint_failures ()
-{
-  return constraint_errors - constraint_thresh;
+/* Returns the best location to diagnose a constraint error.  */
+
+static location_t
+get_constraint_error_location (tree t)
+{
+  /* If we have a specific location give it.  */
+  tree expr = CONSTR_EXPR (t);
+  if (location_t loc = cp_expr_location (expr))
+    return loc;
+
+  /* If the constraint is normalized from a requires-clause, give
+     the location as that of the constrained declaration.  */
+  tree cxt = CONSTR_CONTEXT (t);
+  tree src = TREE_VALUE (cxt);
+  if (!src)
+    /* TODO: This only happens for constrained non-template declarations.  */
+    return input_location;
+  if (DECL_P (src))
+    return DECL_SOURCE_LOCATION (src);
+
+  /* Otherwise, give the location as the defining concept.  */
+  gcc_assert (concept_check_p (src));
+  tree id = unpack_concept_check (src);
+  tree tmpl = TREE_OPERAND (id, 0);
+  if (OVL_P (tmpl))
+    tmpl = OVL_FIRST (tmpl);
+  return DECL_SOURCE_LOCATION (tmpl);
 }
 
-/* The diagnosis of constraints performs a combination of normalization
-   and satisfaction testing. We recursively walk through the conjunction or
-   disjunction of associated constraints, testing each sub-constraint in
-   turn.  */
-
-namespace {
-
-void diagnose_constraint (location_t, tree, tree, tree);
-
-/* Emit a specific diagnostics for a failed trait.  */
+/* Emit a diagnostic for a failed trait.  */
 
 void
-diagnose_trait_expression (location_t loc, tree, tree cur, tree args)
+diagnose_trait_expr (tree expr, tree args)
 {
-  if (constraint_expression_satisfied_p (cur, args))
-    return;
-  if (elide_constraint_failure_p())
-    return;
+  location_t loc = cp_expr_location (expr);
 
-  tree expr = PRED_CONSTR_EXPR (cur);
+  /* Build a "fake" version of the instantiated trait, so we can
+     get the instantiated types from result.  */
   ++processing_template_decl;
   expr = tsubst_expr (expr, args, tf_none, NULL_TREE, false);
   --processing_template_decl;
@@ -2758,390 +2943,224 @@ diagnose_trait_expression (location_t loc, tree, tree cur, tree args)
     }
 }
 
-/* Diagnose the expression of a predicate constraint.  */
-
-void
-diagnose_other_expression (location_t loc, tree, tree cur, tree args)
+static tree
+diagnose_valid_expression (tree expr, tree args, tree in_decl)
 {
-  if (constraint_expression_satisfied_p (cur, args))
-    return;
-  if (elide_constraint_failure_p())
-    return;
-  inform (loc, "%qE evaluated to false", cur);
-}
+  tree result = tsubst_expr (expr, args, tf_none, in_decl, false);
+  if (result != error_mark_node)
+    return result;
 
-/* Do our best to infer meaning from predicates.  */
+  location_t loc = cp_expr_loc_or_input_loc (expr);
+  inform (loc, "the required expression %qE is invalid", expr);
 
-inline void
-diagnose_predicate_constraint (location_t loc, tree orig, tree cur, tree args)
-{
-  if (TREE_CODE (PRED_CONSTR_EXPR (cur)) == TRAIT_EXPR)
-    diagnose_trait_expression (loc, orig, cur, args);
-  else
-    diagnose_other_expression (loc, orig, cur, args);
-}
+  /* TODO: Replay the substitution to diagnose the error?  */
+  // tsubst_expr (expr, args, tf_error, in_decl, false);
 
-/* Diagnose a failed pack expansion, possibly containing constraints.  */
+  return error_mark_node;
+}
 
-void
-diagnose_pack_expansion (location_t loc, tree, tree cur, tree args)
+static tree
+diagnose_valid_type (tree type, tree args, tree in_decl)
 {
-  if (constraint_expression_satisfied_p (cur, args))
-    return;
-  if (elide_constraint_failure_p())
-    return;
-
-  /* Make sure that we don't have naked packs that we don't expect. */
-  if (!same_type_p (TREE_TYPE (cur), boolean_type_node))
-    {
-      inform (loc, "invalid pack expansion in constraint %qE", cur);
-      return;
-    }
+  tree result = tsubst (type, args, tf_none, in_decl);
+  if (result != error_mark_node)
+    return result;
 
-  inform (loc, "in the expansion of %qE", cur);
+  location_t loc = cp_expr_loc_or_input_loc (type);
+  inform (loc, "the required type %qT is invalid", type);
 
-  /* Get the vector of expanded arguments. Note that n must not
-     be 0 since this constraint is not satisfied.  */
-  ++processing_template_decl;
-  tree exprs = tsubst_pack_expansion (cur, args, tf_none, NULL_TREE);
-  --processing_template_decl;
-  if (exprs == error_mark_node)
-    {
-      /* TODO: This error message could be better. */
-      inform (loc, "    substitution failure occurred during expansion");
-      return;
-    }
+  /* TODO: Replay the substitution to diagnose the error?  */
+  // tsubst (type, args, tf_error, in_decl);
 
-  /* Check each expanded constraint separately. */
-  int n = TREE_VEC_LENGTH (exprs);
-  for (int i = 0; i < n; ++i)
-    {
-      tree expr = TREE_VEC_ELT (exprs, i);
-      if (!constraint_expression_satisfied_p (expr, args))
-        inform (loc, "    %qE was not satisfied", expr);
-    }
+  return error_mark_node;
 }
 
-/* Diagnose a potentially unsatisfied concept check constraint DECL<CARGS>.
-   Parameters are as for diagnose_constraint.  */
-
-void
-diagnose_check_constraint (location_t loc, tree orig, tree cur, tree args)
+static void
+diagnose_simple_requirement (tree req, tree args, tree in_decl)
 {
-  if (constraints_satisfied_p (cur, args))
-    return;
-
-  tree decl = CHECK_CONSTR_CONCEPT (cur);
-  tree cargs = CHECK_CONSTR_ARGS (cur);
-  tree tmpl = DECL_TI_TEMPLATE (decl);
-  tree check = build_nt (CHECK_CONSTR, decl, cargs);
-
-  /* Instantiate the concept check arguments.  */
-  tree targs = tsubst (cargs, args, tf_none, NULL_TREE);
-  if (targs == error_mark_node)
-    {
-      if (elide_constraint_failure_p ())
-        return;
-      inform (loc, "invalid use of the concept %qE", check);
-      tsubst (cargs, args, tf_warning_or_error, NULL_TREE);
-      return;
-    }
-
-  tree sub = build_tree_list (tmpl, targs);
-  /* Update to the expanded definitions. */
-  cur = expand_concept (decl, targs);
-  if (cur == error_mark_node)
-    {
-      if (elide_constraint_failure_p ())
-        return;
-      inform (loc, "in the expansion of concept %<%E %S%>", check, sub);
-      cur = get_concept_definition (decl);
-      tsubst_expr (cur, targs, tf_warning_or_error, NULL_TREE, false);
-      return;
-    }
-
-  orig = get_concept_definition (CHECK_CONSTR_CONCEPT (orig));
-  orig = normalize_expression (orig);
-
-  location_t dloc = DECL_SOURCE_LOCATION (decl);
-  inform (dloc, "within %qS", sub);
-  diagnose_constraint (dloc, orig, cur, targs);
+  diagnose_valid_expression (TREE_OPERAND (req, 0), args, in_decl);
 }
 
-/* Diagnose a potentially unsatisfied conjunction or disjunction.  Parameters
-   are as for diagnose_constraint.  */
-
-void
-diagnose_logical_constraint (location_t loc, tree orig, tree cur, tree args)
+static void
+diagnose_compound_requirement (tree req, tree args, tree in_decl)
 {
-  tree t0 = TREE_OPERAND (cur, 0);
-  tree t1 = TREE_OPERAND (cur, 1);
-  if (!constraints_satisfied_p (t0, args))
-    diagnose_constraint (loc, TREE_OPERAND (orig, 0), t0, args);
-  else if (TREE_CODE (orig) == TRUTH_ORIF_EXPR)
+  tree expr = TREE_OPERAND (req, 0);
+  expr = diagnose_valid_expression (expr, args, in_decl);
+  if (expr == error_mark_node)
     return;
-  if (!constraints_satisfied_p (t1, args))
-    diagnose_constraint (loc, TREE_OPERAND (orig, 1), t1, args);
-}
 
-/* Diagnose a potential expression constraint failure. */
+  location_t loc = cp_expr_loc_or_input_loc (expr);
 
-void
-diagnose_expression_constraint (location_t loc, tree orig, tree cur, tree args)
-{
-  if (constraints_satisfied_p (cur, args))
-    return;
-  if (elide_constraint_failure_p())
+  /* Check the noexcept condition.  */
+  if (COMPOUND_REQ_NOEXCEPT_P (req) && !expr_noexcept_p (expr, tf_none))
+    inform (loc, "%qE is not %<noexcept%>", expr);
+
+  tree type = TREE_OPERAND (req, 1);
+  type = diagnose_valid_type (type, args, in_decl);
+  if (type == error_mark_node)
     return;
 
-  tree expr = EXPR_CONSTR_EXPR (orig);
-  inform (loc, "the required expression %qE would be ill-formed", expr);
+  if (type)
+    {
+      subst_info quiet (tf_none, in_decl);
+      subst_info noisy (tf_error, in_decl);
 
-  // TODO: We should have a flag that controls this substitution.
-  // I'm finding it very useful for resolving concept check errors.
+      /* Check the expression against the result type.  */
+      if (tree placeholder = type_uses_auto (type))
+	{
+	  if (!type_deducible_p (expr, type, placeholder, args, quiet))
+	    {
+	      tree orig_expr = TREE_OPERAND (req, 0);
+	      inform (loc, "type deduction from %qE failed", orig_expr);
+
+	      /* Further explain the reason for the error.  */
+	      type_deducible_p (expr, type, placeholder, args, noisy);
+	    }
+	}
+      else if (!expression_convertible_p (expr, type, quiet))
+	{
+	  tree orig_expr = TREE_OPERAND (req, 0);
+	  inform (loc, "cannot convert %qE to %qT", orig_expr, type);
 
-  // inform (input_location, "==== BEGIN DUMP ====");
-  // tsubst_expr (EXPR_CONSTR_EXPR (orig), args, tf_warning_or_error, NULL_TREE, false);
-  // inform (input_location, "==== END DUMP ====");
+	  /* Further explain the reason for the error.  */
+	  expression_convertible_p (expr, type, noisy);
+	}
+    }
 }
 
-/* Diagnose a potentially failed type constraint. */
-
-void
-diagnose_type_constraint (location_t loc, tree orig, tree cur, tree args)
+static void
+diagnose_type_requirement (tree req, tree args, tree in_decl)
 {
-  if (constraints_satisfied_p (cur, args))
-    return;
-  if (elide_constraint_failure_p())
-    return;
-
-  tree type = TYPE_CONSTR_TYPE (orig);
-  inform (loc, "the required type %qT would be ill-formed", type);
+  tree type = TREE_OPERAND (req, 0);
+  diagnose_valid_type (type, args, in_decl);
 }
 
-/* Diagnose a potentially unsatisfied conversion constraint. */
-
-void
-diagnose_implicit_conversion_constraint (location_t loc, tree orig, tree cur,
-					 tree args)
+static void
+diagnose_nested_requirement (tree req, tree args)
 {
-  if (constraints_satisfied_p (cur, args))
-    return;
-
-  /* The expression and type will previously have been substituted into,
-     and therefore may already be an error. Also, we will have already
-     diagnosed substitution failures into an expression since this must be
-     part of a compound requirement.  */
-  tree expr = ICONV_CONSTR_EXPR (cur);
-  if (error_operand_p (expr))
+  tree expr = TREE_OPERAND (req, 0);
+  if (constraints_satisfied_p (expr, args))
     return;
+  location_t loc = cp_expr_location (expr);
+  inform (loc, "nested requirement %qE is not satisfied", expr);
 
-  /* Don't elide a previously diagnosed failure.  */
-  if (elide_constraint_failure_p())
-    return;
-
-  tree type = ICONV_CONSTR_TYPE (cur);
-  if (error_operand_p (type))
-    {
-      inform (loc, "substitution into type %qT failed",
-	      ICONV_CONSTR_TYPE (orig));
-      return;
-    }
-
-  inform(loc, "%qE is not implicitly convertible to %qT", expr, type);
+  /* TODO: Replay the substitution to diagnose the error?  */
+  // subst_info noisy (tf_warning_or_error, NULL_TREE);
+  // constraints_satisfied_p (expr, args, noisy);
 }
 
-/* Diagnose an argument deduction constraint. */
-
-void
-diagnose_argument_deduction_constraint (location_t loc, tree orig, tree cur,
-					tree args)
+static void
+diagnose_requirement (tree req, tree args, tree in_decl)
 {
-  if (constraints_satisfied_p (cur, args))
-    return;
-
-  /* The expression and type will previously have been substituted into,
-     and therefore may already be an error. Also, we will have already
-     diagnosed substution failures into an expression since this must be
-     part of a compound requirement.  */
-  tree expr = DEDUCT_CONSTR_EXPR (cur);
-  if (error_operand_p (expr))
-    return;
-
-  /* Don't elide a previously diagnosed failure.  */
-  if (elide_constraint_failure_p ())
-    return;
-
-  tree pattern = DEDUCT_CONSTR_PATTERN (cur);
-  if (error_operand_p (pattern))
+  iloc_sentinel loc_s (cp_expr_location (req));
+  switch (TREE_CODE (req))
     {
-      inform (loc, "substitution into type %qT failed",
-	      DEDUCT_CONSTR_PATTERN (orig));
-      return;
+    case SIMPLE_REQ:
+      return diagnose_simple_requirement (req, args, in_decl);
+    case COMPOUND_REQ:
+      return diagnose_compound_requirement (req, args, in_decl);
+    case TYPE_REQ:
+      return diagnose_type_requirement (req, args, in_decl);
+    case NESTED_REQ:
+      return diagnose_nested_requirement (req, args);
+    default:
+       gcc_unreachable ();
     }
-
-  inform (loc, "unable to deduce placeholder type %qT from %qE",
-	  pattern, expr);
 }
 
-/* Diagnose an exception constraint. */
-
-void
-diagnose_exception_constraint (location_t loc, tree orig, tree cur, tree args)
+static void
+diagnose_requires_expr (tree expr, tree args, tree in_decl)
 {
-  if (constraints_satisfied_p (cur, args))
-    return;
-  if (elide_constraint_failure_p ())
-    return;
+  local_specialization_stack stack (lss_copy);
+  tree parms = TREE_OPERAND (expr, 0);
+  tree body = TREE_OPERAND (expr, 1);
 
-  /* Rebuild a noexcept expression. */
-  tree expr = EXCEPT_CONSTR_EXPR (cur);
-  if (error_operand_p (expr))
+  cp_unevaluated u;
+  subst_info info (tf_warning_or_error, NULL_TREE);
+  tree vars = tsubst_constraint_variables (parms, args, info);
+  if (vars == error_mark_node)
     return;
 
-  inform (loc, "%qE evaluated to false", EXCEPT_CONSTR_EXPR (orig));
+  tree p = body;
+  while (p)
+    {
+      tree req = TREE_VALUE (p);
+      diagnose_requirement (req, args, in_decl);
+      p = TREE_CHAIN (p);
+    }
 }
 
-/* Diagnose a potentially unsatisfied parameterized constraint.  */
+/* Diagnose a substitution failure in the atomic constraint T. Note that
+   ARGS have been previously instantiated through the parameter map.  */
 
-void
-diagnose_parameterized_constraint (location_t loc, tree orig, tree cur,
-				   tree args)
+static void
+diagnose_atomic_constraint (tree t, tree args, subst_info info)
 {
-  if (constraints_satisfied_p (cur, args))
-    return;
-
-  local_specialization_stack stack;
-  tree parms = PARM_CONSTR_PARMS (cur);
-  tree vars = tsubst_constraint_variables (parms, args, tf_warning_or_error,
-					   NULL_TREE);
-  if (vars == error_mark_node)
+  /* If the constraint is already ill-formed, we've previously diagnosed
+     the reason. We should still say why the constraints aren't satisfied.  */
+  if (t == error_mark_node)
     {
-      if (elide_constraint_failure_p ())
-        return;
-
-      /* TODO: Check which variable failed and use orig to diagnose
-         that substitution error.  */
-      inform (loc, "failed to instantiate constraint variables");
+      location_t loc;
+      if (info.in_decl)
+        loc = DECL_SOURCE_LOCATION (info.in_decl);
+      else
+        loc = input_location;
+      inform (loc, "invalid constraints");
       return;
     }
 
-  /* TODO: It would be better write these in a list. */
-  while (vars)
-    {
-      inform (loc, "    with %q#D", vars);
-      vars = TREE_CHAIN (vars);
-    }
-  orig = PARM_CONSTR_OPERAND (orig);
-  cur = PARM_CONSTR_OPERAND (cur);
-  return diagnose_constraint (loc, orig, cur, args);
-}
-
-/* Diagnose the constraint CUR for the given ARGS. This is only ever invoked
-   on the associated constraints, so we can only have conjunctions of
-   predicate constraints.  The ORIGinal (dependent) constructs follow
-   the current constraints to enable better diagnostics.  Note that ORIG
-   and CUR must be the same kinds of node, except when CUR is an error.  */
+  location_t loc = get_constraint_error_location (t);
+  iloc_sentinel loc_s (loc);
 
-void
-diagnose_constraint (location_t loc, tree orig, tree cur, tree args)
-{
-  switch (TREE_CODE (cur))
+  /* Generate better diagnostics for certain kinds of expressions.  */
+  tree expr = ATOMIC_CONSTR_EXPR (t);
+  STRIP_ANY_LOCATION_WRAPPER (expr);
+  switch (TREE_CODE (expr))
     {
-    case EXPR_CONSTR:
-      diagnose_expression_constraint (loc, orig, cur, args);
-      break;
-
-    case TYPE_CONSTR:
-      diagnose_type_constraint (loc, orig, cur, args);
-      break;
-
-    case ICONV_CONSTR:
-      diagnose_implicit_conversion_constraint (loc, orig, cur, args);
-      break;
-
-    case DEDUCT_CONSTR:
-      diagnose_argument_deduction_constraint (loc, orig, cur, args);
-      break;
-
-    case EXCEPT_CONSTR:
-      diagnose_exception_constraint (loc, orig, cur, args);
-      break;
-
-    case CONJ_CONSTR:
-    case DISJ_CONSTR:
-      diagnose_logical_constraint (loc, orig, cur, args);
-      break;
-
-    case PRED_CONSTR:
-      diagnose_predicate_constraint (loc, orig, cur, args);
-      break;
-
-    case PARM_CONSTR:
-      diagnose_parameterized_constraint (loc, orig, cur, args);
-      break;
-
-    case CHECK_CONSTR:
-      diagnose_check_constraint (loc, orig, cur, args);
+    case TRAIT_EXPR:
+      diagnose_trait_expr (expr, args);
       break;
-
-    case EXPR_PACK_EXPANSION:
-      diagnose_pack_expansion (loc, orig, cur, args);
+    case REQUIRES_EXPR:
+      diagnose_requires_expr (expr, args, info.in_decl);
       break;
-
-    case ERROR_MARK:
-      /* TODO: Can we improve the diagnostic with the original?  */
-      inform (input_location, "ill-formed constraint");
+    case INTEGER_CST:
+      /* This must be either 0 or false.  */
+      inform (loc, "%qE is never satisfied", expr);
       break;
-
     default:
-      gcc_unreachable ();
-      break;
+      inform (loc, "the expression %qE evaluated to %<false%>", expr);
     }
 }
 
-/* Diagnose the reason(s) why ARGS do not satisfy the constraints
-   of declaration DECL. */
-
-void
-diagnose_declaration_constraints (location_t loc, tree decl, tree args)
+diagnosing_failed_constraint::
+diagnosing_failed_constraint (tree t, tree args, bool diag)
+  : diagnosing_error (diag)
 {
-  inform (loc, "  constraints not satisfied");
-
-  /* Constraints are attached to the template.  */
-  if (tree ti = DECL_TEMPLATE_INFO (decl))
-    {
-      decl = TI_TEMPLATE (ti);
-      if (!args)
-	args = TI_ARGS (ti);
-    }
-
-  /* Recursively diagnose the associated constraints.  */
-  tree ci = get_constraints (decl);
-  tree t = CI_ASSOCIATED_CONSTRAINTS (ci);
-  diagnose_constraint (loc, t, t, args);
+  if (diagnosing_error)
+    current_failed_constraint = tree_cons (args, t, current_failed_constraint);
 }
 
-} // namespace
+diagnosing_failed_constraint::
+~diagnosing_failed_constraint ()
+{
+  if (diagnosing_error && current_failed_constraint)
+    current_failed_constraint = TREE_CHAIN (current_failed_constraint);
+}
 
-/* Emit diagnostics detailing the failure ARGS to satisfy the
-   constraints of T. Here, T can be either a constraint
-   or a declaration.  */
+/* Emit diagnostics detailing the failure ARGS to satisfy the constraints
+   of T. Here, T can be either a constraint or a declaration.  */
 
 void
 diagnose_constraints (location_t loc, tree t, tree args)
 {
-  constraint_errors = 0;
+  inform (loc, "constraints not satisfied");
 
-  if (constraint_p (t))
-    diagnose_constraint (loc, t, t, args);
-  else if (DECL_P (t))
-    diagnose_declaration_constraints (loc, t, args);
+  /* Replay satisfaction, but diagnose errors.  */
+  subst_info info (tf_warning_or_error, NULL_TREE);
+  if (!args)
+    constraints_satisfied_p (t, info);
   else
-    gcc_unreachable ();
-
-  /* Note the number of elided failures. */
-  int n = undiagnosed_constraint_failures ();
-  if (n > 0)
-    inform (loc, "... and %d more constraint errors not shown", n);
+    constraints_satisfied_p (t, args, info);
 }
+
+#include "gt-cp-constraint.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index 0a72231..f38b4e8 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -381,6 +381,7 @@ cp_common_init_ts (void)
   /* New decls.  */
   MARK_TS_DECL_COMMON (TEMPLATE_DECL);
   MARK_TS_DECL_COMMON (WILDCARD_DECL);
+  MARK_TS_DECL_COMMON (CONCEPT_DECL);
 
   MARK_TS_DECL_NON_COMMON (USING_DECL);
 
@@ -458,17 +459,11 @@ cp_common_init_ts (void)
   MARK_TS_EXP (CHECK_CONSTR);
   MARK_TS_EXP (COMPOUND_REQ);
   MARK_TS_EXP (CONJ_CONSTR);
-  MARK_TS_EXP (DEDUCT_CONSTR);
   MARK_TS_EXP (DISJ_CONSTR);
-  MARK_TS_EXP (EXCEPT_CONSTR);
-  MARK_TS_EXP (EXPR_CONSTR);
-  MARK_TS_EXP (ICONV_CONSTR);
+  MARK_TS_EXP (ATOMIC_CONSTR);
   MARK_TS_EXP (NESTED_REQ);
-  MARK_TS_EXP (PARM_CONSTR);
-  MARK_TS_EXP (PRED_CONSTR);
   MARK_TS_EXP (REQUIRES_EXPR);
   MARK_TS_EXP (SIMPLE_REQ);
-  MARK_TS_EXP (TYPE_CONSTR);
   MARK_TS_EXP (TYPE_REQ);
 
   c_common_init_ts ();
diff --git a/gcc/cp/cp-tree.def b/gcc/cp/cp-tree.def
index 4db1d31..845a7e2 100644
--- a/gcc/cp/cp-tree.def
+++ b/gcc/cp/cp-tree.def
@@ -507,6 +507,11 @@ DEFTREECODE (OMP_DEPOBJ, "omp_depobj", tcc_statement, 2)
 
 /* Extensions for Concepts. */
 
+/* Concept definition. This is not entirely different than a VAR_DECL
+   except that a) it must be a template, and b) doesn't have the wide
+   range of value and linkage options available to variables.  */
+DEFTREECODE (CONCEPT_DECL, "concept_decl", tcc_declaration, 0)
+
 /* Used to represent information associated with constrained declarations. */
 DEFTREECODE (CONSTRAINT_INFO, "constraint_info", tcc_exceptional, 0)
 
@@ -541,10 +546,24 @@ DEFTREECODE (NESTED_REQ, "nested_req", tcc_expression, 1)
    The operands of a constraint can be either types or expressions.
    Unlike expressions, constraints do not have a type. */
 
-/* A predicate constraint evaluates an expression E.
+/* An atomic constraint evaluates an expression E. The operand of the
+   constraint is its parameter mapping. The actual expression is stored
+   in the context.
+
+   ATOMIC_CONSTR_INFO provides source info to support diagnostics.
+   ATOMIC_CONSTR_EXPR has the expression to be evaluated.
+   ATOMIC_CONSTR_PARMS is the parameter mapping for the atomic constraint
+   and is stored in the type field.  */
+DEFTREECODE (ATOMIC_CONSTR, "atomic_constr", tcc_expression, 1)
+
+/* The conjunction and disjunction of two constraints, respectively.
+   Operands are accessed using TREE_OPERAND. The third operand provides
+   source info for diagnostics.
 
-   PRED_CONSTR_EXPR has the expression to be evaluated. */
-DEFTREECODE (PRED_CONSTR, "pred_constr", tcc_expression, 1)
+   CONJ_CONSTR_INFO and DISJ_CONSTR_INFO provide access to the source
+   information of constraints, which is stored in the TREE_TYPE.  */
+DEFTREECODE (CONJ_CONSTR, "conj_constr", tcc_expression, 2)
+DEFTREECODE (DISJ_CONSTR, "disj_constr", tcc_expression, 2)
 
 /* A check constraint represents the checking of a concept
    C. It has two operands: the template defining the concept
@@ -554,53 +573,6 @@ DEFTREECODE (PRED_CONSTR, "pred_constr", tcc_expression, 1)
    CHECK_CONSTR_ARGUMENTS are the template arguments */
 DEFTREECODE (CHECK_CONSTR, "check_constr", tcc_expression, 2)
 
-/* An expression constraint determines the validity of a expression E.
-
-   EXPR_CONST_EXPR has the expression being validated. */
-DEFTREECODE (EXPR_CONSTR, "expr_constr", tcc_expression, 1)
-
-/* A type constraint determines the validity of a type T. Note that
-
-   TYPE_CONST_TYPE has the type being validated */
-DEFTREECODE (TYPE_CONSTR, "type_constr", tcc_expression, 1)
-
-/* An implicit conversion constraint determines if an expression
-   E is implicitly convertible to a type T. Note that T may
-   be dependent but does not contain any placeholders.
-
-   ICONV_CONSTR_EXPR has the expression E.
-   ICONV_CONSTR_TYPE has the type T.
-   */
-DEFTREECODE (ICONV_CONSTR, "iconv_constr", tcc_expression, 2)
-
-/* An argument deduction constraint determines if the type of an
-   expression E can be deduced from a type pattern T. Note that
-   T must contain at least one place holder.
-
-   DEDUCT_CONSTR_EXPR has the expression E
-   DEDUCT_CONSTR_PATTERN has the type pattern T.
-   DEDUCT_CONSTR_PLACEHOLDERS has the list of placeholder nodes in T. */
-DEFTREECODE (DEDUCT_CONSTR, "deduct_constr", tcc_expression, 3)
-
-/* An exception constraint determines if, for an expression E,
-   noexcept(E) is true.
-
-   EXCEPT_CONSTR_EXPR has the expression E. */
-DEFTREECODE (EXCEPT_CONSTR, "except_constr", tcc_expression, 1)
-
-/* A parameterized constraint declares constraint variables, which
-   are used in expression, type, and exception constraints.
-
-   PARM_CONSTR_PARMS has a TREE_LIST of parameter declarations.
-   PARM_CONSTR_OPERAND has the nested constraint. */
-DEFTREECODE (PARM_CONSTR, "parm_constr", tcc_expression, 2)
-
-/* The conjunction and disjunction of two constraints, respectively.
-   Operands are accessed using TREE_OPERAND. */
-DEFTREECODE (CONJ_CONSTR, "conj_constr", tcc_expression, 2)
-DEFTREECODE (DISJ_CONSTR, "disj_constr", tcc_expression, 2)
-
-
 /*
 Local variables:
 mode:c
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index b82b580..9ff617b 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1522,9 +1522,37 @@ check_constraint_info (tree t)
 #define PLACEHOLDER_TYPE_CONSTRAINTS(NODE) \
   DECL_SIZE_UNIT (TYPE_NAME (NODE))
 
-/* The expression evaluated by the predicate constraint. */
-#define PRED_CONSTR_EXPR(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, PRED_CONSTR), 0)
+/* Valid for any normalized constraint.  */
+#define CONSTR_CHECK(NODE) \
+  TREE_CHECK3 (NODE, ATOMIC_CONSTR, CONJ_CONSTR, DISJ_CONSTR)
+
+/* The CONSTR_INFO stores normalization data for a constraint. It refers to
+   the original expression and the expression or declaration
+   from which the constraint was normalized.
+
+   This is TREE_LIST whose TREE_PURPOSE is the original expression and whose
+   TREE_VALUE is a list of contexts.  */
+#define CONSTR_INFO(NODE) \
+  TREE_TYPE (CONSTR_CHECK (NODE))
+
+/* The expression evaluated by the constraint.  */
+#define CONSTR_EXPR(NODE) \
+  TREE_PURPOSE (CONSTR_INFO (NODE))
+
+/* The expression or declaration from which this constraint was normalized.
+   This is a TREE_LIST whose TREE_VALUE is either a template-id expression
+   denoting a concept check or the declaration introducing the constraint.
+   These are chained to other context objects.  */
+#define CONSTR_CONTEXT(NODE) \
+  TREE_VALUE (CONSTR_INFO (NODE))
+
+/* The parameter mapping for an atomic constraint. */
+#define ATOMIC_CONSTR_MAP(NODE) \
+  TREE_OPERAND (TREE_CHECK (NODE, ATOMIC_CONSTR), 0)
+
+/* The expression of an atomic constraint. */
+#define ATOMIC_CONSTR_EXPR(NODE) \
+  CONSTR_EXPR (ATOMIC_CONSTR_CHECK (NODE))
 
 /* The concept of a concept check. */
 #define CHECK_CONSTR_CONCEPT(NODE) \
@@ -1534,46 +1562,6 @@ check_constraint_info (tree t)
 #define CHECK_CONSTR_ARGS(NODE) \
   TREE_OPERAND (TREE_CHECK (NODE, CHECK_CONSTR), 1)
 
-/* The expression validated by the predicate constraint. */
-#define EXPR_CONSTR_EXPR(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, EXPR_CONSTR), 0)
-
-/* The type validated by the predicate constraint. */
-#define TYPE_CONSTR_TYPE(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, TYPE_CONSTR), 0)
-
-/* In an implicit conversion constraint, the source expression. */
-#define ICONV_CONSTR_EXPR(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, ICONV_CONSTR), 0)
-
-/* In an implicit conversion constraint, the target type. */
-#define ICONV_CONSTR_TYPE(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, ICONV_CONSTR), 1)
-
-/* In an argument deduction constraint, the source expression. */
-#define DEDUCT_CONSTR_EXPR(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, DEDUCT_CONSTR), 0)
-
-/* In an argument deduction constraint, the target type pattern. */
-#define DEDUCT_CONSTR_PATTERN(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, DEDUCT_CONSTR), 1)
-
-/* In an argument deduction constraint, the list of placeholder nodes. */
-#define DEDUCT_CONSTR_PLACEHOLDER(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, DEDUCT_CONSTR), 2)
-
-/* The expression of an exception constraint. */
-#define EXCEPT_CONSTR_EXPR(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, EXCEPT_CONSTR), 0)
-
-/* In a parameterized constraint, the local parameters. */
-#define PARM_CONSTR_PARMS(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, PARM_CONSTR), 0)
-
-/* In a parameterized constraint, the operand. */
-#define PARM_CONSTR_OPERAND(NODE) \
-  TREE_OPERAND (TREE_CHECK (NODE, PARM_CONSTR), 1)
-
 /* Whether a PARM_DECL represents a local parameter in a
    requires-expression.  */
 #define CONSTRAINT_VAR_P(NODE) \
@@ -1663,6 +1651,7 @@ struct GTY(()) saved_scope {
 
   int x_processing_template_decl;
   int x_processing_specialization;
+  int x_processing_constraint;
   int suppress_location_wrappers;
   BOOL_BITFIELD x_processing_explicit_instantiation : 1;
   BOOL_BITFIELD need_pop_function_context : 1;
@@ -2627,7 +2616,8 @@ struct GTY(()) lang_decl_base {
    || TREE_CODE (NODE) == CONST_DECL		\
    || TREE_CODE (NODE) == TYPE_DECL		\
    || TREE_CODE (NODE) == TEMPLATE_DECL		\
-   || TREE_CODE (NODE) == USING_DECL)
+   || TREE_CODE (NODE) == USING_DECL            \
+   || TREE_CODE (NODE) == CONCEPT_DECL)
 
 /* DECL_LANG_SPECIFIC for the above codes.  */
 
@@ -3358,6 +3348,33 @@ struct GTY(()) lang_decl {
 #define TEMPLATE_DECL_COMPLEX_ALIAS_P(NODE) \
   DECL_LANG_FLAG_2 (TEMPLATE_DECL_CHECK (NODE))
 
+/* Returns t iff the node can have a TEMPLATE_INFO field.  */
+
+inline tree
+template_info_decl_check (const_tree t, const char* f, int l, const char* fn)
+{
+  switch (TREE_CODE (t))
+    {
+    case VAR_DECL:
+    case FUNCTION_DECL:
+    case FIELD_DECL:
+    case TYPE_DECL:
+    case CONCEPT_DECL:
+    case TEMPLATE_DECL:
+      return const_cast<tree>(t);
+    default:
+      break;
+    }
+  tree_check_failed (t, f, l, fn,
+                     VAR_DECL, FUNCTION_DECL, FIELD_DECL, TYPE_DECL,
+                     CONCEPT_DECL, TEMPLATE_DECL, 0);
+  gcc_unreachable ();
+}
+
+
+#define TEMPLATE_INFO_DECL_CHECK(NODE) \
+  template_info_decl_check ((NODE), __FILE__, __LINE__, __FUNCTION__)
+
 /* Nonzero for a type which is an alias for another type; i.e, a type
    which declaration was written 'using name-of-type =
    another-type'.  */
@@ -3367,8 +3384,8 @@ struct GTY(()) lang_decl {
    && TREE_CODE (TYPE_NAME (NODE)) == TYPE_DECL	\
    && TYPE_DECL_ALIAS_P (TYPE_NAME (NODE)))
 
-/* If non-NULL for a VAR_DECL, FUNCTION_DECL, TYPE_DECL or
-   TEMPLATE_DECL, the entity is either a template specialization (if
+/* If non-NULL for a VAR_DECL, FUNCTION_DECL, TYPE_DECL, TEMPLATE_DECL,
+   or CONCEPT_DECL, the entity is either a template specialization (if
    DECL_USE_TEMPLATE is nonzero) or the abstract instance of the
    template itself.
 
@@ -3387,7 +3404,7 @@ struct GTY(()) lang_decl {
    global function f.  In this case, DECL_TEMPLATE_INFO for S<int>::f
    will be non-NULL, but DECL_USE_TEMPLATE will be zero.  */
 #define DECL_TEMPLATE_INFO(NODE) \
-  (DECL_LANG_SPECIFIC (VAR_TEMPL_TYPE_FIELD_OR_FUNCTION_DECL_CHECK (NODE)) \
+  (DECL_LANG_SPECIFIC (TEMPLATE_INFO_DECL_CHECK (NODE)) \
    ->u.min.template_info)
 
 /* For a lambda capture proxy, its captured variable.  */
@@ -5222,6 +5239,8 @@ enum tsubst_flags {
 				declaration.  */
   tf_no_cleanup = 1 << 10,   /* Do not build a cleanup
 				(build_target_expr and friends) */
+  tf_norm = 1 << 11,		 /* Build diagnostic information during
+				    constraint normalization.  */
   /* Convenient substitution flags combinations.  */
   tf_warning_or_error = tf_warning | tf_error
 };
@@ -6121,43 +6140,6 @@ class_of_this_parm (const_tree fntype)
   return TREE_TYPE (type_of_this_parm (fntype));
 }
 
-/* True iff T is a variable template declaration. */
-inline bool
-variable_template_p (tree t)
-{
-  if (TREE_CODE (t) != TEMPLATE_DECL)
-    return false;
-  if (!PRIMARY_TEMPLATE_P (t))
-    return false;
-  if (tree r = DECL_TEMPLATE_RESULT (t))
-    return VAR_P (r);
-  return false;
-}
-
-/* True iff T is a variable concept definition. That is, T is
-   a variable template declared with the concept specifier. */
-inline bool
-variable_concept_p (tree t)
-{
-  if (TREE_CODE (t) != TEMPLATE_DECL)
-    return false;
-  if (tree r = DECL_TEMPLATE_RESULT (t))
-    return VAR_P (r) && DECL_DECLARED_CONCEPT_P (r);
-  return false;
-}
-
-/* True iff T is a concept definition. That is, T is a variable or function
-   template declared with the concept specifier. */
-inline bool
-concept_template_p (tree t)
-{
-  if (TREE_CODE (t) != TEMPLATE_DECL)
-    return false;
-  if (tree r = DECL_TEMPLATE_RESULT (t))
-    return VAR_OR_FUNCTION_DECL_P (r) && DECL_DECLARED_CONCEPT_P (r);
-  return false;
-}
-
 /* A parameter list indicating for a function with no parameters,
    e.g  "int f(void)".  */
 extern cp_parameter_declarator *no_parameters;
@@ -6614,6 +6596,9 @@ extern void finish_eh_spec_block		(tree, tree);
 extern tree build_eh_type_type			(tree);
 extern tree cp_protect_cleanup_actions		(void);
 extern tree create_try_catch_expr               (tree, tree);
+extern tree template_parms_to_args		(tree);
+extern tree template_parms_level_to_args	(tree);
+extern tree generic_targs_for			(tree);
 
 /* in expr.c */
 extern tree cplus_expand_constant		(tree);
@@ -6747,6 +6732,8 @@ extern void maybe_show_extern_c_location (void);
 extern bool literal_integer_zerop (const_tree);
 
 /* in pt.c */
+extern void push_access_scope			(tree);
+extern void pop_access_scope			(tree);
 extern bool check_template_shadow		(tree);
 extern bool check_auto_in_tmpl_args             (tree, tree);
 extern tree get_innermost_template_args		(tree, int);
@@ -6766,6 +6753,8 @@ extern int num_template_headers_for_class	(tree);
 extern void check_template_variable		(tree);
 extern tree make_auto				(void);
 extern tree make_decltype_auto			(void);
+extern tree make_constrained_auto		(tree, tree);
+extern tree make_constrained_decltype_auto	(tree, tree);
 extern tree make_template_placeholder		(tree);
 extern bool template_placeholder_p		(tree);
 extern tree do_auto_deduction                   (tree, tree, tree,
@@ -6792,6 +6781,7 @@ extern bool check_default_tmpl_args             (tree, tree, bool, bool, int);
 extern tree push_template_decl			(tree);
 extern tree push_template_decl_real		(tree, bool);
 extern tree add_inherited_template_parms	(tree, tree);
+extern void template_parm_level_and_index	(tree, int*, int*);
 extern bool redeclare_class_template		(tree, tree, tree);
 extern tree lookup_template_class		(tree, tree, tree, tree,
 						 int, tsubst_flags_t);
@@ -6816,6 +6806,7 @@ extern bool always_instantiate_p		(tree);
 extern bool maybe_instantiate_noexcept		(tree, tsubst_flags_t = tf_warning_or_error);
 extern tree instantiate_decl			(tree, bool, bool);
 extern int comp_template_parms			(const_tree, const_tree);
+extern bool template_heads_equivalent_p		(const_tree, const_tree);
 extern bool builtin_pack_fn_p			(tree);
 extern tree uses_parameter_packs                (tree);
 extern bool template_parameter_pack_p           (const_tree);
@@ -6844,7 +6835,11 @@ extern tree tsubst_copy_and_build		(tree, tree, tsubst_flags_t,
 						 tree, bool, bool);
 extern tree tsubst_expr                         (tree, tree, tsubst_flags_t,
                                                  tree, bool);
-extern tree tsubst_pack_expansion               (tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_pack_expansion		(tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_argument_pack		(tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_template_args		(tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_template_arg			(tree, tree, tsubst_flags_t, tree);
+extern tree tsubst_function_parms		(tree, tree, tsubst_flags_t, tree);
 extern tree most_general_template		(tree);
 extern tree get_mostly_instantiated_function_type (tree);
 extern bool problematic_instantiation_changed	(void);
@@ -6913,6 +6908,7 @@ extern bool deduction_guide_p			(const_tree);
 extern bool copy_guide_p			(const_tree);
 extern bool template_guide_p			(const_tree);
 extern void store_explicit_specifier		(tree, tree);
+extern tree add_outermost_template_args		(tree, tree);
 
 /* in rtti.c */
 /* A vector of all tinfo decls that haven't been emitted yet.  */
@@ -7077,7 +7073,9 @@ extern tree finish_asm_stmt			(location_t, int, tree, tree,
 extern tree finish_label_stmt			(tree);
 extern void finish_label_decl			(tree);
 extern cp_expr finish_parenthesized_expr	(cp_expr);
-extern tree force_paren_expr			(tree);
+extern tree force_paren_expr			(tree, bool = false);
+inline tree force_paren_expr_uneval 		(tree t)
+{ return force_paren_expr (t, true); }
 extern tree maybe_undo_parenthesized_ref	(tree);
 extern tree maybe_strip_ref_conversion		(tree);
 extern tree finish_non_static_data_member       (tree, tree, tree);
@@ -7661,69 +7659,97 @@ typedef void cp_binding_oracle_function (enum cp_oracle_request, tree identifier
 
 extern cp_binding_oracle_function *cp_binding_oracle;
 
+/* Set during diagnostics to record the failed constraint. This is a
+   TREE_LIST whose VALUE is the constraint and whose PURPOSE are the
+   instantiation arguments Defined in pt.c.  */
+
+extern tree current_failed_constraint;
+
+/* An RAII class to manage the failed constraint.  */
+
+struct diagnosing_failed_constraint
+{
+  diagnosing_failed_constraint (tree, tree, bool);
+  ~diagnosing_failed_constraint ();
+
+  bool diagnosing_error;
+};
+
 /* in constraint.cc */
-extern void init_constraint_processing          ();
-extern bool constraint_p                        (tree);
-extern tree conjoin_constraints                 (tree, tree);
-extern tree conjoin_constraints                 (tree);
+
+extern void init_constraint_processing		();
+extern cp_expr finish_constraint_or_expr	(location_t, cp_expr, cp_expr);
+extern cp_expr finish_constraint_and_expr	(location_t, cp_expr, cp_expr);
+extern cp_expr finish_constraint_primary_expr	(cp_expr);
+extern tree finish_concept_definition		(cp_expr, tree);
+extern tree combine_constraint_expressions      (tree, tree);
 extern tree get_constraints                     (tree);
 extern void set_constraints                     (tree, tree);
 extern void remove_constraints                  (tree);
 extern tree current_template_constraints	(void);
 extern tree associate_classtype_constraints     (tree);
 extern tree build_constraints                   (tree, tree);
+extern tree get_template_head_requirements	(tree);
+extern tree get_trailing_function_requirements	(tree);
 extern tree get_shorthand_constraints           (tree);
-extern tree build_concept_check                 (tree, tree, tree = NULL_TREE);
+
+extern tree build_concept_id			(tree);
+extern tree build_type_constraint		(tree, tree, tsubst_flags_t);
+extern tree build_concept_check                 (tree, tree, tsubst_flags_t);
+extern tree build_concept_check                 (tree, tree, tree, tsubst_flags_t);
+
+extern tree_pair finish_type_constraints	(tree, tree, tsubst_flags_t);
 extern tree build_constrained_parameter         (tree, tree, tree = NULL_TREE);
-extern tree make_constrained_auto               (tree, tree);
 extern void placeholder_extract_concept_and_args (tree, tree&, tree&);
 extern bool equivalent_placeholder_constraints  (tree, tree);
 extern hashval_t hash_placeholder_constraint	(tree);
 extern bool deduce_constrained_parameter        (tree, tree&, tree&);
 extern tree resolve_constraint_check            (tree);
 extern tree check_function_concept              (tree);
-extern tree finish_template_introduction        (tree, tree);
+extern tree finish_template_introduction        (tree, tree, location_t loc);
 extern bool valid_requirements_p                (tree);
 extern tree finish_concept_name                 (tree);
 extern tree finish_shorthand_constraint         (tree, tree);
-extern tree finish_requires_expr                (tree, tree);
-extern tree finish_simple_requirement           (tree);
-extern tree finish_type_requirement             (tree);
-extern tree finish_compound_requirement         (tree, tree, bool);
-extern tree finish_nested_requirement           (tree);
+extern tree finish_requires_expr                (location_t, tree, tree);
+extern tree finish_simple_requirement           (location_t, tree);
+extern tree finish_type_requirement             (location_t, tree);
+extern tree finish_compound_requirement         (location_t, tree, tree, bool);
+extern tree finish_nested_requirement           (location_t, tree);
 extern void check_constrained_friend            (tree, tree);
 extern tree tsubst_requires_expr                (tree, tree, tsubst_flags_t, tree);
 extern tree tsubst_constraint                   (tree, tree, tsubst_flags_t, tree);
 extern tree tsubst_constraint_info              (tree, tree, tsubst_flags_t, tree);
-extern bool function_concept_check_p            (tree);
-extern tree normalize_expression                (tree);
-extern tree expand_concept                      (tree, tree);
-extern bool expanding_concept                   ();
-extern tree evaluate_constraints                (tree, tree);
-extern tree evaluate_function_concept           (tree, tree);
-extern tree evaluate_variable_concept           (tree, tree);
-extern tree evaluate_constraint_expression      (tree, tree);
+extern tree tsubst_parameter_mapping		(tree, tree, tsubst_flags_t, tree);
+extern tree get_mapped_args			(tree);
+
+struct processing_constraint_expression_sentinel
+{
+  processing_constraint_expression_sentinel ();
+  ~processing_constraint_expression_sentinel ();
+};
+
+extern bool processing_constraint_expression_p	();
+
+extern tree unpack_concept_check		(tree);
+extern tree evaluate_concept_check              (tree, tsubst_flags_t);
+extern tree satisfy_constraint_expression	(tree);
 extern bool constraints_satisfied_p             (tree);
 extern bool constraints_satisfied_p             (tree, tree);
-extern tree lookup_constraint_satisfaction      (tree, tree);
-extern tree memoize_constraint_satisfaction     (tree, tree, tree);
-extern tree lookup_concept_satisfaction         (tree, tree);
-extern tree memoize_concept_satisfaction        (tree, tree, tree);
-extern tree get_concept_expansion               (tree, tree);
-extern tree save_concept_expansion              (tree, tree, tree);
+extern void clear_satisfaction_cache		();
 extern bool* lookup_subsumption_result          (tree, tree);
 extern bool save_subsumption_result             (tree, tree, bool);
-
+extern tree find_template_parameters		(tree, int);
 extern bool equivalent_constraints              (tree, tree);
 extern bool equivalently_constrained            (tree, tree);
 extern bool subsumes_constraints                (tree, tree);
-extern bool strictly_subsumes			(tree, tree);
+extern bool strictly_subsumes			(tree, tree, tree);
+extern bool weakly_subsumes			(tree, tree, tree);
 extern int more_constrained                     (tree, tree);
-
+extern bool atomic_constraints_identical_p	(tree, tree);
+extern hashval_t hash_atomic_constraint		(tree);
 extern void diagnose_constraints                (location_t, tree, tree);
 
 /* in logic.cc */
-extern tree decompose_conclusions               (tree);
 extern bool subsumes                            (tree, tree);
 
 /* In class.c */
@@ -7773,7 +7799,7 @@ extern bool var_in_maybe_constexpr_fn           (tree);
 extern void explain_invalid_constexpr_fn        (tree);
 extern vec<tree> cx_error_context               (void);
 extern tree fold_sizeof_expr			(tree);
-extern void clear_cv_and_fold_caches		(void);
+extern void clear_cv_and_fold_caches		(bool = true);
 extern tree unshare_constructor			(tree CXX_MEM_STAT_INFO);
 
 /* In cp-ubsan.c */
@@ -7820,6 +7846,104 @@ null_node_p (const_tree expr)
   return expr == null_node;
 }
 
+/* True iff T is a variable template declaration. */
+inline bool
+variable_template_p (tree t)
+{
+  if (TREE_CODE (t) != TEMPLATE_DECL)
+    return false;
+  if (!PRIMARY_TEMPLATE_P (t))
+    return false;
+  if (tree r = DECL_TEMPLATE_RESULT (t))
+    return VAR_P (r);
+  return false;
+}
+
+/* True iff T is a standard concept definition. This will return
+   true for both the template and underlying declaration.  */
+
+inline bool
+standard_concept_p (tree t)
+{
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+  return TREE_CODE (t) == CONCEPT_DECL;
+}
+
+/* True iff T is a variable concept definition. This will return
+   true for both the template and the underlying declaration.  */
+
+inline bool
+variable_concept_p (tree t)
+{
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+  return VAR_P (t) && DECL_DECLARED_CONCEPT_P (t);
+}
+
+/* True iff T is a function concept definition or an overload set
+   containing multiple function concepts. This will return true for
+   both the template and the underlying declaration.  */
+
+inline bool
+function_concept_p (tree t)
+{
+  if (TREE_CODE (t) == OVERLOAD)
+    t = OVL_FIRST (t);
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+  return TREE_CODE (t) == FUNCTION_DECL && DECL_DECLARED_CONCEPT_P (t);
+}
+
+/* True iff T is a standard, variable, or function concept.  */
+
+inline bool
+concept_definition_p (tree t)
+{
+  if (t == error_mark_node)
+    return false;
+
+  /* Adjust for function concept overloads.  */
+  if (TREE_CODE (t) == OVERLOAD)
+    t = OVL_FIRST (t);
+
+  /* See through templates. */
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+
+  /* The obvious and easy case.  */
+  if (TREE_CODE (t) == CONCEPT_DECL)
+    return true;
+
+  /* Definitely not a concept.  */
+  if (!VAR_OR_FUNCTION_DECL_P (t))
+    return false;
+  if (!DECL_LANG_SPECIFIC (t))
+    return false;
+
+  return DECL_DECLARED_CONCEPT_P (t);
+}
+
+/* Same as above, but for const trees.  */
+
+inline bool
+concept_definition_p (const_tree t)
+{
+  return concept_definition_p (const_cast<tree> (t));
+}
+
+/* True if t is an expression that checks a concept.  */
+
+inline bool
+concept_check_p (const_tree t)
+{
+  if (TREE_CODE (t) == CALL_EXPR)
+    t = CALL_EXPR_FN (t);
+  if (t && TREE_CODE (t) == TEMPLATE_ID_EXPR)
+    return concept_definition_p (TREE_OPERAND (t, 0));
+  return false;
+}
+
 #if CHECKING_P
 namespace selftest {
   extern void run_cp_tests (void);
diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index 038f300..2a129a3 100644
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -38,6 +38,7 @@ static void pp_cxx_typeid_expression (cxx_pretty_printer *, tree);
 static void pp_cxx_unary_left_fold_expression (cxx_pretty_printer *, tree);
 static void pp_cxx_unary_right_fold_expression (cxx_pretty_printer *, tree);
 static void pp_cxx_binary_fold_expression (cxx_pretty_printer *, tree);
+static void pp_cxx_concept_definition (cxx_pretty_printer *, tree);
 
 
 static inline void
@@ -237,7 +238,14 @@ pp_cxx_template_keyword_if_needed (cxx_pretty_printer *pp, tree scope, tree t)
 static void
 pp_cxx_nested_name_specifier (cxx_pretty_printer *pp, tree t)
 {
-  if (!SCOPE_FILE_SCOPE_P (t) && t != pp->enclosing_scope)
+  /* FIXME: When diagnosing references to concepts (especially as types?)
+     we end up adding too many '::' to the name. This is partially due
+     to the fact that pp->enclosing_namespace is null.  */
+  if (t == global_namespace)
+    {
+      pp_cxx_colon_colon (pp);
+    }
+  else if (!SCOPE_FILE_SCOPE_P (t) && t != pp->enclosing_scope)
     {
       tree scope = get_containing_scope (t);
       pp_cxx_nested_name_specifier (pp, scope);
@@ -1214,7 +1222,7 @@ cxx_pretty_printer::expression (tree t)
 	  }
       }
       break;
-      
+
     case LAMBDA_EXPR:
       pp_cxx_ws_string (this, "<lambda>");
       break;
@@ -1223,14 +1231,8 @@ cxx_pretty_printer::expression (tree t)
       pp_cxx_trait_expression (this, t);
       break;
 
-    case PRED_CONSTR:
+    case ATOMIC_CONSTR:
     case CHECK_CONSTR:
-    case EXPR_CONSTR:
-    case TYPE_CONSTR:
-    case ICONV_CONSTR:
-    case DEDUCT_CONSTR:
-    case EXCEPT_CONSTR:
-    case PARM_CONSTR:
     case CONJ_CONSTR:
     case DISJ_CONSTR:
       pp_cxx_constraint (this, t);
@@ -1349,6 +1351,8 @@ cxx_pretty_printer::simple_type_specifier (tree t)
     case TEMPLATE_PARM_INDEX:
     case BOUND_TEMPLATE_TEMPLATE_PARM:
       pp_cxx_unqualified_id (this, t);
+      if (tree c = PLACEHOLDER_TYPE_CONSTRAINTS (t))
+        pp_cxx_constrained_type_spec (this, c);
       break;
 
     case TYPENAME_TYPE:
@@ -1876,7 +1880,7 @@ pp_cxx_template_argument_list (cxx_pretty_printer *pp, tree t)
 	{
 	  if (argpack)
 	    arg = TREE_VEC_ELT (argpack, idx);
-	  
+
 	  if (need_comma)
 	    pp_cxx_separate_with (pp, ',');
 	  else
@@ -2302,24 +2306,28 @@ pp_cxx_canonical_template_parameter (cxx_pretty_printer *pp, tree parm)
 void
 pp_cxx_constrained_type_spec (cxx_pretty_printer *pp, tree c)
 {
-  tree t, a;
+  pp_cxx_whitespace (pp);
+  pp_cxx_left_bracket (pp);
+  pp->translate_string ("requires");
+  pp_cxx_whitespace (pp);
   if (c == error_mark_node)
     {
-      pp_cxx_ws_string(pp, "<unsatisfied-constrained-placeholder>");
+      pp_cxx_ws_string(pp, "<unsatisfied-type-constraint>");
       return;
     }
+  tree t, a;
   placeholder_extract_concept_and_args (c, t, a);
   pp->id_expression (t);
-  if (TREE_VEC_LENGTH (a) > 1)
-    {
-      pp_cxx_begin_template_argument_list (pp);
-      tree args = make_tree_vec (TREE_VEC_LENGTH (a) - 1);
-      for (int i = TREE_VEC_LENGTH (a) - 1; i > 0; --i)
-	TREE_VEC_ELT (args, i-1) = TREE_VEC_ELT (a, i);
-      pp_cxx_template_argument_list (pp, args);
-      ggc_free (args);
-      pp_cxx_end_template_argument_list (pp);
-    }
+  pp_cxx_begin_template_argument_list (pp);
+  pp_cxx_ws_string (pp, "<placeholder>");
+  pp_cxx_separate_with (pp, ',');
+  tree args = make_tree_vec (TREE_VEC_LENGTH (a) - 1);
+  for (int i = 0; i < TREE_VEC_LENGTH (a) - 1; ++i)
+    TREE_VEC_ELT (args, i) = TREE_VEC_ELT (a, i + 1);
+  pp_cxx_template_argument_list (pp, args);
+  ggc_free (args);
+  pp_cxx_end_template_argument_list (pp);
+  pp_cxx_right_bracket (pp);
 }
 
 /*
@@ -2358,6 +2366,8 @@ pp_cxx_template_declaration (cxx_pretty_printer *pp, tree t)
 
   if (TREE_CODE (t) == FUNCTION_DECL && DECL_SAVED_TREE (t))
     pp_cxx_function_definition (pp, t);
+  else if (TREE_CODE (t) == CONCEPT_DECL)
+    pp_cxx_concept_definition (pp, t);
   else
     pp_cxx_simple_declaration (pp, t);
 }
@@ -2374,6 +2384,17 @@ pp_cxx_explicit_instantiation (cxx_pretty_printer *pp, tree t)
   pp_unsupported_tree (pp, t);
 }
 
+static void
+pp_cxx_concept_definition (cxx_pretty_printer *pp, tree t)
+{
+  pp_cxx_unqualified_id (pp, DECL_NAME (t));
+  pp_cxx_whitespace (pp);
+  pp_cxx_ws_string (pp, "=");
+  pp_cxx_whitespace (pp);
+  pp->expression (DECL_INITIAL (t));
+  pp_cxx_semicolon (pp);
+}
+
 /*
     declaration:
        block-declaration
@@ -2841,6 +2862,7 @@ pp_cxx_compound_requirement (cxx_pretty_printer *pp, tree t)
 
   if (tree type = TREE_OPERAND (t, 1))
     {
+      pp_cxx_whitespace (pp);
       pp_cxx_ws_string (pp, "->");
       pp->type_id (type);
     }
@@ -2858,12 +2880,6 @@ pp_cxx_nested_requirement (cxx_pretty_printer *pp, tree t)
 }
 
 void
-pp_cxx_predicate_constraint (cxx_pretty_printer *pp, tree t)
-{
-  pp->expression (TREE_OPERAND (t, 0));
-}
-
-void
 pp_cxx_check_constraint (cxx_pretty_printer *pp, tree t)
 {
   tree decl = CHECK_CONSTR_CONCEPT (t);
@@ -2871,7 +2887,9 @@ pp_cxx_check_constraint (cxx_pretty_printer *pp, tree t)
   tree args = CHECK_CONSTR_ARGS (t);
   tree id = build_nt (TEMPLATE_ID_EXPR, tmpl, args);
 
-  if (VAR_P (decl))
+  if (TREE_CODE (decl) == CONCEPT_DECL)
+    pp->expression (id);
+  else if (VAR_P (decl))
     pp->expression (id);
   else if (TREE_CODE (decl) == FUNCTION_DECL)
     {
@@ -2884,77 +2902,60 @@ pp_cxx_check_constraint (cxx_pretty_printer *pp, tree t)
     gcc_unreachable ();
 }
 
-void
-pp_cxx_expression_constraint (cxx_pretty_printer *pp, tree t)
-{
-  pp_string (pp, "<valid-expression ");
-  pp_cxx_left_paren (pp);
-  pp->expression (TREE_OPERAND (t, 0));
-  pp_cxx_right_paren (pp);
-  pp_string (pp, ">");
-}
+/* Output the "[with ...]" clause for a parameter mapping of an atomic
+   constraint.   */
 
-void
-pp_cxx_type_constraint (cxx_pretty_printer *pp, tree t)
+static void
+pp_cxx_parameter_mapping (cxx_pretty_printer *pp, tree map)
 {
-  pp_string (pp, "<valid-type ");
-  pp->type_id (TREE_OPERAND (t, 0));
-  pp_string (pp, ">");
-}
+  for (tree p = map; p; p = TREE_CHAIN (p))
+    {
+      tree parm = TREE_VALUE (p);
+      tree arg = TREE_PURPOSE (p);
 
-void
-pp_cxx_implicit_conversion_constraint (cxx_pretty_printer *pp, tree t)
-{
-  pp_string (pp, "<implicitly-conversion ");
-  pp_cxx_left_paren (pp);
-  pp->expression (ICONV_CONSTR_EXPR (t));
-  pp_cxx_right_paren (pp);
-  pp_cxx_ws_string (pp, "to");
-  pp->type_id (ICONV_CONSTR_TYPE (t));
-  pp_string (pp, ">");
-}
+      if (TYPE_P (parm))
+	pp->type_id (parm);
+      else
+	pp_cxx_tree_identifier (pp, DECL_NAME (TEMPLATE_PARM_DECL (parm)));
 
-void
-pp_cxx_argument_deduction_constraint (cxx_pretty_printer *pp, tree t)
-{
-  pp_string (pp, "<argument-deduction ");
-  pp_cxx_left_paren (pp);
-  pp->expression (DEDUCT_CONSTR_EXPR (t));
-  pp_cxx_right_paren (pp);
-  pp_cxx_ws_string (pp, "as");
-  pp->expression (DEDUCT_CONSTR_PATTERN (t));
-  pp_string (pp, ">");
-}
+      pp_cxx_whitespace (pp);
+      pp_equal (pp);
+      pp_cxx_whitespace (pp);
 
-void
-pp_cxx_exception_constraint (cxx_pretty_printer *pp, tree t)
-{
-  pp_cxx_ws_string (pp, "noexcept");
-  pp_cxx_whitespace (pp);
-  pp_cxx_left_paren (pp);
-  pp->expression (TREE_OPERAND (t, 0));
-  pp_cxx_right_paren (pp);
+      if (TYPE_P (arg) || DECL_TEMPLATE_TEMPLATE_PARM_P (arg))
+	pp->type_id (arg);
+      else
+	pp->expression (arg);
+
+      if (TREE_CHAIN (p) != NULL_TREE)
+	pp_cxx_separate_with (pp, ';');
+    }
 }
 
 void
-pp_cxx_parameterized_constraint (cxx_pretty_printer *pp, tree t)
+pp_cxx_atomic_constraint (cxx_pretty_printer *pp, tree t)
 {
-  pp_left_paren (pp);
-  pp_string (pp, "<requires ");
-  if (tree parms = PARM_CONSTR_PARMS (t))
+  /* Emit the expression.  */
+  pp->expression (ATOMIC_CONSTR_EXPR (t));
+
+  /* Emit the parameter mapping.  */
+  tree map = ATOMIC_CONSTR_MAP (t);
+  if (map && map != error_mark_node)
     {
-	pp_cxx_parameter_declaration_clause (pp, parms);
       pp_cxx_whitespace (pp);
-    }
-  pp_cxx_constraint (pp, PARM_CONSTR_OPERAND (t));
-  pp_string (pp, ">");
+      pp_cxx_left_bracket (pp);
+      pp->translate_string ("with");
+      pp_cxx_whitespace (pp);
+      pp_cxx_parameter_mapping (pp, map);
+      pp_cxx_right_bracket (pp);
+   }
 }
 
 void
 pp_cxx_conjunction (cxx_pretty_printer *pp, tree t)
 {
   pp_cxx_constraint (pp, TREE_OPERAND (t, 0));
-  pp_string (pp, " and ");
+  pp_string (pp, " /\\ ");
   pp_cxx_constraint (pp, TREE_OPERAND (t, 1));
 }
 
@@ -2962,7 +2963,7 @@ void
 pp_cxx_disjunction (cxx_pretty_printer *pp, tree t)
 {
   pp_cxx_constraint (pp, TREE_OPERAND (t, 0));
-  pp_string (pp, " or ");
+  pp_string (pp, " \\/ ");
   pp_cxx_constraint (pp, TREE_OPERAND (t, 1));
 }
 
@@ -2974,38 +2975,14 @@ pp_cxx_constraint (cxx_pretty_printer *pp, tree t)
 
   switch (TREE_CODE (t))
     {
-    case PRED_CONSTR:
-      pp_cxx_predicate_constraint (pp, t);
+    case ATOMIC_CONSTR:
+      pp_cxx_atomic_constraint (pp, t);
       break;
 
     case CHECK_CONSTR:
       pp_cxx_check_constraint (pp, t);
       break;
 
-    case EXPR_CONSTR:
-      pp_cxx_expression_constraint (pp, t);
-      break;
-
-    case TYPE_CONSTR:
-      pp_cxx_type_constraint (pp, t);
-      break;
-
-    case ICONV_CONSTR:
-      pp_cxx_implicit_conversion_constraint (pp, t);
-      break;
-
-    case DEDUCT_CONSTR:
-      pp_cxx_argument_deduction_constraint (pp, t);
-      break;
-
-    case EXCEPT_CONSTR:
-      pp_cxx_exception_constraint (pp, t);
-      break;
-
-    case PARM_CONSTR:
-      pp_cxx_parameterized_constraint (pp, t);
-      break;
-
     case CONJ_CONSTR:
       pp_cxx_conjunction (pp, t);
       break;
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 72c02af..6f4c589 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -920,6 +920,31 @@ determine_local_discriminator (tree decl)
 }
 
 
+
+/* Returns true if functions FN1 and FN2 have equivalent trailing
+   requires clauses.  */
+
+static bool
+function_requirements_equivalent_p (tree newfn, tree oldfn)
+{
+  /* In the concepts TS, the combined constraints are compared.  */
+  if (cxx_dialect < cxx2a)
+    {
+      tree ci1 = get_constraints (oldfn);
+      tree ci2 = get_constraints (newfn);
+      tree req1 = ci1 ? CI_ASSOCIATED_CONSTRAINTS (ci1) : NULL_TREE;
+      tree req2 = ci2 ? CI_ASSOCIATED_CONSTRAINTS (ci2) : NULL_TREE;
+      return cp_tree_equal (req1, req2);
+    }
+
+  /* Compare only trailing requirements.  */
+  tree reqs1 = get_trailing_function_requirements (newfn);
+  tree reqs2 = get_trailing_function_requirements (oldfn);
+  if ((reqs1 != NULL_TREE) != (reqs2 != NULL_TREE))
+    return false;
+  return cp_tree_equal (reqs1, reqs2);
+}
+
 /* Subroutine of duplicate_decls: return truthvalue of whether
    or not types of these decls match.
 
@@ -999,6 +1024,12 @@ decls_match (tree newdecl, tree olddecl, bool record_versions /* = true */)
       else
 	types_match = 0;
 
+      /* Two function declarations match if either has a requires-clause
+         then both have a requires-clause and their constraints-expressions
+         are equivalent.  */
+      if (types_match && flag_concepts)
+	types_match = function_requirements_equivalent_p (newdecl, olddecl);
+
       /* The decls dont match if they correspond to two different versions
 	 of the same function.   Disallow extern "C" functions to be
 	 versions for now.  */
@@ -1013,23 +1044,21 @@ decls_match (tree newdecl, tree olddecl, bool record_versions /* = true */)
     }
   else if (TREE_CODE (newdecl) == TEMPLATE_DECL)
     {
+      if (!template_heads_equivalent_p (newdecl, olddecl))
+	return 0;
+
       tree oldres = DECL_TEMPLATE_RESULT (olddecl);
       tree newres = DECL_TEMPLATE_RESULT (newdecl);
 
       if (TREE_CODE (newres) != TREE_CODE (oldres))
 	return 0;
 
-      if (!comp_template_parms (DECL_TEMPLATE_PARMS (newdecl),
-				DECL_TEMPLATE_PARMS (olddecl)))
-	return 0;
-
-      if (TREE_CODE (DECL_TEMPLATE_RESULT (newdecl)) == TYPE_DECL)
-	types_match = (same_type_p (TREE_TYPE (oldres), TREE_TYPE (newres))
-		       && equivalently_constrained (olddecl, newdecl));
+      /* Two template types match if they are the same. Otherwise, compare
+         the underlying declarations.  */
+      if (TREE_CODE (newres) == TYPE_DECL)
+        types_match = same_type_p (TREE_TYPE (newres), TREE_TYPE (oldres));
       else
-	// We don't need to check equivalently_constrained for variable and
-	// function templates because we check it on the results.
-	types_match = decls_match (oldres, newres);
+	types_match = decls_match (newres, oldres);
     }
   else
     {
@@ -1057,11 +1086,6 @@ decls_match (tree newdecl, tree olddecl, bool record_versions /* = true */)
 				 COMPARE_REDECLARATION);
     }
 
-  // Normal functions can be constrained, as can variable partial
-  // specializations.
-  if (types_match && VAR_OR_FUNCTION_DECL_P (newdecl))
-    types_match = equivalently_constrained (newdecl, olddecl);
-
   return types_match;
 }
 
@@ -1336,6 +1360,46 @@ merge_attribute_bits (tree newdecl, tree olddecl)
 			  && lookup_attribute ("gnu_inline",		\
 					       DECL_ATTRIBUTES (fn)))
 
+/* A subroutine of duplicate_decls. Emits a diagnostic when newdecl
+   ambiguates olddecl.  Returns true if an error occurs.  */
+
+static bool
+duplicate_function_template_decls (tree newdecl, tree olddecl)
+{
+
+  tree newres = DECL_TEMPLATE_RESULT (newdecl);
+  tree oldres = DECL_TEMPLATE_RESULT (olddecl);
+  /* Function template declarations can be differentiated by parameter
+     and return type.  */
+  if (compparms (TYPE_ARG_TYPES (TREE_TYPE (oldres)),
+		 TYPE_ARG_TYPES (TREE_TYPE (newres)))
+       && same_type_p (TREE_TYPE (TREE_TYPE (newdecl)),
+		       TREE_TYPE (TREE_TYPE (olddecl))))
+    {
+      /* ... and also by their template-heads and requires-clauses.  */
+      if (template_heads_equivalent_p (newdecl, olddecl)
+	  && function_requirements_equivalent_p (newres, oldres))
+	{
+	  error ("ambiguating new declaration %q+#D", newdecl);
+	  inform (DECL_SOURCE_LOCATION (olddecl),
+		  "old declaration %q#D", olddecl);
+	  return true;
+	}
+
+      /* FIXME: The types are the same but the are differences
+	 in either the template heads or function requirements.
+	 We should be able to diagnose a set of common errors
+	 stemming from these declarations. For example:
+
+	   template<typename T> requires C void f(...);
+	   template<typename T> void f(...) requires C;
+
+	 These are functionally equivalent but not equivalent.  */
+    }
+
+  return false;
+}
+
 /* If NEWDECL is a redeclaration of OLDDECL, merge the declarations.
    If the redeclaration is invalid, a diagnostic is issued, and the
    error_mark_node is returned.  Otherwise, OLDDECL is returned.
@@ -1644,11 +1708,14 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
 
       if (TREE_CODE (newdecl) == TEMPLATE_DECL)
 	{
+	  tree oldres = DECL_TEMPLATE_RESULT (olddecl);
+	  tree newres = DECL_TEMPLATE_RESULT (newdecl);
+
 	  /* The name of a class template may not be declared to refer to
 	     any other template, class, function, object, namespace, value,
 	     or type in the same scope.  */
-	  if (TREE_CODE (DECL_TEMPLATE_RESULT (olddecl)) == TYPE_DECL
-	      || TREE_CODE (DECL_TEMPLATE_RESULT (newdecl)) == TYPE_DECL)
+	  if (TREE_CODE (oldres) == TYPE_DECL
+	      || TREE_CODE (newres) == TYPE_DECL)
 	    {
 	      error_at (newdecl_loc,
 			"conflicting declaration of template %q#D", newdecl);
@@ -1656,24 +1723,13 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
 		      "previous declaration %q#D", olddecl);
 	      return error_mark_node;
 	    }
-	  else if (TREE_CODE (DECL_TEMPLATE_RESULT (olddecl)) == FUNCTION_DECL
-		   && TREE_CODE (DECL_TEMPLATE_RESULT (newdecl)) == FUNCTION_DECL
-		   && compparms (TYPE_ARG_TYPES (TREE_TYPE (DECL_TEMPLATE_RESULT (olddecl))),
-				 TYPE_ARG_TYPES (TREE_TYPE (DECL_TEMPLATE_RESULT (newdecl))))
-		   && comp_template_parms (DECL_TEMPLATE_PARMS (newdecl),
-					   DECL_TEMPLATE_PARMS (olddecl))
-		   /* Template functions can be disambiguated by
-		      return type.  */
-		   && same_type_p (TREE_TYPE (TREE_TYPE (newdecl)),
-				   TREE_TYPE (TREE_TYPE (olddecl)))
-                   /* Template functions can also be disambiguated by
-		      constraints.  */
-                   && equivalently_constrained (olddecl, newdecl))
+
+	  else if (TREE_CODE (oldres) == FUNCTION_DECL
+		   && TREE_CODE (newres) == FUNCTION_DECL)
 	    {
-	      error_at (newdecl_loc, "ambiguating new declaration %q#D",
-			newdecl);
-	      inform (olddecl_loc,
-		      "old declaration %q#D", olddecl);
+	      if (duplicate_function_template_decls (newdecl, olddecl))
+		return error_mark_node;
+	      return NULL_TREE;
 	    }
           else if (check_concept_refinement (olddecl, newdecl))
 	    return error_mark_node;
@@ -2916,6 +2972,9 @@ redeclaration_error_message (tree newdecl, tree olddecl)
 	  return NULL;
 	}
 
+      if (TREE_CODE (DECL_TEMPLATE_RESULT (newdecl)) == CONCEPT_DECL)
+        return G_("redefinition of %q#D");
+
       if (TREE_CODE (DECL_TEMPLATE_RESULT (newdecl)) != FUNCTION_DECL
 	  || (DECL_TEMPLATE_RESULT (newdecl)
 	      == DECL_TEMPLATE_RESULT (olddecl)))
@@ -8985,12 +9044,12 @@ grokfndecl (tree ctype,
       tree tmpl_reqs = NULL_TREE;
       if (processing_template_decl > template_class_depth (ctype))
         tmpl_reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
-
-      /* Adjust the required expression into a constraint. */
-      if (decl_reqs)
-        decl_reqs = normalize_expression (decl_reqs);
-
       tree ci = build_constraints (tmpl_reqs, decl_reqs);
+      if (concept_p && ci)
+        {
+          error_at (location, "a function concept cannot be constrained");
+          ci = NULL_TREE;
+        }
       set_constraints (decl, ci);
     }
 
@@ -9630,12 +9689,18 @@ grokvardecl (tree type,
       if (!same_type_ignoring_top_level_qualifiers_p (type, boolean_type_node))
 	error_at (declspecs->locations[ds_type_spec],
 		  "concept must have type %<bool%>");
+      if (TEMPLATE_PARMS_CONSTRAINTS (current_template_parms))
+        {
+          error_at (location, "a variable concept cannot be constrained");
+          TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = NULL_TREE;
+        }
     }
   else if (flag_concepts
 	   && processing_template_decl > template_class_depth (scope))
     {
       tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
       tree ci = build_constraints (reqs, NULL_TREE);
+
       set_constraints (decl, ci);
     }
 
@@ -12543,12 +12608,18 @@ grokdeclarator (const cp_declarator *declarator,
       if (ctype || in_namespace)
 	error ("cannot use %<::%> in parameter declaration");
 
-      if (type_uses_auto (type)
-	  && !(cxx_dialect >= cxx17 && template_parm_flag))
+      tree auto_node = type_uses_auto (type);
+      if (auto_node && !(cxx_dialect >= cxx17 && template_parm_flag))
 	{
 	  if (cxx_dialect >= cxx14)
-	    error_at (typespec_loc,
-		      "%<auto%> parameter not permitted in this context");
+	    {
+	      if (decl_context == PARM && AUTO_IS_DECLTYPE (auto_node))
+		error_at (typespec_loc,
+			  "cannot declare a parameter with %<decltype(auto)%>");
+	      else
+		error_at (typespec_loc,
+			  "%<auto%> parameter not permitted in this context");
+	    }
 	  else
 	    error_at (typespec_loc, "parameter declared %<auto%>");
 	  type = error_mark_node;
@@ -16362,8 +16433,17 @@ finish_function (bool inline_p)
   if (!processing_template_decl && FNDECL_USED_AUTO (fndecl)
       && TREE_TYPE (fntype) == DECL_SAVED_AUTO_RETURN_TYPE (fndecl))
     {
-      if (is_auto (DECL_SAVED_AUTO_RETURN_TYPE (fndecl)))
+      if (is_auto (DECL_SAVED_AUTO_RETURN_TYPE (fndecl))
+          && !current_function_returns_value
+          && !current_function_returns_null)
 	{
+	  /* We haven't applied return type deduction because we haven't
+             seen any return statements. Do that now.  */
+	  tree node = type_uses_auto (DECL_SAVED_AUTO_RETURN_TYPE (fndecl));
+	  do_auto_deduction (DECL_SAVED_AUTO_RETURN_TYPE (fndecl),
+			     void_node, node, tf_warning_or_error,
+                             adc_return_type);
+
 	  apply_deduced_return_type (fndecl, void_type_node);
 	  fntype = TREE_TYPE (fndecl);
 	}
@@ -16953,7 +17033,9 @@ require_deduced_type (tree decl, tsubst_flags_t complain)
 {
   if (undeduced_auto_decl (decl))
     {
-      if (complain & tf_error)
+      if (TREE_NO_WARNING (decl) && seen_error ())
+	/* We probably already complained about deduction failure.  */;
+      else if (complain & tf_error)
 	error ("use of %qD before deduction of %<auto%>", decl);
       return false;
     }
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 5620134..1fd87d2 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -98,6 +98,7 @@ static void print_instantiation_full_context (diagnostic_context *);
 static void print_instantiation_partial_context (diagnostic_context *,
 						 struct tinst_level *,
 						 location_t);
+static void maybe_print_constraint_context (diagnostic_context *);
 static void cp_diagnostic_starter (diagnostic_context *, diagnostic_info *);
 static void cp_print_error_function (diagnostic_context *, diagnostic_info *);
 
@@ -545,9 +546,7 @@ dump_type (cxx_pretty_printer *pp, tree t, int flags)
 
     case TEMPLATE_TYPE_PARM:
       pp_cxx_cv_qualifier_seq (pp, t);
-      if (tree c = PLACEHOLDER_TYPE_CONSTRAINTS (t))
-	pp_cxx_constrained_type_spec (pp, c);
-      else if (template_placeholder_p (t))
+      if (template_placeholder_p (t))
 	{
 	  t = TREE_TYPE (CLASS_PLACEHOLDER_TEMPLATE (t));
 	  pp_cxx_tree_identifier (pp, TYPE_IDENTIFIER (t));
@@ -558,6 +557,9 @@ dump_type (cxx_pretty_printer *pp, tree t, int flags)
       else
 	pp_cxx_canonical_template_parameter
 	  (pp, TEMPLATE_TYPE_PARM_INDEX (t));
+      /* If this is a constrained placeholder, add the requirements.  */
+      if (tree c = PLACEHOLDER_TYPE_CONSTRAINTS (t))
+        pp_cxx_constrained_type_spec (pp, c);
       break;
 
       /* This is not always necessary for pointers and such, but doing this
@@ -1284,6 +1286,15 @@ dump_decl (cxx_pretty_printer *pp, tree t, int flags)
       dump_template_decl (pp, t, flags);
       break;
 
+    case CONCEPT_DECL:
+      pp_cxx_ws_string (pp, "concept");
+      dump_decl_name (pp, DECL_NAME (t), flags);
+      break;
+
+    case WILDCARD_DECL:
+      pp_string (pp, "<wildcard>");
+      break;
+
     case TEMPLATE_ID_EXPR:
       {
 	tree name = TREE_OPERAND (t, 0);
@@ -1448,7 +1459,9 @@ dump_template_decl (cxx_pretty_printer *pp, tree t, int flags)
   else if (DECL_TEMPLATE_RESULT (t)
            && (VAR_P (DECL_TEMPLATE_RESULT (t))
 	       /* Alias template.  */
-	       || DECL_TYPE_TEMPLATE_P (t)))
+	       || DECL_TYPE_TEMPLATE_P (t)
+               /* Concept definition.  &*/
+               || TREE_CODE (DECL_TEMPLATE_RESULT (t)) == CONCEPT_DECL))
     dump_decl (pp, DECL_TEMPLATE_RESULT (t), flags | TFF_TEMPLATE_NAME);
   else
     {
@@ -2082,6 +2095,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
     case TEMPLATE_DECL:
     case NAMESPACE_DECL:
     case LABEL_DECL:
+    case WILDCARD_DECL:
     case OVERLOAD:
     case TYPE_DECL:
     case IDENTIFIER_NODE:
@@ -2848,18 +2862,14 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
       pp_cxx_nested_requirement (cxx_pp, t);
       break;
 
-    case PRED_CONSTR:
+    case ATOMIC_CONSTR:
     case CHECK_CONSTR:
-    case EXPR_CONSTR:
-    case TYPE_CONSTR:
-    case ICONV_CONSTR:
-    case DEDUCT_CONSTR:
-    case EXCEPT_CONSTR:
-    case PARM_CONSTR:
     case CONJ_CONSTR:
     case DISJ_CONSTR:
-      pp_cxx_constraint (cxx_pp, t);
-      break;
+      {
+        pp_cxx_constraint (cxx_pp, t);
+        break;
+      }
 
     case PLACEHOLDER_EXPR:
       pp_string (pp, M_("*this"));
@@ -3326,6 +3336,7 @@ cp_diagnostic_starter (diagnostic_context *context,
   cp_print_error_function (context, diagnostic);
   maybe_print_instantiation_context (context);
   maybe_print_constexpr_context (context);
+  maybe_print_constraint_context (context);
   pp_set_prefix (context->printer, diagnostic_build_prefix (context,
 								 diagnostic));
 }
@@ -3650,6 +3661,171 @@ maybe_print_constexpr_context (diagnostic_context *context)
 }
 
 
+static void
+print_location (diagnostic_context *context, location_t loc)
+{
+  expanded_location xloc = expand_location (loc);
+  if (context->show_column)
+    pp_verbatim (context->printer, _("%r%s:%d:%d:%R   "),
+                 "locus", xloc.file, xloc.line, xloc.column);
+  else
+    pp_verbatim (context->printer, _("%r%s:%d:%R   "),
+                 "locus", xloc.file, xloc.line);
+}
+
+/* Instantiate the concept check for the purpose of diagnosing an error.  */
+
+static tree
+rebuild_concept_check (tree expr, tree map, tree args)
+{
+  /* Instantiate the parameter mapping for the template-id.  */
+  map = tsubst_parameter_mapping (map, args, tf_none, NULL_TREE);
+  if (map == error_mark_node)
+    return error_mark_node;
+  args = get_mapped_args (map);
+
+  /* Rebuild the template id using substituted arguments. Substituting
+     directly through the expression will trigger recursive satisfaction,
+     so don't do that.  */
+  tree id = unpack_concept_check (expr);
+  args = tsubst_template_args (TREE_OPERAND (id, 1), args, tf_none, NULL_TREE);
+  if (args == error_mark_node)
+    return error_mark_node;
+  return build_nt (TEMPLATE_ID_EXPR, TREE_OPERAND (id, 0), args);
+}
+
+static void
+print_constrained_decl_info (diagnostic_context *context, tree decl)
+{
+  print_location (context, DECL_SOURCE_LOCATION (decl));
+  pp_verbatim (context->printer, "required by the constraints of %q#D\n", decl);
+}
+
+static void
+print_concept_check_info (diagnostic_context *context, tree expr, tree map, tree args)
+{
+  gcc_assert (concept_check_p (expr));
+
+  tree id = unpack_concept_check (expr);
+  tree tmpl = TREE_OPERAND (id, 0);
+  if (OVL_P (tmpl))
+    tmpl = OVL_FIRST (tmpl);
+  tree check = rebuild_concept_check (expr, map, args);
+  if (check == error_mark_node)
+    check = expr;
+
+  print_location (context, DECL_SOURCE_LOCATION (tmpl));
+  pp_verbatim (context->printer, "required for the satisfaction of %qE\n", check);
+}
+
+/* Diagnose the entry point into the satisfaction error. Returns the next
+   context, if any.  */
+
+static tree
+print_constraint_context_head (diagnostic_context *context, tree cxt, tree args)
+{
+  tree src = TREE_VALUE (cxt);
+  if (!src)
+    {
+      print_location (context, input_location);
+      pp_verbatim (context->printer, "required for constraint satisfaction\n");
+      return NULL_TREE;
+    }
+  if (DECL_P (src))
+    {
+      print_constrained_decl_info (context, src);
+      return NULL_TREE;
+    }
+  else
+    {
+      print_concept_check_info (context, src, TREE_PURPOSE (cxt), args);
+      return TREE_CHAIN (cxt);
+    }
+}
+
+static void
+print_requires_expression_info (diagnostic_context *context, tree constr, tree args)
+{
+
+  tree expr = ATOMIC_CONSTR_EXPR (constr);
+  tree map = ATOMIC_CONSTR_MAP (constr);
+  map = tsubst_parameter_mapping (map, args, tf_none, NULL_TREE);
+  if (map == error_mark_node)
+    return;
+  args = get_mapped_args (map);
+
+  print_location (context, cp_expr_loc_or_input_loc (expr));
+  pp_verbatim (context->printer, "in requirements ");
+
+  tree parms = TREE_OPERAND (expr, 0);
+  if (parms)
+    pp_verbatim (context->printer, "with ");
+  while (parms)
+    {
+      tree next = TREE_CHAIN (parms);
+
+      TREE_CHAIN (parms) = NULL_TREE;
+      cp_unevaluated u;
+      tree p = tsubst (parms, args, tf_none, NULL_TREE);
+      pp_verbatim (context->printer, "%q#D", p);
+      TREE_CHAIN (parms) = next;
+
+      if (next)
+        pp_separate_with_comma ((cxx_pretty_printer *)context->printer);
+
+      parms = next;
+    }
+
+  pp_verbatim (context->printer, "\n");
+}
+
+void
+maybe_print_single_constraint_context (diagnostic_context *context, tree failed)
+{
+  if (!failed)
+    return;
+
+  tree constr = TREE_VALUE (failed);
+  if (!constr || constr == error_mark_node)
+    return;
+  tree cxt = CONSTR_CONTEXT (constr);
+  if (!cxt)
+    return;
+  tree args = TREE_PURPOSE (failed);
+
+  /* Print the stack of requirements.  */
+  cxt = print_constraint_context_head (context, cxt, args);
+  while (cxt && !DECL_P (TREE_VALUE (cxt)))
+    {
+      tree expr = TREE_VALUE (cxt);
+      tree map = TREE_PURPOSE (cxt);
+      print_concept_check_info (context, expr, map, args);
+      cxt = TREE_CHAIN (cxt);
+    }
+
+  /* For certain constraints, we can provide additional context.  */
+  if (TREE_CODE (constr) == ATOMIC_CONSTR
+      && TREE_CODE (ATOMIC_CONSTR_EXPR (constr)) == REQUIRES_EXPR)
+    print_requires_expression_info (context, constr, args);
+}
+
+void
+maybe_print_constraint_context (diagnostic_context *context)
+{
+  if (!current_failed_constraint)
+    return;
+
+  tree cur = current_failed_constraint;
+
+  /* Recursively print nested contexts.  */
+  current_failed_constraint = TREE_CHAIN (current_failed_constraint);
+  if (current_failed_constraint)
+    maybe_print_constraint_context (context);
+
+  /* Print this context.  */
+  maybe_print_single_constraint_context (context, cur);
+}
+
 /* Return true iff TYPE_A and TYPE_B are template types that are
    meaningful to compare.  */
 
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index c4fed16..b503e97 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -1040,9 +1040,9 @@ maybe_add_lambda_conv_op (tree type)
 
   bool const generic_lambda_p = generic_lambda_fn_p (callop);
 
-  if (!generic_lambda_p && DECL_INITIAL (callop) == NULL_TREE)
+  if (!generic_lambda_p && undeduced_auto_decl (callop))
     {
-      /* If the op() wasn't instantiated due to errors, give up.  */
+      /* If the op() wasn't deduced due to errors, give up.  */
       gcc_assert (errorcount || sorrycount);
       return;
     }
diff --git a/gcc/cp/logic.cc b/gcc/cp/logic.cc
index 13cc321..2d4abaf 100644
--- a/gcc/cp/logic.cc
+++ b/gcc/cp/logic.cc
@@ -47,729 +47,736 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "type-utils.h"
 
-namespace {
+/* Hash functions for atomic constrains.  */
 
-// Helper algorithms
-
-template<typename I>
-inline I
-next (I iter)
+struct constraint_hash : default_hash_traits<tree>
 {
-  return ++iter;
-}
+  static hashval_t hash (tree t)
+  {
+    return hash_atomic_constraint (t);
+  }
 
-template<typename I, typename P>
-inline bool
-any_p (I first, I last, P pred)
-{
-  while (first != last)
-    {
-      if (pred(*first))
-        return true;
-      ++first;
-    }
-  return false;
-}
+  static bool equal (tree t1, tree t2)
+  {
+    return atomic_constraints_identical_p (t1, t2);
+  }
+};
 
-bool prove_implication (tree, tree);
+/* A conjunctive or disjunctive clause.
 
-/*---------------------------------------------------------------------------
-                           Proof state
----------------------------------------------------------------------------*/
+   Each clause maintains an iterator that refers to the current
+   term, which is used in the linear decomposition of a formula
+   into CNF or DNF.  */
 
-struct term_entry
+struct clause
 {
-  tree t;
-};
+  typedef std::list<tree>::iterator iterator;
+  typedef std::list<tree>::const_iterator const_iterator;
 
-/* Hashing function and equality for constraint entries.  */
+  /* Initialize a clause with an initial term.  */
 
-struct term_hasher : ggc_ptr_hash<term_entry>
-{
-  static hashval_t hash (term_entry *e)
+  clause (tree t)
   {
-    return iterative_hash_template_arg (e->t, 0);
+    m_terms.push_back (t);
+    if (TREE_CODE (t) == ATOMIC_CONSTR)
+      m_set.add (t);
+
+    m_current = m_terms.begin ();
   }
 
-  static bool equal (term_entry *e1, term_entry *e2)
+  /* Create a copy of the current term. The current
+     iterator is set to point to the same position in the
+     copied list of terms.  */
+
+  clause (clause const& c)
+    : m_terms (c.m_terms), m_set (c.m_set), m_current (m_terms.begin ())
   {
-    return cp_tree_equal (e1->t, e2->t);
+    std::advance (m_current, std::distance (c.begin (), c.current ()));
   }
-};
 
-/* A term list is a list of atomic constraints. It is used
-   to maintain the lists of assumptions and conclusions in a
-   proof goal.
+  /* Returns true when all terms are atoms.  */
 
-   Each term list maintains an iterator that refers to the current
-   term. This can be used by various tactics to support iteration
-   and stateful manipulation of the list. */
-class term_list
-{
-public:
-  typedef std::list<tree>::iterator iterator;
+  bool done () const
+  {
+    return m_current == end ();
+  }
 
-  term_list ();
-  term_list (tree);
+  /* Advance to the next term.  */
 
-  bool includes (tree);
-  iterator insert (iterator, tree);
-  iterator push_back (tree);
-  iterator erase (iterator);
-  iterator replace (iterator, tree);
-  iterator replace (iterator, tree, tree);
+  void advance ()
+  {
+    gcc_assert (!done ());
+    ++m_current;
+  }
 
-  iterator begin() { return seq.begin(); }
-  iterator end() { return seq.end(); }
+  /* Replaces the current term at position ITER with T.  If
+     T is an atomic constraint that already appears in the
+     clause, remove but do not replace ITER. Returns a pair
+     containing an iterator to the replace object or past
+     the erased object and a boolean value which is true if
+     an object was erased.  */
 
-  std::list<tree>         seq;
-  hash_table<term_hasher> tab;
-};
+  std::pair<iterator, bool> replace (iterator iter, tree t)
+  {
+    gcc_assert (TREE_CODE (*iter) != ATOMIC_CONSTR);
+    if (TREE_CODE (t) == ATOMIC_CONSTR)
+      {
+	if (m_set.add (t))
+	  return std::make_pair (m_terms.erase (iter), true);
+      }
+    *iter = t;
+    return std::make_pair (iter, false);
+  }
 
-inline
-term_list::term_list ()
-  : seq(), tab (11)
-{
-}
+  /* Inserts T before ITER in the list of terms.  If T has 
+     already is an atomic constraint that already appears in
+     the clause, no action is taken, and the current iterator
+     is returned. Returns a pair of an iterator to the inserted
+     object or ITER if no insertion occurred and a boolean
+     value which is true if an object was inserted.  */
 
-/* Initialize a term list with an initial term. */
+  std::pair<iterator, bool> insert (iterator iter, tree t)
+  {
+    if (TREE_CODE (t) == ATOMIC_CONSTR)
+    {
+      if (m_set.add (t))
+	return std::make_pair (iter, false);
+    }
+    return std::make_pair (m_terms.insert (iter, t), true);
+  }
 
-inline
-term_list::term_list (tree t)
-  : seq (), tab (11)
-{
-  push_back (t);
-}
+  /* Replaces the current term with T. In the case where the
+     current term is erased (because T is redundant), update
+     the position of the current term to the next term.  */
 
-/* Returns true if T is the in the tree. */
+  void replace (tree t)
+  {
+    m_current = replace (m_current, t).first;
+  }
 
-inline bool
-term_list::includes (tree t)
-{
-  term_entry ent = {t};
-  return tab.find (&ent);
-}
+  /* Replace the current term with T1 and T2, in that order.  */
 
-/* Append a term to the list. */
-inline term_list::iterator
-term_list::push_back (tree t)
-{
-  return insert (end(), t);
-}
+  void replace (tree t1, tree t2)
+  {
+    /* Replace the current term with t1. Ensure that iter points
+       to the term before which t2 will be inserted.  Update the
+       current term as needed.  */
+    std::pair<iterator, bool> rep = replace (m_current, t1);
+    if (rep.second)
+      m_current = rep.first;
+    else
+      ++rep.first;
 
-/* Insert a new (unseen) term T into the list before the proposition
-   indicated by ITER. Returns the iterator to the newly inserted
-   element.  */
+    /* Insert the t2. Make this the current term if we erased
+       the prior term.  */
+    std::pair<iterator, bool> ins = insert (rep.first, t2);
+    if (rep.second && ins.second)
+      m_current = ins.first;
+  }
 
-term_list::iterator
-term_list::insert (iterator iter, tree t)
-{
-  gcc_assert (!includes (t));
-  iter = seq.insert (iter, t);
-  term_entry ent = {t};
-  term_entry** slot = tab.find_slot (&ent, INSERT);
-  term_entry* ptr = ggc_alloc<term_entry> ();
-  *ptr = ent;
-  *slot = ptr;
-  return iter;
-}
+  /* Returns true if the clause contains the term T.  */
 
-/* Remove an existing term from the list. Returns an iterator referring
-   to the element after the removed term.  This may be end().  */
+  bool contains (tree t)
+  {
+    gcc_assert (TREE_CODE (t) == ATOMIC_CONSTR);
+    return m_set.contains (t);
+  }
 
-term_list::iterator
-term_list::erase (iterator iter)
-{
-  gcc_assert (includes (*iter));
-  term_entry ent = {*iter};
-  tab.remove_elt (&ent);
-  iter = seq.erase (iter);
-  return iter;
-}
 
-/* Replace the given term with that specified. If the term has
-   been previously seen, do not insert the term. Returns the
-   first iterator past the current term.  */
+  /* Returns an iterator to the first clause in the formula.  */
 
-term_list::iterator
-term_list::replace (iterator iter, tree t)
-{
-  iter = erase (iter);
-  if (!includes (t))
-    insert (iter, t);
-  return iter;
-}
+  iterator begin ()
+  {
+    return m_terms.begin ();
+  }
 
+  /* Returns an iterator to the first clause in the formula.  */
 
-/* Replace the term at the given position by the supplied T1
-   followed by t2. This is used in certain logical operators to
-   load a list of assumptions or conclusions.  */
+  const_iterator begin () const
+  {
+    return m_terms.begin ();
+  }
 
-term_list::iterator
-term_list::replace (iterator iter, tree t1, tree t2)
-{
-  iter = erase (iter);
-  if (!includes (t1))
-    insert (iter, t1);
-  if (!includes (t2))
-    insert (iter, t2);
-  return iter;
-}
+  /* Returns an iterator past the last clause in the formula.  */
+
+  iterator end ()
+  {
+    return m_terms.end ();
+  }
 
-/* A goal (or subgoal) models a sequent of the form
-   'A |- C' where A and C are lists of assumptions and
-   conclusions written as propositions in the constraint
-   language (i.e., lists of trees). */
+  /* Returns an iterator past the last clause in the formula.  */
 
-class proof_goal
-{
-public:
-  term_list assumptions;
-  term_list conclusions;
+  const_iterator end () const
+  {
+    return m_terms.end ();
+  }
+
+  /* Returns the current iterator.  */
+
+  const_iterator current () const
+  {
+    return m_current;
+  }
+
+  std::list<tree> m_terms; /* The list of terms.  */
+  hash_set<tree, false, constraint_hash> m_set; /* The set of atomic constraints.  */
+  iterator m_current; /* The current term.  */
 };
 
+
 /* A proof state owns a list of goals and tracks the
    current sub-goal. The class also provides facilities
    for managing subgoals and constructing term lists. */
 
-class proof_state : public std::list<proof_goal>
+struct formula
 {
-public:
-  proof_state ();
+  typedef std::list<clause>::iterator iterator;
+  typedef std::list<clause>::const_iterator const_iterator;
 
-  iterator branch (iterator i);
-  iterator discharge (iterator i);
-};
+  /* Construct a formula with an initial formula in a
+     single clause.  */
 
-/* Initialize the state with a single empty goal, and set that goal
-   as the current subgoal.  */
-
-inline
-proof_state::proof_state ()
-  : std::list<proof_goal> (1)
-{ }
+  formula (tree t)
+  {
+    /* This should call emplace_back(). There's a an extra copy being
+       invoked by using push_back().  */
+    m_clauses.push_back (t);
+    m_current = m_clauses.begin ();
+  }
 
+  /* Returns true when all clauses are atomic.  */
+  bool done () const
+  {
+    return m_current == end ();
+  }
 
-/* Branch the current goal by creating a new subgoal, returning a
-   reference to the new object. This does not update the current goal. */
+  /* Advance to the next term.  */
+  void advance ()
+  {
+    gcc_assert (!done ());
+    ++m_current;
+  }
 
-inline proof_state::iterator
-proof_state::branch (iterator i)
-{
-  gcc_assert (i != end());
-  proof_goal& g = *i;
-  return insert (++i, g);
-}
+  /* Insert a copy of clause into the formula. This corresponds
+     to a distribution of one logical operation over the other.  */
 
-/* Discharge the current goal, setting it equal to the
-   next non-satisfied goal. */
+  clause& branch ()
+  {
+    gcc_assert (!done ());
+    m_clauses.push_back (*m_current);
+    return m_clauses.back ();
+  }
 
-inline proof_state::iterator
-proof_state::discharge (iterator i)
-{
-  gcc_assert (i != end());
-  return erase (i);
-}
+  /* Returns the position of the current clause.  */
 
+  iterator current ()
+  {
+    return m_current;
+  }
 
-/*---------------------------------------------------------------------------
-                        Debugging
----------------------------------------------------------------------------*/
+  /* Returns an iterator to the first clause in the formula.  */
 
-// void
-// debug (term_list& ts)
-// {
-//   for (term_list::iterator i = ts.begin(); i != ts.end(); ++i)
-//     verbatim ("  # %E", *i);
-// }
-//
-// void
-// debug (proof_goal& g)
-// {
-//   debug (g.assumptions);
-//   verbatim ("       |-");
-//   debug (g.conclusions);
-// }
+  iterator begin ()
+  {
+    return m_clauses.begin ();
+  }
 
-/*---------------------------------------------------------------------------
-                        Atomicity of constraints
----------------------------------------------------------------------------*/
+  /* Returns an iterator to the first clause in the formula.  */
 
-/* Returns true if T is not an atomic constraint.  */
+  const_iterator begin () const
+  {
+    return m_clauses.begin ();
+  }
 
-bool
-non_atomic_constraint_p (tree t)
-{
-  switch (TREE_CODE (t))
-    {
-    case PRED_CONSTR:
-    case EXPR_CONSTR:
-    case TYPE_CONSTR:
-    case ICONV_CONSTR:
-    case DEDUCT_CONSTR:
-    case EXCEPT_CONSTR:
-      /* A pack expansion isn't atomic, but it can't decompose to prove an
-	 atom, so it shouldn't cause analyze_atom to return undecided.  */
-    case EXPR_PACK_EXPANSION:
-      return false;
-    case CHECK_CONSTR:
-    case PARM_CONSTR:
-    case CONJ_CONSTR:
-    case DISJ_CONSTR:
-      return true;
-    default:
-      gcc_unreachable ();
-    }
-}
+  /* Returns an iterator past the last clause in the formula.  */
 
-/* Returns true if any constraints in T are not atomic.  */
+  iterator end ()
+  {
+    return m_clauses.end ();
+  }
 
-bool
-any_non_atomic_constraints_p (term_list& t)
-{
-  return any_p (t.begin(), t.end(), non_atomic_constraint_p);
-}
+  /* Returns an iterator past the last clause in the formula.  */
 
-/*---------------------------------------------------------------------------
-                           Proof validations
----------------------------------------------------------------------------*/
+  const_iterator end () const
+  {
+    return m_clauses.end ();
+  }
 
-enum proof_result
-{
-  invalid,
-  valid,
-  undecided
+  std::list<clause> m_clauses; /* The list of clauses.  */
+  iterator m_current; /* The current clause.  */
 };
 
-proof_result check_term (term_list&, tree);
-
-
-proof_result
-analyze_atom (term_list& ts, tree t)
+void
+debug (clause& c)
 {
-  /* FIXME: Hook into special cases, if any. */
-  /*
-  term_list::iterator iter = ts.begin();
-  term_list::iterator end = ts.end();
-  while (iter != end)
-    {
-      ++iter;
-    }
-  */
-
-  if (non_atomic_constraint_p (t))
-    return undecided;
-  if (any_non_atomic_constraints_p (ts))
-    return undecided;
-  return invalid;
+  for (clause::iterator i = c.begin(); i != c.end(); ++i)
+    verbatim ("  # %E", *i);
 }
 
-/* Search for a pack expansion in the list of assumptions that would
-   make this expansion valid.  */
-
-proof_result
-analyze_pack (term_list& ts, tree t)
+void
+debug (formula& f)
 {
-  tree c1 = normalize_expression (PACK_EXPANSION_PATTERN (t));
-  term_list::iterator iter = ts.begin();
-  term_list::iterator end = ts.end();
-  while (iter != end)
+  for (formula::iterator i = f.begin(); i != f.end(); ++i)
     {
-      if (TREE_CODE (*iter) == TREE_CODE (t))
-        {
-          tree c2 = normalize_expression (PACK_EXPANSION_PATTERN (*iter));
-          if (prove_implication (c2, c1))
-            return valid;
-          else
-            return invalid;
-        }
-      ++iter;
+      verbatim ("(((");
+      debug (*i);
+      verbatim (")))");
     }
-  return invalid;
 }
 
-/* Search for concept checks in TS that we know subsume T. */
+/* The logical rules used to analyze a logical formula. The
+   "left" and "right" refer to the position of formula in a
+   sequent (as in sequent calculus).  */
 
-proof_result
-search_known_subsumptions (term_list& ts, tree t)
+enum rules
 {
-  for (term_list::iterator i = ts.begin(); i != ts.end(); ++i)
-    if (TREE_CODE (*i) == CHECK_CONSTR)
-      {
-        if (bool* b = lookup_subsumption_result (*i, t))
-          return *b ? valid : invalid;
-      }
-  return undecided;
-}
+  left, right
+};
 
-/* Determine if the terms in TS provide sufficient support for proving
-   the proposition T. If any term in TS is a concept check that is known
-   to subsume T, then the proof is valid. Otherwise, we have to expand T
-   and continue searching for support.  */
+/* Distribution counting.  */
 
-proof_result
-analyze_check (term_list& ts, tree t)
+static inline bool
+disjunction_p (tree t)
 {
-  proof_result r = search_known_subsumptions (ts, t);
-  if (r != undecided)
-    return r;
-
-  tree tmpl = CHECK_CONSTR_CONCEPT (t);
-  tree args = CHECK_CONSTR_ARGS (t);
-  tree c = expand_concept (tmpl, args);
-  return check_term (ts, c);
+  return TREE_CODE (t) == DISJ_CONSTR;
 }
 
-/* Recursively check constraints of the parameterized constraint. */
-
-proof_result
-analyze_parameterized (term_list& ts, tree t)
+static inline bool
+conjunction_p (tree t)
 {
-  return check_term (ts, PARM_CONSTR_OPERAND (t));
+  return TREE_CODE (t) == CONJ_CONSTR;
 }
 
-proof_result
-analyze_conjunction (term_list& ts, tree t)
+static inline bool
+atomic_p (tree t)
 {
-  proof_result r = check_term (ts, TREE_OPERAND (t, 0));
-  if (r == invalid || r == undecided)
-    return r;
-  return check_term (ts, TREE_OPERAND (t, 1));
+  return TREE_CODE (t) == ATOMIC_CONSTR;
 }
 
-proof_result
-analyze_disjunction (term_list& ts, tree t)
-{
-  proof_result r = check_term (ts, TREE_OPERAND (t, 0));
-  if (r == valid)
-    return r;
-  return check_term (ts, TREE_OPERAND (t, 1));
-}
+/* Recursively count the number of clauses produced when converting T
+   to DNF. Returns a pair containing the number of clauses and a bool
+   value signifying that the the tree would be rewritten as a result of
+   distributing. In general, a conjunction for which this flag is set
+   is considered a disjunction for the purpose of counting.  */
 
-proof_result
-analyze_term (term_list& ts, tree t)
+static std::pair<int, bool>
+dnf_size_r (tree t)
 {
-  switch (TREE_CODE (t))
-    {
-    case CHECK_CONSTR:
-      return analyze_check (ts, t);
+  if (atomic_p (t))
+    /* Atomic constraints produce no clauses.  */
+    return std::make_pair (0, false);
 
-    case PARM_CONSTR:
-      return analyze_parameterized (ts, t);
+  /* For compound constraints, recursively count clauses and unpack
+     the results.  */
+  tree lhs = TREE_OPERAND (t, 0);
+  tree rhs = TREE_OPERAND (t, 1);
+  std::pair<int, bool> p1 = dnf_size_r (lhs);
+  std::pair<int, bool> p2 = dnf_size_r (rhs);
+  int n1 = p1.first, n2 = p2.first;
+  bool d1 = p1.second, d2 = p2.second;
 
-    case CONJ_CONSTR:
-      return analyze_conjunction (ts, t);
-    case DISJ_CONSTR:
-      return analyze_disjunction (ts, t);
-
-    case PRED_CONSTR:
-    case EXPR_CONSTR:
-    case TYPE_CONSTR:
-    case ICONV_CONSTR:
-    case DEDUCT_CONSTR:
-    case EXCEPT_CONSTR:
-      return analyze_atom (ts, t);
-
-    case EXPR_PACK_EXPANSION:
-      return analyze_pack (ts, t);
-
-    case ERROR_MARK:
-      /* Encountering an error anywhere in a constraint invalidates
-         the proof, since the constraint is ill-formed.  */
-      return invalid;
-    default:
-      gcc_unreachable ();
+  if (disjunction_p (t))
+    {
+      /* Matches constraints of the form P \/ Q. Disjunctions contribute
+	 linearly to the number of constraints.  When both P and Q are
+	 disjunctions, clauses are added. When only one of P and Q
+	 is a disjunction, an additional clause is produced. When neither
+	 P nor Q are disjunctions, two clauses are produced.  */
+      if (disjunction_p (lhs))
+	{
+	  if (disjunction_p (rhs) || (conjunction_p (rhs) && d2))
+	    /* Both P and Q are disjunctions.  */
+	    return std::make_pair (n1 + n2, d1 | d2);
+	  else
+	    /* Only LHS is a disjunction.  */
+	    return std::make_pair (1 + n1 + n2, d1 | d2);
+	  gcc_unreachable ();
+	}
+      if (conjunction_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d1) || (conjunction_p (rhs) && d1 && d2))
+	    /* Both P and Q are disjunctions.  */
+	    return std::make_pair (n1 + n2, d1 | d2);
+	  if (disjunction_p (rhs)
+	      || (conjunction_p (rhs) && d1 != d2)
+	      || (atomic_p (rhs) && d1))
+	    /* Either LHS or RHS is a disjunction.  */
+	    return std::make_pair (1 + n1 + n2, d1 | d2);
+	  else
+	    /* Neither LHS nor RHS is a disjunction.  */
+	    return std::make_pair (2, false);
+	}
+      if (atomic_p (lhs))
+	{
+	  if (disjunction_p (rhs) || (conjunction_p (rhs) && d2))
+	    /* Only RHS is a disjunction.  */
+	    return std::make_pair (1 + n1 + n2, d1 | d2);
+	  else
+	    /* Neither LHS nor RHS is a disjunction.  */
+	    return std::make_pair (2, false);
+	}
+    }
+  else /* conjunction_p (t)  */
+    {
+      /* Matches constraints of the form P /\ Q, possibly resulting
+         in the distribution of one side over the other. When both
+         P and Q are disjunctions, the number of clauses are multiplied.
+         When only one of P and Q is a disjunction, the the number of
+         clauses are added. Otherwise, neither side is a disjunction and
+         no clauses are created.  */
+      if (disjunction_p (lhs))
+	{
+	  if (disjunction_p (rhs) || (conjunction_p (rhs) && d2))
+	    /* Both P and Q are disjunctions.  */
+	    return std::make_pair (n1 * n2, true);
+	  else
+	    /* Only LHS is a disjunction.  */
+	    return std::make_pair (n1 + n2, true);
+	  gcc_unreachable ();
+	}
+      if (conjunction_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d1) || (conjunction_p (rhs) && d1 && d2))
+	    /* Both P and Q are disjunctions.  */
+	    return std::make_pair (n1 * n2, true);
+	  if (disjunction_p (rhs)
+	      || (conjunction_p (rhs) && d1 != d2)
+	      || (atomic_p (rhs) && d1))
+	    /* Either LHS or RHS is a disjunction.  */
+	    return std::make_pair (n1 + n2, true);
+	  else
+	    /* Neither LHS nor RHS is a disjunction.  */
+	    return std::make_pair (0, false);
+	}
+      if (atomic_p (lhs))
+	{
+	  if (disjunction_p (rhs) || (conjunction_p (rhs) && d2))
+	    /* Only RHS is a disjunction.  */
+	    return std::make_pair (n1 + n2, true);
+	  else
+	    /* Neither LHS nor RHS is a disjunction.  */
+	    return std::make_pair (0, false);
+	}
     }
+  gcc_unreachable ();
 }
 
-/* Check if a single term can be proven from a set of assumptions.
-   If the proof is not valid, then it is incomplete when either
-   the given term is non-atomic or any term in the list of assumptions
-   is not-atomic.  */
+/* Recursively count the number of clauses produced when converting T
+   to CNF. Returns a pair containing the number of clauses and a bool
+   value signifying that the the tree would be rewritten as a result of
+   distributing. In general, a disjunction for which this flag is set
+   is considered a conjunction for the purpose of counting.  */
 
-proof_result
-check_term (term_list& ts, tree t)
+static std::pair<int, bool>
+cnf_size_r (tree t)
 {
-  /* Try the easy way; search for an equivalent term.  */
-  if (ts.includes (t))
-    return valid;
+  if (atomic_p (t))
+    /* Atomic constraints produce no clauses.  */
+    return std::make_pair (0, false);
 
-  /* The hard way; actually consider what the term means.  */
-  return analyze_term (ts, t);
-}
+  /* For compound constraints, recursively count clauses and unpack
+     the results.  */
+  tree lhs = TREE_OPERAND (t, 0);
+  tree rhs = TREE_OPERAND (t, 1);
+  std::pair<int, bool> p1 = cnf_size_r (lhs);
+  std::pair<int, bool> p2 = cnf_size_r (rhs);
+  int n1 = p1.first, n2 = p2.first;
+  bool d1 = p1.second, d2 = p2.second;
 
-/* Check to see if any term is proven by the assumptions in the
-   proof goal. The proof is valid if the proof of any term is valid.
-   If validity cannot be determined, but any particular
-   check was undecided, then this goal is undecided.  */
-
-proof_result
-check_goal (proof_goal& g)
-{
-  term_list::iterator iter = g.conclusions.begin ();
-  term_list::iterator end = g.conclusions.end ();
-  bool incomplete = false;
-  while (iter != end)
+  if (disjunction_p (t))
     {
-      proof_result r = check_term (g.assumptions, *iter);
-      if (r == valid)
-        return r;
-      if (r == undecided)
-        incomplete = true;
-      ++iter;
+      /* Matches constraints of the form P \/ Q, possibly resulting
+         in the distribution of one side over the other. When both
+         P and Q are conjunctions, the number of clauses are multiplied.
+         When only one of P and Q is a conjunction, the the number of
+         clauses are added. Otherwise, neither side is a conjunction and
+         no clauses are created.  */
+      if (disjunction_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d1 && d2) || (conjunction_p (rhs) && d1))
+	    /* Both P and Q are conjunctions.  */
+	    return std::make_pair (n1 * n2, true);
+	  if ((disjunction_p (rhs) && d1 != d2)
+	      || conjunction_p (rhs)
+	      || (atomic_p (rhs) && d1))
+	    /* Either LHS or RHS is a conjunction.  */
+	    return std::make_pair (n1 + n2, true);
+	  else
+	    /* Neither LHS nor RHS is a conjunction.  */
+	    return std::make_pair (0, false);
+	  gcc_unreachable ();
+	}
+      if (conjunction_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d2) || conjunction_p (rhs))
+	    /* Both LHS and RHS are conjunctions.  */
+	    return std::make_pair (n1 * n2, true);
+	  else
+	    /* Only LHS is a conjunction.  */
+	    return std::make_pair (n1 + n2, true);
+	}
+      if (atomic_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d2) || conjunction_p (rhs))
+	    /* Only RHS is a disjunction.  */
+	    return std::make_pair (n1 + n2, true);
+	  else
+	    /* Neither LHS nor RHS is a disjunction.  */
+	    return std::make_pair (0, false);
+	}
     }
-
-    /* Was the proof complete? */
-    if (incomplete)
-      return undecided;
-    else
-      return invalid;
-}
-
-/* Check if the the proof is valid. This is the case when all
-   goals can be discharged. If any goal is invalid, then the
-   entire proof is invalid. Otherwise, the proof is undecided.  */
-
-proof_result
-check_proof (proof_state& p)
-{
-  proof_state::iterator iter = p.begin();
-  proof_state::iterator end = p.end();
-  while (iter != end)
+  else /* conjunction_p (t)  */
     {
-      proof_result r = check_goal (*iter);
-      if (r == invalid)
-        return r;
-      if (r == valid)
-        iter = p.discharge (iter);
-      else
-        ++iter;
+      /* Matches constraints of the form P /\ Q. Conjunctions contribute
+	 linearly to the number of constraints.  When both P and Q are
+	 conjunctions, clauses are added. When only one of P and Q
+	 is a conjunction, an additional clause is produced. When neither
+	 P nor Q are conjunctions, two clauses are produced.  */
+      if (disjunction_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d1 && d2) || (conjunction_p (rhs) && d1))
+	    /* Both P and Q are conjunctions.  */
+	    return std::make_pair (n1 + n2, d1 | d2);
+	  if ((disjunction_p (rhs) && d1 != d2)
+	      || conjunction_p (rhs)
+	      || (atomic_p (rhs) && d1))
+	    /* Either LHS or RHS is a conjunction.  */
+	    return std::make_pair (1 + n1 + n2, d1 | d2);
+	  else
+	    /* Neither LHS nor RHS is a conjunction.  */
+	    return std::make_pair (2, false);
+	  gcc_unreachable ();
+	}
+      if (conjunction_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d2) || conjunction_p (rhs))
+	    /* Both LHS and RHS are conjunctions.  */
+	    return std::make_pair (n1 + n2, d1 | d2);
+	  else
+	    /* Only LHS is a conjunction.  */
+	    return std::make_pair (1 + n1 + n2, d1 | d2);
+	}
+      if (atomic_p (lhs))
+	{
+	  if ((disjunction_p (rhs) && d2) || conjunction_p (rhs))
+	    /* Only RHS is a disjunction.  */
+	    return std::make_pair (1 + n1 + n2, d1 | d2);
+	  else
+	    /* Neither LHS nor RHS is a disjunction.  */
+	    return std::make_pair (2, false);
+	}
     }
-
-  /* If all goals are discharged, then the proof is valid.  */
-  if (p.empty())
-    return valid;
-  else
-    return undecided;
+  gcc_unreachable ();
 }
 
-/*---------------------------------------------------------------------------
-                           Left logical rules
----------------------------------------------------------------------------*/
+/* Count the number conjunctive clauses that would be created
+   when rewriting T to DNF. */
 
-term_list::iterator
-load_check_assumption (term_list& ts, term_list::iterator i)
+static int
+dnf_size (tree t)
 {
-  tree decl = CHECK_CONSTR_CONCEPT (*i);
-  tree tmpl = DECL_TI_TEMPLATE (decl);
-  tree args = CHECK_CONSTR_ARGS (*i);
-  return ts.replace(i, expand_concept (tmpl, args));
+  std::pair<int, bool> result = dnf_size_r (t);
+  return result.first == 0 ? 1 : result.first;
 }
 
-term_list::iterator
-load_parameterized_assumption (term_list& ts, term_list::iterator i)
-{
-  return ts.replace(i, PARM_CONSTR_OPERAND(*i));
-}
 
-term_list::iterator
-load_conjunction_assumption (term_list& ts, term_list::iterator i)
+/* Count the number disjunctive clauses that would be created
+   when rewriting T to CNF. */
+
+static int
+cnf_size (tree t)
 {
-  tree t1 = TREE_OPERAND (*i, 0);
-  tree t2 = TREE_OPERAND (*i, 1);
-  return ts.replace(i, t1, t2);
+  std::pair<int, bool> result = cnf_size_r (t);
+  return result.first == 0 ? 1 : result.first;
 }
 
-/* Examine the terms in the list, and apply left-logical rules to move
-   terms into the set of assumptions. */
+
+/* A left-conjunction is replaced by its operands.  */
 
 void
-load_assumptions (proof_goal& g)
+replace_term (clause& c, tree t)
 {
-  term_list::iterator iter = g.assumptions.begin();
-  term_list::iterator end = g.assumptions.end();
-  while (iter != end)
-    {
-      switch (TREE_CODE (*iter))
-        {
-        case CHECK_CONSTR:
-          iter = load_check_assumption (g.assumptions, iter);
-          break;
-        case PARM_CONSTR:
-          iter = load_parameterized_assumption (g.assumptions, iter);
-          break;
-        case CONJ_CONSTR:
-          iter = load_conjunction_assumption (g.assumptions, iter);
-          break;
-        default:
-          ++iter;
-          break;
-        }
-    }
+  tree t1 = TREE_OPERAND (t, 0);
+  tree t2 = TREE_OPERAND (t, 1);
+  return c.replace (t1, t2);
 }
 
-/* In each subgoal, load constraints into the assumption set.  */
+/* Create a new clause in the formula by copying the current
+   clause. In the current clause, the term at CI is replaced
+   by the first operand, and in the new clause, it is replaced
+   by the second.  */
 
 void
-load_assumptions(proof_state& p)
+branch_clause (formula& f, clause& c1, tree t)
 {
-  proof_state::iterator iter = p.begin();
-  while (iter != p.end())
-    {
-      load_assumptions (*iter);
-      ++iter;
-    }
+  tree t1 = TREE_OPERAND (t, 0);
+  tree t2 = TREE_OPERAND (t, 1);
+  clause& c2 = f.branch ();
+  c1.replace (t1);
+  c2.replace (t2);
 }
 
-void
-explode_disjunction (proof_state& p, proof_state::iterator gi, term_list::iterator ti1)
-{
-  tree t1 = TREE_OPERAND (*ti1, 0);
-  tree t2 = TREE_OPERAND (*ti1, 1);
+/* Decompose t1 /\ t2 according to the rules R.  */
 
-  /* Erase the current term from the goal. */
-  proof_goal& g1 = *gi;
-  proof_goal& g2 = *p.branch (gi);
+inline void
+decompose_conjuntion (formula& f, clause& c, tree t, rules r)
+{
+  if (r == left)
+    replace_term (c, t);
+  else
+    branch_clause (f, c, t);
+}
 
-  /* Get an iterator to the equivalent position in th enew goal. */
-  int n = std::distance (g1.assumptions.begin (), ti1);
-  term_list::iterator ti2 = g2.assumptions.begin ();
-  std::advance (ti2, n);
+/* Decompose t1 \/ t2 according to the rules R.  */
 
-  /* Replace the disjunction in both branches. */
-  g1.assumptions.replace (ti1, t1);
-  g2.assumptions.replace (ti2, t2);
+inline void
+decompose_disjunction (formula& f, clause& c, tree t, rules r)
+{
+  if (r == right)
+    replace_term (c, t);
+  else
+    branch_clause (f, c, t);
 }
 
+/* An atomic constraint is already decomposed.  */
+inline void
+decompose_atom (clause& c)
+{
+  c.advance ();
+}
 
-/* Search the assumptions of the goal for the first disjunction. */
+/* Decompose a term of clause C (in formula F) according to the
+   logical rules R. */
 
-bool
-explode_goal (proof_state& p, proof_state::iterator gi)
+void
+decompose_term (formula& f, clause& c, tree t, rules r)
 {
-  term_list& ts = gi->assumptions;
-  term_list::iterator ti = ts.begin();
-  term_list::iterator end = ts.end();
-  while (ti != end)
+  switch (TREE_CODE (t))
     {
-      if (TREE_CODE (*ti) == DISJ_CONSTR)
-        {
-          explode_disjunction (p, gi, ti);
-          return true;
-        }
-      else ++ti;
+      case CONJ_CONSTR:
+        return decompose_conjuntion (f, c, t, r);
+      case DISJ_CONSTR:
+	return decompose_disjunction (f, c, t, r);
+      default:
+	return decompose_atom (c);
     }
-  return false;
 }
 
-/* Search for the first goal with a disjunction, and then branch
-   creating a clone of that subgoal. */
+/* Decompose C (in F) using the logical rules R until it
+   is comprised of only atomic constraints.  */
 
 void
-explode_assumptions (proof_state& p)
+decompose_clause (formula& f, clause& c, rules r)
 {
-  proof_state::iterator iter = p.begin();
-  proof_state::iterator end = p.end();
-  while (iter != end)
-    {
-      if (explode_goal (p, iter))
-        return;
-      ++iter;
-    }
+  while (!c.done ())
+    decompose_term (f, c, *c.current (), r);
+  f.advance ();
 }
 
+/* Decompose the logical formula F according to the logical
+   rules determined by R.  The result is a formula containing
+   clauses that contain only atomic terms.  */
 
-/*---------------------------------------------------------------------------
-                           Right logical rules
----------------------------------------------------------------------------*/
-
-term_list::iterator
-load_disjunction_conclusion (term_list& g, term_list::iterator i)
+void
+decompose_formula (formula& f, rules r)
 {
-  tree t1 = TREE_OPERAND (*i, 0);
-  tree t2 = TREE_OPERAND (*i, 1);
-  return g.replace(i, t1, t2);
+  while (!f.done ())
+    decompose_clause (f, *f.current (), r);
 }
 
-/* Apply logical rules to the right hand side. This will load the
-   conclusion set with all tpp-level disjunctions.  */
+/* Fully decomposing T into a list of sequents, each comprised of
+   a list of atomic constraints, as if T were an antecedent.  */
 
-void
-load_conclusions (proof_goal& g)
+static formula
+decompose_antecedents (tree t)
 {
-  term_list::iterator iter = g.conclusions.begin();
-  term_list::iterator end = g.conclusions.end();
-  while (iter != end)
-    {
-      if (TREE_CODE (*iter) == DISJ_CONSTR)
-        iter = load_disjunction_conclusion (g.conclusions, iter);
-      else
-        ++iter;
-    }
+  formula f (t);
+  decompose_formula (f, left);
+  return f;
 }
 
-void
-load_conclusions (proof_state& p)
+/* Fully decomposing T into a list of sequents, each comprised of
+   a list of atomic constraints, as if T were a consequent.  */
+
+static formula
+decompose_consequents (tree t)
 {
-  proof_state::iterator iter = p.begin();
-  while (iter != p.end())
-    {
-      load_conclusions (*iter);
-      ++iter;
-    }
+  formula f (t);
+  decompose_formula (f, right);
+  return f;
 }
 
+static bool derive_proof (clause&, tree, rules);
 
-/*---------------------------------------------------------------------------
-                          High-level proof tactics
----------------------------------------------------------------------------*/
+/* Derive a proof of both operands of T.  */
 
-/* Given two constraints A and C, try to derive a proof that
-   A implies C.  */
+static bool
+derive_proof_for_both_operands (clause& c, tree t, rules r)
+{
+  if (!derive_proof (c, TREE_OPERAND (t, 0), r))
+    return false;
+  return derive_proof (c, TREE_OPERAND (t, 1), r);
+}
 
-bool
-prove_implication (tree a, tree c)
+/* Derive a proof of either operand of T.  */
+
+static bool
+derive_proof_for_either_operand (clause& c, tree t, rules r)
 {
-  /* Quick accept. */
-  if (cp_tree_equal (a, c))
+  if (derive_proof (c, TREE_OPERAND (t, 0), r))
     return true;
+  return derive_proof (c, TREE_OPERAND (t, 1), r);
+}
 
-  /* Build the initial proof state. */
-  proof_state proof;
-  proof_goal& goal = proof.front();
-  goal.assumptions.push_back(a);
-  goal.conclusions.push_back(c);
-
-  /* Perform an initial right-expansion in the off-chance that the right
-     hand side contains disjunctions. */
-  load_conclusions (proof);
+/* Derive a proof of the atomic constraint T in clause C.  */
 
-  int step_max = 1 << 10;
-  int step_count = 0;              /* FIXME: We shouldn't have this. */
-  std::size_t branch_limit = 1024; /* FIXME: This needs to be configurable. */
-  while (step_count < step_max && proof.size() < branch_limit)
-    {
-      /* Determine if we can prove that the assumptions entail the
-         conclusions. If so, we're done. */
-      load_assumptions (proof);
+static bool
+derive_atomic_proof (clause& c, tree t)
+{
+  return c.contains (t);
+}
 
-      /* Can we solve the proof based on this? */
-      proof_result r = check_proof (proof);
-      if (r != undecided)
-        return r == valid;
+/* Derive a proof of T from the terms in C.  */
 
-      /* If not, then we need to dig into disjunctions.  */
-      explode_assumptions (proof);
+static bool
+derive_proof (clause& c, tree t, rules r)
+{
+  switch (TREE_CODE (t))
+  {
+    case CONJ_CONSTR:
+      if (r == left)
+        return derive_proof_for_both_operands (c, t, r);
+      else
+	return derive_proof_for_either_operand (c, t, r);
+    case DISJ_CONSTR:
+      if (r == left)
+        return derive_proof_for_either_operand (c, t, r);
+      else
+	return derive_proof_for_both_operands (c, t, r);
+    default:
+      return derive_atomic_proof (c, t);
+  }
+}
 
-      ++step_count;
-    }
+/* Derive a proof of T from disjunctive clauses in F.  */
 
-  if (step_count == step_max)
-    error ("subsumption failed to resolve");
+static bool
+derive_proofs (formula& f, tree t, rules r)
+{
+  for (formula::iterator i = f.begin(); i != f.end(); ++i)
+    if (!derive_proof (*i, t, r))
+      return false;
+  return true;
+}
 
-  if (proof.size() == branch_limit)
-    error ("exceeded maximum number of branches");
+/* The largest number of clauses in CNF or DNF we accept as input
+   for subsumption. This an upper bound of 2^16 expressions.  */
+static int max_problem_size = 16;
 
+static inline bool
+diagnose_constraint_size (tree t)
+{
+  error_at (input_location, "%qE exceeds the maximum constraint complexity", t);
   return false;
 }
 
@@ -777,31 +784,51 @@ prove_implication (tree a, tree c)
    This is done by deriving a proof of the conclusions on the RIGHT
    from the assumptions on the LEFT assumptions.  */
 
-bool
-subsumes_constraints_nonnull (tree left, tree right)
+static bool
+subsumes_constraints_nonnull (tree lhs, tree rhs)
 {
-  gcc_assert (check_constraint_info (left));
-  gcc_assert (check_constraint_info (right));
-
   auto_timevar time (TV_CONSTRAINT_SUB);
-  tree a = CI_ASSOCIATED_CONSTRAINTS (left);
-  tree c = CI_ASSOCIATED_CONSTRAINTS (right);
-  return prove_implication (a, c);
-}
 
-} /* namespace */
+  int n1 = dnf_size (lhs);
+  int n2 = cnf_size (rhs);
+
+  /* Make sure we haven't exceeded the largest acceptable problem.  */
+  if (std::min (n1, n2) >= max_problem_size)
+    {
+      if (n1 < n2)
+        diagnose_constraint_size (lhs);
+      else
+	diagnose_constraint_size (rhs);
+      return false;
+    }
+
+  /* Decompose the smaller of the two formulas, and recursively
+     check the implication using the larger.  Note that for
+     constraints that are largely comprised of conjunctions the
+     it will usually be the case that n1 <= n2. */
+  if (n1 <= n2)
+    {
+      formula dnf = decompose_antecedents (lhs);
+      return derive_proofs (dnf, rhs, left);
+    }
+  else
+    {
+      formula cnf = decompose_consequents (rhs);
+      return derive_proofs (cnf, lhs, right);
+    }
+}
 
 /* Returns true if the LEFT constraints subsume the RIGHT
    constraints.  */
 
 bool
-subsumes (tree left, tree right)
+subsumes (tree lhs, tree rhs)
 {
-  if (left == right)
+  if (lhs == rhs)
     return true;
-  if (!left)
+  if (!lhs || lhs == error_mark_node)
     return false;
-  if (!right)
+  if (!rhs || rhs == error_mark_node)
     return true;
-  return subsumes_constraints_nonnull (left, right);
+  return subsumes_constraints_nonnull (lhs, rhs);
 }
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index ff6d5ee..57ab129 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -2268,7 +2268,13 @@ diagnose_name_conflict (tree decl, tree bval)
       && (TREE_CODE (decl) != TYPE_DECL
 	  || DECL_ARTIFICIAL (decl) == DECL_ARTIFICIAL (bval))
       && CP_DECL_CONTEXT (decl) == CP_DECL_CONTEXT (bval))
-    error ("redeclaration of %q#D", decl);
+    {
+      if (concept_definition_p (decl))
+        error ("redeclaration of %q#D with different template parameters",
+               decl);
+      else
+        error ("redeclaration of %q#D", decl);
+    }
   else
     error ("%q#D conflicts with a previous declaration", decl);
 
@@ -2334,6 +2340,9 @@ matching_fn_p (tree one, tree two)
 	return false;
     }
 
+  if (!equivalently_constrained (one, two))
+    return false;
+
   return true;
 }
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c61e0b2..b6e738c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -169,6 +169,7 @@ enum required_token {
   RT_TRY, /* try */
   RT_CATCH, /* catch */
   RT_THROW, /* throw */
+  RT_AUTO, /* auto */
   RT_LABEL, /* __label__ */
   RT_AT_TRY, /* @try */
   RT_AT_SYNCHRONIZED, /* @synchronized */
@@ -2196,6 +2197,8 @@ static tree cp_parser_type_specifier
    int *, bool *);
 static tree cp_parser_simple_type_specifier
   (cp_parser *, cp_decl_specifier_seq *, cp_parser_flags);
+static tree cp_parser_placeholder_type_specifier
+  (cp_parser *, location_t, tree, bool);
 static tree cp_parser_type_name
   (cp_parser *, bool);
 static tree cp_parser_nonclass_name
@@ -2369,6 +2372,8 @@ static tree cp_parser_type_parameter
   (cp_parser *, bool *);
 static tree cp_parser_template_id
   (cp_parser *, bool, bool, enum tag_types, bool);
+static tree cp_parser_template_id_expr
+  (cp_parser *, bool, bool, bool);
 static tree cp_parser_template_name
   (cp_parser *, bool, bool, bool, enum tag_types, bool *);
 static tree cp_parser_template_argument_list
@@ -2444,7 +2449,9 @@ static void cp_parser_label_declaration
 
 /* Concept Extensions */
 
-static tree cp_parser_requires_clause
+static tree cp_parser_concept_definition
+  (cp_parser *);
+static tree cp_parser_constraint_expression
   (cp_parser *);
 static tree cp_parser_requires_clause_opt
   (cp_parser *);
@@ -2454,7 +2461,7 @@ static tree cp_parser_requirement_parameter_list
   (cp_parser *);
 static tree cp_parser_requirement_body
   (cp_parser *);
-static tree cp_parser_requirement_list
+static tree cp_parser_requirement_seq
   (cp_parser *);
 static tree cp_parser_requirement
   (cp_parser *);
@@ -2687,11 +2694,6 @@ static bool cp_parser_init_statement_p
 static bool cp_parser_skip_to_closing_square_bracket
   (cp_parser *);
 
-/* Concept-related syntactic transformations */
-
-static tree cp_parser_maybe_concept_name       (cp_parser *, tree);
-static tree cp_parser_maybe_partial_concept_id (cp_parser *, tree, tree);
-
 // -------------------------------------------------------------------------- //
 // Unevaluated Operand Guard
 //
@@ -4874,6 +4876,8 @@ class token_pair
 			      m_open_loc);
   }
 
+  location_t open_location () const { return m_open_loc; }
+
  private:
   location_t m_open_loc;
 };
@@ -4948,7 +4952,7 @@ cp_parser_statement_expr (cp_parser *parser)
 
    This returns the tree code corresponding to the matched operator
    as an int. When the current token matches a compound assignment
-   opertor, the resulting tree code is the negative value of the
+   operator, the resulting tree code is the negative value of the
    non-assignment operator. */
 
 static int
@@ -5904,11 +5908,10 @@ cp_parser_id_expression (cp_parser *parser,
 
       cp_parser_parse_tentatively (parser);
       /* Try a template-id.  */
-      id = cp_parser_template_id (parser,
-				  /*template_keyword_p=*/false,
-				  /*check_dependency_p=*/true,
-				  none_type,
-				  declarator_p);
+      id = cp_parser_template_id_expr (parser,
+				       /*template_keyword_p=*/false,
+				       /*check_dependency_p=*/true,
+				       declarator_p);
       /* If that worked, we're done.  */
       if (cp_parser_parse_definitely (parser))
 	return id;
@@ -5983,10 +5986,9 @@ cp_parser_unqualified_id (cp_parser* parser,
 	   template-id.  */
 	cp_parser_parse_tentatively (parser);
 	/* Try a template-id.  */
-	id = cp_parser_template_id (parser, template_keyword_p,
-				    check_dependency_p,
-				    none_type,
-				    declarator_p);
+	id = cp_parser_template_id_expr (parser, template_keyword_p,
+					 check_dependency_p,
+					 declarator_p);
 	/* If it worked, we're done.  */
 	if (cp_parser_parse_definitely (parser))
 	  return id;
@@ -5995,10 +5997,9 @@ cp_parser_unqualified_id (cp_parser* parser,
       }
 
     case CPP_TEMPLATE_ID:
-      return cp_parser_template_id (parser, template_keyword_p,
-				    check_dependency_p,
-				    none_type,
-				    declarator_p);
+      return cp_parser_template_id_expr (parser, template_keyword_p,
+					 check_dependency_p,
+					 declarator_p);
 
     case CPP_COMPL:
       {
@@ -6239,10 +6240,9 @@ cp_parser_unqualified_id (cp_parser* parser,
 	  /* This could be a template-id, so we try that first.  */
 	  cp_parser_parse_tentatively (parser);
 	  /* Try a template-id.  */
-	  id = cp_parser_template_id (parser, template_keyword_p,
-				      /*check_dependency_p=*/true,
-				      none_type,
-				      declarator_p);
+	  id = cp_parser_template_id_expr (parser, template_keyword_p,
+					   /*check_dependency_p=*/true,
+					   declarator_p);
 	  /* If that worked, we're done.  */
 	  if (cp_parser_parse_definitely (parser))
 	    return id;
@@ -9638,6 +9638,8 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p,
 	    current.lhs = error_mark_node;
 	  else
 	    {
+	      current.lhs.maybe_add_location_wrapper ();
+	      rhs.maybe_add_location_wrapper ();
 	      current.lhs
 		= build_min (current.tree_type,
 			     TREE_CODE_CLASS (current.tree_type)
@@ -14059,10 +14061,26 @@ cp_parser_decl_specifier_seq (cp_parser* parser,
         case RID_CONCEPT:
           ds = ds_concept;
           cp_lexer_consume_token (parser->lexer);
+
+          /* Warn for concept as a decl-specifier. We'll rewrite these as
+             concept declarations later.  */
+          if (!flag_concepts_ts)
+            {
+	      cp_token *next = cp_lexer_peek_token (parser->lexer);
+	      if (next->keyword == RID_BOOL)
+		pedwarn (next->location, 0, "the %<bool%> keyword is not "
+			 "allowed in a C++20 concept definition");
+	      else
+		pedwarn (token->location, 0, "C++20 concept definition syntax "
+			 "is %<concept <name> = <expr>%> ");
+            }
+
 	  /* In C++20 a concept definition is just 'concept name = expr;'
-	     Support that syntax by pretending we've seen 'bool'.  */
+	     Support that syntax as a TS extension by pretending we've seen
+	     the 'bool' specifier.  */
 	  if (cp_lexer_next_token_is (parser->lexer, CPP_NAME)
-	      && cp_lexer_nth_token_is (parser->lexer, 2, CPP_EQ))
+	      && cp_lexer_nth_token_is (parser->lexer, 2, CPP_EQ)
+	      && !decl_specs->any_type_specifiers_p)
 	    {
 	      cp_parser_set_decl_spec_type (decl_specs, boolean_type_node,
 					    token, /*type_definition*/false);
@@ -15800,15 +15818,15 @@ get_unqualified_id (cp_declarator *declarator)
     return NULL_TREE;
 }
 
-/* Returns true if DECL represents a constrained-parameter.  */
+/* Returns true if TYPE would declare a constrained constrained-parameter.  */
 
 static inline bool
-is_constrained_parameter (tree decl)
+is_constrained_parameter (tree type)
 {
-  return (decl
-          && TREE_CODE (decl) == TYPE_DECL
-          && CONSTRAINED_PARM_CONCEPT (decl)
-          && DECL_P (CONSTRAINED_PARM_CONCEPT (decl)));
+  return (type
+          && TREE_CODE (type) == TYPE_DECL
+          && CONSTRAINED_PARM_CONCEPT (type)
+          && DECL_P (CONSTRAINED_PARM_CONCEPT (type)));
 }
 
 /* Returns true if PARM declares a constrained-parameter. */
@@ -15894,8 +15912,8 @@ cp_parser_constrained_template_template_parm (cp_parser *parser,
    declarator.  */
 
 static tree
-constrained_non_type_template_parm (bool *is_non_type,
-                                    cp_parameter_declarator *parm)
+cp_parser_constrained_non_type_template_parm (bool *is_non_type,
+					      cp_parameter_declarator *parm)
 {
   *is_non_type = true;
   cp_declarator *decl = parm->declarator;
@@ -15912,20 +15930,13 @@ constrained_non_type_template_parm (bool *is_non_type,
 static tree
 finish_constrained_parameter (cp_parser *parser,
                               cp_parameter_declarator *parmdecl,
-                              bool *is_non_type,
-                              bool *is_parameter_pack)
+                              bool *is_non_type)
 {
   tree decl = parmdecl->decl_specifiers.type;
   tree id = get_unqualified_id (parmdecl->declarator);
   tree def = parmdecl->default_argument;
   tree proto = DECL_INITIAL (decl);
 
-  /* A template parameter constrained by a variadic concept shall also
-     be declared as a template parameter pack.  */
-  bool is_variadic = template_parameter_pack_p (proto);
-  if (is_variadic && !*is_parameter_pack)
-    cp_parser_error (parser, "variadic constraint introduced without %<...%>");
-
   /* Build the parameter. Return an error if the declarator was invalid. */
   tree parm;
   if (TREE_CODE (proto) == TYPE_DECL)
@@ -15934,7 +15945,7 @@ finish_constrained_parameter (cp_parser *parser,
     parm = cp_parser_constrained_template_template_parm (parser, proto, id,
 							 parmdecl);
   else
-    parm = constrained_non_type_template_parm (is_non_type, parmdecl);
+    parm = cp_parser_constrained_non_type_template_parm (is_non_type, parmdecl);
   if (parm == error_mark_node)
     return error_mark_node;
 
@@ -15949,14 +15960,13 @@ finish_constrained_parameter (cp_parser *parser,
 /* Returns true if the parsed type actually represents the declaration
    of a type template-parameter.  */
 
-static inline bool
+static bool
 declares_constrained_type_template_parameter (tree type)
 {
   return (is_constrained_parameter (type)
 	  && TREE_CODE (TREE_TYPE (type)) == TEMPLATE_TYPE_PARM);
 }
 
-
 /* Returns true if the parsed type actually represents the declaration of
    a template template-parameter.  */
 
@@ -16132,12 +16142,11 @@ cp_parser_template_parameter (cp_parser* parser, bool *is_non_type,
 	cp_lexer_consume_token (parser->lexer);
     }
 
-  // The parameter may have been constrained.
+  /* The parameter may have been constrained type parameter.  */
   if (is_constrained_parameter (parameter_declarator))
     return finish_constrained_parameter (parser,
                                          parameter_declarator,
-                                         is_non_type,
-                                         is_parameter_pack);
+                                         is_non_type);
 
   // Now we're sure that the parameter is a non-type parameter.
   *is_non_type = true;
@@ -16263,8 +16272,8 @@ cp_parser_type_parameter (cp_parser* parser, bool *is_parameter_pack)
 	if (flag_concepts)
           {
 	    tree reqs = get_shorthand_constraints (current_template_parms);
-	    if (tree r = cp_parser_requires_clause_opt (parser))
-              reqs = conjoin_constraints (reqs, normalize_expression (r));
+	    if (tree dreqs = cp_parser_requires_clause_opt (parser))
+              reqs = combine_constraint_expressions (reqs, dreqs);
 	    TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = reqs;
           }
 
@@ -16370,6 +16379,7 @@ cp_parser_template_id (cp_parser *parser,
   /* If the next token corresponds to a template-id, there is no need
      to reparse it.  */
   cp_token *token = cp_lexer_peek_token (parser->lexer);
+
   if (token->type == CPP_TEMPLATE_ID)
     {
       cp_lexer_consume_token (parser->lexer);
@@ -16512,7 +16522,7 @@ cp_parser_template_id (cp_parser *parser,
     = make_location (token->location, token->location, parser->lexer);
 
   /* Check for concepts autos where they don't belong.  We could
-     identify types in some cases of idnetifier TEMPL, looking ahead
+     identify types in some cases of identifier TEMPL, looking ahead
      for a CPP_SCOPE, but that would buy us nothing: we accept auto in
      types.  We reject them in functions, but if what we have is an
      identifier, even with none_type we can't conclude it's NOT a
@@ -16538,11 +16548,13 @@ cp_parser_template_id (cp_parser *parser,
       template_id
 	= finish_template_type (templ, arguments, entering_scope);
     }
-  /* A template-like identifier may be a partial concept id. */
-  else if (flag_concepts
-           && (template_id = (cp_parser_maybe_partial_concept_id
-			      (parser, templ, arguments))))
-    return template_id;
+  else if (concept_definition_p (templ))
+    {
+      /* The caller will decide whether this is a concept check or type
+	 constraint.  */
+      template_id = build2_loc (combined_loc, TEMPLATE_ID_EXPR,
+				boolean_type_node, templ, arguments);
+    }
   else if (variable_template_p (templ))
     {
       template_id = lookup_template_variable (templ, arguments);
@@ -16599,6 +16611,23 @@ cp_parser_template_id (cp_parser *parser,
   return template_id;
 }
 
+/* Like cp_parser_template_id, called in non-type context.  */
+
+static tree
+cp_parser_template_id_expr (cp_parser *parser,
+			    bool template_keyword_p,
+			    bool check_dependency_p,
+			    bool is_declaration)
+{
+  tree x = cp_parser_template_id (parser, template_keyword_p, check_dependency_p,
+				  none_type, is_declaration);
+  if (TREE_CODE (x) == TEMPLATE_ID_EXPR
+      && concept_check_p (x))
+    /* We didn't check the arguments in cp_parser_template_id; do that now.  */
+    return build_concept_id (x);
+  return x;
+}
+
 /* Parse a template-name.
 
    template-name:
@@ -17019,11 +17048,7 @@ cp_parser_template_argument (cp_parser* parser)
 					  /*check_dependency=*/true,
 					  /*ambiguous_decls=*/NULL,
 					  argument_start_token->location);
-      /* Handle a constrained-type-specifier for a non-type template
-	 parameter.  */
-      if (tree decl = cp_parser_maybe_concept_name (parser, argument))
-	argument = decl;
-      else if (TREE_CODE (argument) != TEMPLATE_DECL
+      if (TREE_CODE (argument) != TEMPLATE_DECL
 	       && TREE_CODE (argument) != UNBOUND_CLASS_TEMPLATE)
 	cp_parser_error (parser, "expected template-name");
     }
@@ -17772,7 +17797,7 @@ cp_parser_simple_type_specifier (cp_parser* parser,
 	  else if (!flag_concepts)
 	    pedwarn (token->location, 0,
 		     "use of %<auto%> in parameter declaration "
-		     "only available with %<-fconcepts%>");
+		     "only available with %<-fconcepts-ts%>");
 	}
       else
 	type = make_auto ();
@@ -17888,6 +17913,10 @@ cp_parser_simple_type_specifier (cp_parser* parser,
       if (flags & CP_PARSER_FLAGS_OPTIONAL)
 	cp_parser_parse_tentatively (parser);
 
+      /* Remember current tentative parsing state -- if we know we need
+	 a type, we can give better diagnostics here.  */
+      bool tent = cp_parser_parsing_tentatively (parser);
+
       token = cp_lexer_peek_token (parser->lexer);
 
       /* Look for the optional `::' operator.  */
@@ -17942,13 +17971,44 @@ cp_parser_simple_type_specifier (cp_parser* parser,
 	    type = NULL_TREE;
 	}
 
+      if (!type && flag_concepts && decl_specs)
+	{
+	  /* Try for a type-constraint with template arguments.  We check
+	     decl_specs here to avoid trying this for a functional cast.  */
+
+	  cp_parser_parse_tentatively (parser);
+
+	  type = cp_parser_template_id (parser,
+					/*template_keyword_p=*/false,
+					/*check_dependency_p=*/true,
+					none_type,
+					/*is_declaration=*/false);
+	  if (type && concept_check_p (type))
+	    {
+	      location_t loc = EXPR_LOCATION (type);
+	      type = cp_parser_placeholder_type_specifier (parser, loc,
+							   type, tent);
+	      if (tent && type == error_mark_node)
+		/* Perhaps it's a concept-check expression.  */
+		cp_parser_simulate_error (parser);
+	    }
+	  else
+	    cp_parser_simulate_error (parser);
+
+	  if (!cp_parser_parse_definitely (parser))
+	    type = NULL_TREE;
+	}
+
       if (!type && cxx_dialect >= cxx17)
 	{
-	  /* Try class template argument deduction.  */
+	  /* Try class template argument deduction or type-constraint without
+	     template arguments.  */
 	  tree name = cp_parser_identifier (parser);
 	  if (name && TREE_CODE (name) == IDENTIFIER_NODE
 	      && parser->scope != error_mark_node)
 	    {
+	      location_t loc
+		= cp_lexer_previous_token (parser->lexer)->location;
 	      tree tmpl = cp_parser_lookup_name (parser, name,
 						 none_type,
 						 /*is_template=*/false,
@@ -17960,6 +18020,9 @@ cp_parser_simple_type_specifier (cp_parser* parser,
 		  && (DECL_CLASS_TEMPLATE_P (tmpl)
 		      || DECL_TEMPLATE_TEMPLATE_PARM_P (tmpl)))
 		type = make_template_placeholder (tmpl);
+	      else if (flag_concepts && tmpl && concept_definition_p (tmpl))
+		type = cp_parser_placeholder_type_specifier (parser, loc,
+							     tmpl, tent);
 	      else
 		{
 		  type = error_mark_node;
@@ -18031,6 +18094,140 @@ cp_parser_simple_type_specifier (cp_parser* parser,
   return type;
 }
 
+/* Parse the remainder of a placholder-type-specifier.
+
+   placeholder-type-specifier:
+     type-constraint_opt auto
+     type-constraint_opt decltype(auto)
+
+  The raw form of the constraint is parsed in cp_parser_simple_type_specifier
+  and passed as TMPL. This function converts TMPL to an actual type-constraint,
+  parses the placeholder type, and performs some contextual syntactic analysis.
+
+  LOC provides the location of the template name.
+
+  TENTATIVE is true if the type-specifier parsing is tentative; in that case,
+  don't give an error if TMPL isn't a valid type-constraint, as the template-id
+  might actually be a concept-check,
+
+  Note that the Concepts TS allows the auto or decltype(auto) to be
+  omitted in a constrained-type-specifier.  */
+
+tree
+cp_parser_placeholder_type_specifier (cp_parser *parser, location_t loc,
+				      tree tmpl, bool tentative)
+{
+  if (tmpl == error_mark_node)
+    return error_mark_node;
+
+  tree orig_tmpl = tmpl;
+
+  /* Get the arguments as written for subsequent analysis.  */
+  tree args = NULL_TREE;
+  if (TREE_CODE (tmpl) == TEMPLATE_ID_EXPR)
+    {
+      args = TREE_OPERAND (tmpl, 1);
+      tmpl = TREE_OPERAND (tmpl, 0);
+    }
+  if (args == NULL_TREE)
+    /* A concept-name with no arguments can't be an expression.  */
+    tentative = false;
+
+  tsubst_flags_t complain = tentative ? tf_none : tf_warning_or_error;
+
+  /* Get the concept and prototype parameter for the constraint.  */
+  tree_pair info = finish_type_constraints (tmpl, args, complain);
+  tree con = info.first;
+  tree proto = info.second;
+  if (con == error_mark_node)
+    return error_mark_node;
+
+  /* As per the standard, require auto or decltype(auto), except in some
+     cases (template parameter lists, -fconcepts-ts enabled).  */
+  cp_token *placeholder = NULL, *open_paren = NULL, *close_paren = NULL;
+  if (cxx_dialect >= cxx2a)
+    {
+      if (cp_lexer_next_token_is_keyword (parser->lexer, RID_AUTO))
+	placeholder = cp_lexer_consume_token (parser->lexer);
+      else if (cp_lexer_next_token_is_keyword (parser->lexer, RID_DECLTYPE))
+	{
+	  placeholder = cp_lexer_consume_token (parser->lexer);
+	  open_paren = cp_parser_require (parser, CPP_OPEN_PAREN,
+					  RT_OPEN_PAREN);
+	  cp_parser_require_keyword (parser, RID_AUTO, RT_AUTO);
+          close_paren = cp_parser_require (parser, CPP_CLOSE_PAREN,
+					   RT_CLOSE_PAREN,
+					   open_paren->location);
+	}
+    }
+
+  /* A type constraint constrains a contextually determined type or type
+     parameter pack. However, the the Concepts TS does allow concepts
+     to introduce non-type and template template parameters.  */
+  if (TREE_CODE (proto) != TYPE_DECL)
+    {
+      if (!flag_concepts_ts
+	  || !processing_template_parmlist)
+	{
+	  error_at (loc, "%qE does not constrain a type", DECL_NAME (con));
+	  inform (DECL_SOURCE_LOCATION (con), "concept defined here");
+	  return error_mark_node;
+	}
+    }
+
+  /* In a template parameter list, a type-parameter can be introduced
+     by type-constraints alone.  */
+  if (processing_template_parmlist && !placeholder)
+    return build_constrained_parameter (con, proto, args);
+
+  /* Diagnose issues placeholder issues.  */
+  if (!flag_concepts_ts
+      && !parser->in_result_type_constraint_p
+      && !placeholder)
+    {
+      tree id = build_nt (TEMPLATE_ID_EXPR, tmpl, args);
+      tree expr = DECL_P (orig_tmpl) ? DECL_NAME (con) : id;
+      error_at (input_location,
+		"expected %<auto%> or %<decltype(auto)%> after %qE", expr);
+      /* Fall through. This is an error of omission.  */
+    }
+  else if (parser->in_result_type_constraint_p && placeholder)
+    {
+      /* A trailing return type only allows type-constraints.  */
+      error_at (input_location,
+		"unexpected placeholder in constrained result type");
+    }
+
+  /* In a parameter-declaration-clause, a placeholder-type-specifier
+     results in an invented template parameter.  */
+  if (parser->auto_is_implicit_function_template_parm_p)
+    {
+      if (placeholder && token_is_decltype (placeholder))
+	{
+	  location_t loc = make_location (placeholder->location,
+					  placeholder->location,
+					  close_paren->location);
+	  error_at (loc, "cannot declare a parameter with %<decltype(auto)%>");
+	  return error_mark_node;
+	}
+      tree parm = build_constrained_parameter (con, proto, args);
+      return synthesize_implicit_template_parm (parser, parm);
+    }
+
+  /* Determine if the type should be deduced using template argument
+     deduction or decltype deduction. Note that the latter is always
+     used for type-constraints in trailing return types.  */
+  bool decltype_p = placeholder
+    ? placeholder->keyword == RID_DECLTYPE
+    : parser->in_result_type_constraint_p;
+
+  /* Otherwise, this is the type of a variable or return type.  */
+  if (decltype_p)
+    return make_constrained_decltype_auto (con, args);
+  else
+    return make_constrained_auto (con, args);
+}
+
 /* Parse a type-name.
 
    type-name:
@@ -18103,8 +18300,6 @@ cp_parser_type_name (cp_parser* parser, bool typename_keyword_p)
 	  && TREE_CODE (type_decl) == TYPE_DECL
 	  && TYPE_DECL_ALIAS_P (type_decl))
 	gcc_assert (DECL_TEMPLATE_INSTANTIATION (type_decl));
-      else if (is_constrained_parameter (type_decl))
-        /* Don't do anything. */ ;
       else
 	cp_parser_simulate_error (parser);
 
@@ -18116,105 +18311,6 @@ cp_parser_type_name (cp_parser* parser, bool typename_keyword_p)
   return type_decl;
 }
 
-/*  Check if DECL and ARGS can form a constrained-type-specifier.
-    If ARGS is non-null, we try to form a concept check of the
-    form DECL<?, ARGS> where ? is a wildcard that matches any
-    kind of template argument. If ARGS is NULL, then we try to
-    form a concept check of the form DECL<?>. */
-
-static tree
-cp_parser_maybe_constrained_type_specifier (cp_parser *parser,
-					    tree decl, tree args)
-{
-  gcc_assert (args ? TREE_CODE (args) == TREE_VEC : true);
-
-  /* If we a constrained-type-specifier cannot be deduced. */
-  if (parser->prevent_constrained_type_specifiers)
-    return NULL_TREE;
-
-  /* A constrained type specifier can only be found in an
-     overload set or as a reference to a template declaration.
-
-     FIXME: This might be masking a bug.  It's possible that
-     that the deduction below is causing template specializations
-     to be formed with the wildcard as an argument.  */
-  if (TREE_CODE (decl) != OVERLOAD && TREE_CODE (decl) != TEMPLATE_DECL)
-    return NULL_TREE;
-
-  /* Try to build a call expression that evaluates the
-     concept. This can fail if the overload set refers
-     only to non-templates. */
-  tree placeholder = build_nt (WILDCARD_DECL);
-  tree check = build_concept_check (decl, placeholder, args);
-  if (check == error_mark_node)
-    return NULL_TREE;
-
-  /* Deduce the checked constraint and the prototype parameter.
-
-     FIXME: In certain cases, failure to deduce should be a
-     diagnosable error.  */
-  tree conc;
-  tree proto;
-  if (!deduce_constrained_parameter (check, conc, proto))
-    return NULL_TREE;
-
-  /* In template parameter scope, this results in a constrained
-     parameter. Return a descriptor of that parm. */
-  if (processing_template_parmlist)
-    return build_constrained_parameter (conc, proto, args);
-
-  /* In a parameter-declaration-clause, constrained-type
-     specifiers result in invented template parameters.  */
-  if (parser->auto_is_implicit_function_template_parm_p)
-    {
-      tree x = build_constrained_parameter (conc, proto, args);
-      return synthesize_implicit_template_parm (parser, x);
-    }
-  else
-    {
-     /* Otherwise, we're in a context where the constrained
-        type name is deduced and the constraint applies
-        after deduction. */
-      return make_constrained_auto (conc, args);
-    }
-
-  return NULL_TREE;
-}
-
-/* If DECL refers to a concept, return a TYPE_DECL representing
-   the result of using the constrained type specifier in the
-   current context.  DECL refers to a concept if
-
-  - it is an overload set containing a function concept taking a single
-    type argument, or
-
-  - it is a variable concept taking a single type argument.  */
-
-static tree
-cp_parser_maybe_concept_name (cp_parser* parser, tree decl)
-{
-  if (flag_concepts
-      && (TREE_CODE (decl) == OVERLOAD
-	  || BASELINK_P (decl)
-	  || variable_concept_p (decl)))
-    return cp_parser_maybe_constrained_type_specifier (parser, decl, NULL_TREE);
-  else
-    return NULL_TREE;
-}
-
-/* Check if DECL and ARGS form a partial-concept-id.  If so,
-   assign ID to the resulting constrained placeholder.
-
-   Returns true if the partial-concept-id designates a placeholder
-   and false otherwise. Note that *id is set to NULL_TREE in
-   this case. */
-
-static tree
-cp_parser_maybe_partial_concept_id (cp_parser *parser, tree decl, tree args)
-{
-  return cp_parser_maybe_constrained_type_specifier (parser, decl, args);
-}
-
 /* Parse a non-class type-name, that is, either an enum-name, a typedef-name,
    or a concept-name.
 
@@ -18245,10 +18341,6 @@ cp_parser_nonclass_name (cp_parser* parser)
 
   type_decl = strip_using_decl (type_decl);
 
-  /* If we found an overload set, then it may refer to a concept-name. */
-  if (tree decl = cp_parser_maybe_concept_name (parser, type_decl))
-    type_decl = decl;
-
   if (TREE_CODE (type_decl) != TYPE_DECL
       && (objc_is_id (identifier) || objc_is_class_name (identifier)))
     {
@@ -26886,30 +26978,279 @@ cp_parser_label_declaration (cp_parser* parser)
 }
 
 // -------------------------------------------------------------------------- //
+// Concept definitions
+
+static tree
+cp_parser_concept_definition (cp_parser *parser)
+{
+  gcc_assert (cp_lexer_next_token_is_keyword (parser->lexer, RID_CONCEPT));
+  cp_lexer_consume_token (parser->lexer);
+
+  cp_expr id = cp_parser_identifier (parser);
+  if (id == error_mark_node)
+    {
+      cp_parser_skip_to_end_of_statement (parser);
+      cp_parser_consume_semicolon_at_end_of_statement (parser);
+      return NULL_TREE;
+    }
+
+  if (!cp_parser_require (parser, CPP_EQ, RT_EQ))
+    {
+      cp_parser_skip_to_end_of_statement (parser);
+      cp_parser_consume_semicolon_at_end_of_statement (parser);
+      return error_mark_node;
+    }
+
+  processing_constraint_expression_sentinel parsing_constraint;
+  tree init = cp_parser_constraint_expression (parser);
+  if (init == error_mark_node)
+    cp_parser_skip_to_end_of_statement (parser);
+
+  /* Consume the trailing ';'. Diagnose the problem if it isn't there,
+     but continue as if it were.  */
+  cp_parser_consume_semicolon_at_end_of_statement (parser);
+
+  return finish_concept_definition (id, init);
+}
+
+// -------------------------------------------------------------------------- //
 // Requires Clause
 
-// Parse a requires clause.
-//
-//    requires-clause:
-//      'requires' logical-or-expression
-//
-// The required logical-or-expression must be a constant expression. Note
-// that we don't check that the expression is constepxr here. We defer until
-// we analyze constraints and then, we only check atomic constraints.
+/* Diagnose an expression that should appear in ()'s within a requires-clause
+   and suggest where to place those parentheses.  */
+
+static void
+cp_parser_diagnose_ungrouped_constraint_plain (location_t loc)
+{
+  error_at (loc, "expression after %<requires%> must be enclosed "
+		 "in parentheses");
+}
+
+static void
+cp_parser_diagnose_ungrouped_constraint_rich (location_t loc)
+{
+  gcc_rich_location richloc (loc);
+  richloc.add_fixit_insert_before ("(");
+  richloc.add_fixit_insert_after (")");
+  error_at (&richloc, "expression after %<requires%> must be enclosed "
+		      "in parentheses");
+}
+
+/* Parse a primary expression within a constraint.  */
+
+static cp_expr
+cp_parser_constraint_primary_expression (cp_parser *parser)
+{
+  cp_parser_parse_tentatively (parser);
+  cp_id_kind idk;
+  location_t loc = input_location;
+  cp_expr expr = cp_parser_primary_expression (parser,
+					       /*address_p=*/false,
+					       /*cast_p=*/false,
+					       /*template_arg_p=*/false,
+					       &idk);
+  expr.maybe_add_location_wrapper ();
+  if (expr != error_mark_node)
+    expr = finish_constraint_primary_expr (expr);
+  if (cp_parser_parse_definitely (parser))
+    return expr;
+
+  /* Retry the parse at a lower precedence. If that succeeds, diagnose the
+     error, but return the expression as if it were valid.  */
+  cp_parser_parse_tentatively (parser);
+  expr = cp_parser_simple_cast_expression (parser);
+  if (cp_parser_parse_definitely (parser))
+    {
+      cp_parser_diagnose_ungrouped_constraint_rich (expr.get_location());
+      return expr;
+    }
+
+  /* Otherwise, something has gone wrong, but we can't generate a more
+     meaningful diagnostic or recover.  */
+  cp_parser_diagnose_ungrouped_constraint_plain (loc);
+  return error_mark_node;
+}
+
+/* Examine the token following EXPR. If it is an operator in a non-logical
+   binary expression, diagnose that as an error. Returns ERROR_MARK_NODE.  */
+
+static cp_expr
+cp_parser_check_non_logical_constraint (cp_parser *parser, cp_expr lhs)
+{
+  cp_token *token = cp_lexer_peek_token (parser->lexer);
+  switch (token->type)
+    {
+      default:
+        return lhs;
+
+      /* Arithmetic operators.  */
+      case CPP_PLUS:
+      case CPP_MINUS:
+      case CPP_MULT:
+      case CPP_DIV:
+      case CPP_MOD:
+      /* Bitwise operators.  */
+      case CPP_AND:
+      case CPP_OR:
+      case CPP_XOR:
+      case CPP_RSHIFT:
+      case CPP_LSHIFT:
+      /* Relational operators.  */
+      /* FIXME: Handle '<=>'.  */
+      case CPP_EQ_EQ:
+      case CPP_NOT_EQ:
+      case CPP_LESS:
+      case CPP_GREATER:
+      case CPP_LESS_EQ:
+      case CPP_GREATER_EQ:
+      /* Conditional operator */
+      case CPP_QUERY:
+      /* Pointer-to-member.  */
+      case CPP_DOT_STAR:
+      case CPP_DEREF_STAR:
+      /* Assignment operators.  */
+      case CPP_PLUS_EQ:
+      case CPP_MINUS_EQ:
+      case CPP_MULT_EQ:
+      case CPP_DIV_EQ:
+      case CPP_MOD_EQ:
+      case CPP_AND_EQ:
+      case CPP_OR_EQ:
+      case CPP_XOR_EQ:
+      case CPP_RSHIFT_EQ:
+      case CPP_LSHIFT_EQ:
+        break;
+
+      case CPP_EQ: {
+	/* An equal sign may be part of the the definition of a function,
+	   and not an assignment operator, when parsing the expression
+	   for a trailing requires-clause. For example:
+
+	      template<typename T>
+	      struct S {
+		S() requires C<T> = default;
+	      }
+
+	   This is not an error.  */
+	if (cp_lexer_nth_token_is_keyword (parser->lexer, 2, RID_DELETE)
+	    || cp_lexer_nth_token_is_keyword (parser->lexer, 2, RID_DEFAULT))
+	  return lhs;
+
+        break;
+      }
+   }
+
+   /* Try to parse the RHS as either the remainder of a conditional-expression
+      or a logical-or-expression so we can form a good diagnostic.  */
+  cp_parser_parse_tentatively (parser);
+  cp_expr rhs;
+  if (token->type == CPP_QUERY)
+    rhs = cp_parser_question_colon_clause (parser, lhs);
+  else
+    {
+      cp_lexer_consume_token (parser->lexer);
+      rhs = cp_parser_binary_expression (parser, false, false, false,
+					 PREC_NOT_OPERATOR, NULL);
+    }
+
+  /* If we couldn't parse the RHS, then emit the best diagnostic we can.  */
+  if (!cp_parser_parse_definitely (parser))
+    {
+      cp_parser_diagnose_ungrouped_constraint_plain (token->location);
+      return error_mark_node;
+    }
+
+  /* Otherwise, emit a fixit for the complete binary expression.  */
+  location_t loc = make_location (token->location,
+				  lhs.get_start(),
+				  rhs.get_finish());
+  cp_parser_diagnose_ungrouped_constraint_rich (loc);
+  return error_mark_node;
+}
+
+/* Parse a constraint-logical-and-expression.
+
+     constraint-logical-and-expression:
+       primary-expression
+       constraint-logical-and-expression '&&' primary-expression  */
+
+static cp_expr
+cp_parser_constraint_logical_and_expression (cp_parser *parser)
+{
+  cp_expr lhs = cp_parser_constraint_primary_expression (parser);
+  while (cp_lexer_next_token_is (parser->lexer, CPP_AND_AND))
+    {
+      cp_token *op = cp_lexer_consume_token (parser->lexer);
+      tree rhs = cp_parser_constraint_primary_expression (parser);
+      lhs = finish_constraint_and_expr (op->location, lhs, rhs);
+    }
+  return cp_parser_check_non_logical_constraint (parser, lhs);
+}
+
+/* Parse a constraint-logical-or-expression.
+
+     constraint-logical-or-expression:
+       constraint-logical-and-expression
+       constraint-logical-or-expression '||' constraint-logical-and-expression  */
+
+static cp_expr
+cp_parser_constraint_logical_or_expression (cp_parser *parser)
+{
+  cp_expr lhs = cp_parser_constraint_logical_and_expression (parser);
+  while (cp_lexer_next_token_is (parser->lexer, CPP_OR_OR))
+    {
+      cp_token *op = cp_lexer_consume_token (parser->lexer);
+      cp_expr rhs = cp_parser_constraint_logical_and_expression (parser);
+      lhs = finish_constraint_or_expr (op->location, lhs, rhs);
+    }
+  return cp_parser_check_non_logical_constraint (parser, lhs);
+}
+
+/* Parse the expression after a requires-clause. This has a different grammar
+    than that in the concepts TS.  */
+
 static tree
-cp_parser_requires_clause (cp_parser *parser)
+cp_parser_requires_clause_expression (cp_parser *parser)
 {
-  // Parse the requires clause so that it is not automatically folded.
+  processing_constraint_expression_sentinel parsing_constraint;
   ++processing_template_decl;
-  tree expr = cp_parser_binary_expression (parser, false, false,
-					   PREC_NOT_OPERATOR, NULL);
+  cp_expr expr = cp_parser_constraint_logical_or_expression (parser);
   if (check_for_bare_parameter_packs (expr))
     expr = error_mark_node;
   --processing_template_decl;
   return expr;
 }
 
-// Optionally parse a requires clause:
+/* Parse a expression after a requires clause.
+
+    constraint-expression:
+      logical-or-expression
+
+   The required logical-or-expression must be a constant expression. Note
+   that we don't check that the expression is constepxr here. We defer until
+   we analyze constraints and then, we only check atomic constraints.  */
+
+static tree
+cp_parser_constraint_expression (cp_parser *parser)
+{
+  processing_constraint_expression_sentinel parsing_constraint;
+  ++processing_template_decl;
+  cp_expr expr = cp_parser_binary_expression (parser, false, true,
+					      PREC_NOT_OPERATOR, NULL);
+  if (check_for_bare_parameter_packs (expr))
+    expr = error_mark_node;
+  --processing_template_decl;
+  expr.maybe_add_location_wrapper ();
+  return expr;
+}
+
+/* Optionally parse a requires clause:
+
+      requires-clause:
+        `requires` constraint-logical-or-expression.
+   [ConceptsTS]
+        `requires constraint-expression.  */
+
 static tree
 cp_parser_requires_clause_opt (cp_parser *parser)
 {
@@ -26920,17 +27261,21 @@ cp_parser_requires_clause_opt (cp_parser *parser)
 	  && tok->u.value == ridpointers[RID_REQUIRES])
 	{
 	  error_at (cp_lexer_peek_token (parser->lexer)->location,
-		    "%<requires%> only available with %<-fconcepts%>");
+		    "%<requires%> only available with "
+                    "%<-std=c++2a%> or %<-fconcepts%>");
 	  /* Parse and discard the requires-clause.  */
 	  cp_lexer_consume_token (parser->lexer);
-	  cp_parser_requires_clause (parser);
+	  cp_parser_constraint_expression (parser);
 	}
       return NULL_TREE;
     }
   cp_lexer_consume_token (parser->lexer);
-  return cp_parser_requires_clause (parser);
-}
 
+  if (!flag_concepts_ts)
+    return cp_parser_requires_clause_expression (parser);
+  else
+    return cp_parser_constraint_expression (parser);
+}
 
 /*---------------------------------------------------------------------------
                            Requires expressions
@@ -26940,6 +27285,7 @@ cp_parser_requires_clause_opt (cp_parser *parser)
 
    requirement-expression:
        'requires' requirement-parameter-list [opt] requirement-body */
+
 static tree
 cp_parser_requires_expression (cp_parser *parser)
 {
@@ -26957,6 +27303,9 @@ cp_parser_requires_expression (cp_parser *parser)
       return error_mark_node;
     }
 
+  /* This is definitely a requires-expression.  */
+  cp_parser_commit_to_tentative_parse (parser);
+
   tree parms, reqs;
   {
     /* Local parameters are delared as variables within the scope
@@ -26997,13 +27346,15 @@ cp_parser_requires_expression (cp_parser *parser)
   /* This needs to happen after pop_bindings_and_leave_scope, as it reverses
      the parm chain.  */
   grokparms (parms, &parms);
-  return finish_requires_expr (parms, reqs);
+  loc = make_location (loc, loc, parser->lexer);
+  return finish_requires_expr (loc, parms, reqs);
 }
 
 /* Parse a parameterized requirement.
 
    requirement-parameter-list:
        '(' parameter-declaration-clause ')' */
+
 static tree
 cp_parser_requirement_parameter_list (cp_parser *parser)
 {
@@ -27031,7 +27382,7 @@ cp_parser_requirement_body (cp_parser *parser)
   if (!braces.require_open (parser))
     return error_mark_node;
 
-  tree reqs = cp_parser_requirement_list (parser);
+  tree reqs = cp_parser_requirement_seq (parser);
 
   if (!braces.require_close (parser))
     return error_mark_node;
@@ -27039,34 +27390,28 @@ cp_parser_requirement_body (cp_parser *parser)
   return reqs;
 }
 
-/* Parse a list of requirements.
+/* Parse a sequence of requirements.
 
-   requirement-list:
+   requirement-seq:
        requirement
-       requirement-list ';' requirement[opt] */
+       requirement-seq requirement */
+
 static tree
-cp_parser_requirement_list (cp_parser *parser)
+cp_parser_requirement_seq (cp_parser *parser)
 {
   tree result = NULL_TREE;
-  while (true)
+  do
     {
       tree req = cp_parser_requirement (parser);
-      if (req == error_mark_node)
-        return error_mark_node;
-
-      result = tree_cons (NULL_TREE, req, result);
-
-      /* If we see a semi-colon, consume it. */
-      if (cp_lexer_next_token_is (parser->lexer, CPP_SEMICOLON))
-	cp_lexer_consume_token (parser->lexer);
+      if (req != error_mark_node)
+	result = tree_cons (NULL_TREE, req, result);
+    } while (cp_lexer_next_token_is_not (parser->lexer, CPP_CLOSE_BRACE));
 
-      /* Stop processing at the end of the list. */
-      if (cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_BRACE))
-        break;
-    }
+  /* If there are no valid requirements, this is not a valid expression. */
+  if (!result)
+    return error_mark_node;
 
-  /* Reverse the order of requirements so they are analyzed in
-     declaration order. */
+  /* Reverse the order of requirements so they are analyzed in order. */
   return nreverse (result);
 }
 
@@ -27077,6 +27422,7 @@ cp_parser_requirement_list (cp_parser *parser)
        compound-requirement
        type-requirement
        nested-requirement */
+
 static tree
 cp_parser_requirement (cp_parser *parser)
 {
@@ -27094,17 +27440,26 @@ cp_parser_requirement (cp_parser *parser)
 
      simple-requirement:
        expression ';' */
+
 static tree
 cp_parser_simple_requirement (cp_parser *parser)
 {
-  tree expr = cp_parser_expression (parser, NULL, false, false);
+  location_t start = cp_lexer_peek_token (parser->lexer)->location;
+  cp_expr expr = cp_parser_expression (parser, NULL, false, false);
+  if (expr == error_mark_node)
+    cp_parser_skip_to_end_of_statement (parser);
+
+  cp_parser_consume_semicolon_at_end_of_statement (parser);
+
   if (!expr || expr == error_mark_node)
     return error_mark_node;
 
-  if (!cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON))
-    return error_mark_node;
+  /* Sometimes we don't get locations, so use the cached token location
+     as a reasonable approximation.  */
+  if (expr.get_location() == UNKNOWN_LOCATION)
+    expr.set_location (start);
 
-  return finish_simple_requirement (expr);
+  return finish_simple_requirement (expr.get_location (), expr);
 }
 
 /* Parse a type requirement
@@ -27115,16 +27470,18 @@ cp_parser_simple_requirement (cp_parser *parser)
      required-type-name:
          type-name
          'template' [opt] simple-template-id  */
+
 static tree
 cp_parser_type_requirement (cp_parser *parser)
 {
-  cp_lexer_consume_token (parser->lexer);
+  cp_token *start_tok = cp_lexer_consume_token (parser->lexer);
+  location_t loc = cp_lexer_peek_token (parser->lexer)->location;
 
   // Save the scope before parsing name specifiers.
   tree saved_scope = parser->scope;
   tree saved_object_scope = parser->object_scope;
   tree saved_qualifying_scope = parser->qualifying_scope;
-  cp_parser_global_scope_opt (parser, /*current_scope_valid_p=*/true);
+  cp_parser_global_scope_opt (parser, /*current_scope_valid_p=*/false);
   cp_parser_nested_name_specifier_opt (parser,
                                        /*typename_keyword_p=*/true,
                                        /*check_dependency_p=*/false,
@@ -27156,18 +27513,20 @@ cp_parser_type_requirement (cp_parser *parser)
   if (type == error_mark_node)
     cp_parser_skip_to_end_of_statement (parser);
 
-  if (!cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON))
-    return error_mark_node;
+  cp_parser_consume_semicolon_at_end_of_statement (parser);
+
   if (type == error_mark_node)
     return error_mark_node;
 
-  return finish_type_requirement (type);
+  loc = make_location (loc, start_tok->location, parser->lexer);
+  return finish_type_requirement (loc, type);
 }
 
 /* Parse a compound requirement
 
      compound-requirement:
          '{' expression '}' 'noexcept' [opt] trailing-return-type [opt] ';' */
+
 static tree
 cp_parser_compound_requirement (cp_parser *parser)
 {
@@ -27176,12 +27535,26 @@ cp_parser_compound_requirement (cp_parser *parser)
   if (!braces.require_open (parser))
     return error_mark_node;
 
+  cp_token *expr_token = cp_lexer_peek_token (parser->lexer);
+
   tree expr = cp_parser_expression (parser, NULL, false, false);
-  if (!expr || expr == error_mark_node)
-    return error_mark_node;
+  if (expr == error_mark_node)
+    cp_parser_skip_to_closing_brace (parser);
 
   if (!braces.require_close (parser))
-    return error_mark_node;
+    {
+      cp_parser_skip_to_end_of_statement (parser);
+      cp_parser_consume_semicolon_at_end_of_statement (parser);
+      return error_mark_node;
+    }
+
+  /* If the expression was invalid, skip the remainder of the requirement.  */
+  if (!expr || expr == error_mark_node)
+    {
+      cp_parser_skip_to_end_of_statement (parser);
+      cp_parser_consume_semicolon_at_end_of_statement (parser);
+      return error_mark_node;
+    }
 
   /* Parse the optional noexcept. */
   bool noexcept_p = false;
@@ -27196,29 +27569,69 @@ cp_parser_compound_requirement (cp_parser *parser)
   if (cp_lexer_next_token_is (parser->lexer, CPP_DEREF))
     {
       cp_lexer_consume_token (parser->lexer);
+      cp_token *tok = cp_lexer_peek_token (parser->lexer);
+
       bool saved_result_type_constraint_p = parser->in_result_type_constraint_p;
       parser->in_result_type_constraint_p = true;
+      /* C++2a allows either a type-id or a type-constraint. Parsing
+         a type-id will subsume the parsing for a type-constraint but
+         allow for more syntactic forms (e.g., const C<T>*).  */
       type = cp_parser_trailing_type_id (parser);
       parser->in_result_type_constraint_p = saved_result_type_constraint_p;
       if (type == error_mark_node)
         return error_mark_node;
+
+      location_t type_loc = make_location (tok->location, tok->location,
+					   parser->lexer);
+
+      /* Check that we haven't written something like 'const C<T>*'.  */
+      if (type_uses_auto (type))
+	{
+	  if (!is_auto (type))
+	    {
+	      error_at (type_loc,
+			"result type is not a plain type-constraint");
+	      cp_parser_consume_semicolon_at_end_of_statement (parser);
+	      return error_mark_node;
+	    }
+	}
+      else if (!flag_concepts_ts)
+	/* P1452R2 removed the trailing-return-type option.  */
+	error_at (type_loc,
+		  "return-type-requirement is not a type-constraint");
     }
 
-  return finish_compound_requirement (expr, type, noexcept_p);
+  location_t loc = make_location (expr_token->location,
+				  braces.open_location (),
+				  parser->lexer);
+
+  cp_parser_consume_semicolon_at_end_of_statement (parser);
+
+  if (expr == error_mark_node || type == error_mark_node)
+    return error_mark_node;
+
+  return finish_compound_requirement (loc, expr, type, noexcept_p);
 }
 
 /* Parse a nested requirement. This is the same as a requires clause.
 
    nested-requirement:
      requires-clause */
+
 static tree
 cp_parser_nested_requirement (cp_parser *parser)
 {
-  cp_lexer_consume_token (parser->lexer);
-  tree req = cp_parser_requires_clause (parser);
+  gcc_assert (cp_lexer_next_token_is_keyword (parser->lexer, RID_REQUIRES));
+  cp_token *tok = cp_lexer_consume_token (parser->lexer);
+  location_t loc = cp_lexer_peek_token (parser->lexer)->location;
+  tree req = cp_parser_constraint_expression (parser);
+  if (req == error_mark_node)
+    cp_parser_skip_to_end_of_statement (parser);
+  loc = make_location (loc, tok->location, parser->lexer);
+  cp_parser_consume_semicolon_at_end_of_statement (parser);
   if (req == error_mark_node)
     return error_mark_node;
-  return finish_nested_requirement (req);
+  return finish_nested_requirement (loc, req);
 }
 
 /* Support Functions */
@@ -28145,6 +28558,11 @@ cp_parser_template_declaration_after_parameters (cp_parser* parser,
   else if (cxx_dialect >= cxx11
 	   && cp_lexer_next_token_is_keyword (parser->lexer, RID_USING))
     decl = cp_parser_alias_declaration (parser);
+  else if (cxx_dialect >= cxx2a /* Implies flag_concept.  */
+           && cp_lexer_next_token_is_keyword (parser->lexer, RID_CONCEPT)
+           && !cp_lexer_nth_token_is_keyword (parser->lexer, 2, RID_BOOL))
+    /* Allow 'concept bool' to be handled as per the TS.  */
+    decl = cp_parser_concept_definition (parser);
   else
     {
       /* There are no access checks when parsing a template, as we do not
@@ -28264,6 +28682,8 @@ cp_parser_template_introduction (cp_parser* parser, bool member_p)
   tree saved_object_scope = parser->object_scope;
   tree saved_qualifying_scope = parser->qualifying_scope;
 
+  cp_token *start_token = cp_lexer_peek_token (parser->lexer);
+
   /* Look for the optional `::' operator.  */
   cp_parser_global_scope_opt (parser,
 			      /*current_scope_valid_p=*/false);
@@ -28285,12 +28705,14 @@ cp_parser_template_introduction (cp_parser* parser, bool member_p)
   parser->object_scope = saved_object_scope;
   parser->qualifying_scope = saved_qualifying_scope;
 
-  if (concept_name == error_mark_node)
+  if (concept_name == error_mark_node
+      || (seen_error () && !concept_definition_p (tmpl_decl)))
     cp_parser_simulate_error (parser);
 
   /* Look for opening brace for introduction.  */
   matching_braces braces;
   braces.require_open (parser);
+  location_t open_loc = input_location;
 
   if (!cp_parser_parse_definitely (parser))
     return false;
@@ -28321,15 +28743,26 @@ cp_parser_template_introduction (cp_parser* parser, bool member_p)
     }
 
   /* Build and associate the constraint.  */
-  tree parms = finish_template_introduction (tmpl_decl, introduction_list);
+  location_t introduction_loc = make_location (open_loc,
+					       start_token->location,
+					       parser->lexer);
+  tree parms = finish_template_introduction (tmpl_decl,
+					     introduction_list,
+					     introduction_loc);
   if (parms && parms != error_mark_node)
     {
+      if (!flag_concepts_ts)
+	pedwarn (introduction_loc, 0, "template-introductions"
+		 " are not part of C++20 concepts [-fconcepts-ts]");
+
       cp_parser_template_declaration_after_parameters (parser, parms,
 						       member_p);
       return true;
     }
 
-  error_at (token->location, "no matching concept for template-introduction");
+  if (parms == NULL_TREE)
+    error_at (token->location, "no matching concept for template-introduction");
+
   return true;
 }
 
@@ -28397,8 +28830,8 @@ cp_parser_explicit_template_declaration (cp_parser* parser, bool member_p)
   if (flag_concepts)
   {
     tree reqs = get_shorthand_constraints (current_template_parms);
-    if (tree r = cp_parser_requires_clause_opt (parser))
-      reqs = conjoin_constraints (reqs, normalize_expression (r));
+    if (tree treqs = cp_parser_requires_clause_opt (parser))
+      reqs = combine_constraint_expressions (reqs, treqs);
     TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = reqs;
   }
 
@@ -29635,6 +30068,9 @@ cp_parser_required_error (cp_parser *parser,
       case RT_THROW:
 	gmsgid = G_("expected %<throw%>");
 	break;
+      case RT_AUTO:
+        gmsgid = G_("expected %<auto%>");
+        break;
       case RT_LABEL:
 	gmsgid = G_("expected %<__label__%>");
 	break;
@@ -41910,36 +42346,15 @@ make_generic_type_name ()
 static tree
 synthesize_implicit_template_parm  (cp_parser *parser, tree constr)
 {
-  gcc_assert (current_binding_level->kind == sk_function_parms);
-
-   /* Before committing to modifying any scope, if we're in an
-      implicit template scope, and we're trying to synthesize a
-      constrained parameter, try to find a previous parameter with
-      the same name.  This is the same-type rule for abbreviated
-      function templates.
-
-      NOTE: We can generate implicit parameters when tentatively
-      parsing a nested name specifier, only to reject that parse
-      later. However, matching the same template-id as part of a
-      direct-declarator should generate an identical template
-      parameter, so this rule will merge them. */
-  if (parser->implicit_template_scope && constr)
-    {
-      tree t = parser->implicit_template_parms;
-      while (t)
-        {
-          if (equivalent_placeholder_constraints (TREE_TYPE (t), constr))
-	    {
-	      tree d = TREE_VALUE (t);
-	      if (TREE_CODE (d) == PARM_DECL)
-		/* Return the TEMPLATE_PARM_INDEX.  */
-		d = DECL_INITIAL (d);
-	      return d;
-	    }
-          t = TREE_CHAIN (t);
-        }
+  /* A requires-clause is not a function and cannot have placeholders.  */
+  if (current_binding_level->kind == sk_block)
+    {
+      error ("placeholder type not allowed in this context");
+      return error_mark_node;
     }
 
+  gcc_assert (current_binding_level->kind == sk_function_parms);
+
   /* We are either continuing a function template that already contains implicit
      template parameters, creating a new fully-implicit function template, or
      extending an existing explicit function template with implicit template
@@ -42050,18 +42465,9 @@ synthesize_implicit_template_parm  (cp_parser *parser, tree constr)
   tree synth_tmpl_parm;
   bool non_type = false;
 
-  if (proto == NULL_TREE || TREE_CODE (proto) == TYPE_DECL)
-    synth_tmpl_parm
-      = finish_template_type_parm (class_type_node, synth_id);
-  else if (TREE_CODE (proto) == TEMPLATE_DECL)
-    synth_tmpl_parm
-      = finish_constrained_template_template_parm (proto, synth_id);
-  else
-    {
-      synth_tmpl_parm = copy_decl (proto);
-      DECL_NAME (synth_tmpl_parm) = synth_id;
-      non_type = true;
-    }
+  /* Synthesize the type template parameter.  */
+  gcc_assert(!proto || TREE_CODE (proto) == TYPE_DECL);
+  synth_tmpl_parm = finish_template_type_parm (class_type_node, synth_id);
 
   /* Attach the constraint to the parm before processing.  */
   tree node = build_tree_list (NULL_TREE, synth_tmpl_parm);
@@ -42073,6 +42479,13 @@ synthesize_implicit_template_parm  (cp_parser *parser, tree constr)
 			     /*non_type=*/non_type,
 			     /*param_pack=*/false);
 
+  /* Mark the synthetic declaration "virtual". This is used when
+     comparing template-heads to determine if whether an abbreviated
+     function template is equivalent to an explicit template.
+
+     Note that DECL_ARTIFICIAL is used elsewhere for template parameters.  */
+  DECL_VIRTUAL_P (TREE_VALUE (new_parm)) = true;
+
   // Chain the new parameter to the list of implicit parameters.
   if (parser->implicit_template_parms)
     parser->implicit_template_parms
@@ -42111,7 +42524,7 @@ synthesize_implicit_template_parm  (cp_parser *parser, tree constr)
   if (tree req = TEMPLATE_PARM_CONSTRAINTS (tree_last (new_parm)))
     {
       tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
-      reqs = conjoin_constraints (reqs, req);
+      reqs = combine_constraint_expressions (reqs, req);
       TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = reqs;
     }
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 6310e7b..8446443 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -135,8 +135,6 @@ enum template_base_result {
   tbr_success
 };
 
-static void push_access_scope (tree);
-static void pop_access_scope (tree);
 static bool resolve_overloaded_unification (tree, tree, tree, tree,
 					    unification_kind_t, int,
 					    bool);
@@ -153,7 +151,6 @@ static tree coerce_innermost_template_parms (tree, tree, tree, tsubst_flags_t,
 					      bool, bool);
 static void tsubst_enum	(tree, tree, tree);
 static tree add_to_template_args (tree, tree);
-static tree add_outermost_template_args (tree, tree);
 static bool check_instantiated_args (tree, tree, tsubst_flags_t);
 static int check_non_deducible_conversion (tree, tree, int, int,
 					   struct conversion **, bool);
@@ -183,12 +180,9 @@ static int can_complete_type_without_circularity (tree);
 static tree get_bindings (tree, tree, tree, bool);
 static int template_decl_level (tree);
 static int check_cv_quals_for_unify (int, tree, tree);
-static void template_parm_level_and_index (tree, int*, int*);
 static int unify_pack_expansion (tree, tree, tree,
 				 tree, unification_kind_t, bool, bool);
 static tree copy_template_args (tree);
-static tree tsubst_template_arg (tree, tree, tsubst_flags_t, tree);
-static tree tsubst_template_args (tree, tree, tsubst_flags_t, tree);
 static tree tsubst_template_parms (tree, tree, tsubst_flags_t);
 static tree most_specialized_partial_spec (tree, tsubst_flags_t);
 static tree tsubst_aggr_type (tree, tree, tsubst_flags_t, tree, int);
@@ -232,7 +226,7 @@ static tree enclosing_instantiation_of (tree tctx);
    template, VAR_DECL for static member variable, or TYPE_DECL for
    alias template (needed by instantiate_decl).  */
 
-static void
+void
 push_access_scope (tree t)
 {
   gcc_assert (VAR_OR_FUNCTION_DECL_P (t)
@@ -255,7 +249,7 @@ push_access_scope (tree t)
 /* Restore the scope set up by push_access_scope.  T is the node we
    are processing.  */
 
-static void
+void
 pop_access_scope (tree t)
 {
   if (TREE_CODE (t) == FUNCTION_DECL)
@@ -582,7 +576,7 @@ add_to_template_args (tree args, tree extra_args)
    template arguments used to attain the full instantiation from the
    partial instantiation.  */
 
-static tree
+tree
 add_outermost_template_args (tree args, tree extra_args)
 {
   tree new_args;
@@ -3305,6 +3299,153 @@ comp_template_parms (const_tree parms1, const_tree parms2)
   return 1;
 }
 
+/* Returns true if two template parameters are declared with
+   equivalent constraints.  */
+
+static bool
+template_parameter_constraints_equivalent_p (const_tree parm1, const_tree parm2)
+{
+  tree req1 = TREE_TYPE (parm1);
+  tree req2 = TREE_TYPE (parm2);
+  if (!req1 != !req2)
+    return false;
+  if (req1)
+    return cp_tree_equal (req1, req2);
+  return true;
+}
+
+/* Returns true when two template parameters are equivalent.  */
+
+static bool
+template_parameters_equivalent_p (const_tree parm1, const_tree parm2)
+{
+  tree decl1 = TREE_VALUE (parm1);
+  tree decl2 = TREE_VALUE (parm2);
+
+  /* If either of the template parameters are invalid, assume
+     they match for the sake of error recovery. */
+  if (error_operand_p (decl1) || error_operand_p (decl2))
+    return true;
+
+  /* ... they declare parameters of the same kind.  */
+  if (TREE_CODE (decl1) != TREE_CODE (decl2))
+    return false;
+
+  /* ... one parameter was introduced by a parameter declaration, then
+     both are. This case arises as a result of eagerly rewriting declarations
+     during parsing.  */
+  if (DECL_VIRTUAL_P (decl1) != DECL_VIRTUAL_P (decl2))
+    return false;
+
+  /* ... if either declares a pack, they both do.  */
+  if (template_parameter_pack_p (decl1) != template_parameter_pack_p (decl2))
+    return false;
+
+  if (TREE_CODE (decl1) == PARM_DECL)
+    {
+      /* ... if they declare non-type parameters, the types are equivalent.  */
+      if (!same_type_p (TREE_TYPE (decl1), TREE_TYPE (decl2)))
+	return false;
+    }
+  else if (TREE_CODE (decl2) == TEMPLATE_DECL)
+    {
+      /* ... if they declare template template parameters, their template
+	 parameter lists are equivalent.  */
+      if (!template_heads_equivalent_p (decl1, decl2))
+	return false;
+    }
+
+  /* ... if they are declared with a qualified-concept name, they both
+     are, and those names are equivalent.  */
+  return template_parameter_constraints_equivalent_p (parm1, parm2);
+}
+
+/* Returns true if two template parameters lists are equivalent.
+   Two template parameter lists are equivalent if they have the
+   same length and their corresponding parameters are equivalent.
+
+   PARMS1 and PARMS2 are TREE_LISTs containing TREE_VECs: the
+   data structure returned by DECL_TEMPLATE_PARMS.
+
+   This is generally the same implementation as comp_template_parms
+   except that it also the concept names and arguments used to
+   introduce parameters.  */
+
+static bool
+template_parameter_lists_equivalent_p (const_tree parms1, const_tree parms2)
+{
+  if (parms1 == parms2)
+    return true;
+
+  const_tree p1 = parms1;
+  const_tree p2 = parms2;
+  while (p1 != NULL_TREE && p2 != NULL_TREE)
+    {
+      tree list1 = TREE_VALUE (p1);
+      tree list2 = TREE_VALUE (p2);
+
+      if (TREE_VEC_LENGTH (list1) != TREE_VEC_LENGTH (list2))
+	return 0;
+
+      for (int i = 0; i < TREE_VEC_LENGTH (list2); ++i)
+	{
+	  tree parm1 = TREE_VEC_ELT (list1, i);
+	  tree parm2 = TREE_VEC_ELT (list2, i);
+	  if (!template_parameters_equivalent_p (parm1, parm2))
+	    return false;
+	}
+
+      p1 = TREE_CHAIN (p1);
+      p2 = TREE_CHAIN (p2);
+    }
+
+  if ((p1 != NULL_TREE) != (p2 != NULL_TREE))
+    return false;
+
+  return true;
+}
+
+/* Return true if the requires-clause of the template parameter lists are
+   equivalent and false otherwise.  */
+static bool
+template_requirements_equivalent_p (const_tree parms1, const_tree parms2)
+{
+  tree req1 = TEMPLATE_PARMS_CONSTRAINTS (parms1);
+  tree req2 = TEMPLATE_PARMS_CONSTRAINTS (parms2);
+  if ((req1 != NULL_TREE) != (req2 != NULL_TREE))
+    return false;
+  if (!cp_tree_equal (req1, req2))
+    return false;
+  return true;
+}
+
+/* Returns true if two template heads are equivalent. 17.6.6.1p6:
+   Two template heads are equivalent if their template parameter
+   lists are equivalent and their requires clauses are equivalent.
+
+   In pre-C++20, this is equivalent to calling comp_template_parms
+   for the template parameters of TMPL1 and TMPL2.  */
+
+bool
+template_heads_equivalent_p (const_tree tmpl1, const_tree tmpl2)
+{
+  tree parms1 = DECL_TEMPLATE_PARMS (tmpl1);
+  tree parms2 = DECL_TEMPLATE_PARMS (tmpl2);
+
+  /* Don't change the matching rules for pre-C++20.  */
+  if (cxx_dialect < cxx2a)
+    return comp_template_parms (parms1, parms2);
+
+  /* ... have the same number of template parameters, and their
+     corresponding parameters are equivalent.  */
+  if (!template_parameter_lists_equivalent_p (parms1, parms2))
+    return false;
+
+  /* ... if either has a requires-clause, they both do and their
+     corresponding constraint-expressions are equivalent.  */
+  return template_requirements_equivalent_p (parms1, parms2);
+}
+
 /* Determine whether PARM is a parameter pack.  */
 
 bool
@@ -4572,7 +4713,7 @@ template_parm_to_arg (tree t)
 /* Given a single level of template parameters (a TREE_VEC), return it
    as a set of template arguments.  */
 
-static tree
+tree
 template_parms_level_to_args (tree parms)
 {
   tree a = copy_node (parms);
@@ -4590,7 +4731,7 @@ template_parms_level_to_args (tree parms)
    arguments.  The template parameters are represented as a TREE_VEC, in
    the form documented in cp-tree.h for template arguments.  */
 
-static tree
+tree
 template_parms_to_args (tree parms)
 {
   tree header;
@@ -4626,6 +4767,26 @@ current_template_args (void)
   return template_parms_to_args (current_template_parms);
 }
 
+/* Return the fully generic arguments for of TMPL, i.e. what
+   current_template_args would be while parsing it.  */
+
+tree
+generic_targs_for (tree tmpl)
+{
+  if (tmpl == NULL_TREE)
+    return NULL_TREE;
+  if (DECL_TEMPLATE_TEMPLATE_PARM_P (tmpl)
+      || DECL_TEMPLATE_SPECIALIZATION (tmpl))
+    /* DECL_TEMPLATE_RESULT doesn't have the arguments we want.  For a template
+       template parameter, it has no TEMPLATE_INFO; for a partial
+       specialization, it has the arguments for the primary template, and we
+       want the arguments for the partial specialization.  */;
+  else if (tree result = DECL_TEMPLATE_RESULT (tmpl))
+    if (tree ti = get_template_info (result))
+      return TI_ARGS (ti);
+  return template_parms_to_args (DECL_TEMPLATE_PARMS (tmpl));
+}
+
 /* Update the declared TYPE by doing any lookups which were thought to be
    dependent, but are not now that we know the SCOPE of the declarator.  */
 
@@ -4855,7 +5016,7 @@ process_partial_specialization (tree decl)
   if (comp_template_args (inner_args, INNERMOST_TEMPLATE_ARGS (main_args))
       && (!flag_concepts
 	  || !strictly_subsumes (current_template_constraints (),
-				 get_constraints (maintmpl))))
+				 inner_args, maintmpl)))
     {
       if (!flag_concepts)
         error ("partial specialization %q+D does not specialize "
@@ -5564,6 +5725,8 @@ push_template_decl_real (tree decl, bool is_friend)
 	gcc_assert (!DECL_ARTIFICIAL (decl));
       else if (VAR_P (decl))
 	/* C++14 variable template. */;
+      else if (TREE_CODE (decl) == CONCEPT_DECL)
+	/* C++2a concept definitions.  */;
       else
 	{
 	  error ("template declaration of %q#D", decl);
@@ -5966,6 +6129,19 @@ redeclare_class_template (tree type, tree parms, tree cons)
 	  return false;
 	}
 
+      /* The parameters can be declared to introduce different
+	 constraints.  */
+      tree p1 = TREE_VEC_ELT (tmpl_parms, i);
+      tree p2 = TREE_VEC_ELT (parms, i);
+      if (!template_parameter_constraints_equivalent_p (p1, p2))
+	{
+	  error ("declaration of template parameter %q+#D with different "
+		 "constraints", parm);
+	  inform (DECL_SOURCE_LOCATION (tmpl_parm),
+		  "original declaration appeared here");
+	  return false;
+	}
+
       if (tmpl_default != NULL_TREE && parm_default != NULL_TREE)
 	{
 	  /* We have in [temp.param]:
@@ -5999,13 +6175,18 @@ redeclare_class_template (tree type, tree parms, tree cons)
 	TEMPLATE_TYPE_PARM_FOR_CLASS (TREE_TYPE (parm)) = true;
     }
 
-  // Cannot redeclare a class template with a different set of constraints.
-  if (!equivalent_constraints (get_constraints (tmpl), cons))
+  tree ci = get_constraints (tmpl);
+  tree req1 = ci ? CI_TEMPLATE_REQS (ci) : NULL_TREE;
+  tree req2 = cons ? CI_TEMPLATE_REQS (cons) : NULL_TREE;
+
+  /* Two classes with different constraints declare different entities.  */
+  if (!cp_tree_equal (req1, req2))
     {
       error_at (input_location, "redeclaration %q#D with different "
                                 "constraints", tmpl);
       inform (DECL_SOURCE_LOCATION (tmpl),
               "original declaration appeared here");
+      return false;
     }
 
     return true;
@@ -6214,8 +6395,7 @@ get_underlying_template (tree tmpl)
 	      != num_innermost_template_parms (underlying)))
 	break;
 
-      tree alias_args = INNERMOST_TEMPLATE_ARGS
-	(template_parms_to_args (DECL_TEMPLATE_PARMS (tmpl)));
+      tree alias_args = INNERMOST_TEMPLATE_ARGS (generic_targs_for (tmpl));
       if (!comp_template_args (TI_ARGS (tinfo), alias_args))
 	break;
 
@@ -7322,14 +7502,7 @@ coerce_template_args_for_ttp (tree templ, tree arglist,
 
   tree outer = DECL_CONTEXT (templ);
   if (outer)
-    {
-      if (DECL_TEMPLATE_SPECIALIZATION (outer))
-	/* We want arguments for the partial specialization, not arguments for
-	   the primary template.  */
-	outer = template_parms_to_args (DECL_TEMPLATE_PARMS (outer));
-      else
-	outer = TI_ARGS (get_template_info (DECL_TEMPLATE_RESULT (outer)));
-    }
+    outer = generic_targs_for (outer);
   else if (current_template_parms)
     {
       /* This is an argument of the current template, so we haven't set
@@ -7787,8 +7960,6 @@ is_compatible_template_arg (tree parm, tree arg)
   if (parm_cons == NULL_TREE)
     return true;
 
-  tree arg_cons = get_constraints (arg);
-
   /* If the template parameter is constrained, we need to rewrite its
      constraints in terms of the ARG's template parameters. This ensures
      that all of the template parameter types will have the same depth.
@@ -7796,17 +7967,18 @@ is_compatible_template_arg (tree parm, tree arg)
      Note that this is only valid when coerce_template_template_parm is
      true for the innermost template parameters of PARM and ARG. In other
      words, because coercion is successful, this conversion will be valid.  */
+  tree new_args = NULL_TREE;
   if (parm_cons)
     {
-      tree args = template_parms_to_args (DECL_TEMPLATE_PARMS (arg));
-      parm_cons = tsubst_constraint_info (parm_cons,
-					  INNERMOST_TEMPLATE_ARGS (args),
+      tree aparms = DECL_INNERMOST_TEMPLATE_PARMS (arg);
+      new_args = template_parms_level_to_args (aparms);
+      parm_cons = tsubst_constraint_info (parm_cons, new_args,
 					  tf_none, NULL_TREE);
       if (parm_cons == error_mark_node)
         return false;
     }
 
-  return subsumes (parm_cons, arg_cons);
+  return weakly_subsumes (parm_cons, new_args, arg);
 }
 
 // Convert a placeholder argument into a binding to the original
@@ -8426,7 +8598,7 @@ coerce_template_parms (tree parms,
      template (DR 1430).  */
   else if (in_decl
 	   && (DECL_ALIAS_TEMPLATE_P (in_decl)
-	       || concept_template_p (in_decl))
+	       || concept_definition_p (in_decl))
 	   && variadic_args_p
 	   && nargs - variadic_args_p < nparms - variadic_p)
     {
@@ -8600,6 +8772,7 @@ coerce_template_parms (tree parms,
 
       if (arg == error_mark_node)
 	lost++;
+
       TREE_VEC_ELT (new_inner_args, arg_idx - pack_adjust) = arg;
     }
 
@@ -8617,6 +8790,32 @@ coerce_template_parms (tree parms,
       /* We had some pack expansion arguments that will only work if the packs
 	 are empty, but wait until instantiation time to complain.
 	 See variadic-ttp3.C.  */
+
+      /* Except that we can't provide empty packs to alias templates or
+         concepts when there are no corresponding parameters. Basically,
+         we can get here with this:
+
+             template<typename T> concept C = true;
+
+             template<typename... Args>
+	       requires C<Args...>
+             void f();
+
+         When parsing C<Args...>, we try to form a concept check of
+         C<?, Args...>. Without the extra check for substituting an empty
+         pack past the last parameter, we can accept the check as valid.
+
+         FIXME: This may be valid for alias templates (but I doubt it).
+
+         FIXME: The error could be better also.   */
+      if (in_decl && concept_definition_p (in_decl))
+	{
+	  if (complain & tf_error)
+	    error_at (location_of (TREE_VEC_ELT (args, arg_idx)),
+		      "too many arguments");
+	  return error_mark_node;
+	}
+
       int len = nparms + (nargs - arg_idx);
       tree args = make_tree_vec (len);
       int i = 0;
@@ -9452,7 +9651,7 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
           if (complain & tf_error)
             {
 	      auto_diagnostic_group d;
-              error ("template constraint failure");
+              error ("template constraint failure for %qD", gen_tmpl);
               diagnose_constraints (input_location, gen_tmpl, arglist);
             }
           return error_mark_node;
@@ -9785,13 +9984,12 @@ lookup_template_class (tree d1, tree arglist, tree in_decl, tree context,
 tree
 lookup_template_variable (tree templ, tree arglist)
 {
+  if (flag_concepts && variable_concept_p (templ))
+    return build_concept_check (templ, arglist, tf_none);
+
   /* The type of the expression is NULL_TREE since the template-id could refer
      to an explicit or partial specialization. */
-  tree type = NULL_TREE;
-  if (flag_concepts && variable_concept_p (templ))
-    /* Except that concepts are always bool.  */
-    type = boolean_type_node;
-  return build2 (TEMPLATE_ID_EXPR, type, templ, arglist);
+  return build2 (TEMPLATE_ID_EXPR, NULL_TREE, templ, arglist);
 }
 
 /* Instantiate a variable declaration from a TEMPLATE_ID_EXPR for use. */
@@ -9802,12 +10000,6 @@ finish_template_variable (tree var, tsubst_flags_t complain)
   tree templ = TREE_OPERAND (var, 0);
   tree arglist = TREE_OPERAND (var, 1);
 
-  /* We never want to return a VAR_DECL for a variable concept, since they
-     aren't instantiated.  In a template, leave the TEMPLATE_ID_EXPR alone.  */
-  bool concept_p = flag_concepts && variable_concept_p (templ);
-  if (concept_p && processing_template_decl)
-    return var;
-
   tree tmpl_args = DECL_TI_ARGS (DECL_TEMPLATE_RESULT (templ));
   arglist = add_outermost_template_args (tmpl_args, arglist);
 
@@ -9828,19 +10020,6 @@ finish_template_variable (tree var, tsubst_flags_t complain)
       return error_mark_node;
     }
 
-  /* If a template-id refers to a specialization of a variable
-     concept, then the expression is true if and only if the
-     concept's constraints are satisfied by the given template
-     arguments.
-
-     NOTE: This is an extension of Concepts Lite TS that
-     allows constraints to be used in expressions. */
-  if (concept_p)
-    {
-      tree decl = DECL_TEMPLATE_RESULT (templ);
-      return evaluate_variable_concept (decl, arglist);
-    }
-
   return instantiate_template (templ, arglist, complain);
 }
 
@@ -10041,6 +10220,26 @@ for_each_template_parm_r (tree *tp, int *walk_subtrees, void *d)
 	return error_mark_node;
       break;
 
+    case SCOPE_REF:
+      if (pfd->include_nondeduced_p)
+	WALK_SUBTREE (TREE_OPERAND (t, 0));
+      break;
+
+    case REQUIRES_EXPR:
+      {
+	if (!fn)
+	  return error_mark_node;
+
+	/* Recursively walk the type of each constraint variable.  */
+	tree p = TREE_OPERAND (t, 0);
+	while (p)
+	  {
+	    WALK_SUBTREE (TREE_TYPE (p));
+	    p = TREE_CHAIN (p);
+	  }
+      }
+      break;
+
     default:
       break;
     }
@@ -10104,6 +10303,119 @@ for_each_template_parm (tree t, tree_fn_t fn, void* data,
   return result;
 }
 
+struct find_template_parameter_info
+{
+  explicit find_template_parameter_info (int d)
+    : max_depth (d)
+  {}
+
+  hash_set<tree> visited;
+  hash_set<tree> parms;
+  int max_depth;
+};
+
+/* Appends the declaration of T to the list in DATA.  */
+
+static int
+keep_template_parm (tree t, void* data)
+{
+  find_template_parameter_info *ftpi = (find_template_parameter_info*)data;
+
+  /* Template parameters declared within the expression are not part of
+     the parameter mapping. For example, in this concept:
+
+       template<typename T>
+       concept C = requires { <expr> } -> same_as<int>;
+
+     the return specifier same_as<int> declares a new decltype parameter
+     that must not be part of the parameter mapping. The same is true
+     for generic lambda parameters, lambda template parameters, etc.  */
+  int level;
+  int index;
+  template_parm_level_and_index (t, &level, &index);
+  if (level > ftpi->max_depth)
+    return 0;
+
+  /* Arguments like const T yield parameters like const T. This means that
+     a template-id like X<T, const T> would yield two distinct parameters:
+     T and const T. Adjust types to their unqualified versions.  */
+  if (TYPE_P (t))
+    t = TYPE_MAIN_VARIANT (t);
+  ftpi->parms.add (t);
+
+  return 0;
+}
+
+/* Ensure that we recursively examine certain terms that are not normally
+   visited in for_each_template_parm_r.  */
+
+static int
+any_template_parm_r (tree t, void *data)
+{
+  find_template_parameter_info *ftpi = (find_template_parameter_info*)data;
+
+#define WALK_SUBTREE(NODE)						\
+  do									\
+    {									\
+      for_each_template_parm (NODE, keep_template_parm, data,		\
+			      &ftpi->visited, true,			\
+			      any_template_parm_r);			\
+    }									\
+  while (0)
+
+  switch (TREE_CODE (t))
+    {
+    case RECORD_TYPE:
+    case UNION_TYPE:
+    case ENUMERAL_TYPE:
+      /* Search for template parameters in type aliases.  */
+      if (alias_template_specialization_p (t))
+	{
+	  tree tinfo = TYPE_ALIAS_TEMPLATE_INFO (t);
+	  WALK_SUBTREE (TI_ARGS (tinfo));
+        }
+      break;
+
+    case TEMPLATE_TYPE_PARM:
+      /* Type constraints of a placeholder type may contain parameters.  */
+      if (is_auto (t))
+	if (tree constr = PLACEHOLDER_TYPE_CONSTRAINTS (t))
+	  WALK_SUBTREE (constr);
+      break;
+
+    case TEMPLATE_ID_EXPR:
+      /* Search through references to variable templates.  */
+      WALK_SUBTREE (TREE_OPERAND (t, 0));
+      WALK_SUBTREE (TREE_OPERAND (t, 1));
+      break;
+
+    case CONSTRUCTOR:
+      if (TREE_TYPE (t))
+        WALK_SUBTREE (TREE_TYPE (t));
+      break;
+    default:
+      break;
+    }
+
+  /* Keep walking.  */
+  return 0;
+}
+
+/* Returns a list of unique template parameters found within T.  */
+
+tree
+find_template_parameters (tree t, int depth)
+{
+  find_template_parameter_info ftpi (depth);
+  for_each_template_parm (t, keep_template_parm, &ftpi, &ftpi.visited,
+			  /*include_nondeduced*/true, any_template_parm_r);
+  tree list = NULL_TREE;
+  for (hash_set<tree>::iterator iter = ftpi.parms.begin();
+       iter != ftpi.parms.end(); ++iter)
+    list = tree_cons (NULL_TREE, *iter, list);
+  return list;
+}
+
 /* Returns true if T depends on any template parameter.  */
 
 int
@@ -10431,6 +10743,30 @@ tsubst_friend_function (tree decl, tree args)
       DECL_USE_TEMPLATE (DECL_TEMPLATE_RESULT (new_friend)) = 0;
       DECL_SAVED_TREE (DECL_TEMPLATE_RESULT (new_friend))
 	= DECL_SAVED_TREE (DECL_TEMPLATE_RESULT (decl));
+
+      /* Attach the template requirements to the new declaration
+         for declaration matching. We need to rebuild the requirements
+         so that parameter levels match.  */
+      if (tree ci = get_constraints (decl))
+	{
+	  tree parms = DECL_TEMPLATE_PARMS (new_friend);
+	  tree args = generic_targs_for (new_friend);
+	  tree treqs = tsubst_constraint (CI_TEMPLATE_REQS (ci), args,
+					  tf_warning_or_error, NULL_TREE);
+	  tree freqs = tsubst_constraint (CI_DECLARATOR_REQS (ci), args,
+					  tf_warning_or_error, NULL_TREE);
+
+	  /* Update the constraints -- these won't really be valid for
+	     checking, but that's not what we need them for. These ensure
+	     that the declared function can find the friend during
+	     declaration matching.  */
+	  tree new_ci = get_constraints (new_friend);
+	  CI_TEMPLATE_REQS (new_ci) = treqs;
+	  CI_DECLARATOR_REQS (new_ci) = freqs;
+
+	  /* Also update the template parameter list.  */
+	  TEMPLATE_PARMS_CONSTRAINTS (parms) = treqs;
+	}
     }
 
   /* The mangled name for the NEW_FRIEND is incorrect.  The function
@@ -11529,7 +11865,7 @@ instantiate_class_template (tree type)
   return ret;
 }
 
-static tree
+tree
 tsubst_template_arg (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 {
   tree r;
@@ -11547,6 +11883,7 @@ tsubst_template_arg (tree t, tree args, tsubst_flags_t complain, tree in_decl)
       if (!(complain & tf_warning))
 	--c_inhibit_evaluation_warnings;
     }
+
   return r;
 }
 
@@ -11770,14 +12107,6 @@ gen_elem_of_pack_expansion_instantiation (tree pattern,
     t = tsubst_decl (pattern, args, complain);
   else if (pattern == error_mark_node)
     t = error_mark_node;
-  else if (constraint_p (pattern))
-    {
-      if (processing_template_decl)
-	t = tsubst_constraint (pattern, args, complain, in_decl);
-      else
-	t = (constraints_satisfied_p (pattern, args)
-	     ? boolean_true_node : boolean_false_node);
-    }
   else if (!TYPE_P (pattern))
     t = tsubst_expr (pattern, args, complain, in_decl,
 		     /*integral_constant_expression_p=*/false);
@@ -12257,7 +12586,6 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain,
         {
 	  int idx;
           template_parm_level_and_index (parm_pack, &level, &idx);
-
           if (level <= levels)
             arg_pack = TMPL_ARG (args, level, idx);
         }
@@ -12311,6 +12639,10 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain,
 	  /* We can't substitute for this parameter pack.  We use a flag as
 	     well as the missing_level counter because function parameter
 	     packs don't have a level.  */
+          if (!(processing_template_decl || is_auto (parm_pack)))
+	    {
+	      gcc_unreachable ();
+	    }
 	  gcc_assert (processing_template_decl || is_auto (parm_pack));
 	  unsubstituted_packs = true;
 	}
@@ -12519,9 +12851,33 @@ copy_template_args (tree t)
   return new_vec;
 }
 
+/* Substitute ARGS into the *_ARGUMENT_PACK orig_arg.  */
+
+tree
+tsubst_argument_pack (tree orig_arg, tree args, tsubst_flags_t complain,
+		      tree in_decl)
+{
+  /* Substitute into each of the arguments.  */
+  tree new_arg = TYPE_P (orig_arg)
+    ? cxx_make_type (TREE_CODE (orig_arg))
+    : make_node (TREE_CODE (orig_arg));
+
+  tree pack_args = tsubst_template_args (ARGUMENT_PACK_ARGS (orig_arg),
+					 args, complain, in_decl);
+  if (pack_args == error_mark_node)
+    new_arg = error_mark_node;
+  else
+    SET_ARGUMENT_PACK_ARGS (new_arg, pack_args);
+
+  if (TREE_CODE (new_arg) == NONTYPE_ARGUMENT_PACK)
+    TREE_CONSTANT (new_arg) = TREE_CONSTANT (orig_arg);
+
+  return new_arg;
+}
+
 /* Substitute ARGS into the vector or list of template arguments T.  */
 
-static tree
+tree
 tsubst_template_args (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 {
   tree orig_t = t;
@@ -12556,22 +12912,7 @@ tsubst_template_args (tree t, tree args, tsubst_flags_t complain, tree in_decl)
             expanded_len_adjust += TREE_VEC_LENGTH (new_arg) - 1;
         }
       else if (ARGUMENT_PACK_P (orig_arg))
-        {
-          /* Substitute into each of the arguments.  */
-          new_arg = TYPE_P (orig_arg)
-            ? cxx_make_type (TREE_CODE (orig_arg))
-            : make_node (TREE_CODE (orig_arg));
-
-	  tree pack_args = tsubst_template_args (ARGUMENT_PACK_ARGS (orig_arg),
-						 args, complain, in_decl);
-          if (pack_args == error_mark_node)
-            new_arg = error_mark_node;
-	  else
-	    SET_ARGUMENT_PACK_ARGS (new_arg, pack_args);
-
-          if (TREE_CODE (new_arg) == NONTYPE_ARGUMENT_PACK)
-	    TREE_CONSTANT (new_arg) = TREE_CONSTANT (orig_arg);
-        }
+	new_arg = tsubst_argument_pack (orig_arg, args, complain, in_decl);
       else
 	new_arg = tsubst_template_arg (orig_arg, args, complain, in_decl);
 
@@ -12704,6 +13045,7 @@ tsubst_template_parm (tree t, tree args, tsubst_flags_t complain)
 
   default_value = TREE_PURPOSE (t);
   parm_decl = TREE_VALUE (t);
+  tree constraint = TEMPLATE_PARM_CONSTRAINTS (t);
 
   parm_decl = tsubst (parm_decl, args, complain, NULL_TREE);
   if (TREE_CODE (parm_decl) == PARM_DECL
@@ -12711,8 +13053,11 @@ tsubst_template_parm (tree t, tree args, tsubst_flags_t complain)
     parm_decl = error_mark_node;
   default_value = tsubst_template_arg (default_value, args,
 				       complain, NULL_TREE);
+  constraint = tsubst_constraint (constraint, args, complain, NULL_TREE);
 
-  return build_tree_list (default_value, parm_decl);
+  tree r = build_tree_list (default_value, parm_decl);
+  TEMPLATE_PARM_CONSTRAINTS (r) = constraint;
+  return r;
 }
 
 /* Substitute the ARGS into the indicated aggregate (or enumeration)
@@ -13138,14 +13483,11 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain,
       && !grok_op_properties (r, /*complain=*/false))
     return error_mark_node;
 
-  /* When instantiating a constrained member, substitute
-     into the constraints to create a new constraint.  */
+  /* Associate the constraints directly with the instantiation. We
+     don't substitute through the constraints; that's only done when
+     they are checked.  */
   if (tree ci = get_constraints (t))
-    if (member)
-      {
-	ci = tsubst_constraint_info (ci, argvec, complain, NULL_TREE);
-	set_constraints (r, ci);
-      }
+    set_constraints (r, ci);
 
   if (DECL_FRIEND_P (t) && DECL_FRIEND_CONTEXT (t))
     SET_DECL_FRIEND_CONTEXT (r,
@@ -14001,6 +14343,17 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
   return r;
 }
 
+/* Substitute into the complete parameter type list PARMS.  */
+
+tree
+tsubst_function_parms (tree parms,
+		       tree args,
+		       tsubst_flags_t complain,
+		       tree in_decl)
+{
+  return tsubst_arg_types (parms, args, NULL_TREE, complain, in_decl);
+}
+
 /* Substitute into the ARG_TYPES of a function type.
    If END is a TREE_CHAIN, leave it and any following types
    un-substituted.  */
@@ -14565,6 +14918,14 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 	    if (code == TEMPLATE_TYPE_PARM)
 	      {
 		int quals;
+
+		/* When building concept checks for the purpose of
+		   deducing placeholders, we can end up with wildcards
+		   where types are expected. Adjust this to the deduced
+		   value.  */
+		if (TREE_CODE (arg) == WILDCARD_DECL)
+		  arg = TREE_TYPE (TREE_TYPE (arg));
+
 		gcc_assert (TYPE_P (arg));
 
 		quals = cp_type_quals (arg) | cp_type_quals (t);
@@ -14696,10 +15057,10 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 
                 if (TREE_CODE (t) == TEMPLATE_TYPE_PARM)
 		  {
-		    /* Propagate constraints on placeholders.  */
+		    /* Propagate constraints on placeholders since they are
+		       only instantiated during satisfaction.  */
 		    if (tree constr = PLACEHOLDER_TYPE_CONSTRAINTS (t))
-		      PLACEHOLDER_TYPE_CONSTRAINTS (r)
-			= tsubst_constraint (constr, args, complain, in_decl);
+		      PLACEHOLDER_TYPE_CONSTRAINTS (r) = constr;
 		    else if (tree pl = CLASS_PLACEHOLDER_TEMPLATE (t))
 		      {
 			pl = tsubst_copy (pl, args, complain, in_decl);
@@ -18347,6 +18708,28 @@ tsubst_copy_and_build (tree t,
 	    RETURN (templ);
 	  }
 
+	if (concept_definition_p (templ))
+	  {
+	    tree check = build_concept_check (templ, targs, complain);
+	    if (check == error_mark_node)
+	      RETURN (error_mark_node);
+
+	    tree id = unpack_concept_check (check);
+
+	    /* If we built a function concept check, return the underlying
+	       template-id. So we can evaluate it as a function call.  */
+	    if (function_concept_p (TREE_OPERAND (id, 0)))
+	      RETURN (id);
+
+	    /* Evaluate the concept, if needed.  */
+	    tree args = TREE_OPERAND (id, 1);
+	    if (!uses_template_parms (args)
+		&& !processing_constraint_expression_p ())
+	      RETURN (evaluate_concept_check (check, complain));
+
+	    RETURN (check);
+	  }
+
 	if (variable_template_p (templ))
 	  RETURN (lookup_and_finish_template_variable (templ, targs, complain));
 
@@ -19111,6 +19494,25 @@ tsubst_copy_and_build (tree t,
 		       /*fn_p=*/NULL,
 		       complain));
 	  }
+	else if (concept_check_p (function))
+	  {
+	    /* FUNCTION is a template-id referring to a concept definition.  */
+	    tree id = unpack_concept_check (function);
+	    tree tmpl = TREE_OPERAND (id, 0);
+	    tree args = TREE_OPERAND (id, 1);
+
+	    /* Calls to standard and variable concepts should have been
+	       previously diagnosed.  */
+	    gcc_assert (function_concept_p (tmpl));
+
+	    /* Ensure the result is wrapped as a call expression.  */
+	    ret = build_concept_check (tmpl, args, tf_warning_or_error);
+
+	    /* Possibly evaluate the check if it is non-dependent.   */
+	    if (!uses_template_parms (args)
+		&& !processing_constraint_expression_p ())
+	      ret = evaluate_concept_check (ret, complain);
+	  }
 	else
 	  ret = finish_call_expr (function, &call_args,
 				  /*disallow_virtual=*/qualified_p,
@@ -23202,10 +23604,11 @@ more_specialized_fn (tree pat1, tree pat2, int len)
      constrained template.  */
   if (!lose1 && !lose2)
     {
-      tree c1 = get_constraints (DECL_TEMPLATE_RESULT (pat1));
-      tree c2 = get_constraints (DECL_TEMPLATE_RESULT (pat2));
-      lose1 = !subsumes_constraints (c1, c2);
-      lose2 = !subsumes_constraints (c2, c1);
+      int winner = more_constrained (decl1, decl2);
+      if (winner > 0)
+	lose2 = true;
+      else if (winner < 0)
+	lose1 = true;
     }
 
   /* All things being equal, if the next argument is a pack expansion
@@ -23277,7 +23680,7 @@ more_specialized_partial_spec (tree tmpl, tree pat1, tree pat2)
   /* If both deductions succeed, the partial ordering selects the more
      constrained template.  */
   if (!winner && any_deductions)
-    return more_constrained (tmpl1, tmpl2);
+    winner = more_constrained (tmpl1, tmpl2);
 
   /* In the case of a tie where at least one of the templates
      has a parameter pack at the end, the template with the most
@@ -25712,7 +26115,7 @@ value_dependent_expression_p (tree expression)
       }
 
     case TEMPLATE_ID_EXPR:
-      return variable_concept_p (TREE_OPERAND (expression, 0));
+      return concept_definition_p (TREE_OPERAND (expression, 0));
 
     case CONSTRUCTOR:
       {
@@ -26112,14 +26515,14 @@ instantiation_dependent_r (tree *tp, int *walk_subtrees,
       return *tp;
 
     case CALL_EXPR:
-      /* Treat calls to function concepts as dependent. */
-      if (function_concept_check_p (*tp))
+      /* Treat concept checks as dependent. */
+      if (concept_check_p (*tp))
         return *tp;
       break;
 
     case TEMPLATE_ID_EXPR:
-      /* And variable concepts.  */
-      if (variable_concept_p (TREE_OPERAND (*tp, 0)))
+      /* Treat concept checks as dependent.  */
+      if (concept_check_p (*tp))
 	return *tp;
       break;
 
@@ -26657,10 +27060,10 @@ build_non_dependent_expr (tree expr)
       /* Don't do this during nsdmi parsing as it can lead to
 	 unexpected recursive instantiations.  */
       && !parsing_nsdmi ()
-      /* Don't do this during concept expansion either and for
+      /* Don't do this during concept processing either and for
          the same reason.  */
-      && !expanding_concept ())
-    fold_non_dependent_expr (expr, tf_none);
+      && !processing_constraint_expression_p ())
+    fold_non_dependent_expr (expr);
 
   STRIP_ANY_LOCATION_WRAPPER (expr);
 
@@ -26755,8 +27158,7 @@ static tree
 make_auto_1 (tree name, bool set_canonical)
 {
   tree au = cxx_make_type (TEMPLATE_TYPE_PARM);
-  TYPE_NAME (au) = build_decl (input_location,
-			       TYPE_DECL, name, au);
+  TYPE_NAME (au) = build_decl (input_location, TYPE_DECL, name, au);
   TYPE_STUB_DECL (au) = TYPE_NAME (au);
   TEMPLATE_TYPE_PARM_INDEX (au) = build_template_parm_index
     (0, processing_template_decl + 1, processing_template_decl + 1,
@@ -26801,31 +27203,87 @@ template_placeholder_p (tree t)
   return is_auto (t) && CLASS_PLACEHOLDER_TEMPLATE (t);
 }
 
-/* Make a "constrained auto" type-specifier. This is an
-   auto type with constraints that must be associated after
-   deduction.  The constraint is formed from the given
-   CONC and its optional sequence of arguments, which are
-   non-null if written as partial-concept-id.  */
+/* Make a "constrained auto" type-specifier. This is an auto or
+  decltype(auto) type with constraints that must be associated after
+  deduction.  The constraint is formed from the given concept CON
+  and its optional sequence of template arguments ARGS.
 
-tree
-make_constrained_auto (tree con, tree args)
-{
-  tree type = make_auto_1 (auto_identifier, false);
+  TYPE must be the result of make_auto_type or make_decltype_auto_type. */
 
+static tree
+make_constrained_placeholder_type (tree type, tree con, tree args)
+{
   /* Build the constraint. */
   tree tmpl = DECL_TI_TEMPLATE (con);
-  tree expr = VAR_P (con) ? tmpl : ovl_make (tmpl);
-  expr = build_concept_check (expr, type, args);
+  tree expr = tmpl;
+  if (TREE_CODE (con) == FUNCTION_DECL)
+    expr = ovl_make (tmpl);
+  expr = build_concept_check (expr, type, args, tf_warning_or_error);
 
-  tree constr = normalize_expression (expr);
-  PLACEHOLDER_TYPE_CONSTRAINTS (type) = constr;
+  PLACEHOLDER_TYPE_CONSTRAINTS (type) = expr;
 
   /* Our canonical type depends on the constraint.  */
   TYPE_CANONICAL (type) = canonical_type_parameter (type);
 
   /* Attach the constraint to the type declaration. */
-  tree decl = TYPE_NAME (type);
-  return decl;
+  return TYPE_NAME (type);
+}
+
+/* Make a "constrained auto" type-specifier.  */
+
+tree
+make_constrained_auto (tree con, tree args)
+{
+  tree type = make_auto_1 (auto_identifier, false);
+  return make_constrained_placeholder_type (type, con, args);
+}
+
+/* Make a "constrained decltype(auto)" type-specifier.  */
+
+tree
+make_constrained_decltype_auto (tree con, tree args)
+{
+  tree type = make_auto_1 (decltype_auto_identifier, false);
+  /* FIXME: I don't know why this isn't done in make_auto_1.  */
+  AUTO_IS_DECLTYPE (type) = true;
+  return make_constrained_placeholder_type (type, con, args);
+}
+
+/* Build and return a concept definition. Like other templates, the
+   CONCEPT_DECL node is wrapped by a TEMPLATE_DECL.  This returns the
+   the TEMPLATE_DECL. */
+
+tree
+finish_concept_definition (cp_expr id, tree init)
+{
+  gcc_assert (identifier_p (id));
+  gcc_assert (processing_template_decl);
+
+  location_t loc = id.get_location();
+
+  /* A concept-definition shall not have associated constraints.  */
+  if (TEMPLATE_PARMS_CONSTRAINTS (current_template_parms))
+    {
+      error_at (loc, "a concept cannot be constrained");
+      TEMPLATE_PARMS_CONSTRAINTS (current_template_parms) = NULL_TREE;
+    }
+
+  /* A concept-definition shall appear in namespace scope.  Templates
+     aren't allowed in block scope, so we only need to check for class
+     scope.  */
+  if (TYPE_P (current_scope()) || !DECL_NAMESPACE_SCOPE_P (current_scope ()))
+    {
+      error_at (loc, "concept %qE not in namespace scope", *id);
+      return error_mark_node;
+    }
+
+  /* Initially build the concept declaration; it's type is bool.  */
+  tree decl = build_lang_decl_loc (loc, CONCEPT_DECL, *id, boolean_type_node);
+  DECL_CONTEXT (decl) = current_scope ();
+  DECL_INITIAL (decl) = init;
+
+  /* Push the enclosing template.  */
+  return push_template_decl (decl);
 }
 
 /* Given type ARG, return std::initializer_list<ARG>.  */
@@ -27656,13 +28114,17 @@ do_auto_deduction (tree type, tree init, tree auto_node,
 
   /* Check any placeholder constraints against the deduced type. */
   if (flag_concepts && !processing_template_decl)
-    if (tree constr = NON_ERROR (PLACEHOLDER_TYPE_CONSTRAINTS (auto_node)))
+    if (tree check = NON_ERROR (PLACEHOLDER_TYPE_CONSTRAINTS (auto_node)))
       {
         /* Use the deduced type to check the associated constraints. If we
            have a partial-concept-id, rebuild the argument list so that
            we check using the extra arguments. */
-        gcc_assert (TREE_CODE (constr) == CHECK_CONSTR);
-        tree cargs = CHECK_CONSTR_ARGS (constr);
+	check = unpack_concept_check (check);
+	gcc_assert (TREE_CODE (check) == TEMPLATE_ID_EXPR);
+	tree cdecl = TREE_OPERAND (check, 0);
+	if (OVL_P (cdecl))
+	  cdecl = OVL_FIRST (cdecl);
+        tree cargs = TREE_OPERAND (check, 1);
         if (TREE_VEC_LENGTH (cargs) > 1)
           {
             cargs = copy_node (cargs);
@@ -27670,7 +28132,11 @@ do_auto_deduction (tree type, tree init, tree auto_node,
           }
         else
           cargs = targs;
-        if (!constraints_satisfied_p (constr, cargs))
+
+	/* Rebuild the check using the deduced arguments.  */
+	check = build_concept_check (cdecl, cargs, tf_none);
+
+	if (!constraints_satisfied_p (check, cargs))
           {
             if (complain & tf_warning_or_error)
               {
@@ -27695,7 +28161,7 @@ do_auto_deduction (tree type, tree init, tree auto_node,
                            "placeholder constraints");
                     break;
                   }
-                diagnose_constraints (input_location, constr, targs);
+		diagnose_constraints (input_location, check, targs);
               }
             return error_mark_node;
           }
@@ -27936,6 +28402,23 @@ append_type_to_template_for_access_check (tree templ,
 					      scope, location);
 }
 
+/* Recursively walk over && expressions searching for EXPR. Return a reference
+   to that expression.  */
+
+static tree *find_template_requirement (tree *t, tree key)
+{
+  if (*t == key)
+    return t;
+  if (TREE_CODE (*t) == TRUTH_ANDIF_EXPR)
+    {
+      if (tree *p = find_template_requirement (&TREE_OPERAND (*t, 0), key))
+	return p;
+      if (tree *p = find_template_requirement (&TREE_OPERAND (*t, 1), key))
+	return p;
+    }
+  return 0;
+}
+
 /* Convert the generic type parameters in PARM that match the types given in the
    range [START_IDX, END_IDX) from the current_template_parms into generic type
    packs.  */
@@ -27957,9 +28440,8 @@ convert_generic_types_to_packs (tree parm, int start_idx, int end_idx)
       /* Create a distinct parameter pack type from the current parm and add it
 	 to the replacement args to tsubst below into the generic function
 	 parameter.  */
-
-      tree o = TREE_TYPE (TREE_VALUE
-			  (TREE_VEC_ELT (current, i)));
+      tree node = TREE_VEC_ELT (current, i);
+      tree o = TREE_TYPE (TREE_VALUE (node));
       tree t = copy_type (o);
       TEMPLATE_TYPE_PARM_INDEX (t)
 	= reduce_template_parm_level (TEMPLATE_TYPE_PARM_INDEX (o),
@@ -27970,7 +28452,26 @@ convert_generic_types_to_packs (tree parm, int start_idx, int end_idx)
       TEMPLATE_TYPE_PARAMETER_PACK (t) = true;
       TYPE_CANONICAL (t) = canonical_type_parameter (t);
       TREE_VEC_ELT (replacement, i) = t;
-      TREE_VALUE (TREE_VEC_ELT (current, i)) = TREE_CHAIN (t);
+
+      /* Replace the current template parameter with new pack.  */
+      TREE_VALUE (node) = TREE_CHAIN (t);
+
+      /* Surgically adjust the associated constraint of adjusted parameter
+         and it's corresponding contribution to the current template
+         requirements.  */
+      if (tree constr = TEMPLATE_PARM_CONSTRAINTS (node))
+	{
+	  tree id = unpack_concept_check (constr);
+	  TREE_VEC_ELT (TREE_OPERAND (id, 1), 0) = template_parm_to_arg (t);
+	  tree fold = finish_left_unary_fold_expr (constr, TRUTH_ANDIF_EXPR);
+	  TEMPLATE_PARM_CONSTRAINTS (node) = fold;
+
+	  /* If there was a constraint, we also need to replace that in
+	     the template requirements, which we've already built.  */
+	  tree *reqs = &TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
+	  reqs = find_template_requirement (reqs, constr);
+	  *reqs = fold;
+	}
     }
 
   for (int i = end_idx, e = TREE_VEC_LENGTH (current); i < e; ++i)
@@ -27987,27 +28488,6 @@ convert_generic_types_to_packs (tree parm, int start_idx, int end_idx)
   return tsubst (parm, replacement, tf_none, NULL_TREE);
 }
 
-/* Entries in the decl_constraint hash table. */
-struct GTY((for_user)) constr_entry
-{
-  tree decl;
-  tree ci;
-};
-
-/* Hashing function and equality for constraint entries. */
-struct constr_hasher : ggc_ptr_hash<constr_entry>
-{
-  static hashval_t hash (constr_entry *e)
-  {
-    return (hashval_t)DECL_UID (e->decl);
-  }
-
-  static bool equal (constr_entry *e1, constr_entry *e2)
-  {
-    return e1->decl == e2->decl;
-  }
-};
-
 /* A mapping from declarations to constraint information. Note that
    both templates and their underlying declarations are mapped to the
    same constraint information.
@@ -28015,7 +28495,7 @@ struct constr_hasher : ggc_ptr_hash<constr_entry>
    FIXME: This is defined in pt.c because garbage collection
    code is not being generated for constraint.cc. */
 
-static GTY (()) hash_table<constr_hasher> *decl_constraints;
+static GTY ((cache)) tree_cache_map *decl_constraints;
 
 /* Returns the template constraints of declaration T. If T is not
    constrained, return NULL_TREE. Note that T must be non-null. */
@@ -28025,14 +28505,15 @@ get_constraints (tree t)
 {
   if (!flag_concepts)
     return NULL_TREE;
+  if (!decl_constraints)
+    return NULL_TREE;
 
   gcc_assert (DECL_P (t));
   if (TREE_CODE (t) == TEMPLATE_DECL)
     t = DECL_TEMPLATE_RESULT (t);
-  constr_entry elt = { t, NULL_TREE };
-  constr_entry* found = decl_constraints->find (&elt);
+  tree* found = decl_constraints->get (t);
   if (found)
-    return found->ci;
+    return *found;
   else
     return NULL_TREE;
 }
@@ -28050,12 +28531,8 @@ set_constraints (tree t, tree ci)
   gcc_assert (t && flag_concepts);
   if (TREE_CODE (t) == TEMPLATE_DECL)
     t = DECL_TEMPLATE_RESULT (t);
-  gcc_assert (!get_constraints (t));
-  constr_entry elt = {t, ci};
-  constr_entry** slot = decl_constraints->find_slot (&elt, INSERT);
-  constr_entry* entry = ggc_alloc<constr_entry> ();
-  *entry = elt;
-  *slot = entry;
+  bool found = hash_map_safe_put<hm_ggc> (decl_constraints, t, ci);
+  gcc_assert (!found);
 }
 
 /* Remove the associated constraints of the declaration T.  */
@@ -28067,149 +28544,8 @@ remove_constraints (tree t)
   if (TREE_CODE (t) == TEMPLATE_DECL)
     t = DECL_TEMPLATE_RESULT (t);
 
-  constr_entry elt = {t, NULL_TREE};
-  constr_entry** slot = decl_constraints->find_slot (&elt, NO_INSERT);
-  if (slot)
-    decl_constraints->clear_slot (slot);
-}
-
-/* Memoized satisfaction results for declarations. This
-   maps the pair (constraint_info, arguments) to the result computed
-   by constraints_satisfied_p.  */
-
-struct GTY((for_user)) constraint_sat_entry
-{
-  tree ci;
-  tree args;
-  tree result;
-};
-
-/* Hashing function and equality for constraint entries. */
-
-struct constraint_sat_hasher : ggc_ptr_hash<constraint_sat_entry>
-{
-  static hashval_t hash (constraint_sat_entry *e)
-  {
-    hashval_t val = iterative_hash_object(e->ci, 0);
-    return iterative_hash_template_arg (e->args, val);
-  }
-
-  static bool equal (constraint_sat_entry *e1, constraint_sat_entry *e2)
-  {
-    return e1->ci == e2->ci && comp_template_args (e1->args, e2->args);
-  }
-};
-
-/* Memoized satisfaction results for concept checks. */
-
-struct GTY((for_user)) concept_spec_entry
-{
-  tree tmpl;
-  tree args;
-  tree result;
-};
-
-/* Hashing function and equality for constraint entries.  */
-
-struct concept_spec_hasher : ggc_ptr_hash<concept_spec_entry>
-{
-  static hashval_t hash (concept_spec_entry *e)
-  {
-    return hash_tmpl_and_args (e->tmpl, e->args);
-  }
-
-  static bool equal (concept_spec_entry *e1, concept_spec_entry *e2)
-  {
-    ++comparing_specializations;
-    bool eq = e1->tmpl == e2->tmpl && comp_template_args (e1->args, e2->args);
-    --comparing_specializations;
-    return eq;
-  }
-};
-
-static GTY (()) hash_table<constraint_sat_hasher> *constraint_memos;
-static GTY (()) hash_table<concept_spec_hasher> *concept_memos;
-
-/* Search for a memoized satisfaction result. Returns one of the
-   truth value nodes if previously memoized, or NULL_TREE otherwise.   */
-
-tree
-lookup_constraint_satisfaction (tree ci, tree args)
-{
-  constraint_sat_entry elt = { ci, args, NULL_TREE };
-  constraint_sat_entry* found = constraint_memos->find (&elt);
-  if (found)
-    return found->result;
-  else
-    return NULL_TREE;
-}
-
-/* Memoize the result of a satisfication test. Returns the saved result.  */
-
-tree
-memoize_constraint_satisfaction (tree ci, tree args, tree result)
-{
-  constraint_sat_entry elt = {ci, args, result};
-  constraint_sat_entry** slot = constraint_memos->find_slot (&elt, INSERT);
-  constraint_sat_entry* entry = ggc_alloc<constraint_sat_entry> ();
-  *entry = elt;
-  *slot = entry;
-  return result;
-}
-
-/* Search for a memoized satisfaction result for a concept. */
-
-tree
-lookup_concept_satisfaction (tree tmpl, tree args)
-{
-  concept_spec_entry elt = { tmpl, args, NULL_TREE };
-  concept_spec_entry* found = concept_memos->find (&elt);
-  if (found)
-    return found->result;
-  else
-    return NULL_TREE;
-}
-
-/* Memoize the result of a concept check. Returns the saved result.  */
-
-tree
-memoize_concept_satisfaction (tree tmpl, tree args, tree result)
-{
-  concept_spec_entry elt = {tmpl, args, result};
-  concept_spec_entry** slot = concept_memos->find_slot (&elt, INSERT);
-  concept_spec_entry* entry = ggc_alloc<concept_spec_entry> ();
-  *entry = elt;
-  *slot = entry;
-  return result;
-}
-
-static GTY (()) hash_table<concept_spec_hasher> *concept_expansions;
-
-/* Returns a prior concept specialization. This returns the substituted
-   and normalized constraints defined by the concept.  */
-
-tree
-get_concept_expansion (tree tmpl, tree args)
-{
-  concept_spec_entry elt = { tmpl, args, NULL_TREE };
-  concept_spec_entry* found = concept_expansions->find (&elt);
-  if (found)
-    return found->result;
-  else
-    return NULL_TREE;
-}
-
-/* Save a concept expansion for later.  */
-
-tree
-save_concept_expansion (tree tmpl, tree args, tree def)
-{
-  concept_spec_entry elt = {tmpl, args, def};
-  concept_spec_entry** slot = concept_expansions->find_slot (&elt, INSERT);
-  concept_spec_entry* entry = ggc_alloc<concept_spec_entry> ();
-  *entry = elt;
-  *slot = entry;
-  return def;
+  if (decl_constraints)
+    decl_constraints->remove (t);
 }
 
 static hashval_t
@@ -28306,13 +28642,11 @@ init_constraint_processing (void)
   if (!flag_concepts)
     return;
 
-  decl_constraints = hash_table<constr_hasher>::create_ggc(37);
-  constraint_memos = hash_table<constraint_sat_hasher>::create_ggc(37);
-  concept_memos = hash_table<concept_spec_hasher>::create_ggc(37);
-  concept_expansions = hash_table<concept_spec_hasher>::create_ggc(37);
   subsumption_table = hash_table<subsumption_hasher>::create_ggc(37);
 }
 
+GTY(()) tree current_failed_constraint;
+
 /* __integer_pack(N) in a pack expansion expands to a sequence of numbers from
    0..N-1.  */
 
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index b441af8..5bc8679 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -835,7 +835,10 @@ accessible_p (tree type, tree decl, bool consider_local_p)
      in default arguments for template parameters), and access
      checking should be performed in the outermost parameter list.  */
   if (processing_template_decl
-      && !expanding_concept ()
+      /* FIXME CWG has been talking about doing access checking in the context
+	 of the constraint-expression, rather than the constrained declaration,
+	 in which case we would want to remove this test.  */
+      && !processing_constraint_expression_p ()
       && (!processing_template_parmlist || processing_template_decl > 1))
     return 1;
 
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 5a8c4d2..1839013 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1788,10 +1788,10 @@ finish_mem_initializers (tree mem_inits)
 
 /* Obfuscate EXPR if it looks like an id-expression or member access so
    that the call to finish_decltype in do_auto_deduction will give the
-   right result.  */
+   right result.  If EVEN_UNEVAL, do this even in unevaluated context.  */
 
 tree
-force_paren_expr (tree expr)
+force_paren_expr (tree expr, bool even_uneval)
 {
   /* This is only needed for decltype(auto) in C++14.  */
   if (cxx_dialect < cxx14)
@@ -1799,7 +1799,7 @@ force_paren_expr (tree expr)
 
   /* If we're in unevaluated context, we can't be deducing a
      return/initializer type, so we don't need to mess with this.  */
-  if (cp_unevaluated_operand)
+  if (cp_unevaluated_operand && !even_uneval)
     return expr;
 
   if (!DECL_P (tree_strip_any_location_wrapper (expr))
@@ -2589,6 +2589,27 @@ finish_call_expr (tree fn, vec<tree, va_gc> **args, bool disallow_virtual,
 				      /*fn_p=*/NULL,
 				      complain);
     }
+  else if (concept_check_p (fn))
+    {
+      /* FN is actually a template-id referring to a concept definition.  */
+      tree id = unpack_concept_check (fn);
+      tree tmpl = TREE_OPERAND (id, 0);
+      tree args = TREE_OPERAND (id, 1);
+
+      if (!function_concept_p (tmpl))
+	{
+	  error_at (EXPR_LOC_OR_LOC (fn, input_location),
+		    "cannot call a concept as a function");
+	  return error_mark_node;
+	}
+
+      /* Ensure the result is wrapped as a call expression.  */
+      result = build_concept_check (tmpl, args, tf_warning_or_error);
+
+      /* Evaluate the check if it is non-dependent.   */
+      if (!uses_template_parms (args))
+	result = evaluate_concept_check (result, complain);
+    }
   else if (is_overloaded_fn (fn))
     {
       /* If the function is an overloaded builtin, resolve it.  */
@@ -3833,9 +3854,10 @@ finish_id_expression_1 (tree id_expression,
       if (! error_operand_p (decl)
 	  && !dependent_p
 	  && integral_constant_expression_p
-	  && ! decl_constant_var_p (decl)
+	  && !decl_constant_var_p (decl)
 	  && TREE_CODE (decl) != CONST_DECL
-	  && ! builtin_valid_in_constant_expr_p (decl))
+	  && !builtin_valid_in_constant_expr_p (decl)
+	  && !concept_check_p (decl))
 	{
 	  if (!allow_non_integral_constant_expression_p)
 	    {
@@ -3851,12 +3873,23 @@ finish_id_expression_1 (tree id_expression,
 	decl = wrap;
       else if (TREE_CODE (decl) == TEMPLATE_ID_EXPR
 	       && !dependent_p
-	       && variable_template_p (TREE_OPERAND (decl, 0)))
+	       && variable_template_p (TREE_OPERAND (decl, 0))
+	       && !concept_check_p (decl))
 	{
 	  decl = finish_template_variable (decl);
 	  mark_used (decl);
 	  decl = convert_from_reference (decl);
 	}
+      else if (concept_check_p (decl))
+	{
+	  /* If this is a standard or variable concept check, potentially
+	     evaluate it. Function concepts need to be called as functions,
+	     so don't try evaluating them here.  */
+	  tree tmpl = TREE_OPERAND (decl, 0);
+	  tree args = TREE_OPERAND (decl, 1);
+	  if (!function_concept_p (tmpl) && !uses_template_parms (args))
+	    decl = evaluate_concept_check (decl, tf_warning_or_error);
+	}
       else if (scope)
 	{
 	  if (TREE_CODE (decl) == SCOPE_REF)
@@ -3929,6 +3962,16 @@ finish_id_expression_1 (tree id_expression,
 
 	  decl = baselink_for_fns (decl);
 	}
+      else if (concept_check_p (decl))
+	{
+	  /* If this is a standard or variable concept check, potentially
+	     evaluate it. Function concepts need to be called as functions,
+	     so don't try evaluating them here.  */
+	  tree tmpl = TREE_OPERAND (decl, 0);
+	  tree args = TREE_OPERAND (decl, 1);
+	  if (!function_concept_p (tmpl) && !uses_template_parms (args))
+	    decl = evaluate_concept_check (decl, tf_warning_or_error);
+	}
       else
 	{
 	  if (DECL_P (decl) && DECL_NONLOCAL (decl)
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 1d9e9b8..ba334e7 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -9644,7 +9644,8 @@ check_return_expr (tree retval, bool *no_warning)
 	  if (!retval)
 	    retval = void_node;
 	  auto_node = type_uses_auto (pattern);
-	  type = do_auto_deduction (pattern, retval, auto_node);
+	  type = do_auto_deduction (pattern, retval, auto_node,
+				    tf_warning_or_error, adc_return_type);
 	}
 
       if (type == error_mark_node)
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 54d6b84..2402c38 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -923,7 +923,7 @@ store_init_value (tree decl, tree init, vec<tree, va_gc>** cleanups, int flags)
     return split_nonconstant_init (decl, value);
 
   /* DECL may change value; purge caches.  */
-  clear_cv_and_fold_caches ();
+  clear_cv_and_fold_caches (TREE_STATIC (decl));
 
   /* If the value is a constant, just put it in DECL_INITIAL.  If DECL
      is an automatic variable, the middle end will turn this into a
@@ -2242,8 +2242,7 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
       if (!CLASS_PLACEHOLDER_TEMPLATE (anode))
 	{
 	  if (complain & tf_error)
-	    error_at (DECL_SOURCE_LOCATION (TEMPLATE_TYPE_DECL (anode)),
-		      "invalid use of %qT", anode);
+	    error ("invalid use of %qT", anode);
 	  return error_mark_node;
 	}
       else if (!parms)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 20e10c0..dc9a3e5 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -2512,14 +2512,17 @@ exhaustion is signalled by throwing @code{std::bad_alloc}.  See also
 @samp{new (nothrow)}.
 
 @item -fconcepts
+@itemx -fconcepts-ts
 @opindex fconcepts
-Enable support for the C++ Extensions for Concepts Technical
-Specification, ISO 19217 (2015), which allows code like
-
-@smallexample
-template <class T> concept bool Addable = requires (T t) @{ t + t; @};
-template <Addable T> T add (T a, T b) @{ return a + b; @}
-@end smallexample
+@opindex fconcepts-ts
+Below @option{-std=c++2a}, @option{-fconcepts} enables support for the
+C++ Extensions for Concepts Technical Specification, ISO 19217 (2015).
+
+With @option{-std=c++2a} and above, Concepts are part of the language
+standard, so @option{-fconcepts} defaults to on.  But the standard
+specification of Concepts differs significantly from the TS, so some
+constructs that were allowed in the TS but didn't make it into the
+standard can still be enabled by @option{-fconcepts-ts}.
 
 @item -fconstexpr-depth=@var{n}
 @opindex fconstexpr-depth
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26a3fcc..9318655 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-08  Andrew Sutton  <asutton@lock3software.com>
+
+	* lib/target-supports.exp (check_effective_target_concepts): Check
+	for std=c++2a.
+
 2019-10-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* c-c++-common/Waddress-1.c: Test locations too.
diff --git a/gcc/testsuite/g++.dg/concepts/alias1.C b/gcc/testsuite/g++.dg/concepts/alias1.C
deleted file mode 100644
index 279a478..0000000
--- a/gcc/testsuite/g++.dg/concepts/alias1.C
+++ /dev/null
@@ -1,16 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  requires C<T>()
-    using X = T*;
-
-struct S { };
-
-int main()
-{
-  X<S> x1;
-}
diff --git a/gcc/testsuite/g++.dg/concepts/alias2.C b/gcc/testsuite/g++.dg/concepts/alias2.C
deleted file mode 100644
index 06ffb1a..0000000
--- a/gcc/testsuite/g++.dg/concepts/alias2.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<C T> using X = T*;
-
-struct S { };
-
-int main()
-{
-  X<S> x1;
-}
diff --git a/gcc/testsuite/g++.dg/concepts/alias3.C b/gcc/testsuite/g++.dg/concepts/alias3.C
deleted file mode 100644
index 2901c04..0000000
--- a/gcc/testsuite/g++.dg/concepts/alias3.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  requires C<T>()
-    using X = T*;
-
-int main()
-{
-  X<int> x1; // { dg-error "constraint|invalid" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/alias4.C b/gcc/testsuite/g++.dg/concepts/alias4.C
deleted file mode 100644
index 2c9f5de..0000000
--- a/gcc/testsuite/g++.dg/concepts/alias4.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  requires C<T>()
-    using X = T*;
-
-// BUG: Alias templates are expanded at the point of use, regardless
-// of whether or not they are dependent. This causes T* to be substituted
-// without acutally checking the constraints.
-template<typename T>
-  using Y = X<T>;
-
-int main()
-{
-  Y<int> y1; // { dg-error "" "" { xfail *-*-* } }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/auto1.C b/gcc/testsuite/g++.dg/concepts/auto1.C
index 2682940..e053306 100644
--- a/gcc/testsuite/g++.dg/concepts/auto1.C
+++ b/gcc/testsuite/g++.dg/concepts/auto1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T1, class T2> class A { };
diff --git a/gcc/testsuite/g++.dg/concepts/auto3.C b/gcc/testsuite/g++.dg/concepts/auto3.C
index abfb201..27a6afa 100644
--- a/gcc/testsuite/g++.dg/concepts/auto3.C
+++ b/gcc/testsuite/g++.dg/concepts/auto3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class...> class tuple {};
diff --git a/gcc/testsuite/g++.dg/concepts/auto4.C b/gcc/testsuite/g++.dg/concepts/auto4.C
index 4eb2ae8..8bf3fa9 100644
--- a/gcc/testsuite/g++.dg/concepts/auto4.C
+++ b/gcc/testsuite/g++.dg/concepts/auto4.C
@@ -1,6 +1,6 @@
 // PR c++/85006
-// { dg-do compile { target c++17 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<typename... Ts> struct A {};
 
diff --git a/gcc/testsuite/g++.dg/concepts/class-deduction1.C b/gcc/testsuite/g++.dg/concepts/class-deduction1.C
index 936dd68..3359700 100644
--- a/gcc/testsuite/g++.dg/concepts/class-deduction1.C
+++ b/gcc/testsuite/g++.dg/concepts/class-deduction1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T>
diff --git a/gcc/testsuite/g++.dg/concepts/class-deduction2.C b/gcc/testsuite/g++.dg/concepts/class-deduction2.C
deleted file mode 100644
index e0718d1..0000000
--- a/gcc/testsuite/g++.dg/concepts/class-deduction2.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// PR c++/85706
-// { dg-do compile { target c++17 } }
-// { dg-additional-options "-fconcepts" }
-
-template<class T> struct S {
-  S(T);
-};
-
-template<class = void>
-auto f() -> decltype(S(42)); // error
diff --git a/gcc/testsuite/g++.dg/concepts/class.C b/gcc/testsuite/g++.dg/concepts/class.C
deleted file mode 100644
index dc5523e..0000000
--- a/gcc/testsuite/g++.dg/concepts/class.C
+++ /dev/null
@@ -1,53 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Class() { return __is_class(T); }
-
-template<typename T>
-  concept bool Union() { return __is_union(T); }
-
-
-// Check ordering of specializations
-template<typename T>
-  concept bool One() { return sizeof(T) >= 4; }
-
-template<typename T>
-  concept bool Two() { return One<T>() && sizeof(T) >= 8; }
-
-// Check non-overlapping specializations
-template<typename T>
-  struct S1 { static const int value = 0; };
-
-template<Class T>
-  struct S1<T> { static const int value = 1; };
-
-template<Union T>
-  struct S1<T> { static const int value = 2; };
-
-struct S { };
-union U { };
-
-static_assert(S1<int>::value == 0, "");
-static_assert(S1<S>::value == 1, "");
-static_assert(S1<U>::value == 2, "");
-
-
-// Check ordering of partial specializaitons
-template<typename T>
-  struct S2 { static const int value = 0;  };
-
-template<One T>
-  struct S2<T> { static const int value = 1; };
-
-template<Two T>
-  struct S2<T> { static const int value = 2; };
-
-struct one_type { char x[4]; };
-struct two_type { char x[8]; };
-
-static_assert(S2<char>::value == 0, "");
-static_assert(S2<one_type>::value == 1, "");
-static_assert(S2<two_type>::value == 2, "");
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/class1.C b/gcc/testsuite/g++.dg/concepts/class1.C
deleted file mode 100644
index a738e6e..0000000
--- a/gcc/testsuite/g++.dg/concepts/class1.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  requires C<T>()
-    struct S { };
-
-struct X { };
-
-S<X> sx;
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/class2.C b/gcc/testsuite/g++.dg/concepts/class2.C
deleted file mode 100644
index ec87181..0000000
--- a/gcc/testsuite/g++.dg/concepts/class2.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  requires C<T>()
-    struct S { };
-
-struct X { };
-
-S<int> sx; // { dg-error "constraint|invalid" }
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/class3.C b/gcc/testsuite/g++.dg/concepts/class3.C
deleted file mode 100644
index 256370d..0000000
--- a/gcc/testsuite/g++.dg/concepts/class3.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-// Check class redeclaration with alternative spellings.
-template<typename T> requires C<T>() struct S;
-template<C T> struct S { };
-
-struct X { };
-
-// S<X> sx;
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/class4.C b/gcc/testsuite/g++.dg/concepts/class4.C
deleted file mode 100644
index b583e55..0000000
--- a/gcc/testsuite/g++.dg/concepts/class4.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Class() { return __is_class(T); }
-
-template<typename T>
-  concept bool Union() { return __is_union(T); }
-
-// Check non-overlapping specializations
-template<typename T> struct S1 { static const int value = 0; };
-template<Class T> struct S1<T> { static const int value = 1; };
-template<Union T> struct S1<T> { static const int value = 2; };
-
-struct S { };
-union U { };
-
-static_assert(S1<int>::value == 0, "");
-static_assert(S1<S>::value == 1, "");
-static_assert(S1<U>::value == 2, "");
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/class5.C b/gcc/testsuite/g++.dg/concepts/class5.C
index 7bf620e..ac9d7e8 100644
--- a/gcc/testsuite/g++.dg/concepts/class5.C
+++ b/gcc/testsuite/g++.dg/concepts/class5.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/class6.C b/gcc/testsuite/g++.dg/concepts/class6.C
index bdd60918..f2345b1 100644
--- a/gcc/testsuite/g++.dg/concepts/class6.C
+++ b/gcc/testsuite/g++.dg/concepts/class6.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
@@ -15,5 +15,3 @@ struct one_type { char x[4]; };
 
 // Constraints are checked even when decls are not instantiatied.
 S4<one_type>* x4b; // { dg-error "constraint|invalid" }
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/constrained-parm.C b/gcc/testsuite/g++.dg/concepts/constrained-parm.C
deleted file mode 100644
index c2b6614a..0000000
--- a/gcc/testsuite/g++.dg/concepts/constrained-parm.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<const C T> struct S1 { };    // { dg-error "cv-qualified" }
-template<volatile C T> struct S2 { }; // { dg-error "cv-qualified" }
-template<C* T> struct S3 { };         // { dg-error "invalid" }
-template<C const* T> struct S3a { };  // { dg-error "invalid" }
-template<C* const T> struct S3b { };  // { dg-error "invalid" }
-template<C& T> struct S4 { };         // { dg-error "invalid" }
-template<C[3] T> struct S4 { };       // { dg-error "invalid|expected" }
-template<C(*T)()> struct S5 { };      // { dg-error "invalid" }
diff --git a/gcc/testsuite/g++.dg/concepts/debug1.C b/gcc/testsuite/g++.dg/concepts/debug1.C
index 87f2ac9..b9a5444 100644
--- a/gcc/testsuite/g++.dg/concepts/debug1.C
+++ b/gcc/testsuite/g++.dg/concepts/debug1.C
@@ -1,11 +1,11 @@
 // PR c++/84551
-// { dg-do compile { target c++17 } }
-// { dg-options "-g -O -fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<typename> concept bool C() { return true; }
 
-template<template<typename T> requires C<T>() class> struct A {};
+template<template<typename T> requires C<T>() class TT> struct A {};
 
-template<typename> requires true struct B {};
+template<typename U> requires C<U>() struct B {};
 
 A<B> a;
diff --git a/gcc/testsuite/g++.dg/concepts/decl-diagnose.C b/gcc/testsuite/g++.dg/concepts/decl-diagnose.C
index 019a8ce..6a461a5 100644
--- a/gcc/testsuite/g++.dg/concepts/decl-diagnose.C
+++ b/gcc/testsuite/g++.dg/concepts/decl-diagnose.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 typedef concept int CINT; // { dg-error "'concept' cannot appear in a typedef declaration" }
@@ -12,10 +12,10 @@ concept bool f3(); // { dg-error "14:concept .f3. has no definition" }
 struct X
 {
   template<typename T>
-  concept int f4() { return 0; } // { dg-error "return type|member function" }
-  concept bool f5() { return true; } // { dg-error "member function" }
+  concept int f4() { return 0; } // { dg-error "cannot be a member" }
+  concept f5 = true; // { dg-error "declared 'concept'" }
   template<typename T>
-  static concept bool f6() { return true; } // { dg-error "a concept cannot be a member function" }
+  static concept f6 = true; // { dg-error "declared 'concept'" }
   static concept bool x; // { dg-error "declared 'concept'" }
 			 // { dg-error "uninitialized 'const" "" { target *-*-* } .-1 }
   concept int x2; // { dg-error "declared 'concept'" }
diff --git a/gcc/testsuite/g++.dg/concepts/deduction-constraint1.C b/gcc/testsuite/g++.dg/concepts/deduction-constraint1.C
index bebbda1..eba5771 100644
--- a/gcc/testsuite/g++.dg/concepts/deduction-constraint1.C
+++ b/gcc/testsuite/g++.dg/concepts/deduction-constraint1.C
@@ -1,5 +1,5 @@
 // PR c++/67007
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class U>
diff --git a/gcc/testsuite/g++.dg/concepts/diagnostic1.C b/gcc/testsuite/g++.dg/concepts/diagnostic1.C
index 9bb1506..ced56d4 100644
--- a/gcc/testsuite/g++.dg/concepts/diagnostic1.C
+++ b/gcc/testsuite/g++.dg/concepts/diagnostic1.C
@@ -1,19 +1,19 @@
 // PR c++/67159
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T, class U>
 concept bool SameAs = __is_same_as(T, U);
 
 template <class T>
-concept bool R1 = requires (T& t) {
-  { t.begin() } -> T
-  { t.end() } -> SameAs<T*>;
+concept bool R1 = requires (T& t) { // { dg-message "in requirements" }
+  { t.begin() } -> T;		// { dg-error "no match" }
+  { t.end() } -> SameAs<T*>;	// { dg-error "does not satisfy" }
 };
 
 template <class T>
-concept bool R2 = requires (T& t) {
-  { t.end() } -> SameAs<T*>;
+concept bool R2 = requires (T& t) { // { dg-message "in requirements" }
+  { t.end() } -> SameAs<T*>;	// { dg-error "does not satisfy" }
 };
 
 struct foo {
diff --git a/gcc/testsuite/g++.dg/concepts/disjunction1.C b/gcc/testsuite/g++.dg/concepts/disjunction1.C
deleted file mode 100644
index 930adf4..0000000
--- a/gcc/testsuite/g++.dg/concepts/disjunction1.C
+++ /dev/null
@@ -1,60 +0,0 @@
-// PR c++/66962
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <typename> struct remove_cv;
-template <typename> struct is_reference;
-template <typename> void declval();
-template <typename> struct is_constructible;
-template <typename> struct is_nothrow_constructible;
-template <typename _Tp> using remove_cv_t = typename remove_cv<_Tp>::type;
-template <typename> struct Trans_NS_extension_apply_list;
-template <typename T> using _t = typename T::type;
-template <class> void ImplicitlyConvertibleTo();
-template <class> void Assignable();
-template <class T, class... Args> int ConstructibleObject = requires { T{}; };
-template <class T, class... Args>
-concept bool BindableReference =
-    is_reference<T>::value &&is_constructible<T>::value;
-template <class T, class... Args> concept bool Constructible() {
-  return ConstructibleObject<T> || BindableReference<T, Args...>;
-}
-template <class T> concept bool DefaultConstructible() {
-  return Constructible<T>() && requires { new T[0]; };
-}
-template <class T> concept bool MoveConstructible() {
-  return Constructible<T>() && ImplicitlyConvertibleTo<T>;
-}
-template <class T> concept bool Movable() {
-  return MoveConstructible<T>() && Assignable<T &&>;
-}
-template <class, class> int Swappable_ = requires { 0; };
-template <class T, class U> int Swappable();
-template <class T> concept bool Dereferencable = requires{{0}};
-template <Dereferencable R> using RvalueReferenceType = decltype(0);
-template <class T> int IsValueType;
-template <class> struct value_type;
-template <class T>
-requires IsValueType<
-    _t<value_type<remove_cv_t<T>>>> using ValueType =
-    _t<value_type<remove_cv_t<T>>>;
-template <class I> concept bool Readable() {
-  return Movable<I>() && DefaultConstructible<I>() &&
-         Dereferencable<const I> && requires{{0}};
-}
-template <class Out, class T> concept bool MoveWritable() {
-  return Movable<Out>() && DefaultConstructible<Out>() &&
-         Dereferencable<Out>;
-}
-template <class In, class Out> concept bool IndirectlyMovable() {
-  return Readable<In>() && Movable<ValueType<In>>() &&
-         Constructible<ValueType<In>>() &&
-         MoveWritable<Out, RvalueReferenceType<In>>() &&
-         MoveWritable<Out, ValueType<In>>();
-}
-IndirectlyMovable { In, Out }
-int is_nothrow_indirectly_movable_v =
-    is_nothrow_constructible<ValueType<In>>::value;
-template <Readable R1, Readable R2>
-    requires IndirectlyMovable<R1, R2>() &&
-    IndirectlyMovable<R2, R1>() void iter_swap2();
diff --git a/gcc/testsuite/g++.dg/concepts/dr1430.C b/gcc/testsuite/g++.dg/concepts/dr1430.C
index f865d5e..6f5bab1 100644
--- a/gcc/testsuite/g++.dg/concepts/dr1430.C
+++ b/gcc/testsuite/g++.dg/concepts/dr1430.C
@@ -1,5 +1,5 @@
 // PR c++/66092
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 #include <type_traits>
@@ -29,11 +29,14 @@ template <typename T, typename U, typename... Args>
   concept bool Similar = true;
 
 template <typename... Args>
-requires Same<Args...>() // { dg-error "invalid reference" }
+requires Same<Args...>() // { dg-error "" "" { xfail *-*-* } }
   void foo( Args... args ) {}
+// FIXME: The new method of building concept checks is suppressing the
+// diagnostic for the invalid substitution. This produces an invalid
+// requires-clause, which still prevents the function from being resolved.
 
 template <typename... Args>
-requires Similar<Args...> // { dg-error "invalid reference" }
+requires Similar<Args...> // { dg-error "pack expansion" }
   void bar( Args... args ) {}
 
 int main()
diff --git a/gcc/testsuite/g++.dg/concepts/equiv.C b/gcc/testsuite/g++.dg/concepts/equiv.C
index faec354..640c2b5 100644
--- a/gcc/testsuite/g++.dg/concepts/equiv.C
+++ b/gcc/testsuite/g++.dg/concepts/equiv.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do link { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 // Check equivalence of short- and longhand declarations.
diff --git a/gcc/testsuite/g++.dg/concepts/equiv2.C b/gcc/testsuite/g++.dg/concepts/equiv2.C
index 2094ca9..dff719b 100644
--- a/gcc/testsuite/g++.dg/concepts/equiv2.C
+++ b/gcc/testsuite/g++.dg/concepts/equiv2.C
@@ -1,4 +1,4 @@
-// { dg-do run { target c++17 } }
+// { dg-do link { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 
@@ -21,9 +21,9 @@ int main() {
 
 void f1(C, C) { }
 
-template<C T>
-void f2(T, T) { }
+template<C T1, C T2>
+void f2(T1, T2) { }
 
-template<typename T>
-  requires C<T>
-void f3(T, T) { }
+template<typename T, typename U>
+  requires C<T> && C<U>
+void f3(T, U) { }
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-inst1.C b/gcc/testsuite/g++.dg/concepts/explicit-inst1.C
deleted file mode 100644
index 99bd72e..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-inst1.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-struct X { };
-struct Y { int n; };
-
-template<typename T> void g(T) { } // #1
-template<C T> void g(T) { } // #2
-template<D T> void g(T) { } // #3
-
-// FIXME: How do I test that these generate the right symbols?
-template void g(int); // Instantiate #1
-template void g(X); // Instantitae #3
-template void g(Y); // Instantiate #2
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-inst2.C b/gcc/testsuite/g++.dg/concepts/explicit-inst2.C
deleted file mode 100644
index ea31387..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-inst2.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-struct X { };
-struct Y { int n; };
-
-template<typename T> struct S  { void f1() { } };  // #1
-template<C T> struct S<T> { void f2() { } };      // #2
-template<D T> struct S<T> { void f3() { } };      // #3
-
-template struct S<int>; // Instantiate #1
-template struct S<X>; // Instantiate #2
-template struct S<Y>; // Instantiate #2
-
-int main() {
-  S<int> i; i.f1();
-  S<X> x; x.f3();
-  S<Y> y; y.f2();
-}
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-inst3.C b/gcc/testsuite/g++.dg/concepts/explicit-inst3.C
deleted file mode 100644
index 18d3c49..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-inst3.C
+++ /dev/null
@@ -1,28 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-struct X { };
-struct Y { int n; };
-
-template<typename T>
-  struct S {
-    void f() { }                 // #1
-    void f() requires C<T>() { } // #2
-
-    void g() requires C<T>() { } // #1
-    void g() requires D<T>() { } // #2
-  };
-
-template void S<int>::f(); // #1
-template void S<X>::f(); // #2
-
-template void S<X>::g(); // #2
-template void S<Y>::g(); // #1
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-inst4.C b/gcc/testsuite/g++.dg/concepts/explicit-inst4.C
deleted file mode 100644
index 20f4377..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-inst4.C
+++ /dev/null
@@ -1,18 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-template<typename T>
-  struct S {
-    void g() requires C<T>() { } // #1
-    void g() requires D<T>() { } // #2
-  };
-
-template void S<int>::g(); // { dg-error "match" }
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec1.C b/gcc/testsuite/g++.dg/concepts/explicit-spec1.C
deleted file mode 100644
index bff06f2..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-spec1.C
+++ /dev/null
@@ -1,32 +0,0 @@
-// { dg-do run { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <cassert>
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-struct X { } x;
-struct Y { int n; } y;
-
-template<typename T> void g(T) { } // #1
-template<C T> void g(T) { }        // #2
-template<D T> void g(T) { }     // #3
-
-int called;
-
-template<> void g(int) { called = 1; } // Specialization of #1
-template<> void g<X>(X) { called = 2; } // Specialization of #3
-template<> void g(Y) { called = 3; } // Specialization of #2
-
-int main() {
-  g(0);
-  assert(called == 1);
-  g(x);
-  assert(called == 2);
-  g(y);
-  assert(called == 3);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec2.C b/gcc/testsuite/g++.dg/concepts/explicit-spec2.C
deleted file mode 100644
index ca8b8a0..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-spec2.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-struct X { };
-
-template<C T> struct S;
-template<> struct S<X> { void f() { } };
-
-int main() {
-  S<X> x; x.f();
-}
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec3.C b/gcc/testsuite/g++.dg/concepts/explicit-spec3.C
deleted file mode 100644
index fd48da1..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-spec3.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<C T> struct S;
-
-struct X { };
-
-// Not a valid explicit specialization, int does not satisfy C.
-template<> struct S<int> { }; // { dg-error "constraint" }
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec4.C b/gcc/testsuite/g++.dg/concepts/explicit-spec4.C
deleted file mode 100644
index 75a2dec..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-spec4.C
+++ /dev/null
@@ -1,51 +0,0 @@
-// { dg-do run { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <cassert>
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-struct X { } x;
-struct Y { int n; } y;
-
-int called = 0;
-
-template<typename T>
-  struct S {
-    void f() { called = 0; }                 // #1
-    void f() requires C<T>() { called = 0; } // #2
-
-    void g() requires C<T>() { } // #1
-    void g() requires D<T>() { } // #2
-  };
-
-template<> void S<int>::f() { called = 1; } // Spec of #1
-template<> void S<X>::f() { called = 2; } // Spec of #2
-
-template<> void S<X>::g() { called = 3; } // Spec of #2
-template<> void S<Y>::g() { called = 4; } // Spec of #1
-
-int main() {
-  S<double> sd;
-  S<int> si;
-  S<X> sx;
-  S<Y> sy;
-
-  sd.f();
-  assert(called == 0);
-  si.f();
-  assert(called == 1);
-  sx.f();
-  assert(called == 2);
-  sy.f();
-  assert(called == 0);
-
-  sx.g();
-  assert(called == 3);
-  sy.g();
-  assert(called == 4);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec5.C b/gcc/testsuite/g++.dg/concepts/explicit-spec5.C
deleted file mode 100644
index d83eec1..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-spec5.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <cassert>
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() && __is_empty(T); }
-
-struct X { } x;
-struct Y { int n; } y;
-
-int called = 0;
-
-template<typename T>
-  struct S {
-    void f() requires C<T>();
-  };
-
-template<> void S<int>::f() { called = 1; } // { dg-error "match" }
diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec6.C b/gcc/testsuite/g++.dg/concepts/explicit-spec6.C
deleted file mode 100644
index b548707..0000000
--- a/gcc/testsuite/g++.dg/concepts/explicit-spec6.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-struct A {
-    template<class T2> void f1(T, T2); // member template
-    template<class T2> void f2(T, T2); // member template
-};
-
-template<>
-template<class X1> void A<int>::f1(int, X1);
-
-// Specialization with template-id
-template<>
-template<> void A<int>::f2<char>(int, char);
-
-// Specialization with deduction
-template<>
-template<> void A<int>::f1(int, char);
diff --git a/gcc/testsuite/g++.dg/concepts/expression.C b/gcc/testsuite/g++.dg/concepts/expression.C
index 33dad0a..ba4c48d 100644
--- a/gcc/testsuite/g++.dg/concepts/expression.C
+++ b/gcc/testsuite/g++.dg/concepts/expression.C
@@ -1,6 +1,8 @@
-// { dg-do run { target c++17 } }
+// { dg-do run { target c++17_only } }
 // { dg-options "-fconcepts" }
 
+// TODO: ICE on gimplify 16?
+
 #include <cassert>
 #include <iostream>
 
@@ -8,13 +10,9 @@ template<typename T>
   concept bool C1 = __is_class(T);
 
 template<typename T>
-  concept bool C2() { return __is_class(T); }
-
-template<typename T>
-  concept bool C3() { return requires (T a) { ++a; }; }
+  concept bool C3 = requires (T a) { ++a; };
 
 int main() {
   if (C1<int>) assert(false);
-  if (C2<int>()) assert(false);
-  if (!C3<int>()) assert(false);
+  if (!C3<int>) assert(false);
 }
diff --git a/gcc/testsuite/g++.dg/concepts/expression2.C b/gcc/testsuite/g++.dg/concepts/expression2.C
index c5447df..1cff605 100644
--- a/gcc/testsuite/g++.dg/concepts/expression2.C
+++ b/gcc/testsuite/g++.dg/concepts/expression2.C
@@ -1,16 +1,16 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C1()
 {
-  return requires (T t) { t.f(); };
+  return requires (T t) { t.f(); }; // { dg-message "in requirements" }
 }
 
 template<typename T>
 concept bool C2()
 {
-  return requires { typename T::type; };
+  return requires { typename T::type; }; // { dg-message "in requirements" }
 }
 
 template<typename T>
@@ -22,7 +22,7 @@ template<typename T>
 void f2(T x) { }
 
 // Note that these declarations are private and therefore
-// cannot satisify the constraints.
+// cannot satisfy the constraints.
 class S
 {
   using type = int;
@@ -31,12 +31,12 @@ class S
 
 int main()
 {
-  f1(s); // { dg-error "cannot call" }
+  f1(s); // { dg-error "cannot call|private" }
   f2(s); // { dg-error "" }
 
   // When used in non-SFINAE contexts, make sure that we fail
   // the constraint check before emitting the access check
-  // failures. The context is being presented constistently
+  // failures. The context is being presented consistently
   // in both cases.
   static_assert(C1<S>(), ""); // { dg-error "failed" }
   static_assert(C2<S>(), ""); // { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/concepts/expression3.C b/gcc/testsuite/g++.dg/concepts/expression3.C
index 26b829d..67646811 100644
--- a/gcc/testsuite/g++.dg/concepts/expression3.C
+++ b/gcc/testsuite/g++.dg/concepts/expression3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/feature-macro.C b/gcc/testsuite/g++.dg/concepts/feature-macro.C
deleted file mode 100644
index d3d9b54..0000000
--- a/gcc/testsuite/g++.dg/concepts/feature-macro.C
+++ /dev/null
@@ -1,6 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#ifndef __cpp_concepts
-#error __cpp_concepts not defined
-#endif
diff --git a/gcc/testsuite/g++.dg/concepts/fn-concept1.C b/gcc/testsuite/g++.dg/concepts/fn-concept1.C
index a4ade7c..d1b4c0c 100644
--- a/gcc/testsuite/g++.dg/concepts/fn-concept1.C
+++ b/gcc/testsuite/g++.dg/concepts/fn-concept1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/fn-concept2.C b/gcc/testsuite/g++.dg/concepts/fn-concept2.C
index 0d70728..899988c 100644
--- a/gcc/testsuite/g++.dg/concepts/fn-concept2.C
+++ b/gcc/testsuite/g++.dg/concepts/fn-concept2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/fn-generic-member-ool.C b/gcc/testsuite/g++.dg/concepts/fn-generic-member-ool.C
index b664ccf..2453803 100644
--- a/gcc/testsuite/g++.dg/concepts/fn-generic-member-ool.C
+++ b/gcc/testsuite/g++.dg/concepts/fn-generic-member-ool.C
@@ -1,4 +1,3 @@
-// Out-of-line generic member function definitions.
 // { dg-do compile { target c++14 } }
 // { dg-additional-options "-fconcepts" }
 
diff --git a/gcc/testsuite/g++.dg/concepts/fn1.C b/gcc/testsuite/g++.dg/concepts/fn1.C
index 17f14b9..f23c057 100644
--- a/gcc/testsuite/g++.dg/concepts/fn1.C
+++ b/gcc/testsuite/g++.dg/concepts/fn1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/fn10.C b/gcc/testsuite/g++.dg/concepts/fn10.C
index 6993f34..8d0a2e1 100644
--- a/gcc/testsuite/g++.dg/concepts/fn10.C
+++ b/gcc/testsuite/g++.dg/concepts/fn10.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 // Test that constraint satisfaction checks work even when
@@ -40,7 +40,7 @@ template <typename T>
 template <typename T>
   concept bool Concept()
   {
-    return requires( T t ) {
+    return requires( T t ) { // { dg-message "in requirements" }
       requires Float<decltype( project(t) )>();
     };
   }
diff --git a/gcc/testsuite/g++.dg/concepts/fn2.C b/gcc/testsuite/g++.dg/concepts/fn2.C
index 250e0a8..debb323 100644
--- a/gcc/testsuite/g++.dg/concepts/fn2.C
+++ b/gcc/testsuite/g++.dg/concepts/fn2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/fn3.C b/gcc/testsuite/g++.dg/concepts/fn3.C
index bc0e126..07b8e3a 100644
--- a/gcc/testsuite/g++.dg/concepts/fn3.C
+++ b/gcc/testsuite/g++.dg/concepts/fn3.C
@@ -1,4 +1,4 @@
-// { dg-do run { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/concepts/fn4.C b/gcc/testsuite/g++.dg/concepts/fn4.C
index 830a174..bbaac46 100644
--- a/gcc/testsuite/g++.dg/concepts/fn4.C
+++ b/gcc/testsuite/g++.dg/concepts/fn4.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/fn5.C b/gcc/testsuite/g++.dg/concepts/fn5.C
index 018b12f..7714788 100644
--- a/gcc/testsuite/g++.dg/concepts/fn5.C
+++ b/gcc/testsuite/g++.dg/concepts/fn5.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 // Check shorthand notation.
diff --git a/gcc/testsuite/g++.dg/concepts/fn6.C b/gcc/testsuite/g++.dg/concepts/fn6.C
index 97155f8..031e87f 100644
--- a/gcc/testsuite/g++.dg/concepts/fn6.C
+++ b/gcc/testsuite/g++.dg/concepts/fn6.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 // Redefinition errors.
diff --git a/gcc/testsuite/g++.dg/concepts/fn7.C b/gcc/testsuite/g++.dg/concepts/fn7.C
index 0052f1a..869cb9c 100644
--- a/gcc/testsuite/g++.dg/concepts/fn7.C
+++ b/gcc/testsuite/g++.dg/concepts/fn7.C
@@ -1,8 +1,6 @@
-// { dg-do link { target c++17 } }
+// { dg-do link { target c++14 } }
 // { dg-options "-fconcepts" }
 
-// FIXME: What is this actually testing?
-
 void f() requires true { }
 
 int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/fn8.C b/gcc/testsuite/g++.dg/concepts/fn8.C
index a3daf4e..ffcce4f 100644
--- a/gcc/testsuite/g++.dg/concepts/fn8.C
+++ b/gcc/testsuite/g++.dg/concepts/fn8.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/fn9.C b/gcc/testsuite/g++.dg/concepts/fn9.C
index 84ed77c..2f5e88b 100644
--- a/gcc/testsuite/g++.dg/concepts/fn9.C
+++ b/gcc/testsuite/g++.dg/concepts/fn9.C
@@ -1,4 +1,4 @@
-// { dg-do run { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/concepts/friend1.C b/gcc/testsuite/g++.dg/concepts/friend1.C
deleted file mode 100644
index 9050b55..0000000
--- a/gcc/testsuite/g++.dg/concepts/friend1.C
+++ /dev/null
@@ -1,35 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Eq() { return requires(T t) { t == t; }; }
-
-struct Nt {
-  template<Eq T> friend void f(T) { }
-} nt;
-
-template<typename T> struct S;
-
-template<Eq T>
-  void proc(S<T>*);
-
-template<typename T>
-  struct S {
-    friend bool operator==(S, S) requires Eq<T>() { return true; }
-
-    friend void proc<>(S*); // { dg-error "does not match any template declaration" }
-  };
-
-struct X { } x;
-
-int main() {
-  // f(0); // OK
-  f(nt); // { dg-error "cannot call" }
-  f(x);  // { dg-error "3:'f' was not declared" }
-
-  S<int> si;
-  si == si; // OK
-
-  S<X> sx;
-  sx == sx; // { dg-error "no match" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/friend2.C b/gcc/testsuite/g++.dg/concepts/friend2.C
deleted file mode 100644
index 8ef6002..0000000
--- a/gcc/testsuite/g++.dg/concepts/friend2.C
+++ /dev/null
@@ -1,21 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Eq() { return requires(T t) { t == t; }; }
-
-template<Eq T> struct Foo { };
-
-template<typename T>
-  struct S { // { dg-error "constraint failure" }
-    template<Eq U> friend class Bar;
-
-    friend class Foo<T>;
-  };
-
-struct X { };
-
-int main() {
-  S<int> si; // OK
-  S<X> sx;
-}
diff --git a/gcc/testsuite/g++.dg/concepts/generic-fn-err.C b/gcc/testsuite/g++.dg/concepts/generic-fn-err.C
index 5a95565..816072d 100644
--- a/gcc/testsuite/g++.dg/concepts/generic-fn-err.C
+++ b/gcc/testsuite/g++.dg/concepts/generic-fn-err.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
@@ -10,10 +10,10 @@ template<int N>
 template<template<typename> class X>
   concept bool Template() { return true; }
 
-struct S { };
+void f1(Int) { }      // { dg-error "does not constrain a type" }
+void f2(Template) { } // { dg-error "does not constrain a type" }
 
-void f1(Int) { }      // { dg-error "" }
-void f2(Template) { } // { dg-error "" }
+struct S { };
 
 struct S1 {
   void f1(auto x) { }
diff --git a/gcc/testsuite/g++.dg/concepts/generic-fn.C b/gcc/testsuite/g++.dg/concepts/generic-fn.C
index 3b10327..257608a 100644
--- a/gcc/testsuite/g++.dg/concepts/generic-fn.C
+++ b/gcc/testsuite/g++.dg/concepts/generic-fn.C
@@ -1,4 +1,4 @@
-// { dg-do run { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/concepts/iconv1.C b/gcc/testsuite/g++.dg/concepts/iconv1.C
deleted file mode 100644
index e99254f..0000000
--- a/gcc/testsuite/g++.dg/concepts/iconv1.C
+++ /dev/null
@@ -1,21 +0,0 @@
-// PR c++/67240
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-int foo(int x)
-{
-    return x;
-}
- 
-template <typename T>
-concept bool C1 = requires (T x) {
-    {foo(x)} -> int&;
-};
-
-template <typename T>
-concept bool C2 = requires (T x) {
-    {foo(x)} -> void;
-};
- 
-static_assert( C1<int> );	// { dg-error "assert" }
-static_assert( C2<int> );	// { dg-error "assert" }
diff --git a/gcc/testsuite/g++.dg/concepts/inherit-ctor1.C b/gcc/testsuite/g++.dg/concepts/inherit-ctor1.C
index 4b3f561..b137791 100644
--- a/gcc/testsuite/g++.dg/concepts/inherit-ctor1.C
+++ b/gcc/testsuite/g++.dg/concepts/inherit-ctor1.C
@@ -1,23 +1,33 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
-  concept bool C() { return __is_class(T); }
+  concept bool C = __is_class(T);
+
+struct X { };
 
 template<typename T>
-  struct S1 { S1(double) requires C<T>() { } };
+  struct Base {
+    Base(double) requires C<T> { } 
+  };
 
-struct S2 : S1<int> {
-  using S1<int>::S1;
+struct Ok1 : Base<X> {
+  using Base<X>::Base;
+};
+
+struct Err1 : Base<int> {
+  using Base<int>::Base;
 };
 
 template<typename T>
-  struct S3 : S1<T> {
-    using S1<T>::S1;
+  struct Generic : Base<T> {
+    using Base<T>::Base;
   };
 
-struct X { };
 
 int main() {
-  S3<X> s(0.0);
+  Ok1 x1(0.0);
+  Err1 x2(0.0); // { dg-error "no matching" }
+  Generic<X> x3(0.0);
+  Generic<int> x4(0.0); // { dg-error "no matching" }
 }
diff --git a/gcc/testsuite/g++.dg/concepts/inherit-ctor2.C b/gcc/testsuite/g++.dg/concepts/inherit-ctor2.C
deleted file mode 100644
index cb81d13..0000000
--- a/gcc/testsuite/g++.dg/concepts/inherit-ctor2.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  struct S1 {
-    S1(double) requires C<T>() { }
-  };
-
-template<typename T>
-  struct S2 : S1<T> { // { dg-error "matching" }
-    using S1<T>::S1;
-  };
-
-int main() {
-  S2<int> s; // { dg-error "deleted function" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/inherit-ctor3.C b/gcc/testsuite/g++.dg/concepts/inherit-ctor3.C
index 6f04632..abfe96e 100644
--- a/gcc/testsuite/g++.dg/concepts/inherit-ctor3.C
+++ b/gcc/testsuite/g++.dg/concepts/inherit-ctor3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
@@ -11,12 +11,13 @@ template<typename T>
   };
 
 template<typename T>
-  struct S2 : S1<T> {
-    using S1<T>::S1;
+  struct S2 : S1<T> { // { dg-error "no matching function" }
+    using S1<T>::S1; // { dg-error "no matching function" }
   };
 
 struct X { } x;
 
 int main() {
-  S2<X> s = x;
+  S2<X> s1(0); // { dg-error "use of deleted function" }
+  S2<X> s2; // { dg-error "use of deleted function" }
 }
diff --git a/gcc/testsuite/g++.dg/concepts/inherit-ctor4.C b/gcc/testsuite/g++.dg/concepts/inherit-ctor4.C
deleted file mode 100644
index 43df6e6..0000000
--- a/gcc/testsuite/g++.dg/concepts/inherit-ctor4.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  struct S1 {
-    template<C U> S1(U x) { }
-  };
-
-template<typename T>
-  struct S2 : S1<T> {
-    using S1<T>::S1;
-  };
-
-int main() {
-  S2<int> s(0); // { dg-error "no matching function" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/intro1.C b/gcc/testsuite/g++.dg/concepts/intro1.C
index 84fa6db..5f9bb7e 100644
--- a/gcc/testsuite/g++.dg/concepts/intro1.C
+++ b/gcc/testsuite/g++.dg/concepts/intro1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/intro2.C b/gcc/testsuite/g++.dg/concepts/intro2.C
index 9c7c173..206777d 100644
--- a/gcc/testsuite/g++.dg/concepts/intro2.C
+++ b/gcc/testsuite/g++.dg/concepts/intro2.C
@@ -1,4 +1,4 @@
-// { dg-do run { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 #include <cassert>
diff --git a/gcc/testsuite/g++.dg/concepts/intro3.C b/gcc/testsuite/g++.dg/concepts/intro3.C
index 5e93f31..f02f1be 100644
--- a/gcc/testsuite/g++.dg/concepts/intro3.C
+++ b/gcc/testsuite/g++.dg/concepts/intro3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename ... T>
diff --git a/gcc/testsuite/g++.dg/concepts/intro4.C b/gcc/testsuite/g++.dg/concepts/intro4.C
index a7e5135..0b275e1 100644
--- a/gcc/testsuite/g++.dg/concepts/intro4.C
+++ b/gcc/testsuite/g++.dg/concepts/intro4.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename ... T>
@@ -18,11 +18,11 @@ template<int N>
 template<typename T, typename U = int>
   concept bool C5() { return __is_class(U); }
 
-C1{...A, B} void f1() {}; // { dg-error "no matching|wrong number" }
-C1{A} void f2() {} // { dg-error "cannot match pack|no matching concept" }
-C2{A, B} void f3() {}; // { dg-error "cannot match pack|no matching concept" }
-C3{...A} void f4() {}; // { dg-error "cannot match pack|no matching concept" }
-C4{A} void f5() {}; // { dg-error "no matching concept" }
+C1{...A, B} void f1() {}; // { dg-error "cannot deduce template parameters" }
+C1{A} void f2() {}
+C2{A, B} void f3() {};
+C3{...A} void f4() {}; // { dg-error "cannot be introduced" }
+C4{A} void f5() {}; // { dg-error "cannot deduce template parameters" }
 C5{A, B} void f6() {};
 
 int main()
diff --git a/gcc/testsuite/g++.dg/concepts/intro5.C b/gcc/testsuite/g++.dg/concepts/intro5.C
index e7cd7a4..bbfef7b 100644
--- a/gcc/testsuite/g++.dg/concepts/intro5.C
+++ b/gcc/testsuite/g++.dg/concepts/intro5.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T, typename U = int>
@@ -7,10 +7,5 @@ template<typename T, typename U = int>
      return sizeof(U) == sizeof(int);
   }
 
-C{A} void f1() {}
+C{A} void f1() {} // { dg-error "all template parameters" }
 
-int main()
-{
-  f1<char>();
-  return 0;
-}
diff --git a/gcc/testsuite/g++.dg/concepts/intro6.C b/gcc/testsuite/g++.dg/concepts/intro6.C
index 57b325a..233c5bc 100644
--- a/gcc/testsuite/g++.dg/concepts/intro6.C
+++ b/gcc/testsuite/g++.dg/concepts/intro6.C
@@ -1,5 +1,5 @@
 // PR c++/67003
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 namespace X {
diff --git a/gcc/testsuite/g++.dg/concepts/intro7.C b/gcc/testsuite/g++.dg/concepts/intro7.C
index d5bdc7e..343fe7a 100644
--- a/gcc/testsuite/g++.dg/concepts/intro7.C
+++ b/gcc/testsuite/g++.dg/concepts/intro7.C
@@ -1,14 +1,14 @@
 // PR c++/66985
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <template <class> class T>
-concept bool _Valid = requires { typename T<int>; };
+concept bool Valid = requires { typename T<int>; };
 
 template <template <class> class T>
 struct __defer { };
 
-_Valid{T}
+Valid{T}
 struct __defer<T> {
   using type = T<int>;
 };
diff --git a/gcc/testsuite/g++.dg/concepts/lambda1.C b/gcc/testsuite/g++.dg/concepts/lambda1.C
deleted file mode 100644
index a77e654..0000000
--- a/gcc/testsuite/g++.dg/concepts/lambda1.C
+++ /dev/null
@@ -1,32 +0,0 @@
-// PR c++/82565
-// { dg-do compile { target c++14 } }
-// { dg-additional-options -fconcepts }
-
-struct string
-{
-  string();
-  string(const char *);
-  bool empty() const;
-};
-
-template<typename T, typename ReturnType>
-concept bool Concept() {
-  return requires(T t, const string& s) {
-    { t(s) } -> ReturnType;
-  };
-}
-
-struct test {
-  string _str;
-
-  template<typename Visitor>
-    requires Concept<Visitor, bool>()
-  decltype(auto) visit(Visitor&& visitor) const {
-    return visitor(_str);
-  }
-
-};
-
-int main() {
-  test().visit([] (auto& x) { return x.empty(); });
-}
diff --git a/gcc/testsuite/g++.dg/concepts/locations1.C b/gcc/testsuite/g++.dg/concepts/locations1.C
index 33c3b62..fbad42f 100644
--- a/gcc/testsuite/g++.dg/concepts/locations1.C
+++ b/gcc/testsuite/g++.dg/concepts/locations1.C
@@ -1,5 +1,5 @@
-// { dg-do compile { target c++17 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/concepts/member-concept.C b/gcc/testsuite/g++.dg/concepts/member-concept.C
deleted file mode 100644
index ef577a1..0000000
--- a/gcc/testsuite/g++.dg/concepts/member-concept.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-struct Base {
-  template<typename T>
-    static concept bool D() { return __is_same_as(T, int); } // { dg-error "a concept cannot be a member function" }
-
-  template<typename T, typename U>
-    static concept bool E() { return __is_same_as(T, U); } // { dg-error "a concept cannot be a member function" }
-};
diff --git a/gcc/testsuite/g++.dg/concepts/memfun-err.C b/gcc/testsuite/g++.dg/concepts/memfun-err.C
deleted file mode 100644
index 6e1ad00..0000000
--- a/gcc/testsuite/g++.dg/concepts/memfun-err.C
+++ /dev/null
@@ -1,37 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return __is_empty(T); }
-
-struct X { } x;
-struct Y { int n; } y;
-
-int called = 0;
-
-// Test constrained member definitions
-template<typename T>
-  struct S1 { // { dg-message "defined here" }
-    void f1() requires C<T>() { }
-    void g1() requires C<T>() and true;
-    template<C U> void h1(U u) { called = 1; }
-
-    void g2() requires C<T>(); // { dg-message "candidate" }
-  };
-
-template<typename T>
-  void S1<T>::g2() requires D<T>() { } // { dg-error "no declaration matches" }
-
-int main() {
-  S1<X> sx;
-  S1<Y> sy;
-  S1<int> si;
-
-  si.f1(); // { dg-error "matching" }
-  si.g1(); // { dg-error "matching" }
-  si.h1(0); // { dg-error "matching" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/memfun.C b/gcc/testsuite/g++.dg/concepts/memfun.C
deleted file mode 100644
index 818c7e6..0000000
--- a/gcc/testsuite/g++.dg/concepts/memfun.C
+++ /dev/null
@@ -1,112 +0,0 @@
-// { dg-do run { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <cassert>
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return __is_empty(T); }
-
-struct X { } x;
-struct Y { int n; } y;
-
-int called = 0;
-
-// Test constrained member definitions
-template<typename T>
-  struct S1 {
-    void f1() requires C<T>() { }
-
-    void f2() requires C<T>() { called = 1; }
-    void f2() requires not C<T>() { called = 2; }
-
-    void f3() { called = 1; }
-    void f3() requires C<T>() { called = 2; }
-    void f3() requires C<T>() and D<T>() { called = 3; }
-
-    void g1() requires C<T>() and true;
-
-    void g2() requires C<T>();
-    void g2() requires not C<T>();
-
-    void g3();
-    void g3() requires C<T>();
-    void g3() requires C<T>() and D<T>();
-
-    template<C U> void h1(U u) { called = 1; }
-    template<C U> void h2(U u);
-    template<C U> void h3(U u) requires D<U>();
-  };
-
-template<C T>
-  struct S2 {
-    void f(T) requires D<T>();
-  };
-
-
-int main() {
-  S1<X> sx;
-  S1<Y> sy;
-  S1<int> si;
-
-  // Defined in-class
-  sx.f1();
-  sx.f2(); assert(called == 1);
-  sx.f3(); assert(called == 3);
-
-  sy.f1();
-  sy.f2(); assert(called == 1);
-  sy.f3(); assert(called == 2);
-
-  si.f2(); assert(called == 2);
-  si.f3(); assert(called == 1);
-
-  // Member function template tests
-  S1<int> s1i;
-  s1i.h1(x); assert(called == 1);
-  s1i.h2(x); assert(called == 2);
-  s1i.h3(x); assert(called == 3);
-
-  // Defined out of class.
-  sx.g1();
-  sx.g2(); assert(called == 1);
-  sx.g3(); assert(called == 3);
-
-  sy.g1();
-  sy.g2(); assert(called == 1);
-  sy.g3(); assert(called == 2);
-
-  si.g2(); assert(called == 2);
-  si.g3(); assert(called == 1);
-}
-
-template<typename T>
-  void S1<T>::g1() requires C<T>() and true { }
-
-template<typename T>
-  void S1<T>::g2() requires C<T>() { called = 1; }
-
-template<typename T>
-  void S1<T>::g2() requires not C<T>() { called = 2; }
-
-template<typename T>
-  void S1<T>::g3() { called = 1; }
-
-template<typename T>
-  void S1<T>::g3() requires C<T>() { called = 2; }
-
-template<typename T>
-  void S1<T>::g3() requires C<T>() and D<T>() { called = 3; }
-
-template<typename T>
-  template<C U>
-    void S1<T>::h2(U u) { called = 2; }
-
-template<typename T>
-  template<C U>
-      void S1<T>::h3(U u) requires D<U>() { called = 3; }
-
-template<C T>
-  void S2<T>::f(T t) requires D<T>() { called = 4; }
diff --git a/gcc/testsuite/g++.dg/concepts/memfun2.C b/gcc/testsuite/g++.dg/concepts/memfun2.C
deleted file mode 100644
index 78a2cf7..0000000
--- a/gcc/testsuite/g++.dg/concepts/memfun2.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// PR c++/72415
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<int... Indices>
-struct indices {};
-
-template<typename Dummy>
-struct foo_type {
-    template<int... Indices>
-    static void impl(indices<Indices...>)
-        requires (... && (Indices, true));
-
-    static auto caller()
-    { return impl(indices<0, 1, 2> {}); }
-};
-
-int main()
-{
-    // internal compiler error: in satisfy_predicate_constraint, at cp/constraint.cc:2013
-    foo_type<void>::caller();
-}
diff --git a/gcc/testsuite/g++.dg/concepts/memtmpl1.C b/gcc/testsuite/g++.dg/concepts/memtmpl1.C
deleted file mode 100644
index dc00a07..0000000
--- a/gcc/testsuite/g++.dg/concepts/memtmpl1.C
+++ /dev/null
@@ -1,16 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T>
-struct A {
-  template <class U>
-  requires sizeof(T) == 1
-    static void f(U);
-  template <class U>
-  requires sizeof(T) == 2
-    static void f(U);
-  void g()
-  {
-    f(42);
-  }
-};
diff --git a/gcc/testsuite/g++.dg/concepts/partial-concept-id1.C b/gcc/testsuite/g++.dg/concepts/partial-concept-id1.C
index 5f0f346..6b66b78 100644
--- a/gcc/testsuite/g++.dg/concepts/partial-concept-id1.C
+++ b/gcc/testsuite/g++.dg/concepts/partial-concept-id1.C
@@ -1,27 +1,37 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
-  concept bool Type() { return true; }
+  concept bool Type = true;
 
 template<typename T, typename U>
-  concept bool Same() { return __is_same_as(T, U); }
+  concept bool Same = __is_same_as(T, U);
 
 template<typename T, typename U>
-  concept bool C1() { return true; }
+  concept bool C1 = true;
 
 template<typename T, typename... Args>
-  concept bool C2() { return true; }
+  concept bool C2 = true;
+
+template<typename T, typename U>
+  concept bool C3 = __is_same_as(T, int) && __is_same_as(U, double);
 
 template<Same<int> T> struct S1 { };
 template<typename T, Same<T> U> struct S2 { };
 
-void f(Same<int> q) { }
-void g(Type a, Same<decltype(a)> b) { }
+template<Same<int> Q>
+void f(Q q) { }
+template<Type A, Same<decltype(A{})> B>
+void g(A a, B b) { }
 
-void h0(Same<int>* a) { }
-void h1(C1<int>* a) { }
-void h2(C2<char, short, int, long>* a) { }
+template<Same<int> A>
+void h0(A* a) { }
+template<C1<int> A>
+void h1(A* a) { }
+template<C2<char, short, int, long> A>
+void h2(A* a) { }
+template<C3<double> A>
+void h3(A* a) { }
 
 int main() {
   S1<int> s1;
@@ -30,5 +40,6 @@ int main() {
   g(0, 1);
   h0((int*)0);
   h1((int*)0);
-  h2((int*)0);
+  // h2((int*)0);
+  h3((int*)0);
 }
diff --git a/gcc/testsuite/g++.dg/concepts/partial-concept-id2.C b/gcc/testsuite/g++.dg/concepts/partial-concept-id2.C
index e51894b..2c14576 100644
--- a/gcc/testsuite/g++.dg/concepts/partial-concept-id2.C
+++ b/gcc/testsuite/g++.dg/concepts/partial-concept-id2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 // Make sure that we check partial concept ids
diff --git a/gcc/testsuite/g++.dg/concepts/partial-spec.C b/gcc/testsuite/g++.dg/concepts/partial-spec.C
deleted file mode 100644
index 0ff8ec2..0000000
--- a/gcc/testsuite/g++.dg/concepts/partial-spec.C
+++ /dev/null
@@ -1,16 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-// Check that constraints don't break unconstrained partial
-// specializations.
-
-template<typename T>
-  struct S { };
-
-template<typename T>
-  struct S<T*> { };
-
-template<>
-  struct S<int> { };
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/partial-spec2.C b/gcc/testsuite/g++.dg/concepts/partial-spec2.C
deleted file mode 100644
index 2449c37..0000000
--- a/gcc/testsuite/g++.dg/concepts/partial-spec2.C
+++ /dev/null
@@ -1,33 +0,0 @@
-// PR c++/67084
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T>
-constexpr bool p = false;
-
-template <class T>
-constexpr bool p<T*> = false;
-
-template <class T>
-  requires true
-constexpr bool p<T*> = false;
-
-template <class T>
-  requires true && T() == 0
-constexpr bool p<T*> = true;
-
-template <class T>
-constexpr bool q = false;
-
-template <class T>
-constexpr bool q<T*> = true;
-
-template <class T>
-  requires false
-constexpr bool q<T*> = false;
-
-template <class T>
-  requires false && T() != 0
-constexpr bool q<T*> = false;
-
-static_assert (p<int*>,"");
diff --git a/gcc/testsuite/g++.dg/concepts/partial-spec3.C b/gcc/testsuite/g++.dg/concepts/partial-spec3.C
deleted file mode 100644
index d407181..0000000
--- a/gcc/testsuite/g++.dg/concepts/partial-spec3.C
+++ /dev/null
@@ -1,8 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T> struct A { };
-template <class T> requires false struct A<T*> { };
-template <class T> struct A<T*> { static int i; };
-
-int i = A<int*>::i;
diff --git a/gcc/testsuite/g++.dg/concepts/partial-spec4.C b/gcc/testsuite/g++.dg/concepts/partial-spec4.C
deleted file mode 100644
index 70461b4..0000000
--- a/gcc/testsuite/g++.dg/concepts/partial-spec4.C
+++ /dev/null
@@ -1,50 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T> concept bool is_int = __is_same_as(T,int);
-
-template <class T> struct A { };
-template <is_int T> struct A<T*> {
-  typedef int I1;
-  static const A<T*>::I1 j1 = 0;
-  static int f();
-};
-template <is_int T> int A<T*>::f()
-{ A<T*>::I1 i; return j1; }
-
-template <class T> struct A<T*> {
-  typedef int I2;
-  static const A<T*>::I2 j2 = 0;
-  static int f();
-};
-template <class T> int A<T*>::f()
-{ A<T*>::I2 i; return j2; }
-
-const int i1 = A<int*>::j1;
-const int i2 = A<float*>::j2;
-
-template <class T> struct B;
-
-template <is_int T> struct B<T> {
-  typedef int I4;
-  static const B<T>::I4 j4 = 0;
-  static int f();
-};
-template <is_int T> int B<T>::f()
-{ B<T>::I4 i; return j4; }
-
-template <class T> struct B {
-  typedef int I5;
-  static const B<T>::I5 j5 = 0;
-  static int f();
-};
-template <class T> int B<T>::f()
-{ B<T>::I5 i; return j5; }
-
-int i4 = B<int>::j4;
-int i5 = B<float>::j5;
-int main()
-{
-  B<int>::f();
-  B<float>::f();
-}
diff --git a/gcc/testsuite/g++.dg/concepts/partial-spec5.C b/gcc/testsuite/g++.dg/concepts/partial-spec5.C
index a5b853c..bec6715 100644
--- a/gcc/testsuite/g++.dg/concepts/partial-spec5.C
+++ b/gcc/testsuite/g++.dg/concepts/partial-spec5.C
@@ -1,5 +1,5 @@
 // PR c++/67138
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T>
diff --git a/gcc/testsuite/g++.dg/concepts/partial-spec6.C b/gcc/testsuite/g++.dg/concepts/partial-spec6.C
deleted file mode 100644
index 1d80ee3..0000000
--- a/gcc/testsuite/g++.dg/concepts/partial-spec6.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// PR c++/67152
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T>
-concept bool HasType = requires { typename T::type; };
-
-template<class T>
-struct trait {
-  using type = void;
-};
-
-struct has_type { using type = void; };
-
-// Instantiation here
-trait<has_type>::type foo() {}
-
-// constrained version here. Type "has_type" would fail this
-// constraint so this partial specialization would not have been
-// selected.
-template<class T>
-  requires !HasType<T>
-struct trait<T> {
-  using type = void;
-};
diff --git a/gcc/testsuite/g++.dg/concepts/placeholder1.C b/gcc/testsuite/g++.dg/concepts/placeholder1.C
deleted file mode 100644
index edd0003..0000000
--- a/gcc/testsuite/g++.dg/concepts/placeholder1.C
+++ /dev/null
@@ -1,35 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T, typename U>
-struct is_same
-{
-  static constexpr bool value = false;
-};
-
-template<typename T>
-struct is_same<T, T>
-{
-  static constexpr bool value = true;
-};
-
-template<class T, class U>
-concept bool Same = is_same<T, U>::value;
-
-template<typename T>
-concept bool C1 = true;
-
-template<typename T, typename U>
-concept bool C2 = true;
-
-template<typename T>
-concept bool C3() { return true; }
-
-template<typename T, typename U>
-concept bool C4() { return true; }
-
-C1      c1 = 0;
-C2<int> c2 = 0;
-C3      c3 = 0;
-C4<int> c4 = 0;
-Same<int> s1 = 'a'; // { dg-error "does not satisfy|is_same" }
diff --git a/gcc/testsuite/g++.dg/concepts/placeholder2.C b/gcc/testsuite/g++.dg/concepts/placeholder2.C
index 3d6fc81..0c6f91a 100644
--- a/gcc/testsuite/g++.dg/concepts/placeholder2.C
+++ b/gcc/testsuite/g++.dg/concepts/placeholder2.C
@@ -1,9 +1,6 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
-// Check argument deduction constraints.
-// TODO: We shoul have more of these...
-
 template<typename T>
 concept bool C1 = sizeof(T) == 0;
 
@@ -12,22 +9,16 @@ concept bool C2 = __is_same_as(T, U);
 
 
 template<typename T>
-concept bool D1()
-{
-  return requires (T t) { { t } -> C1; };
-}
+concept bool D1 = requires (T t) { { t } -> C1; };
 
 template<typename T>
-concept bool D2()
-{
-  return requires (T t) { { t } -> C2<void>; };
-}
+concept bool D2 = requires (T t) { { t } -> C2<void>; };
 
-void f1(D1) { }
-void f2(D2) { }
+void f1(auto D1) { } // OK: D1 is declared as a parameter
+void f2(auto D2) { } // OK: D2 is declared as a parameter
 
 int main()
 {
-  f1(0); // { dg-error "cannot call" }
-  f2(0); // { dg-error "cannot call" }
+  f1(0);
+  f2(0);
 }
diff --git a/gcc/testsuite/g++.dg/concepts/placeholder3.C b/gcc/testsuite/g++.dg/concepts/placeholder3.C
index 93f0c0d..4f8600b 100644
--- a/gcc/testsuite/g++.dg/concepts/placeholder3.C
+++ b/gcc/testsuite/g++.dg/concepts/placeholder3.C
@@ -1,5 +1,5 @@
 // PR c++/66218
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T, class U>
@@ -7,8 +7,8 @@ concept bool Same = __is_same_as(T, U);
 
 template <class T>
 concept bool C =
-  requires {
-    { 0 } -> Same<T>;
+  requires { // { dg-message "in requirements" }
+    { 0 } -> Same<T>;		// { dg-error "does not satisfy" }
   };
 
 template <C c>
diff --git a/gcc/testsuite/g++.dg/concepts/placeholder4.C b/gcc/testsuite/g++.dg/concepts/placeholder4.C
index d130813..2b5afbb 100644
--- a/gcc/testsuite/g++.dg/concepts/placeholder4.C
+++ b/gcc/testsuite/g++.dg/concepts/placeholder4.C
@@ -1,5 +1,5 @@
 // PR c++/66218
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T, class U>
@@ -7,8 +7,8 @@ concept bool Same = __is_same_as(T, U);
 
 template <class T>
 concept bool C =
-  requires {
-    { 0 } -> Same<T>;
+  requires { // { dg-message "in requirements" }
+    { 0 } -> Same<T>;		// { dg-error "does not satisfy" }
   };
 
 template <class T>
diff --git a/gcc/testsuite/g++.dg/concepts/placeholder5.C b/gcc/testsuite/g++.dg/concepts/placeholder5.C
index 245e27a..7881a40 100644
--- a/gcc/testsuite/g++.dg/concepts/placeholder5.C
+++ b/gcc/testsuite/g++.dg/concepts/placeholder5.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T, class U>
@@ -8,11 +8,11 @@ const int i = 0;
 template <class T>
 concept bool C =
   requires {
-    { &i } -> const Same<T>*;
+    { &i } -> const Same<T>*; // { dg-error "not a plain type-constraint" }
   };
 
 template <C c>
 constexpr bool f() { return true; }
 
-static_assert(f<double>(), "");	// { dg-error "" }
-static_assert(f<int>(), "");
+static_assert(f<double>(), "");	// { dg-error "cannot call|as type" }
+static_assert(f<int>(), ""); // { dg-error "cannot call|as type" }
diff --git a/gcc/testsuite/g++.dg/concepts/placeholder6.C b/gcc/testsuite/g++.dg/concepts/placeholder6.C
index 51282d9..20b9c93 100644
--- a/gcc/testsuite/g++.dg/concepts/placeholder6.C
+++ b/gcc/testsuite/g++.dg/concepts/placeholder6.C
@@ -1,11 +1,8 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <int I> struct B { static const int i = I; };
 template <int I> concept bool Few = I < 10;
 
-constexpr int g(B<Few> b) { return b.i; }
+constexpr int g(B<Few> b); // { dg-error "does not constrain a type|invalid" }
 
-#define SA(X) static_assert((X),#X)
-SA(g(B<2>{}) == 2);
-SA(g(B<10>{}) == 10); 		// { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/concepts/pr58500.C b/gcc/testsuite/g++.dg/concepts/pr58500.C
deleted file mode 100644
index cb74072..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr58500.C
+++ /dev/null
@@ -1,7 +0,0 @@
-// PR c++/58500
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-struct A {};
-
-void foo(auto (A::*)());
diff --git a/gcc/testsuite/g++.dg/concepts/pr58534.C b/gcc/testsuite/g++.dg/concepts/pr58534.C
deleted file mode 100644
index b2c3caa..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr58534.C
+++ /dev/null
@@ -1,7 +0,0 @@
-// PR c++/58534
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-template<typename> void foo(const auto&) {}
-
-template<typename, typename...T> void foo(const auto&, T...) {}
diff --git a/gcc/testsuite/g++.dg/concepts/pr58535.C b/gcc/testsuite/g++.dg/concepts/pr58535.C
deleted file mode 100644
index 3e212a0..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr58535.C
+++ /dev/null
@@ -1,7 +0,0 @@
-// PR c++/58535
-// { dg-do compile { target c++14 } }
-
-struct A
-{
-  virtual void foo(auto); // { dg-error "auto|templates" }
-};
diff --git a/gcc/testsuite/g++.dg/concepts/pr58536.C b/gcc/testsuite/g++.dg/concepts/pr58536.C
deleted file mode 100644
index 99c7ebe..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr58536.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// PR c++/58536
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-struct A
-{
-  A(auto);
-};
-
-A::A(auto) {}
diff --git a/gcc/testsuite/g++.dg/concepts/pr58548.C b/gcc/testsuite/g++.dg/concepts/pr58548.C
deleted file mode 100644
index cd3e6fd..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr58548.C
+++ /dev/null
@@ -1,8 +0,0 @@
-// PR c++/58548
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-void foo(auto)
-{
-  struct A { int i; };
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr58549.C b/gcc/testsuite/g++.dg/concepts/pr58549.C
deleted file mode 100644
index 6b66afc..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr58549.C
+++ /dev/null
@@ -1,8 +0,0 @@
-// PR c++/58549
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-void foo(auto)
-{
-  void bar();
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr60052.C b/gcc/testsuite/g++.dg/concepts/pr60052.C
deleted file mode 100644
index c5bc28e..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60052.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// PR c++/60052
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-struct A
-{
-  void foo(auto);
-};
-
-void A::foo(auto) {}
-
-struct B
-{
-  void bar(auto);
-};
diff --git a/gcc/testsuite/g++.dg/concepts/pr60053.C b/gcc/testsuite/g++.dg/concepts/pr60053.C
deleted file mode 100644
index 20cf121..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60053.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// PR c++/60053
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-struct A
-{
-  void foo(auto);
-};
-
-void A::foo(auto) {}
-
-template<typename> struct B
-{
-  template<typename T> void bar(auto);
-};
diff --git a/gcc/testsuite/g++.dg/concepts/pr60064.C b/gcc/testsuite/g++.dg/concepts/pr60064.C
deleted file mode 100644
index b82b560..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60064.C
+++ /dev/null
@@ -1,21 +0,0 @@
-// PR c++/60064
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-class A
-{
-  int m;
-  friend void foo (auto) {}
-  friend void foo2 (auto);
-};
-
-void foo2 (auto i)
-{
-  A a;
-  a.m = i;
-}
-
-int main ()
-{
-  foo2 (7);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr60065.C b/gcc/testsuite/g++.dg/concepts/pr60065.C
deleted file mode 100644
index b2b1aea..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60065.C
+++ /dev/null
@@ -1,8 +0,0 @@
-// PR c++/60065
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-template <int> void foo(auto... x);
-template <typename> void foo2(auto... x);
-template <int> void foo3(auto... x, auto y, auto... z);
-template <typename> void foo4(auto... x, auto y, auto... z);
diff --git a/gcc/testsuite/g++.dg/concepts/pr60377.C b/gcc/testsuite/g++.dg/concepts/pr60377.C
deleted file mode 100644
index 5b18717..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60377.C
+++ /dev/null
@@ -1,9 +0,0 @@
-// PR c++/60377
-// { dg-do compile { target c++14 } }
-
-void foo(auto, void (f*)()); // { dg-error "auto|expected" }
-
-struct A
-{
-  int i;
-};
diff --git a/gcc/testsuite/g++.dg/concepts/pr60390.C b/gcc/testsuite/g++.dg/concepts/pr60390.C
deleted file mode 100644
index a453d1d..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60390.C
+++ /dev/null
@@ -1,26 +0,0 @@
-// PR c++/60390
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-struct A
-{
-  void foo (auto);
-};
-
-class B
-{
-  int m;
-  friend void A::foo (auto);
-};
-
-void A::foo (auto i)
-{
-  B b;
-  b.m = i;
-}
-
-int main ()
-{
-  A a;
-  a.foo (7);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr60391.C b/gcc/testsuite/g++.dg/concepts/pr60391.C
deleted file mode 100644
index 5c5ca2c..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60391.C
+++ /dev/null
@@ -1,9 +0,0 @@
-// PR c++/60391
-// { dg-do compile { target c++14 } }
-
-namespace N
-{
-  int operator"" _X(auto) {} // { dg-error "auto|invalid" }
-}
-
-namespace N {}
diff --git a/gcc/testsuite/g++.dg/concepts/pr60573.C b/gcc/testsuite/g++.dg/concepts/pr60573.C
deleted file mode 100644
index 42cda21..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr60573.C
+++ /dev/null
@@ -1,28 +0,0 @@
-// PR c++/60573
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-struct A
-{
-  struct B
-  {
-    void foo(auto);
-  };
-
-  void B::foo(auto) {}  // { dg-error "8:cannot define" }
-
-  struct X
-  {
-    struct Y
-    {
-      struct Z
-      {
-        void foo(auto);
-      };
-    };
-
-    void Y::Z::foo(auto) {}  // { dg-error "10:cannot define" }
-  };
-
-  void X::Y::Z::foo(auto) {}  // { dg-error "8:cannot define" }
-};
diff --git a/gcc/testsuite/g++.dg/concepts/pr65552.C b/gcc/testsuite/g++.dg/concepts/pr65552.C
deleted file mode 100644
index 318fdcc..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr65552.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-concept bool Concept() {
-  return requires () {
-    typename T::member_type1;
-    typename T::member_type2;
-  };
-}
-
-struct model {
-  using member_type1 = int;
-  using member_type2 = int;
-};
-
-template<Concept C>
-struct S {};
-
-S<model> s;
diff --git a/gcc/testsuite/g++.dg/concepts/pr65575.C b/gcc/testsuite/g++.dg/concepts/pr65575.C
deleted file mode 100644
index efaf958..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr65575.C
+++ /dev/null
@@ -1,24 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-concept bool C = false;
-
-int f1() requires false;
-int& f2() requires false;
-int* f3() requires false;
-auto f4() -> int& requires false;
-auto f5() -> int* requires false;
-auto f6() -> int requires false;
-
-int (*p)() requires true; // { dg-error "" }
-int (&p)() requires true; // { dg-error "" }
-int g(int (*)() requires true); // { dg-error "" }
-
-int f() { return 0; }
-
-int
-main()
-{
-  f1(); // { dg-error "cannot call" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr65634.C b/gcc/testsuite/g++.dg/concepts/pr65634.C
index e383653..5fcb38a 100644
--- a/gcc/testsuite/g++.dg/concepts/pr65634.C
+++ b/gcc/testsuite/g++.dg/concepts/pr65634.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/pr65636.C b/gcc/testsuite/g++.dg/concepts/pr65636.C
index 2aec0e5..f927c9a 100644
--- a/gcc/testsuite/g++.dg/concepts/pr65636.C
+++ b/gcc/testsuite/g++.dg/concepts/pr65636.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 using TD = int;
diff --git a/gcc/testsuite/g++.dg/concepts/pr65681.C b/gcc/testsuite/g++.dg/concepts/pr65681.C
index 0d8a69d..67153d6 100644
--- a/gcc/testsuite/g++.dg/concepts/pr65681.C
+++ b/gcc/testsuite/g++.dg/concepts/pr65681.C
@@ -1,66 +1,45 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
-concept bool C()
-{
-  return requires (T t) { t.mf(); };
-}
+concept bool C = requires (T t) { t.mf(); };
 
 template<typename T>
-concept bool CA1()
-{
-  return C<typename T::ca1_type>();
-}
+concept bool CA1 = C<typename T::ca1_type>;
 
 template<typename T>
-concept bool CA2()
-{
-  return CA1<T>() && requires () { typename T::ca2_type; };
-}
+concept bool CA2 = CA1<T> && requires () { typename T::ca2_type; };
 
 template<typename T>
-concept bool CA3()
-{
-  return CA2<T>() && requires () { typename T::ca3_type; };
-}
+concept bool CA3 = CA2<T> && requires () { typename T::ca3_type; };
 
 template<typename T>
-concept bool CB1()
-{
-  return requires () { typename T::cb1_type; };
-}
+concept bool CB1 = requires () { typename T::cb1_type; };
 
 template<typename T>
-concept bool CB2()
-{
-  return CB1<T>() && requires () { typename T::cb2_type; };
-}
+concept bool CB2 = CB1<T> && requires () { typename T::cb2_type; };
 
 template<typename T>
-concept bool CB3()
-{
-  return CB2<T>() && requires () { typename T::cb3_type; };
-}
+concept bool CB3 = CB2<T> && requires () { typename T::cb3_type; };
 
 
 struct MC { void mf(); };
-static_assert(C<MC>(), "");
+static_assert(C<MC>, "");
 
 
 struct MA1 { using ca1_type = MC; };
 struct MA2 : MA1 { using ca2_type = int; };
 struct MA3 : MA2 { using ca3_type = int; };
-static_assert(CA1<MA1>(), "");
-static_assert(CA2<MA2>(), "");
-static_assert(CA3<MA3>(), "");
+static_assert(CA1<MA1>, "");
+static_assert(CA2<MA2>, "");
+static_assert(CA3<MA3>, "");
 
 struct MB1 { using cb1_type = int; };
 struct MB2 : MB1 { using cb2_type = int; };
 struct MB3 : MB2 { using cb3_type = int; };
-static_assert(CB1<MB1>(), "");
-static_assert(CB2<MB2>(), "");
-static_assert(CB3<MB3>(), "");
+static_assert(CB1<MB1>, "");
+static_assert(CB2<MB2>, "");
+static_assert(CB3<MB3>, "");
 
 
 template<typename T1, typename T2>
@@ -73,29 +52,19 @@ struct S<T1, T2> // Specialization #1
 };
 
 template<CA1 T1, CB2 T2>
-  requires !CA2<T1>()
+  requires (!CA2<T1>)
 struct S<T1, T2> // Specialization #2
 {
   static constexpr int value = 2;
 };
 
 template<CA2 T1, CB3 T2>
-  requires !CA3<T1>()
+  requires (!CA3<T1>)
 struct S<T1, T2> // Specialization #3
 {
   static constexpr int value = 3;
 };
 
-S<MA1,MB1> s11;
-S<MA1,MB2> s12;
-S<MA1,MB3> s13;
-S<MA2,MB1> s21;
-S<MA2,MB2> s22;
-S<MA2,MB3> s23;
-S<MA3,MB1> s31;
-S<MA3,MB2> s32;
-S<MA3,MB3> s33;
-
 static_assert(S<MA1,MB1>::value == 1, "");
 static_assert(S<MA1,MB2>::value == 2, "");
 static_assert(S<MA1,MB3>::value == 2, "");
diff --git a/gcc/testsuite/g++.dg/concepts/pr65848.C b/gcc/testsuite/g++.dg/concepts/pr65848.C
index 0678018..ea3077d 100644
--- a/gcc/testsuite/g++.dg/concepts/pr65848.C
+++ b/gcc/testsuite/g++.dg/concepts/pr65848.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 // Performance test... This should be fast.
diff --git a/gcc/testsuite/g++.dg/concepts/pr65854.C b/gcc/testsuite/g++.dg/concepts/pr65854.C
deleted file mode 100644
index 28eac88..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr65854.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-// Handle alias templates in type requirements.
-
-template<typename T1, typename T2>
-struct BTT { };
-
-template<typename T>
-struct BTT<T,T> { using type = int; };
-
-template<typename T1, typename T2>
-using Alias1 = typename BTT<T1, T2>::type;
-
-template<typename T1, typename T2>
-concept bool C()
-{
-  return requires() { typename Alias1<T1, T2>; };
-}
-
-template<typename T1, typename T2>
-  requires C<T1, T2>()
-int f();
-
-auto i = f<char, int>(); // { dg-error "cannot call function" }
diff --git a/gcc/testsuite/g++.dg/concepts/pr66091.C b/gcc/testsuite/g++.dg/concepts/pr66091.C
deleted file mode 100644
index a71cd7b..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr66091.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-concept bool C1()
-{
-  return requires() { typename T::type1; };
-}
-
-template<typename T>
-concept bool C2()
-{
-  return C1<T>() && requires() { typename T::type2; };
-}
-
-template<C1 T>
-struct S {
-  S& operator++() { return *this; }
-  S& operator++() requires C2<T>() { return *this; }
-};
diff --git a/gcc/testsuite/g++.dg/concepts/pr67249.C b/gcc/testsuite/g++.dg/concepts/pr67249.C
index a0eca9b..382eba1 100644
--- a/gcc/testsuite/g++.dg/concepts/pr67249.C
+++ b/gcc/testsuite/g++.dg/concepts/pr67249.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<class T> concept bool C1 = true;
diff --git a/gcc/testsuite/g++.dg/concepts/pr67544.C b/gcc/testsuite/g++.dg/concepts/pr67544.C
index af4f677..6001760 100644
--- a/gcc/testsuite/g++.dg/concepts/pr67544.C
+++ b/gcc/testsuite/g++.dg/concepts/pr67544.C
@@ -1,4 +1,5 @@
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++11 } }
+// { dg-options "-fconcepts" }
 
 template <typename T> struct A
 {
diff --git a/gcc/testsuite/g++.dg/concepts/pr67595.C b/gcc/testsuite/g++.dg/concepts/pr67595.C
index 7b5d712..7199e05 100644
--- a/gcc/testsuite/g++.dg/concepts/pr67595.C
+++ b/gcc/testsuite/g++.dg/concepts/pr67595.C
@@ -1,10 +1,10 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
-template <class X> concept bool allocatable = requires{{new X}->X * };
+template <class X> concept bool allocatable = requires{{new X}->X *; };
 template <class X> concept bool semiregular = allocatable<X>;
-template <class X> concept bool readable = requires{requires semiregular<X>};
-template <class> int weak_input_iterator = requires{{0}->readable};
+template <class X> concept bool readable = requires{requires semiregular<X>;};
+template <class> int weak_input_iterator = requires{{0}->readable;};
 template <class X> bool input_iterator{weak_input_iterator<X>}; // { dg-warning "narrowing conversion" }
 template <class X> bool forward_iterator{input_iterator<X>};
 template <class X> bool bidirectional_iterator{forward_iterator<X>};
diff --git a/gcc/testsuite/g++.dg/concepts/pr67655.C b/gcc/testsuite/g++.dg/concepts/pr67655.C
index b155421..ddd069c 100644
--- a/gcc/testsuite/g++.dg/concepts/pr67655.C
+++ b/gcc/testsuite/g++.dg/concepts/pr67655.C
@@ -1,7 +1,7 @@
 // { dg-do compile { target c++11 } }
 // { dg-additional-options "-fconcepts" }
 
-template<class... Xs>                 
+template<class... Xs>
 void consume(Xs&&...) {}
 
 template<class... Xs>
diff --git a/gcc/testsuite/g++.dg/concepts/pr68434.C b/gcc/testsuite/g++.dg/concepts/pr68434.C
index fc45898..16868ba 100644
--- a/gcc/testsuite/g++.dg/concepts/pr68434.C
+++ b/gcc/testsuite/g++.dg/concepts/pr68434.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class>
diff --git a/gcc/testsuite/g++.dg/concepts/pr68683.C b/gcc/testsuite/g++.dg/concepts/pr68683.C
deleted file mode 100644
index ff7709e..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr68683.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <typename, typename>
-struct is_same {
-  static constexpr bool value = true;
-};
-
-template <typename T, typename U>
-concept bool Same = is_same<T, U>::value;
-
-template <typename T>
-concept bool Integral = requires {
-  { T () } -> Same<typename T::value_type>;
-};
-
-struct A {
-  using value_type = bool;
-};
-
-int main () {
-  Integral<A>;
-  Integral<A>;
-  return 0;
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr71127.C b/gcc/testsuite/g++.dg/concepts/pr71127.C
index 3ec6514..224eaa3 100644
--- a/gcc/testsuite/g++.dg/concepts/pr71127.C
+++ b/gcc/testsuite/g++.dg/concepts/pr71127.C
@@ -1,6 +1,7 @@
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<template<typename> class T>
 concept bool C = T<int>::value;
-C c = 1;  // { dg-error "invalid reference to concept" }
+
+C c = 1;  // { dg-error "does not constrain a type" }
diff --git a/gcc/testsuite/g++.dg/concepts/pr71128.C b/gcc/testsuite/g++.dg/concepts/pr71128.C
index 8b4eb41..a150e37 100644
--- a/gcc/testsuite/g++.dg/concepts/pr71128.C
+++ b/gcc/testsuite/g++.dg/concepts/pr71128.C
@@ -1,5 +1,5 @@
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C() { return true; }
diff --git a/gcc/testsuite/g++.dg/concepts/pr71131.C b/gcc/testsuite/g++.dg/concepts/pr71131.C
index 02f1999..675d66d 100644
--- a/gcc/testsuite/g++.dg/concepts/pr71131.C
+++ b/gcc/testsuite/g++.dg/concepts/pr71131.C
@@ -1,6 +1,7 @@
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<template<typename> class T>
 concept bool C = true;
-C c = 1;  // { dg-error "invalid reference to concept" }
+
+C c = 1;  // { dg-error "does not constrain a type" }
diff --git a/gcc/testsuite/g++.dg/concepts/pr71368.C b/gcc/testsuite/g++.dg/concepts/pr71368.C
deleted file mode 100644
index 5cd2b54..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr71368.C
+++ /dev/null
@@ -1,26 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-struct inner;
-
-template<typename X> concept bool CompoundReq = requires {
-    // fine with concrete type in trailing type, i.e. inner& instead of X&
-    { X::inner_member() } -> X&;
-};
-
-template<typename X> concept bool Concept = requires {
-    { X::outer_member() } -> CompoundReq;
-};
-
-struct inner { static inner& inner_member(); };
-struct outer { static inner outer_member(); };
-
-int main()
-{
-    // fine
-    static_assert( CompoundReq<inner> );
-    static_assert( CompoundReq<decltype( outer::outer_member() )> );
-
-    // ICE
-    static_assert( Concept<outer> );
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr71385.C b/gcc/testsuite/g++.dg/concepts/pr71385.C
index 42d21f5..fb75425 100644
--- a/gcc/testsuite/g++.dg/concepts/pr71385.C
+++ b/gcc/testsuite/g++.dg/concepts/pr71385.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<class T>
diff --git a/gcc/testsuite/g++.dg/concepts/pr71965.C b/gcc/testsuite/g++.dg/concepts/pr71965.C
deleted file mode 100644
index 6bfaef1..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr71965.C
+++ /dev/null
@@ -1,27 +0,0 @@
-// { dg-do compile { target c++14 } }
-// { dg-options "-fconcepts" }
-
-template <class T>
-concept bool Destructible() {
-    return false;
-}
-
-template <class T, class...Args>
-concept bool ConstructibleObject =
-    // Concept evaluation should short-circuit even the template
-    // substitution, so we shouldn't even substitute into the requires
-    // constraint and the unimplemented multi-dimensional new T{...}
-    // initialization.  ATM we do, but as long as we don't output the
-    // sorry() message we used to for such constructs when asked not
-    // to issue errors, this shouldn't be a problem for this and
-    // similar cases.
-    Destructible<T>() && requires (Args&&...args) {
-        new T{ (Args&&)args... };
-    };
-
-int main() {
-    using T = int[2][2];
-    // GCC has not implemented initialization of multi-dimensional
-    // arrays with new{} expressions.
-    static_assert(!ConstructibleObject<T, T>);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr80471.C b/gcc/testsuite/g++.dg/concepts/pr80471.C
deleted file mode 100644
index d5fa5a5..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr80471.C
+++ /dev/null
@@ -1,23 +0,0 @@
-// PR c++/80471
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-template <class, class>
-constexpr bool is_same = false;
-template <class T>
-constexpr bool is_same<T, T> = true;
-
-template<class T>
-decltype(auto) f(T&& a){return a;}
-
-decltype(auto) g(auto&& a){return a;}
-
-auto z = [](auto&& a) -> decltype(auto) { return a; };
-
-int main()
-{
-  int i;
-  static_assert(is_same< decltype(f(i)), int& >, "");
-  static_assert(is_same< decltype(g(i)), int  >, "");
-  static_assert(is_same< decltype(z(i)), int& >, "");
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr84330.C b/gcc/testsuite/g++.dg/concepts/pr84330.C
index 975ee89..0c2f456 100644
--- a/gcc/testsuite/g++.dg/concepts/pr84330.C
+++ b/gcc/testsuite/g++.dg/concepts/pr84330.C
@@ -1,12 +1,15 @@
 // PR c++/84330
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 struct A
 {
-  template<typename T> requires sizeof(T) >> 0 void foo(T);  // { dg-error "predicate constraint" }
+  template<typename T>
+    requires (sizeof(T) >> 0)
+  void foo(T);
 
   void bar()
   {
-    foo(0);  // { dg-error "no matching" }
+    foo(0);  // { dg-error "no matching function" }
   }
 };
diff --git a/gcc/testsuite/g++.dg/concepts/pr84979-2.C b/gcc/testsuite/g++.dg/concepts/pr84979-2.C
deleted file mode 100644
index ce69a0f..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr84979-2.C
+++ /dev/null
@@ -1,41 +0,0 @@
-// { dg-do compile { target c++11 } }
-// { dg-options "-fconcepts" }
-
-template <typename T>
-void foo1(T& t) {
-  typename T::template C<void> tcv = t;
-  typename T::template C<auto> u = tcv;
-  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
-  (typename T::template D<auto> (t)); // { dg-error "invalid" }
-}
-
-struct T1 {
-  template <typename T> struct C {
-    C(T1&);
-    static void f(T1&, C&);
-  };
-  template <typename T> struct D {
-    D(T1&);
-  };
-};
-
-template <typename T>
-void foo2(T& t) {
-  typename T::template C<void> tcv = t;
-  typename T::template C<auto> u = tcv;
-  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
-  T::template D<auto> (t); // { dg-error "invalid" }
-}
-
-struct T2 {
-  template <typename T> struct C {
-    C(T2&);
-    static void f(T2&, C&);
-  };
-  template <typename T> static void D(T2&);
-};
-
-void f(T1& t1, T2& t2) {
-  foo1 (t1);
-  foo2 (t2);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr84979-3.C b/gcc/testsuite/g++.dg/concepts/pr84979-3.C
deleted file mode 100644
index 3809c2d..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr84979-3.C
+++ /dev/null
@@ -1,45 +0,0 @@
-// { dg-do compile { target c++11 } }
-// { dg-options "-fconcepts" }
-
-// This is like pr84979-2.C, except that we swap the types passed to
-// the template functions foo1 and foo2, so that the expectations WRT
-// D's typeness are not met.
-
-template <typename T>
-void foo1(T& t) {
-  typename T::template C<void> tcv = t;
-  typename T::template C<auto> u = tcv;
-  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
-  (typename T::template D<auto> (t)); // { dg-error "invalid" }
-}
-
-struct T1 {
-  template <typename T> struct C {
-    C(T1&);
-    static void f(T1&, C&);
-  };
-  template <typename T> struct D {
-    D(T1&);
-  };
-};
-
-template <typename T>
-void foo2(T& t) {
-  typename T::template C<void> tcv = t;
-  typename T::template C<auto> u = tcv;
-  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
-  T::template D<auto> (t); // { dg-error "yields a type" }
-}
-
-struct T2 {
-  template <typename T> struct C {
-    C(T2&);
-    static void f(T2&, C&);
-  };
-  template <typename T> static void D(T2&);
-};
-
-void f(T1& t1, T2& t2) {
-  foo1 (t2);
-  foo2 (t1);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr84979.C b/gcc/testsuite/g++.dg/concepts/pr84979.C
deleted file mode 100644
index 9bd40df..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr84979.C
+++ /dev/null
@@ -1,9 +0,0 @@
-// { dg-do compile { target c++11 } }
-// { dg-options "-fconcepts" }
-
-template<typename> void foo() {}
-
-void bar()
-{
-  foo<auto>(); // { dg-error "invalid" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/pr84980.C b/gcc/testsuite/g++.dg/concepts/pr84980.C
deleted file mode 100644
index 619c0bd..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr84980.C
+++ /dev/null
@@ -1,6 +0,0 @@
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-template<T> concept bool C = true;  // { dg-error "has not been declared" }
-
-template<C...> struct A;
diff --git a/gcc/testsuite/g++.dg/concepts/pr85065.C b/gcc/testsuite/g++.dg/concepts/pr85065.C
index 861a838..52a4264 100644
--- a/gcc/testsuite/g++.dg/concepts/pr85065.C
+++ b/gcc/testsuite/g++.dg/concepts/pr85065.C
@@ -1,6 +1,6 @@
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<int> concept bool C = true;
 
-C c = 0;  // { dg-error "invalid reference to concept" }
+C c = 0;  // { dg-error "does not constrain a type" }
diff --git a/gcc/testsuite/g++.dg/concepts/pr85265.C b/gcc/testsuite/g++.dg/concepts/pr85265.C
deleted file mode 100644
index 86124ce..0000000
--- a/gcc/testsuite/g++.dg/concepts/pr85265.C
+++ /dev/null
@@ -1,6 +0,0 @@
-// { dg-do compile { target c++14 } }
-// { dg-additional-options "-fconcepts" }
-
-template<typename> concept bool C = true;
-
-C{} void foo();  // { dg-error "expected identifier" }
diff --git a/gcc/testsuite/g++.dg/concepts/regress/alias-decl-42.C b/gcc/testsuite/g++.dg/concepts/regress/alias-decl-42.C
deleted file mode 100644
index 6d5a4d5..0000000
--- a/gcc/testsuite/g++.dg/concepts/regress/alias-decl-42.C
+++ /dev/null
@@ -1,18 +0,0 @@
-// PR c++/59200
-// { dg-options "-std=c++17 -fconcepts" }
-
-struct A
-{
-  static constexpr bool value = true;
-};
-
-template<typename T>
-struct B
-{
-  template<typename U>
-    using C = A;
-};
-
-template<typename T>
-template<typename U>
-  const bool B<T>::C<U>::value;  // { dg-error "too many" }
diff --git a/gcc/testsuite/g++.dg/concepts/req-neg1.C b/gcc/testsuite/g++.dg/concepts/req-neg1.C
deleted file mode 100644
index 637f993..0000000
--- a/gcc/testsuite/g++.dg/concepts/req-neg1.C
+++ /dev/null
@@ -1,11 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-void f1(int a) requires true;         // OK
-auto f2(int a) -> bool requires true; // OK
-auto f3(int a) requires true -> bool; // { dg-error "" } requires-clause precedes trailing-return-type
-typedef void fn_t() requires true;    // { dg-error "typedef" }
-void (*pf)() requires true;           // { dg-error "non-function" }
-void (*fn(int))() requires false;     // { dg-error "return type" }
-void g(int (*)() requires true);      // { dg-error "parameter|non-function" }
-auto* p = new (void(*)(char) requires true); // { dg-error "type-id" }
diff --git a/gcc/testsuite/g++.dg/concepts/req1.C b/gcc/testsuite/g++.dg/concepts/req1.C
deleted file mode 100644
index fedea73..0000000
--- a/gcc/testsuite/g++.dg/concepts/req1.C
+++ /dev/null
@@ -1,29 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Class () { return __is_class(T); }
-
-// Allow a requires-expression with no parms.
-template<typename T>
-  concept bool C = requires { typename T::type; };
-
-void f1(auto a) requires Class<decltype(a)>() { }
-void f2(auto a) requires requires (decltype(a) x) { -x; } { }
-
-struct S { } s;
-
-// Allow non-type template parms as constraints.
-template<bool B> requires B struct S0; // OK
-
-template<int N> requires N struct S1 { };      // { dg-error "does not have type" }
-template<int N> requires N == 0 struct S2 { }; // OK
-
-template<typename T, T X> requires X struct S3 { }; // OK
-S3<int, 0> s3a;      // { dg-error "constraint failure|does not have type" }
-S3<bool, false> s3b; // { dg-error "constraint failure" }
-
-int main() {
-  f1(s);
-  f2(0);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req10.C b/gcc/testsuite/g++.dg/concepts/req10.C
deleted file mode 100644
index 949859c..0000000
--- a/gcc/testsuite/g++.dg/concepts/req10.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-// Test that standard conversions are checked with
-// implicit conversion constraints.
-
-template<typename T, typename U>
-concept bool C()
-{
-  return requires(T& t) { {t} -> U&; };
-}
-
-struct B { };
-class D : B { };
-
-int main()
-{
-  static_assert(C<D, B>(), ""); // { dg-error "failed" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req11.C b/gcc/testsuite/g++.dg/concepts/req11.C
deleted file mode 100644
index 8891cce..0000000
--- a/gcc/testsuite/g++.dg/concepts/req11.C
+++ /dev/null
@@ -1,29 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-// Check that we can evaluate constant requires-expressions
-// as constant expressions, for the curious case when they
-// appear within predicate constraints.
-
-template<typename... Ts> struct variant { };
-
-template<typename T>
-concept bool Streamable()
-{
-  return requires (T t) { t; };
-}
-
-template<typename T>
-concept bool Range()
-{
-  return requires (T t) { t; };
-}
-
-template<class T>
-  requires Streamable<T>() and not Range<T>()
-void print(const T& x) { }
-
-int main()
-{
-  print("hello"); // { dg-error "cannot call" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req12.C b/gcc/testsuite/g++.dg/concepts/req12.C
deleted file mode 100644
index c6b345a..0000000
--- a/gcc/testsuite/g++.dg/concepts/req12.C
+++ /dev/null
@@ -1,26 +0,0 @@
-// PR c++/66218
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <type_traits>
-
-template <class T, class U>
-concept bool Same =
-  std::is_same<T, U>::value;
-
-template <class T>
-concept bool C =
-  requires(T t) {
-    { t } -> Same<T>;
-  };
-
-template <class>
-constexpr bool f() { return false; }
-template <C>
-constexpr bool f() { return true; }
-
-static_assert(f<char>(), "");
-static_assert(f<int>(), "");
-static_assert(f<double>(), "");
-
-int main() {}
diff --git a/gcc/testsuite/g++.dg/concepts/req13.C b/gcc/testsuite/g++.dg/concepts/req13.C
deleted file mode 100644
index 4fd2312..0000000
--- a/gcc/testsuite/g++.dg/concepts/req13.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// PR c++/66758
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T, class...Args>
-concept bool Constructible =
-  requires(Args&&...args) {
-    T{ ((Args&&)(args))... };
-    new T{((Args&&)(args))...};
-  };
-
-template <Constructible T> struct A { };
-A<int> a;
-
diff --git a/gcc/testsuite/g++.dg/concepts/req14.C b/gcc/testsuite/g++.dg/concepts/req14.C
deleted file mode 100644
index 6e60b6f..0000000
--- a/gcc/testsuite/g++.dg/concepts/req14.C
+++ /dev/null
@@ -1,15 +0,0 @@
-// PR c++/66758
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T, class U>
-concept bool C = requires (T t, U u) { t + u; };
-
-template <class T, class U>
-requires C<T,U>
-void f(T t, U u) { t + u; }
-
-int main()
-{
-  using T = decltype(f(42, 24));
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req15.C b/gcc/testsuite/g++.dg/concepts/req15.C
deleted file mode 100644
index 385d51d..0000000
--- a/gcc/testsuite/g++.dg/concepts/req15.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// PR c++/66832
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T, class U, unsigned N>
-  requires requires (T& t, U &u) { t.foo(); u.foo(); }
-void foo_all( T (&t)[N], U (&u)[N] ) {
-  for(auto& x : t)
-      x.foo();
-  for(auto& x : u)
-      x.foo();
-}
-
-struct S {
-  void foo() {}
-};
-
-int main() {
-  S rg[4] {};
-  foo_all(rg, rg);
-}
-
diff --git a/gcc/testsuite/g++.dg/concepts/req16.C b/gcc/testsuite/g++.dg/concepts/req16.C
deleted file mode 100644
index ca04d60..0000000
--- a/gcc/testsuite/g++.dg/concepts/req16.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// PR c++/66988
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <type_traits>
-
-template <template <class> class T, class U>
-concept bool _Valid = requires { typename T<U>; };
-
-template <class T>
-using __t = typename T::type;
-
-template <class T>
-struct __has_type : std::false_type { };
-
-template <class T>
-  requires _Valid<__t, T>
-struct __has_type<T> : std::true_type { };
-
-static_assert(!__has_type<int>(), "");
diff --git a/gcc/testsuite/g++.dg/concepts/req17.C b/gcc/testsuite/g++.dg/concepts/req17.C
deleted file mode 100644
index 472cfef..0000000
--- a/gcc/testsuite/g++.dg/concepts/req17.C
+++ /dev/null
@@ -1,21 +0,0 @@
-// PR c++/67018
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <typename T>
-constexpr bool Val = true;
-
-template <class I>
-concept bool InputIterator = requires (I i) {
-  requires Val <decltype(i++)>;
-};
-
-template <class I>
-concept bool ForwardIterator = InputIterator<I> && true;
-
-template<InputIterator>
-constexpr bool f() { return false; }
-template<ForwardIterator>
-constexpr bool f() { return true; }
-
-static_assert(f<int*>());
diff --git a/gcc/testsuite/g++.dg/concepts/req18.C b/gcc/testsuite/g++.dg/concepts/req18.C
deleted file mode 100644
index cccfaed..0000000
--- a/gcc/testsuite/g++.dg/concepts/req18.C
+++ /dev/null
@@ -1,18 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class> struct all_same {
-  static constexpr bool value = 1;
-};
-template <class T> concept bool Assignable
-= requires(T t)
-{
-  requires all_same<decltype(t = 0)>::value;
-};
-
-template <class I> requires !Assignable<I>
-int dispatch();
-template <Assignable>
-void dispatch();
-
-int main() { dispatch<int *>(); }
diff --git a/gcc/testsuite/g++.dg/concepts/req19.C b/gcc/testsuite/g++.dg/concepts/req19.C
deleted file mode 100644
index 97cd9e5..0000000
--- a/gcc/testsuite/g++.dg/concepts/req19.C
+++ /dev/null
@@ -1,14 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-struct B
-{
-  template <class T> void f(T t)
-    requires requires (T tt) { tt; }
-  { }
-};
-
-int main()
-{
-  B().f(42);
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req2.C b/gcc/testsuite/g++.dg/concepts/req2.C
deleted file mode 100644
index b32845a..0000000
--- a/gcc/testsuite/g++.dg/concepts/req2.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Class () { return __is_class(T); }
-
-void f1(auto a) requires Class<decltype(a)>() { }
-
-// FIXME: This is generating excess errors related to pretty
-// printing the trailing requires expression.
-void f2(auto a)
-  requires requires (decltype(a) x) { -x; }
-{ }
-
-struct S { } s;
-
-int main() {
-  f1(0); // { dg-error "cannot call" }
-  f2((void*)0); // { dg-error "cannot call" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req20.C b/gcc/testsuite/g++.dg/concepts/req20.C
deleted file mode 100644
index bd6b0f9..0000000
--- a/gcc/testsuite/g++.dg/concepts/req20.C
+++ /dev/null
@@ -1,21 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template <class T> concept bool C = true;
-
-template <class T>
-requires C<typename T::foo>
-void f(T t) { }
-
-void f(...);
-
-template <class T>
-requires C<T>
-void g(T t) { }
-
-int main()
-{
-  f(42);
-  g(42);
-}
-
diff --git a/gcc/testsuite/g++.dg/concepts/req3.C b/gcc/testsuite/g++.dg/concepts/req3.C
deleted file mode 100644
index 8ce58e5..0000000
--- a/gcc/testsuite/g++.dg/concepts/req3.C
+++ /dev/null
@@ -1,17 +0,0 @@
-// { dg-do run { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Class () { return __is_class(T); }
-
-struct Test {
-  void f(auto a) requires Class<decltype(a)>();
-} test;
-
-struct S { }s;
-
-int main() {
-  test.f(s);
-}
-
-void Test::f(auto a) requires Class<decltype(a)>() { }
diff --git a/gcc/testsuite/g++.dg/concepts/req4.C b/gcc/testsuite/g++.dg/concepts/req4.C
deleted file mode 100644
index fcc13c6..0000000
--- a/gcc/testsuite/g++.dg/concepts/req4.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-struct fool {
-  constexpr fool operator&&(fool) const { return {}; }
-  constexpr fool operator||(fool) const { return {}; }
-};
-
-template<typename T> constexpr fool p1() { return {}; }
-template<typename T> constexpr fool p2() { return {}; }
-
-template<typename T>
-  concept bool C() { return p1<T>() && p2<T>(); }
-
-template<C T> void f(T x) { }
-
-int main() {
-  f(0); // { dg-error "cannot call|uses overloaded operator" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req5.C b/gcc/testsuite/g++.dg/concepts/req5.C
deleted file mode 100644
index 7ad1cab..0000000
--- a/gcc/testsuite/g++.dg/concepts/req5.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-struct fool { };
-
-constexpr fool operator&&(fool, fool) { return {}; }
-constexpr fool operator||(fool, fool) { return {}; }
-
-template<typename T> constexpr fool p1() { return {}; }
-template<typename T> constexpr fool p2() { return {}; }
-
-template<typename T>
-  concept bool C() { return p1<T>() && p2<T>(); }
-
-template<C T> void f(T x) { }
-
-int main() {
-  f(0); // { dg-error "cannot call|uses overloaded operator" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req6.C b/gcc/testsuite/g++.dg/concepts/req6.C
deleted file mode 100644
index dd7dbdd..0000000
--- a/gcc/testsuite/g++.dg/concepts/req6.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-struct X { };
-int operator==(X, X) { return 0; }
-
-template<typename T>
-  concept bool C1() { return X(); } // { dg-error "bool" }
-
-template<C1 T>
-  void h(T) { } // OK until used.
-
-void f()
-{
-  h(0); // { dg-error "does not have|cannot call" }
-}
-
-template<typename T>
-  concept bool C2() { return X() == X(); } // OK
diff --git a/gcc/testsuite/g++.dg/concepts/req7.C b/gcc/testsuite/g++.dg/concepts/req7.C
deleted file mode 100644
index a6cfb4b..0000000
--- a/gcc/testsuite/g++.dg/concepts/req7.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-#include <vector>
-
-using namespace std;
-
-template<typename T>
-  struct Sequence : std::false_type { };
-
-template<typename T>
-  struct Predicate : std::false_type { };
-
-template<typename Seq, typename Fn>
-  requires Sequence<Seq>{} and Predicate<Fn>{}
-    bool all(const Seq& seq, Fn fn) {
-      for(const auto& x : seq)
-        if (not fn(x))
-          return false;
-      return true;
-    }
-
-int main() {
-  all(vector<int>{0, 2}, true); // { dg-error "not|bool" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/req8.C b/gcc/testsuite/g++.dg/concepts/req8.C
deleted file mode 100644
index 201be37..0000000
--- a/gcc/testsuite/g++.dg/concepts/req8.C
+++ /dev/null
@@ -1,17 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-// Check that type requirements are normalized correctly.
-
-template<typename T>
-  concept bool Has_member_type() {
-    return requires() { typename T::type; };
-  }
-
-template<typename T>
-  concept bool Concept() {
-    return true && Has_member_type<T>();
-  }
-
-template<Concept T>
-  void foo( T t  ) { }
diff --git a/gcc/testsuite/g++.dg/concepts/req9.C b/gcc/testsuite/g++.dg/concepts/req9.C
deleted file mode 100644
index 497154c..0000000
--- a/gcc/testsuite/g++.dg/concepts/req9.C
+++ /dev/null
@@ -1,25 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-struct S1 {};
-
-template<typename T>
-concept bool C() { return requires(T x) { { x.fn() } -> S1<T>; }; }
-
-template<C U>
-void fn(U x)
-{
-  x.fn();
-}
-
-struct S2
-{
-  auto fn() const { return S1<S2>(); }
-};
-
-int main()
-{
-  fn(S2{});
-  return 0;
-}
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm1.C b/gcc/testsuite/g++.dg/concepts/template-parm1.C
deleted file mode 100644
index 192226f..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm1.C
+++ /dev/null
@@ -1,35 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C1 = __is_same_as(T, int);
-
-template<int N>
-  concept bool C2 = N == 0;
-
-template<template<typename> class X>
-  concept bool C3 = true;
-
-template<typename> struct Foo;
-
-// Type template parameters
-template<C1 T = int> struct S1 { };
-template<C1 = int> struct S2;
-template<C1 T> struct S2 { };
-
-// Non-type template parameters
-template<C2 N = 0> struct S3 { };
-template<C2 = 0> struct S4;
-template<C2 N> struct S4 { };
-
-// Template template parameters
-template<C3 X = Foo> struct S5 { };
-template<C3 = Foo> struct S6;
-template<C3 X> struct S6 { };
-
-S1<> s1;
-S2<> s2;
-S3<> s3;
-S4<> s4;
-S5<> s5;
-S6<> s6;
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm10.C b/gcc/testsuite/g++.dg/concepts/template-parm10.C
deleted file mode 100644
index 33bf372..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm10.C
+++ /dev/null
@@ -1,18 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<int N, class T>
-  concept bool P() { return true; }
-
-template<template<typename> class X, class T>
-  concept bool Q() { return true; }
-
-template<P<int> N> void f() { }
-template<Q<int> X> void g() { }
-
-template<typename> struct S { };
-
-int main() {
-  f<0>();
-  g<S>();
-}
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm11.C b/gcc/testsuite/g++.dg/concepts/template-parm11.C
index 04e11e2..07ad6e2 100644
--- a/gcc/testsuite/g++.dg/concepts/template-parm11.C
+++ b/gcc/testsuite/g++.dg/concepts/template-parm11.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm12.C b/gcc/testsuite/g++.dg/concepts/template-parm12.C
index 8745bb1..cb3e2c6 100644
--- a/gcc/testsuite/g++.dg/concepts/template-parm12.C
+++ b/gcc/testsuite/g++.dg/concepts/template-parm12.C
@@ -1,6 +1,6 @@
-// Conceptized version of template/ttp23.C
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
+// Conceptized version of template/ttp23.C
 
 template <class T> concept bool Foo = true;
 
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm2.C b/gcc/testsuite/g++.dg/concepts/template-parm2.C
index adecc12..d708fd0 100644
--- a/gcc/testsuite/g++.dg/concepts/template-parm2.C
+++ b/gcc/testsuite/g++.dg/concepts/template-parm2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm3.C b/gcc/testsuite/g++.dg/concepts/template-parm3.C
index 3d37e9c..028149c 100644
--- a/gcc/testsuite/g++.dg/concepts/template-parm3.C
+++ b/gcc/testsuite/g++.dg/concepts/template-parm3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm4.C b/gcc/testsuite/g++.dg/concepts/template-parm4.C
index f546a75..d93dbc7 100644
--- a/gcc/testsuite/g++.dg/concepts/template-parm4.C
+++ b/gcc/testsuite/g++.dg/concepts/template-parm4.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm5.C b/gcc/testsuite/g++.dg/concepts/template-parm5.C
deleted file mode 100644
index cd93c607..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm5.C
+++ /dev/null
@@ -1,20 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C1 = __is_same_as(T, int);
-
-template<int N>
-  concept bool C2 = N == 0;
-
-template<template<typename> class X>
-  concept bool C3 = true;
-
-template<typename> struct Foo;
-
-template<C1... Ts = int> struct S1; // { dg-error "default argument" }
-template<C1... = int> struct S2; // { dg-error "default argument" }
-template<C2... Ns = 0> struct S3; // { dg-error "default argument" }
-template<C2... = 0> struct S4; // { dg-error "default argument" }
-template<C3... Ts = Foo> struct S5; // { dg-error "default argument" }
-template<C3... = Foo> struct S6; // { dg-error "default argument" }
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm6.C b/gcc/testsuite/g++.dg/concepts/template-parm6.C
deleted file mode 100644
index 9efe409..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm6.C
+++ /dev/null
@@ -1,42 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename... Ts> struct are_same;
-
-template<>
-  struct are_same<> {
-    static constexpr bool value = true;
-  };
-
-template<typename T>
-  struct are_same<T> {
-    static constexpr bool value = true;
-  };
-
-template<typename T, typename U, typename... Ts>
-  struct are_same<T, U, Ts...> {
-    static constexpr bool value =
-      __is_same_as(T, U) && are_same<U, Ts...>::value;
-  };
-
-constexpr bool all_of() { return true; }
-constexpr bool all_of(bool b) { return b; }
-
-template<typename... Ts>
-  constexpr bool all_of(bool a, bool b, Ts... args) {
-    return (a && b) && all_of(b, args...);
-  }
-
-template<typename... Ts>
-  concept bool C1 = are_same<Ts...>::value;
-
-template<bool... Bs>
-  concept bool C2 = all_of(Bs...);
-
-template<C1... Ts> struct S1 { };
-template<C1...> struct S2 { };
-template<C2... Bs> struct S4 { };
-template<C2...> struct S5 { };
-
-S1<int, int, int> s1;
-S4<true, true, true> s4;
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm7.C b/gcc/testsuite/g++.dg/concepts/template-parm7.C
deleted file mode 100644
index 1dfa0d1..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm7.C
+++ /dev/null
@@ -1,45 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename... Ts> struct are_same;
-
-template<>
-  struct are_same<> {
-    static constexpr bool value = true;
-  };
-
-template<typename T>
-  struct are_same<T> {
-    static constexpr bool value = true;
-  };
-
-template<typename T, typename U, typename... Ts>
-  struct are_same<T, U, Ts...> {
-    static constexpr bool value =
-      __is_same_as(T, U) && are_same<U, Ts...>::value;
-  };
-
-constexpr bool all_of() { return true; }
-constexpr bool all_of(bool b) { return b; }
-
-template<typename... Ts>
-  constexpr bool all_of(bool a, bool b, Ts... args) {
-    return (a && b) && all_of(b, args...);
-  }
-
-
-template<typename... Ts>
-  concept bool C1 = are_same<Ts...>::value;
-
-template<bool... Bs>
-  concept bool C2 = all_of(Bs...);
-
-template<C1... Ts> struct S1 { }; // OK
-S1<int, int, char> s1; // { dg-error "constraint failure|invalid type" }
-template<C1 Ts> struct S2 { }; // { dg-error "variadic constraint"  }
-
-template<C2... Bs> struct S3 { }; // OK
-S3<true, true, false> s3; // { dg-error "constraint failure|invalid type" }
-template<C2 Bs> struct S4 { }; // { dg-error "variadic constraint" }
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm8.C b/gcc/testsuite/g++.dg/concepts/template-parm8.C
deleted file mode 100644
index 63c4512..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm8.C
+++ /dev/null
@@ -1,22 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() and __is_empty(T); }
-
-template<template<typename Q> requires C<Q>() class X>
-  struct S { };
-
-// An unconstrained template can be used as an argument for any
-// constrained template template parameter.
-template<typename A> struct T0 { };
-S<T0> x1;
-
-// Matching constraints are valid.
-template<typename A> requires C<A>() struct T1 { };
-S<T1> x2;
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/template-parm9.C b/gcc/testsuite/g++.dg/concepts/template-parm9.C
deleted file mode 100644
index 64308cd..0000000
--- a/gcc/testsuite/g++.dg/concepts/template-parm9.C
+++ /dev/null
@@ -1,19 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool C() { return __is_class(T); }
-
-template<typename T>
-  concept bool D() { return C<T>() and __is_empty(T); }
-
-template<template<typename Q> requires C<Q>() class X>
-  struct S { };
-
-template<typename A> requires true struct T0 { };
-template<typename A> requires D<A>() struct T1 { };
-
-S<T0> x3; // { dg-error "constraint mismatch|invalid type" }
-S<T1> x4; // { dg-error "constraint mismatch|invalid type" }
-
-int main() { }
diff --git a/gcc/testsuite/g++.dg/concepts/template-template-parm1.C b/gcc/testsuite/g++.dg/concepts/template-template-parm1.C
index 6c4dc2c..d701859 100644
--- a/gcc/testsuite/g++.dg/concepts/template-template-parm1.C
+++ b/gcc/testsuite/g++.dg/concepts/template-template-parm1.C
@@ -1,5 +1,5 @@
 // PR c++/66937
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 #include <tuple>
diff --git a/gcc/testsuite/g++.dg/concepts/traits1.C b/gcc/testsuite/g++.dg/concepts/traits1.C
deleted file mode 100644
index 27610e2..0000000
--- a/gcc/testsuite/g++.dg/concepts/traits1.C
+++ /dev/null
@@ -1,98 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Nothrow_assignable() { return __has_nothrow_assign(T); }
-
-template<typename T>
-  concept bool Nothrow_constructible() { return __has_nothrow_constructor(T); }
-
-template<typename T>
-  concept bool Nothrow_copyable() { return __has_nothrow_copy(T); }
-
-template<typename T>
-  concept bool Trivially_assignable() { return __has_trivial_assign(T); }
-
-template<typename T>
-  concept bool Trivially_constructible() { return __has_trivial_constructor(T); }
-
-template<typename T>
-  concept bool Trivially_copyable() { return __has_trivial_copy(T); }
-
-template<typename T>
-  concept bool Trivially_destructible() { return __has_trivial_destructor(T); }
-
-template<typename T>
-  concept bool Dynamically_destructible() { return __has_virtual_destructor(T); }
-
-template<typename T>
-  concept bool Abstract() { return __is_abstract(T); }
-
-template<typename T>
-  concept bool Polymorphic() { return __is_polymorphic(T); }
-
-template<typename T>
-  concept bool Class() { return __is_class(T); }
-
-template<typename T>
-  concept bool Empty() { return __is_empty(T); }
-
-template<typename T>
-  concept bool Enum() { return __is_enum(T); }
-
-template<typename T>
-  concept bool Final() { return __is_final(T); }
-
-template<typename T>
-  concept bool Literal_type() { return __is_literal_type(T); }
-
-template<typename T>
-  concept bool Pod() { return __is_pod(T); }
-
-template<typename T>
-  concept bool Standard_layout() { return __is_standard_layout(T); }
-
-template<typename T>
-  concept bool Trivial() { return __is_trivial(T); }
-
-template<typename T>
-  concept bool Union() { return __is_union(T); }
-
-template<Nothrow_assignable T> void f1() { }
-template<Nothrow_copyable T> void f2() { }
-template<Nothrow_constructible T> void f3() { }
-template<Trivially_assignable T> void f4() { }
-template<Trivially_copyable T> void f5() { }
-template<Trivially_constructible T> void f6() { }
-template<Trivially_destructible T> void f7() { }
-template<Dynamically_destructible T> void f8() { }
-template<Class T> void f9() { }
-template<Empty T> void f10() { }
-template<Standard_layout T> void f11() { }
-template<Pod T> void f12() { }
-template<Trivial T> void f13() { }
-template<Polymorphic T> void f14() { }
-template<Abstract T> void f15() { }
-template<Final T> void f16() { }
-template<Union T> void f17() { }
-template<Enum T> void f18() { }
-
-int main() {
-  f1<void>(); // { dg-error "cannot call" }
-  f2<void>(); // { dg-error "cannot call" }
-  f3<void>(); // { dg-error "cannot call" }
-  f4<void>(); // { dg-error "cannot call" }
-  f5<void>(); // { dg-error "cannot call" }
-  f6<void>(); // { dg-error "cannot call" }
-  f7<void>(); // { dg-error "cannot call" }
-  f8<void>(); // { dg-error "cannot call" }
-  f9<void>(); // { dg-error "cannot call" }
-  f10<void>(); // { dg-error "cannot call" }
-  f11<void>(); // { dg-error "cannot call" }
-  f12<void>(); // { dg-error "cannot call" }
-  f13<void>(); // { dg-error "cannot call" }
-  f14<void>(); // { dg-error "cannot call" }
-  f15<void>(); // { dg-error "cannot call" }
-  f16<void>(); // { dg-error "cannot call" }
-  f17<void>(); // { dg-error "cannot call" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/traits2.C b/gcc/testsuite/g++.dg/concepts/traits2.C
deleted file mode 100644
index 71dcfd3..0000000
--- a/gcc/testsuite/g++.dg/concepts/traits2.C
+++ /dev/null
@@ -1,99 +0,0 @@
-// { dg-do compile { target c++17 } }
-// { dg-options "-fconcepts" }
-
-template<typename T>
-  concept bool Nothrow_assignable() { return __has_nothrow_assign(T); }
-
-template<typename T>
-  concept bool Nothrow_constructible() { return __has_nothrow_constructor(T); }
-
-template<typename T>
-  concept bool Nothrow_copyable() { return __has_nothrow_copy(T); }
-
-template<typename T>
-  concept bool Trivially_assignable() { return __has_trivial_assign(T); }
-
-template<typename T>
-  concept bool Trivially_constructible() { return __has_trivial_constructor(T); }
-
-template<typename T>
-  concept bool Trivially_copyable() { return __has_trivial_copy(T); }
-
-template<typename T>
-  concept bool Trivially_destructible() { return __has_trivial_destructor(T); }
-
-template<typename T>
-  concept bool Dynamically_destructible() { return __has_virtual_destructor(T); }
-
-template<typename T>
-  concept bool Abstract() { return __is_abstract(T); }
-
-template<typename T>
-  concept bool Polymorphic() { return __is_polymorphic(T); }
-
-template<typename T>
-  concept bool Class() { return __is_class(T); }
-
-template<typename T>
-  concept bool Empty() { return __is_empty(T); }
-
-template<typename T>
-  concept bool Enum() { return __is_enum(T); }
-
-template<typename T>
-  concept bool Final() { return __is_final(T); }
-
-template<typename T>
-  concept bool Literal_type() { return __is_literal_type(T); }
-
-template<typename T>
-  concept bool Pod() { return __is_pod(T); }
-
-template<typename T>
-  concept bool Standard_layout() { return __is_standard_layout(T); }
-
-template<typename T>
-  concept bool Trivial() { return __is_trivial(T); }
-
-template<typename T>
-  concept bool Union() { return __is_union(T); }
-
-template<Nothrow_assignable T> void f1();
-template<Nothrow_copyable T> void f2();
-template<Nothrow_constructible T> void f3();
-template<Trivially_assignable T> void f4();
-template<Trivially_copyable T> void f5();
-template<Trivially_constructible T> void f6();
-template<Trivially_destructible T> void f7();
-template<Dynamically_destructible T> void f8();
-template<Class T> void f9();
-template<Empty T> void f10();
-template<Standard_layout T> void f11();
-template<Pod T> void f12();
-template<Trivial T> void f13();
-template<Polymorphic T> void f14();
-template<Abstract T> void f15();
-template<Final T> void f16();
-template<Union T> void f17();
-template<Enum T> void f18();
-
-
-int main() {
-  f1<void>(); // { dg-error "cannot call" }
-  f2<void>(); // { dg-error "cannot call" }
-  f3<void>(); // { dg-error "cannot call" }
-  f4<void>(); // { dg-error "cannot call" }
-  f5<void>(); // { dg-error "cannot call" }
-  f6<void>(); // { dg-error "cannot call" }
-  f7<void>(); // { dg-error "cannot call" }
-  f8<void>(); // { dg-error "cannot call" }
-  f9<void>(); // { dg-error "cannot call" }
-  f10<void>(); // { dg-error "cannot call" }
-  f11<void>(); // { dg-error "cannot call" }
-  f12<void>(); // { dg-error "cannot call" }
-  f13<void>(); // { dg-error "cannot call" }
-  f14<void>(); // { dg-error "cannot call" }
-  f15<void>(); // { dg-error "cannot call" }
-  f16<void>(); // { dg-error "cannot call" }
-  f17<void>(); // { dg-error "cannot call" }
-}
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept1.C b/gcc/testsuite/g++.dg/concepts/var-concept1.C
index 90a88d8..21a4915 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept1.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept2.C b/gcc/testsuite/g++.dg/concepts/var-concept2.C
index c16d3e4..4ff00a0 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept2.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept3.C b/gcc/testsuite/g++.dg/concepts/var-concept3.C
index f3d642b..144c0ea 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept3.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
@@ -12,12 +12,19 @@ template<typename T>
 
 
 template<typename U>
-  requires C1<U>() // { dg-error "" }
+  requires C1<U>() // { dg-error "cannot be used as a function" }
   void f1(U) { }
 
 template<typename U>
-  requires C2<U> // { dg-error "invalid reference" }
+  requires C2<U> // { dg-error "must be called" }
   void f2(U) { }
 
 template<C3 T>  // { dg-error "not a type" }
-  void f(T) { } // { dg-error "" }
+  void f(T) { } // { dg-error "declared void|not declared" }
+
+void foo()
+{
+  struct S { } s;
+  f2(s);
+  // f2(0);
+}
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept4.C b/gcc/testsuite/g++.dg/concepts/var-concept4.C
index 3864c9d..a7839ee 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept4.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept4.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T, typename U>
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept5.C b/gcc/testsuite/g++.dg/concepts/var-concept5.C
index b1e9cb5..d8fa298 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept5.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept5.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T1, typename T2>
@@ -8,8 +8,8 @@ template<typename T1, typename T2, typename T3>
 concept bool C2 = true;
 
 
-template<C1 T> // { dg-error "not a type" }
+template<C1 T> // { dg-error "wrong number of template arguments" }
 constexpr bool f1( )  { return true; }
 
-template<C2<int> T> // { dg-error "expected|not a type" }
+template<C2<int> T> // { dg-error "wrong number of template arguments" }
 constexpr bool f2( )  { return true; }
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept6.C b/gcc/testsuite/g++.dg/concepts/var-concept6.C
index 8f5ac62..80984a7 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept6.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept6.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T>
diff --git a/gcc/testsuite/g++.dg/concepts/var-concept7.C b/gcc/testsuite/g++.dg/concepts/var-concept7.C
index 8371b37..2cfe266 100644
--- a/gcc/testsuite/g++.dg/concepts/var-concept7.C
+++ b/gcc/testsuite/g++.dg/concepts/var-concept7.C
@@ -1,6 +1,6 @@
 // PR c++/85133
-// { dg-do compile { target c++17 } }
-// { dg-additional-options "-fconcepts" }
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
 
 template<typename> concept bool C; // { dg-error "no initializer" }
 
diff --git a/gcc/testsuite/g++.dg/concepts/var-templ1.C b/gcc/testsuite/g++.dg/concepts/var-templ1.C
index b69d7d8d..4ac578f 100644
--- a/gcc/testsuite/g++.dg/concepts/var-templ1.C
+++ b/gcc/testsuite/g++.dg/concepts/var-templ1.C
@@ -1,5 +1,5 @@
 // PR c++/67117
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T>
diff --git a/gcc/testsuite/g++.dg/concepts/var-templ2.C b/gcc/testsuite/g++.dg/concepts/var-templ2.C
index ffe5f1f..1b8890a 100644
--- a/gcc/testsuite/g++.dg/concepts/var-templ2.C
+++ b/gcc/testsuite/g++.dg/concepts/var-templ2.C
@@ -1,5 +1,5 @@
 // PR c++/67139
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T>
diff --git a/gcc/testsuite/g++.dg/concepts/var-templ3.C b/gcc/testsuite/g++.dg/concepts/var-templ3.C
index 22f07ee..cc5ee5f 100644
--- a/gcc/testsuite/g++.dg/concepts/var-templ3.C
+++ b/gcc/testsuite/g++.dg/concepts/var-templ3.C
@@ -1,5 +1,5 @@
 // PR c++/68666
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 struct A {
diff --git a/gcc/testsuite/g++.dg/concepts/variadic1.C b/gcc/testsuite/g++.dg/concepts/variadic1.C
index 4c0f437..c3bc7f6 100644
--- a/gcc/testsuite/g++.dg/concepts/variadic1.C
+++ b/gcc/testsuite/g++.dg/concepts/variadic1.C
@@ -1,5 +1,5 @@
 // PR c++/66712
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T, class...Args>
diff --git a/gcc/testsuite/g++.dg/concepts/variadic2.C b/gcc/testsuite/g++.dg/concepts/variadic2.C
index 4675d97..7b22009 100644
--- a/gcc/testsuite/g++.dg/concepts/variadic2.C
+++ b/gcc/testsuite/g++.dg/concepts/variadic2.C
@@ -1,17 +1,18 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T> concept bool Copyable = requires (T t) { T(t); };
 template <class T> concept bool Constructable = requires { T(); };
 template <class T> concept bool Both = Copyable<T> && Constructable<T>;
 
-template <Copyable... Ts>
+template <Copyable... Ts> // requires (Copyable<Ts> && ...)
 constexpr int f(Ts...) { return 0; } // #1
 
-template <Both... Ts>
+template <Both... Ts> // requires (Both<Ts> && ...)
 constexpr int f(Ts...) { return 1; }     // #2
 
 int main()
 {
-  static_assert(f(42) == 1);
+  static_assert(f(42) == 1); // { dg-error "ambiguous" }
+  // The associated constraints of the two functions are incomparable.
 }
diff --git a/gcc/testsuite/g++.dg/concepts/variadic3.C b/gcc/testsuite/g++.dg/concepts/variadic3.C
index f980e99..bd2f381 100644
--- a/gcc/testsuite/g++.dg/concepts/variadic3.C
+++ b/gcc/testsuite/g++.dg/concepts/variadic3.C
@@ -1,5 +1,5 @@
 // PR c++/70036
-// { dg-do compile { target c++14 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template <class T> concept bool C = true;
diff --git a/gcc/testsuite/g++.dg/concepts/variadic4.C b/gcc/testsuite/g++.dg/concepts/variadic4.C
index e0f7903..d6eea49 100644
--- a/gcc/testsuite/g++.dg/concepts/variadic4.C
+++ b/gcc/testsuite/g++.dg/concepts/variadic4.C
@@ -1,5 +1,5 @@
 // PR c++/73456
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename...> struct list {};
@@ -7,13 +7,14 @@ template<typename...> struct list {};
 template<typename Seq>
 concept bool Sequence = true;
 
-template<Sequence... Seqs>
+template<Sequence... Seqs> // requires (Sequence<Seqs> && ...)
 struct zip;
 
 template<Sequence... Seqs>
-    requires requires { typename list<Seqs...>; }
-// main.cpp:12:8: internal compiler error: in non_atomic_constraint_p, at cp/logic.cc:315
-struct zip<Seqs...> {};
+    requires requires { typename list<Seqs...>; } // && (Sequence<Seqs> && ...)
+struct zip<Seqs...> {}; // { dg-error "does not specialize" }
+// The constraints of the specialization and the sequence are not
+// comparable; the specializations are unordered.
 
 int main()
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto52.C b/gcc/testsuite/g++.dg/cpp0x/auto52.C
index d33f927..c277d33 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto52.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto52.C
@@ -3,4 +3,4 @@
 
 using T = auto() -> int;
 using U = void() -> int; // { dg-error "11:.type name. function with trailing return type not declared with .auto." }
-using W = auto(); // { dg-error "11:invalid use of .auto." }
+using W = auto(); // { dg-error "11:.*auto." }
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err2.C
index aaa80f4..3399ce7 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err2.C
@@ -6,7 +6,7 @@ int main()
   auto a = []() { return true; };
   auto b = []() { return a(); };  // { dg-error "'a' is not captured" }
   int c, d;
-  while (b() && c < d) // { dg-error "could not convert" }
+  while (b() && c < d)
     {
     }
 }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-access1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-access1.C
new file mode 100644
index 0000000..bbb1be0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-access1.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target concepts } }
+
+class A
+{
+  static void f(int);
+public:
+  template <class T> void g(T t)
+    requires requires { f(t); }
+  {}
+};
+
+int main()
+{
+  A().g(42);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-alias.C b/gcc/testsuite/g++.dg/cpp2a/concepts-alias.C
new file mode 100644
index 0000000..6b2ab0d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-alias.C
@@ -0,0 +1,25 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Class = __is_class(T);
+
+template<typename T>
+  requires Class<T>
+using X = T*;
+
+// BUG: Alias templates are expanded at the point of use, regardless
+// of whether or not they are dependent. This causes T* to be substituted
+// without acutally checking the constraints. See the declaration of y1
+// below.
+template<typename T>
+using Y = X<T>;
+
+template<Class T> using Z = T*;
+
+struct S { };
+
+X<S> x1; // OK
+X<int> x2; // { dg-error "template constraint failure" }
+Y<int> y1; // { dg-error "" "" { xfail *-*-* } }
+Z<S> z1; // ok
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-alias2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-alias2.C
new file mode 100644
index 0000000..b784030
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-alias2.C
@@ -0,0 +1,12 @@
+// { dg-do compile { target concepts } }
+
+using Bool = bool;
+template <class T>
+const Bool b = true;
+
+template <class T>
+concept BoolC = b<T>;
+
+template <BoolC T> struct A { };
+
+A<int> a;
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-class.C b/gcc/testsuite/g++.dg/cpp2a/concepts-class.C
new file mode 100644
index 0000000..aca5c44
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-class.C
@@ -0,0 +1,115 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Class = __is_class(T);
+
+template<typename T>
+concept Union = __is_union(T);
+
+template<typename T>
+concept One = sizeof(T) >= 4;
+
+template<typename T>
+concept Two = One<T> && sizeof(T) >= 8;
+
+// Basic checks
+template<typename T> requires true struct ok { };
+template<typename T> requires false struct err { };
+
+ok<int> ok1;
+err<int> err1; // { dg-error "template constraint failure" }
+err<int>* err2; // { dg-error "template constraint failure" }
+
+// Redeclarations
+template<typename T>
+  requires Class<T>
+struct S1;
+
+template<Class T> // { dg-error "template parameter | different constraints" }
+struct S1 { };
+
+template<typename T>
+  requires Class<T>
+struct S2;
+
+template<typename T>
+  requires Union<T>
+struct S2; // { dg-error "redeclaration | different constraints" }
+
+
+// Check non-overlapping specializations
+template<typename T>
+struct S3 { static const int value = 0; };
+
+template<typename T>
+  requires Class<T>
+struct S3<T> { static const int value = 1; };
+
+template<typename T>
+  requires Union<T>
+struct S3<T> { static const int value = 2; };
+
+struct S { };
+union U { };
+
+static_assert(S3<int>::value == 0, "");
+static_assert(S3<S>::value == 1, "");
+static_assert(S3<U>::value == 2, "");
+
+// Check ordering of partial specializations
+template<typename T>
+struct S4 { static const int value = 0;  };
+
+template<typename T>
+  requires One<T>
+struct S4<T> { static const int value = 1; };
+
+template<typename T>
+  requires Two<T>
+struct S4<T> { static const int value = 2; };
+
+struct one_type { char x[4]; };
+struct two_type { char x[8]; };
+
+static_assert(S4<char>::value == 0, "");
+static_assert(S4<one_type>::value == 1, "");
+static_assert(S4<two_type>::value == 2, "");
+
+// Specializations are more specialized.
+template<typename T> requires Two<T> struct S5 { };
+template<typename T> requires One<T> struct S5<T> { }; // { dg-error "does not specialize" }
+
+// Constraints are checked even when decls are not instantiatied.
+S5<one_type>* x4b; // { dg-error "constraint|invalid" }
+
+// Deduction guides
+template <class T>
+concept IsInt = __is_same_as(T,int);
+
+template<typename T>
+struct A
+{
+  int i;
+  A(...);
+};
+
+template<typename I>
+  requires IsInt<I>
+A(I) -> A<I>;
+
+A a(1);
+A a2(1.0);      // { dg-error "class template argument deduction | no matching function for call" }
+
+
+template<typename T>
+struct S6
+{
+  template<typename U>
+    requires true
+  struct Inner;
+};
+
+template<typename T>
+template<typename U>
+struct S6<T>::Inner { }; // { dg-error "does not match" }
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-cmath.C b/gcc/testsuite/g++.dg/cpp2a/concepts-cmath.C
new file mode 100644
index 0000000..b090c3a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-cmath.C
@@ -0,0 +1,4 @@
+// { dg-do compile { target c++2a } }
+
+#include <cmath>
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-complete1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-complete1.C
new file mode 100644
index 0000000..25c4ca0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-complete1.C
@@ -0,0 +1,11 @@
+// { dg-do compile { target c++2a } }
+
+template <class T> concept has_mem_type = requires { typename T::type; };
+
+template <has_mem_type T> int f () { return 0; }
+template <class T> char f() { return 0; }
+
+struct A;
+static_assert (sizeof (f<A>()) == 1);
+struct A { typedef int type; };
+static_assert (sizeof (f<A>()) > 1);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-constrained-parm.C b/gcc/testsuite/g++.dg/cpp2a/concepts-constrained-parm.C
new file mode 100644
index 0000000..bb7e31d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-constrained-parm.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<const C T> struct S1 { };    // { dg-error "cv-qualified" }
+template<volatile C T> struct S2 { }; // { dg-error "cv-qualified" }
+template<C* T> struct S3 { };         // { dg-error "invalid" }
+template<C const* T> struct S3a { };  // { dg-error "invalid" }
+template<C* const T> struct S3b { };  // { dg-error "invalid" }
+template<C& T> struct S4 { };         // { dg-error "invalid" }
+template<C[3] T> struct S4 { };       // { dg-error "invalid|expected" }
+template<C(*T)()> struct S5 { };      // { dg-error "invalid" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-decltype.C b/gcc/testsuite/g++.dg/cpp2a/concepts-decltype.C
new file mode 100644
index 0000000..db3cfdf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-decltype.C
@@ -0,0 +1,67 @@
+// { dg-do compile { target c++2a } }
+
+// Tests constrained decltype(auto).
+
+template<typename T>
+concept Type = true;
+
+template<typename T>
+concept Int = __is_same_as(T, int);
+
+template<typename T, typename U>
+concept SameAs = __is_same_as(T, U);
+
+template<typename T, typename U>
+  requires SameAs<T, U>
+constexpr bool check = true;
+
+int z = 0;
+const int cz = 0;
+
+Type decltype(auto) x1 = 0;
+static_assert(check<decltype(x1), int>);
+Type decltype(auto) x2 = z;
+static_assert(check<decltype(x2), int>);
+Type decltype(auto) x3 = (z);
+static_assert(check<decltype(x3), int&>);
+Type decltype(auto) x4 = cz;
+static_assert(check<decltype(x4), const int>);
+Type decltype(auto) x5 = (cz);
+static_assert(check<decltype(x5), const int&>);
+
+Type decltype(auto) f1() { return 0; }
+static_assert(check<decltype(f1()), int>);
+Type decltype(auto) f2() { return z; }
+static_assert(check<decltype(f2()), int>);
+Type decltype(auto) f3() { return (z); }
+static_assert(check<decltype(f3()), int&>);
+Type decltype(auto) f4() { return cz; }
+static_assert(check<decltype(f4()), int>); // Top-level const is removed?
+Type decltype(auto) f5() { return (cz); }
+static_assert(check<decltype(f5()), const int&>);
+
+bool b = true;
+const bool cb = true;
+
+Int decltype(auto) b1 = true; // { dg-error "deduced initializer" }
+Int decltype(auto) b2 = (b);  // { dg-error "deduced initializer" }
+Int decltype(auto) b3 = (cb); // { dg-error "deduced initializer" }
+
+Int decltype(auto) g1() { } // { dg-error "deduced return type" }
+Int decltype(auto) g2() { return; } // { dg-error "deduced return type" }
+Int decltype(auto) g3() { return true; } // { dg-error "deduced return type" }
+int g4(Type decltype(auto) x) { return 0; } // { dg-error "cannot declare" }
+int g5(decltype(auto) x) { return 0; } // { dg-error "cannot declare" }
+
+template<Type decltype(auto) X, typename T>
+  requires SameAs<decltype(X), T>
+constexpr bool deduced_as = true;
+
+constexpr int Z = 10;
+
+static_assert(deduced_as<0, int>);
+static_assert(deduced_as<0, int&>); // { dg-error "invalid variable template" }
+static_assert(deduced_as<Z, const int>);
+static_assert(deduced_as<(Z), const int>); // { dg-error "invalid variable template" }
+static_assert(deduced_as<(Z), const int&>);
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-defarg1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-defarg1.C
new file mode 100644
index 0000000..c3ed309
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-defarg1.C
@@ -0,0 +1,7 @@
+// { dg-do compile { target concepts } }
+
+template<typename T, typename U = T> concept C3 = true;
+template<class T> struct s1
+{
+  template <C3<T> U> void f() { }
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-dep1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-dep1.C
new file mode 100644
index 0000000..b4f6113
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-dep1.C
@@ -0,0 +1,5 @@
+// { dg-do compile { target concepts } }
+
+template <class T> concept True = true;
+template <class T, int I = static_cast<int>(True<T>)> struct A { };
+template <class T> struct B: A<T> { };
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-dr1430.C b/gcc/testsuite/g++.dg/cpp2a/concepts-dr1430.C
new file mode 100644
index 0000000..f39921f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-dr1430.C
@@ -0,0 +1,14 @@
+// PR c++/66092
+// { dg-do compile { target c++2a } }
+
+template <typename T, typename U, typename... Args>
+  concept Similar = true;
+
+template <typename... Args>
+  requires Similar<Args...> // { dg-error "pack expansion" }
+void foo( Args... args ) {}
+
+int main()
+{
+  foo(1, 2, 3); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst1.C
new file mode 100644
index 0000000..14d994c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst1.C
@@ -0,0 +1,23 @@
+// { dg-do compile { target c++2a } }
+// { dg-final { scan-assembler "_Z1gI1XEvT_" } }
+// { dg-final { scan-assembler "_Z1gI1YEvT_" } }
+// { dg-final { scan-assembler "_Z1gIiEvT_" } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+struct X { };
+struct Y { int n; };
+
+template<typename T> void g(T) { } // #1
+template<C T> void g(T) { } // #2
+template<D T> void g(T) { } // #3
+
+template void g(int); // Instantiate #1
+template void g(X); // Instantitae #3
+template void g(Y); // Instantiate #2
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst2.C
new file mode 100644
index 0000000..6074bc7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst2.C
@@ -0,0 +1,24 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+struct X { };
+struct Y { int n; };
+
+template<typename T> struct S  { void f1() { } };  // #1
+template<C T> struct S<T> { void f2() { } };      // #2
+template<D T> struct S<T> { void f3() { } };      // #3
+
+template struct S<int>; // Instantiate #1
+template struct S<X>; // Instantiate #2
+template struct S<Y>; // Instantiate #2
+
+int main() {
+  S<int> i; i.f1();
+  S<X> x; x.f3();
+  S<Y> y; y.f2();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst3.C
new file mode 100644
index 0000000..03ec9e9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst3.C
@@ -0,0 +1,27 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+struct X { };
+struct Y { int n; };
+
+template<typename T>
+  struct S {
+    void f() { }                 // #1
+    void f() requires C<T> { } // #2
+
+    void g() requires C<T> { } // #1
+    void g() requires D<T> { } // #2
+  };
+
+template void S<int>::f(); // #1
+template void S<X>::f(); // #2
+
+template void S<X>::g(); // #2
+template void S<Y>::g(); // #1
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst4.C
new file mode 100644
index 0000000..81bc081
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-inst4.C
@@ -0,0 +1,17 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+template<typename T>
+  struct S {
+    void g() requires C<T> { } // #1
+    void g() requires D<T> { } // #2
+  };
+
+template void S<int>::g(); // { dg-error "match" }
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec1.C
new file mode 100644
index 0000000..d54bcdb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec1.C
@@ -0,0 +1,31 @@
+// { dg-do run { target c++2a } }
+
+#include <cassert>
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+struct X { } x;
+struct Y { int n; } y;
+
+template<typename T> void g(T) { } // #1
+template<C T> void g(T) { }        // #2
+template<D T> void g(T) { }     // #3
+
+int called;
+
+template<> void g(int) { called = 1; } // Specialization of #1
+template<> void g<X>(X) { called = 2; } // Specialization of #3
+template<> void g(Y) { called = 3; } // Specialization of #2
+
+int main() {
+  g(0);
+  assert(called == 1);
+  g(x);
+  assert(called == 2);
+  g(y);
+  assert(called == 3);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec2.C
new file mode 100644
index 0000000..4103714
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec2.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+struct X { };
+
+template<C T> struct S;
+template<> struct S<X> { void f() { } };
+
+int main() {
+  S<X> x; x.f();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec3.C
new file mode 100644
index 0000000..76c6fb9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec3.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<C T> struct S;
+
+struct X { };
+
+// Not a valid explicit specialization, int does not satisfy C.
+template<> struct S<int> { }; // { dg-error "constraint failure" }
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec4.C
new file mode 100644
index 0000000..0634eaf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec4.C
@@ -0,0 +1,50 @@
+// { dg-do run { target c++2a } }
+
+#include <cassert>
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+struct X { } x;
+struct Y { int n; } y;
+
+int called = 0;
+
+template<typename T>
+  struct S {
+    void f() { called = 0; }                 // #1
+    void f() requires C<T> { called = 0; } // #2
+
+    void g() requires C<T> { } // #1
+    void g() requires D<T> { } // #2
+  };
+
+template<> void S<int>::f() { called = 1; } // Spec of #1
+template<> void S<X>::f() { called = 2; } // Spec of #2
+
+template<> void S<X>::g() { called = 3; } // Spec of #2
+template<> void S<Y>::g() { called = 4; } // Spec of #1
+
+int main() {
+  S<double> sd;
+  S<int> si;
+  S<X> sx;
+  S<Y> sy;
+
+  sd.f();
+  assert(called == 0);
+  si.f();
+  assert(called == 1);
+  sx.f();
+  assert(called == 2);
+  sy.f();
+  assert(called == 0);
+
+  sx.g();
+  assert(called == 3);
+  sy.g();
+  assert(called == 4);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec5.C
new file mode 100644
index 0000000..b682b0d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec5.C
@@ -0,0 +1,21 @@
+// { dg-do compile { target c++2a } }
+
+#include <cassert>
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> && __is_empty(T);
+
+struct X { } x;
+struct Y { int n; } y;
+
+int called = 0;
+
+template<typename T>
+  struct S {
+    void f() requires C<T>;
+  };
+
+template<> void S<int>::f() { called = 1; } // { dg-error "match" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec6.C
new file mode 100644
index 0000000..13f04d7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-explicit-spec6.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+struct A {
+    template<class T2> void f1(T, T2); // member template
+    template<class T2> void f2(T, T2); // member template
+};
+
+template<>
+template<class X1> void A<int>::f1(int, X1);
+
+// Specialization with template-id
+template<>
+template<> void A<int>::f2<char>(int, char);
+
+// Specialization with deduction
+template<>
+template<> void A<int>::f1(int, char);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-feature-macro.C b/gcc/testsuite/g++.dg/cpp2a/concepts-feature-macro.C
new file mode 100644
index 0000000..56fbb68
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-feature-macro.C
@@ -0,0 +1,5 @@
+// { dg-do compile { target c++2a } }
+
+#ifndef __cpp_concepts
+#error __cpp_concepts not defined
+#endif
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-fn1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-fn1.C
new file mode 100644
index 0000000..33f3a74
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-fn1.C
@@ -0,0 +1,248 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Type = true;
+
+template<typename T>
+concept False = false;
+
+template<typename T>
+concept Class = __is_class(T);
+
+template<typename T>
+concept EmptyClass = Class<T> && __is_empty(T);
+
+template<typename T, typename U>
+concept Classes = __is_class(T) && __is_class (U);
+
+struct empty { };
+
+struct nonempty { int n; };
+
+static_assert(Type<int>);
+static_assert(False<int>); // { dg-error "static assertion failed" }
+
+// Basic checks
+
+template<typename T>
+  requires Type<T>
+int fn1(T t) { return 0; }
+
+template<typename T>
+  requires False<T>
+int fn2(T t) { return 0; }
+
+void driver()
+{
+  fn1(0); // OK
+  fn2(0); // { dg-error "cannot call function" }
+}
+
+// Ordering
+
+template<typename T>
+concept Cf = requires (T t) { t.f(); };
+
+template<typename T>
+concept Cfg = Cf<T> && requires (T t) { t.g(); };
+
+template<typename T>
+concept Cf2 = requires (T t) { t.f(); };
+
+template<typename T>
+constexpr int algo(T t) { return 0; }
+
+template<typename T> requires Cf<T>
+constexpr int algo(T t) { return 1; }
+
+template<typename T> requires Cfg<T>
+constexpr int algo(T t) { return 2; }
+
+template<typename T> requires Cf<T>
+constexpr int ambig(T t) { return 1; }
+
+template<typename T> requires Cf2<T>
+constexpr int ambig(T t) { return 1; }
+
+struct T1 {
+  void f() { }
+};
+
+struct T2 : T1 {
+  void g() { }
+};
+
+void driver_0()
+{
+  T1 x;
+  T2 y;
+  static_assert(algo(0) == 0);
+  static_assert(algo(x) == 1);
+  static_assert(algo(y) == 2);
+  ambig(x); // { dg-error "call of overload | is ambiguous" }
+}
+
+template<typename T>
+struct S
+{
+  void f() requires Class<T> { }
+
+  template<typename U>
+  struct Inner
+  {
+    void g() requires Classes<T, U> { }
+  };
+
+  template<typename U> requires Classes<T, U> void h(U) { }
+};
+
+struct X { };
+
+void driver_1()
+{
+  S<X> s1;
+  s1.f(); // OK
+  s1.h(s1); // OK
+  s1.h(0); // { dg-error "no matching function" }
+
+  S<int> s2;
+  s2.f(); // { dg-error "no matching function" }
+
+  S<X>::Inner<X> si1;
+  si1.g();
+
+  S<X>::Inner<int> si2;
+  si2.g(); // { dg-error "no matching function" }
+}
+
+// Check constraints on non-dependent arguments, even when in a
+// dependent context.
+
+template<typename T> requires Class<T> void f1(T x) { }
+
+// fn1-2.C -- Dependent checks
+template<typename T>
+void caller_1(T x) 
+{ 
+  f1(x); // Unchecked dependent arg.
+  f1(empty{}); // Checked non-dependent arg, but OK
+  f1(0); // { dg-error "cannot call function" }
+}
+
+// fn3.c -- Ordering
+template<typename T> 
+  requires Class<T> 
+constexpr int f2(T x) { return 1; }
+
+template<typename T> 
+  requires EmptyClass<T> 
+constexpr int f2(T x) { return 2; }
+
+template<typename T> 
+constexpr int f3(T x) requires Class<T> { return 1; }
+
+template<typename T> 
+constexpr int f3(T x) requires EmptyClass<T> { return 2; }
+
+void driver_2() 
+{
+  f2(0); // { dg-error "no matching function" }
+  static_assert (f2(empty{}) == 2);
+  static_assert (f2(nonempty{}) == 1);
+  f3(0); // { dg-error "no matching function" }
+  static_assert (f3(empty{}) == 2);
+  static_assert (f3(nonempty{}) == 1);
+}
+
+// fn8.C -- Address of overloaded functions
+template<typename T> requires Type<T> void ok(T) { }
+template<typename T> requires Class<T> void err(T) { }
+
+auto p1 = &ok<int>;
+auto p2 = &err<int>; // { dg-error "no matches" }
+void (*p3)(int) = &ok<int>;
+void (*p4)(int) = &err<int>; // { dg-error "no matches" }
+void (*p5)(int) = &ok;
+void (*p6)(int) = &err; // { dg-error "no matches" }
+
+template<typename T> void g(T x) { }
+
+void driver_3 () 
+{
+  g(&ok<int>);
+  g(&err<int>); // { dg-error "no matches" }
+}
+
+
+struct S2 {
+  template<typename T> requires Type<T> int ok(T) { return 0; }
+  template<typename T> requires Class<T> int err(T) { return 0; }
+};
+
+auto p7 = &S2::ok<int>;
+auto p8 = &S2::err<int>; // { dg-error "no matches" }
+int (S2::*p9)(int) = &S2::ok<int>;
+int (S2::*p10)(int) = &S2::err<int>; // { dg-error "no matches" }
+int (S2::*p11)(int) = &S2::ok;
+int (S2::*p12)(int) = &S2::err; // { dg-error "no matches" }
+
+// fn9.C -- Ordering with function address
+template<typename T> 
+  requires Class<T> 
+constexpr int fn(T) { return 1; }
+
+template<typename T> 
+  requires EmptyClass<T>
+constexpr int fn(T) { return 2; }
+
+struct S3 
+{
+  template<typename T> 
+    requires Class<T> 
+  constexpr int fn(T) const { return 1; }
+  
+  template<typename T> 
+    requires EmptyClass<T> 
+  constexpr int fn(T) const { return 2; }
+};
+
+void driver_5 () {
+  struct X { };
+  struct Y { X x; };
+
+  constexpr X x;
+  constexpr Y y;
+  constexpr S3 s;
+
+  constexpr auto p1 = &fn<X>; // Empty f
+  static_assert (p1(x) == 2);
+
+  constexpr auto p2 = &fn<Y>; // Class f
+  static_assert(p2(y) == 1);
+
+  constexpr auto p3 = &S3::fn<X>; // Empty f
+  static_assert((s.*p3)(x) == 2);
+
+  constexpr auto p4 = &S3::fn<Y>; // Empty f
+  static_assert((s.*p4)(y) == 1);
+}
+
+
+// Redeclarations
+
+// FIXME: This should be a diagnosable error. The programmer has moved
+// the requirements from the template-head to the declarator.
+template<typename T> requires Type<T> void f3();
+template<typename T> void f3() requires Type<T>;
+
+void driver_4()
+{
+  f3<int>(); // { dg-error "call of overload | ambiguous" }
+}
+
+template<template<typename T> requires true class X> void f4();
+template<template<typename T> class X> void f4(); // OK: different declarations
+
+template<typename T> requires Type<T> void def() { }
+template<typename T> requires Type<T> void def() { } // { dg-error "redefinition" }
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-fn2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-fn2.C
new file mode 100644
index 0000000..ddf99aa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-fn2.C
@@ -0,0 +1,111 @@
+// { dg-do run { target c++2a } }
+
+#define assert(E) if (!(E)) __builtin_abort();
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = __is_empty(T);
+
+struct X { } x;
+struct Y { int n; } y;
+
+int called = 0;
+
+// Test constrained member definitions
+template<typename T>
+  struct S1 {
+    void f1() requires C<T> { }
+
+    void f2() requires C<T> { called = 1; }
+    void f2() requires (!C<T>) { called = 2; }
+
+    void f3() { called = 1; }
+    void f3() requires C<T> { called = 2; }
+    void f3() requires C<T> && D<T> { called = 3; }
+
+    void g1() requires C<T> && true;
+
+    void g2() requires C<T>;
+    void g2() requires (!C<T>);
+
+    void g3();
+    void g3() requires C<T>;
+    void g3() requires C<T> and D<T>;
+
+    template<C U> void h1(U u) { called = 1; }
+    template<C U> void h2(U u);
+    template<C U> void h3(U u) requires D<U>;
+  };
+
+template<C T>
+  struct S2 {
+    void f(T) requires D<T>;
+  };
+
+
+int main() {
+  S1<X> sx;
+  S1<Y> sy;
+  S1<int> si;
+
+  // Defined in-class
+  sx.f1();
+  sx.f2(); assert(called == 1);  
+  sx.f3(); assert(called == 3);
+
+  sy.f1();
+  sy.f2(); assert(called == 1);
+  sy.f3(); assert(called == 2);
+
+  si.f2(); assert(called == 2);
+  si.f3(); assert(called == 1);
+
+  // Member function template tests
+  S1<int> s1i;
+  s1i.h1(x); assert(called == 1);
+  s1i.h2(x); assert(called == 2);
+  s1i.h3(x); assert(called == 3);
+
+  // Defined out of class.
+  sx.g1();
+  sx.g2(); assert(called == 1);
+  sx.g3(); assert(called == 3);
+
+  sy.g1();
+  sy.g2(); assert(called == 1);
+  sy.g3(); assert(called == 2);
+
+  si.g2(); assert(called == 2);
+  si.g3(); assert(called == 1);
+}
+
+template<typename T>
+  void S1<T>::g1() requires C<T> and true { }
+
+template<typename T>
+  void S1<T>::g2() requires C<T> { called = 1; }
+
+template<typename T>
+  void S1<T>::g2() requires (!C<T>) { called = 2; }
+
+template<typename T>
+  void S1<T>::g3() { called = 1; }
+
+template<typename T>
+  void S1<T>::g3() requires C<T> { called = 2; }
+
+template<typename T>
+  void S1<T>::g3() requires C<T> and D<T> { called = 3; }
+
+template<typename T>
+  template<C U>
+    void S1<T>::h2(U u) { called = 2; }
+
+template<typename T>
+  template<C U>
+      void S1<T>::h3(U u) requires D<U> { called = 3; }
+
+template<C T>
+  void S2<T>::f(T t) requires D<T> { called = 4; }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-fn3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-fn3.C
new file mode 100644
index 0000000..e73ae23
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-fn3.C
@@ -0,0 +1,49 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept type = true;
+
+template<typename T, typename U>
+concept same_as = __is_same_as(T, U);
+
+template<typename T>
+concept integral = __is_same_as(T, int);
+
+template<typename... Ts>
+concept all_integral = (integral<Ts> && ...);
+
+void f1(integral auto... args) { }
+void f2(all_integral auto... args) { }
+
+template<type T> requires true
+void f3(T, integral auto... args) { }
+
+template<type T>
+struct S
+{
+  void f1(integral auto... args) { }
+  void f2(all_integral auto... args) { }
+
+  template<type U> requires true
+  void f3(U, integral auto... args) { }
+};
+
+int main()
+{
+  f1(1, 2, 3);
+  f1(1, 2, 3u); // { dg-error "cannot call" }
+  f2(1, 2, 3);
+  f2(1, 2, 3u); // { dg-error "cannot call" }
+  f3(1, 2, 3);
+  f3(1, 2, 3u); // { dg-error "cannot call" }
+  f3(1u, 2, 3);
+
+  S<void> s;
+  s.f1(1, 2, 3);
+  s.f1(1, 2, 3u); // { dg-error "no matching function" }
+  s.f2(1, 2, 3);
+  s.f2(1, 2, 3u); // { dg-error "no matching function" }
+  s.f3(1, 2, 3);
+  s.f3(1, 2, 3u); // { dg-error "no matching function" }
+  s.f3(1u, 2, 3);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-fnparm1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-fnparm1.C
new file mode 100644
index 0000000..586b510
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-fnparm1.C
@@ -0,0 +1,10 @@
+// { dg-do compile { target concepts } }
+
+template <class T> void f(T t)
+  requires requires { static_cast<T&&>(t); }
+{}
+
+int main()
+{
+  f(42);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-friend1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-friend1.C
new file mode 100644
index 0000000..da97575
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-friend1.C
@@ -0,0 +1,34 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept Eq = requires(T t) { t == t; }; // { dg-message "in requirements" }
+
+struct Nt {
+  template<Eq T> friend void f(T) { }
+} nt;
+
+template<typename T> struct S;
+
+template<Eq T>
+  void proc(S<T>*);
+
+template<typename T>
+  struct S {
+    friend bool operator==(S, S) requires Eq<T> { return true; }
+
+    friend void proc<>(S*); // { dg-error "does not match any template declaration" }
+  };
+
+struct X { } x;
+
+int main() {
+  // f(0); // OK
+  f(nt); // { dg-error "cannot call" }
+  f(x);  // { dg-error "3:'f' was not declared" }
+
+  S<int> si;
+  si == si; // OK
+
+  S<X> sx;
+  sx == sx; // { dg-error "no match" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-friend2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-friend2.C
new file mode 100644
index 0000000..6aa9d96
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-friend2.C
@@ -0,0 +1,20 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept Eq = requires(T t) { t == t; }; // { dg-message "in requirements" }
+
+template<Eq T> struct Foo { };
+
+template<typename T>
+  struct S { // { dg-error "constraint failure" }
+    template<Eq U> friend class Bar;
+
+    friend class Foo<T>;
+  };
+
+struct X { };
+
+int main() {
+  S<int> si; // OK
+  S<X> sx;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-friend3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-friend3.C
new file mode 100644
index 0000000..4f49358
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-friend3.C
@@ -0,0 +1,20 @@
+// { dg-do compile { target concepts } }
+
+template <class T> concept True = true;
+
+template <True U> struct B { int i = ++U::x; };
+template <True U> void f() { ++U::x; }
+
+template <class V> class C
+{
+  static int x;
+
+  template <True U> friend struct B;
+  template <True U> friend void f();
+};
+
+int main()
+{
+  f<C<int>>();
+  B<C<int>>();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-iconv1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-iconv1.C
new file mode 100644
index 0000000..cc2ce7e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-iconv1.C
@@ -0,0 +1,22 @@
+// PR c++/67240
+// { dg-do compile { target c++2a } }
+
+template <class T, class U> concept Same = __is_same_as(T,U);
+
+int foo(int x)
+{
+    return x;
+}
+ 
+template <typename T>
+concept C1 = requires (T x) {
+    {foo(x)} -> Same<int&>;
+};
+
+template <typename T>
+concept C2 = requires (T x) {
+    {foo(x)} -> Same<void>;
+};
+ 
+static_assert( C1<int> );	// { dg-error "assert" }
+static_assert( C2<int> );	// { dg-error "assert" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor2.C
new file mode 100644
index 0000000..aa244bc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor2.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  struct S1 {
+    S1(double) requires C<T> { }
+  };
+
+template<typename T>
+  struct S2 : S1<T> { // { dg-error "matching" }
+    using S1<T>::S1;
+  };
+
+int main() {
+  S2<int> s; // { dg-error "deleted function" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor4.C
new file mode 100644
index 0000000..75190eb3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor4.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  struct S1 {
+    template<C U> S1(U x) { }
+  };
+
+template<typename T>
+  struct S2 : S1<T> {
+    using S1<T>::S1; // { dg-error "no matching function" }
+  };
+
+int main() {
+  S2<int> s(0); // { dg-error "use of deleted function" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor5.C
new file mode 100644
index 0000000..2044ab5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor5.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target concepts } }
+
+template <class T> struct A
+{
+  constexpr A(T) requires (sizeof(T) > 1) {}
+
+  A(T);
+};
+
+template <class T> struct B: A<T>
+{
+  using A<T>::A;
+};
+
+int main()
+{
+  constexpr B<int> b = 42;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-lambda1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-lambda1.C
new file mode 100644
index 0000000..ef19688
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-lambda1.C
@@ -0,0 +1,33 @@
+// PR c++/82565
+// { dg-do compile { target c++2a } }
+
+struct string
+{
+  string();
+  string(const char *);
+  bool empty() const;
+};
+
+template<class From, class To>
+concept convertible_to = requires(From (&f)(), void (&g)(To)) { g(f()); };
+
+template<typename T, typename ReturnType>
+concept Concept =
+  requires(T t, const string& s) {
+    { t(s) } -> convertible_to<ReturnType>;
+  };
+
+struct test {
+  string _str;
+
+  template<typename Visitor>
+    requires Concept<Visitor, bool>
+  decltype(auto) visit(Visitor&& visitor) const {
+    return visitor(_str);
+  }
+
+};
+
+int main() {
+  test().visit([] (auto& x) { return x.empty(); });
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-locations1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-locations1.C
new file mode 100644
index 0000000..6c81c14
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-locations1.C
@@ -0,0 +1,22 @@
+// { dg-do compile { target c++2a } }
+
+struct S
+{
+  concept S();  // { dg-error "3:a constructor cannot be .concept." }
+  // { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
+  concept int s = 1;  // { dg-error "3:non-static data member .s. declared .concept." }
+  // { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
+  concept void foo();  // { dg-error "3:a concept cannot be a member function" }
+  // { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
+  concept ~S();  // { dg-error "3:a destructor cannot be .concept." }
+  // { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
+};
+
+typedef concept int my_int;  // { dg-error "9:.concept. cannot appear in a typedef declaration" }
+// { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
+
+void bar(concept int);  // { dg-error "10:a parameter cannot be declared .concept." }
+// { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
+
+concept int i = 0;  // { dg-error "1:a non-template variable cannot be .concept." }
+// { dg-error "concept definition syntax" "" { target *-*-* } .-1 }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-member-concept.C b/gcc/testsuite/g++.dg/cpp2a/concepts-member-concept.C
new file mode 100644
index 0000000..f3a2d06
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-member-concept.C
@@ -0,0 +1,21 @@
+// { dg-do compile { target c++2a } }
+
+// FIXME: Diagnostics should be better.
+
+struct Base {
+  template<typename T>
+  static concept D = __is_same_as(T, int); // { dg-error "static data member" }
+
+  template<typename T, typename U>
+  static concept E = __is_same_as(T, U); // { dg-error "static data member" }
+
+  template<typename T>
+  concept C1 = __is_same_as(T, int); // { dg-error "not in namespace scope" }
+};
+
+union U {
+  template<typename T>
+  concept C = true; // // { dg-error "not in namespace scope" }
+};
+
+// { dg-excess-errors "deprecated" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-memfun-err.C b/gcc/testsuite/g++.dg/cpp2a/concepts-memfun-err.C
new file mode 100644
index 0000000..acfa188
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-memfun-err.C
@@ -0,0 +1,35 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = __is_empty(T);
+
+struct X { } x;
+struct Y { int n; } y;
+
+int called = 0;
+
+// Test constrained member definitions
+template<typename T>
+  struct S1 { // { dg-message "defined here" }
+    void f1() requires C<T> { }
+    void g1() requires C<T> and true;
+    template<C U> void h1(U u) { called = 1; }
+
+    void g2() requires C<T>; // { dg-message "candidate" }
+  };
+
+template<typename T>
+  void S1<T>::g2() requires D<T> { } // { dg-error "no declaration matches" }
+
+int main() {
+  S1<X> sx;
+  S1<Y> sy;
+  S1<int> si;
+
+  si.f1(); // { dg-error "matching" }
+  si.g1(); // { dg-error "matching" }
+  si.h1(0); // { dg-error "matching" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-memfun.C b/gcc/testsuite/g++.dg/cpp2a/concepts-memfun.C
new file mode 100644
index 0000000..f6ad519
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-memfun.C
@@ -0,0 +1,111 @@
+// { dg-do run { target c++2a } }
+
+#include <cassert>
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = __is_empty(T);
+
+struct X { } x;
+struct Y { int n; } y;
+
+int called = 0;
+
+// Test constrained member definitions
+template<typename T>
+  struct S1 {
+    void f1() requires C<T> { }
+
+    void f2() requires C<T> { called = 1; }
+    void f2() requires (not C<T>) { called = 2; }
+
+    void f3() { called = 1; }
+    void f3() requires C<T> { called = 2; }
+    void f3() requires C<T> and D<T> { called = 3; }
+
+    void g1() requires C<T> and true;
+
+    void g2() requires C<T>;
+    void g2() requires (not C<T>);
+
+    void g3();
+    void g3() requires C<T>;
+    void g3() requires C<T> and D<T>;
+
+    template<C U> void h1(U u) { called = 1; }
+    template<C U> void h2(U u);
+    template<C U> void h3(U u) requires D<U>;
+  };
+
+template<C T>
+  struct S2 {
+    void f(T) requires D<T>;
+  };
+
+
+int main() {
+  S1<X> sx;
+  S1<Y> sy;
+  S1<int> si;
+
+  // Defined in-class
+  sx.f1();
+  sx.f2(); assert(called == 1);
+  sx.f3(); assert(called == 3);
+
+  sy.f1();
+  sy.f2(); assert(called == 1);
+  sy.f3(); assert(called == 2);
+
+  si.f2(); assert(called == 2);
+  si.f3(); assert(called == 1);
+
+  // Member function template tests
+  S1<int> s1i;
+  s1i.h1(x); assert(called == 1);
+  s1i.h2(x); assert(called == 2);
+  s1i.h3(x); assert(called == 3);
+
+  // Defined out of class.
+  sx.g1();
+  sx.g2(); assert(called == 1);
+  sx.g3(); assert(called == 3);
+
+  sy.g1();
+  sy.g2(); assert(called == 1);
+  sy.g3(); assert(called == 2);
+
+  si.g2(); assert(called == 2);
+  si.g3(); assert(called == 1);
+}
+
+template<typename T>
+  void S1<T>::g1() requires C<T> and true { }
+
+template<typename T>
+  void S1<T>::g2() requires C<T> { called = 1; }
+
+template<typename T>
+  void S1<T>::g2() requires (not C<T>) { called = 2; }
+
+template<typename T>
+  void S1<T>::g3() { called = 1; }
+
+template<typename T>
+  void S1<T>::g3() requires C<T> { called = 2; }
+
+template<typename T>
+  void S1<T>::g3() requires C<T> and D<T> { called = 3; }
+
+template<typename T>
+  template<C U>
+    void S1<T>::h2(U u) { called = 2; }
+
+template<typename T>
+  template<C U>
+      void S1<T>::h3(U u) requires D<U> { called = 3; }
+
+template<C T>
+  void S2<T>::f(T t) requires D<T> { called = 4; }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl1.C
new file mode 100644
index 0000000..ee28d5b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl1.C
@@ -0,0 +1,17 @@
+// { dg-do compile { target c++2a } }
+
+template <class T>
+struct A {
+  template <class U>
+    requires (sizeof(T) == 1)
+      static void f(U);
+  
+  template <class U>
+    requires (sizeof(T) == 2)
+      static void f(U);
+  
+  void g()
+  {
+    f(42);
+  }
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl2.C
new file mode 100644
index 0000000..f60b220
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-memtmpl2.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target concepts } }
+
+template <class T, class U> concept NotSame = !__is_same_as (T, U);
+
+template <class T, class X>
+struct A
+{
+  template <NotSame<A> U> void f(U) { }
+  template <class U> void f(U);
+};
+
+int main()
+{
+  A<int,int>().f<char>(0);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-nested1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-nested1.C
new file mode 100644
index 0000000..8fc965f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-nested1.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target concepts } }
+
+namespace N { template <class T> concept True = true; }
+template <class T> struct A { };
+
+template <class T>
+requires N::True<T> && requires { typename A<T>; }
+void f();
+
+int main()
+{
+  f<int>();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-noexcept1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-noexcept1.C
new file mode 100644
index 0000000..e5a9b72
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-noexcept1.C
@@ -0,0 +1,25 @@
+// { dg-do compile { target c++2a } }
+
+void f1(int);
+void f2(int) noexcept;
+
+template<typename T>
+concept C1 = requires (T t) { // { dg-message "in requirements" }
+  { f1(t) } noexcept;
+};
+
+template<typename T>
+concept C2 = requires (T t) {
+  { f2(t) } noexcept;
+};
+
+template<C1 T>
+void g1(T t);
+
+template<C2 T>
+void g2(T t);
+
+void test() {
+  g1(0); // { dg-error "cannot call" }
+  g2(0);
+}
\ No newline at end of file
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-p1141.C b/gcc/testsuite/g++.dg/cpp2a/concepts-p1141.C
new file mode 100644
index 0000000..deb409a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-p1141.C
@@ -0,0 +1,98 @@
+// { dg-do compile }
+// { dg-options "-std=c++2a" }
+
+template<typename T>
+concept Type = true;
+
+template<typename T>
+concept Bottom = false;
+
+template<typename T>
+concept Class = __is_class(T);
+
+template<auto N>
+concept Number = true;
+
+template<template<typename> class T>
+concept Template = true;
+
+struct empty { };
+
+Type x1 = 0; // { dg-error "expected 'auto'" }
+Type auto x2 = 0;
+
+Number x3 = 0; // { dg-error "does not constrain a type" }
+Template x4 = 0; // { dg-error "does not constrain a type" }
+
+Type const& x5 = 0; // { dg-error "expected 'auto'" }
+const Type& x6 = 0; // { dg-error "expected 'auto'" }
+Type auto const& x7 = 0;
+const Type auto& x8 = 0;
+Type const auto& x9 = 0; // { dg-error "expected 'auto'|two or more data types" }
+
+template<Type T> // OK: T is a type parameter.
+void f1(T);
+
+template<Number N> // { dg-error "does not constrain a type" }
+void f2();
+
+template<Template X> // { dg-error "does not constrain a type" }
+void f3();
+
+template<Type auto N> // OK: N is a non-type parameter.
+void f4() { }
+
+template<Bottom auto N> // OK: but never usable.
+void f5();
+
+void driver() {
+  f4<0>();
+  f5<0>(); // { dg-error "no matching function for call | constraints not satisfied" }
+}
+
+Type f6() { return 0; } // { dg-error "expected 'auto'" }
+static_assert(__is_same_as(decltype(f6), int()));
+
+Type auto f7() { return 0; }
+static_assert(__is_same_as(decltype(f7), int()));
+
+Type f8() { return 0; } // { dg-error "expected 'auto'" }
+auto f9() -> Type { return 0; } // { dg-error "expected 'auto'" }
+
+Type f10() { } // { dg-error "expected 'auto'" }
+auto f11() -> Type { } // { dg-error "expected" }
+
+Number f12(); // { dg-error "does not constrain a type" }
+auto f13() -> Number; // { dg-error "does not constrain a type" }
+
+Template f14(); // { dg-error "does not constrain a type" }
+auto f15() -> Template; // { dg-error "does not constrain a type" }
+
+Type f16() { return 0; } // { dg-error "expected 'auto'" }
+auto f17() -> Type { return 0; } // { dg-error "expected 'auto'" }
+
+// Abbreviated function templates
+
+void f18(Class x) { } // { dg-error "expected 'auto'" }
+void f19(Class auto x) { }
+void f20(Class auto x, Class auto y) { }
+
+void driver_1()
+{
+  f19(0); // { dg-error "cannot call function" }
+  f19(empty{});
+  f20(0, empty{}); // { dg-error "cannot call function" }
+  f20(empty{}, empty{});
+}
+
+// Abbreviated function redeclarations
+
+// Functionally equivalent but not equivalent.
+void f21(Class auto x);
+template<Class T> void f21(T x);
+
+void driver_2()
+{
+  f21(empty{}); // { dg-error "call of overload | ambiguous" }
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec.C b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec.C
new file mode 100644
index 0000000..25b4e2a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec.C
@@ -0,0 +1,16 @@
+// { dg-do compile { target c++17_only } }
+// { dg-options "-fconcepts" }
+
+// Check that constraints don't break unconstrained partial
+// specializations.
+
+template<typename T>
+  struct S { };
+
+template<typename T>
+  struct S<T*> { };
+
+template<>
+  struct S<int> { };
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec2.C
new file mode 100644
index 0000000..566d8dd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec2.C
@@ -0,0 +1,38 @@
+// PR c++/67084
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
+
+template <class T>
+concept True = true;
+template <class T>
+concept False = false;
+
+template <class T>
+constexpr bool p = false;
+
+template <class T>
+constexpr bool p<T*> = false;
+
+template <class T>
+  requires True<T>
+constexpr bool p<T*> = false;
+
+template <class T>
+  requires True<T> && (T() == 0)
+constexpr bool p<T*> = true;
+
+template <class T>
+constexpr bool q = false;
+
+template <class T>
+constexpr bool q<T*> = true;
+
+template <class T>
+  requires False<T>
+constexpr bool q<T*> = false;
+
+template <class T>
+  requires False<T> && (T() != 0)
+constexpr bool q<T*> = false;
+
+static_assert (p<int*>,"");
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec3.C
new file mode 100644
index 0000000..2970af1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec3.C
@@ -0,0 +1,8 @@
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
+
+template <class T> struct A { };
+template <class T> requires false struct A<T*> { };
+template <class T> struct A<T*> { static int i; };
+
+int i = A<int*>::i;
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec4.C
new file mode 100644
index 0000000..5ba3ab1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec4.C
@@ -0,0 +1,49 @@
+// { dg-do compile { target c++2a } }
+
+template <class T> concept is_int = __is_same_as(T,int);
+
+template <class T> struct A { };
+template <is_int T> struct A<T*> {
+  typedef int I1;
+  static const A<T*>::I1 j1 = 0;
+  static int f();
+};
+template <is_int T> int A<T*>::f()
+{ A<T*>::I1 i; return j1; }
+
+template <class T> struct A<T*> {
+  typedef int I2;
+  static const A<T*>::I2 j2 = 0;
+  static int f();
+};
+template <class T> int A<T*>::f()
+{ A<T*>::I2 i; return j2; }
+
+const int i1 = A<int*>::j1;
+const int i2 = A<float*>::j2;
+
+template <class T> struct B;
+
+template <is_int T> struct B<T> {
+  typedef int I4;
+  static const B<T>::I4 j4 = 0;
+  static int f();
+};
+template <is_int T> int B<T>::f()
+{ B<T>::I4 i; return j4; }
+
+template <class T> struct B {
+  typedef int I5;
+  static const B<T>::I5 j5 = 0;
+  static int f();
+};
+template <class T> int B<T>::f()
+{ B<T>::I5 i; return j5; }
+
+int i4 = B<int>::j4;
+int i5 = B<float>::j5;
+int main()
+{
+  B<int>::f();
+  B<float>::f();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec5.C
new file mode 100644
index 0000000..f33f7496
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec5.C
@@ -0,0 +1,12 @@
+// PR c++/67138
+// { dg-do compile { target c++2a } }
+
+template <class T>
+concept Auto = true;
+
+template <Auto T>
+struct test {};
+
+template <Auto T>
+  requires requires (T t) { t + t; }
+struct test<T> {};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec6.C
new file mode 100644
index 0000000..2bb4bac
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-partial-spec6.C
@@ -0,0 +1,24 @@
+// PR c++/67152
+// { dg-do compile { target c++2a } }
+
+template <class T>
+concept HasType = requires { typename T::type; };
+
+template<class T>
+struct trait {
+  using type = void;
+};
+
+struct has_type { using type = void; };
+
+// Instantiation here
+trait<has_type>::type foo() {}
+
+// constrained version here. Type "has_type" would fail this
+// constraint so this partial specialization would not have been
+// selected.
+template<class T>
+  requires (!HasType<T>)
+struct trait<T> {
+  using type = void;
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-placeholder1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-placeholder1.C
new file mode 100644
index 0000000..cbea81d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-placeholder1.C
@@ -0,0 +1,14 @@
+// { dg-do compile { target c++2a } }
+
+template<class T, class U>
+concept Same = __is_same_as(T, U);
+
+template<typename T>
+concept C1 = true;
+
+template<typename T, typename U>
+concept C2 = true;
+
+C1 auto        c1 = 0;
+C2<int> auto   c2 = 0;
+Same<int> auto s1 = 'a'; // { dg-error "does not satisfy|is_same" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr58500.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58500.C
new file mode 100644
index 0000000..cb74072
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58500.C
@@ -0,0 +1,7 @@
+// PR c++/58500
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A {};
+
+void foo(auto (A::*)());
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr58534.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58534.C
new file mode 100644
index 0000000..b2c3caa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58534.C
@@ -0,0 +1,7 @@
+// PR c++/58534
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+template<typename> void foo(const auto&) {}
+
+template<typename, typename...T> void foo(const auto&, T...) {}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr58535.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58535.C
new file mode 100644
index 0000000..3e212a0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58535.C
@@ -0,0 +1,7 @@
+// PR c++/58535
+// { dg-do compile { target c++14 } }
+
+struct A
+{
+  virtual void foo(auto); // { dg-error "auto|templates" }
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr58536.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58536.C
new file mode 100644
index 0000000..99c7ebe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58536.C
@@ -0,0 +1,10 @@
+// PR c++/58536
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A
+{
+  A(auto);
+};
+
+A::A(auto) {}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr58548.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58548.C
new file mode 100644
index 0000000..cd3e6fd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58548.C
@@ -0,0 +1,8 @@
+// PR c++/58548
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+void foo(auto)
+{
+  struct A { int i; };
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr58549.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58549.C
new file mode 100644
index 0000000..6b66afc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr58549.C
@@ -0,0 +1,8 @@
+// PR c++/58549
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+void foo(auto)
+{
+  void bar();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr59200.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr59200.C
new file mode 100644
index 0000000..995672c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr59200.C
@@ -0,0 +1,19 @@
+// PR c++/59200
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A
+{
+  static constexpr bool value = true;
+};
+
+template<typename T>
+struct B
+{
+  template<typename U>
+    using C = A;
+};
+
+template<typename T>
+template<typename U>
+  const bool B<T>::C<U>::value;  // { dg-error "too many" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60052.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60052.C
new file mode 100644
index 0000000..c5bc28e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60052.C
@@ -0,0 +1,15 @@
+// PR c++/60052
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A
+{
+  void foo(auto);
+};
+
+void A::foo(auto) {}
+
+struct B
+{
+  void bar(auto);
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60053.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60053.C
new file mode 100644
index 0000000..20cf121
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60053.C
@@ -0,0 +1,15 @@
+// PR c++/60053
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A
+{
+  void foo(auto);
+};
+
+void A::foo(auto) {}
+
+template<typename> struct B
+{
+  template<typename T> void bar(auto);
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60064.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60064.C
new file mode 100644
index 0000000..b82b560
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60064.C
@@ -0,0 +1,21 @@
+// PR c++/60064
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+class A
+{
+  int m;
+  friend void foo (auto) {}
+  friend void foo2 (auto);
+};
+
+void foo2 (auto i)
+{
+  A a;
+  a.m = i;
+}
+
+int main ()
+{
+  foo2 (7);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60065.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60065.C
new file mode 100644
index 0000000..b2b1aea
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60065.C
@@ -0,0 +1,8 @@
+// PR c++/60065
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+template <int> void foo(auto... x);
+template <typename> void foo2(auto... x);
+template <int> void foo3(auto... x, auto y, auto... z);
+template <typename> void foo4(auto... x, auto y, auto... z);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60377.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60377.C
new file mode 100644
index 0000000..5b18717
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60377.C
@@ -0,0 +1,9 @@
+// PR c++/60377
+// { dg-do compile { target c++14 } }
+
+void foo(auto, void (f*)()); // { dg-error "auto|expected" }
+
+struct A
+{
+  int i;
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60390.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60390.C
new file mode 100644
index 0000000..a453d1d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60390.C
@@ -0,0 +1,26 @@
+// PR c++/60390
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A
+{
+  void foo (auto);
+};
+
+class B
+{
+  int m;
+  friend void A::foo (auto);
+};
+
+void A::foo (auto i)
+{
+  B b;
+  b.m = i;
+}
+
+int main ()
+{
+  A a;
+  a.foo (7);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60391.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60391.C
new file mode 100644
index 0000000..5c5ca2c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60391.C
@@ -0,0 +1,9 @@
+// PR c++/60391
+// { dg-do compile { target c++14 } }
+
+namespace N
+{
+  int operator"" _X(auto) {} // { dg-error "auto|invalid" }
+}
+
+namespace N {}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr60573.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60573.C
new file mode 100644
index 0000000..42cda21
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr60573.C
@@ -0,0 +1,28 @@
+// PR c++/60573
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+struct A
+{
+  struct B
+  {
+    void foo(auto);
+  };
+
+  void B::foo(auto) {}  // { dg-error "8:cannot define" }
+
+  struct X
+  {
+    struct Y
+    {
+      struct Z
+      {
+        void foo(auto);
+      };
+    };
+
+    void Y::Z::foo(auto) {}  // { dg-error "10:cannot define" }
+  };
+
+  void X::Y::Z::foo(auto) {}  // { dg-error "8:cannot define" }
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr65552.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65552.C
new file mode 100644
index 0000000..5af2a40
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65552.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Concept =
+  requires () {
+    typename T::member_type1;
+    typename T::member_type2;
+  };
+
+struct model {
+  using member_type1 = int;
+  using member_type2 = int;
+};
+
+template<Concept C>
+struct S {};
+
+S<model> s;
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr65575.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65575.C
new file mode 100644
index 0000000..3bfde5e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65575.C
@@ -0,0 +1,23 @@
+// PR c++/65575
+// { dg-do compile { target c++17_only } }
+// { dg-additional-options "-fconcepts" }
+
+template<typename T>
+concept bool C = false;
+
+int f1() requires false;
+int& f2() requires false;
+int* f3() requires false;
+auto f4() -> int& requires false;
+auto f5() -> int* requires false;
+auto f6() -> int requires false;
+
+int (*p1)() requires true; // { dg-error "" }
+int (&p2)() requires true; // { dg-error "" }
+int g(int (*)() requires true); // { dg-error "" }
+
+int
+main()
+{
+  f1(); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr65634.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65634.C
new file mode 100644
index 0000000..52f24ec
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65634.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept C1 =
+    requires () {
+        { T::smf() } noexcept;
+    };
+
+struct M1 {
+    static void smf() noexcept;
+};
+template<typename T>
+concept C2 = C1<typename T::type>;
+
+struct M2 {
+    using type = M1;
+};
+static_assert(C2<M2>, "");
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr65636.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65636.C
new file mode 100644
index 0000000..b99a343
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65636.C
@@ -0,0 +1,8 @@
+// { dg-do compile { target c++2a } }
+
+using TD = int;
+
+template<typename T>
+concept C = requires () { typename TD; };
+
+static_assert(C<int>, "");
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr65848.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65848.C
new file mode 100644
index 0000000..b246d25
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65848.C
@@ -0,0 +1,59 @@
+// { dg-do compile { target c++2a } }
+
+// Performance test... This should be fast.
+
+#include <type_traits>
+
+template<typename T>
+concept Destructible = std::is_destructible<T>::value;
+template<typename T, typename... Args>
+concept Constructible = Destructible<T> && std::is_constructible<T, Args...>::value;
+template<typename T>
+concept Move_constructible = Constructible<T, T&&>;
+template<typename T>
+concept Copy_constructible = Move_constructible<T> && Constructible<T, const T&>;
+template<typename T, typename U>
+concept Assignable = std::is_assignable<T, U>::value;
+template<typename T>
+concept Move_assignable = Assignable<T&, T&&>;
+template<typename T>
+concept Copy_assignable = Move_assignable<T> && Assignable<T&, const T&>;
+template<typename T>
+concept Copyable = Copy_constructible<T> && Copy_assignable<T>;
+
+template<typename T>
+concept C1 = Copyable<T>;
+template<typename T>
+concept C2 = C1<T>;
+template<typename T>
+concept C3 = C2<T>;
+template<typename T>
+concept C4 = C3<T>;
+template<typename T>
+concept C5 = C4<T>;
+template<typename T>
+concept C6 = C5<T>;
+template<typename T>
+concept C7 = C6<T>;
+template<typename T>
+concept C8 = C7<T>;
+template<typename T>
+concept C9 = C8<T>;
+template<typename T>
+concept C10 = C9<T>;
+template<typename T>
+concept C11 = C10<T>;
+
+struct S1 {};
+struct S2 {};
+struct S3 {};
+struct S4 {};
+struct S5 {};
+struct S6 {};
+
+static_assert(C11<S1>, "");
+static_assert(C11<S2>, "");
+static_assert(C11<S3>, "");
+static_assert(C11<S4>, "");
+static_assert(C11<S5>, "");
+static_assert(C11<S6>, "");
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr65854.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65854.C
new file mode 100644
index 0000000..a21073c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr65854.C
@@ -0,0 +1,22 @@
+// PR c++/65854
+// { dg-do compile { target c++2a } }
+
+// Handle alias templates in type requirements.
+
+template<typename T1, typename T2>
+struct BTT { };
+
+template<typename T>
+struct BTT<T,T> { using type = int; };
+
+template<typename T1, typename T2>
+using Alias1 = typename BTT<T1, T2>::type;
+
+template<typename T1, typename T2>
+concept C = requires() { typename Alias1<T1, T2>; }; // { dg-message "in requirements" }
+
+template<typename T1, typename T2>
+  requires C<T1, T2>
+int f();
+
+auto i = f<char, int>(); // { dg-error "cannot call function" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr66091.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr66091.C
new file mode 100644
index 0000000..ea51e31
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr66091.C
@@ -0,0 +1,21 @@
+// PR c++/66091
+// { dg-do compile { target c++17_only } }
+// { dg-additional-options "-fconcepts" }
+
+template<typename T>
+concept bool C1()
+{
+  return requires() { typename T::type1; };
+}
+
+template<typename T>
+concept bool C2()
+{
+  return C1<T>() && requires() { typename T::type2; };
+}
+
+template<C1 T>
+struct S {
+  S& operator++() { return *this; }
+  S& operator++() requires C2<T>() { return *this; }
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr66844.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr66844.C
new file mode 100644
index 0000000..64baab1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr66844.C
@@ -0,0 +1,16 @@
+// PR c++/66844
+// { dg-do compile { target c++2a } }
+
+template <class T, class U>
+concept Same = __is_same_as(T, U);
+
+template <class T>
+concept C = requires (T t) {	// { dg-error "invalid parameter|in requirements" }
+    requires Same<decltype(t),void>;
+  };
+
+template <typename T>
+  requires C<T>
+constexpr bool is_c() { return true; }
+
+static_assert(is_c<void>(), ""); // { dg-error "cannot call" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr66962.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr66962.C
new file mode 100644
index 0000000..ca57a09
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr66962.C
@@ -0,0 +1,80 @@
+// PR c++/66962
+// { dg-do compile { target c++2a } }
+
+template <typename> struct remove_cv;
+template <typename> struct is_reference;
+template <typename> void declval();
+template <typename> struct is_constructible;
+template <typename> struct is_nothrow_constructible;
+template <typename _Tp> using remove_cv_t = typename remove_cv<_Tp>::type;
+template <typename> struct Trans_NS_extension_apply_list;
+template <typename T> using _t = typename T::type;
+template <class> void ImplicitlyConvertibleTo();
+template <class> void Assignable();
+template <class T, class... Args> int ConstructibleObject = requires { T{}; };
+
+template <class T, class... Args>
+concept BindableReference = 
+  is_reference<T>::value && is_constructible<T>::value;
+
+template <class T, class... Args> 
+concept Constructible = 
+  ConstructibleObject<T> || BindableReference<T, Args...>;
+
+template <class T> 
+concept DefaultConstructible = 
+  Constructible<T> && requires { new T[0]; };
+
+template <class T> 
+concept MoveConstructible =
+  Constructible<T> && ImplicitlyConvertibleTo<T>;
+
+template <class T>
+concept Movable =
+  MoveConstructible<T> && Assignable<T &&>;
+
+template <class, class>
+int Swappable_ = requires { 0; };
+
+template <class T, class U> 
+int Swappable();
+
+template <class T> 
+concept Dereferencable = requires{{0};};
+
+template <Dereferencable R> 
+using RvalueReferenceType = decltype(0);
+
+template <class T> 
+int IsValueType;
+
+template <class>
+struct value_type;
+
+template <class T>
+  requires IsValueType<_t<value_type<remove_cv_t<T>>>>
+using ValueType = _t<value_type<remove_cv_t<T>>>;
+
+template <class I> 
+concept Readable =
+  Movable<I> && DefaultConstructible<I> && Dereferencable<const I> && requires{{0};};
+
+template <class Out, class T> 
+concept MoveWritable =
+  Movable<Out> && DefaultConstructible<Out> && Dereferencable<Out>;
+
+template <class In, class Out> 
+concept IndirectlyMovable =
+  Readable<In> && 
+  Movable<ValueType<In>> && 
+  Constructible<ValueType<In>> &&
+  MoveWritable<Out, RvalueReferenceType<In>> &&
+  MoveWritable<Out, ValueType<In>>;
+
+template<typename In, typename Out>
+  requires IndirectlyMovable<In, Out>
+int is_nothrow_indirectly_movable_v = is_nothrow_constructible<ValueType<In>>::value;
+
+template <Readable R1, Readable R2>
+  requires IndirectlyMovable<R1, R2> && IndirectlyMovable<R2, R1>
+void iter_swap2();
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67070.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67070.C
new file mode 100644
index 0000000..548cb40
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67070.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++2a } }
+
+template <class T>
+concept C1 =
+  requires { typename T::type; } && T::type::value;
+
+template <class T>
+concept C2 =
+  requires {
+    typename T::Type;
+    requires T::Type::value;
+  };
+
+template <class T>
+  requires (!C1<T>)
+void f1() { }
+
+template <class T>
+  requires (!C2<T>)
+void f2() { }
+
+struct S { };
+
+void test()
+{
+  f1<S>();
+  f2<S>();
+}
+
+// ------------------
+
+
+template<typename T>
+concept C = requires (T t) { t.f(); };
+
+template<typename A, typename B>
+  requires (!(C<A> && C<B>))
+void g1() { }
+
+template<typename A, typename B>
+  requires (!C<A> || !C<B>)
+void g2() { }
+
+struct X {
+  void f();
+};
+
+void test2() {
+  g1<X, X>(); // { dg-error "cannot call" }
+  g2<X, X>(); // { dg-error "cannot call" }
+}
\ No newline at end of file
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67147.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67147.C
new file mode 100644
index 0000000..db8c37e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67147.C
@@ -0,0 +1,25 @@
+// PR c++/67147
+// { dg-do compile { target c++2a } }
+
+template <class F, class I1, class I2 = I1>
+concept IndirectCallableRelation = true;
+
+template <class, class, class = void>
+constexpr bool indirect_relation() { return false; }
+
+// FIXME: The original bug was found using the introducer syntax.
+
+template<typename F, typename I1>
+  requires IndirectCallableRelation<F, I1>
+constexpr bool indirect_relation() { return true; }
+
+template<typename F, typename I1, typename I2>
+  requires IndirectCallableRelation<F, I1, I2>
+constexpr bool indirect_relation() { return true; }
+
+// This was added to the discussion thread as a minimum repro.
+
+template<typename T, int = sizeof(T)> 
+concept C1 = true;
+
+template <C1 T> int test();
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67148.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67148.C
new file mode 100644
index 0000000..c593996
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67148.C
@@ -0,0 +1,121 @@
+// PR c++/67148
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+namespace std
+{
+  template<typename T>
+  T declval();
+
+  typedef unsigned int size_t;
+  typedef int ptrdiff_t;
+  typedef decltype(nullptr) nullptr_t;
+  template<typename _Tp, _Tp... _Idx>
+    struct integer_sequence
+    {
+      typedef _Tp value_type;
+      static constexpr size_t size() { return sizeof...(_Idx); }
+    };
+
+  template <class T, T Value>
+  struct integral_constant {
+    using type = integral_constant;
+    using value_type = T;
+    constexpr operator T() const { return Value; }
+    constexpr T operator()() const { return Value; }
+    static constexpr T value {Value};
+  };
+  template <class T, T Value>
+  constexpr T integral_constant<T, Value>::value;
+  using true_type = integral_constant<bool, true>;
+  using false_type = integral_constant<bool, false>;
+
+  template <class T, class U>
+  struct is_same : false_type {};
+  template <class T>
+  struct is_same<T,T> : true_type {};
+}
+       
+namespace meta
+{
+    inline namespace v1
+    {
+        template <typename T>
+        using _t = typename T::type;
+        template <bool... Bools>
+        using and_c = std::is_same<std::integer_sequence<bool, Bools...>,
+                                   std::integer_sequence<bool, (Bools || true)...>>;
+    }
+}
+
+namespace stl2 { inline namespace v1 {
+using std::declval;
+namespace detail {
+template <class...>
+struct all_same : std::true_type {};
+template <class T, class...Rest>
+struct all_same<T, Rest...> :
+  meta::and_c<__is_same_as(T, Rest)...> {};
+}
+template <class...Ts>
+concept bool Same() {
+  return detail::all_same<Ts...>::value;
+}
+template <class F, class...Args>
+using ResultType = decltype(declval<F>()(declval<Args>()...));
+template <class>
+struct value_type {};
+template <class T>
+struct value_type<T*> {
+  using type = T;
+};
+template <class T>
+using ValueType =
+  typename value_type<T>::type;
+
+template <class F, class...Args>
+concept bool Function() {
+  return requires (F& f, Args&&...args) {
+    f((Args&&)args...);
+    requires Same<decltype(f((Args&&)args...)), ResultType<F, Args...> >();
+  };
+}
+
+template <class, class...> struct __function : std::false_type {};
+Function{F, ...Args} struct __function<F, Args...> : std::true_type {};
+
+template <class F, class I1, class I2>
+concept bool IndirectCallable() {
+  return Function<F, ValueType<I1>, ValueType<I2>>();
+}
+
+template <class F, class I1, class I2>
+concept bool IndirectCallable2() {
+  return __function<F, ValueType<I1>, ValueType<I2>>::value;
+}
+
+namespace ext { namespace models {
+template <class, class, class>
+constexpr bool indirect_callable() { return false; }
+IndirectCallable{F, I1, I2}
+constexpr bool indirect_callable() { return true; }
+
+template <class, class, class>
+constexpr bool indirect_callable2() { return false; }
+IndirectCallable2{F, I1, I2}
+constexpr bool indirect_callable2() { return true; }
+}}
+}}
+
+namespace models = stl2::ext::models;
+
+template <class T = void>
+struct plus {
+  T operator()(T, T) const;
+};
+
+static_assert((models::indirect_callable<::plus<int>, int*, int*>()));
+static_assert((models::indirect_callable2<::plus<int>, int*, int*>()));
+
+static_assert((models::indirect_callable<::plus<int>, int**, int*>())); // { dg-error "static assertion failed" }
+static_assert((models::indirect_callable2<::plus<int>, int**, int*>())); // { dg-error "static assertion failed" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67178.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67178.C
new file mode 100644
index 0000000..f76f2e3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67178.C
@@ -0,0 +1,26 @@
+// PR c++/67178
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept c = true;
+
+template<typename T>
+concept C0 = requires (auto x) { // { dg-error "placeholder type" }
+  x;
+};
+
+template<typename T>
+concept C1 = requires (C1 auto x) { // { dg-error "not been declared|placeholder|two or more|in requirements" }
+  x; // { dg-error "not declared" }
+  { x } -> c; // { dg-error "not declared|does not satisfy" }
+};
+
+template<typename T>
+  requires C1<T>
+void f(T) {}
+
+int main() {
+  f(1); // { dg-error "cannot call" }
+}
+
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67210.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67210.C
new file mode 100644
index 0000000..044e677
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67210.C
@@ -0,0 +1,10 @@
+// PR c++/67210
+// { dg-do compile { target c++2a } }
+
+template <class T, class U>
+concept C = true;
+
+template <class T>
+struct A {};
+
+void f(A<C<int> auto >) {} 
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67217.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67217.C
new file mode 100644
index 0000000..35618ae
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67217.C
@@ -0,0 +1,8 @@
+// PR c++/67217
+// { dg-do compile { target c++2a } }
+
+template <class T>
+  requires __is_same_as(T, double)
+union A {};
+
+int main() { A<int>{}; } // { dg-error "template constraint failure" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-1.C
new file mode 100644
index 0000000..1c5d73a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-1.C
@@ -0,0 +1,32 @@
+// PR c++/67225
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template <class T, class U> 
+concept bool Same() 
+{
+    return true;
+}
+
+template <class T> struct WrapT {T t;};
+
+template <class T>
+concept bool Destructible()
+{
+    return requires(T t, const T ct, WrapT<T>& wt) // { dg-message "in requirements" }
+    {
+        {wt.~WrapT()} noexcept;
+        // {&t} -> Same<T*>; // #1
+        //{&t} -> T*; // #2
+    };
+}
+
+template <Destructible T>
+void f() {}
+
+struct Y {private: ~Y();};
+
+int main()
+{
+    f<Y>(); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-2.C
new file mode 100644
index 0000000..6218176
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-2.C
@@ -0,0 +1,36 @@
+// PR c++/67225
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename Target>
+// template<typename Target, typename... Ts>
+concept bool has_resize ()
+{
+  return requires (Target tgt)
+  {
+    { tgt.resize () };
+  };
+}
+
+template<typename Target>
+void resize (Target tgt)
+{
+  if constexpr (has_resize<Target> ())
+  {
+    tgt.resize ();
+  }
+}
+
+class MyClass
+{
+  private:
+    int foo (int i)
+    {
+      return i * 2;
+    }
+};
+
+int main ()
+{
+  return MyClass {}.foo (7); // { dg-error "private within this context" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-3.C
new file mode 100644
index 0000000..d08efb6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-3.C
@@ -0,0 +1,21 @@
+// PR c++/67225
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template <class>
+concept bool Dummy = true;
+
+template <typename>
+class example {
+    template <Dummy U>
+    friend auto func();
+};
+
+class test {
+    test() = default;
+};
+
+int main()
+{
+    test t; // { dg-error "private within this context" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-4.C
new file mode 100644
index 0000000..0ef5ed8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-4.C
@@ -0,0 +1,14 @@
+// PR c++/67225
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template <class, class>
+concept bool C1 = true;
+
+template <class>
+concept bool C2 = requires { { 42 } -> C1<int>; };
+
+int main() {
+    class A { int x; } a;
+    a.x = 42; // { dg-error "private within this context" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-5.C
new file mode 100644
index 0000000..9a25831f4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67225-5.C
@@ -0,0 +1,17 @@
+// PR c++/67225
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename A, typename T>
+concept bool SomeConcept = true;
+
+template <typename T>
+void breaker(SomeConcept<int>);
+
+class SomeClass {
+    int privateMember;
+};
+
+int main() {
+    return SomeClass().privateMember; // { dg-error "private within this context" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67319.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67319.C
new file mode 100644
index 0000000..6eb1c44
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67319.C
@@ -0,0 +1,24 @@
+// PR c++/67319
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template <typename T>
+concept bool Any()
+{
+  return requires (T t) { +t; };
+}
+
+struct my_struct
+{
+  template <Any... Args>
+  auto sample(Args... args) -> void;
+};
+
+int main()
+{
+  my_struct{}.sample();
+  my_struct{}.sample(0);
+  my_struct{}.sample(0, 'a');
+  my_struct{}.sample(nullptr); // { dg-error "" }
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67427.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67427.C
new file mode 100644
index 0000000..fcad301
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67427.C
@@ -0,0 +1,22 @@
+// PR c++/67427
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template <class S, class I>
+concept bool Sentinel =
+  requires (I i) { i; };
+
+template <class I, class S>
+concept bool SizedIteratorRange =
+  Sentinel<S, I> && true;
+
+Sentinel{S, I}
+void distance(I first, S last) {}
+
+template <class I, class S>
+  requires SizedIteratorRange<I, S>
+void distance(I first, S last) {}
+
+int main() {
+  distance(42, 43); // { dg-error "ambiguous" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67654.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67654.C
new file mode 100644
index 0000000..27ee205
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67654.C
@@ -0,0 +1,30 @@
+// PR c++/67427
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template <bool... Values> struct and_c_impl {
+  static constexpr bool value = true;
+};
+
+template <bool ValueFirst, bool... ValuesRest>
+struct and_c_impl<ValueFirst, ValuesRest...> {
+  static constexpr bool value = ValueFirst && and_c_impl<ValuesRest...>::value;
+};
+
+template <bool... Values> constexpr bool and_c() {
+  return and_c_impl<Values...>::value;
+}
+
+template<class T> concept bool C() {
+  return true;
+}
+
+template<class... Tx>
+struct A {
+  A() requires and_c<C<Tx>()...>() = default;
+};
+
+int main() {
+  A<int, double> a;
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67658.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67658.C
new file mode 100644
index 0000000..087f4fc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67658.C
@@ -0,0 +1,14 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class T> concept bool C1() { return false; }
+template<C1 T> concept bool C2() { return true; } // { dg-error "cannot be constrained" }
+
+void f(C2 x) {
+}
+
+struct A {} a;
+
+int main() {
+  f(a);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67684.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67684.C
new file mode 100644
index 0000000..35e9295
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67684.C
@@ -0,0 +1,63 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class T>
+class A {
+ public:
+  template<int I, class S>
+    requires I > 0
+  friend int f1(const A<S>&);
+
+  template<int I, class S>
+  friend int f2(const A<S>&) requires I > 0;
+
+ private:
+  int x = 2;
+};
+
+template<int I, class S>
+  requires I > 0
+int f1(const A<S>& a)  { 
+  return a.x;
+} 
+
+template<int I, class S>
+int f2(const A<S>& a) requires I > 0 { 
+  return a.x;
+} 
+
+class B {
+ public:
+  template<int I>
+    requires I > 0
+  friend int f3(const B&);
+
+  template<int I>
+  friend int f4(const B&) requires I > 0;
+
+ private:
+  int x = 2;
+};
+
+template<int I>
+  requires I > 0
+int f3(const B& a) {
+  return a.x;
+}
+
+template<int I>
+int f4(const B& a) requires I > 0 {
+  return a.x;
+}
+
+int main() { 
+  A<double> a;
+  f1<2>(a);
+  f2<2>(a);
+
+  B b;
+  f3<2>(b);
+  f4<2>(b);
+
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67685.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67685.C
new file mode 100644
index 0000000..82f068e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67685.C
@@ -0,0 +1,7 @@
+// PR c++/67685
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+void f(auto i) {requires {i;};}
+
+int main() {f(0);}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67692.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67692.C
new file mode 100644
index 0000000..139ecd6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67692.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target c++2a } }
+
+template<class T>
+bool f(T x) {
+  return requires(T x) {
+    ++x;
+  };
+}
+
+int main() {
+  f(3);
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67697.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67697.C
new file mode 100644
index 0000000..44c077b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67697.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class X>
+concept bool C() {
+  return requires(X x, bool b) {
+    requires b; // { dg-error "not a constant expression" }
+    x++;
+  };
+}
+
+int main() {
+  C<int>();
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67719.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67719.C
new file mode 100644
index 0000000..d28b445
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67719.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class X> concept bool C() {
+  return __is_same_as(X, int) || __is_same_as(X, long);
+}
+
+template<C... Tx>
+struct Ax {};
+
+int main() {
+  Ax<int, long> a;
+  Ax<int, long, void> b; // { dg-error "template constraint failure" }
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67774.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67774.C
new file mode 100644
index 0000000..d363c59
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67774.C
@@ -0,0 +1,26 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+#include <type_traits>
+#include <utility>
+#include <iostream>
+
+template <class X> concept bool cpt_RealScalar() {
+  return std::is_floating_point<X>::value;
+}
+
+namespace detail {
+template <class, class> constexpr bool k_evaluator_impl = false;
+
+template <std::size_t... Indexes, class E>
+constexpr bool k_evaluator_impl<std::index_sequence<Indexes...>, E> = true;
+}
+
+template <class X, std::size_t K> concept bool cpt_KEvaluator =
+  detail::k_evaluator_impl<std::make_index_sequence<K>, X>;
+
+int main() {
+  auto f = [](int, int, int) -> double { return 3; };
+  std::cout << cpt_KEvaluator<decltype(f)> << '\n'; // { dg-error "wrong number of template arguments" }
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67825.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67825.C
new file mode 100644
index 0000000..95698e9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67825.C
@@ -0,0 +1,20 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+struct A {
+  template <class T>
+  double operator()(T x) const {
+    return 0;
+  }
+};
+
+template <class X> concept bool C() {
+  return requires {
+    &X::operator();
+  };
+}
+
+int main() {
+  static_assert(C<A>());
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67860.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67860.C
new file mode 100644
index 0000000..8bad031
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67860.C
@@ -0,0 +1,61 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+#include <type_traits>
+
+inline constexpr bool and_impl() { return true; }
+
+template <class OperandFirst, class... OperandsRest>
+constexpr bool and_impl(OperandFirst operand_first,
+                        OperandsRest... operands_rest) {
+  return operand_first && and_impl(operands_rest...);
+}
+
+template <class... Operands> constexpr bool and_(Operands... operands) {
+  return and_impl(operands...);
+}
+
+template <class X> concept bool C() { return true; }
+
+// v1
+template<int, class... Xs>
+  requires and_(C<Xs>()...)
+constexpr int f(const Xs&... xs) {
+  return 0;
+}
+
+// v2
+template<int, class... Xs>
+constexpr int f(const Xs&... xs) {
+  return 1;
+}
+
+int main() {
+  static_assert(f<10>(3.0, 2.0f) == 0);
+  return 0;
+}
+
+// 2nd example
+
+template <typename T, typename... Us>
+concept bool AreType() {
+  return (std::is_same<T,Us>::value && ...);
+  // return true; gives the same overloaded error
+}
+
+// Function with constraint
+template<typename T, AreType<T>... Us>
+constexpr bool isValid(Us... us) {
+  return true;
+}
+
+// Function with no constraint
+template<typename T, typename... U>
+constexpr bool isValid(U... u) {
+  return false;
+}
+
+int main2() {
+  static_assert(isValid<int>(1)); // also isValid<int>(1, 2, 3); etc
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67862.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67862.C
new file mode 100644
index 0000000..222e528
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67862.C
@@ -0,0 +1,162 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+typedef int size_t;
+template <typename _Tp> struct A { static constexpr _Tp value = 1; };
+template <typename _Tp> _Tp declval();
+template <typename _From, typename _To> struct __is_convertible_helper {
+  template <typename, typename> static A<bool> __test(int);
+  typedef decltype(__test<_From, _To>(0)) type;
+};
+template <typename, typename>
+struct is_convertible : __is_convertible_helper<int, int>::type {};
+template <typename> struct remove_reference;
+template <typename _Tp> struct remove_reference<_Tp &> { typedef _Tp type; };
+struct base;
+struct general;
+template <typename _Tp, _Tp...> struct B;
+template <typename _Tp, _Tp> using make_integer_sequence = B<int>;
+template <size_t... _Idx> using index_sequence = B<size_t, _Idx...>;
+template <size_t _Num>
+using make_index_sequence = make_integer_sequence<size_t, _Num>;
+template <bool...> struct and_c_impl { static constexpr bool value = true; };
+template <bool...> constexpr bool and_c() { return and_c_impl<>::value; }
+
+template <class X, class Y> concept bool cpt_Convertible() {
+  return is_convertible<X, Y>::value;
+}
+
+template <class T> using uncvref_t = typename remove_reference<T>::type;
+struct Plus;
+using index_t = int;
+template <class> bool cpt_Index;
+template <class... Extents>
+requires and_c<cpt_Index<Extents>()...>() class Dimensionality;
+namespace detail_concept {
+template <class> bool match_dimensionality;
+template <class... Extents>
+constexpr bool match_dimensionality<Dimensionality<Extents...>> = true;
+}
+template <class X> concept bool cpt_Dimensionality() {
+  return detail_concept::match_dimensionality<X>;
+}
+
+template <class X> concept bool cpt_Shaped() { return requires(X x){{x};}; }
+
+template <class X> concept bool cpt_Dimensioned() { return cpt_Shaped<X>(); }
+
+template <class... Extents>
+requires and_c<cpt_Index<Extents>()...>() class Dimensionality {
+public:
+  static constexpr size_t num_dimensions = sizeof...(Extents);
+};
+template <index_t...> using DimensionalityC = Dimensionality<>;
+template <class> struct dimensionality_type_impl;
+template <cpt_Dimensioned X> struct dimensionality_type_impl<X> {
+  using type = uncvref_t<decltype(declval<X>().dimensionality())>;
+};
+template <cpt_Dimensioned X>
+using dimensionality_type = typename dimensionality_type_impl<X>::type;
+template <class Functor, class... Expressibles>
+requires requires(Functor functor, Expressibles... expressibles) {
+  map_expressions_impl(functor, expressibles...);
+}
+
+decltype(auto) map_impl(Functor, Expressibles...);
+void cpt_ContinualScalar();
+template <class> concept bool cpt_Scalar() { return cpt_ContinualScalar; }
+
+template <class X> concept bool cpt_FlatEvaluator() {
+  return requires(X x){{x}->cpt_Scalar;};
+}
+
+template <class, class> bool k_evaluator_impl;
+template <size_t... Indexes, class Evaluator>
+constexpr bool k_evaluator_impl<index_sequence<Indexes...>, Evaluator> = true;
+template <class X, size_t K> concept bool cpt_KEvaluator() {
+  return k_evaluator_impl<make_index_sequence<K>, X>;
+}
+
+template <class X, size_t K> concept bool cpt_KCompatibleEvaluator() {
+  return cpt_KEvaluator<X, K>();
+}
+
+template <class X> concept bool cpt_Structure() {
+  return cpt_Convertible<X, base>();
+}
+
+template <cpt_Dimensionality Dimensionality, cpt_Structure,
+          cpt_KCompatibleEvaluator<Dimensionality::num_dimensions> Evaluator>
+class NumericArrayExpression;
+namespace detail_concept {
+
+template <class> bool match_numeric_array_expression;
+
+template <cpt_Dimensionality Dimensionality,
+          cpt_Structure Structure,
+          cpt_KCompatibleEvaluator<Dimensionality::num_dimensions> Evaluator>
+constexpr bool match_numeric_array_expression<
+    NumericArrayExpression<Dimensionality, Structure, Evaluator>> = true;
+
+}
+template <class X> concept bool cpt_NumericArrayExpression() {
+  return detail_concept::match_numeric_array_expression<X>;
+}
+
+namespace expression_traits {
+namespace detail_expression_traits {
+template <class...> struct first_numeric_array_expression_impl;
+template <cpt_NumericArrayExpression ExpressionFirst, class... ExpressionsRest>
+struct first_numeric_array_expression_impl<ExpressionFirst,
+                                           ExpressionsRest...> {
+  using type = ExpressionFirst;
+};
+}
+template <class... Expressions>
+using first_numeric_array_expression =
+    typename detail_expression_traits::first_numeric_array_expression_impl<
+        Expressions...>::type;
+template <class... Expressions>
+using first_expression_dimensionality =
+    dimensionality_type<first_numeric_array_expression<Expressions...>>;
+}
+template <cpt_Dimensionality Dimensionality, cpt_Structure,
+          cpt_KCompatibleEvaluator<Dimensionality::num_dimensions> Evaluator>
+class NumericArrayExpression {
+public:
+  NumericArrayExpression(Dimensionality, Evaluator) {}
+  Dimensionality &dimensionality();
+};
+
+template <cpt_Structure Structure, cpt_Dimensionality Dimensionality,
+          cpt_KCompatibleEvaluator<Dimensionality::num_dimensions> Evaluator>
+auto make_numeric_array_expression(Dimensionality dimensionality,
+                                   Evaluator evaluator) {
+  return NumericArrayExpression<Dimensionality, Structure, Evaluator>(
+      dimensionality, evaluator);
+}
+
+template <size_t, class Functor, class... Evaluators>
+auto make_map_evaluator_impl(Functor) requires
+    and_(cpt_FlatEvaluator<Evaluators>()...);
+template <class Functor, class... Expressions>
+requires
+requires(Expressions... expressions,
+         expression_traits::first_expression_dimensionality<Expressions...>
+             dimensionality) {
+  make_map_evaluator_impl<decltype(dimensionality)::num_dimensions>(
+      expressions...);
+}
+
+decltype(auto) map_expressions_impl(Functor, Expressions...);
+template <class Functor, class... Expressibles> concept bool cpt_Mappable() {
+  return requires(Functor functor, Expressibles... expressibles) {
+    map_impl(functor, expressibles...);
+  };
+}
+
+void ____C_A_T_C_H____T_E_S_T____8() {
+  auto e1 = make_numeric_array_expression<general>(DimensionalityC<>(), [] {});
+  using E1 = decltype(e1);
+  cpt_Mappable<Plus, E1>();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr67969.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67969.C
new file mode 100644
index 0000000..4f2ab51
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr67969.C
@@ -0,0 +1,32 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+template <class, class>
+class NumericArray {};
+
+template <class>
+constexpr bool match_numeric_array = false;
+template <class Scalar, class Shape>
+constexpr bool
+    match_numeric_array<NumericArray<Scalar, Shape>> =
+        true;
+template <class T>
+concept bool cpt_NumericArrayContainer() {
+  return match_numeric_array<T>;
+}
+
+template <class X>
+concept bool cpt_NumericArray() {
+  return requires{requires cpt_NumericArrayContainer<X>();};
+}
+
+
+template <class X>
+requires !cpt_NumericArray<X>() auto func(int, X) {}
+
+template <class X>
+requires cpt_NumericArray<X>() auto func(int, X) {}
+
+int main() {
+  NumericArray<double, int> v5;
+  func(0, v5);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-1.C
new file mode 100644
index 0000000..bc4ddee
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-1.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target c++2a } }
+template <typename t>
+struct S
+{
+  template <typename t2>
+    requires false
+  friend void foobar(S, t2) {}
+};
+
+int main()
+{
+  foobar(S<double>{}, int{}); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-2.C
new file mode 100644
index 0000000..91e3c80
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68093-2.C
@@ -0,0 +1,14 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+template <class T>
+concept bool True = true;
+
+template <class T>
+struct S {
+  friend bool operator==(S, int) requires True<T> { return true; }
+  friend bool operator==(S, int) requires !True<T> { return true; }
+};
+
+int main() {
+  S<int> s;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr68372.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68372.C
new file mode 100644
index 0000000..d1416eb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68372.C
@@ -0,0 +1,48 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename F>
+concept bool FCallable()
+{
+  return requires(F)
+  {
+      F::f();
+  };
+}
+
+class Test1
+{
+public:
+  template<FCallable P, FCallable... Pp>
+  static void g()
+  {
+    (Pp::f(), ...);
+  }
+};
+
+class A
+{
+public:
+  static void f() {}
+};
+
+template<typename X> concept bool C = true;
+
+template<C... X>
+void bar(X...)
+{}
+
+struct foo
+{
+  template<C... X>
+  void bar(X...)
+  {}
+};
+
+int main()
+{
+  Test1::template g<A>();
+  bar();
+  foo {}.bar();
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr68434.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68434.C
new file mode 100644
index 0000000..23ecf4d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68434.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template <class>
+concept C1 = true;
+
+template <class>
+concept C2 = true;
+
+template <class Expr>
+concept C3 =
+  requires (Expr expr) {
+      {expr}->C1;
+      {expr}->C2;
+  };
+
+template<C3 T>
+auto f (T);
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr68683.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68683.C
new file mode 100644
index 0000000..f11d69f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68683.C
@@ -0,0 +1,25 @@
+// PR c++/68683
+// { dg-do compile { target c++2a } }
+
+template <typename, typename>
+struct is_same {
+  static constexpr bool value = true;
+};
+
+template <typename T, typename U>
+concept Same = is_same<T, U>::value;
+
+template <typename T>
+concept Integral = requires {
+  { T () } -> Same<typename T::value_type>;
+};
+
+struct A {
+  using value_type = bool;
+};
+
+int main () {
+  Integral<A>;
+  Integral<A>;
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr68812.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68812.C
new file mode 100644
index 0000000..2d809e8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr68812.C
@@ -0,0 +1,34 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+namespace zero
+{
+  template<int... s>
+  struct S
+  {
+    template<int... f>
+      requires(... and (s == f))
+    static void F()
+    {
+    }
+  };
+
+  void foo(S<>) {}
+}
+
+namespace one
+{
+  template<typename X, typename Y> concept bool Foo = true;
+
+  template<typename... T>
+  struct foo
+  {
+    template<typename... U>
+    foo(U...)
+      requires (Foo<T, U> && ...)
+    {}
+  };
+
+  void bar(foo<int, long, double>) {}
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr69235.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr69235.C
new file mode 100644
index 0000000..5e96d0e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr69235.C
@@ -0,0 +1,48 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename T>
+concept bool Boolean()
+{
+  return requires(T t)
+  {
+    { t } -> bool;
+  };
+}
+
+template<typename T>
+concept bool C()
+{
+  return requires (T t)
+  {
+    { t } -> Boolean;
+  };
+}
+
+template<typename T>
+struct X;
+
+template<typename T>
+  requires ! C<typename T::type>()
+struct X<T>
+{
+  using type = int;
+};
+
+template<typename T>
+  requires C<typename T::type>()
+struct X<T>
+{
+  using type = int;
+};
+
+struct S
+{
+  using type = char;
+};
+
+void f()
+{
+  X<S>::type x;
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr71368.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr71368.C
new file mode 100644
index 0000000..c67e632
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr71368.C
@@ -0,0 +1,28 @@
+// PR c++/71368
+// { dg-do compile { target c++2a } }
+
+template <class T, class U> concept Same = __is_same_as(T,U);
+
+struct inner;
+
+template<typename X> concept CompoundReq = requires {
+    // fine with concrete type in trailing type, i.e. inner& instead of X&
+    { X::inner_member() } -> Same<X&>;
+};
+
+template<typename X> concept Concept = requires {
+    { X::outer_member() } -> CompoundReq;
+};
+
+struct inner { static inner& inner_member(); };
+struct outer { static inner outer_member(); };
+
+int main()
+{
+    // fine
+    static_assert( CompoundReq<inner> );
+    static_assert( CompoundReq<decltype( outer::outer_member() )> );
+
+    // ICE
+    static_assert( Concept<outer> );
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr71385.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr71385.C
new file mode 100644
index 0000000..f31997c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr71385.C
@@ -0,0 +1,14 @@
+// { dg-do compile { target c++2a } }
+
+template<class From, class To>
+concept convertible_to = requires(From (&f)(), void (&g)(To)) { g(f()); };
+
+template<class T>
+concept Addable =
+ requires(T x){
+  {x + x} -> convertible_to<T>;
+ };
+
+int main(){
+ Addable auto t = 0;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr71965.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr71965.C
new file mode 100644
index 0000000..4619cf9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr71965.C
@@ -0,0 +1,24 @@
+// { dg-do compile { target c++2a } }
+
+template <class T>
+concept Destructible = false;
+
+template <class T, class...Args>
+concept ConstructibleObject =
+    // Concept evaluation should short-circuit even the template
+    // substitution, so we shouldn't even substitute into the requires
+    // constraint and the unimplemented multi-dimensional new T{...}
+    // initialization.  ATM we do, but as long as we don't output the
+    // sorry() message we used to for such constructs when asked not
+    // to issue errors, this shouldn't be a problem for this and
+    // similar cases.
+    Destructible<T> && requires (Args&&...args) {
+        new T{ (Args&&)args... };
+    };
+
+int main() {
+    using T = int[2][2];
+    // GCC has not implemented initialization of multi-dimensional
+    // arrays with new{} expressions.
+    static_assert(!ConstructibleObject<T, T>);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr72415.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr72415.C
new file mode 100644
index 0000000..04bdc51
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr72415.C
@@ -0,0 +1,22 @@
+// PR c++/72415
+// { dg-do compile { target c++17 } }
+// { dg-options "-fconcepts" }
+
+template<int... Xs>
+struct indices {};
+
+template<typename Dummy>
+struct foo_type {
+    template<int... Indices>
+    static void impl(indices<Indices...>)
+        requires (... && (Indices, true));
+
+    static auto caller()
+    { return impl(indices<0, 1, 2> {}); }
+};
+
+int main()
+{
+    // internal compiler error: in satisfy_predicate_constraint, at cp/constraint.cc:2013
+    foo_type<void>::caller();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr78752.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr78752.C
new file mode 100644
index 0000000..40eeaa7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr78752.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+#include <type_traits>
+
+template <class T, class U>
+concept bool Same = std::is_same<T, U>::value;
+
+struct test {
+  template <Same<int>... Ints>
+  void func(Ints... ints) {}
+};
+
+int main()
+{
+  test t;
+  t.func(1, 2, 3);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr79759.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr79759.C
new file mode 100644
index 0000000..a99103c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr79759.C
@@ -0,0 +1,7 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename T, T N>
+concept bool C0() { return true; }
+
+void f(C0<0>);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr80471.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr80471.C
new file mode 100644
index 0000000..d5fa5a5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr80471.C
@@ -0,0 +1,23 @@
+// PR c++/80471
+// { dg-do compile { target c++14 } }
+// { dg-additional-options "-fconcepts" }
+
+template <class, class>
+constexpr bool is_same = false;
+template <class T>
+constexpr bool is_same<T, T> = true;
+
+template<class T>
+decltype(auto) f(T&& a){return a;}
+
+decltype(auto) g(auto&& a){return a;}
+
+auto z = [](auto&& a) -> decltype(auto) { return a; };
+
+int main()
+{
+  int i;
+  static_assert(is_same< decltype(f(i)), int& >, "");
+  static_assert(is_same< decltype(g(i)), int  >, "");
+  static_assert(is_same< decltype(z(i)), int& >, "");
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr80746.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr80746.C
new file mode 100644
index 0000000..69e2fbe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr80746.C
@@ -0,0 +1,14 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename T, typename T::type>
+concept bool C = true;
+
+template<C<0> T> class ct {};
+
+struct S
+{
+  using type = int;
+};
+
+template class ct<S>;
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr80773.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr80773.C
new file mode 100644
index 0000000..34b96c5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr80773.C
@@ -0,0 +1,33 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename F>
+concept bool FCallable()
+{
+  return requires(F)
+  {
+    F::f();
+  };
+}
+
+class Test1
+{
+public:
+  template<FCallable P, FCallable... Pp>
+  static void g()
+  {
+    (Pp::f(), ...);
+  }
+};
+
+class A
+{
+public:
+  static void f() {}
+};
+
+int main()
+{
+  Test1::template g<A>();
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr82507.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr82507.C
new file mode 100644
index 0000000..f743855
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr82507.C
@@ -0,0 +1,17 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class I>
+concept bool True = true;
+
+template<class T>
+concept bool HasType = requires { typename T::type; };
+
+template<class T>
+struct S
+{
+  void foo() requires HasType<T> && True<typename T::type>;
+};
+
+S<int> s;
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr82740.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr82740.C
new file mode 100644
index 0000000..6e0f062
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr82740.C
@@ -0,0 +1,32 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class T>
+concept bool C = requires(const T& t) { t.foo(); };
+
+template<class T>
+struct Base
+{
+  constexpr T const& derived() const
+  {
+    return static_cast<T const&>(*this);
+  }
+  constexpr bool bar() const
+    requires requires(const T& t) { t.foo(); }
+  {
+    derived().foo();
+    return true;
+  }
+};
+
+template<class T>
+struct Derived : Base<Derived<T>>
+{
+  constexpr void foo() const {}
+};
+
+int main()
+{
+  static_assert(Derived<int>{}.bar());
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr84140.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84140.C
new file mode 100644
index 0000000..d901ab2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84140.C
@@ -0,0 +1,38 @@
+// { dg-do run { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<class, class> constexpr bool is_same_v = false;
+template<class T> constexpr bool is_same_v<T, T> = true;
+
+template<class T, class U>
+concept bool Same = is_same_v<T, U>;
+
+template<class T, class U>
+concept bool Diff = requires(T& t, U& u) { u - t; };
+
+template<class I, class S>
+int distance(I, S) { return 0; }
+
+template<class I, Diff<I> S>
+int distance(I first, S last)
+{
+  return last - first;
+}
+
+template<class T>
+struct I
+{
+  template<class U>
+    requires Same<T, U>
+  friend int operator-(I const&, I<U> const&)
+  {
+    static_assert(Same<T, U>);
+    return 42;
+  }
+};
+
+int main()
+{
+  return distance(I<int>{}, I<void>{});
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr84551.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84551.C
new file mode 100644
index 0000000..e40796f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84551.C
@@ -0,0 +1,11 @@
+// PR c++/84551
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-g -O" }
+
+template<typename> concept C = true;
+
+template<template<typename T> requires C<T> class TT> struct A {};
+
+template<typename U> requires true struct B {};
+
+A<B> a;				// { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-2.C
new file mode 100644
index 0000000..ce69a0f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-2.C
@@ -0,0 +1,41 @@
+// { dg-do compile { target c++11 } }
+// { dg-options "-fconcepts" }
+
+template <typename T>
+void foo1(T& t) {
+  typename T::template C<void> tcv = t;
+  typename T::template C<auto> u = tcv;
+  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
+  (typename T::template D<auto> (t)); // { dg-error "invalid" }
+}
+
+struct T1 {
+  template <typename T> struct C {
+    C(T1&);
+    static void f(T1&, C&);
+  };
+  template <typename T> struct D {
+    D(T1&);
+  };
+};
+
+template <typename T>
+void foo2(T& t) {
+  typename T::template C<void> tcv = t;
+  typename T::template C<auto> u = tcv;
+  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
+  T::template D<auto> (t); // { dg-error "invalid" }
+}
+
+struct T2 {
+  template <typename T> struct C {
+    C(T2&);
+    static void f(T2&, C&);
+  };
+  template <typename T> static void D(T2&);
+};
+
+void f(T1& t1, T2& t2) {
+  foo1 (t1);
+  foo2 (t2);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-3.C
new file mode 100644
index 0000000..3809c2d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979-3.C
@@ -0,0 +1,45 @@
+// { dg-do compile { target c++11 } }
+// { dg-options "-fconcepts" }
+
+// This is like pr84979-2.C, except that we swap the types passed to
+// the template functions foo1 and foo2, so that the expectations WRT
+// D's typeness are not met.
+
+template <typename T>
+void foo1(T& t) {
+  typename T::template C<void> tcv = t;
+  typename T::template C<auto> u = tcv;
+  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
+  (typename T::template D<auto> (t)); // { dg-error "invalid" }
+}
+
+struct T1 {
+  template <typename T> struct C {
+    C(T1&);
+    static void f(T1&, C&);
+  };
+  template <typename T> struct D {
+    D(T1&);
+  };
+};
+
+template <typename T>
+void foo2(T& t) {
+  typename T::template C<void> tcv = t;
+  typename T::template C<auto> u = tcv;
+  T::template C<auto>::f (tcv, u); // { dg-error "incomplete" }
+  T::template D<auto> (t); // { dg-error "yields a type" }
+}
+
+struct T2 {
+  template <typename T> struct C {
+    C(T2&);
+    static void f(T2&, C&);
+  };
+  template <typename T> static void D(T2&);
+};
+
+void f(T1& t1, T2& t2) {
+  foo1 (t2);
+  foo2 (t1);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979.C
new file mode 100644
index 0000000..9bd40df
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84979.C
@@ -0,0 +1,9 @@
+// { dg-do compile { target c++11 } }
+// { dg-options "-fconcepts" }
+
+template<typename> void foo() {}
+
+void bar()
+{
+  foo<auto>(); // { dg-error "invalid" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr84980.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84980.C
new file mode 100644
index 0000000..1703de0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr84980.C
@@ -0,0 +1,4 @@
+// { dg-do compile { target c++17_only } }
+// { dg-additional-options "-fconcepts" }
+
+template<T> concept bool C = true;  // { dg-error "has not been declared" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr85265.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr85265.C
new file mode 100644
index 0000000..96aac69
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr85265.C
@@ -0,0 +1,7 @@
+// PR c++/85265
+// { dg-do compile { target c++17_only } }
+// { dg-additional-options "-fconcepts" }
+
+template<typename> concept bool C = true;
+
+C{} void foo();  // { dg-error "expected identifier" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr85706.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr85706.C
new file mode 100644
index 0000000..e0718d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr85706.C
@@ -0,0 +1,10 @@
+// PR c++/85706
+// { dg-do compile { target c++17 } }
+// { dg-additional-options "-fconcepts" }
+
+template<class T> struct S {
+  S(T);
+};
+
+template<class = void>
+auto f() -> decltype(S(42)); // error
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr85808.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr85808.C
new file mode 100644
index 0000000..bcba830
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr85808.C
@@ -0,0 +1,19 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+namespace X
+{
+  template<class> constexpr bool x = true;
+}
+
+template<int> using helper = void;
+
+template<typename T>
+concept bool C =
+  requires
+  {
+    requires X::x<T>;
+    typename helper<T{}>;
+  };
+
+static_assert(C<int>);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr86269.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr86269.C
new file mode 100644
index 0000000..4428ee1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr86269.C
@@ -0,0 +1,19 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+#include <type_traits>
+
+template<typename t2, typename t = std::remove_reference_t<t2>>
+concept bool IntegralOrIntegralRef = std::is_integral_v<t>;
+
+template<IntegralOrIntegralRef t>
+auto foo(t && v)
+{
+  return v;
+}
+
+int main()
+{
+  int i = 7;
+  foo(8);
+  return foo(i);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr87441.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr87441.C
new file mode 100644
index 0000000..bcd4ba5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr87441.C
@@ -0,0 +1,10 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename X, typename Y = X>
+concept bool HasBinaryAdd = requires(X x, Y y)
+{
+  {x + y} -> decltype(x + y);
+};
+
+void proc(HasBinaryAdd x, HasBinaryAdd y);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires1.C
new file mode 100644
index 0000000..f1603af
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires1.C
@@ -0,0 +1,71 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Class = __is_class(T);
+
+// Allow a requires-expression with no parms.
+template<typename T>
+concept C = requires { typename T::type; };
+
+void f1(int a) requires true;         // OK
+auto f2(int a) -> bool requires true; // OK
+auto f3(int a) requires true -> bool; // { dg-error "" } requires-clause precedes trailing-return-type
+typedef void fn_t() requires true;    // { dg-error "typedef" }
+void (*pf)() requires true;           // { dg-error "non-function" }
+void (*fn(int))() requires false;     // { dg-error "return type" }
+void g(int (*)() requires true);      // { dg-error "parameter|non-function" }
+auto* p = new (void(*)(char) requires true); // { dg-error "type-id" }
+void f4(auto a) requires Class<decltype(a)> { }
+void f5(auto a) requires requires (decltype(a) x) { -x; } { } // { dg-message "in requirements" }
+
+struct Test {
+  void f(auto a) requires Class<decltype(a)>;
+} test;
+
+void driver_1() {
+  struct S { } s;
+  f4(s);
+  f5(0);
+  f5((void*)0); // { dg-error "cannot call" }
+  test.f(s);
+}
+
+void Test::f(auto a) requires Class<decltype(a)> { }
+
+template<bool B> requires B struct S0; // OK
+
+template<int N> requires N struct S1 { }; // { dg-error "does not have type" }
+S1<1> x0; // { dg-error "template constraint failure|does not have type" }
+
+template<int N> requires N == 0 struct S2 { }; // { dg-error "does not have type|must be enclosed" }
+
+template<int N> requires (N == 0) struct S3 { }; // OK
+
+template<typename T, T X> requires X struct S4 { }; // OK
+S4<int, 0> x1;      // { dg-error "template constraint failure|does not have type" }
+S4<bool, true> x2; // OK
+S4<bool, false> x3; // { dg-error "template constraint failure" }
+
+
+// req11.C
+template<typename T>
+concept Streamable = requires (T t) { t; };
+
+template<typename T>
+concept Range = requires (T t) { t; };
+
+// FIXME: There are two syntax errors here when there should be
+// just one.Note that !Range<T> is not a primary-expression and needs to
+// be wrapped in parens to be syntactically valid.
+template<class T>
+  requires Streamable<T> && !Range<T> // { dg-error "must be enclosed" }
+void print1(const T& x) { }
+
+template<class T>
+  requires Streamable<T> && (!Range<T>)
+void print2(const T& x) { }
+
+void driver_3()
+{
+  print2("hello"); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires10.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires10.C
new file mode 100644
index 0000000..bb0e3b0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires10.C
@@ -0,0 +1,32 @@
+// PR c++/66988
+// { dg-do compile { target c++2a } }
+
+template<bool B>
+struct bool_constant {
+  static constexpr bool value = B;
+  constexpr operator bool() const { return value; }
+};
+
+using true_type = bool_constant<true>;
+using false_type = bool_constant<false>;
+
+template <template <class> class T, class U>
+concept _Valid = requires { typename T<U>; };
+
+template <class T>
+using nested_type = typename T::type;
+
+template <class T>
+struct has_nested_type : false_type { };
+
+template <class T>
+  requires _Valid<nested_type, T>
+struct has_nested_type<T> : true_type { };
+
+struct Nested
+{
+  using type = int;
+};
+
+static_assert(!has_nested_type<int>());
+static_assert(has_nested_type<Nested>());
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires11.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires11.C
new file mode 100644
index 0000000..be6409e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires11.C
@@ -0,0 +1,21 @@
+// PR c++/67018
+// { dg-do compile { target c++2a } }
+
+template <typename T>
+constexpr bool Val = true;
+
+template <class I>
+concept InputIterator = requires (I i) {
+  requires Val<decltype(i++)>;
+};
+
+template <class I>
+concept ForwardIterator = InputIterator<I> && true;
+
+template<InputIterator>
+constexpr bool f() { return false; }
+
+template<ForwardIterator>
+constexpr bool f() { return true; }
+
+static_assert(f<int*>());
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires12.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires12.C
new file mode 100644
index 0000000..c8e3cfd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires12.C
@@ -0,0 +1,21 @@
+// { dg-do compile { target c++2a } }
+
+template <class> struct all_same {
+  static constexpr bool value = true;
+};
+
+template <class T> 
+concept Assignable = requires(T t)
+{
+  requires all_same<decltype(t = 0)>::value;
+};
+
+template <class I> 
+  requires (!Assignable<I>)
+int dispatch();
+
+template <class I>
+  requires Assignable<I>
+void dispatch();
+
+int main() { dispatch<int *>(); }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires13.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires13.C
new file mode 100644
index 0000000..8ba3862
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires13.C
@@ -0,0 +1,20 @@
+// { dg-do compile { target c++2a } }
+
+template <class T> concept C = true;
+
+template <class T>
+  requires C<typename T::foo>
+void f(T t) { }
+
+void f(...);
+
+template <class T>
+  requires C<T>
+void g(T t) { }
+
+int main()
+{
+  f(42);
+  g(42);
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires14.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires14.C
new file mode 100644
index 0000000..e2893c0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires14.C
@@ -0,0 +1,24 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept A = sizeof(T) >= 4;
+
+template<typename T>
+concept B = __is_class(T);
+
+template<A T>
+void ok1(T a) {
+  return;
+}
+
+template<typename T>
+  requires B<T>
+void ok2(T a) {
+  return;
+}
+
+template<A T>
+  requires B<T>
+void fun(T a) {
+  return;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires15.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires15.C
new file mode 100644
index 0000000..81d9196
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires15.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target c++2a } }
+
+struct string;
+
+template<typename T>
+concept C = string; // { dg-error "expected primary-expression" }
+
+template<C T>
+void fun(T s) { }
+
+int main(int, char **) {
+  fun((int *)0); // { dg-error "cannot call function" }
+  return 0;
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires16.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires16.C
new file mode 100644
index 0000000..209c916
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires16.C
@@ -0,0 +1,47 @@
+// { dg-do compile { target c++2a } }
+
+// A poor mans Integral concept.
+template<typename T>
+concept Integral = __is_same_as(T, int);
+
+template<int N>
+concept Nonnegative = N >= 0;
+
+template<typename... Args>
+concept UnaryPack = (sizeof...(Args) == 1);
+
+template<typename... Args>
+  requires Integral<Args...> // { dg-error "non-pack parameter" }
+void f1();
+
+template<typename... Args>
+  requires Integral<Args>... // { dg-error "parameter packs not expanded|expected unqualified-id" }
+void f2();
+
+template<typename... Args>
+  requires (Integral<Args> && ...)
+void f3() { }
+
+template<Integral... Args>
+void f4() { }
+
+// FIXME: This syntax is likely to be made invalid.
+template<Nonnegative... Args> // { dg-error "does not constrain a type" }
+void f5() { }
+
+template<UnaryPack Arg> // requires UnaryPack<Arg>
+void f6() { }
+
+template<UnaryPack... Args> // requires (... && UnaryPack<Args>)
+void f7() { }
+
+void driver()
+{
+  f1<int, int>(); // { dg-error "cannot call function" }
+  f3<int, int>();
+  f3<int, void>(); // { dg-error "cannot call function" }
+  f4<int, int>();
+  f4<int, void>(); // { dg-error "cannot call function" }
+  f7<int>();
+  f7<int, int>();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires17.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires17.C
new file mode 100644
index 0000000..1ec1d59
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires17.C
@@ -0,0 +1,11 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Type = true;
+
+template<typename T>
+concept C =
+  requires (T a) {
+    { a.f() } -> Type; // OK
+    { a.g() } -> const Type*; // { dg-error "not a plain type-constraint" }
+  };
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires2.C
new file mode 100644
index 0000000..45bb423
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires2.C
@@ -0,0 +1,74 @@
+// { dg-do compile { target c++2a } }
+
+// Test the types of atomic constraints
+
+// req5.C
+struct fool {
+  constexpr fool operator&&(fool) const { return {}; }
+  constexpr fool operator||(fool) const { return {}; }
+};
+
+template<typename T> constexpr fool p1() { return {}; }
+template<typename T> constexpr fool p2() { return {}; }
+
+template<typename T>
+concept Bad = p1<T>() && p2<T>();
+
+template<typename T> requires Bad<T> void bad(T x) { }
+
+void driver_2()
+{
+  bad(0); // { dg-error "cannot call" }
+}
+
+// req6.C
+struct X { };
+int operator==(X, X) { return 0; }
+
+template<typename T>
+concept C1 = (X());
+
+template<typename T>
+concept C2 = (X() == X());
+
+template<typename T>
+  requires C1<T>
+void h1(T) { } 
+
+template<typename T>
+  requires C2<T>
+void h2(T);
+
+void driver_3()
+{
+  h1(0); // { dg-error "cannot call" }
+  h2(0); // { dg-error "cannot call" } 
+}
+
+// req7.C
+template<bool B>
+struct boolean_constant 
+{
+  constexpr operator bool() const { return B; }
+};
+
+using true_type = boolean_constant<true>;
+using false_type = boolean_constant<false>;
+
+template<typename T>
+struct dependent_true : true_type { };
+
+template<typename T>
+struct dependent_false : false_type { };
+
+template<typename T>
+  requires (dependent_true<T>{}) // { dg-message "bool" }
+struct S5 { };
+
+template<typename T>
+  requires (dependent_false<T>{}) // { dg-message "bool" }
+struct S6 { };
+
+S5<int> x5; // { dg-error "template constraint failure" }
+S6<int> x6; // { dg-error "template constraint failure" }
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires3.C
new file mode 100644
index 0000000..bbcba0d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires3.C
@@ -0,0 +1,32 @@
+// { dg-do compile { target c++2a } }
+
+// Test basic expression requirements
+
+// req13.C
+
+template<class T, class...Args>
+concept Constructible =
+  requires(Args&&...args) {
+    T {((Args&&)(args))...};
+    new T{((Args&&)(args))...};
+  };
+
+template<typename T>
+  requires Constructible<T> 
+struct A { };
+
+A<int> a;
+
+// req19.C
+
+struct B
+{
+  template <class T> 
+  void f(T t) requires requires (T tt) { tt; }
+  { }
+};
+
+int main()
+{
+  B().f(42);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires4.C
new file mode 100644
index 0000000..61aa72d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires4.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target c++2a } }
+
+// Test associated type requirements
+
+// req8.C
+
+template<typename T>
+concept Has_member_type = requires { typename T::type; };
+
+template<typename T>
+concept Concept = true && Has_member_type<T>;
+
+template<typename T>
+  requires Concept<T>
+void foo(T t) { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires5.C
new file mode 100644
index 0000000..fe37ed4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires5.C
@@ -0,0 +1,45 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options -fconcepts-ts }
+
+// Test conversion requirements (not in C++20)
+
+// req9.C
+
+template<typename T>
+struct S1 { };
+
+template<typename T>
+concept C = requires(T x) { { x.fn() } -> S1<T>; };
+
+template<typename U>
+  requires C<U>
+void fn(U x)
+{
+  x.fn();
+}
+
+struct S2
+{
+  auto fn() const { return S1<S2>(); }
+};
+
+int driver_1()
+{
+  fn(S2{});
+  return 0;
+}
+
+// req10.C
+// Test implicit conversion requirements
+
+template<typename T, typename U>
+concept ConvertibleTo = requires(T& t) { {t} -> U&; };
+
+struct B { };
+class D : /*private*/ B { };
+
+void driver_2()
+{
+  static_assert(ConvertibleTo<D, B>()); // { dg-error "cannot be used as a function" }
+  static_assert(ConvertibleTo<D, B>); // { dg-error "static assertion failed" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires6.C
new file mode 100644
index 0000000..20df78b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires6.C
@@ -0,0 +1,34 @@
+// { dg-do compile { target c++2a } }
+
+// Test deduction requirements.
+
+// req12.C
+
+template <typename T, typename U>
+concept SameAs = __is_same_as(T, U);
+
+template <typename T>
+concept C1 = requires(T t) { // { dg-message "in requirements" }
+  { t } -> SameAs<T>; // NOTE: t deduced as decltype((t))
+  // { dg-error "does not satisfy placeholder constraints" "" { target *-*-* } .-1 }
+};
+
+template <typename T>
+  requires C1<T>
+constexpr bool f1() { return true; }
+
+static_assert(f1<char>()); // { dg-error "cannot call" }
+static_assert(f1<int>()); // { dg-error "cannot call" }
+static_assert(f1<double>()); // { dg-error "cannot call" }
+
+
+template <typename T>
+concept C2 = requires(T t) {
+  { t } -> SameAs<T&>; // NOTE: t deduced as decltype((t))
+};
+
+template <typename T>
+  requires C2<T>
+constexpr bool f2() { return true; }
+
+static_assert(f2<int>()); // OK
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires7.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires7.C
new file mode 100644
index 0000000..89057c4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires7.C
@@ -0,0 +1,16 @@
+// PR c++/66758
+// { dg-do compile { target c++2a } }
+
+template <class T, class U>
+concept C = requires (T t, U u) { t + u; };
+
+template <class T, class U>
+  requires C<T,U>
+void f(T t, U u) { t + u; }
+
+struct non_addable { };
+
+int main()
+{
+  using T = decltype(f(42, 24));
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires8.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires8.C
new file mode 100644
index 0000000..f10e4bc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires8.C
@@ -0,0 +1,17 @@
+// { dg-do compile { target c++2a } }
+
+template <class T, class U>
+concept C = requires (T t, U u) { t + u; }; // { dg-message "in requirements" }
+
+template <class T, class U>
+  requires C<T,U>
+void f(T t, U u) { t + u; }
+
+struct non_addable { };
+
+int main()
+{
+  // FIXME: This diagnostic is being emitted twice, when it should
+  // be emitted just once.
+  using U = decltype(f(42, non_addable{})); // { dg-error "cannot call function" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires9.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires9.C
new file mode 100644
index 0000000..3594176
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires9.C
@@ -0,0 +1,21 @@
+// PR c++/66832
+// { dg-do compile { target c++2a } }
+
+template <class T, class U, unsigned N>
+  requires requires (T& t, U &u) { t.foo(); u.foo(); }
+void foo_all( T (&t)[N], U (&u)[N] ) {
+  for(auto& x : t)
+      x.foo();
+  for(auto& x : u)
+      x.foo();
+}
+
+struct S {
+  void foo() {}
+};
+
+int main() {
+  S rg[4] {};
+  foo_all(rg, rg);
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-sfinae1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-sfinae1.C
new file mode 100644
index 0000000..87b5d75
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-sfinae1.C
@@ -0,0 +1,10 @@
+// { dg-do compile { target concepts } }
+
+template <class T> struct A
+{
+  static const int x = 42;
+};
+
+template <class T> concept R42 = A<T&>::x == 42;
+
+static_assert (!R42<void>);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm1.C
new file mode 100644
index 0000000..4ff401a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm1.C
@@ -0,0 +1,19 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Int = __is_same_as(T, int);
+
+// Type template parameters
+template<Int T = int> struct S1 { };
+template<Int = int> struct S2;
+template<Int T> struct S2 { };
+
+// Non-type template parameters
+template<Int auto N = 0> struct S3 { };
+template<Int auto = 0> struct S4;
+template<Int auto N> struct S4 { };
+
+S1<> s1;
+S2<> s2;
+S3<> s3;
+S4<> s4;
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm10.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm10.C
new file mode 100644
index 0000000..239b485
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm10.C
@@ -0,0 +1,10 @@
+// { dg-do compile { target c++2a } }
+
+template <class>
+concept Dummy = true;
+
+template <typename>
+class example {
+    template <Dummy<> U>
+    friend auto func();
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm2.C
new file mode 100644
index 0000000..7c1d69b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm2.C
@@ -0,0 +1,15 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept Int = __is_same_as(T, int);
+
+template<typename> struct Foo;
+
+// Instantiation of default arguments happens at the point of
+// instantiation for the class.
+
+template<Int T = char> struct S1 { };
+template<Int auto X = false> struct S2 { };
+
+S1<> s1; // { dg-error "constraint failure" }
+S2<> s2; // { dg-error "placeholder constraints not satisfied" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm5.C
new file mode 100644
index 0000000..78b6f1c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm5.C
@@ -0,0 +1,9 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept Int = __is_same_as(T, int);
+
+template<Int... Ts = int> struct S1; // { dg-error "default argument" }
+template<Int... = int> struct S2; // { dg-error "default argument" }
+template<Int auto... Ns = 0> struct S3; // { dg-error "default argument" }
+template<Int auto... = 0> struct S4; // { dg-error "default argument" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm6.C
new file mode 100644
index 0000000..47c8ef7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm6.C
@@ -0,0 +1,44 @@
+// { dg-do compile { target c++2a } }
+
+template<typename... Ts> struct are_same;
+
+template<>
+  struct are_same<> {
+    static constexpr bool value = true;
+  };
+
+template<typename T>
+  struct are_same<T> {
+    static constexpr bool value = true;
+  };
+
+template<typename T, typename U, typename... Ts>
+  struct are_same<T, U, Ts...> {
+    static constexpr bool value =
+      __is_same_as(T, U) && are_same<U, Ts...>::value;
+  };
+
+template<typename... Ts>
+concept Same = are_same<Ts...>::value;
+
+template<typename T>
+concept Int = __is_same_as(T, int);
+
+// NOTE: The use of Same is misleading; it constraints each T, not
+// the pack of Ts.
+template<Same... Ts> struct S1 { }; // requires (C<Ts> && ...)
+S1<int, int, int> s1;
+S1<int, int, bool> s2;
+
+// // NOTE: The use of Same is misleading; it constraints each deduced
+// // type, not the pack of Ts.
+template<Same auto... Xs> struct S2 { }; // requires (C<X> && ...) with each X deduced
+S2<true, true, true> s3;
+S2<true, true, 'a'> s4;  // OK
+
+template<Int... Ts> struct S3 { }; // requires (C<Ts> && ...)
+S3<int, int, char> x0; // { dg-error "template constraint failure" }
+
+template<Int auto... Xs> struct S4 { }; // requires (C<X> && ...) with each X deduced
+S4<0, 1, 2, 'a'> x1; // { dg-error "placeholder constraints not satisfied" }
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm8.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm8.C
new file mode 100644
index 0000000..adcffed
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm8.C
@@ -0,0 +1,21 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> and __is_empty(T);
+
+template<template<typename Q> requires C<Q> class X>
+  struct S { };
+
+// An unconstrained template can be used as an argument for any
+// constrained template template parameter.
+template<typename A> struct T0 { };
+S<T0> x1;
+
+// Matching constraints are valid.
+template<typename A> requires C<A> struct T1 { };
+S<T1> x2;
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm9.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm9.C
new file mode 100644
index 0000000..d578b35
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm9.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept C = __is_class(T);
+
+template<typename T>
+  concept D = C<T> and __is_empty(T);
+
+template<template<typename Q> requires C<Q> class X>
+  struct S { };
+
+template<typename A> requires true struct T0 { };
+template<typename A> requires D<A> struct T1 { };
+
+S<T0> x3; // { dg-error "constraint mismatch|invalid type" }
+S<T1> x4; // { dg-error "constraint mismatch|invalid type" }
+
+int main() { }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-traits1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-traits1.C
new file mode 100644
index 0000000..0ea529e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-traits1.C
@@ -0,0 +1,97 @@
+// { dg-options "-std=c++2a" }
+
+template<typename T>
+  concept Nothrow_assignable = __has_nothrow_assign(T);
+
+template<typename T>
+  concept Nothrow_constructible = __has_nothrow_constructor(T);
+
+template<typename T>
+  concept Nothrow_copyable = __has_nothrow_copy(T);
+
+template<typename T>
+  concept Trivially_assignable = __has_trivial_assign(T);
+
+template<typename T>
+  concept Trivially_constructible = __has_trivial_constructor(T);
+
+template<typename T>
+  concept Trivially_copyable = __has_trivial_copy(T);
+
+template<typename T>
+  concept Trivially_destructible = __has_trivial_destructor(T);
+
+template<typename T>
+  concept Dynamically_destructible = __has_virtual_destructor(T);
+
+template<typename T>
+  concept Abstract = __is_abstract(T);
+
+template<typename T>
+  concept Polymorphic = __is_polymorphic(T);
+
+template<typename T>
+  concept Class = __is_class(T);
+
+template<typename T>
+  concept Empty = __is_empty(T);
+
+template<typename T>
+  concept Enum = __is_enum(T);
+
+template<typename T>
+  concept Final = __is_final(T);
+
+template<typename T>
+  concept Literal_type = __is_literal_type(T);
+
+template<typename T>
+  concept Pod = __is_pod(T);
+
+template<typename T>
+  concept Standard_layout = __is_standard_layout(T);
+
+template<typename T>
+  concept Trivial = __is_trivial(T);
+
+template<typename T>
+  concept Union = __is_union(T);
+
+template<Nothrow_assignable T> void f1() { }
+template<Nothrow_copyable T> void f2() { }
+template<Nothrow_constructible T> void f3() { }
+template<Trivially_assignable T> void f4() { }
+template<Trivially_copyable T> void f5() { }
+template<Trivially_constructible T> void f6() { }
+template<Trivially_destructible T> void f7() { }
+template<Dynamically_destructible T> void f8() { }
+template<Class T> void f9() { }
+template<Empty T> void f10() { }
+template<Standard_layout T> void f11() { }
+template<Pod T> void f12() { }
+template<Trivial T> void f13() { }
+template<Polymorphic T> void f14() { }
+template<Abstract T> void f15() { }
+template<Final T> void f16() { }
+template<Union T> void f17() { }
+template<Enum T> void f18() { }
+
+int main() {
+  f1<void>(); // { dg-error "cannot call" }
+  f2<void>(); // { dg-error "cannot call" }
+  f3<void>(); // { dg-error "cannot call" }
+  f4<void>(); // { dg-error "cannot call" }
+  f5<void>(); // { dg-error "cannot call" }
+  f6<void>(); // { dg-error "cannot call" }
+  f7<void>(); // { dg-error "cannot call" }
+  f8<void>(); // { dg-error "cannot call" }
+  f9<void>(); // { dg-error "cannot call" }
+  f10<void>(); // { dg-error "cannot call" }
+  f11<void>(); // { dg-error "cannot call" }
+  f12<void>(); // { dg-error "cannot call" }
+  f13<void>(); // { dg-error "cannot call" }
+  f14<void>(); // { dg-error "cannot call" }
+  f15<void>(); // { dg-error "cannot call" }
+  f16<void>(); // { dg-error "cannot call" }
+  f17<void>(); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-traits2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-traits2.C
new file mode 100644
index 0000000..1dc5ffe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-traits2.C
@@ -0,0 +1,98 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+  concept Nothrow_assignable = __has_nothrow_assign(T);
+
+template<typename T>
+  concept Nothrow_constructible = __has_nothrow_constructor(T);
+
+template<typename T>
+  concept Nothrow_copyable = __has_nothrow_copy(T);
+
+template<typename T>
+  concept Trivially_assignable = __has_trivial_assign(T);
+
+template<typename T>
+  concept Trivially_constructible = __has_trivial_constructor(T);
+
+template<typename T>
+  concept Trivially_copyable = __has_trivial_copy(T);
+
+template<typename T>
+  concept Trivially_destructible = __has_trivial_destructor(T);
+
+template<typename T>
+  concept Dynamically_destructible = __has_virtual_destructor(T);
+
+template<typename T>
+  concept Abstract = __is_abstract(T);
+
+template<typename T>
+  concept Polymorphic = __is_polymorphic(T);
+
+template<typename T>
+  concept Class = __is_class(T);
+
+template<typename T>
+  concept Empty = __is_empty(T);
+
+template<typename T>
+  concept Enum = __is_enum(T);
+
+template<typename T>
+  concept Final = __is_final(T);
+
+template<typename T>
+  concept Literal_type = __is_literal_type(T);
+
+template<typename T>
+  concept Pod = __is_pod(T);
+
+template<typename T>
+  concept Standard_layout = __is_standard_layout(T);
+
+template<typename T>
+  concept Trivial = __is_trivial(T);
+
+template<typename T>
+  concept Union = __is_union(T);
+
+template<Nothrow_assignable T> void f1();
+template<Nothrow_copyable T> void f2();
+template<Nothrow_constructible T> void f3();
+template<Trivially_assignable T> void f4();
+template<Trivially_copyable T> void f5();
+template<Trivially_constructible T> void f6();
+template<Trivially_destructible T> void f7();
+template<Dynamically_destructible T> void f8();
+template<Class T> void f9();
+template<Empty T> void f10();
+template<Standard_layout T> void f11();
+template<Pod T> void f12();
+template<Trivial T> void f13();
+template<Polymorphic T> void f14();
+template<Abstract T> void f15();
+template<Final T> void f16();
+template<Union T> void f17();
+template<Enum T> void f18();
+
+
+int main() {
+  f1<void>(); // { dg-error "cannot call" }
+  f2<void>(); // { dg-error "cannot call" }
+  f3<void>(); // { dg-error "cannot call" }
+  f4<void>(); // { dg-error "cannot call" }
+  f5<void>(); // { dg-error "cannot call" }
+  f6<void>(); // { dg-error "cannot call" }
+  f7<void>(); // { dg-error "cannot call" }
+  f8<void>(); // { dg-error "cannot call" }
+  f9<void>(); // { dg-error "cannot call" }
+  f10<void>(); // { dg-error "cannot call" }
+  f11<void>(); // { dg-error "cannot call" }
+  f12<void>(); // { dg-error "cannot call" }
+  f13<void>(); // { dg-error "cannot call" }
+  f14<void>(); // { dg-error "cannot call" }
+  f15<void>(); // { dg-error "cannot call" }
+  f16<void>(); // { dg-error "cannot call" }
+  f17<void>(); // { dg-error "cannot call" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts1.C
new file mode 100644
index 0000000..b819ad4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts1.C
@@ -0,0 +1,49 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+// This tests the terse notation.
+
+template<typename T>
+concept True = true;
+
+template<typename T>
+concept False = false;
+
+template<typename T, typename U>
+concept SameAs = __is_same_as(T, U);
+
+True x1 = 0;
+False x2 = 0; // { dg-error "deduced initializer does not satisfy" }
+
+void f1(True t) { }
+void f2(False t) { }
+void f3(SameAs<int> q) { }
+void f4(True a, SameAs<decltype(a)> b) { }
+
+True f5() { return 0; }
+False f6() { return 0; } // { dg-error "deduced return type" }
+SameAs<int> f7() { return 0; }
+SameAs<int> f8() { return 'a'; } // { dg-error "deduced return type" }
+auto f9() -> True { return 0; }
+auto f10() -> False { return 0; } // { dg-error "deduced return type" }
+auto f11() -> SameAs<int> { return 0; }
+auto f12() -> SameAs<char> { return 0; } // { dg-error "deduced return type" }
+auto f13(int n) -> SameAs<decltype(n)> { return n; }
+auto f14(int n) -> SameAs<decltype(n)> { return 'a'; } // { dg-error "deduced return type" }
+auto f15(auto x) -> SameAs<decltype(x)> { return 0; } // { dg-error "deduced return type" }
+
+void driver()
+{
+  f1(0);
+  f2(0); // { dg-error "cannot call" }
+  f3(0);
+  f3('a'); // { dg-error "cannot call" }
+  f4(0, 0);
+  f4(0, 'a'); // { dg-error "cannot call" }
+  f15(0);
+  f15('a'); // { dg-message "" }
+}
+
+template<class T> concept bool C1() { return false; }
+template<C1 T> concept bool C2() { return true; } // { dg-error "cannot be constrained" }
+template<C1 T> concept bool C3 = true; // { dg-error "cannot be constrained" }
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts2.C
new file mode 100644
index 0000000..9d2dbee
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts2.C
@@ -0,0 +1,260 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+// Basic tests using function concepts.
+
+template<typename T>
+concept bool Type() { return true; }
+
+template<typename T>
+concept bool False() { return false; }
+
+template<typename T>
+concept bool Class() { return __is_class(T); }
+
+template<typename T>
+concept bool EmptyClass() { return Class<T>() && __is_empty(T); }
+
+template<typename T, typename U>
+concept bool Classes() { return __is_class(T) && __is_class (U); }
+
+struct empty { };
+
+struct nonempty { int n; };
+
+static_assert(Type<int>());
+static_assert(False<int>()); // { dg-error "static assertion failed" }
+
+// Basic checks
+
+template<typename T>
+  requires (Type<T>())
+int fn1(T t) { return 0; }
+
+template<typename T>
+  requires (False<T>())
+int fn2(T t) { return 0; }
+
+void driver()
+{
+  fn1(0); // OK
+  fn2(0); // { dg-error "cannot call function" }
+}
+
+// Ordering
+
+template<typename T>
+concept bool Cf() { return requires (T t) { t.f(); }; }
+
+template<typename T>
+concept bool Cfg() { return Cf<T>() && requires (T t) { t.g(); }; }
+
+template<typename T>
+concept bool Cf2() { return requires (T t) { t.f(); }; }
+
+template<typename T>
+constexpr int algo(T t) { return 0; }
+
+template<typename T> requires (Cf<T>())
+constexpr int algo(T t) { return 1; }
+
+template<typename T> requires (Cfg<T>())
+constexpr int algo(T t) { return 2; }
+
+template<typename T> requires (Cf<T>())
+constexpr int ambig(T t) { return 1; }
+
+template<typename T> requires (Cf2<T>())
+constexpr int ambig(T t) { return 1; }
+
+struct T1 {
+  void f() { }
+};
+
+struct T2 : T1 {
+  void g() { }
+};
+
+void driver_0()
+{
+  T1 x;
+  T2 y;
+  static_assert(algo(0) == 0);
+  static_assert(algo(x) == 1);
+  static_assert(algo(y) == 2);
+  ambig(x); // { dg-error "call of overload | is ambiguous" }
+}
+
+template<typename T>
+struct S
+{
+  void f() requires (Class<T>()) { }
+  
+  template<typename U>
+  struct Inner
+  {
+    void g() requires (Classes<T, U>()) { }
+  };
+
+  template<typename U> requires (Classes<T, U>()) void h(U) { }
+};
+
+struct X { };
+
+void driver_1()
+{
+  S<X> s1;
+  s1.f(); // OK
+  s1.h(s1); // OK
+  s1.h(0); // { dg-error "no matching function" }
+
+  S<int> s2;
+  s2.f(); // { dg-error "no matching function" }
+
+  S<X>::Inner<X> si1;
+  si1.g();
+  
+  S<X>::Inner<int> si2;
+  si2.g(); // { dg-error "no matching function" }
+}
+
+// Check constraints on non-dependent arguments, even when in a
+// dependent context.
+
+template<typename T> requires (Class<T>()) void f1(T x) { }
+
+// fn1-2.C -- Dependent checks
+template<typename T>
+void caller_1(T x) 
+{ 
+  f1(x); // Unchecked dependent arg.
+  f1(empty{}); // Checked non-dependent arg, but OK
+  f1(0); // { dg-error "cannot call function" }
+}
+
+// fn3.c -- Ordering
+template<typename T> 
+  requires (Class<T>()) 
+constexpr int f2(T x) { return 1; }
+
+template<typename T> 
+  requires (EmptyClass<T>())
+constexpr int f2(T x) { return 2; }
+
+template<typename T> 
+constexpr int f3(T x) requires (Class<T>()) { return 1; }
+
+template<typename T> 
+constexpr int f3(T x) requires (EmptyClass<T>()) { return 2; }
+
+void driver_2() 
+{
+  f2(0); // { dg-error "no matching function" }
+  static_assert (f2(empty{}) == 2);
+  static_assert (f2(nonempty{}) == 1);
+  f3(0); // { dg-error "no matching function" }
+  static_assert (f3(empty{}) == 2);
+  static_assert (f3(nonempty{}) == 1);
+}
+
+// fn8.C -- Address of overloaded functions
+template<typename T> requires (Type<T>()) void ok(T) { }
+template<typename T> requires (Class<T>()) void err(T) { }
+
+auto p1 = &ok<int>;
+auto p2 = &err<int>; // { dg-error "no matches" }
+void (*p3)(int) = &ok<int>;
+void (*p4)(int) = &err<int>; // { dg-error "no matches" }
+void (*p5)(int) = &ok;
+void (*p6)(int) = &err; // { dg-error "no matches" }
+
+template<typename T> void g(T x) { }
+
+void driver_3 () 
+{
+  g(&ok<int>);
+  g(&err<int>); // { dg-error "no matches" }
+}
+
+
+struct S2 {
+  template<typename T> requires (Type<T>()) int ok(T) { return 0; }
+  template<typename T> requires (Class<T>()) int err(T) { return 0; }
+};
+
+auto p7 = &S2::ok<int>;
+auto p8 = &S2::err<int>; // { dg-error "no matches" }
+int (S2::*p9)(int) = &S2::ok<int>;
+int (S2::*p10)(int) = &S2::err<int>; // { dg-error "no matches" }
+int (S2::*p11)(int) = &S2::ok;
+int (S2::*p12)(int) = &S2::err; // { dg-error "no matches" }
+
+// fn9.C -- Ordering with function address
+template<typename T> 
+  requires (Class<T>())
+constexpr int fn(T) { return 1; }
+
+template<typename T> 
+  requires (EmptyClass<T>())
+constexpr int fn(T) { return 2; }
+
+struct S3 
+{
+  template<typename T> 
+    requires (Class<T>())
+  constexpr int fn(T) const { return 1; }
+  
+  template<typename T> 
+    requires (EmptyClass<T>())
+  constexpr int fn(T) const { return 2; }
+};
+
+void driver_5 () {
+  struct X { };
+  struct Y { X x; };
+
+  constexpr X x;
+  constexpr Y y;
+  constexpr S3 s;
+
+  constexpr auto p1 = &fn<X>; // Empty f
+  static_assert (p1(x) == 2);
+
+  constexpr auto p2 = &fn<Y>; // Class f
+  static_assert(p2(y) == 1);
+
+  constexpr auto p3 = &S3::fn<X>; // Empty f
+  static_assert((s.*p3)(x) == 2);
+
+  constexpr auto p4 = &S3::fn<Y>; // Empty f
+  static_assert((s.*p4)(y) == 1);
+}
+
+
+// Redeclarations
+
+// FIXME: This should be a diagnosable error. The programmer has moved
+// the requirements from the template-head to the declarator.
+template<typename T> requires (Type<T>()) void f3();
+template<typename T> void f3() requires (Type<T>());
+
+void driver_4()
+{
+  f3<int>(); // { dg-error "call of overload | ambiguous" }
+}
+
+template<template<typename T> requires true class X> void f4();
+template<template<typename T> class X> void f4(); // OK: different declarations
+
+template<typename T> requires (Type<T>()) void def() { }
+template<typename T> requires (Type<T>()) void def() { } // { dg-error "redefinition" }
+
+// fn-concept1.C
+
+template<typename T>
+concept bool Tuple() { // { dg-error "multiple statements" }
+  static_assert(T::value, "");
+  return true;
+}
+
+void f(Tuple&);
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts3.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts3.C
new file mode 100644
index 0000000..c1f4ba9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts3.C
@@ -0,0 +1,251 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+// Basic tests using variable concepts.
+
+template<typename T>
+concept bool Type = true;
+
+template<typename T>
+concept bool False = false;
+
+template<typename T>
+concept bool Class = __is_class(T);
+
+template<typename T>
+concept bool EmptyClass = Class<T> && __is_empty(T);
+
+template<typename T, typename U>
+concept bool Classes = __is_class(T) && __is_class (U);
+
+struct empty { };
+
+struct nonempty { int n; };
+
+static_assert(Type<int>);
+static_assert(False<int>); // { dg-error "static assertion failed" }
+
+// Basic checks
+
+template<typename T>
+  requires Type<T>
+int fn1(T t) { return 0; }
+
+template<typename T>
+  requires False<T>
+int fn2(T t) { return 0; }
+
+void driver()
+{
+  fn1(0); // OK
+  fn2(0); // { dg-error "cannot call function" }
+}
+
+// Ordering
+
+template<typename T>
+concept bool Cf = requires (T t) { t.f(); };
+
+template<typename T>
+concept bool Cfg = Cf<T> && requires (T t) { t.g(); };
+
+template<typename T>
+concept bool Cf2 = requires (T t) { t.f(); };
+
+template<typename T>
+constexpr int algo(T t) { return 0; }
+
+template<typename T> requires Cf<T>
+constexpr int algo(T t) { return 1; }
+
+template<typename T> requires Cfg<T>
+constexpr int algo(T t) { return 2; }
+
+template<typename T> requires Cf<T>
+constexpr int ambig(T t) { return 1; }
+
+template<typename T> requires Cf2<T>
+constexpr int ambig(T t) { return 1; }
+
+struct T1 {
+  void f() { }
+};
+
+struct T2 : T1 {
+  void g() { }
+};
+
+void driver_0()
+{
+  T1 x;
+  T2 y;
+  static_assert(algo(0) == 0);
+  static_assert(algo(x) == 1);
+  static_assert(algo(y) == 2);
+  ambig(x); // { dg-error "call of overload | is ambiguous" }
+}
+
+template<typename T>
+struct S
+{
+  void f() requires Class<T> { }
+  
+  template<typename U>
+  struct Inner
+  {
+    void g() requires Classes<T, U> { }
+  };
+
+  template<typename U> requires Classes<T, U> void h(U) { }
+};
+
+struct X { };
+
+void driver_1()
+{
+  S<X> s1;
+  s1.f(); // OK
+  s1.h(s1); // OK
+  s1.h(0); // { dg-error "no matching function" }
+
+  S<int> s2;
+  s2.f(); // { dg-error "no matching function" }
+
+  S<X>::Inner<X> si1;
+  si1.g();
+  
+  S<X>::Inner<int> si2;
+  si2.g(); // { dg-error "no matching function" }
+}
+
+// Check constraints on non-dependent arguments, even when in a
+// dependent context.
+
+template<typename T> requires Class<T> void f1(T x) { }
+
+// fn1-2.C -- Dependent checks
+template<typename T>
+void caller_1(T x) 
+{ 
+  f1(x); // Unchecked dependent arg.
+  f1(empty{}); // Checked non-dependent arg, but OK
+  f1(0); // { dg-error "cannot call function" }
+}
+
+// fn3.c -- Ordering
+template<typename T> 
+  requires Class<T> 
+constexpr int f2(T x) { return 1; }
+
+template<typename T> 
+  requires EmptyClass<T>
+constexpr int f2(T x) { return 2; }
+
+template<typename T> 
+constexpr int f3(T x) requires Class<T> { return 1; }
+
+template<typename T> 
+constexpr int f3(T x) requires EmptyClass<T> { return 2; }
+
+void driver_2() 
+{
+  f2(0); // { dg-error "no matching function" }
+  static_assert (f2(empty{}) == 2);
+  static_assert (f2(nonempty{}) == 1);
+  f3(0); // { dg-error "no matching function" }
+  static_assert (f3(empty{}) == 2);
+  static_assert (f3(nonempty{}) == 1);
+}
+
+// fn8.C -- Address of overloaded functions
+template<typename T> requires Type<T> void ok(T) { }
+template<typename T> requires Class<T> void err(T) { }
+
+auto p1 = &ok<int>;
+auto p2 = &err<int>; // { dg-error "no matches" }
+void (*p3)(int) = &ok<int>;
+void (*p4)(int) = &err<int>; // { dg-error "no matches" }
+void (*p5)(int) = &ok;
+void (*p6)(int) = &err; // { dg-error "no matches" }
+
+template<typename T> void g(T x) { }
+
+void driver_3 () 
+{
+  g(&ok<int>);
+  g(&err<int>); // { dg-error "no matches" }
+}
+
+
+struct S2 {
+  template<typename T> requires Type<T> int ok(T) { return 0; }
+  template<typename T> requires Class<T> int err(T) { return 0; }
+};
+
+auto p7 = &S2::ok<int>;
+auto p8 = &S2::err<int>; // { dg-error "no matches" }
+int (S2::*p9)(int) = &S2::ok<int>;
+int (S2::*p10)(int) = &S2::err<int>; // { dg-error "no matches" }
+int (S2::*p11)(int) = &S2::ok;
+int (S2::*p12)(int) = &S2::err; // { dg-error "no matches" }
+
+// fn9.C -- Ordering with function address
+template<typename T> 
+  requires Class<T>
+constexpr int fn(T) { return 1; }
+
+template<typename T> 
+  requires EmptyClass<T>
+constexpr int fn(T) { return 2; }
+
+struct S3 
+{
+  template<typename T> 
+    requires Class<T>
+  constexpr int fn(T) const { return 1; }
+  
+  template<typename T> 
+    requires EmptyClass<T>
+  constexpr int fn(T) const { return 2; }
+};
+
+void driver_5 () {
+  struct X { };
+  struct Y { X x; };
+
+  constexpr X x;
+  constexpr Y y;
+  constexpr S3 s;
+
+  constexpr auto p1 = &fn<X>; // Empty f
+  static_assert (p1(x) == 2);
+
+  constexpr auto p2 = &fn<Y>; // Class f
+  static_assert(p2(y) == 1);
+
+  constexpr auto p3 = &S3::fn<X>; // Empty f
+  static_assert((s.*p3)(x) == 2);
+
+  constexpr auto p4 = &S3::fn<Y>; // Empty f
+  static_assert((s.*p4)(y) == 1);
+}
+
+
+// Redeclarations
+
+// FIXME: This should be a diagnosable error. The programmer has moved
+// the requirements from the template-head to the declarator.
+template<typename T> requires Type<T> void f3();
+template<typename T> void f3() requires Type<T>;
+
+void driver_4()
+{
+  f3<int>(); // { dg-error "call of overload | ambiguous" }
+}
+
+template<template<typename T> requires true class X> void f4();
+template<template<typename T> class X> void f4(); // OK: different declarations
+
+template<typename T> requires Type<T> void def() { }
+template<typename T> requires Type<T> void def() { } // { dg-error "redefinition" }
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C
new file mode 100644
index 0000000..3d720e8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts4.C
@@ -0,0 +1,34 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+// Basic tests for introduction syntax.
+
+template<typename T>
+concept True = true;
+
+template<typename T>
+concept False = false;
+
+template<typename T, typename U>
+concept Same = __is_same_as(T, U);
+
+template<int N>
+concept Pos = N >= 0;
+
+True{T} void f1(T) { }
+False{T} void f2(T) { }
+Same{X, Y} void same();
+Pos{N} void fn();
+
+void driver()
+{
+  f1(0);
+  f2(0); // { dg-error "cannot call function" }
+
+  same<int, int>();
+  same<int, char>(); // { dg-error "cannot call function" }
+
+  fn<0>(); // OK
+  fn<-1>(); // { dg-error "cannot call function" }
+  fn<int>(); // { dg-error "no matching function" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts5.C
new file mode 100644
index 0000000..cdc40df
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts5.C
@@ -0,0 +1,10 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+struct Base {
+  template<typename T>
+    static concept bool D() { return __is_same_as(T, int); } // { dg-error "a concept cannot be a member function" }
+
+  template<typename T, typename U>
+    static concept bool E() { return __is_same_as(T, U); } // { dg-error "a concept cannot be a member function" }
+};
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C
new file mode 100644
index 0000000..bf665aa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-ts6.C
@@ -0,0 +1,72 @@
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-fconcepts-ts" }
+
+template<typename T, int N, typename... Xs> concept bool C1 = true;
+
+template<template<typename> class X> concept bool C2 = true;
+
+template<typename... Ts> concept bool C3 = true;
+
+C1{A, B, ...C} struct S1 { };
+
+C2{T} void f();
+
+C2{...Ts} void g(); // { dg-error "cannot be introduced" }
+
+C3{...Ts} struct S2 { };
+C3{T, U, V} struct S3 { };
+C3{...Ts, U} struct S4 { }; // { dg-error "cannot deduce template parameters" }
+
+template<typename> struct X { };
+
+void driver1() {
+  S1<int, 0, char, bool, float> s1a;
+  S1<0, 0, char, bool, float> s1b; // { dg-error "type/value mismatch" }
+
+  f<X>();
+  f<int>(); // { dg-error "no matching function for call" }
+
+  S2<int> s2a;
+  S2<char, signed char, unsigned char> s2b;
+  S2<0> s2c; // { dg-error "type/value mismatch" }
+
+  S3<int, int, int> s3a;
+  S3<int, int> s3b; // { dg-error "wrong number of template arguments" }
+}
+
+template<typename... Args>
+struct all_same;
+
+template<typename T, typename U, typename... Args>
+struct all_same<T, U, Args...>
+{
+  static constexpr bool value = __is_same_as(T, U) && all_same<U, Args...>::value;
+};
+
+template<typename T>
+struct all_same<T>
+{
+  static constexpr bool value = true;
+};
+
+template<>
+struct all_same<>
+{
+  static constexpr bool value = true;
+};
+
+template<typename... Ts>
+concept AllSame = all_same<Ts...>::value;
+
+AllSame{...Ts} struct S5 { };
+AllSame{T, U} struct S6 { };
+
+void driver2()
+{
+  S5<int, int> s5a;
+  S5<int, int, int, int> s5b;
+  S5<int, int, int, char> s5c; // { dg-error "template constraint failure" }
+  S6<void, void> s6a;
+  S6<void, int> s6c; // { dg-error "template constraint failure" }
+  S6<void, void, void> s6b; // { dg-error "wrong number of template arguments" }
+}
\ No newline at end of file
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-using1.C b/gcc/testsuite/g++.dg/cpp2a/concepts-using1.C
new file mode 100644
index 0000000..733382d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-using1.C
@@ -0,0 +1,17 @@
+// PR c++/79591
+// { dg-do compile { target c++2a } }
+
+template <class> concept True = true;
+
+// Fine.
+namespace X {
+  void f(auto) {}
+  void f(True auto) {}
+}
+
+void f(auto) {}
+namespace Y {
+  void f(True auto) {}
+  using ::f;
+  // error: 'template<class auto:3> void f(auto:3)' conflicts with a previous declaration
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts.C b/gcc/testsuite/g++.dg/cpp2a/concepts.C
new file mode 100644
index 0000000..5839207
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts.C
@@ -0,0 +1,57 @@
+// { dg-do compile { target c++2a } }
+
+// Change in grammar for the expression trailing `requires`.
+template<typename T>
+  requires true != false // { dg-error "must be enclosed" }
+void f1(T)
+{ }
+
+template<typename T>
+void f3(T) requires true != false // { dg-error "must be enclosed" }
+{ }
+
+template<typename T>
+  requires requires {
+    requires true == false; // OK: logical-or-expressions allowed here.
+  }
+void f3(T)
+{ }
+
+template<typename T>
+concept bool C1 = true; // { dg-error "bool" }
+template<typename T>
+bool concept C2 = true; // { dg-error "concept definition syntax" }
+
+template<typename T>
+concept C3 = true; // OK
+template<typename T>
+concept C3 = true; // { dg-error "redefinition" }
+template<typename T, typename U>
+concept C3 = true; // { dg-error "different template parameters" }
+template<int>
+concept C3 = true; // { dg-error "different template parameters" }
+int C3 = 0; // { dg-error "different kind of entity" }
+
+int C4 = 0;
+template<typename T>
+concept C4 = true; // { dg-error "different kind of entity" }
+
+// Concepts as expressions
+
+template<typename T>
+concept True = true;
+
+template<typename T>
+concept False = false;
+
+static_assert(True<int>);
+static_assert(False<int>); // { dg-error "static assertion failed" }
+
+void f4(True auto);
+
+template<True T> concept C5 = true; // { dg-error "cannot be constrained" }
+
+
+template<typename T>
+concept Recursive = Recursive<T>; // { dg-error "not declared|expected" }
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts1.C b/gcc/testsuite/g++.dg/cpp2a/concepts1.C
new file mode 100644
index 0000000..f22464a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts1.C
@@ -0,0 +1,27 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept Class = __is_class(T);
+
+template<Class T>
+void f1(T) { }
+
+struct empty { };
+
+// Redeclarations involving brief template parameters.
+
+template<Class T>
+void decl1(T);
+
+template<typename T>
+  requires Class<T>
+void decl1(T);
+
+void driver_1()
+{
+  f1(0); // { dg-error "cannot call function" }
+  f1(empty{});
+
+  decl1(empty{}); // { dg-error "call of overload | ambiguous" }
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts2.C b/gcc/testsuite/g++.dg/cpp2a/concepts2.C
new file mode 100644
index 0000000..d3b45f7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts2.C
@@ -0,0 +1,69 @@
+// { dg-do compile { target c++2a } }
+
+template<typename T>
+concept True = true;
+
+template<typename T>
+concept False = false;
+
+template<typename T>
+concept Int = __is_same_as(T, int);
+
+static_assert(True<int>);
+static_assert(!False<int>);
+static_assert(False<int>); // { dg-error "static assertion failed" }
+
+constexpr bool will_be_true() {
+  if (True<int>)
+    return true;
+  return false;
+}
+
+constexpr bool will_be_false() {
+  if (!False<int>)
+    return true;
+  return false;
+}
+
+static_assert(will_be_true());
+static_assert(will_be_false());
+
+template<typename T>
+constexpr bool is_int() {
+  if (Int<T>)
+    return true;
+  return false;
+}
+
+static_assert(is_int<int>());
+static_assert(is_int<void>()); // { dg-error "static assertion failed" }
+
+template<typename T>
+constexpr bool f1() {
+  if (Int<int>) //  Note: always true.
+    return true;
+  return false;
+}
+static_assert(f1<int>());
+static_assert(f1<void>());
+
+
+template<typename T>
+constexpr bool f2() {
+  if constexpr (Int<int>) // Note: always true.
+    return true;
+  return false;
+}
+static_assert(f2<int>());
+static_assert(f2<void>());
+
+template<typename T>
+concept C = true;
+
+int driver() {
+  bool c_int = (C<int>); 
+  if((C<int>))
+    ;
+  return c_int;
+}
+
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts3.C b/gcc/testsuite/g++.dg/cpp2a/concepts3.C
new file mode 100644
index 0000000..d962426
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts3.C
@@ -0,0 +1,48 @@
+// { dg-do compile { target c++2a } }
+
+template <class T, class U> concept same_as = __is_same_as(T,U);
+
+template<typename T>
+concept C1 = requires (T& t) { // { dg-message "in requirements" }
+  t.~T(); 
+};
+
+template<typename T>
+concept C2 = requires (T& t) { // { dg-message "in requirements" }
+  { t.~T() } -> same_as<void>;
+};
+
+template<typename T>
+concept C3 = requires { // { dg-message "in requirements" }
+  typename T::type;
+};
+
+class S1
+{
+  ~S1() { }
+  using type = int;
+};
+
+void driver() {
+  static_assert(C1<S1>, ""); // { dg-error "static assertion failed" }
+  static_assert(C2<S1>, ""); // { dg-error "static assertion failed" }
+  static_assert(C3<S1>, ""); // { dg-error "static assertion failed" }
+}
+
+template<typename T>
+  requires C1<T>
+void f1() { }
+
+template<typename T>
+  requires C2<T>
+void f2() { }
+
+template<typename T>
+  requires C3<T>
+void f3() { }
+
+void driver2() {
+  f1<S1>(); // { dg-error "cannot call|is private" }
+  f2<S1>(); // { dg-error "cannot call|is private" }
+  f3<S1>(); // { dg-error "cannot call|is private" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts4.C b/gcc/testsuite/g++.dg/cpp2a/concepts4.C
new file mode 100644
index 0000000..388fad7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts4.C
@@ -0,0 +1,10 @@
+// { dg-do compile { target c++2a } }
+
+template <class T> struct A { static const int x = 42; };
+
+template <class Ta> concept A42 = A<Ta>::x == 42;
+template <class Tv> concept Void = __is_same_as(Tv, void);
+template <class Tb, class Ub> concept A42b = Void<Tb> || A42<Ub>;
+template <class Tc> concept R42c = A42b<Tc, Tc&>;
+
+static_assert (R42c<void>);
diff --git a/gcc/testsuite/g++.dg/cpp2a/cond-triv2.C b/gcc/testsuite/g++.dg/cpp2a/cond-triv2.C
new file mode 100644
index 0000000..554f8a3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/cond-triv2.C
@@ -0,0 +1,30 @@
+// PR c++/67348
+// { dg-do compile { target c++2a } }
+
+#include <type_traits>
+#include <vector>
+using namespace std;
+
+template <class...Ts>
+  requires (is_destructible<Ts>::value && ...)
+struct variant {
+  ~variant() { /* ... */ }
+  ~variant()
+    requires (is_trivially_destructible<Ts>::value && ...) = default;
+
+  variant(variant&&) { /* ... */ }
+  variant(variant&&)
+    requires (is_trivially_move_constructible<Ts>::value && ...) = default;
+
+  variant& operator=(variant&&) { /* ... */ }
+  variant& operator=(variant&&)
+    requires (is_trivially_move_assignable<Ts>::value && ...) = default;
+
+  // ...similar treatment for copy construction / assignment...
+};
+
+static_assert(is_trivially_destructible<variant<int, float>>());
+static_assert(!is_trivially_destructible<variant<int, vector<int>>>());
+
+static_assert(is_trivially_move_constructible<variant<int, float>>());
+static_assert(!is_trivially_move_constructible<variant<int, vector<int>>>());
diff --git a/gcc/testsuite/lib/g++-dg.exp b/gcc/testsuite/lib/g++-dg.exp
index ddeb4a2..77f29db 100644
--- a/gcc/testsuite/lib/g++-dg.exp
+++ b/gcc/testsuite/lib/g++-dg.exp
@@ -52,7 +52,7 @@ proc g++-dg-runtest { testcases flags default-extra-flags } {
 	    if { [llength $gpp_std_list] > 0 } {
 		set std_list $gpp_std_list
 	    } else {
-		set std_list { 98 14 17 }
+		set std_list { 98 14 17 2a }
 	    }
 	    set option_list { }
 	    foreach x $std_list {
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 179202f..f8a235d 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -8584,7 +8584,7 @@ proc check_effective_target_c++2a { } {
 
 # Check for C++ Concepts TS support, i.e. -fconcepts flag.
 proc check_effective_target_concepts { } {
-    return [check-flags { "" { } { -fconcepts } }]
+    return [check-flags { "" { } { -fconcepts -std=*2a } }]
 }
 
 # Return 1 if expensive testcases should be run.
diff --git a/gcc/timevar.def b/gcc/timevar.def
index 3551a43..357fcfd 100644
--- a/gcc/timevar.def
+++ b/gcc/timevar.def
@@ -141,8 +141,9 @@ DEFTIMEVAR (TV_PARSE_INLINE          , "parser inl. func. body")
 DEFTIMEVAR (TV_PARSE_INMETH          , "parser inl. meth. body")
 DEFTIMEVAR (TV_TEMPLATE_INST         , "template instantiation")
 DEFTIMEVAR (TV_CONSTEXPR	     , "constant expression evaluation")
-DEFTIMEVAR (TV_CONSTRAINT_SAT        , "constraint satisfaction")
-DEFTIMEVAR (TV_CONSTRAINT_SUB        , "constraint subsumption")
+DEFTIMEVAR (TV_CONSTRAINT_NORM	     , "constraint normalization")
+DEFTIMEVAR (TV_CONSTRAINT_SAT	     , "constraint satisfaction")
+DEFTIMEVAR (TV_CONSTRAINT_SUB	     , "constraint subsumption")
 DEFTIMEVAR (TV_FLATTEN_INLINING      , "flatten inlining")
 DEFTIMEVAR (TV_EARLY_INLINING        , "early inlining heuristics")
 DEFTIMEVAR (TV_INLINE_PARAMETERS     , "inline parameters")
-- 
cgit v1.1


From e295e3d981355c61b72eca2ee58864958655cc31 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Wed, 9 Oct 2019 17:49:26 +0000
Subject: PR c++/92032 - DR 1601: Promotion of enum with fixed underlying
 type.

I've been messing with compare_ics recently and noticed that we don't
implement CWG 1601, which should be fairly easy.  Thus this patch.

The motivating example is
  enum E : char { e };
  void f(char);
  void f(int);
  void g() {
    f(e);
  }
where the call to f was ambiguous but we should choose f(char).

Currently we give f(int) cr_promotion in standard_conversion, while
f(char) remains cr_std, which is worse than cr_promotion.  So I thought
I'd give it cr_promotion also and then add a tiebreaker to compare_ics.

	* call.c (standard_conversion): When converting an enumeration with
	a fixed underlying type to the underlying type, give it the cr_promotion
	rank.
	(compare_ics): Implement a tiebreaker as per CWG 1601.

	* g++.dg/cpp0x/scoped_enum10.C: New test.
	* g++.dg/cpp0x/scoped_enum11.C: New test.

From-SVN: r276766
---
 gcc/cp/ChangeLog                           |  8 ++++++
 gcc/cp/call.c                              | 39 ++++++++++++++++++++++++++++--
 gcc/testsuite/ChangeLog                    |  6 +++++
 gcc/testsuite/g++.dg/cpp0x/scoped_enum10.C | 37 ++++++++++++++++++++++++++++
 gcc/testsuite/g++.dg/cpp0x/scoped_enum11.C | 35 +++++++++++++++++++++++++++
 5 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/scoped_enum10.C
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/scoped_enum11.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e633823..4eb18294 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-09  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/92032 - DR 1601: Promotion of enum with fixed underlying	type.
+	* call.c (standard_conversion): When converting an enumeration with
+	a fixed underlying type to the underlying type, give it the cr_promotion
+	rank.
+	(compare_ics): Implement a tiebreaker as per CWG 1601.
+
 2019-10-08  Andrew Sutton  <asutton@lock3software.com>
 	    Jason Merrill  <jason@redhat.com>
 
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index d36564d..33ec6a2 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -1472,8 +1472,18 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p,
 
       conv = build_conv (ck_std, to, conv);
 
-      /* Give this a better rank if it's a promotion.  */
-      if (same_type_p (to, type_promotes_to (from))
+      tree underlying_type = NULL_TREE;
+      if (TREE_CODE (from) == ENUMERAL_TYPE
+	  && ENUM_FIXED_UNDERLYING_TYPE_P (from))
+	underlying_type = ENUM_UNDERLYING_TYPE (from);
+
+      /* Give this a better rank if it's a promotion.
+
+	 To handle CWG 1601, also bump the rank if we are converting
+	 an enumeration with a fixed underlying type to the underlying
+	 type.  */
+      if ((same_type_p (to, type_promotes_to (from))
+	   || (underlying_type && same_type_p (to, underlying_type)))
 	  && next_conversion (conv)->rank <= cr_promotion)
 	conv->rank = cr_promotion;
     }
@@ -10473,6 +10483,31 @@ compare_ics (conversion *ics1, conversion *ics2)
 	}
     }
 
+  /* [over.ics.rank]
+
+     Per CWG 1601:
+     -- A conversion that promotes an enumeration whose underlying type
+     is fixed to its underlying type is better than one that promotes to
+     the promoted underlying type, if the two are different.  */
+  if (ics1->rank == cr_promotion
+      && ics2->rank == cr_promotion
+      && UNSCOPED_ENUM_P (from_type1)
+      && ENUM_FIXED_UNDERLYING_TYPE_P (from_type1)
+      && same_type_p (from_type1, from_type2))
+    {
+      tree utype = ENUM_UNDERLYING_TYPE (from_type1);
+      tree prom = type_promotes_to (from_type1);
+      if (!same_type_p (utype, prom))
+	{
+	  if (same_type_p (to_type1, utype)
+	      && same_type_p (to_type2, prom))
+	    return 1;
+	  else if (same_type_p (to_type2, utype)
+		   && same_type_p (to_type1, prom))
+	    return -1;
+	}
+    }
+
   /* Neither conversion sequence is better than the other.  */
   return 0;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9318655..f1e3a99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-09  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/92032 - DR 1601: Promotion of enum with fixed underlying	type.
+	* g++.dg/cpp0x/scoped_enum10.C: New test.
+	* g++.dg/cpp0x/scoped_enum11.C: New test.
+
 2019-10-08  Andrew Sutton  <asutton@lock3software.com>
 
 	* lib/target-supports.exp (check_effective_target_concepts): Check
diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum10.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum10.C
new file mode 100644
index 0000000..054b908
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum10.C
@@ -0,0 +1,37 @@
+// PR c++/92032 - DR 1601: Promotion of enumeration with fixed underlying type.
+// { dg-do compile { target c++11 } }
+
+enum E : char { e };
+enum F : int { f };
+enum G : long { g };
+enum H : unsigned { h };
+
+int f1(char);
+void f1(int);
+
+void f2(int);
+int f2(char);
+
+int f3(int);
+void f3(short);
+
+int f4(long);
+void f4(int);
+
+void f5(unsigned);
+int f5(int);
+
+int f6(unsigned);
+void f6(int);
+
+void
+test ()
+{
+  int r = 0;
+  r += f1 (e);
+  r += f2 (e);
+  r += f3 (f);
+  r += f4 (g);
+  r += f5 (f);
+  r += f6 (h);
+}
diff --git a/gcc/testsuite/g++.dg/cpp0x/scoped_enum11.C b/gcc/testsuite/g++.dg/cpp0x/scoped_enum11.C
new file mode 100644
index 0000000..e6dcfba
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/scoped_enum11.C
@@ -0,0 +1,35 @@
+// PR c++/92032 - DR 1601: Promotion of enumeration with fixed underlying type.
+// { dg-do compile { target c++11 } }
+
+enum E1 : long { e1 };
+enum E2 : short { e2 };
+
+int f1(short);
+void f1(int);
+
+void f2(int);
+int f2(short);
+
+void f3(int);
+int f3(long);
+
+int f4(short);
+void f4(long);
+
+int f5(int);
+void f5(long);
+
+int f6(unsigned int); // { dg-message "candidate" }
+void f6(long); // { dg-message "candidate" }
+
+void
+fn ()
+{
+  int r = 0;
+  r += f1 (e2);
+  r += f2 (e2);
+  r += f3 (e1);
+  r += f4 (e2);
+  r += f5 (e2);
+  r += f6 (e2); // { dg-error "ambiguous" }
+}
-- 
cgit v1.1


From a0e887be6147edcd14a5b95af17456d0a01575d4 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Wed, 9 Oct 2019 18:43:36 +0000
Subject: [Darwin, machopic 3/n] Set a SYMBOL flag for indirections.

We are able to treat these specially where needed in legitimate address
tests (specifically, they are guaranteed to be pointer-aligned).

gcc/ChangeLog:

2019-10-09  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_indirect_data_reference): Set flag to
	indicate that the new symbol is an indirection.
	(machopic_indirect_call_target): Likewise.
	* config/darwin.h (MACHO_SYMBOL_FLAG_INDIRECTION): New.
	(MACHO_SYMBOL_INDIRECTION_P): New.
	(MACHO_SYMBOL_FLAG_STATIC): Adjust bit number.

From-SVN: r276767
---
 gcc/ChangeLog       | 9 +++++++++
 gcc/config/darwin.c | 2 ++
 gcc/config/darwin.h | 9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a02d211..e66d065 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-09  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (machopic_indirect_data_reference): Set flag to
+	indicate that the new symbol is an indirection.
+	(machopic_indirect_call_target): Likewise.
+	* config/darwin.h (MACHO_SYMBOL_FLAG_INDIRECTION): New.
+	(MACHO_SYMBOL_INDIRECTION_P): New.
+	(MACHO_SYMBOL_FLAG_STATIC): Adjust bit number.
+
 2019-10-08  Jason Merrill  <jason@redhat.com>
 
 	* doc/invoke.texi: Document -fconcepts-ts.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 679e0c2..35d0444 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -707,6 +707,7 @@ machopic_indirect_data_reference (rtx orig, rtx reg)
 		  machopic_indirection_name (orig, /*stub_p=*/false)));
 
       SYMBOL_REF_DATA (ptr_ref) = SYMBOL_REF_DATA (orig);
+      SYMBOL_REF_FLAGS (ptr_ref) |= MACHO_SYMBOL_FLAG_INDIRECTION;
 
       ptr_ref = gen_const_mem (Pmode, ptr_ref);
       machopic_define_symbol (ptr_ref);
@@ -806,6 +807,7 @@ machopic_indirect_call_target (rtx target)
 
       XEXP (target, 0) = gen_rtx_SYMBOL_REF (mode, stub_name);
       SYMBOL_REF_DATA (XEXP (target, 0)) = SYMBOL_REF_DATA (sym_ref);
+      SYMBOL_REF_FLAGS (XEXP (target, 0)) |= MACHO_SYMBOL_FLAG_INDIRECTION;
       MEM_READONLY_P (target) = 1;
       MEM_NOTRAP_P (target) = 1;
     }
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 7fab869..f331fa1 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -843,12 +843,19 @@ extern GTY(()) section * darwin_sections[NUM_DARWIN_SECTIONS];
 #define MACHO_SYMBOL_HIDDEN_VIS_P(RTX) \
   ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_HIDDEN_VIS) != 0)
 
+/* Set on a symbol that is a pic stub or symbol indirection (i.e. the
+   L_xxxxx${stub,non_lazy_ptr,lazy_ptr}.  */
+
+#define MACHO_SYMBOL_FLAG_INDIRECTION ((SYMBOL_FLAG_SUBT_DEP) << 5)
+#define MACHO_SYMBOL_INDIRECTION_P(RTX) \
+  ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_INDIRECTION) != 0)
+
 /* Set on a symbol to indicate when fix-and-continue style code
    generation is being used and the symbol refers to a static symbol
    that should be rebound from new instances of a translation unit to
    the original instance of the data.  */
 
-#define MACHO_SYMBOL_FLAG_STATIC ((SYMBOL_FLAG_SUBT_DEP) << 5)
+#define MACHO_SYMBOL_FLAG_STATIC ((SYMBOL_FLAG_SUBT_DEP) << 6)
 #define MACHO_SYMBOL_STATIC_P(RTX) \
   ((SYMBOL_REF_FLAGS (RTX) & MACHO_SYMBOL_FLAG_STATIC) != 0)
 
-- 
cgit v1.1


From dee1497cbb3dacdbc73474340b9e73de72f09140 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Wed, 9 Oct 2019 18:48:38 +0000
Subject: [Darwin] Improve Objective-C NeXT ABI version check.

We were missing a check for the case that user's ABI was > 2 and the
codegen was for 64 bit.

gcc/ChangeLog:

2019-10-09  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (darwin_override_options): Make the check for
	Objective-C ABI version more specific for 64bit code.

From-SVN: r276768
---
 gcc/ChangeLog       |  5 +++++
 gcc/config/darwin.c | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e66d065..ecbe825 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-09  Iain Sandoe  <iain@sandoe.co.uk>
 
+	* config/darwin.c (darwin_override_options): Make the check for
+	Objective-C ABI version more specific for 64bit code.
+
+2019-10-09  Iain Sandoe  <iain@sandoe.co.uk>
+
 	* config/darwin.c (machopic_indirect_data_reference): Set flag to
 	indicate that the new symbol is an indirection.
 	(machopic_indirect_call_target): Likewise.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 35d0444..f490f62 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -3114,18 +3114,19 @@ darwin_override_options (void)
 				: (generating_for_darwin_version >= 9) ? 1
 								       : 0);
 
-  /* Objective-C family ABI 2 is only valid for next/m64 at present.  */
   if (global_options_set.x_flag_objc_abi && flag_next_runtime)
     {
-      if (TARGET_64BIT && global_options.x_flag_objc_abi < 2)
-	error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> must be greater"
-				    " than or equal to 2 for %<-m64%> targets"
-				    " with %<-fnext-runtime%>");
-      if (!TARGET_64BIT && global_options.x_flag_objc_abi >= 2)
-	error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> %d is not"
-				    " supported on %<-m32%> targets with"
-				    " %<-fnext-runtime%>",
-				    global_options.x_flag_objc_abi);
+      if (TARGET_64BIT && global_options.x_flag_objc_abi != 2)
+	/* The Objective-C family ABI 2 is the only valid version NeXT/m64.  */
+	error_at (UNKNOWN_LOCATION,
+		  "%<-fobjc-abi-version%> 2 must be used for 64 bit targets"
+		  " with %<-fnext-runtime%>");
+      else if (!TARGET_64BIT && global_options.x_flag_objc_abi >= 2)
+	/* ABI versions 0 and 1 are the only valid versions NeXT/m32.  */
+	error_at (UNKNOWN_LOCATION,
+		  "%<-fobjc-abi-version%> %d is not supported for 32 bit"
+		  " targets with %<-fnext-runtime%>",
+		  global_options.x_flag_objc_abi);
     }
 
   /* Don't emit DWARF3/4 unless specifically selected.  This is a
-- 
cgit v1.1


From 3b29211acb2b463a664875bf55cec0242e95d2ea Mon Sep 17 00:00:00 2001
From: Marek Polacek <mpolacek@gcc.gnu.org>
Date: Wed, 9 Oct 2019 20:38:13 +0000
Subject: Fix typo in test name.

From-SVN: r276770
---
 gcc/testsuite/g++.dg/cpp0x/initlist-array1.C  | 5 +++++
 gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-array1.C
 delete mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C

(limited to 'gcc')

diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array1.C
new file mode 100644
index 0000000..925ab16
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array1.C
@@ -0,0 +1,5 @@
+// { dg-do compile { target c++11 } }
+
+typedef int IRT[2];
+
+const IRT& ir = IRT{1,2};
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C
deleted file mode 100644
index 925ab16..0000000
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-arrray1.C
+++ /dev/null
@@ -1,5 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-typedef int IRT[2];
-
-const IRT& ir = IRT{1,2};
-- 
cgit v1.1


From 89e0a492af5bec8ffa2ec5d99c4858df50d22c16 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Wed, 9 Oct 2019 20:58:00 +0000
Subject: Implement C++20 P0388R4, DR 1307, and DR 330.

This patch implements P0388R4, Permit conversions to arrays of unknown bound,
<http://wg21.link/p0388r4>.  CWG 393 allowed references to arrays of unknown
bound and this C++20 feature allows conversions like

  void f(int(&)[]);
  int arr[1];

  void g() { f(arr); }
  int(&r)[] = arr;

The proposal seemed fairly straightforward but it turned out to be quite
shifty.  I found out that I needed to implement DR 2352 (done), and also
DR 1307 (done in this patch).  The latter DR added wording for
list-initialization ranking of references to arrays which this proposal
extends.  DR 330 was also implemented in this patch.

	PR c++/91364 - P0388R4: Permit conversions to arrays of	unknown bound.
	PR c++/69531 - DR 1307: Differently bounded array parameters.
	PR c++/88128 - DR 330: Qual convs and pointers to arrays of pointers.
	* call.c (build_array_conv): Build ck_identity at the beginning
	of the conversion.
	(standard_conversion): Pass bounds_none to comp_ptr_ttypes_const.
	(maybe_warn_array_conv): New.
	(convert_like_real): Call it.  Add an error message about converting
	from arrays of unknown bounds.
	(conv_get_original_expr): New.
	(nelts_initialized_by_list_init): New.
	(conv_binds_to_array_of_unknown_bound): New.
	(compare_ics): Implement list-initialization ranking based on
	array sizes, as specified in DR 1307 and P0388R.
	* cp-tree.h (comp_ptr_ttypes_const): Adjust declaration.
	(compare_bounds_t): New enum.
	* typeck.c (comp_array_types): New bool and compare_bounds_t
	parameters.  Use them.
	(structural_comptypes): Adjust the call to comp_array_types.
	(similar_type_p): Handle ARRAY_TYPE.
	(build_const_cast_1): Pass bounds_none to comp_ptr_ttypes_const.
	(comp_ptr_ttypes_real): Don't check cv-quals of ARRAY_TYPEs.  Use
	comp_array_types to compare array types.  Look through arrays as per
	DR 330.
	(comp_ptr_ttypes_const): Use comp_array_types to compare array types.
	Look through arrays as per DR 330.

	* g++.dg/conversion/qual1.C: New test.
	* g++.dg/conversion/qual2.C: New test.
	* g++.dg/conversion/qual3.C: New test.
	* g++.dg/conversion/ref2.C: New test.
	* g++.dg/conversion/ref3.C: New test.
	* g++.dg/cpp0x/initlist-array3.C: Remove dg-error.
	* g++.dg/cpp0x/initlist-array7.C: New test.
	* g++.dg/cpp0x/initlist-array8.C: New test.
	* g++.dg/cpp2a/array-conv1.C: New test.
	* g++.dg/cpp2a/array-conv10.C: New test.
	* g++.dg/cpp2a/array-conv11.C: New test.
	* g++.dg/cpp2a/array-conv12.C: New test.
	* g++.dg/cpp2a/array-conv13.C: New test.
	* g++.dg/cpp2a/array-conv14.C: New test.
	* g++.dg/cpp2a/array-conv15.C: New test.
	* g++.dg/cpp2a/array-conv16.C: New test.
	* g++.dg/cpp2a/array-conv17.C: New test.
	* g++.dg/cpp2a/array-conv2.C: New test.
	* g++.dg/cpp2a/array-conv3.C: New test.
	* g++.dg/cpp2a/array-conv4.C: New test.
	* g++.dg/cpp2a/array-conv5.C: New test.
	* g++.dg/cpp2a/array-conv6.C: New test.
	* g++.dg/cpp2a/array-conv7.C: New test.
	* g++.dg/cpp2a/array-conv8.C: New test.
	* g++.dg/cpp2a/array-conv9.C: New test.
	* g++.old-deja/g++.bugs/900321_01.C: Adjust dg-error.

	* testsuite/23_containers/span/lwg3255.cc: Adjust test to match the
	post-P0388R4 behavior.

From-SVN: r276771
---
 gcc/cp/ChangeLog                                |  29 +++++
 gcc/cp/call.c                                   | 160 ++++++++++++++++++++++--
 gcc/cp/cp-tree.h                                |   6 +-
 gcc/cp/typeck.c                                 |  66 +++++++---
 gcc/testsuite/ChangeLog                         |  32 +++++
 gcc/testsuite/g++.dg/conversion/qual1.C         |  51 ++++++++
 gcc/testsuite/g++.dg/conversion/qual2.C         |  14 +++
 gcc/testsuite/g++.dg/conversion/qual3.C         |  53 ++++++++
 gcc/testsuite/g++.dg/conversion/ref2.C          |  29 +++++
 gcc/testsuite/g++.dg/conversion/ref3.C          |   4 +
 gcc/testsuite/g++.dg/cpp0x/initlist-array3.C    |   3 +-
 gcc/testsuite/g++.dg/cpp0x/initlist-array7.C    |  21 ++++
 gcc/testsuite/g++.dg/cpp0x/initlist-array8.C    |  35 ++++++
 gcc/testsuite/g++.dg/cpp2a/array-conv1.C        |  33 +++++
 gcc/testsuite/g++.dg/cpp2a/array-conv10.C       |  22 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv11.C       |  23 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv12.C       |  12 ++
 gcc/testsuite/g++.dg/cpp2a/array-conv13.C       |  17 +++
 gcc/testsuite/g++.dg/cpp2a/array-conv14.C       |  17 +++
 gcc/testsuite/g++.dg/cpp2a/array-conv15.C       |  23 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv16.C       |  16 +++
 gcc/testsuite/g++.dg/cpp2a/array-conv17.C       |  39 ++++++
 gcc/testsuite/g++.dg/cpp2a/array-conv2.C        |  26 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv3.C        |  26 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv4.C        |  24 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv5.C        |  24 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv6.C        |  28 +++++
 gcc/testsuite/g++.dg/cpp2a/array-conv7.C        |  34 +++++
 gcc/testsuite/g++.dg/cpp2a/array-conv8.C        |  26 ++++
 gcc/testsuite/g++.dg/cpp2a/array-conv9.C        |  27 ++++
 gcc/testsuite/g++.old-deja/g++.bugs/900321_01.C |   2 +-
 31 files changed, 893 insertions(+), 29 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/conversion/qual1.C
 create mode 100644 gcc/testsuite/g++.dg/conversion/qual2.C
 create mode 100644 gcc/testsuite/g++.dg/conversion/qual3.C
 create mode 100644 gcc/testsuite/g++.dg/conversion/ref2.C
 create mode 100644 gcc/testsuite/g++.dg/conversion/ref3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-array7.C
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-array8.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv10.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv11.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv12.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv13.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv14.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv15.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv16.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv17.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv2.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv5.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv7.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv8.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/array-conv9.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4eb18294..e47e8ca 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,34 @@
 2019-10-09  Marek Polacek  <polacek@redhat.com>
 
+	PR c++/91364 - P0388R4: Permit conversions to arrays of	unknown bound.
+	PR c++/69531 - DR 1307: Differently bounded array parameters.
+	PR c++/88128 - DR 330: Qual convs and pointers to arrays of pointers.
+	* call.c (build_array_conv): Build ck_identity at the beginning
+	of the conversion.
+	(standard_conversion): Pass bounds_none to comp_ptr_ttypes_const.
+	(maybe_warn_array_conv): New.
+	(convert_like_real): Call it.  Add an error message about converting
+	from arrays of unknown bounds.
+	(conv_get_original_expr): New.
+	(nelts_initialized_by_list_init): New.
+	(conv_binds_to_array_of_unknown_bound): New.
+	(compare_ics): Implement list-initialization ranking based on
+	array sizes, as specified in DR 1307 and P0388R.
+	* cp-tree.h (comp_ptr_ttypes_const): Adjust declaration.
+	(compare_bounds_t): New enum.
+	* typeck.c (comp_array_types): New bool and compare_bounds_t
+	parameters.  Use them.
+	(structural_comptypes): Adjust the call to comp_array_types.
+	(similar_type_p): Handle ARRAY_TYPE.
+	(build_const_cast_1): Pass bounds_none to comp_ptr_ttypes_const.
+	(comp_ptr_ttypes_real): Don't check cv-quals of ARRAY_TYPEs.  Use
+	comp_array_types to compare array types.  Look through arrays as per
+	DR 330.
+	(comp_ptr_ttypes_const): Use comp_array_types to compare array types.
+	Look through arrays as per DR 330.
+
+2019-10-09  Marek Polacek  <polacek@redhat.com>
+
 	PR c++/92032 - DR 1601: Promotion of enum with fixed underlying	type.
 	* call.c (standard_conversion): When converting an enumeration with
 	a fixed underlying type to the underlying type, give it the cr_promotion
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 33ec6a2..55d2aba 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -122,7 +122,8 @@ struct conversion {
        of using this field directly.  */
     conversion *next;
     /* The expression at the beginning of the conversion chain.  This
-       variant is used only if KIND is ck_identity or ck_ambig.  */
+       variant is used only if KIND is ck_identity or ck_ambig.  You can
+       use conv_get_original_expr to get this expression.  */
     tree expr;
     /* The array of conversions for an initializer_list, so this
        variant is used only when KIN D is ck_list.  */
@@ -223,6 +224,8 @@ static void add_candidates (tree, tree, const vec<tree, va_gc> *, tree, tree,
 			    tsubst_flags_t);
 static conversion *merge_conversion_sequences (conversion *, conversion *);
 static tree build_temp (tree, tree, int, diagnostic_t *, tsubst_flags_t);
+static conversion *build_identity_conv (tree, tree);
+static inline bool conv_binds_to_array_of_unknown_bound (conversion *);
 
 /* Returns nonzero iff the destructor name specified in NAME matches BASETYPE.
    NAME can take many forms...  */
@@ -1066,7 +1069,7 @@ build_array_conv (tree type, tree ctor, int flags, tsubst_flags_t complain)
   c->rank = rank;
   c->user_conv_p = user;
   c->bad_p = bad;
-  c->u.next = NULL;
+  c->u.next = build_identity_conv (TREE_TYPE (ctor), ctor);
   return c;
 }
 
@@ -1366,7 +1369,7 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p,
 
       if (same_type_p (from, to))
 	/* OK */;
-      else if (c_cast_p && comp_ptr_ttypes_const (to, from))
+      else if (c_cast_p && comp_ptr_ttypes_const (to, from, bounds_either))
 	/* In a C-style cast, we ignore CV-qualification because we
 	   are allowed to perform a static_cast followed by a
 	   const_cast.  */
@@ -1668,7 +1671,14 @@ reference_binding (tree rto, tree rfrom, tree expr, bool c_cast_p, int flags,
       maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
       /* DR 1288: Otherwise, if the initializer list has a single element
 	 of type E and ... [T's] referenced type is reference-related to E,
-	 the object or reference is initialized from that element... */
+	 the object or reference is initialized from that element...
+
+	 ??? With P0388R4, we should bind 't' directly to U{}:
+	   using U = A[2];
+	   A (&&t)[] = {U{}};
+	 because A[] and A[2] are reference-related.  But we don't do it
+	 because grok_reference_init has deduced the array size (to 1), and
+	 A[1] and A[2] aren't reference-related.  */
       if (CONSTRUCTOR_NELTS (expr) == 1)
 	{
 	  tree elt = CONSTRUCTOR_ELT (expr, 0)->value;
@@ -6958,6 +6968,27 @@ maybe_inform_about_fndecl_for_bogus_argument_init (tree fn, int argnum)
 	    "  initializing argument %P of %qD", argnum, fn);
 }
 
+/* Maybe warn about C++20 Conversions to arrays of unknown bound.  C is
+   the conversion, EXPR is the expression we're converting.  */
+
+static void
+maybe_warn_array_conv (location_t loc, conversion *c, tree expr)
+{
+  if (cxx_dialect >= cxx2a)
+    return;
+
+  tree type = TREE_TYPE (expr);
+  type = strip_pointer_operator (type);
+
+  if (TREE_CODE (type) != ARRAY_TYPE
+      || TYPE_DOMAIN (type) == NULL_TREE)
+    return;
+
+  if (conv_binds_to_array_of_unknown_bound (c))
+    pedwarn (loc, OPT_Wpedantic, "conversions to arrays of unknown bound "
+	     "are only available with %<-std=c++2a%> or %<-std=gnu++2a%>");
+}
+
 /* Perform the conversions in CONVS on the expression EXPR.  FN and
    ARGNUM are used for diagnostics.  ARGNUM is zero based, -1
    indicates the `this' argument of a method.  INNER is nonzero when
@@ -7377,8 +7408,20 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
 	      error_at (loc, "cannot bind non-const lvalue reference of "
 			"type %qH to an rvalue of type %qI", totype, extype);
 	    else if (!reference_compatible_p (TREE_TYPE (totype), extype))
-	      error_at (loc, "binding reference of type %qH to %qI "
-			"discards qualifiers", totype, extype);
+	      {
+		/* If we're converting from T[] to T[N], don't talk
+		   about discarding qualifiers.  (Converting from T[N] to
+		   T[] is allowed by P0388R4.)  */
+		if (TREE_CODE (extype) == ARRAY_TYPE
+		    && TYPE_DOMAIN (extype) == NULL_TREE
+		    && TREE_CODE (TREE_TYPE (totype)) == ARRAY_TYPE
+		    && TYPE_DOMAIN (TREE_TYPE (totype)) != NULL_TREE)
+		  error_at (loc, "cannot bind reference of type %qH to %qI "
+			    "due to different array bounds", totype, extype);
+		else
+		  error_at (loc, "binding reference of type %qH to %qI "
+			    "discards qualifiers", totype, extype);
+	      }
 	    else
 	      gcc_unreachable ();
 	    maybe_print_user_conv_context (convs);
@@ -7386,6 +7429,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
 
 	    return error_mark_node;
 	  }
+	else if (complain & tf_warning)
+	  maybe_warn_array_conv (loc, convs, expr);
 
 	/* If necessary, create a temporary. 
 
@@ -7469,7 +7514,10 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
     case ck_qual:
       /* Warn about deprecated conversion if appropriate.  */
       if (complain & tf_warning)
-	string_conv_p (totype, expr, 1);
+	{
+	  string_conv_p (totype, expr, 1);
+	  maybe_warn_array_conv (loc, convs, expr);
+	}
       break;
 
     case ck_ptr:
@@ -10061,6 +10109,50 @@ maybe_handle_ref_bind (conversion **ics)
   return NULL;
 }
 
+/* Get the expression at the beginning of the conversion chain C.  */
+
+static tree
+conv_get_original_expr (conversion *c)
+{
+  for (; c; c = next_conversion (c))
+    if (c->kind == ck_identity || c->kind == ck_ambig)
+      return c->u.expr;
+  return NULL_TREE;
+}
+
+/* Return a tree representing the number of elements initialized by the
+   list-initialization C.  The caller must check that C converts to an
+   array type.  */
+
+static tree
+nelts_initialized_by_list_init (conversion *c)
+{
+  /* If the array we're converting to has a dimension, we'll use that.  */
+  if (TYPE_DOMAIN (c->type))
+    return array_type_nelts_top (c->type);
+  else
+    {
+      /* Otherwise, we look at how many elements the constructor we're
+	 initializing from has.  */
+      tree ctor = conv_get_original_expr (c);
+      return size_int (CONSTRUCTOR_NELTS (ctor));
+    }
+}
+
+/* True iff C is a conversion that binds a reference or a pointer to
+   an array of unknown bound.  */
+
+static inline bool
+conv_binds_to_array_of_unknown_bound (conversion *c)
+{
+  /* ck_ref_bind won't have the reference stripped.  */
+  tree type = non_reference (c->type);
+  /* ck_qual won't have the pointer stripped.  */
+  type = strip_pointer_operator (type);
+  return (TREE_CODE (type) == ARRAY_TYPE
+	  && TYPE_DOMAIN (type) == NULL_TREE);
+}
+
 /* Compare two implicit conversion sequences according to the rules set out in
    [over.ics.rank].  Return values:
 
@@ -10174,6 +10266,38 @@ compare_ics (conversion *ics1, conversion *ics2)
 	  if (f1 != f2)
 	    return 0;
 	}
+      /* List-initialization sequence L1 is a better conversion sequence than
+	 list-initialization sequence L2 if
+
+	 -- L1 and L2 convert to arrays of the same element type, and either
+	 the number of elements n1 initialized by L1 is less than the number
+	 of elements n2 initialized by L2, or n1=n2 and L2 converts to an array
+	 of unknown bound and L1 does not.  (Added in CWG 1307 and extended by
+	 P0388R4.)  */
+      else if (t1->kind == ck_aggr
+	       && TREE_CODE (t1->type) == ARRAY_TYPE
+	       && TREE_CODE (t2->type) == ARRAY_TYPE)
+	{
+	  /* The type of the array elements must be the same.  */
+	  if (!same_type_p (TREE_TYPE (t1->type), TREE_TYPE (t2->type)))
+	    return 0;
+
+	  tree n1 = nelts_initialized_by_list_init (t1);
+	  tree n2 = nelts_initialized_by_list_init (t2);
+	  if (tree_int_cst_lt (n1, n2))
+	    return 1;
+	  else if (tree_int_cst_lt (n2, n1))
+	    return -1;
+	  /* The n1 == n2 case.  */
+	  bool c1 = conv_binds_to_array_of_unknown_bound (t1);
+	  bool c2 = conv_binds_to_array_of_unknown_bound (t2);
+	  if (c1 && !c2)
+	    return -1;
+	  else if (!c1 && c2)
+	    return 1;
+	  else
+	    return 0;
+	}
       else
 	{
 	  /* For ambiguous or aggregate conversions, use the target type as
@@ -10469,6 +10593,28 @@ compare_ics (conversion *ics1, conversion *ics2)
 
       if (same_type_ignoring_top_level_qualifiers_p (to_type1, to_type2))
 	{
+	  /* Per P0388R4:
+
+	    void f (int(&)[]),     // (1)
+		 f (int(&)[1]),    // (2)
+		 f (int*);	   // (3)
+
+	    (2) is better than (1), but (3) should be equal to (1) and to
+	    (2).  For that reason we don't use ck_qual for (1) which would
+	    give it the cr_exact rank while (3) remains ck_identity.
+	    Therefore we compare (1) and (2) here.  For (1) we'll have
+
+	      ck_ref_bind <- ck_identity
+		int[] &	       int[1]
+
+	    so to handle this we must look at ref_conv.  */
+	  bool c1 = conv_binds_to_array_of_unknown_bound (ref_conv1);
+	  bool c2 = conv_binds_to_array_of_unknown_bound (ref_conv2);
+	  if (c1 && !c2)
+	    return -1;
+	  else if (!c1 && c2)
+	    return 1;
+
 	  int q1 = cp_type_quals (TREE_TYPE (ref_conv1->type));
 	  int q2 = cp_type_quals (TREE_TYPE (ref_conv2->type));
 	  if (ref_conv1->bad_p)
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 9ff617b..c1301a4 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -7372,6 +7372,10 @@ extern void cxx_print_error_function		(diagnostic_context *,
 						 struct diagnostic_info *);
 
 /* in typeck.c */
+/* Says how we should behave when comparing two arrays one of which
+   has unknown bounds.  */
+enum compare_bounds_t { bounds_none, bounds_either, bounds_first };
+
 extern bool cxx_mark_addressable		(tree, bool = false);
 extern int string_conv_p			(const_tree, const_tree, int);
 extern tree cp_truthvalue_conversion		(tree);
@@ -7462,7 +7466,7 @@ extern tree convert_for_initialization		(tree, tree, tree, int,
 						 impl_conv_rhs, tree, int,
                                                  tsubst_flags_t);
 extern int comp_ptr_ttypes			(tree, tree);
-extern bool comp_ptr_ttypes_const		(tree, tree);
+extern bool comp_ptr_ttypes_const		(tree, tree, compare_bounds_t);
 extern bool error_type_p			(const_tree);
 extern bool ptr_reasonably_similar		(const_tree, const_tree);
 extern tree build_ptrmemfunc			(tree, tree, int, bool,
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index ba334e7..a67dd4b 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -54,7 +54,7 @@ static tree rationalize_conditional_expr (enum tree_code, tree,
 					  tsubst_flags_t);
 static int comp_ptr_ttypes_real (tree, tree, int);
 static bool comp_except_types (tree, tree, bool);
-static bool comp_array_types (const_tree, const_tree, bool);
+static bool comp_array_types (const_tree, const_tree, compare_bounds_t, bool);
 static tree pointer_diff (location_t, tree, tree, tree, tsubst_flags_t, tree *);
 static tree get_delta_difference (tree, tree, bool, bool, tsubst_flags_t);
 static void casts_away_constness_r (tree *, tree *, tsubst_flags_t);
@@ -1084,11 +1084,15 @@ comp_except_specs (const_tree t1, const_tree t2, int exact)
   return exact == ce_derived || base == NULL_TREE || length == list_length (t1);
 }
 
-/* Compare the array types T1 and T2.  ALLOW_REDECLARATION is true if
-   [] can match [size].  */
+/* Compare the array types T1 and T2.  CB says how we should behave when
+   comparing array bounds: bounds_none doesn't allow dimensionless arrays,
+   bounds_either says than any array can be [], bounds_first means that
+   onlt T1 can be an array with unknown bounds.  STRICT is true if
+   qualifiers must match when comparing the types of the array elements.  */
 
 static bool
-comp_array_types (const_tree t1, const_tree t2, bool allow_redeclaration)
+comp_array_types (const_tree t1, const_tree t2, compare_bounds_t cb,
+		  bool strict)
 {
   tree d1;
   tree d2;
@@ -1098,7 +1102,9 @@ comp_array_types (const_tree t1, const_tree t2, bool allow_redeclaration)
     return true;
 
   /* The type of the array elements must be the same.  */
-  if (!same_type_p (TREE_TYPE (t1), TREE_TYPE (t2)))
+  if (strict
+      ? !same_type_p (TREE_TYPE (t1), TREE_TYPE (t2))
+      : !similar_type_p (TREE_TYPE (t1), TREE_TYPE (t2)))
     return false;
 
   d1 = TYPE_DOMAIN (t1);
@@ -1119,8 +1125,10 @@ comp_array_types (const_tree t1, const_tree t2, bool allow_redeclaration)
        declarations for an array object can specify
        array types that differ by the presence or absence of a major
        array bound (_dcl.array_).  */
-  if (!d1 || !d2)
-    return allow_redeclaration;
+  if (!d1 && d2)
+    return cb >= bounds_either;
+  else if (d1 && !d2)
+    return cb == bounds_either;
 
   /* Check that the dimensions are the same.  */
 
@@ -1368,7 +1376,9 @@ structural_comptypes (tree t1, tree t2, int strict)
 
     case ARRAY_TYPE:
       /* Target types must match incl. qualifiers.  */
-      if (!comp_array_types (t1, t2, !!(strict & COMPARE_REDECLARATION)))
+      if (!comp_array_types (t1, t2, ((strict & COMPARE_REDECLARATION)
+				      ? bounds_either : bounds_none),
+			     /*strict=*/true))
 	return false;
       break;
 
@@ -1549,10 +1559,10 @@ similar_type_p (tree type1, tree type2)
   if (same_type_ignoring_top_level_qualifiers_p (type1, type2))
     return true;
 
-  /* FIXME This ought to handle ARRAY_TYPEs too.  */
   if ((TYPE_PTR_P (type1) && TYPE_PTR_P (type2))
-      || (TYPE_PTRDATAMEM_P (type1) && TYPE_PTRDATAMEM_P (type2)))
-    return comp_ptr_ttypes_const (type1, type2);
+      || (TYPE_PTRDATAMEM_P (type1) && TYPE_PTRDATAMEM_P (type2))
+      || (TREE_CODE (type1) == ARRAY_TYPE && TREE_CODE (type2) == ARRAY_TYPE))
+    return comp_ptr_ttypes_const (type1, type2, bounds_either);
 
   return false;
 }
@@ -7867,7 +7877,7 @@ build_const_cast_1 (tree dst_type, tree expr, tsubst_flags_t complain,
 
   if (TYPE_PTR_P (src_type) || TYPE_PTRDATAMEM_P (src_type))
     {
-      if (comp_ptr_ttypes_const (dst_type, src_type))
+      if (comp_ptr_ttypes_const (dst_type, src_type, bounds_none))
 	{
 	  if (valid_p)
 	    {
@@ -9909,9 +9919,10 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
 			   TYPE_OFFSET_BASETYPE (to)))
 	return 0;
 
-      /* Const and volatile mean something different for function types,
-	 so the usual checks are not appropriate.  */
-      if (!FUNC_OR_METHOD_TYPE_P (to))
+      /* Const and volatile mean something different for function and
+	 array types, so the usual checks are not appropriate.  We'll
+	 check the array type elements in further iterations.  */
+      if (!FUNC_OR_METHOD_TYPE_P (to) && TREE_CODE (to) != ARRAY_TYPE)
 	{
 	  if (!at_least_as_qualified_p (to, from))
 	    return 0;
@@ -9930,7 +9941,17 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
       if (VECTOR_TYPE_P (to))
 	is_opaque_pointer = vector_targets_convertible_p (to, from);
 
-      if (!TYPE_PTR_P (to) && !TYPE_PTRDATAMEM_P (to))
+      /* P0388R4 allows a conversion from int[N] to int[] but not the
+	 other way round.  When both arrays have bounds but they do
+	 not match, then no conversion is possible.  */
+      if (TREE_CODE (to) == ARRAY_TYPE
+	  && !comp_array_types (to, from, bounds_first, /*strict=*/false))
+	return 0;
+
+      if (!TYPE_PTR_P (to)
+	  && !TYPE_PTRDATAMEM_P (to)
+	  /* CWG 330 says we need to look through arrays.  */
+	  && TREE_CODE (to) != ARRAY_TYPE)
 	return ((constp >= 0 || to_more_cv_qualified)
 		&& (is_opaque_pointer
 		    || same_type_ignoring_top_level_qualifiers_p (to, from)));
@@ -10033,10 +10054,10 @@ ptr_reasonably_similar (const_tree to, const_tree from)
 
 /* Return true if TO and FROM (both of which are POINTER_TYPEs or
    pointer-to-member types) are the same, ignoring cv-qualification at
-   all levels.  */
+   all levels.  CB says how we should behave when comparing array bounds.  */
 
 bool
-comp_ptr_ttypes_const (tree to, tree from)
+comp_ptr_ttypes_const (tree to, tree from, compare_bounds_t cb)
 {
   bool is_opaque_pointer = false;
 
@@ -10053,7 +10074,14 @@ comp_ptr_ttypes_const (tree to, tree from)
       if (VECTOR_TYPE_P (to))
 	is_opaque_pointer = vector_targets_convertible_p (to, from);
 
-      if (!TYPE_PTR_P (to))
+      if (TREE_CODE (to) == ARRAY_TYPE
+	  /* Ignore cv-qualification, but if we see e.g. int[3] and int[4],
+	     we must fail.  */
+	  && !comp_array_types (to, from, cb, /*strict=*/false))
+	return false;
+
+      /* CWG 330 says we need to look through arrays.  */
+      if (!TYPE_PTR_P (to) && TREE_CODE (to) != ARRAY_TYPE)
 	return (is_opaque_pointer
 		|| same_type_ignoring_top_level_qualifiers_p (to, from));
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1e3a99..5ee2a81 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,37 @@
 2019-10-09  Marek Polacek  <polacek@redhat.com>
 
+	PR c++/91364 - P0388R4: Permit conversions to arrays of	unknown bound.
+	PR c++/69531 - DR 1307: Differently bounded array parameters.
+	PR c++/88128 - DR 330: Qual convs and pointers to arrays of pointers.
+	* g++.dg/conversion/qual1.C: New test.
+	* g++.dg/conversion/qual2.C: New test.
+	* g++.dg/conversion/qual3.C: New test.
+	* g++.dg/conversion/ref2.C: New test.
+	* g++.dg/conversion/ref3.C: New test.
+	* g++.dg/cpp0x/initlist-array3.C: Remove dg-error.
+	* g++.dg/cpp0x/initlist-array7.C: New test.
+	* g++.dg/cpp0x/initlist-array8.C: New test.
+	* g++.dg/cpp2a/array-conv1.C: New test.
+	* g++.dg/cpp2a/array-conv10.C: New test.
+	* g++.dg/cpp2a/array-conv11.C: New test.
+	* g++.dg/cpp2a/array-conv12.C: New test.
+	* g++.dg/cpp2a/array-conv13.C: New test.
+	* g++.dg/cpp2a/array-conv14.C: New test.
+	* g++.dg/cpp2a/array-conv15.C: New test.
+	* g++.dg/cpp2a/array-conv16.C: New test.
+	* g++.dg/cpp2a/array-conv17.C: New test.
+	* g++.dg/cpp2a/array-conv2.C: New test.
+	* g++.dg/cpp2a/array-conv3.C: New test.
+	* g++.dg/cpp2a/array-conv4.C: New test.
+	* g++.dg/cpp2a/array-conv5.C: New test.
+	* g++.dg/cpp2a/array-conv6.C: New test.
+	* g++.dg/cpp2a/array-conv7.C: New test.
+	* g++.dg/cpp2a/array-conv8.C: New test.
+	* g++.dg/cpp2a/array-conv9.C: New test.
+	* g++.old-deja/g++.bugs/900321_01.C: Adjust dg-error.
+
+2019-10-09  Marek Polacek  <polacek@redhat.com>
+
 	PR c++/92032 - DR 1601: Promotion of enum with fixed underlying	type.
 	* g++.dg/cpp0x/scoped_enum10.C: New test.
 	* g++.dg/cpp0x/scoped_enum11.C: New test.
diff --git a/gcc/testsuite/g++.dg/conversion/qual1.C b/gcc/testsuite/g++.dg/conversion/qual1.C
new file mode 100644
index 0000000..5022da9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/qual1.C
@@ -0,0 +1,51 @@
+// PR c++/88128 - Implement DR 330: Qualification conversions and pointers to
+// arrays of pointers.
+
+int *a[4];
+const int *const(*ap1)[4] = &a;
+/* if at some level k the P2 is more cv-qualified than P1, then there
+   must be a const at every single level (other than level zero) of P2
+   up until k.  */
+const int *(*ap2)[4] = &a; // { dg-error "cannot convert" }
+int *const(*ap3)[4] = &a;
+int *(*ap4)[4] = &a;
+int *(*const ap5)[4] = &a;
+const int *const(*const ap6)[4] = &a;
+int *const(*const ap7)[4] = &a;
+int *(*const ap8)[4] = &a;
+
+const int *b[4];
+const int *const(*bp1)[4] = &b;
+const int *(*bp2)[4] = &b;
+int *const(*bp3)[4] = &b; // { dg-error "cannot convert" }
+int *(*bp4)[4] = &b; // { dg-error "cannot convert" }
+int *(*const bp5)[4] = &b; // { dg-error "cannot convert" }
+const int *const(*const bp6)[4] = &b;
+int *const(*const bp7)[4] = &b; // { dg-error "cannot convert" }
+int *(*const bp8)[4] = &b; // { dg-error "cannot convert" }
+
+int *c[2][3];
+int const *const (*cp1)[3] = c;
+int const *(*cp2)[3] = c; // { dg-error "cannot convert" }
+int const *const (*const cp3)[3] = c;
+int *const (*cp4)[3] = c;
+int *(*cp5)[3] = c;
+
+double *const (*d)[3];
+double const *const (*e)[3] = d;
+int *(*f)[3];
+const int *const (*g)[3] = f;
+
+// From PR88128.
+int* (*xx)[];
+const int* const(*yy)[] = xx;
+
+// From DR 330.
+int main()
+{
+   double *array2D[2][3];
+
+   double       *       (*array2DPtr1)[3] = array2D;
+   double       * const (*array2DPtr2)[3] = array2DPtr1;
+   double const * const (*array2DPtr3)[3] = array2DPtr2;
+}
diff --git a/gcc/testsuite/g++.dg/conversion/qual2.C b/gcc/testsuite/g++.dg/conversion/qual2.C
new file mode 100644
index 0000000..8a063a0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/qual2.C
@@ -0,0 +1,14 @@
+// PR c++/88128 - DR 330: Qual convs and pointers to arrays of pointers.
+
+// Make sure we don't accept different bounds.
+
+int *a[4];
+const int *const(*ap1)[5] = &a; // { dg-error "cannot convert" }
+
+int *(*b)[3];
+const int *const (*bp1)[3] = &b; // { dg-error "cannot convert" }
+const int *const (*bp2)[4] = &b; // { dg-error "cannot convert" }
+int *(*bp3)[4] = &b; // { dg-error "cannot convert" }
+
+int *c[2][3];
+int const *const (*cp1)[4] = c; // { dg-error "cannot convert" }
diff --git a/gcc/testsuite/g++.dg/conversion/qual3.C b/gcc/testsuite/g++.dg/conversion/qual3.C
new file mode 100644
index 0000000..4b466d9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/qual3.C
@@ -0,0 +1,53 @@
+// PR c++/88128 - DR 330: Qual convs and pointers to arrays of pointers.
+// { dg-do compile { target c++17 } }
+
+using P = int *(*)[3];
+using Q = const int *const (*)[3];
+using Qi = const int *[3];
+using Q2 = Qi const *;
+using R = const int *const (*)[4];
+using S = const int *const (*)[];
+using T = const int *(*)[];
+
+void
+f (P p, Q q, Q2 q2, R r, S s, T t)
+{
+  q = p;
+  q2 = p;
+  r = p; // { dg-error "cannot convert" }
+  t = p; // { dg-error "cannot convert" }
+  s = t;
+  t = s; // { dg-error "invalid conversion" }
+
+  // Test const_cast.
+  const_cast<P>(q);
+  const_cast<P>(q2);
+  const_cast<Q>(p);
+  const_cast<Q2>(p);
+  const_cast<S>(p); // { dg-error "invalid .const_cast." }
+  const_cast<P>(s); // { dg-error "invalid .const_cast." }
+  const_cast<S>(q); // { dg-error "invalid .const_cast." }
+  const_cast<S>(q2); // { dg-error "invalid .const_cast." }
+  const_cast<Q>(s); // { dg-error "invalid .const_cast." }
+  const_cast<Q2>(s); // { dg-error "invalid .const_cast." }
+  const_cast<T>(s);
+  const_cast<S>(t);
+  const_cast<T>(q); // { dg-error "invalid .const_cast." }
+  const_cast<Q>(t); // { dg-error "invalid .const_cast." }
+
+  // Test reinterpret_cast.
+  reinterpret_cast<P>(q); // { dg-error "casts away qualifiers" }
+  reinterpret_cast<P>(q2); // { dg-error "casts away qualifiers" }
+  reinterpret_cast<Q>(p);
+  reinterpret_cast<Q2>(p);
+  reinterpret_cast<S>(p);
+  reinterpret_cast<P>(s); // { dg-error "casts away qualifiers" }
+  reinterpret_cast<S>(q);
+  reinterpret_cast<S>(q2);
+  reinterpret_cast<Q>(s);
+  reinterpret_cast<Q2>(s);
+  reinterpret_cast<T>(s); // { dg-error "casts away qualifiers" }
+  reinterpret_cast<S>(t);
+  reinterpret_cast<T>(q); // { dg-error "casts away qualifiers" }
+  reinterpret_cast<Q>(t);
+}
diff --git a/gcc/testsuite/g++.dg/conversion/ref2.C b/gcc/testsuite/g++.dg/conversion/ref2.C
new file mode 100644
index 0000000..418e711
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/ref2.C
@@ -0,0 +1,29 @@
+// PR c++/88128 - Implement DR 330: Qualification conversions and pointers to
+// arrays of pointers.
+
+int *ar[4];
+/* if at some level k the P2 is more cv-qualified than P1, then there
+   must be a const at every single level (other than level zero) of P2
+   up until k.  */
+const int *(&arp)[4] = ar; // { dg-error "discards qualifiers" }
+const int *const(&arp2)[4] = ar;
+int *const(&arp3)[4] = ar;
+int *(&arp4)[4] = ar;
+
+const int *br[4];
+const int *(&brp)[4] = br;
+const int *const(&brp2)[4] = br;
+int *const(&brp3)[4] = br; // { dg-error "discards qualifiers" }
+int *(&brp4)[4] = br; // { dg-error "discards qualifiers" }
+
+int *c[2][3];
+int const *const (&cp1)[3] = *c;
+int const *(&cp2)[3] = *c; // { dg-error "discards qualifiers" }
+int *const (&cp3)[3] = *c;
+int *(&cp4)[3] = *c;
+
+double *const (*d)[3];
+double const *const (&e)[3] = *d;
+
+int *(*f)[3];
+const int *const (&g)[3] = *f;
diff --git a/gcc/testsuite/g++.dg/conversion/ref3.C b/gcc/testsuite/g++.dg/conversion/ref3.C
new file mode 100644
index 0000000..ca5326c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/ref3.C
@@ -0,0 +1,4 @@
+int a[2];
+const int (&rc)[2] = a;
+volatile int (&rv)[2] = a;
+const volatile int (&rcv)[2] = a;
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C
index 1a94f4e..4140cd9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C
@@ -6,5 +6,6 @@ void composite (int const (&) [3]);
 
 int main ()
 {
-  composite({0,1});		// { dg-error "ambiguous" }
+  // Not ambiguous since CWG 1307.
+  composite({0,1});
 }
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array7.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array7.C
new file mode 100644
index 0000000..7a689c66
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array7.C
@@ -0,0 +1,21 @@
+// PR c++/69531 - DR 1307, Overload resolution based on size of array init-list.
+// { dg-do run { target c++11 } }
+
+int f(int const(&)[2]) { return 1; }
+int f(int const(&)[3]) { return 2; }
+
+int
+main ()
+{
+   if (f({}) != 1)
+    __builtin_abort ();
+
+   if (f({1}) != 1)
+    __builtin_abort ();
+
+   if (f({1, 2}) != 1)
+    __builtin_abort ();
+
+   if (f({1, 2, 3}) != 2)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array8.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array8.C
new file mode 100644
index 0000000..ac2774e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array8.C
@@ -0,0 +1,35 @@
+// PR c++/69531 - DR 1307, Overload resolution based on size of array init-list.
+// { dg-do run { target c++2a } }
+
+int f(int (&)[1][1]) { return 1; }
+int f(int (&)[1][2]) { return 2; }
+
+int g(int (&&)[2][1]) { return 1; }
+int g(int (&&)[2][2]) { return 2; }
+
+int h(int (&&)[][1]) { return 1; }
+int h(int (&&)[][2]) { return 2; }
+
+int
+main ()
+{
+  int arr1[1][1];
+  int arr2[1][2];
+
+  if (f(arr1) != 1)
+    __builtin_abort ();
+  if (f(arr2) != 2)
+    __builtin_abort ();
+
+  if (g({ { 1, 2 }, { 3 } }) != 2)
+    __builtin_abort ();
+
+  if (g({ { 1, 2 }, { 3, 4 } }) != 2)
+    __builtin_abort ();
+
+  if (h({ { 1, 2 }, { 3 } }) != 2)
+    __builtin_abort ();
+
+  if (h({ { 1, 2 }, { 3, 4 } }) != 2)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv1.C b/gcc/testsuite/g++.dg/cpp2a/array-conv1.C
new file mode 100644
index 0000000..e90b340
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv1.C
@@ -0,0 +1,33 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++17 } }
+// { dg-options "-Wpedantic" }
+// C++17, because that has CWG 393.
+
+void f(int(&)[]);
+void fp(int(*)[]);
+void f2(int(&)[][10]);
+void fp2(int(*)[][10]);
+int arr[10];
+int arr2[10][10];
+
+void
+g ()
+{
+  f (arr); // { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+  fp (&arr); // { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+  f2 (arr2);// { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+  fp2 (&arr2);// { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+}
+
+int(&r1)[] = arr;// { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+int(&r2)[10] = arr;
+int(&r3)[][10] = arr2;// { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+/* Note that
+   int (&r)[10][] = arr2;
+   is invalid.  */
+int(&r4)[10][10] = arr2;
+
+int(*p1)[] = &arr;// { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+int(*p2)[10] = &arr;
+int(*p3)[][10] = &arr2;// { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
+int(*p4)[10][10] = &arr2;
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv10.C b/gcc/testsuite/g++.dg/cpp2a/array-conv10.C
new file mode 100644
index 0000000..1ee1a77
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv10.C
@@ -0,0 +1,22 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++17 } }
+// { dg-options "-Wpedantic" }
+
+// The other direction: converting from int[] to int(&)[3] is forbidden.
+
+extern int a[];
+extern int (*b)[];
+extern int (&c)[];
+int (&y)[] = a;
+int (&x)[3] = y; // { dg-error "cannot bind reference" }
+int (&z)[3] = a; // { dg-error "cannot bind reference" }
+
+void f(int (*)[3]);
+void f2(int (&)[3]);
+
+void
+test ()
+{
+  f(b); // { dg-error "cannot convert" }
+  f2(c); // { dg-error "cannot bind reference" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv11.C b/gcc/testsuite/g++.dg/cpp2a/array-conv11.C
new file mode 100644
index 0000000..a072b29
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv11.C
@@ -0,0 +1,23 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+// { dg-options "-Wpedantic" }
+
+// Test flexible array member.  Here we're binding int[] to int[].  This worked
+// even before P0388R4.
+
+typedef int T[];
+extern T arr;
+T &t1 = arr;
+
+struct S {
+  int i;
+  int a[]; // { dg-warning "flexible array member" }
+};
+
+void f (int (&)[]);
+
+void
+test (S s)
+{
+  f (s.a);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv12.C b/gcc/testsuite/g++.dg/cpp2a/array-conv12.C
new file mode 100644
index 0000000..1156ea3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv12.C
@@ -0,0 +1,12 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+// { dg-options "-Wpedantic" }
+
+int arr[1] = { 42 };
+int(&r)[]{arr};
+int(&r2)[] = {arr};
+int(&&r3)[]{};
+int(&&r4)[]{42};
+int(&&r5)[] = {};
+int(&&r6)[] = {42};
+int(&r7)[](arr); // { dg-warning "conversions to arrays of unknown bound are only available" "" { target c++17_down } }
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv13.C b/gcc/testsuite/g++.dg/cpp2a/array-conv13.C
new file mode 100644
index 0000000..9908b7e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv13.C
@@ -0,0 +1,17 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+template <typename T> void foo(T);
+
+template <typename F, typename T, typename = decltype(foo<T>(F()))>
+void test(int) { }
+
+// No other overload, so if the above fails because of the conversion,
+// we fail.
+
+void
+fn ()
+{
+  test<int(*)[2], int(*)[]>(0);
+  test<int(*)[], int(*)[]>(0);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv14.C b/gcc/testsuite/g++.dg/cpp2a/array-conv14.C
new file mode 100644
index 0000000..793e85d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv14.C
@@ -0,0 +1,17 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+void f(const int(*)[]);
+void fb(const int(*)[3]);
+void f2(const int(&)[]);
+void fb2(const int(&)[3]);
+
+void
+g ()
+{
+  int arr[3];
+  f(&arr);
+  fb(&arr);
+  f2(arr);
+  fb2(arr);
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv15.C b/gcc/testsuite/g++.dg/cpp2a/array-conv15.C
new file mode 100644
index 0000000..033a746
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv15.C
@@ -0,0 +1,23 @@
+// PR c++/69531 - DR 1307, Overload resolution based on size of array init-list.
+// { dg-do run { target c++2a } }
+
+int f(int, int const(&)[2]) { return 1; }
+int f(double, int const(&)[2]) { return 2; }
+
+int f2(int, int const(&)[1]) { return 1; }
+int f2(int, int const(&)[2]) { return 2; }
+
+int f3(int, int const(&)[]) { return 1; }
+int f3(double, int const(&)[]) { return 2; }
+
+int main ()
+{
+  if (f (1, {1}) != 1)
+    __builtin_abort ();
+
+  if (f2 (1, {1}) != 1)
+    __builtin_abort ();
+
+  if (f3 (1, {1}) != 1)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv16.C b/gcc/testsuite/g++.dg/cpp2a/array-conv16.C
new file mode 100644
index 0000000..bfb39d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv16.C
@@ -0,0 +1,16 @@
+// PR c++/91364 - P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+using P = int *(*)[3];
+using S = const int *const (*)[];
+using Q = const int *const (*)[3];
+using Qi = const int *[3];
+using Q2 = Qi const *;
+
+void
+f (P p, S s, Q q, Q2 q2)
+{
+  s = p;
+  s = q;
+  s = q2;
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv17.C b/gcc/testsuite/g++.dg/cpp2a/array-conv17.C
new file mode 100644
index 0000000..3313ed4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv17.C
@@ -0,0 +1,39 @@
+// PR c++/91364 - P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+// As conversion/qual1.C, but with [].
+
+int *a[4];
+const int *const(*ap1)[] = &a;
+/* if at some level k the P2 is more cv-qualified than P1, then there
+   must be a const at every single level (other than level zero) of P2
+   up until k.  */
+const int *(*ap2)[] = &a; // { dg-error "cannot convert" }
+int *const(*ap3)[] = &a;
+int *(*ap4)[] = &a;
+int *(*const ap5)[] = &a;
+const int *const(*const ap6)[] = &a;
+int *const(*const ap7)[] = &a;
+int *(*const ap8)[] = &a;
+
+const int *b[4];
+const int *const(*bp1)[] = &b;
+const int *(*bp2)[] = &b;
+int *const(*bp3)[] = &b; // { dg-error "cannot convert" }
+int *(*bp4)[] = &b; // { dg-error "cannot convert" }
+int *(*const bp5)[] = &b; // { dg-error "cannot convert" }
+const int *const(*const bp6)[] = &b;
+int *const(*const bp7)[] = &b; // { dg-error "cannot convert" }
+int *(*const bp8)[] = &b; // { dg-error "cannot convert" }
+
+int *c[2][3];
+int const *const (*cp1)[] = c;
+int const *(*cp2)[] = c; // { dg-error "cannot convert" }
+int const *const (*const cp3)[] = c;
+int *const (*cp4)[] = c;
+int *(*cp5)[] = c;
+
+double *const (*d)[3];
+double const *const (*e)[] = d;
+int *(*f)[3];
+const int *const (*g)[] = f;
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv2.C b/gcc/testsuite/g++.dg/cpp2a/array-conv2.C
new file mode 100644
index 0000000..5245d83
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv2.C
@@ -0,0 +1,26 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+struct A {
+  A();
+  A(const A(&)[2]);
+};
+
+using T = A[];
+using U = A[2];
+
+// t binds directly to U{} now.  Before it bound indirectly to a temporary
+// A{U{}}.  ??? But we don't do it now; see reference_binding and the 
+// BRACE_ENCLOSED_INITIALIZER_P block.
+A (&&t)[] = {U{}};
+
+U u{};
+
+T &
+foo ()
+{
+  // This didn't compile before P0388R4: invalid initialization of non-const
+  // reference of type 'A (&)[]' from an rvalue of type
+  // '<brace-enclosed initializer list>'.
+  return {u};
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv3.C b/gcc/testsuite/g++.dg/cpp2a/array-conv3.C
new file mode 100644
index 0000000..3d92b40
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv3.C
@@ -0,0 +1,26 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do run { target c++2a } }
+
+// Ranking of reference initialization conversions
+
+int f(int(&)[]) { return 1; }	    // (1)
+int f(int(&)[1]) { return 2; }	    // (2)
+
+int h(int(*)[]) { return 1; }	    // (a)
+int h(int(*)[1]) { return 2; }	    // (b)
+
+// From P0388R4:
+// (2) and (b) should clearly be better than (1) and (a), respectively,
+// as the former overloads are more restricted. 
+// (a) should be worse than (b), which is implied by (a) necessitating
+// a qualification conversion in that case.
+
+int
+main ()
+{
+  int arr[1];
+  if (f(arr) != 2)
+    __builtin_abort ();
+  if (h(&arr) != 2)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv4.C b/gcc/testsuite/g++.dg/cpp2a/array-conv4.C
new file mode 100644
index 0000000..979c69b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv4.C
@@ -0,0 +1,24 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+// Ranking of reference initialization conversions
+
+void f(int(&)[]) {}	    // (1)
+//void f(int(&)[1]) { }	    // (2)
+void f(int*) { }	    // (3)
+
+//void f2(int(&)[]) { }	    // (1)
+void f2(int(&)[1]) { }	    // (2)
+void f2(int*) { }	    // (3)
+
+// From P0388R4:
+// (3) should be equal to (1) (as it is to (2))
+// Check that we get "ambiguous overload" errors.
+
+void
+doit ()
+{
+  int arr[1];
+  f(arr); // { dg-error "ambiguous" }
+  f2(arr); // { dg-error "ambiguous" }
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv5.C b/gcc/testsuite/g++.dg/cpp2a/array-conv5.C
new file mode 100644
index 0000000..34678f5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv5.C
@@ -0,0 +1,24 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do run { target c++2a } }
+
+// Ranking of list-initialization sequences
+int b(int   (&&)[] ) { return 1; }   // #1
+int b(long  (&&)[] ) { return 2; }   // #2
+int b(int   (&&)[1]) { return 3; }   // #3
+int b(long  (&&)[1]) { return 4; }   // #4
+int b(int   (&&)[2]) { return 5; }   // #5
+
+/* Here,
+   -- #1, #3 and #5 should rank better than both #2 and #4, as no promotion
+      is necessitated.
+   -- #1 should rank worse than #3, being far less specialized.
+   -- #1 should rank better than #5, as the latter requires a larger array
+      temporary.  (#3 also ranks better than #5 for the same reason--cf. core
+      issue 1307).  */
+
+int
+main ()
+{
+  if (b({1}) != 3)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv6.C b/gcc/testsuite/g++.dg/cpp2a/array-conv6.C
new file mode 100644
index 0000000..c2389c8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv6.C
@@ -0,0 +1,28 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do run { target c++2a } }
+
+// Ranking of reference initialization conversions
+
+int f1(const int(&)[]) { return 1; }
+int f1(const int(&)[1]) { return 2; }
+
+int f2(const int(&)[]) { return 1; }
+int f2(int(&)[1]) { return 2; }
+
+int f3(int(&)[]) { return 1; }
+int f3(const int(&)[1]) { return 2; }
+
+const int arr[1] = { 42 };
+
+int
+main ()
+{
+  if (f1(arr) != 2)
+    __builtin_abort ();
+
+  if (f2(arr) != 1)
+    __builtin_abort ();
+
+  if (f3(arr) != 2)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv7.C b/gcc/testsuite/g++.dg/cpp2a/array-conv7.C
new file mode 100644
index 0000000..07c709f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv7.C
@@ -0,0 +1,34 @@
+// PR c++/69531 - DR 1307, Overload resolution based on size of array init-list.
+// { dg-do run { target c++2a } }
+
+int f(int const(&)[]) { return 1; }
+int f(int const(&)[2]) { return 2; }
+
+int f2(int const(&)[]) { return 1; }
+int f2(int const(&)[1]) { return 2; }
+
+int f3(int const(&)[]) { return 1; }
+int f3(int const(&)[1]) { return 2; }
+int f3(int const(&)[2]) { return 3; }
+
+int main ()
+{
+  if (f ({}) != 1)
+    __builtin_abort ();
+  if (f ({1}) != 1)
+    __builtin_abort ();
+  if (f ({1, 2}) != 2)
+    __builtin_abort ();
+
+  if (f2 ({}) != 1)
+    __builtin_abort ();
+  if (f2 ({1}) != 2)
+    __builtin_abort ();
+
+  if (f3 ({}) != 1)
+    __builtin_abort ();
+  if (f3 ({1}) != 2)
+    __builtin_abort ();
+  if (f3 ({1, 2}) != 3)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv8.C b/gcc/testsuite/g++.dg/cpp2a/array-conv8.C
new file mode 100644
index 0000000..635c767
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv8.C
@@ -0,0 +1,26 @@
+// PR c++/69531 - DR 1307, Overload resolution based on size of array init-list.
+// { dg-do run { target c++2a } }
+// Example from [over.ics.rank].
+
+int f(int    (&&)[] ) { return 1; }    // #1
+int f(double (&&)[] ) { return 2; }    // #2
+int f(int    (&&)[2]) { return 3; }    // #3
+
+int
+main ()
+{
+  // Calls #1: Better than #2 due to conversion, better than #3 due to bounds.
+  if (f({1}) != 1)
+     __builtin_abort ();
+  // Calls #2: Identity conversion is better than floating-integral conversion.
+  if (f({1.0}) != 2)
+     __builtin_abort ();
+  // Calls #2: Identity conversion is better than floating-integral conversion.
+  if (f({1.0, 2.0}) != 2)
+     __builtin_abort ();
+  // Calls #3: Converting to array of known bound is better than to unknown
+  // bound, and an identity conversion is better than floating-integral
+  // conversion.
+  if (f({1, 2}) != 3)
+     __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/array-conv9.C b/gcc/testsuite/g++.dg/cpp2a/array-conv9.C
new file mode 100644
index 0000000..82f615d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/array-conv9.C
@@ -0,0 +1,27 @@
+// PR c++/91364 - Implement P0388R4: Permit conversions to arrays of unknown bound.
+// { dg-do compile { target c++2a } }
+
+int arr[1];
+extern int arr2[];
+
+void
+test ()
+{
+  int (&r)[1] = const_cast<int(&)[1]>(arr);
+  int (&r2)[] = const_cast<int(&)[]>(arr); // { dg-error "invalid" }
+  int (&r3)[1] = (int(&)[1]) arr;
+  int (&r4)[] = (int(&)[]) arr;
+  int (&r5)[1] = static_cast<int(&)[1]>(arr);
+  int (&r6)[] = static_cast<int(&)[]>(arr);
+
+  // Try c_cast_p.
+  int(*p1)[] = (int(*)[]) &arr;
+  int(*p2)[1] = (int(*)[]) &arr; // { dg-error "cannot convert" }
+  int(*p3)[] = (int(*)[1]) &arr;
+  int(*p4)[] = (int(*)[1]) &arr2;
+  int(*p5)[] = (int(*)[]) (int(*)[1]) &arr;
+  int(*p6)[] = (int(*)[1]) (int(*)[]) &arr;
+  int(*p7)[] = static_cast<int(*)[]>(&arr);
+  int(*p8)[] = static_cast<int(*)[1]>(&arr);
+  int(*p9)[] = static_cast<int(*)[1]>(&arr2); // { dg-error "invalid" }
+}
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900321_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900321_01.C
index 6b52783..c3b1ab5 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900321_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900321_01.C
@@ -20,7 +20,7 @@ void function_0 ()
 {
   // we miss the first two because typeck.c (comp_array_types) deems
   // it okay if one of the sizes is null
-  ptr_to_array_of_ints = ptr_to_array_of_3_ints;	// { dg-error "" } 
+  ptr_to_array_of_ints = ptr_to_array_of_3_ints;	// { dg-error "conversions to arrays" "" { target c++17_down } }
   ptr_to_array_of_3_ints = ptr_to_array_of_ints;	// { dg-error "" } 
 
   ptr_to_array_of_3_ints = ptr_to_array_of_5_ints;	// { dg-error "" } 
-- 
cgit v1.1


From a7160771da8b77a03317aab2c27706ba70fe3e9c Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Wed, 9 Oct 2019 21:35:11 +0000
Subject: PR tree-optimization/90879 - fold zero-equality of strcmp between a
 longer string and a smaller array

gcc/c-family/ChangeLog:

	PR tree-optimization/90879
	* c.opt (-Wstring-compare): New option.

gcc/testsuite/ChangeLog:

	PR tree-optimization/90879
	* gcc.dg/Wstring-compare-2.c: New test.
	* gcc.dg/Wstring-compare.c: New test.
	* gcc.dg/strcmpopt_3.c: Scan the optmized dump instead of strlen.
	* gcc.dg/strcmpopt_6.c: New test.
	* gcc.dg/strlenopt-65.c: Remove uinnecessary declarations, add
	test cases.
	* gcc.dg/strlenopt-66.c: Run it.
	* gcc.dg/strlenopt-68.c: New test.

gcc/ChangeLog:

	PR tree-optimization/90879
	* builtins.c (check_access): Avoid using maxbound when null.
	* calls.c (maybe_warn_nonstring_arg): Adjust to get_range_strlen change.
	* doc/invoke.texi (-Wstring-compare): Document new warning option.
	* gimple-fold.c (get_range_strlen_tree): Make setting maxbound
	conditional.
	(get_range_strlen): Overwrite initial maxbound when non-null.
	* gimple-ssa-sprintf.c (get_string_length): Adjust to get_range_strlen
	changes.
	* tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Same.
	(used_only_for_zero_equality): New function.
	(handle_builtin_memcmp): Call it.
	(determine_min_objsize): Return an integer instead of tree.
	(get_len_or_size, strxcmp_eqz_result): New functions.
	(maybe_warn_pointless_strcmp): New function.
	(handle_builtin_string_cmp): Call it.  Fold zero-equality of strcmp
	between a longer string and a smaller array.
	(get_range_strlen_dynamic): Overwrite initial maxbound when non-null.

From-SVN: r276773
---
 gcc/ChangeLog                            |  21 +
 gcc/builtins.c                           |   2 +-
 gcc/c-family/ChangeLog                   |   5 +
 gcc/c-family/c.opt                       |   6 +
 gcc/calls.c                              |   8 +
 gcc/doc/invoke.texi                      |  26 ++
 gcc/gimple-fold.c                        |  36 +-
 gcc/gimple-ssa-sprintf.c                 |  44 +-
 gcc/testsuite/ChangeLog                  |  12 +
 gcc/testsuite/gcc.dg/Wstring-compare-2.c | 127 ++++++
 gcc/testsuite/gcc.dg/Wstring-compare.c   | 181 +++++++++
 gcc/testsuite/gcc.dg/strcmpopt_3.c       |  20 +-
 gcc/testsuite/gcc.dg/strcmpopt_6.c       | 207 ++++++++++
 gcc/testsuite/gcc.dg/strlenopt-65.c      |  53 ++-
 gcc/testsuite/gcc.dg/strlenopt-66.c      |  38 +-
 gcc/testsuite/gcc.dg/strlenopt-69.c      | 126 ++++++
 gcc/tree-ssa-strlen.c                    | 664 +++++++++++++++++++------------
 17 files changed, 1261 insertions(+), 315 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/Wstring-compare-2.c
 create mode 100644 gcc/testsuite/gcc.dg/Wstring-compare.c
 create mode 100644 gcc/testsuite/gcc.dg/strcmpopt_6.c
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-69.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ecbe825..ada9be7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,24 @@
+2019-10-09  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90879
+	* builtins.c (check_access): Avoid using maxbound when null.
+	* calls.c (maybe_warn_nonstring_arg): Adjust to get_range_strlen change.
+	* doc/invoke.texi (-Wstring-compare): Document new warning option.
+	* gimple-fold.c (get_range_strlen_tree): Make setting maxbound
+	conditional.
+	(get_range_strlen): Overwrite initial maxbound when non-null.
+	* gimple-ssa-sprintf.c (get_string_length): Adjust to get_range_strlen
+	changes.
+	* tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Same.
+	(used_only_for_zero_equality): New function.
+	(handle_builtin_memcmp): Call it.
+	(determine_min_objsize): Return an integer instead of tree.
+	(get_len_or_size, strxcmp_eqz_result): New functions.
+	(maybe_warn_pointless_strcmp): New function.
+	(handle_builtin_string_cmp): Call it.  Fold zero-equality of strcmp
+	between a longer string and a smaller array.
+	(get_range_strlen_dynamic): Overwrite initial maxbound when non-null.
+
 2019-10-09  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (darwin_override_options): Make the check for
diff --git a/gcc/builtins.c b/gcc/builtins.c
index a1dc83c..5d811f1 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3334,7 +3334,7 @@ check_access (tree exp, tree, tree, tree dstwrite,
 	  c_strlen_data lendata = { };
 	  get_range_strlen (srcstr, &lendata, /* eltsize = */ 1);
 	  range[0] = lendata.minlen;
-	  range[1] = lendata.maxbound;
+	  range[1] = lendata.maxbound ? lendata.maxbound : lendata.maxlen;
 	  if (range[0] && (!maxread || TREE_CODE (maxread) == INTEGER_CST))
 	    {
 	      if (maxread && tree_int_cst_le (maxread, range[0]))
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 3012f8b..398ba6d 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-09  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90879
+	* c.opt (-Wstring-compare): New option.
+
 2019-10-08  Andrew Sutton  <asutton@lock3software.com>
 	    Jason Merrill  <jason@redhat.com>
 
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 8f6867b..a1360ba 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -795,6 +795,12 @@ Wsizeof-array-argument
 C ObjC C++ ObjC++ Var(warn_sizeof_array_argument) Warning Init(1)
 Warn when sizeof is applied on a parameter declared as an array.
 
+Wstring-compare
+C ObjC C++ LTO ObjC++ Warning Var(warn_string_compare) Warning LangEnabledBy(C ObjC C++ ObjC++, Wextra)
+Warn about calls to strcmp and strncmp used in equality expressions that
+are necessarily true or false due to the length of one and size of the other
+argument.
+
 Wstringop-overflow
 C ObjC C++ LTO ObjC++ Warning Alias(Wstringop-overflow=, 2, 0)
 Warn about buffer overflow in string manipulation functions like memcpy
diff --git a/gcc/calls.c b/gcc/calls.c
index 51ad55f..ae90447 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -1614,6 +1614,10 @@ maybe_warn_nonstring_arg (tree fndecl, tree exp)
 	    if (!get_attr_nonstring_decl (arg))
 	      {
 		c_strlen_data lendata = { };
+		/* Set MAXBOUND to an arbitrary non-null non-integer
+		   node as a request to have it set to the length of
+		   the longest string in a PHI.  */
+		lendata.maxbound = arg;
 		get_range_strlen (arg, &lendata, /* eltsize = */ 1);
 		maxlen = lendata.maxbound;
 	      }
@@ -1639,6 +1643,10 @@ maybe_warn_nonstring_arg (tree fndecl, tree exp)
 	if (!get_attr_nonstring_decl (arg))
 	  {
 	    c_strlen_data lendata = { };
+	    /* Set MAXBOUND to an arbitrary non-null non-integer
+	       node as a request to have it set to the length of
+	       the longest string in a PHI.  */
+	    lendata.maxbound = arg;
 	    get_range_strlen (arg, &lendata, /* eltsize = */ 1);
 	    maxlen = lendata.maxbound;
 	  }
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index dc9a3e5..9247603 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -349,6 +349,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wsizeof-pointer-memaccess  -Wsizeof-array-argument @gol
 -Wstack-protector  -Wstack-usage=@var{byte-size}  -Wstrict-aliasing @gol
 -Wstrict-aliasing=n  -Wstrict-overflow  -Wstrict-overflow=@var{n} @gol
+-Wstring-compare @gol
 -Wstringop-overflow=@var{n}  -Wstringop-truncation  -Wsubobject-linkage @gol
 -Wsuggest-attribute=@r{[}pure@r{|}const@r{|}noreturn@r{|}format@r{|}malloc@r{]} @gol
 -Wsuggest-final-types @gol  -Wsuggest-final-methods  -Wsuggest-override @gol
@@ -4485,6 +4486,7 @@ name is still supported, but the newer name is more descriptive.)
 -Wold-style-declaration @r{(C only)}  @gol
 -Woverride-init  @gol
 -Wsign-compare @r{(C only)} @gol
+-Wstring-compare @gol
 -Wredundant-move @r{(only for C++)}  @gol
 -Wtype-limits  @gol
 -Wuninitialized  @gol
@@ -5800,6 +5802,30 @@ comparisons, so this warning level gives a very large number of
 false positives.
 @end table
 
+@item -Wstring-compare
+@opindex Wstring-compare
+@opindex Wno-string-compare
+Warn for calls to @code{strcmp} and @code{strncmp} whose result is
+determined to be either zero or non-zero in tests for such equality
+owing to the length of one argument being greater than the size of
+the array the other argument is stored in (or the bound in the case
+of @code{strncmp}).  Such calls could be mistakes.  For example,
+the call to @code{strcmp} below is diagnosed because its result is
+necessarily non-zero irrespective of the contents of the array @code{a}.
+
+@smallexample
+extern char a[4];
+void f (char *d)
+@{
+  strcpy (d, "string");
+  @dots{}
+  if (0 == strcmp (a, d))   // cannot be true
+    puts ("a and d are the same");
+@}
+@end smallexample
+
+@option{-Wstring-compare} is enabled by @option{-Wextra}.
+
 @item -Wstringop-overflow
 @itemx -Wstringop-overflow=@var{type}
 @opindex Wstringop-overflow
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 8d642de..a085ab2 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -1348,6 +1348,10 @@ get_range_strlen_tree (tree arg, bitmap *visited, strlen_range_kind rkind,
 	}
     }
 
+  /* Set if VAL represents the maximum length based on array size (set
+     when exact length cannot be determined).  */
+  bool maxbound = false;
+
   if (!val && rkind == SRK_LENRANGE)
     {
       if (TREE_CODE (arg) == ADDR_EXPR)
@@ -1443,6 +1447,7 @@ get_range_strlen_tree (tree arg, bitmap *visited, strlen_range_kind rkind,
 	      pdata->minlen = ssize_int (0);
 	    }
 	}
+      maxbound = true;
     }
 
   if (!val)
@@ -1456,25 +1461,23 @@ get_range_strlen_tree (tree arg, bitmap *visited, strlen_range_kind rkind,
 	  && tree_int_cst_lt (val, pdata->minlen)))
     pdata->minlen = val;
 
-  if (pdata->maxbound)
+  if (pdata->maxbound && TREE_CODE (pdata->maxbound) == INTEGER_CST)
     {
       /* Adjust the tighter (more optimistic) string length bound
 	 if necessary and proceed to adjust the more conservative
 	 bound.  */
       if (TREE_CODE (val) == INTEGER_CST)
 	{
-	  if (TREE_CODE (pdata->maxbound) == INTEGER_CST)
-	    {
-	      if (tree_int_cst_lt (pdata->maxbound, val))
-		pdata->maxbound = val;
-	    }
-	  else
-	    pdata->maxbound = build_all_ones_cst (size_type_node);
+	  if (tree_int_cst_lt (pdata->maxbound, val))
+	    pdata->maxbound = val;
 	}
       else
 	pdata->maxbound = val;
     }
-  else
+  else if (pdata->maxbound || maxbound)
+    /* Set PDATA->MAXBOUND only if it either isn't INTEGER_CST or
+       if VAL corresponds to the maximum length determined based
+       on the type of the object.  */
     pdata->maxbound = val;
 
   if (tight_bound)
@@ -1655,8 +1658,11 @@ get_range_strlen (tree arg, bitmap *visited,
 
 /* Try to obtain the range of the lengths of the string(s) referenced
    by ARG, or the size of the largest array ARG refers to if the range
-   of lengths cannot be determined, and store all in *PDATA.  ELTSIZE
-   is the expected size of the string element in bytes: 1 for char and
+   of lengths cannot be determined, and store all in *PDATA which must
+   be zero-initialized on input except PDATA->MAXBOUND may be set to
+   a non-null tree node other than INTEGER_CST to request to have it
+   set to the length of the longest string in a PHI.  ELTSIZE is
+   the expected size of the string element in bytes: 1 for char and
    some power of 2 for wide characters.
    Return true if the range [PDATA->MINLEN, PDATA->MAXLEN] is suitable
    for optimization.  Returning false means that a nonzero PDATA->MINLEN
@@ -1668,6 +1674,7 @@ bool
 get_range_strlen (tree arg, c_strlen_data *pdata, unsigned eltsize)
 {
   bitmap visited = NULL;
+  tree maxbound = pdata->maxbound;
 
   if (!get_range_strlen (arg, &visited, SRK_LENRANGE, pdata, eltsize))
     {
@@ -1680,9 +1687,10 @@ get_range_strlen (tree arg, c_strlen_data *pdata, unsigned eltsize)
   else if (!pdata->minlen)
     pdata->minlen = ssize_int (0);
 
-  /* Unless its null, leave the more conservative MAXBOUND unchanged.  */
-  if (!pdata->maxbound)
-    pdata->maxbound = pdata->maxlen;
+  /* If it's unchanged from it initial non-null value, set the conservative
+     MAXBOUND to SIZE_MAX.  Otherwise leave it null (if it is null).  */
+  if (maxbound && pdata->maxbound == maxbound)
+    pdata->maxbound = build_all_ones_cst (size_type_node);
 
   if (visited)
     BITMAP_FREE (visited);
diff --git a/gcc/gimple-ssa-sprintf.c b/gcc/gimple-ssa-sprintf.c
index b11d798..b548bbd 100644
--- a/gcc/gimple-ssa-sprintf.c
+++ b/gcc/gimple-ssa-sprintf.c
@@ -1974,8 +1974,11 @@ get_string_length (tree str, unsigned eltsize, const vr_values *vr)
   if (!str)
     return fmtresult ();
 
-  /* Try to determine the dynamic string length first.  */
+  /* Try to determine the dynamic string length first.
+     Set MAXBOUND to an arbitrary non-null non-integer node as a request
+     to have it set to the length of the longest string in a PHI.  */
   c_strlen_data lendata = { };
+  lendata.maxbound = str;
   if (eltsize == 1)
     get_range_strlen_dynamic (str, &lendata, vr);
   else
@@ -1988,26 +1991,27 @@ get_string_length (tree str, unsigned eltsize, const vr_values *vr)
       get_range_strlen (str, &lendata, eltsize);
     }
 
-  /* LENDATA.MAXBOUND is null when LENDATA.MIN corresponds to the shortest
-     string referenced by STR.  Otherwise, if it's not equal to .MINLEN it
-     corresponds to the bound of the largest array STR refers to, if known,
-     or it's SIZE_MAX otherwise.  */
+  /* If LENDATA.MAXBOUND is not equal to .MINLEN it corresponds to the bound
+     of the largest array STR refers to, if known, or it's set to SIZE_MAX
+     otherwise.  */
 
   /* Return the default result when nothing is known about the string.  */
-  if (lendata.maxbound)
+  if ((lendata.maxbound && !tree_fits_uhwi_p (lendata.maxbound))
+      || !tree_fits_uhwi_p (lendata.maxlen))
     {
-      if (integer_all_onesp (lendata.maxbound)
-      	  && integer_all_onesp (lendata.maxlen))
-      	return fmtresult ();
-
-      if (!tree_fits_uhwi_p (lendata.maxbound)
-	  || !tree_fits_uhwi_p (lendata.maxlen))
-      	return fmtresult ();
-
-      unsigned HOST_WIDE_INT lenmax = tree_to_uhwi (max_object_size ()) - 2;
-      if (lenmax <= tree_to_uhwi (lendata.maxbound)
-	  && lenmax <= tree_to_uhwi (lendata.maxlen))
-	return fmtresult ();
+      fmtresult res;
+      res.nonstr = lendata.decl;
+      return res;
+    }
+
+  unsigned HOST_WIDE_INT lenmax = tree_to_uhwi (max_object_size ()) - 2;
+  if (integer_zerop (lendata.minlen)
+      && (!lendata.maxbound || lenmax <= tree_to_uhwi (lendata.maxbound))
+      && lenmax <= tree_to_uhwi (lendata.maxlen))
+    {
+      fmtresult res;
+      res.nonstr = lendata.decl;
+      return res;
     }
 
   HOST_WIDE_INT min
@@ -2056,9 +2060,9 @@ get_string_length (tree str, unsigned eltsize, const vr_values *vr)
     {
       /* When the upper bound is unknown (it can be zero or excessive)
 	 set the likely length to the greater of 1.  If MAXBOUND is
-	 set, also reset the length of the lower bound to zero.  */
+	 known, also reset the length of the lower bound to zero.  */
       res.range.likely = res.range.min ? res.range.min : warn_level > 1;
-      if (lendata.maxbound)
+      if (lendata.maxbound && !integer_all_onesp (lendata.maxbound))
 	res.range.min = 0;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ee2a81..d03827d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-09  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/90879
+	* gcc.dg/Wstring-compare-2.c: New test.
+	* gcc.dg/Wstring-compare.c: New test.
+	* gcc.dg/strcmpopt_3.c: Scan the optmized dump instead of strlen.
+	* gcc.dg/strcmpopt_6.c: New test.
+	* gcc.dg/strlenopt-65.c: Remove uinnecessary declarations, add
+	test cases.
+	* gcc.dg/strlenopt-66.c: Run it.
+	* gcc.dg/strlenopt-68.c: New test.
+
 2019-10-09  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/91364 - P0388R4: Permit conversions to arrays of	unknown bound.
diff --git a/gcc/testsuite/gcc.dg/Wstring-compare-2.c b/gcc/testsuite/gcc.dg/Wstring-compare-2.c
new file mode 100644
index 0000000..e6ca2a6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wstring-compare-2.c
@@ -0,0 +1,127 @@
+/* PR tree-optimization/90879 - fold zero-equality of strcmp between
+   a longer string and a smaller array
+   Test for a warning for strcmp of a longer string against smaller
+   array.
+   { dg-do compile }
+   { dg-options "-O2 -Wall -Wstring-compare -Wno-stringop-truncation -ftrack-macro-expansion=0" } */
+
+typedef __SIZE_TYPE__ size_t;
+
+extern void* memcpy (void*, const void*, size_t);
+
+extern int strcmp (const char*, const char*);
+extern size_t strlen (const char*);
+extern char* strcpy (char*, const char*);
+extern char* strncpy (char*, const char*, size_t);
+extern int strncmp (const char*, const char*, size_t);
+
+void sink (int, ...);
+#define sink(...) sink (__LINE__, __VA_ARGS__)
+
+
+extern char a1[1], a2[2], a3[3], a4[4], a5[5], a6[6], a7[7], a8[8], a9[9];
+
+#define T(a, b) sink (0 == strcmp (a, b))
+
+
+void test_string_cst (void)
+{
+  const char *s1 = "1", *s2 = "12";
+
+  T (s1, a1);                 // { dg-warning ".strcmp. of a string of length 1 and an array of size 1 evaluates to nonzero" }
+  T (s1, a2);
+  T (s1, a3);
+
+  T (a1, s1);                 // { dg-warning ".strcmp. of a string of length 1 and an array of size 1 evaluates to nonzero" }
+  T (a2, s1);
+  T (a3, s1);
+
+  T (s2, a1);                 // { dg-warning ".strcmp. of a string of length 2 and an array of size 1 evaluates to nonzero" }
+  T (s2, a2);                 // { dg-warning ".strcmp. of a string of length 2 and an array of size 2 evaluates to nonzero" }
+  T (s2, a3);
+
+  T (a1, s2);                 // { dg-warning ".strcmp. of a string of length 2 and an array of size 1 evaluates to nonzero" }
+  T (a2, s2);                 // { dg-warning ".strcmp. of a string of length 2 and an array of size 2 evaluates to nonzero" }
+  T (a3, s2);
+}
+
+
+void test_string_cst_off_cst (void)
+{
+  const char *s1 = "1", *s2 = "12", *s3 = "123", *s4 = "1234";
+
+  T (s1, a2 + 1);              // { dg-warning ".strcmp. of a string of length 1 and an array of size 1 evaluates to nonzero" }
+  T (a2 + 1, s1);              // { dg-warning ".strcmp. of a string of length 1 and an array of size 1 evaluates to nonzero" }
+
+
+  T (s3 + 1, a2);             // { dg-warning ".strcmp. of a string of length 2 and an array of size 2 evaluates to nonzero" }
+  T (s3 + 1, a3);
+
+  T (s2, a4 + 1);
+  T (s2, a4 + 2);             // { dg-warning ".strcmp. of a string of length 2 and an array of size 2 evaluates to nonzero" }
+
+  T (s4, a4 + 1);             // { dg-warning ".strcmp. of a string of length 4 and an array of size 3 evaluates to nonzero" }
+  T (s3, a5 + 1);
+}
+
+
+/* Use strncpy below rather than memcpy until PR 91183 is resolved.  */
+
+#undef T
+#define T(s, n, a)					\
+  do {							\
+    char arr[32];					\
+    sink (arr);						\
+    strncpy (arr, s, n < 0 ? strlen (s) + 1: n);	\
+    sink (0 == strcmp (arr, a));			\
+  } while (0)
+
+void test_string_exact_length (void)
+{
+  const char *s1 = "1", *s2 = "12";
+
+  T (s1, -1, a1);             // { dg-warning ".strcmp. of a string of length 1 and an array of size 1 evaluates to nonzero" }
+  T (s1, -1, a2);
+  T (s1, -1, a3);
+
+  T (s2, -1, a1);             // { dg-warning ".strcmp. of a string of length 2 and an array of size 1 evaluates to nonzero" }
+  T (s2, -1, a2);             // { dg-warning ".strcmp. of a string of length 2 and an array of size 2 evaluates to nonzero" }
+  T (s2, -1, a3);
+}
+
+
+void test_string_min_length (void)
+{
+  const char *s1 = "1", *s2 = "12";
+
+  T (s1,  1, a1);             // { dg-warning ".strcmp. of a string of length 1 or more and an array of size 1 evaluates to nonzero" }
+  T (s1,  1, a2);
+  T (s1,  1, a3);
+
+  T (s2,  2, a1);             // { dg-warning ".strcmp. of a string of length 2 or more and an array of size 1 evaluates to nonzero" }
+  T (s2,  2, a2);             // { dg-warning ".strcmp. of a string of length 2 or more and an array of size 2 evaluates to nonzero" }
+  T (s2,  2, a3);
+}
+
+
+int test_strncmp_str_lit_var (const char *s, long n)
+{
+  if (strncmp (s, "123456", n) == 0)    // { dg-bogus "\\\[-Wstring-compare" }
+    return 1;
+
+  return 0;
+}
+
+int test_strlen_strncmp_str_lit_var (const char *s, long n)
+{
+  if (__builtin_strlen (s) < n)
+    return -1;
+
+  if (n == 6)
+    if (strncmp (s, "123456", n) == 0)  // { dg-bogus "\\\[-Wstring-compare" }
+      return 1;
+
+  return 0;
+}
+
+
diff --git a/gcc/testsuite/gcc.dg/Wstring-compare.c b/gcc/testsuite/gcc.dg/Wstring-compare.c
new file mode 100644
index 0000000..0ca492d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wstring-compare.c
@@ -0,0 +1,181 @@
+/* PR tree-optimization/90879 - fold zero-equality of strcmp between
+   a longer string and a smaller array
+   { dg-do compile }
+   { dg-options "-O2 -Wall -Wextra -ftrack-macro-expansion=0" } */
+
+#include "strlenopt.h"
+
+#define T(a, b) sink (0 == strcmp (a, b), a, b)
+
+void sink (int, ...);
+
+struct S { char a4[4], c; };
+
+extern char a4[4];
+extern char a5[5];
+extern char b4[4];
+
+/* Verify that comparison of string literals with arrays with unknown
+   content but size that prevents them from comparing equal is diagnosed.  */
+
+void strcmp_array_lit (void)
+{
+  if (strcmp (a4, "1234"))  // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero" }
+                            // { dg-bogus "in this expreession" "unwanted note" { target *-*-* } .-1 }
+    sink (0, a4);
+
+  int cmp;
+  cmp = strcmp (a4, "1234");  // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero" }
+  if (cmp)                  // { dg-message "in this expression" }
+    sink (0, a4);
+
+  T (a4, "4321");           // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero " }
+  T (a4, "12345");          // { dg-warning "length 5 and an array of size 4 " }
+  T (a4, "123456");         // { dg-warning "length 6 and an array of size 4 " }
+  T ("1234", a4);           // { dg-warning "length 4 and an array of size 4 " }
+  T ("12345", a4);          // { dg-warning "length 5 and an array of size 4 " }
+  T ("123456", a4);         // { dg-warning "length 6 and an array of size 4 " }
+}
+
+
+void strcmp_array_pstr (void)
+{
+  const char *s4 = "1234";
+
+  {
+    if (strcmp (a4, s4))    // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero" }
+                            // { dg-bogus "in this expreession" "unwanted note" { target *-*-* } .-1 }
+      sink (1, a4);
+    else
+      sink (0, a4);
+  }
+
+  {
+    int c;
+    c = strcmp (a4, s4);    // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero" }
+    if (c)                  // { dg-message "in this expression" }
+      sink (1, a4);
+    else
+      sink (0, a4);
+  }
+
+  const char *t4 = "4321";
+  const char *s5 = "12345";
+  const char *s6 = "123456";
+
+  T (a4, t4);               // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero " }
+  T (a4, s5);               // { dg-warning "length 5 and an array of size 4 " }
+  T (a4, s6);               // { dg-warning "length 6 and an array of size 4 " }
+  T (s4, a4);               // { dg-warning "length 4 and an array of size 4 " }
+  T (s5, a4);               // { dg-warning "length 5 and an array of size 4 " }
+  T (s6, a4);               // { dg-warning "length 6 and an array of size 4 " }
+}
+
+
+void strcmp_array_cond_pstr (int i)
+{
+  const char *s4 = i ? "1234" : "4321";
+  T (a4, s4);               // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero " }
+  T (a5, s4);
+}
+
+void strcmp_array_copy (void)
+{
+  char s[8];
+
+  {
+    strcpy (s, "1234");
+    if (strcmp (a4, s))     // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero" }
+                            // { dg-bogus "in this expreession" "unwanted note" { target *-*-* } .-1 }
+      sink (1, a4);
+    else
+      sink (0, a4);
+  }
+
+  {
+    strcpy (s, "1234");
+
+    int c;
+    c = strcmp (a4, s);     // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero" }
+    if (c)                  // { dg-message "in this expression" }
+      sink (1, a4);
+    else
+      sink (0, a4);
+  }
+
+  strcpy (s, "4321");
+  T (a4, s);                // { dg-warning "'strcmp' of a string of length 4 and an array of size 4 evaluates to nonzero " }
+  strcpy (s, "12345");
+  T (a4, s);                // { dg-warning "length 5 and an array of size 4 " }
+  strcpy (s, "123456");
+  T (a4, s);                // { dg-warning "length 6 and an array of size 4 " }
+  strcpy (s, "4321");
+  T (s, a4);                // { dg-warning "length 4 and an array of size 4 " }
+  strcpy (s, "54321");
+  T (s, a4);                // { dg-warning "length 5 and an array of size 4 " }
+  strcpy (s, "654321");
+  T (s, a4);                // { dg-warning "length 6 and an array of size 4 " }
+}
+
+
+void strcmp_member_array_lit (const struct S *p)
+{
+  T (p->a4, "1234");        // { dg-warning "length 4 and an array of size 4 " }
+}
+
+
+#undef T
+#define T(a, b, n) sink (0 == strncmp (a, b, n), a, b)
+
+void strncmp_array_lit (void)
+{
+  if (strncmp (a4, "12345", 5))   // { dg-warning "'strncmp' of a string of length 5, an array of size 4 and bound of 5 evaluates to nonzero" }
+                                  // { dg-bogus "in this expreession" "unwanted note" { target *-*-* } .-1 }
+    sink (0, a4);
+
+  int cmp;
+  cmp = strncmp (a4, "54321", 5);   // { dg-warning "'strncmp' of a string of length 5, an array of size 4 and bound of 5 evaluates to nonzero" }
+  if (cmp)                          // { dg-message "in this expression" }
+    sink (0, a4);
+
+  // Verify no warning when the bound is the same as the array size.
+  T (a4, "4321", 4);
+  T (a4, "654321", 4);
+
+  T (a4, "12345", 5);       // { dg-warning "length 5, an array of size 4 and bound of 5 " }
+  T (a4, "123456", 6);      // { dg-warning "length 6, an array of size 4 and bound of 6" }
+
+  T ("1234", a4, 4);
+  T ("12345", a4, 4);
+
+  T ("12345", a4, 5);       // { dg-warning "length 5, an array of size 4 and bound of 5 " }
+  T ("123456", a4, 6);      // { dg-warning "length 6, an array of size 4 and bound of 6 " }
+}
+
+
+void strncmp_strarray_copy (void)
+{
+  {
+    char a[] = "1234";
+    char b[6];
+    strcpy (b, "12345");
+    if (strncmp (a, b, 5))  // { dg-warning "'strncmp' of strings of length 4 and 5 and bound of 5 evaluates to nonzero" }
+                            // { dg-bogus "in this expreession" "unwanted note" { target *-*-* } .-1 }
+      sink (0, a, b);
+  }
+
+  {
+    char a[] = "4321";
+    char b[6];
+    strcpy (b, "54321");
+    int cmp;
+    cmp = strncmp (a, b, 5);  // { dg-warning "'strncmp' of strings of length 4 and 5 and bound of 5 evaluates to nonzero" }
+    if (cmp)                  // { dg-message "in this expression" }
+      sink (0, a, b);
+  }
+
+  strcpy (a4, "abc");
+  T (a4, "54321", 5);       // { dg-warning "'strncmp' of strings of length 3 and 5 and bound of 5 evaluates to nonzero " }
+}
+
+
diff --git a/gcc/testsuite/gcc.dg/strcmpopt_3.c b/gcc/testsuite/gcc.dg/strcmpopt_3.c
index 571646c..35941be 100644
--- a/gcc/testsuite/gcc.dg/strcmpopt_3.c
+++ b/gcc/testsuite/gcc.dg/strcmpopt_3.c
@@ -1,31 +1,31 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -fdump-tree-strlen" } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
 
-__attribute__ ((noinline)) int 
-f1 (void) 
-{ 
+__attribute__ ((noinline)) int
+f1 (void)
+{
   char *s0= "abcd";
   char s[8];
   __builtin_strcpy (s, s0);
-  return __builtin_strcmp(s, "abc") != 0; 
+  return __builtin_strcmp (s, "abc") != 0;
 }
 
 __attribute__ ((noinline)) int
-f2 (void) 
-{ 
+f2 (void)
+{
   char *s0 = "ab";
   char s[8];
   __builtin_strcpy (s, s0);
-  return __builtin_strcmp("abc", s) != 0; 
+  return __builtin_strcmp ("abc", s) != 0;
 }
 
 int main (void)
 {
-  if (f1 () != 1 
+  if (f1 () != 1
       || f2 () != 1)
     __builtin_abort ();
 
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "strcmp" 0 "strlen1" } } */
+/* { dg-final { scan-tree-dump-times "strcmp" 0 "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strcmpopt_6.c b/gcc/testsuite/gcc.dg/strcmpopt_6.c
new file mode 100644
index 0000000..cb99294
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strcmpopt_6.c
@@ -0,0 +1,207 @@
+/* Verify that strcmp and strncmp calls with mixed constant and
+   non-constant strings are evaluated correctly.
+   { dg-do run }
+   { dg-options "-O2" } */
+
+#include "strlenopt.h"
+
+#define A(expr)                                                 \
+  ((expr)                                                       \
+   ? (void)0                                                    \
+   : (__builtin_printf ("assertion failed on line %i: %s\n",    \
+                        __LINE__, #expr),                       \
+      __builtin_abort ()))
+
+__attribute__ ((noclone, noinline)) int
+test_strlen_gt2_strcmp_abcd (const char *s)
+{
+  if (strlen (s) < 3)
+    return -1;
+
+  return strcmp (s, "abcd") == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_strlen_lt6_strcmp_abcd (const char *s)
+{
+  if (strlen (s) > 5)
+    return -1;
+
+  return strcmp (s, "abcd") == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_strcpy_strcmp_abc (const char *s)
+{
+  char a[4];
+  strcpy (a, s);
+  return strcmp (a, "abc") == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_strcpy_abc_strcmp (const char *s)
+{
+  char a[4], b[6];
+  strcpy (a, "abc");
+  strcpy (b, s);
+  return strcmp (a, b) == 0;
+}
+
+/* Exercise strcmp of two strings between 1 and 3 characters long
+   stored in arrays of the same known size.  */
+char ga4[4], gb4[4];
+
+__attribute__ ((noclone, noinline)) int
+test_store_0_nulterm_strcmp_same_size_arrays (void)
+{
+  ga4[0] = gb4[0] = 'x';
+  ga4[3] = gb4[3] = '\0';
+  return strcmp (ga4, gb4) == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_store_0_nulterm_strncmp_bound_2_same_size_arrays (void)
+{
+  ga4[0] = gb4[0] = 'x';
+  ga4[3] = gb4[3] = '\0';
+  return strncmp (ga4, gb4, 2) == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_store_0_nulterm_strncmp_bound_equal_same_size_arrays (void)
+{
+  ga4[0] = gb4[0] = 'x';
+  ga4[3] = gb4[3] = '\0';
+  return strncmp (ga4, gb4, 4) == 0;
+}
+
+/* Exercise strcmp of two strings between 0 and 3 characters long
+   stored in arrays of the same known size.  */
+
+__attribute__ ((noclone, noinline)) int
+test_nulterm_strcmp_same_size_arrays (void)
+{
+  ga4[3] = gb4[3] = '\0';
+  return strcmp (ga4, gb4) == 0;
+}
+
+/* Exercise strcmp of two strings between 1 and 3 and 1 and 4 characters
+   long, respectively, stored in arrays of known but different sizes.  */
+char gc5[5];
+
+__attribute__ ((noclone, noinline)) int
+test_store_0_nulterm_strcmp_arrays (void)
+{
+  ga4[0] = gc5[0] = 'x';
+  ga4[3] = gc5[4] = '\0';
+  return strcmp (ga4, gc5) == 0;
+}
+
+/* Exercise strcmp of two strings between 0 and 3 and 1 and 4 characters
+   long, respectively, stored in arrays of known but different sizes.  */
+
+__attribute__ ((noclone, noinline)) int
+test_nulterm_strcmp_arrays (void)
+{
+  ga4[3] = gc5[4] = '\0';
+  return strcmp (ga4, gc5) == 0;
+}
+
+
+__attribute__ ((noclone, noinline)) int
+test_strcpy_strncmp_abcd (const char *s)
+{
+  char a[6];
+  strcpy (a, s);
+  return strcmp (a, "abcd") == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_strcpy_abcd_strncmp_3 (const char *s)
+{
+  char a[6], b[8];
+  strcpy (a, "abcd");
+  strcpy (b, s);
+  return strncmp (a, b, 3) == 0;
+}
+
+__attribute__ ((noclone, noinline)) int
+test_strcpy_abcd_strncmp_4 (const char *s)
+{
+  char a[6], b[8];
+  strcpy (a, "abcd");
+  strcpy (b, s);
+  return strncmp (a, b, 4) == 0;
+}
+
+
+int main (void)
+{
+  test_strlen_gt2_strcmp_abcd ("abcd");
+  test_strlen_lt6_strcmp_abcd ("abcd");
+
+  A (0 == test_strcpy_strcmp_abc ("ab"));
+  A (0 != test_strcpy_strcmp_abc ("abc"));
+  A (0 == test_strcpy_strcmp_abc ("abcd"));
+
+  A (0 == test_strcpy_abc_strcmp ("ab"));
+  A (0 != test_strcpy_abc_strcmp ("abc"));
+  A (0 == test_strcpy_abc_strcmp ("abcd"));
+
+  strcpy (ga4, "abc"); strcpy (gb4, "abd");
+  A (0 == test_store_0_nulterm_strcmp_same_size_arrays ());
+  strcpy (ga4, "abd"); strcpy (gb4, "abc");
+  A (0 == test_store_0_nulterm_strcmp_same_size_arrays ());
+  strcpy (ga4, "abc"); strcpy (gb4, "abc");
+  A (0 != test_store_0_nulterm_strcmp_same_size_arrays ());
+
+  strcpy (ga4, "abc"); strcpy (gb4, "acd");
+  A (0 == test_store_0_nulterm_strncmp_bound_2_same_size_arrays ());
+  strcpy (ga4, "acd"); strcpy (gb4, "abc");
+  A (0 == test_store_0_nulterm_strncmp_bound_2_same_size_arrays ());
+  strcpy (ga4, "abc"); strcpy (gb4, "abc");
+  A (0 != test_store_0_nulterm_strncmp_bound_2_same_size_arrays ());
+
+  strcpy (ga4, "abc"); strcpy (gb4, "abd");
+  A (0 == test_store_0_nulterm_strncmp_bound_equal_same_size_arrays ());
+  strcpy (ga4, "abd"); strcpy (gb4, "abc");
+  A (0 == test_store_0_nulterm_strncmp_bound_equal_same_size_arrays ());
+  strcpy (ga4, "abc"); strcpy (gb4, "abc");
+  A (0 != test_store_0_nulterm_strncmp_bound_equal_same_size_arrays ());
+
+  strcpy (ga4, "abc"); strcpy (gb4, "abd");
+  A (0 == test_nulterm_strcmp_same_size_arrays ());
+  strcpy (ga4, "abd"); strcpy (gb4, "abc");
+  A (0 == test_nulterm_strcmp_same_size_arrays ());
+  strcpy (ga4, "abc"); strcpy (gb4, "abc");
+  A (0 != test_nulterm_strcmp_same_size_arrays ());
+
+  strcpy (ga4, "abc"); strcpy (gc5, "abcd");
+  A (0 == test_store_0_nulterm_strcmp_arrays ());
+  strcpy (ga4, "abd"); strcpy (gc5, "abcd");
+  A (0 == test_store_0_nulterm_strcmp_arrays ());
+  strcpy (ga4, "abc"); strcpy (gc5, "abc");
+  A (0 != test_store_0_nulterm_strcmp_arrays ());
+
+  strcpy (ga4, "abc"); strcpy (gc5, "abcd");
+  A (0 == test_nulterm_strcmp_arrays ());
+  strcpy (ga4, "abd"); strcpy (gc5, "abc");
+  A (0 == test_nulterm_strcmp_arrays ());
+  strcpy (ga4, "abc"); strcpy (gc5, "abc");
+  A (0 != test_nulterm_strcmp_arrays ());
+
+  A (0 == test_strcpy_strncmp_abcd ("ab"));
+  A (0 == test_strcpy_strncmp_abcd ("abc"));
+  A (0 != test_strcpy_strncmp_abcd ("abcd"));
+  A (0 == test_strcpy_strncmp_abcd ("abcde"));
+
+  A (0 == test_strcpy_abcd_strncmp_3 ("ab"));
+  A (0 != test_strcpy_abcd_strncmp_3 ("abc"));
+  A (0 != test_strcpy_abcd_strncmp_3 ("abcd"));
+  A (0 != test_strcpy_abcd_strncmp_3 ("abcde"));
+
+  A (0 == test_strcpy_abcd_strncmp_4 ("ab"));
+  A (0 == test_strcpy_abcd_strncmp_4 ("abc"));
+  A (0 != test_strcpy_abcd_strncmp_4 ("abcd"));
+  A (0 != test_strcpy_abcd_strncmp_4 ("abcde"));
+}
diff --git a/gcc/testsuite/gcc.dg/strlenopt-65.c b/gcc/testsuite/gcc.dg/strlenopt-65.c
index a34d178..521d7ac 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-65.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-65.c
@@ -1,17 +1,10 @@
 /* PRE tree-optimization/90626 - fold strcmp(a, b) == 0 to zero when
    one string length is exact and the other is unequal
    { dg-do compile }
-   { dg-options "-O2 -Wall -fdump-tree-optimized" } */
+   { dg-options "-O2 -Wall -Wno-string-compare -fdump-tree-optimized -ftrack-macro-expansion=0" } */
 
 #include "strlenopt.h"
 
-typedef __SIZE_TYPE__ size_t;
-
-extern void abort (void);
-extern void* memcpy (void *, const void *, size_t);
-extern int strcmp (const char *, const char *);
-extern int strncmp (const char *, const char *, size_t);
-
 #define CAT(x, y) x ## y
 #define CONCAT(x, y) CAT (x, y)
 #define FAILNAME(name) CONCAT (call_ ## name ##_on_line_, __LINE__)
@@ -142,21 +135,45 @@ void test_strcmp_keep (const char *s, const char *t)
 #undef CMPFUNC
 #define CMPFUNC(a, b, dummy) strcmp (a, b)
 
-  KEEP ("1", "1", a, b, -1);
+  KEEP ("123", "123\0", a, b, /* bnd = */ -1);
+  KEEP ("123\0", "123", a, b, -1);
+
+  {
+    char a[8], b[8];
+    sink (a, b);
+    strcpy (a, s);
+    strcpy (b, t);
+    TEST_KEEP (0 == strcmp (a, b));
+  }
+}
+
+
+void test_strncmp_keep (const char *s, const char *t)
+{
+#undef CMPFUNC
+#define CMPFUNC(a, b, n) strncmp (a, b, n)
+
+  KEEP ("1", "1", a, b, 2);
 
-  KEEP ("1\0", "1", a, b, -1);
-  KEEP ("1",   "1\0", a, b, -1);
+  KEEP ("1\0", "1", a, b, 2);
+  KEEP ("1",   "1\0", a, b, 2);
 
-  KEEP ("12\0", "12", a, b, -1);
-  KEEP ("12",   "12\0", a, b, -1);
+  KEEP ("12\0", "12", a, b, 2);
+  KEEP ("12",   "12\0", a, b, 2);
 
-  KEEP ("111\0", "111", a, b, -1);
-  KEEP ("112", "112\0", a, b, -1);
+  KEEP ("111\0", "111", a, b, 3);
+  KEEP ("112", "112\0", a, b, 3);
 
-  KEEP (s, t, a, b, -1);
+  {
+    char a[8], b[8];
+    sink (a, b);
+    strcpy (a, s);
+    strcpy (b, t);
+    TEST_KEEP (0 == strncmp (a, b, sizeof a));
+  }
 }
 
 /* { dg-final { scan-tree-dump-times "call_in_true_branch_not_eliminated_" 0 "optimized" } }
 
-   { dg-final { scan-tree-dump-times "call_made_in_true_branch_on_line_1\[0-9\]\[0-9\]\[0-9\]" 8 "optimized" } }
-   { dg-final { scan-tree-dump-times "call_made_in_false_branch_on_line_1\[0-9\]\[0-9\]\[0-9\]" 8 "optimized" } } */
+   { dg-final { scan-tree-dump-times "call_made_in_true_branch_on_line_1\[0-9\]\[0-9\]\[0-9\]" 11 "optimized" } }
+   { dg-final { scan-tree-dump-times "call_made_in_false_branch_on_line_1\[0-9\]\[0-9\]\[0-9\]" 11 "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-66.c b/gcc/testsuite/gcc.dg/strlenopt-66.c
index 5dc10a0..4ba31a8 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-66.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-66.c
@@ -1,6 +1,6 @@
 /* PRE tree-optimization/90626 - fold strcmp(a, b) == 0 to zero when
    one string length is exact and the other is unequal
-   { dg-do compile }
+   { dg-do run }
    { dg-options "-O2 -Wall -fdump-tree-optimized" } */
 
 #include "strlenopt.h"
@@ -65,8 +65,44 @@ test_strncmp (void)
   A (0 <  strncmp (b, a, 5));
 }
 
+
+__attribute__ ((noclone, noinline, noipa)) void
+test_strncmp_a4_cond_s5_s2_2 (const char *s, int i)
+{
+  char a4[4];
+  strcpy (a4, s);
+  A (0 == strncmp (a4, i ? "12345" : "12", 2));
+}
+
+
+__attribute__ ((noclone, noinline, noipa)) void
+test_strncmp_a4_cond_a5_s2_5 (const char *s, const char *t, int i)
+{
+  char a4[4], a5[5];
+  strcpy (a4, s);
+  strcpy (a5, t);
+  A (0 == strncmp (a4, i ? a5 : "12", 5));
+}
+
+__attribute__ ((noclone, noinline, noipa)) void
+test_strncmp_a4_cond_a5_a3_n (const char *s1, const char *s2, const char *s3,
+			      int i, unsigned n)
+{
+  char a3[3], a4[4], a5[5];
+  strcpy (a3, s1);
+  strcpy (a4, s2);
+  strcpy (a5, s3);
+  A (0 == strncmp (a4, i ? a5 : a3, n));
+}
+
+
 int main (void)
 {
   test_strcmp ();
   test_strncmp ();
+  test_strncmp_a4_cond_s5_s2_2 ("12", 0);
+  test_strncmp_a4_cond_a5_s2_5 ("12", "1234", 0);
+
+  test_strncmp_a4_cond_a5_a3_n ("12", "123", "1234", 0, 2);
+  test_strncmp_a4_cond_a5_a3_n ("123", "12", "12", 1, 3);
 }
diff --git a/gcc/testsuite/gcc.dg/strlenopt-69.c b/gcc/testsuite/gcc.dg/strlenopt-69.c
new file mode 100644
index 0000000..46ceb9d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-69.c
@@ -0,0 +1,126 @@
+/* PR tree-optimization/90879 - fold zero-equality of strcmp between
+   a longer string and a smaller array
+   { dg-do compile }
+   { dg-options "-O2 -Wall -Wno-string-compare -fdump-tree-optimized -ftrack-macro-expansion=0" } */
+
+#include "strlenopt.h"
+
+#define A(expr)                                                 \
+  ((expr)                                                       \
+   ? (void)0                                                    \
+   : (__builtin_printf ("assertion failed on line %i: %s\n",    \
+                        __LINE__, #expr),                       \
+      __builtin_abort ()))
+
+void clobber (void*, ...);
+
+struct S { char a4[4], c; };
+
+extern char a4[4];
+extern char b4[4];
+
+/* Verify that comparison of string literals with arrays with unknown
+   content but size that prevents them from comparing equal is folded
+   to a constant.  */
+
+void test_array_lit (void)
+{
+  A (strcmp (a4, "1234")); clobber (a4);
+  A (strcmp (a4, "12345")); clobber (a4);
+  A (strcmp (a4, "123456")); clobber (a4);
+  A (strcmp ("1234", a4)); clobber (a4);
+  A (strcmp ("12345", a4)); clobber (a4);
+  A (strcmp ("123456", a4)); clobber (a4);
+}
+
+void test_memarray_lit (struct S *p)
+{
+  A (strcmp (p->a4, "1234"));
+  A (strcmp (p->a4, "12345"));
+  A (strcmp (p->a4, "123456"));
+
+  A (strcmp ("1234", p->a4));
+  A (strcmp ("12345", p->a4));
+  A (strcmp ("123456", p->a4));
+}
+
+/* Verify that the equality of empty strings is folded.  */
+
+void test_empty_string (void)
+{
+  A (0 == strcmp ("", ""));
+
+  *a4 = '\0';
+  A (0 == strcmp (a4, ""));
+  A (0 == strcmp ("", a4));
+  A (0 == strcmp (a4, a4));
+
+  char s[8] = "";
+  A (0 == strcmp (a4, s));
+
+  a4[1] = '\0';
+  b4[1] = '\0';
+  A (0 == strcmp (a4 + 1, b4 + 1));
+
+  a4[2] = '\0';
+  b4[2] = '\0';
+  A (0 == strcmp (&a4[2], &b4[2]));
+
+  clobber (a4, b4);
+
+  memset (a4, 0, sizeof a4);
+  memset (b4, 0, sizeof b4);
+  A (0 == strcmp (a4, b4));
+}
+
+/* Verify that comparison of dynamically created strings with unknown
+   arrays is folded.  */
+
+void test_array_copy (void)
+{
+  char s[8];
+  strcpy (s, "1234");
+  A (strcmp (a4, s));
+
+  strcpy (s, "12345");
+  A (strlen (s) == 5);
+  A (strcmp (a4, s)); clobber (a4);
+
+  strcpy (s, "123456");
+  A (strcmp (a4, s)); clobber (a4);
+
+  strcpy (s, "1234");
+  A (strcmp (s, a4)); clobber (a4);
+
+  strcpy (s, "12345");
+  A (strcmp (s, a4)); clobber (a4);
+
+  strcpy (s, "123456");
+  A (strcmp (s, a4)); clobber (a4);
+}
+
+
+void test_array_bounded (void)
+{
+  A (strncmp (a4, "12345", 5)); clobber (a4);
+  A (strncmp ("54321", a4, 5)); clobber (a4);
+
+  A (strncmp (a4, "123456", 5)); clobber (a4);
+  A (strncmp ("654321", a4, 5)); clobber (a4);
+}
+
+void test_array_copy_bounded (void)
+{
+  char s[8];
+  strcpy (s, "12345");
+  A (strncmp (a4, s, 5)); clobber (a4);
+  strcpy (s, "54321");
+  A (strncmp (s, a4, 5)); clobber (a4);
+
+  strcpy (s, "123456");
+  A (strncmp (a4, s, 5)); clobber (a4);
+  strcpy (s, "654321");
+  A (strncmp (s, a4, 5)); clobber (a4);
+}
+
+/* { dg-final { scan-tree-dump-not "abort|strcmp|strncmp" "optimized" } } */
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index c2866e0..ef2717d 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -915,6 +915,7 @@ get_range_strlen_dynamic (tree src, c_strlen_data *pdata, bitmap *visited,
 			      && tree_int_cst_lt (pdata->maxlen, argdata.maxlen)))
 			pdata->maxlen = argdata.maxlen;
 		      if (!pdata->maxbound
+			  || TREE_CODE (pdata->maxbound) != INTEGER_CST
 			  || (argdata.maxbound
 			      && tree_int_cst_lt (pdata->maxbound,
 						  argdata.maxbound)
@@ -1042,6 +1043,7 @@ get_range_strlen_dynamic (tree src, c_strlen_data *pdata,
 			  const vr_values *rvals)
 {
   bitmap visited = NULL;
+  tree maxbound = pdata->maxbound;
 
   unsigned limit = PARAM_VALUE (PARAM_SSA_NAME_DEF_CHAIN_LIMIT);
   if (!get_range_strlen_dynamic (src, pdata, &visited, rvals, &limit))
@@ -1055,6 +1057,11 @@ get_range_strlen_dynamic (tree src, c_strlen_data *pdata,
   else if (!pdata->minlen)
     pdata->minlen = ssize_int (0);
 
+  /* If it's unchanged from it initial non-null value, set the conservative
+     MAXBOUND to SIZE_MAX.  Otherwise leave it null (if it is null).  */
+  if (maxbound && pdata->maxbound == maxbound)
+    pdata->maxbound = build_all_ones_cst (size_type_node);
+
   if (visited)
     BITMAP_FREE (visited);
 }
@@ -2454,6 +2461,9 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi, tree src, tree cnt)
   else
     {
       c_strlen_data lendata = { };
+      /* Set MAXBOUND to an arbitrary non-null non-integer node as a request
+	 to have it set to the length of the longest string in a PHI.  */
+      lendata.maxbound = src;
       get_range_strlen (src, &lendata, /* eltsize = */1);
       if (TREE_CODE (lendata.minlen) == INTEGER_CST
 	  && TREE_CODE (lendata.maxbound) == INTEGER_CST)
@@ -3226,51 +3236,78 @@ handle_builtin_memset (gimple_stmt_iterator *gsi)
   return true;
 }
 
-/* Handle a call to memcmp.  We try to handle small comparisons by
-   converting them to load and compare, and replacing the call to memcmp
-   with a __builtin_memcmp_eq call where possible.
-   return true when call is transformed, return false otherwise.  */
+/* Return a pointer to the first such equality expression if RES is used
+   only in expressions testing its equality to zero, and null otherwise.  */
 
-static bool
-handle_builtin_memcmp (gimple_stmt_iterator *gsi)
+static gimple *
+used_only_for_zero_equality (tree res)
 {
-  gcall *stmt2 = as_a <gcall *> (gsi_stmt (*gsi));
-  tree res = gimple_call_lhs (stmt2);
-  tree arg1 = gimple_call_arg (stmt2, 0);
-  tree arg2 = gimple_call_arg (stmt2, 1);
-  tree len = gimple_call_arg (stmt2, 2);
-  unsigned HOST_WIDE_INT leni;
+  gimple *first_use = NULL;
+
   use_operand_p use_p;
   imm_use_iterator iter;
 
-  if (!res)
-    return false;
-
   FOR_EACH_IMM_USE_FAST (use_p, iter, res)
     {
-      gimple *ustmt = USE_STMT (use_p);
+      gimple *use_stmt = USE_STMT (use_p);
 
-      if (is_gimple_debug (ustmt))
-	continue;
-      if (gimple_code (ustmt) == GIMPLE_ASSIGN)
+      if (is_gimple_debug (use_stmt))
+        continue;
+      if (gimple_code (use_stmt) == GIMPLE_ASSIGN)
 	{
-	  gassign *asgn = as_a <gassign *> (ustmt);
-	  tree_code code = gimple_assign_rhs_code (asgn);
-	  if ((code != EQ_EXPR && code != NE_EXPR)
-	      || !integer_zerop (gimple_assign_rhs2 (asgn)))
-	    return false;
+	  tree_code code = gimple_assign_rhs_code (use_stmt);
+	  if (code == COND_EXPR)
+	    {
+	      tree cond_expr = gimple_assign_rhs1 (use_stmt);
+	      if ((TREE_CODE (cond_expr) != EQ_EXPR
+		   && (TREE_CODE (cond_expr) != NE_EXPR))
+		  || !integer_zerop (TREE_OPERAND (cond_expr, 1)))
+		return NULL;
+	    }
+	  else if (code == EQ_EXPR || code == NE_EXPR)
+	    {
+	      if (!integer_zerop (gimple_assign_rhs2 (use_stmt)))
+		return NULL;
+            }
+	  else
+	    return NULL;
 	}
-      else if (gimple_code (ustmt) == GIMPLE_COND)
+      else if (gimple_code (use_stmt) == GIMPLE_COND)
 	{
-	  tree_code code = gimple_cond_code (ustmt);
+	  tree_code code = gimple_cond_code (use_stmt);
 	  if ((code != EQ_EXPR && code != NE_EXPR)
-	      || !integer_zerop (gimple_cond_rhs (ustmt)))
-	    return false;
+	      || !integer_zerop (gimple_cond_rhs (use_stmt)))
+	    return NULL;
 	}
       else
-	return false;
+        return NULL;
+
+      if (!first_use)
+	first_use = use_stmt;
     }
 
+  return first_use;
+}
+
+/* Handle a call to memcmp.  We try to handle small comparisons by
+   converting them to load and compare, and replacing the call to memcmp
+   with a __builtin_memcmp_eq call where possible.
+   return true when call is transformed, return false otherwise.  */
+
+static bool
+handle_builtin_memcmp (gimple_stmt_iterator *gsi)
+{
+  gcall *stmt = as_a <gcall *> (gsi_stmt (*gsi));
+  tree res = gimple_call_lhs (stmt);
+
+  if (!res || !used_only_for_zero_equality (res))
+    return false;
+
+  tree arg1 = gimple_call_arg (stmt, 0);
+  tree arg2 = gimple_call_arg (stmt, 1);
+  tree len = gimple_call_arg (stmt, 2);
+  unsigned HOST_WIDE_INT leni;
+
   if (tree_fits_uhwi_p (len)
       && (leni = tree_to_uhwi (len)) <= GET_MODE_SIZE (word_mode)
       && pow2p_hwi (leni))
@@ -3283,7 +3320,7 @@ handle_builtin_memcmp (gimple_stmt_iterator *gsi)
       if (int_mode_for_size (leni, 1).exists (&mode)
 	  && (align >= leni || !targetm.slow_unaligned_access (mode, align)))
 	{
-	  location_t loc = gimple_location (stmt2);
+	  location_t loc = gimple_location (stmt);
 	  tree type, off;
 	  type = build_nonstandard_integer_type (leni, 1);
 	  gcc_assert (known_eq (GET_MODE_BITSIZE (TYPE_MODE (type)), leni));
@@ -3307,78 +3344,10 @@ handle_builtin_memcmp (gimple_stmt_iterator *gsi)
 	}
     }
 
-  gimple_call_set_fndecl (stmt2, builtin_decl_explicit (BUILT_IN_MEMCMP_EQ));
+  gimple_call_set_fndecl (stmt, builtin_decl_explicit (BUILT_IN_MEMCMP_EQ));
   return true;
 }
 
-/* If IDX1 and IDX2 refer to strings A and B of unequal lengths, return
-   the result of 0 == strncmp (A, B, N) (which is the same as strcmp for
-   sufficiently large N).  Otherwise return false.  */
-
-static bool
-strxcmp_unequal (int idx1, int idx2, unsigned HOST_WIDE_INT n)
-{
-  unsigned HOST_WIDE_INT len1;
-  unsigned HOST_WIDE_INT len2;
-
-  bool nulterm1;
-  bool nulterm2;
-
-  if (idx1 < 0)
-    {
-      len1 = ~idx1;
-      nulterm1 = true;
-    }
-  else if (strinfo *si = get_strinfo (idx1))
-    {
-      if (tree_fits_uhwi_p (si->nonzero_chars))
-	{
-	  len1 = tree_to_uhwi (si->nonzero_chars);
-	  nulterm1 = si->full_string_p;
-	}
-      else
-	return false;
-    }
-  else
-    return false;
-
-  if (idx2 < 0)
-    {
-      len2 = ~idx2;
-      nulterm2 = true;
-    }
-  else if (strinfo *si = get_strinfo (idx2))
-    {
-      if (tree_fits_uhwi_p (si->nonzero_chars))
-	{
-	  len2 = tree_to_uhwi (si->nonzero_chars);
-	  nulterm2 = si->full_string_p;
-	}
-      else
-	return false;
-    }
-  else
-    return false;
-
-  /* N is set to UHWI_MAX for strcmp and less to strncmp.  Adjust
-     the length of each string to consider to be no more than N.  */
-  if (len1 > n)
-    len1 = n;
-  if (len2 > n)
-    len2 = n;
-
-  if ((len1 < len2 && nulterm1)
-      || (len2 < len1 && nulterm2))
-    /* The string lengths are definitely unequal and the result can
-       be folded to one (since it's used for comparison with zero).  */
-    return true;
-
-  /* The string lengths may be equal or unequal.  Even when equal and
-     both strings nul-terminated, without the string contents there's
-     no way to determine whether they are equal.  */
-  return false;
-}
-
 /* Given an index to the strinfo vector, compute the string length
    for the corresponding string. Return -1 when unknown.  */
 
@@ -3407,15 +3376,16 @@ compute_string_length (int idx)
 
 /* Determine the minimum size of the object referenced by DEST expression
    which must have a pointer type.
-   Return the minimum size of the object if successful or NULL when the size
-   cannot be determined.  */
-static tree
+   Return the minimum size of the object if successful or HWI_M1U when
+   the size cannot be determined.  */
+
+static unsigned HOST_WIDE_INT
 determine_min_objsize (tree dest)
 {
   unsigned HOST_WIDE_INT size = 0;
 
   if (compute_builtin_object_size (dest, 2, &size))
-    return build_int_cst (sizetype, size);
+    return size;
 
   /* Try to determine the size of the object through the RHS
      of the assign statement.  */
@@ -3423,11 +3393,11 @@ determine_min_objsize (tree dest)
     {
       gimple *stmt = SSA_NAME_DEF_STMT (dest);
       if (!is_gimple_assign (stmt))
-	return NULL_TREE;
+	return HOST_WIDE_INT_M1U;
 
       if (!gimple_assign_single_p (stmt)
 	  && !gimple_assign_unary_nop_p (stmt))
-	return NULL_TREE;
+	return HOST_WIDE_INT_M1U;
 
       dest = gimple_assign_rhs1 (stmt);
       return determine_min_objsize (dest);
@@ -3435,7 +3405,7 @@ determine_min_objsize (tree dest)
 
   /* Try to determine the size of the object from its type.  */
   if (TREE_CODE (dest) != ADDR_EXPR)
-    return NULL_TREE;
+    return HOST_WIDE_INT_M1U;
 
   tree type = TREE_TYPE (dest);
   if (TREE_CODE (type) == POINTER_TYPE)
@@ -3443,196 +3413,388 @@ determine_min_objsize (tree dest)
 
   type = TYPE_MAIN_VARIANT (type);
 
-  /* We cannot determine the size of the array if it's a flexible array,
-     which is declared at the end of a structure.  */
-  if (TREE_CODE (type) == ARRAY_TYPE
-      && !array_at_struct_end_p (dest))
+  /* The size of a flexible array cannot be determined.  Otherwise,
+     for arrays with more than one element, return the size of its
+     type.  GCC itself misuses arrays of both zero and one elements
+     as flexible array members so they are excluded as well.  */
+  if (TREE_CODE (type) != ARRAY_TYPE
+      || !array_at_struct_end_p (dest))
     {
-      tree size_t = TYPE_SIZE_UNIT (type);
-      if (size_t && TREE_CODE (size_t) == INTEGER_CST
-	  && !integer_zerop (size_t))
-        return size_t;
+      tree type_size = TYPE_SIZE_UNIT (type);
+      if (type_size && TREE_CODE (type_size) == INTEGER_CST
+	  && !integer_onep (type_size)
+	  && !integer_zerop (type_size))
+        return tree_to_uhwi (type_size);
     }
 
-  return NULL_TREE;
+  return HOST_WIDE_INT_M1U;
 }
 
-/* Handle a call to strcmp or strncmp. When the result is ONLY used to do
-   equality test against zero:
-
-   A. When the lengths of both arguments are constant and it's a strcmp:
-      * if the lengths are NOT equal, we can safely fold the call
-        to a non-zero value.
-      * otherwise, do nothing now.
-
-   B. When the length of one argument is constant, try to replace the call
-   with a __builtin_str(n)cmp_eq call where possible, i.e:
-
-   strncmp (s, STR, C) (!)= 0 in which, s is a pointer to a string, STR
-   is a string with constant length , C is a constant.
-     if (C <= strlen(STR) && sizeof_array(s) > C)
-       {
-         replace this call with
-         strncmp_eq (s, STR, C) (!)= 0
-       }
-     if (C > strlen(STR)
-       {
-         it can be safely treated as a call to strcmp (s, STR) (!)= 0
-         can handled by the following strcmp.
-       }
-
-   strcmp (s, STR) (!)= 0 in which, s is a pointer to a string, STR
-   is a string with constant length.
-     if  (sizeof_array(s) > strlen(STR))
-       {
-         replace this call with
-         strcmp_eq (s, STR, strlen(STR)+1) (!)= 0
-       }
-
-   Return true when the call is transformed, return false otherwise.
- */
+/* Given strinfo IDX for ARG, set LENRNG[] to the range of lengths
+   of  the string(s) referenced by ARG if it can be determined.
+   If the length cannot be determined, set *SIZE to the size of
+   the array the string is stored in, if any.  If no such array is
+   known, set *SIZE to -1.  When the strings are nul-terminated set
+   *NULTERM to true, otherwise to false.  Return true on success.  */
 
 static bool
-handle_builtin_string_cmp (gimple_stmt_iterator *gsi)
+get_len_or_size (tree arg, int idx, unsigned HOST_WIDE_INT lenrng[2],
+		 unsigned HOST_WIDE_INT *size, bool *nulterm)
 {
-  gcall *stmt = as_a <gcall *> (gsi_stmt (*gsi));
-  tree res = gimple_call_lhs (stmt);
-  use_operand_p use_p;
-  imm_use_iterator iter;
-  tree arg1 = gimple_call_arg (stmt, 0);
-  tree arg2 = gimple_call_arg (stmt, 1);
-  int idx1 = get_stridx (arg1);
-  int idx2 = get_stridx (arg2);
-  HOST_WIDE_INT length = -1;
-  bool is_ncmp = false;
+  /* Set so that both LEN and ~LEN are invalid lengths, i.e.,
+     maximum possible length + 1.  */
+  lenrng[0] = lenrng[1] = HOST_WIDE_INT_MAX;
 
-  if (!res)
-    return false;
-
-  /* When both arguments are unknown, do nothing.  */
-  if (idx1 == 0 && idx2 == 0)
-    return false;
+  *size = HOST_WIDE_INT_M1U;
 
-  /* Handle strncmp function.  */
-  if (gimple_call_num_args (stmt) == 3)
+  if (idx < 0)
     {
-      tree len = gimple_call_arg (stmt, 2);
-      if (tree_fits_shwi_p (len))
-        length = tree_to_shwi (len);
-
-      is_ncmp = true;
+      /* IDX is the inverted constant string length.  */
+      lenrng[0] = ~idx;
+      lenrng[1] = lenrng[0];
+      *nulterm = true;
     }
-
-  /* For strncmp, if the length argument is NOT known, do nothing.  */
-  if (is_ncmp && length < 0)
-    return false;
-
-  /* When the result is ONLY used to do equality test against zero.  */
-  FOR_EACH_IMM_USE_FAST (use_p, iter, res)
+  else if (idx == 0)
+    ; /* Handled below.  */
+  else if (strinfo *si = get_strinfo (idx))
     {
-      gimple *use_stmt = USE_STMT (use_p);
+      if (!si->nonzero_chars)
+	arg = si->ptr;
+      else if (tree_fits_uhwi_p (si->nonzero_chars))
+	{
+	  lenrng[0] = tree_to_uhwi (si->nonzero_chars);
+	  *nulterm = si->full_string_p;
+	  /* Set the upper bound only if the string is known to be
+	     nul-terminated, otherwise leave it at maximum + 1.  */
+	  if (*nulterm)
+	    lenrng[1] = lenrng[0];
+	}
+      else if (TREE_CODE (si->nonzero_chars) == SSA_NAME)
+	{
+	  wide_int min, max;
+	  value_range_kind rng = get_range_info (si->nonzero_chars, &min, &max);
+	  if (rng == VR_RANGE)
+	    {
+	      lenrng[0] = min.to_uhwi ();
+	      lenrng[1] = max.to_uhwi ();
+	      *nulterm = si->full_string_p;
+	    }
+	}
+      else if (si->ptr)
+	arg = si->ptr;
+    }
 
-      if (is_gimple_debug (use_stmt))
-        continue;
-      if (gimple_code (use_stmt) == GIMPLE_ASSIGN)
+  if (lenrng[0] == HOST_WIDE_INT_MAX)
+    {
+      /* Compute the minimum and maximum real or possible lengths.  */
+      c_strlen_data lendata = { };
+      if (get_range_strlen (arg, &lendata, /* eltsize = */1))
 	{
-	  tree_code code = gimple_assign_rhs_code (use_stmt);
-	  if (code == COND_EXPR)
+	  if (tree_fits_shwi_p (lendata.maxlen) && !lendata.maxbound)
 	    {
-	      tree cond_expr = gimple_assign_rhs1 (use_stmt);
-	      if ((TREE_CODE (cond_expr) != EQ_EXPR
-		   && (TREE_CODE (cond_expr) != NE_EXPR))
-		  || !integer_zerop (TREE_OPERAND (cond_expr, 1)))
-		return false;
+	      lenrng[0] = tree_to_shwi (lendata.minlen);
+	      lenrng[1] = tree_to_shwi (lendata.maxlen);
+	      *nulterm = true;
 	    }
-	  else if (code == EQ_EXPR || code == NE_EXPR)
+	  else if (lendata.maxbound && tree_fits_shwi_p (lendata.maxbound))
 	    {
-	      if (!integer_zerop (gimple_assign_rhs2 (use_stmt)))
-		return false;
-            }
-	  else
-	    return false;
+	      /* Set *SIZE to the conservative LENDATA.MAXBOUND which
+		 is a conservative estimate of the longest string based
+		 on the sizes of the arrays referenced by ARG.  */
+	      *size = tree_to_uhwi (lendata.maxbound) + 1;
+	      *nulterm = false;
+	    }
 	}
-      else if (gimple_code (use_stmt) == GIMPLE_COND)
+      else
 	{
-	  tree_code code = gimple_cond_code (use_stmt);
-	  if ((code != EQ_EXPR && code != NE_EXPR)
-	      || !integer_zerop (gimple_cond_rhs (use_stmt)))
-	    return false;
+	  /* Set *SIZE to the size of the smallest object referenced
+	     by ARG if ARG denotes a single object, or to HWI_M1U
+	     otherwise.  */
+	  *size = determine_min_objsize (arg);
+	  *nulterm = false;
 	}
-      else
-        return false;
     }
 
-  /* When the lengths of the arguments are known to be unequal
-     we can safely fold the call to a non-zero value for strcmp;
-     otherwise, do nothing now.  */
-  if (idx1 != 0 && idx2 != 0)
-    {
-      if (strxcmp_unequal (idx1, idx2, length))
-	{
-	  replace_call_with_value (gsi, integer_one_node);
-	  return true;
-	}
-      return false;
+  return lenrng[0] != HOST_WIDE_INT_MAX || *size != HOST_WIDE_INT_M1U;
+}
+
+/* If IDX1 and IDX2 refer to strings A and B of unequal lengths, return
+   the result of 0 == strncmp (A, B, BOUND) (which is the same as strcmp
+   for a sufficiently large BOUND).  If the result is based on the length
+   of one string being greater than the longest string that would fit in
+   the array pointer to by the argument, set *PLEN and *PSIZE to
+   the corresponding length (or its complement when the string is known
+   to be at least as long and need not be nul-terminated) and size.
+   Otherwise return null.  */
+
+static tree
+strxcmp_eqz_result (tree arg1, int idx1, tree arg2, int idx2,
+		    unsigned HOST_WIDE_INT bound, unsigned HOST_WIDE_INT len[2],
+		    unsigned HOST_WIDE_INT *psize)
+{
+  /* Determine the range the length of each string is in and whether it's
+     known to be nul-terminated, or the size of the array it's stored in.  */
+  bool nul1, nul2;
+  unsigned HOST_WIDE_INT siz1, siz2;
+  unsigned HOST_WIDE_INT len1rng[2], len2rng[2];
+  if (!get_len_or_size (arg1, idx1, len1rng, &siz1, &nul1)
+      || !get_len_or_size (arg2, idx2, len2rng, &siz2, &nul2))
+    return NULL_TREE;
+
+  /* BOUND is set to HWI_M1U for strcmp and less to strncmp, and LENiRNG
+     to HWI_MAX when invalid.  Adjust the length of each string to consider
+     to be no more than BOUND.  */
+  if (len1rng[0] < HOST_WIDE_INT_MAX && len1rng[0] > bound)
+    len1rng[0] = bound;
+  if (len1rng[1] < HOST_WIDE_INT_MAX && len1rng[1] > bound)
+    len1rng[1] = bound;
+  if (len2rng[0] < HOST_WIDE_INT_MAX && len2rng[0] > bound)
+    len2rng[0] = bound;
+  if (len2rng[1] < HOST_WIDE_INT_MAX && len2rng[1] > bound)
+    len2rng[1] = bound;
+
+  /* Two empty strings are equal.  */
+  if (len1rng[1] == 0 && len2rng[1] == 0)
+    return integer_one_node;
+
+  /* The strings are definitely unequal when the lower bound of the length
+     of one of them is greater than the length of the longest string that
+     would fit into the other array.  */
+  if (len1rng[0] == HOST_WIDE_INT_MAX
+      && len2rng[0] != HOST_WIDE_INT_MAX
+      && ((len2rng[0] < bound && len2rng[0] >= siz1)
+	  || len2rng[0] > siz1))
+    {
+      *psize = siz1;
+      len[0] = len1rng[0];
+      /* Set LEN[0] to the lower bound of ARG1's length when it's
+	 nul-terminated or to the complement of its minimum length
+	 otherwise,  */
+      len[1] = nul2 ? len2rng[0] : ~len2rng[0];
+      return integer_zero_node;
+    }
+
+  if (len2rng[0] == HOST_WIDE_INT_MAX
+      && len1rng[0] != HOST_WIDE_INT_MAX
+      && ((len1rng[0] < bound && len1rng[0] >= siz2)
+	  || len1rng[0] > siz2))
+    {
+      *psize = siz2;
+      len[0] = nul1 ? len1rng[0] : ~len1rng[0];
+      len[1] = len2rng[0];
+      return integer_zero_node;
+    }
+
+  /* The strings are also definitely unequal when their lengths are unequal
+     and at least one is nul-terminated.  */
+  if (len1rng[0] != HOST_WIDE_INT_MAX
+      && len2rng[0] != HOST_WIDE_INT_MAX
+      && ((len1rng[1] < len2rng[0] && nul1)
+	  || (len2rng[1] < len1rng[0] && nul2)))
+    {
+      if (bound <= len1rng[0] || bound <= len2rng[0])
+	*psize = bound;
+      else
+	*psize = HOST_WIDE_INT_M1U;
+
+      len[0] = len1rng[0];
+      len[1] = len2rng[0];
+      return integer_zero_node;
     }
 
-  /* When the length of one argument is constant.  */
-  tree var_string = NULL_TREE;
-  HOST_WIDE_INT const_string_leni = -1;
+  /* The string lengths may be equal or unequal.  Even when equal and
+     both strings nul-terminated, without the string contents there's
+     no way to determine whether they are equal.  */
+  return NULL_TREE;
+}
+
+/* Diagnose pointless calls to strcmp or strncmp STMT with string
+   arguments of lengths LEN or size SIZ and (for strncmp) BOUND,
+   whose result is used in equality expressions that evaluate to
+   a constant due to one argument being longer than the size of
+   the other.  */
 
-  if (idx1)
+static void
+maybe_warn_pointless_strcmp (gimple *stmt, HOST_WIDE_INT bound,
+			     unsigned HOST_WIDE_INT len[2],
+			     unsigned HOST_WIDE_INT siz)
+{
+  gimple *use = used_only_for_zero_equality (gimple_call_lhs (stmt));
+  if (!use)
+    return;
+
+  bool at_least = false;
+
+  /* Excessive LEN[i] indicates a lower bound.  */
+  if (len[0] > HOST_WIDE_INT_MAX)
     {
-      const_string_leni = compute_string_length (idx1);
-      var_string = arg2;
+      at_least = true;
+      len[0] = ~len[0];
     }
-  else
+
+  if (len[1] > HOST_WIDE_INT_MAX)
     {
-      gcc_checking_assert (idx2);
-      const_string_leni = compute_string_length (idx2);
-      var_string = arg1;
+      at_least = true;
+      len[1] = ~len[1];
     }
 
-  if (const_string_leni < 0)
-    return false;
+  unsigned HOST_WIDE_INT minlen = MIN (len[0], len[1]);
 
-  unsigned HOST_WIDE_INT var_sizei = 0;
-  /* try to determine the minimum size of the object pointed by var_string.  */
-  tree size = determine_min_objsize (var_string);
+  /* FIXME: Include a note pointing to the declaration of the smaller
+     array.  */
+  location_t stmt_loc = gimple_location (stmt);
+  tree callee = gimple_call_fndecl (stmt);
+  bool warned = false;
+  if (siz <= minlen && bound == -1)
+    warned = warning_at (stmt_loc, OPT_Wstring_compare,
+			 (at_least
+			  ? G_("%G%qD of a string of length %wu or more and "
+			       "an array of size %wu evaluates to nonzero")
+			  : G_("%G%qD of a string of length %wu and an array "
+			       "of size %wu evaluates to nonzero")),
+			 stmt, callee, minlen, siz);
+  else if (!at_least && siz <= HOST_WIDE_INT_MAX)
+    {
+      if (len[0] != HOST_WIDE_INT_MAX && len[1] != HOST_WIDE_INT_MAX)
+	warned = warning_at (stmt_loc, OPT_Wstring_compare,
+			     "%G%qD of strings of length %wu and %wu "
+			     "and bound of %wu evaluates to nonzero",
+			     stmt, callee, len[0], len[1], bound);
+      else
+	warned = warning_at (stmt_loc, OPT_Wstring_compare,
+			     "%G%qD of a string of length %wu, an array "
+			     "of size %wu and bound of %wu evaluates to "
+			     "nonzero",
+			     stmt, callee, minlen, siz, bound);
+    }
+
+  if (warned)
+    {
+      location_t use_loc = gimple_location (use);
+      if (LOCATION_LINE (stmt_loc) != LOCATION_LINE (use_loc))
+	inform (use_loc, "in this expression");
+    }
+}
 
-  if (!size)
-    return false;
 
-  if (tree_fits_uhwi_p (size))
-    var_sizei = tree_to_uhwi (size);
+/* Optimize a call to strcmp or strncmp either by folding it to a constant
+   when possible or by transforming the latter to the former.  Warn about
+   calls where the length of one argument is greater than the size of
+   the array to which the other argument points if the latter's length
+   is not known.  Return true when the call has been transformed into
+   another and false otherwise.  */
+
+static bool
+handle_builtin_string_cmp (gimple_stmt_iterator *gsi)
+{
+  gcall *stmt = as_a <gcall *> (gsi_stmt (*gsi));
+  tree lhs = gimple_call_lhs (stmt);
 
-  if (var_sizei == 0)
+  if (!lhs)
     return false;
 
-  /* For strncmp, if length > const_string_leni , this call can be safely
-     transformed to a strcmp.  */
-  if (is_ncmp && length > const_string_leni)
-    is_ncmp = false;
+  tree arg1 = gimple_call_arg (stmt, 0);
+  tree arg2 = gimple_call_arg (stmt, 1);
+  int idx1 = get_stridx (arg1);
+  int idx2 = get_stridx (arg2);
 
-  unsigned HOST_WIDE_INT final_length
-    = is_ncmp ? length : const_string_leni + 1;
+  /* For strncmp set to the the value of the third argument if known.  */
+  HOST_WIDE_INT bound = -1;
 
-  /* Replace strcmp or strncmp with the corresponding str(n)cmp_eq.  */
-  if (var_sizei > final_length)
+  /* Extract the strncmp bound.  */
+  if (gimple_call_num_args (stmt) == 3)
     {
-      tree fn
-	= (is_ncmp
-	   ? builtin_decl_implicit (BUILT_IN_STRNCMP_EQ)
-	   : builtin_decl_implicit (BUILT_IN_STRCMP_EQ));
-      if (!fn)
+      tree len = gimple_call_arg (stmt, 2);
+      if (tree_fits_shwi_p (len))
+        bound = tree_to_shwi (len);
+
+      /* If the bound argument is NOT known, do nothing.  */
+      if (bound < 0)
 	return false;
-      tree const_string_len = build_int_cst (size_type_node, final_length);
-      update_gimple_call (gsi, fn, 3, arg1, arg2, const_string_len);
     }
+
+  {
+    /* Set to the length of one argument (or its complement if it's
+       the lower bound of a range) and the size of the array storing
+       the other if the result is based on the former being equal to
+       or greater than the latter.  */
+    unsigned HOST_WIDE_INT len[2] = { HOST_WIDE_INT_MAX, HOST_WIDE_INT_MAX };
+    unsigned HOST_WIDE_INT siz = HOST_WIDE_INT_M1U;
+
+    /* Try to determine if the two strings are either definitely equal
+       or definitely unequal and if so, either fold the result to zero
+       (when equal) or set the range of the result to ~[0, 0] otherwise.  */
+    if (tree eqz = strxcmp_eqz_result (arg1, idx1, arg2, idx2, bound,
+				       len, &siz))
+      {
+	if (integer_zerop (eqz))
+	  {
+	    maybe_warn_pointless_strcmp (stmt, bound, len, siz);
+
+	    /* When the lengths of the first two string arguments are
+	       known to be unequal set the range of the result to non-zero.
+	       This allows the call to be eliminated if its result is only
+	       used in tests for equality to zero.  */
+	    wide_int zero = wi::zero (TYPE_PRECISION (TREE_TYPE (lhs)));
+	    set_range_info (lhs, VR_ANTI_RANGE, zero, zero);
+	    return false;
+	  }
+	/* When the two strings are definitely equal (such as when they
+	   are both empty) fold the call to the constant result.  */
+	replace_call_with_value (gsi, integer_zero_node);
+	return true;
+      }
+  }
+
+  /* Return if nothing is known about the strings pointed to by ARG1
+     and ARG2.  */
+  if (idx1 == 0 && idx2 == 0)
+    return false;
+
+  /* Determine either the length or the size of each of the strings,
+     whichever is available.  */
+  HOST_WIDE_INT cstlen1 = -1, cstlen2 = -1;
+  HOST_WIDE_INT arysiz1 = -1, arysiz2 = -1;
+
+  if (idx1)
+    cstlen1 = compute_string_length (idx1) + 1;
   else
+    arysiz1 = determine_min_objsize (arg1);
+
+  /* Bail if neither the string length nor the size of the array
+     it is stored in can be determined.  */
+  if (cstlen1 < 0 && arysiz1 < 0)
     return false;
 
-  return true;
+  /* Repeat for the second argument.  */
+  if (idx2)
+    cstlen2 = compute_string_length (idx2) + 1;
+  else
+    arysiz2 = determine_min_objsize (arg2);
+
+  if (cstlen2 < 0 && arysiz2 < 0)
+    return false;
+
+  /* The exact number of characters to compare.  */
+  HOST_WIDE_INT cmpsiz = bound < 0 ? cstlen1 < 0 ? cstlen2 : cstlen1 : bound;
+  /* The size of the array in which the unknown string is stored.  */
+  HOST_WIDE_INT varsiz = arysiz1 < 0 ? arysiz2 : arysiz1;
+
+  if (cmpsiz < varsiz && used_only_for_zero_equality (lhs))
+    {
+      /* If the known length is less than the size of the other array
+	 and the strcmp result is only used to test equality to zero,
+	 transform the call to the equivalent _eq call.  */
+      if (tree fn = builtin_decl_implicit (bound < 0 ? BUILT_IN_STRCMP_EQ
+					   : BUILT_IN_STRNCMP_EQ))
+	{
+	  tree n = build_int_cst (size_type_node, cmpsiz);
+	  update_gimple_call (gsi, fn, 3, arg1, arg2, n);
+	  return true;
+	}
+    }
+
+  return false;
 }
 
 /* Handle a POINTER_PLUS_EXPR statement.
-- 
cgit v1.1


From 66ef6ac5806f82fdaa35c01f89b6c8cd4b47b4b5 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Thu, 10 Oct 2019 00:16:19 +0000
Subject: Daily bump.

From-SVN: r276786
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 70f16fc..caa1d99 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191009
+20191010
-- 
cgit v1.1


From 6ea20bd0218fd6386cef3701befa653cee6f1101 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 10 Oct 2019 00:10:17 -0400
Subject: * cp-tree.h (template_info_decl_check): Check ENABLE_TREE_CHECKING.

From-SVN: r276787
---
 gcc/cp/ChangeLog |  4 ++++
 gcc/cp/cp-tree.h | 62 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 37 insertions(+), 29 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e47e8ca..2a35bf2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-09  Jason Merrill  <jason@redhat.com>
+
+	* cp-tree.h (template_info_decl_check): Check ENABLE_TREE_CHECKING.
+
 2019-10-09  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/91364 - P0388R4: Permit conversions to arrays of	unknown bound.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index c1301a4..663d84b 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -593,15 +593,46 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX];
   TREE_CHECK(NODE,BOUND_TEMPLATE_TEMPLATE_PARM)
 
 #if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007)
+
+/* Returns t iff the node can have a TEMPLATE_INFO field.  */
+
+inline tree
+template_info_decl_check (const_tree t, const char* f, int l, const char* fn)
+{
+  switch (TREE_CODE (t))
+    {
+    case VAR_DECL:
+    case FUNCTION_DECL:
+    case FIELD_DECL:
+    case TYPE_DECL:
+    case CONCEPT_DECL:
+    case TEMPLATE_DECL:
+      return const_cast<tree>(t);
+    default:
+      break;
+    }
+  tree_check_failed (t, f, l, fn,
+		     VAR_DECL, FUNCTION_DECL, FIELD_DECL, TYPE_DECL,
+		     CONCEPT_DECL, TEMPLATE_DECL, 0);
+  gcc_unreachable ();
+}
+
+#define TEMPLATE_INFO_DECL_CHECK(NODE) \
+  template_info_decl_check ((NODE), __FILE__, __LINE__, __FUNCTION__)
+
 #define THUNK_FUNCTION_CHECK(NODE) __extension__			\
 ({  __typeof (NODE) const __t = (NODE);					\
     if (TREE_CODE (__t) != FUNCTION_DECL || !__t->decl_common.lang_specific \
 	|| !__t->decl_common.lang_specific->u.fn.thunk_p)		\
       tree_check_failed (__t, __FILE__, __LINE__, __FUNCTION__, 0);	\
      __t; })
-#else
+
+#else /* ENABLE_TREE_CHECKING */
+
+#define TEMPLATE_INFO_DECL_CHECK(NODE) (NODE)
 #define THUNK_FUNCTION_CHECK(NODE) (NODE)
-#endif
+
+#endif /* ENABLE_TREE_CHECKING */
 
 /* Language-dependent contents of an identifier.  */
 
@@ -3348,33 +3379,6 @@ struct GTY(()) lang_decl {
 #define TEMPLATE_DECL_COMPLEX_ALIAS_P(NODE) \
   DECL_LANG_FLAG_2 (TEMPLATE_DECL_CHECK (NODE))
 
-/* Returns t iff the node can have a TEMPLATE_INFO field.  */
-
-inline tree
-template_info_decl_check (const_tree t, const char* f, int l, const char* fn)
-{
-  switch (TREE_CODE (t))
-    {
-    case VAR_DECL:
-    case FUNCTION_DECL:
-    case FIELD_DECL:
-    case TYPE_DECL:
-    case CONCEPT_DECL:
-    case TEMPLATE_DECL:
-      return const_cast<tree>(t);
-    default:
-      break;
-    }
-  tree_check_failed (t, f, l, fn,
-                     VAR_DECL, FUNCTION_DECL, FIELD_DECL, TYPE_DECL,
-                     CONCEPT_DECL, TEMPLATE_DECL, 0);
-  gcc_unreachable ();
-}
-
-
-#define TEMPLATE_INFO_DECL_CHECK(NODE) \
-  template_info_decl_check ((NODE), __FILE__, __LINE__, __FUNCTION__)
-
 /* Nonzero for a type which is an alias for another type; i.e, a type
    which declaration was written 'using name-of-type =
    another-type'.  */
-- 
cgit v1.1


From 94e7f906ca5c73fb79d21ec54733e9e75a96c2b4 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 10 Oct 2019 09:07:30 +0200
Subject: c-common.h (c_omp_check_context_selector, [...]): Declare.

c-family/
	* c-common.h (c_omp_check_context_selector,
	c_omp_get_context_selector): Declare.
	* c-omp.c (c_omp_declare_simd_clauses_to_numbers): Fix spelling
	in diagnostic message.
	(c_omp_check_context_selector, c_omp_get_context_selector): New
	functions.
	* c-attribs.c (c_common_attribute_table): Add "omp declare variant"
	attribute.
	(handle_omp_declare_variant_attribute): New function.
c/
	* c-parser.c (c_parser_omp_all_clauses): Add NESTED_P argument, if
	true, terminate processing on closing paren and don't skip to end of
	pragma line.
	(c_parser_omp_declare_simd): Handle also declare variant.
	(omp_construct_selectors, omp_device_selectors,
	omp_implementation_selectors, omp_user_selectors): New variables.
	(c_parser_omp_context_selector,
	c_parser_omp_context_selector_specification,
	c_finish_omp_declare_variant): New functions.
	(c_finish_omp_declare_simd): Handle both declare simd and
	declare variant.
	(c_parser_omp_declare): Handle declare variant.
cp/
	* parser.h (struct cp_omp_declare_simd_data): Add variant_p member.
	* parser.c (cp_ensure_no_omp_declare_simd): Handle both declare simd
	and declare variant.
	(cp_parser_oacc_all_clauses): Formatting fix.
	(cp_parser_omp_all_clauses): Add NESTED_P argument, if true, terminate
	processing on closing paren and don't skip to end of pragma line.
	(cp_parser_omp_declare_simd): Add VARIANT_P argument.  Handle also
	declare variant.
	(omp_construct_selectors, omp_device_selectors,
	omp_implementation_selectors, omp_user_selectors): New variables.
	(cp_parser_omp_context_selector,
	cp_parser_omp_context_selector_specification,
	cp_finish_omp_declare_variant): New functions.
	(cp_parser_late_parsing_omp_declare_simd): Handle also declare variant.
	(cp_parser_omp_declare): Handle declare variant.
testsuite/
	* c-c++-common/gomp/declare-variant-1.c: New test.
	* c-c++-common/gomp/declare-variant-2.c: New test.
	* c-c++-common/gomp/declare-variant-3.c: New test.
	* g++.dg/gomp/this-1.C: Adjust for diagnostic message spelling fix.
	* gcc.dg/gomp/declare-variant-1.c: New test.
	* gcc.dg/gomp/declare-variant-2.c: New test.

From-SVN: r276789
---
 gcc/c-family/ChangeLog                             |  12 +
 gcc/c-family/c-attribs.c                           |  13 +
 gcc/c-family/c-common.h                            |   2 +
 gcc/c-family/c-omp.c                               | 134 ++++-
 gcc/c/ChangeLog                                    |  15 +
 gcc/c/c-parser.c                                   | 545 +++++++++++++++++++--
 gcc/cp/ChangeLog                                   |  18 +
 gcc/cp/parser.c                                    | 506 ++++++++++++++++++-
 gcc/cp/parser.h                                    |   3 +-
 gcc/testsuite/ChangeLog                            |   9 +
 .../c-c++-common/gomp/declare-variant-1.c          |  54 ++
 .../c-c++-common/gomp/declare-variant-2.c          | 122 +++++
 .../c-c++-common/gomp/declare-variant-3.c          | 141 ++++++
 gcc/testsuite/g++.dg/gomp/this-1.C                 |   4 +-
 gcc/testsuite/gcc.dg/gomp/declare-variant-1.c      |  41 ++
 gcc/testsuite/gcc.dg/gomp/declare-variant-2.c      |  22 +
 16 files changed, 1570 insertions(+), 71 deletions(-)
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-1.c
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-2.c
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-3.c
 create mode 100644 gcc/testsuite/gcc.dg/gomp/declare-variant-1.c
 create mode 100644 gcc/testsuite/gcc.dg/gomp/declare-variant-2.c

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 398ba6d..598fea4 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-common.h (c_omp_check_context_selector,
+	c_omp_get_context_selector): Declare.
+	* c-omp.c (c_omp_declare_simd_clauses_to_numbers): Fix spelling
+	in diagnostic message.
+	(c_omp_check_context_selector, c_omp_get_context_selector): New
+	functions.
+	* c-attribs.c (c_common_attribute_table): Add "omp declare variant"
+	attribute.
+	(handle_omp_declare_variant_attribute): New function.
+
 2019-10-09  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/90879
diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c
index 6500b99..917d483 100644
--- a/gcc/c-family/c-attribs.c
+++ b/gcc/c-family/c-attribs.c
@@ -140,6 +140,8 @@ static tree handle_warn_unused_attribute (tree *, tree, tree, int, bool *);
 static tree handle_returns_nonnull_attribute (tree *, tree, tree, int, bool *);
 static tree handle_omp_declare_simd_attribute (tree *, tree, tree, int,
 					       bool *);
+static tree handle_omp_declare_variant_attribute (tree *, tree, tree, int,
+						  bool *);
 static tree handle_simd_attribute (tree *, tree, tree, int, bool *);
 static tree handle_omp_declare_target_attribute (tree *, tree, tree, int,
 						 bool *);
@@ -442,6 +444,8 @@ const struct attribute_spec c_common_attribute_table[] =
 			      handle_returns_nonnull_attribute, NULL },
   { "omp declare simd",       0, -1, true,  false, false, false,
 			      handle_omp_declare_simd_attribute, NULL },
+  { "omp declare variant",    0, -1, true,  false, false, false,
+			      handle_omp_declare_variant_attribute, NULL },
   { "simd",		      0, 1, true,  false, false, false,
 			      handle_simd_attribute, NULL },
   { "omp declare target",     0, -1, true, false, false, false,
@@ -3064,6 +3068,15 @@ handle_omp_declare_simd_attribute (tree *, tree, tree, int, bool *)
   return NULL_TREE;
 }
 
+/* Handle an "omp declare variant" attribute; arguments as in
+   struct attribute_spec.handler.  */
+
+static tree
+handle_omp_declare_variant_attribute (tree *, tree, tree, int, bool *)
+{
+  return NULL_TREE;
+}
+
 /* Handle a "simd" attribute.  */
 
 static tree
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 1e13aaa..eabe689 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1189,6 +1189,8 @@ extern tree c_omp_declare_simd_clauses_to_numbers (tree, tree);
 extern void c_omp_declare_simd_clauses_to_decls (tree, tree);
 extern bool c_omp_predefined_variable (tree);
 extern enum omp_clause_default_kind c_omp_predetermined_sharing (tree);
+extern tree c_omp_check_context_selector (location_t, tree);
+extern tree c_omp_get_context_selector (tree, const char *, const char *);
 
 /* Return next tree in the chain for chain_next walking of tree nodes.  */
 static inline tree
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 0048289..5426256 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -2011,7 +2011,7 @@ c_omp_declare_simd_clauses_to_numbers (tree parms, tree clauses)
 	  if (arg == NULL_TREE)
 	    {
 	      error_at (OMP_CLAUSE_LOCATION (c),
-			"%qD is not an function argument", decl);
+			"%qD is not a function argument", decl);
 	      continue;
 	    }
 	  OMP_CLAUSE_DECL (c) = build_int_cst (integer_type_node, idx);
@@ -2026,7 +2026,7 @@ c_omp_declare_simd_clauses_to_numbers (tree parms, tree clauses)
 	      if (arg == NULL_TREE)
 		{
 		  error_at (OMP_CLAUSE_LOCATION (c),
-			    "%qD is not an function argument", decl);
+			    "%qD is not a function argument", decl);
 		  continue;
 		}
 	      OMP_CLAUSE_LINEAR_STEP (c)
@@ -2120,3 +2120,133 @@ c_omp_predetermined_sharing (tree decl)
 
   return OMP_CLAUSE_DEFAULT_UNSPECIFIED;
 }
+
+/* Diagnose errors in an OpenMP context selector, return CTX if
+   it is correct or error_mark_node otherwise.  */
+
+tree
+c_omp_check_context_selector (location_t loc, tree ctx)
+{
+  /* Each trait-set-selector-name can only be specified once.
+     There are just 4 set names.  */
+  for (tree t1 = ctx; t1; t1 = TREE_CHAIN (t1))
+    for (tree t2 = TREE_CHAIN (t1); t2; t2 = TREE_CHAIN (t2))
+      if (TREE_PURPOSE (t1) == TREE_PURPOSE (t2))
+	{
+	  error_at (loc, "selector set %qs specified more than once",
+	  	    IDENTIFIER_POINTER (TREE_PURPOSE (t1)));
+	  return error_mark_node;
+	}
+  for (tree t = ctx; t; t = TREE_CHAIN (t))
+    {
+      /* Each trait-selector-name can only be specified once.  */
+      if (list_length (TREE_VALUE (t)) < 5)
+	{
+	  for (tree t1 = TREE_VALUE (t); t1; t1 = TREE_CHAIN (t1))
+	    for (tree t2 = TREE_CHAIN (t1); t2; t2 = TREE_CHAIN (t2))
+	      if (TREE_PURPOSE (t1) == TREE_PURPOSE (t2))
+		{
+		  error_at (loc,
+			    "selector %qs specified more than once in set %qs",
+			    IDENTIFIER_POINTER (TREE_PURPOSE (t1)),
+			    IDENTIFIER_POINTER (TREE_PURPOSE (t)));
+		  return error_mark_node;
+		}
+	}
+      else
+	{
+	  hash_set<tree> pset;
+	  for (tree t1 = TREE_VALUE (t); t1; t1 = TREE_CHAIN (t1))
+	    if (pset.add (TREE_PURPOSE (t1)))
+	      {
+		error_at (loc,
+			  "selector %qs specified more than once in set %qs",
+			  IDENTIFIER_POINTER (TREE_PURPOSE (t1)),
+			  IDENTIFIER_POINTER (TREE_PURPOSE (t)));
+		return error_mark_node;
+	      }
+	}
+
+      static const char *const kind[] = {
+	"host", "nohost", "cpu", "gpu", "fpga", "any", NULL };
+      static const char *const vendor[] = {
+	"amd", "arm", "bsc", "cray", "fujitsu", "gnu", "ibm", "intel",
+	"llvm", "pgi", "ti", "unknown", NULL };
+      static const char *const extension[] = { NULL };
+      static const char *const atomic_default_mem_order[] = {
+	"seq_cst", "relaxed", "acq_rel", NULL };
+      struct known_properties { const char *set; const char *selector;
+				const char *const *props; };
+      known_properties props[] = {
+	{ "device", "kind", kind },
+	{ "implementation", "vendor", vendor },
+	{ "implementation", "extension", extension },
+	{ "implementation", "atomic_default_mem_order",
+	  atomic_default_mem_order } };
+      for (tree t1 = TREE_VALUE (t); t1; t1 = TREE_CHAIN (t1))
+	for (unsigned i = 0; i < ARRAY_SIZE (props); i++)
+	  if (!strcmp (IDENTIFIER_POINTER (TREE_PURPOSE (t1)),
+					   props[i].selector)
+	      && !strcmp (IDENTIFIER_POINTER (TREE_PURPOSE (t)),
+					      props[i].set))
+	    for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
+	      for (unsigned j = 0; ; j++)
+		{
+		  if (props[i].props[j] == NULL)
+		    {
+		      if (!strcmp (IDENTIFIER_POINTER (TREE_PURPOSE (t2)),
+				   " score"))
+			break;
+		      if (props[i].props == atomic_default_mem_order)
+			{
+			  error_at (loc,
+				    "incorrect property %qs of %qs selector",
+				    IDENTIFIER_POINTER (TREE_PURPOSE (t2)),
+				    "atomic_default_mem_order");
+			  return error_mark_node;
+			}
+		      else
+			warning_at (loc, 0,
+				    "unknown property %qs of %qs selector",
+				    IDENTIFIER_POINTER (TREE_PURPOSE (t2)),
+				    props[i].selector);
+		      break;
+		    }
+		  else if (!strcmp (IDENTIFIER_POINTER (TREE_PURPOSE (t2)),
+				    props[i].props[j]))
+		    {
+		      if (props[i].props == atomic_default_mem_order
+			  && t2 != TREE_VALUE (t1))
+			{
+			  tree t3 = TREE_VALUE (t1);
+			  if (!strcmp (IDENTIFIER_POINTER (TREE_PURPOSE (t3)),
+				       " score")
+			      && t2 == TREE_CHAIN (TREE_VALUE (t1)))
+			    break;
+			  error_at (loc,
+				    "%qs selector must have a single property",
+				    "atomic_default_mem_order");
+			  return error_mark_node;
+			}
+		      break;
+		    }
+		}
+    }
+  return ctx;
+}
+
+/* From context selector CTX, return trait-selector with name SEL in
+   trait-selector-set with name SET if any, or NULL_TREE if not found.  */
+
+tree
+c_omp_get_context_selector (tree ctx, const char *set, const char *sel)
+{
+  tree setid = get_identifier (set);
+  tree selid = get_identifier (sel);
+  for (tree t1 = ctx; t1; t1 = TREE_CHAIN (t1))
+    if (TREE_PURPOSE (t1) == setid)
+      for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
+	if (TREE_PURPOSE (t2) == selid)
+	  return t2;
+  return NULL_TREE;
+}
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 0f263f7..fa1001c 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,18 @@
+2019-10-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-parser.c (c_parser_omp_all_clauses): Add NESTED_P argument, if
+	true, terminate processing on closing paren and don't skip to end of
+	pragma line.
+	(c_parser_omp_declare_simd): Handle also declare variant.
+	(omp_construct_selectors, omp_device_selectors,
+	omp_implementation_selectors, omp_user_selectors): New variables.
+	(c_parser_omp_context_selector,
+	c_parser_omp_context_selector_specification,
+	c_finish_omp_declare_variant): New functions.
+	(c_finish_omp_declare_simd): Handle both declare simd and
+	declare variant.
+	(c_parser_omp_declare): Handle declare variant.
+
 2019-10-02  Joseph Myers  <joseph@codesourcery.com>
 
 	* c-parser.c (c_parser_asm_statement): Handle CPP_SCOPE like two
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 6957297..2daaee8 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -15213,11 +15213,15 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask,
 }
 
 /* Parse all OpenMP clauses.  The set clauses allowed by the directive
-   is a bitmask in MASK.  Return the list of clauses found.  */
+   is a bitmask in MASK.  Return the list of clauses found.
+   FINISH_P set if c_finish_omp_clauses should be called.
+   NESTED_P set if clauses should be terminated by closing paren instead
+   of end of pragma.  */
 
 static tree
 c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask,
-			  const char *where, bool finish_p = true)
+			  const char *where, bool finish_p = true,
+			  bool nested_p = false)
 {
   tree clauses = NULL;
   bool first = true;
@@ -15229,6 +15233,9 @@ c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask,
       const char *c_name;
       tree prev = clauses;
 
+      if (nested_p && c_parser_next_token_is (parser, CPP_CLOSE_PAREN))
+	break;
+
       if (!first && c_parser_next_token_is (parser, CPP_COMMA))
 	c_parser_consume_token (parser);
 
@@ -15513,7 +15520,8 @@ c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask,
     }
 
  saw_error:
-  c_parser_skip_to_pragma_eol (parser);
+  if (!nested_p)
+    c_parser_skip_to_pragma_eol (parser);
 
   if (finish_p)
     {
@@ -18919,7 +18927,11 @@ check_clauses:
 }
 
 /* OpenMP 4.0:
-   # pragma omp declare simd declare-simd-clauses[optseq] new-line  */
+   # pragma omp declare simd declare-simd-clauses[optseq] new-line
+
+   OpenMP 5.0:
+   # pragma omp declare variant (identifier) match(context-selector) new-line
+   */
 
 #define OMP_DECLARE_SIMD_CLAUSE_MASK				\
 	( (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_SIMDLEN)	\
@@ -18932,6 +18944,12 @@ check_clauses:
 static void
 c_parser_omp_declare_simd (c_parser *parser, enum pragma_context context)
 {
+  c_token *token = c_parser_peek_token (parser);
+  gcc_assert (token->type == CPP_NAME);
+  tree kind = token->value;
+  gcc_assert (strcmp (IDENTIFIER_POINTER (kind), "simd") == 0
+	      || strcmp (IDENTIFIER_POINTER (kind), "variant") == 0);
+
   auto_vec<c_token> clauses;
   while (c_parser_next_token_is_not (parser, CPP_PRAGMA_EOL))
     {
@@ -18949,17 +18967,14 @@ c_parser_omp_declare_simd (c_parser *parser, enum pragma_context context)
 
   while (c_parser_next_token_is (parser, CPP_PRAGMA))
     {
-      if (c_parser_peek_token (parser)->pragma_kind
-	  != PRAGMA_OMP_DECLARE
+      if (c_parser_peek_token (parser)->pragma_kind != PRAGMA_OMP_DECLARE
 	  || c_parser_peek_2nd_token (parser)->type != CPP_NAME
-	  || strcmp (IDENTIFIER_POINTER
-				(c_parser_peek_2nd_token (parser)->value),
-		     "simd") != 0)
+	  || c_parser_peek_2nd_token (parser)->value != kind)
 	{
-	  c_parser_error (parser,
-			  "%<#pragma omp declare simd%> must be followed by "
-			  "function declaration or definition or another "
-			  "%<#pragma omp declare simd%>");
+	  error ("%<#pragma omp declare %s%> must be followed by "
+		 "function declaration or definition or another "
+		 "%<#pragma omp declare %s%>",
+		 IDENTIFIER_POINTER (kind), IDENTIFIER_POINTER (kind));
 	  return;
 	}
       c_parser_consume_pragma (parser);
@@ -19007,8 +19022,9 @@ c_parser_omp_declare_simd (c_parser *parser, enum pragma_context context)
     case pragma_struct:
     case pragma_param:
     case pragma_stmt:
-      c_parser_error (parser, "%<#pragma omp declare simd%> must be followed by "
-			      "function declaration or definition");
+      error ("%<#pragma omp declare %s%> must be followed by "
+	     "function declaration or definition",
+	     IDENTIFIER_POINTER (kind));
       break;
     case pragma_compound:
       if (c_parser_next_token_is (parser, CPP_KEYWORD)
@@ -19034,38 +19050,470 @@ c_parser_omp_declare_simd (c_parser *parser, enum pragma_context context)
 					 NULL, clauses);
 	  break;
 	}
-      c_parser_error (parser, "%<#pragma omp declare simd%> must be followed by "
-			      "function declaration or definition");
+      error ("%<#pragma omp declare %s%> must be followed by "
+	     "function declaration or definition",
+	     IDENTIFIER_POINTER (kind));
       break;
     default:
       gcc_unreachable ();
     }
 }
 
-/* Finalize #pragma omp declare simd clauses after FNDECL has been parsed,
-   and put that into "omp declare simd" attribute.  */
+static const char *const omp_construct_selectors[] = {
+  "simd", "target", "teams", "parallel", "for", NULL };
+static const char *const omp_device_selectors[] = {
+  "kind", "isa", "arch", NULL };
+static const char *const omp_implementation_selectors[] = {
+  "vendor", "extension", "atomic_default_mem_order", "unified_address",
+  "unified_shared_memory", "dynamic_allocators", "reverse_offload", NULL };
+static const char *const omp_user_selectors[] = {
+  "condition", NULL };
+
+/* OpenMP 5.0:
+
+   trait-selector:
+     trait-selector-name[([trait-score:]trait-property[,trait-property[,...]])]
+
+   trait-score:
+     score(score-expression)  */
+
+static tree
+c_parser_omp_context_selector (c_parser *parser, tree set, tree parms)
+{
+  tree ret = NULL_TREE;
+  do
+    {
+      tree selector;
+      if (c_parser_next_token_is (parser, CPP_KEYWORD)
+	  || c_parser_next_token_is (parser, CPP_NAME))
+	selector = c_parser_peek_token (parser)->value;
+      else
+	{
+	  c_parser_error (parser, "expected trait selector name");
+	  return error_mark_node;
+	}
+
+      tree properties = NULL_TREE;
+      const char *const *selectors = NULL;
+      bool allow_score = true;
+      bool allow_user = false;
+      int property_limit = 0;
+      enum { CTX_PROPERTY_NONE, CTX_PROPERTY_USER, CTX_PROPERTY_IDLIST,
+	     CTX_PROPERTY_EXPR, CTX_PROPERTY_SIMD } property_kind
+	= CTX_PROPERTY_NONE;
+      switch (IDENTIFIER_POINTER (set)[0])
+	{
+	case 'c': /* construct */
+	  selectors = omp_construct_selectors;
+	  allow_score = false;
+	  property_limit = 1;
+	  property_kind = CTX_PROPERTY_SIMD;
+	  break;
+	case 'd': /* device */
+	  selectors = omp_device_selectors;
+	  allow_score = false;
+	  allow_user = true;
+	  property_limit = 3;
+	  property_kind = CTX_PROPERTY_IDLIST;
+	  break;
+	case 'i': /* implementation */
+	  selectors = omp_implementation_selectors;
+	  allow_user = true;
+	  property_limit = 3;
+	  property_kind = CTX_PROPERTY_IDLIST;
+	  break;
+	case 'u': /* user */
+	  selectors = omp_user_selectors;
+	  property_limit = 1;
+	  property_kind = CTX_PROPERTY_EXPR;
+	  break;
+	default:
+	  gcc_unreachable ();
+	}
+      for (int i = 0; ; i++)
+	{
+	  if (selectors[i] == NULL)
+	    {
+	      if (allow_user)
+		{
+		  property_kind = CTX_PROPERTY_USER;
+		  break;
+		}
+	      else
+		{
+		  error_at (c_parser_peek_token (parser)->location,
+			    "selector %qs not allowed for context selector "
+			    "set %qs", IDENTIFIER_POINTER (selector),
+			    IDENTIFIER_POINTER (set));
+		  c_parser_consume_token (parser);
+		  return error_mark_node;
+		}
+	    }
+	  if (i == property_limit)
+	    property_kind = CTX_PROPERTY_NONE;
+	  if (strcmp (selectors[i], IDENTIFIER_POINTER (selector)) == 0)
+	    break;
+	}
+
+      c_parser_consume_token (parser);
+
+      if (c_parser_next_token_is (parser, CPP_OPEN_PAREN))
+	{
+	  if (property_kind == CTX_PROPERTY_NONE)
+	    {
+	      error_at (c_parser_peek_token (parser)->location,
+			"selector %qs does not accept any properties",
+			IDENTIFIER_POINTER (selector));
+	      return error_mark_node;
+	    }
+
+	  matching_parens parens;
+	  parens.require_open (parser);
+
+	  c_token *token = c_parser_peek_token (parser);
+	  if (allow_score
+	      && c_parser_next_token_is (parser, CPP_NAME)
+	      && strcmp (IDENTIFIER_POINTER (token->value), "score") == 0
+	      && c_parser_peek_2nd_token (parser)->type == CPP_OPEN_PAREN)
+	    {
+	      c_parser_consume_token (parser);
+
+	      matching_parens parens2;
+	      parens2.require_open (parser);
+	      tree score = c_parser_expr_no_commas (parser, NULL).value;
+	      parens2.skip_until_found_close (parser);
+	      c_parser_require (parser, CPP_COLON, "expected %<:%>");
+	      if (score != error_mark_node)
+		{
+		  mark_exp_read (score);
+		  score = c_fully_fold (score, false, NULL);
+		  if (!INTEGRAL_TYPE_P (TREE_TYPE (score))
+		      || !tree_fits_shwi_p (score))
+		    error_at (token->location, "score argument must be "
+			      "constant integer expression");
+		  else
+		    properties = tree_cons (get_identifier (" score"),
+					    score, properties);
+		}
+	      token = c_parser_peek_token (parser);
+	    }
+
+	  switch (property_kind)
+	    {
+	      tree t;
+	    case CTX_PROPERTY_USER:
+	      do
+		{
+		  t = c_parser_expr_no_commas (parser, NULL).value;
+		  if (TREE_CODE (t) == STRING_CST)
+		    properties = tree_cons (NULL_TREE, t, properties);
+		  else if (t != error_mark_node)
+		    {
+		      mark_exp_read (t);
+		      t = c_fully_fold (t, false, NULL);
+		      if (!INTEGRAL_TYPE_P (TREE_TYPE (t))
+			  || !tree_fits_shwi_p (t))
+			error_at (token->location, "property must be "
+				  "constant integer expression or string "
+				  "literal");
+		      else
+			properties = tree_cons (NULL_TREE, t, properties);
+		    }
+
+		  if (c_parser_next_token_is (parser, CPP_COMMA))
+		    c_parser_consume_token (parser);
+		  else
+		    break;
+		}
+	      while (1);
+	      break;
+	    case CTX_PROPERTY_IDLIST:
+	      do
+		{
+		  tree prop;
+		  if (c_parser_next_token_is (parser, CPP_KEYWORD)
+		      || c_parser_next_token_is (parser, CPP_NAME))
+		    prop = c_parser_peek_token (parser)->value;
+		  else
+		    {
+		      c_parser_error (parser, "expected identifier");
+		      return error_mark_node;
+		    }
+		  c_parser_consume_token (parser);
+
+		  properties = tree_cons (prop, NULL_TREE, properties);
+
+		  if (c_parser_next_token_is (parser, CPP_COMMA))
+		    c_parser_consume_token (parser);
+		  else
+		    break;
+		}
+	      while (1);
+	      break;
+	    case CTX_PROPERTY_EXPR:
+	      t = c_parser_expr_no_commas (parser, NULL).value;
+	      if (t != error_mark_node)
+		{
+		  mark_exp_read (t);
+		  t = c_fully_fold (t, false, NULL);
+		  if (!INTEGRAL_TYPE_P (TREE_TYPE (t))
+		      || !tree_fits_shwi_p (t))
+		    error_at (token->location, "property must be "
+			      "constant integer expression");
+		  else
+		    properties = tree_cons (NULL_TREE, t, properties);
+		}
+	      break;
+	    case CTX_PROPERTY_SIMD:
+	      if (parms == NULL_TREE)
+		{
+		  error_at (token->location, "properties for %<simd%> "
+			    "selector may not be specified in "
+			    "%<metadirective%>");
+		  return error_mark_node;
+		}
+	      tree c;
+	      c = c_parser_omp_all_clauses (parser,
+					    OMP_DECLARE_SIMD_CLAUSE_MASK,
+					    "simd", true, true);
+	      c = c_omp_declare_simd_clauses_to_numbers (parms
+							 == error_mark_node
+							 ? NULL_TREE : parms,
+							 c);
+	      properties = tree_cons (NULL_TREE, c, properties);
+	      break;
+	    default:
+	      gcc_unreachable ();
+	    }
+
+	  parens.skip_until_found_close (parser);
+	  properties = nreverse (properties);
+	}
+      else if (property_kind == CTX_PROPERTY_IDLIST
+	       || property_kind == CTX_PROPERTY_EXPR)
+	{
+	  c_parser_require (parser, CPP_OPEN_PAREN, "expected %<(%>");
+	  return error_mark_node;
+	}
+
+      ret = tree_cons (selector, properties, ret);
+
+      if (c_parser_next_token_is (parser, CPP_COMMA))
+	c_parser_consume_token (parser);
+      else
+	break;
+    }
+  while (1);
+
+  return nreverse (ret);
+}
+
+/* OpenMP 5.0:
+
+   trait-set-selector[,trait-set-selector[,...]]
+
+   trait-set-selector:
+     trait-set-selector-name = { trait-selector[, trait-selector[, ...]] }
+
+   trait-set-selector-name:
+     constructor
+     device
+     implementation
+     user  */
+
+static tree
+c_parser_omp_context_selector_specification (c_parser *parser, tree parms)
+{
+  tree ret = NULL_TREE;
+  do
+    {
+      const char *setp = "";
+      if (c_parser_next_token_is (parser, CPP_NAME))
+	setp = IDENTIFIER_POINTER (c_parser_peek_token (parser)->value);
+      switch (setp[0])
+	{
+	case 'c':
+	  if (strcmp (setp, "construct") == 0)
+	    setp = NULL;
+	  break;
+	case 'd':
+	  if (strcmp (setp, "device") == 0)
+	    setp = NULL;
+	  break;
+	case 'i':
+	  if (strcmp (setp, "implementation") == 0)
+	    setp = NULL;
+	  break;
+	case 'u':
+	  if (strcmp (setp, "user") == 0)
+	    setp = NULL;
+	  break;
+	default:
+	  break;
+	}
+      if (setp)
+	{
+	  c_parser_error (parser, "expected %<construct%>, %<device%>, "
+				  "%<implementation%> or %<user%>");
+	  return error_mark_node;
+	}
+
+      tree set = c_parser_peek_token (parser)->value;
+      c_parser_consume_token (parser);
+
+      if (!c_parser_require (parser, CPP_EQ, "expected %<=%>"))
+	return error_mark_node;
+
+      matching_braces braces;
+      if (!braces.require_open (parser))
+	return error_mark_node;
+
+      tree selectors = c_parser_omp_context_selector (parser, set, parms);
+      if (selectors == error_mark_node)
+	ret = error_mark_node;
+      else if (ret != error_mark_node)
+	ret = tree_cons (set, selectors, ret);
+
+      braces.skip_until_found_close (parser);
+
+      if (c_parser_next_token_is (parser, CPP_COMMA))
+	c_parser_consume_token (parser);
+      else
+	break;
+    }
+  while (1);
+
+  if (ret == error_mark_node)
+    return ret;
+  return nreverse (ret);
+}
+
+/* Finalize #pragma omp declare variant after FNDECL has been parsed, and put
+   that into "omp declare variant" attribute.  */
+
+static void
+c_finish_omp_declare_variant (c_parser *parser, tree fndecl, tree parms)
+{
+  matching_parens parens;
+  if (!parens.require_open (parser))
+    {
+     fail:
+      c_parser_skip_to_pragma_eol (parser, false);
+      return;
+    }
+
+  if (c_parser_next_token_is_not (parser, CPP_NAME)
+      || c_parser_peek_token (parser)->id_kind != C_ID_ID)
+    {
+      c_parser_error (parser, "expected identifier");
+      goto fail;
+    }
+
+  c_token *token = c_parser_peek_token (parser);
+  tree variant = lookup_name (token->value);
+
+  if (variant == NULL_TREE)
+    {
+      undeclared_variable (token->location, token->value);
+      variant = error_mark_node;
+    }
+
+  c_parser_consume_token (parser);
+
+  parens.require_close (parser);
+
+  const char *clause = "";
+  location_t match_loc = c_parser_peek_token (parser)->location;
+  if (c_parser_next_token_is (parser, CPP_NAME))
+    clause = IDENTIFIER_POINTER (c_parser_peek_token (parser)->value);
+  if (strcmp (clause, "match"))
+    {
+      c_parser_error (parser, "expected %<match%>");
+      goto fail;
+    }
+
+  c_parser_consume_token (parser);
+
+  if (!parens.require_open (parser))
+    goto fail;
+
+  if (parms == NULL_TREE)
+    parms = error_mark_node;
+
+  tree ctx = c_parser_omp_context_selector_specification (parser, parms);
+  if (ctx == error_mark_node)
+    goto fail;
+  ctx = c_omp_check_context_selector (match_loc, ctx);
+  if (ctx != error_mark_node && variant != error_mark_node)
+    {
+      if (TREE_CODE (variant) != FUNCTION_DECL)
+	{
+	  error_at (token->location, "variant %qD is not a function", variant);
+	  variant = error_mark_node;
+	}
+      else if (c_omp_get_context_selector (ctx, "construct", "simd")
+	       == NULL_TREE
+	       && !comptypes (TREE_TYPE (fndecl), TREE_TYPE (variant)))
+	{
+	  error_at (token->location, "variant %qD and base %qD have "
+				     "incompatible types", variant, fndecl);
+	  variant = error_mark_node;
+	}
+      else if (fndecl_built_in_p (variant)
+	       && (strncmp (IDENTIFIER_POINTER (DECL_NAME (variant)),
+			    "__builtin_", strlen ("__builtin_")) == 0
+		   || strncmp (IDENTIFIER_POINTER (DECL_NAME (variant)),
+			       "__sync_", strlen ("__sync_")) == 0
+		   || strncmp (IDENTIFIER_POINTER (DECL_NAME (variant)),
+			       "__atomic_", strlen ("__atomic_")) == 0))
+	{
+	  error_at (token->location, "variant %qD is a built-in", variant);
+	  variant = error_mark_node;
+	}
+      if (variant != error_mark_node)
+	{
+	  C_DECL_USED (variant) = 1;
+	  tree attr = tree_cons (get_identifier ("omp declare variant"),
+				 build_tree_list (variant, ctx),
+				 DECL_ATTRIBUTES (fndecl));
+	  DECL_ATTRIBUTES (fndecl) = attr;
+	}
+    }
+
+  parens.require_close (parser);
+  c_parser_skip_to_pragma_eol (parser);
+}
+
+/* Finalize #pragma omp declare simd or #pragma omp declare variant
+   clauses after FNDECL has been parsed, and put that into "omp declare simd"
+   or "omp declare variant" attribute.  */
 
 static void
 c_finish_omp_declare_simd (c_parser *parser, tree fndecl, tree parms,
 			   vec<c_token> clauses)
 {
-  /* Normally first token is CPP_NAME "simd".  CPP_EOF there indicates
-     error has been reported and CPP_PRAGMA that c_finish_omp_declare_simd
-     has already processed the tokens.  */
+  /* Normally first token is CPP_NAME "simd" or "variant".  CPP_EOF there
+     indicates error has been reported and CPP_PRAGMA that
+     c_finish_omp_declare_simd has already processed the tokens.  */
   if (clauses.exists () && clauses[0].type == CPP_EOF)
     return;
+  const char *kind = "simd";
+  if (clauses.exists ()
+      && (clauses[0].type == CPP_NAME || clauses[0].type == CPP_PRAGMA))
+    kind = IDENTIFIER_POINTER (clauses[0].value);
+  gcc_assert (strcmp (kind, "simd") == 0 || strcmp (kind, "variant") == 0);
   if (fndecl == NULL_TREE || TREE_CODE (fndecl) != FUNCTION_DECL)
     {
-      error ("%<#pragma omp declare simd%> not immediately followed by "
-	     "a function declaration or definition");
+      error ("%<#pragma omp declare %s%> not immediately followed by "
+	     "a function declaration or definition", kind);
       clauses[0].type = CPP_EOF;
       return;
     }
   if (clauses.exists () && clauses[0].type != CPP_NAME)
     {
       error_at (DECL_SOURCE_LOCATION (fndecl),
-		"%<#pragma omp declare simd%> not immediately followed by "
-		"a single function declaration or definition");
+		"%<#pragma omp declare %s%> not immediately followed by "
+		"a single function declaration or definition", kind);
       clauses[0].type = CPP_EOF;
       return;
     }
@@ -19075,7 +19523,6 @@ c_finish_omp_declare_simd (c_parser *parser, tree fndecl, tree parms,
 
   unsigned int tokens_avail = parser->tokens_avail;
   gcc_assert (parser->tokens == &parser->tokens_buf[0]);
-  
 
   parser->tokens = clauses.address ();
   parser->tokens_avail = clauses.length ();
@@ -19085,19 +19532,27 @@ c_finish_omp_declare_simd (c_parser *parser, tree fndecl, tree parms,
     {
       c_token *token = c_parser_peek_token (parser);
       gcc_assert (token->type == CPP_NAME
-		  && strcmp (IDENTIFIER_POINTER (token->value), "simd") == 0);
+		  && strcmp (IDENTIFIER_POINTER (token->value), kind) == 0);
       c_parser_consume_token (parser);
       parser->in_pragma = true;
 
-      tree c = NULL_TREE;
-      c = c_parser_omp_all_clauses (parser, OMP_DECLARE_SIMD_CLAUSE_MASK,
-				      "#pragma omp declare simd");
-      c = c_omp_declare_simd_clauses_to_numbers (parms, c);
-      if (c != NULL_TREE)
-	c = tree_cons (NULL_TREE, c, NULL_TREE);
-      c = build_tree_list (get_identifier ("omp declare simd"), c);
-      TREE_CHAIN (c) = DECL_ATTRIBUTES (fndecl);
-      DECL_ATTRIBUTES (fndecl) = c;
+      if (strcmp (kind, "simd") == 0)
+	{
+	  tree c;
+	  c = c_parser_omp_all_clauses (parser, OMP_DECLARE_SIMD_CLAUSE_MASK,
+					"#pragma omp declare simd");
+	  c = c_omp_declare_simd_clauses_to_numbers (parms, c);
+	  if (c != NULL_TREE)
+	    c = tree_cons (NULL_TREE, c, NULL_TREE);
+	  c = build_tree_list (get_identifier ("omp declare simd"), c);
+	  TREE_CHAIN (c) = DECL_ATTRIBUTES (fndecl);
+	  DECL_ATTRIBUTES (fndecl) = c;
+	}
+      else
+	{
+	  gcc_assert (strcmp (kind, "variant") == 0);
+	  c_finish_omp_declare_variant (parser, fndecl, parms);
+	}
     }
 
   parser->tokens = &parser->tokens_buf[0];
@@ -19612,7 +20067,10 @@ c_parser_omp_declare_reduction (c_parser *parser, enum pragma_context context)
    #pragma omp declare simd declare-simd-clauses[optseq] new-line
    #pragma omp declare reduction (reduction-id : typename-list : expression) \
       initializer-clause[opt] new-line
-   #pragma omp declare target new-line  */
+   #pragma omp declare target new-line
+
+   OpenMP 5.0
+   #pragma omp declare variant (identifier) match (context-selector)  */
 
 static void
 c_parser_omp_declare (c_parser *parser, enum pragma_context context)
@@ -19645,10 +20103,17 @@ c_parser_omp_declare (c_parser *parser, enum pragma_context context)
 	  c_parser_omp_declare_target (parser);
 	  return;
 	}
+      if (strcmp (p, "variant") == 0)
+	{
+	  /* c_parser_consume_token (parser); done in
+	     c_parser_omp_declare_simd.  */
+	  c_parser_omp_declare_simd (parser, context);
+	  return;
+	}
     }
 
-  c_parser_error (parser, "expected %<simd%> or %<reduction%> "
-			  "or %<target%>");
+  c_parser_error (parser, "expected %<simd%>, %<reduction%>, "
+			  "%<target%> or %<variant%>");
   c_parser_skip_to_pragma_eol (parser);
 }
 
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2a35bf2..9ed7311 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,21 @@
+2019-10-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* parser.h (struct cp_omp_declare_simd_data): Add variant_p member.
+	* parser.c (cp_ensure_no_omp_declare_simd): Handle both declare simd
+	and declare variant.
+	(cp_parser_oacc_all_clauses): Formatting fix.
+	(cp_parser_omp_all_clauses): Add NESTED_P argument, if true, terminate
+	processing on closing paren and don't skip to end of pragma line.
+	(cp_parser_omp_declare_simd): Add VARIANT_P argument.  Handle also
+	declare variant.
+	(omp_construct_selectors, omp_device_selectors,
+	omp_implementation_selectors, omp_user_selectors): New variables.
+	(cp_parser_omp_context_selector,
+	cp_parser_omp_context_selector_specification,
+	cp_finish_omp_declare_variant): New functions.
+	(cp_parser_late_parsing_omp_declare_simd): Handle also declare variant.
+	(cp_parser_omp_declare): Handle declare variant.
+
 2019-10-09  Jason Merrill  <jason@redhat.com>
 
 	* cp-tree.h (template_info_decl_check): Check ENABLE_TREE_CHECKING.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b6e738c..3ee8da7 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -1376,8 +1376,9 @@ cp_ensure_no_omp_declare_simd (cp_parser *parser)
 {
   if (parser->omp_declare_simd && !parser->omp_declare_simd->error_seen)
     {
-      error ("%<#pragma omp declare simd%> not immediately followed by "
-	     "function declaration or definition");
+      error ("%<#pragma omp declare %s%> not immediately followed by "
+	     "function declaration or definition",
+	     parser->omp_declare_simd->variant_p ? "variant" : "simd");
       parser->omp_declare_simd = NULL;
     }
 }
@@ -35878,8 +35879,8 @@ cp_parser_oacc_clause_async (cp_parser *parser, tree list)
 
 static tree
 cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask,
-			   const char *where, cp_token *pragma_tok,
-			   bool finish_p = true)
+			    const char *where, cp_token *pragma_tok,
+			    bool finish_p = true)
 {
   tree clauses = NULL;
   bool first = true;
@@ -36075,13 +36076,15 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask,
 }
 
 /* Parse all OpenMP clauses.  The set clauses allowed by the directive
-   is a bitmask in MASK.  Return the list of clauses found; the result
-   of clause default goes in *pdefault.  */
+   is a bitmask in MASK.  Return the list of clauses found.
+   FINISH_P set if finish_omp_clauses should be called.
+   NESTED_P set if clauses should be terminated by closing paren instead
+   of end of pragma.  */
 
 static tree
 cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
 			   const char *where, cp_token *pragma_tok,
-			   bool finish_p = true)
+			   bool finish_p = true, bool nested_p = false)
 {
   tree clauses = NULL;
   bool first = true;
@@ -36096,6 +36099,9 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
       const char *c_name;
       tree prev = clauses;
 
+      if (nested_p && cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_PAREN))
+	break;
+
       if (!first && cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
 	cp_lexer_consume_token (parser->lexer);
 
@@ -36415,7 +36421,8 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
 	}
     }
  saw_error:
-  cp_parser_skip_to_pragma_eol (parser, pragma_tok);
+  if (!nested_p)
+    cp_parser_skip_to_pragma_eol (parser, pragma_tok);
   if (finish_p)
     {
       if ((mask & (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_UNIFORM)) != 0)
@@ -40241,7 +40248,8 @@ cp_parser_oacc_wait (cp_parser *parser, cp_token *pragma_tok)
 
 static void
 cp_parser_omp_declare_simd (cp_parser *parser, cp_token *pragma_tok,
-			    enum pragma_context context)
+			    enum pragma_context context,
+			    bool variant_p)
 {
   bool first_p = parser->omp_declare_simd == NULL;
   cp_omp_declare_simd_data data;
@@ -40249,12 +40257,22 @@ cp_parser_omp_declare_simd (cp_parser *parser, cp_token *pragma_tok,
     {
       data.error_seen = false;
       data.fndecl_seen = false;
+      data.variant_p = variant_p;
       data.tokens = vNULL;
       data.clauses = NULL_TREE;
       /* It is safe to take the address of a local variable; it will only be
 	 used while this scope is live.  */
       parser->omp_declare_simd = &data;
     }
+  else if (parser->omp_declare_simd->variant_p != variant_p)
+    {
+      error_at (pragma_tok->location,
+		"%<#pragma omp declare %s%> followed by "
+		"%<#pragma omp declare %s%>",
+		parser->omp_declare_simd->variant_p ? "variant" : "simd",
+		parser->omp_declare_simd->variant_p ? "simd" : "variant");
+      parser->omp_declare_simd->error_seen = true;
+    }
 
   /* Store away all pragma tokens.  */
   while (cp_lexer_next_token_is_not (parser->lexer, CPP_PRAGMA_EOL)
@@ -40290,13 +40308,427 @@ cp_parser_omp_declare_simd (cp_parser *parser, cp_token *pragma_tok,
 	  && !parser->omp_declare_simd->error_seen
 	  && !parser->omp_declare_simd->fndecl_seen)
 	error_at (pragma_tok->location,
-		  "%<#pragma omp declare simd%> not immediately followed by "
-		  "function declaration or definition");
+		  "%<#pragma omp declare %s%> not immediately followed by "
+		  "function declaration or definition",
+		  parser->omp_declare_simd->variant_p ? "variant" : "simd");
       data.tokens.release ();
       parser->omp_declare_simd = NULL;
     }
 }
 
+static const char *const omp_construct_selectors[] = {
+  "simd", "target", "teams", "parallel", "for", NULL };
+static const char *const omp_device_selectors[] = {
+  "kind", "isa", "arch", NULL };
+static const char *const omp_implementation_selectors[] = {
+  "vendor", "extension", "atomic_default_mem_order", "unified_address",
+  "unified_shared_memory", "dynamic_allocators", "reverse_offload", NULL };
+static const char *const omp_user_selectors[] = {
+  "condition", NULL };
+
+/* OpenMP 5.0:
+
+   trait-selector:
+     trait-selector-name[([trait-score:]trait-property[,trait-property[,...]])]
+
+   trait-score:
+     score(score-expression)  */
+
+static tree
+cp_parser_omp_context_selector (cp_parser *parser, tree set, bool has_parms_p)
+{
+  tree ret = NULL_TREE;
+  do
+    {
+      tree selector;
+      if (cp_lexer_next_token_is (parser->lexer, CPP_KEYWORD)
+	  || cp_lexer_next_token_is (parser->lexer, CPP_NAME))
+	selector = cp_lexer_peek_token (parser->lexer)->u.value;
+      else
+	{
+	  cp_parser_error (parser, "expected trait selector name");
+	  return error_mark_node;
+	}
+
+      tree properties = NULL_TREE;
+      const char *const *selectors = NULL;
+      bool allow_score = true;
+      bool allow_user = false;
+      int property_limit = 0;
+      enum { CTX_PROPERTY_NONE, CTX_PROPERTY_USER, CTX_PROPERTY_IDLIST,
+	     CTX_PROPERTY_EXPR, CTX_PROPERTY_SIMD } property_kind
+	= CTX_PROPERTY_NONE;
+      switch (IDENTIFIER_POINTER (set)[0])
+	{
+	case 'c': /* construct */
+	  selectors = omp_construct_selectors;
+	  allow_score = false;
+	  property_limit = 1;
+	  property_kind = CTX_PROPERTY_SIMD;
+	  break;
+	case 'd': /* device */
+	  selectors = omp_device_selectors;
+	  allow_score = false;
+	  allow_user = true;
+	  property_limit = 3;
+	  property_kind = CTX_PROPERTY_IDLIST;
+	  break;
+	case 'i': /* implementation */
+	  selectors = omp_implementation_selectors;
+	  allow_user = true;
+	  property_limit = 3;
+	  property_kind = CTX_PROPERTY_IDLIST;
+	  break;
+	case 'u': /* user */
+	  selectors = omp_user_selectors;
+	  property_limit = 1;
+	  property_kind = CTX_PROPERTY_EXPR;
+	  break;
+	default:
+	  gcc_unreachable ();
+	}
+      for (int i = 0; ; i++)
+	{
+	  if (selectors[i] == NULL)
+	    {
+	      if (allow_user)
+		{
+		  property_kind = CTX_PROPERTY_USER;
+		  break;
+		}
+	      else
+		{
+		  error ("selector %qs not allowed for context selector "
+			 "set %qs", IDENTIFIER_POINTER (selector),
+			 IDENTIFIER_POINTER (set));
+		  cp_lexer_consume_token (parser->lexer);
+		  return error_mark_node;
+		}
+	    }
+	  if (i == property_limit)
+	    property_kind = CTX_PROPERTY_NONE;
+	  if (strcmp (selectors[i], IDENTIFIER_POINTER (selector)) == 0)
+	    break;
+	}
+
+      cp_lexer_consume_token (parser->lexer);
+
+      if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN))
+	{
+	  if (property_kind == CTX_PROPERTY_NONE)
+	    {
+	      error ("selector %qs does not accept any properties",
+		     IDENTIFIER_POINTER (selector));
+	      return error_mark_node;
+	    }
+
+	  matching_parens parens;
+	  parens.consume_open (parser);
+
+	  cp_token *token = cp_lexer_peek_token (parser->lexer);
+	  if (allow_score
+	      && cp_lexer_next_token_is (parser->lexer, CPP_NAME)
+	      && strcmp (IDENTIFIER_POINTER (token->u.value), "score") == 0
+	      && cp_lexer_nth_token_is (parser->lexer, 2, CPP_OPEN_PAREN))
+	    {
+	      cp_lexer_save_tokens (parser->lexer);
+	      cp_lexer_consume_token (parser->lexer);
+	      cp_lexer_consume_token (parser->lexer);
+	      if (cp_parser_skip_to_closing_parenthesis (parser, false, false,
+							 true)
+		  && cp_lexer_next_token_is (parser->lexer, CPP_COLON))
+		{
+		  cp_lexer_rollback_tokens (parser->lexer);
+		  cp_lexer_consume_token (parser->lexer);
+
+		  matching_parens parens2;
+		  parens2.require_open (parser);
+		  tree score = cp_parser_constant_expression (parser);
+		  if (!parens2.require_close (parser))
+		    cp_parser_skip_to_closing_parenthesis (parser, true,
+							   false, true);
+		  cp_parser_require (parser, CPP_COLON, RT_COLON);
+		  if (score != error_mark_node)
+		    {
+		      score = fold_non_dependent_expr (score);
+		      if (!value_dependent_expression_p (score)
+			  && (!INTEGRAL_TYPE_P (TREE_TYPE (score))
+			      || !tree_fits_shwi_p (score)))
+			error_at (token->location, "score argument must be "
+				  "constant integer expression");
+		      else
+			properties = tree_cons (get_identifier (" score"),
+						score, properties);
+		    }
+		}
+	      else
+		cp_lexer_rollback_tokens (parser->lexer);
+
+	      token = cp_lexer_peek_token (parser->lexer);
+	    }
+
+	  switch (property_kind)
+	    {
+	      tree t;
+	    case CTX_PROPERTY_USER:
+	      do
+		{
+		  t = cp_parser_constant_expression (parser);
+		  if (t != error_mark_node)
+		    {
+		      t = fold_non_dependent_expr (t);
+		      if (TREE_CODE (t) == STRING_CST)
+			properties = tree_cons (NULL_TREE, t, properties);
+		      else if (!value_dependent_expression_p (t)
+			       && (!INTEGRAL_TYPE_P (TREE_TYPE (t))
+				   || !tree_fits_shwi_p (t)))
+			error_at (token->location, "property must be "
+				  "constant integer expression or string "
+				  "literal");
+		      else
+			properties = tree_cons (NULL_TREE, t, properties);
+		    }
+
+		  if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
+		    cp_lexer_consume_token (parser->lexer);
+		  else
+		    break;
+		}
+	      while (1);
+	      break;
+	    case CTX_PROPERTY_IDLIST:
+	      do
+		{
+		  tree prop;
+		  if (cp_lexer_next_token_is (parser->lexer, CPP_KEYWORD)
+		      || cp_lexer_next_token_is (parser->lexer, CPP_NAME))
+		    prop = cp_lexer_peek_token (parser->lexer)->u.value;
+		  else
+		    {
+		      cp_parser_error (parser, "expected identifier");
+		      return error_mark_node;
+		    }
+		  cp_lexer_consume_token (parser->lexer);
+
+		  properties = tree_cons (prop, NULL_TREE, properties);
+
+		  if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
+		    cp_lexer_consume_token (parser->lexer);
+		  else
+		    break;
+		}
+	      while (1);
+	      break;
+	    case CTX_PROPERTY_EXPR:
+	      t = cp_parser_constant_expression (parser);
+	      if (t != error_mark_node)
+		{
+		  t = fold_non_dependent_expr (t);
+		  if (!value_dependent_expression_p (t)
+		      && (!INTEGRAL_TYPE_P (TREE_TYPE (t))
+			  || !tree_fits_shwi_p (t)))
+		    error_at (token->location, "property must be "
+			      "constant integer expression");
+		  else
+		    properties = tree_cons (NULL_TREE, t, properties);
+		}
+	      break;
+	    case CTX_PROPERTY_SIMD:
+	      if (!has_parms_p)
+		{
+		  error_at (token->location, "properties for %<simd%> "
+			    "selector may not be specified in "
+			    "%<metadirective%>");
+		  return error_mark_node;
+		}
+	      tree c;
+	      c = cp_parser_omp_all_clauses (parser,
+					     OMP_DECLARE_SIMD_CLAUSE_MASK,
+					     "simd", NULL, true, true);
+	      properties = tree_cons (NULL_TREE, c, properties);
+	      break;
+	    default:
+	      gcc_unreachable ();
+	    }
+
+	  if (!parens.require_close (parser))
+	    cp_parser_skip_to_closing_parenthesis (parser, true, false, true);
+
+	  properties = nreverse (properties);
+	}
+      else if (property_kind == CTX_PROPERTY_IDLIST
+	       || property_kind == CTX_PROPERTY_EXPR)
+	{
+	  cp_parser_require (parser, CPP_OPEN_PAREN, RT_OPEN_PAREN);
+	  return error_mark_node;
+	}
+
+      ret = tree_cons (selector, properties, ret);
+
+      if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
+	cp_lexer_consume_token (parser->lexer);
+      else
+	break;
+    }
+  while (1);
+
+  return nreverse (ret);
+}
+
+/* OpenMP 5.0:
+
+   trait-set-selector[,trait-set-selector[,...]]
+
+   trait-set-selector:
+     trait-set-selector-name = { trait-selector[, trait-selector[, ...]] }
+
+   trait-set-selector-name:
+     constructor
+     device
+     implementation
+     user  */
+
+static tree
+cp_parser_omp_context_selector_specification (cp_parser *parser,
+					      bool has_parms_p)
+{
+  tree ret = NULL_TREE;
+  do
+    {
+      const char *setp = "";
+      if (cp_lexer_next_token_is (parser->lexer, CPP_NAME))
+	setp
+	  = IDENTIFIER_POINTER (cp_lexer_peek_token (parser->lexer)->u.value);
+      switch (setp[0])
+	{
+	case 'c':
+	  if (strcmp (setp, "construct") == 0)
+	    setp = NULL;
+	  break;
+	case 'd':
+	  if (strcmp (setp, "device") == 0)
+	    setp = NULL;
+	  break;
+	case 'i':
+	  if (strcmp (setp, "implementation") == 0)
+	    setp = NULL;
+	  break;
+	case 'u':
+	  if (strcmp (setp, "user") == 0)
+	    setp = NULL;
+	  break;
+	default:
+	  break;
+	}
+      if (setp)
+	{
+	  cp_parser_error (parser, "expected %<construct%>, %<device%>, "
+				   "%<implementation%> or %<user%>");
+	  return error_mark_node;
+	}
+
+      tree set = cp_lexer_peek_token (parser->lexer)->u.value;
+      cp_lexer_consume_token (parser->lexer);
+
+      if (!cp_parser_require (parser, CPP_EQ, RT_EQ))
+	return error_mark_node;
+
+      matching_braces braces;
+      if (!braces.require_open (parser))
+	return error_mark_node;
+
+      tree selectors
+	= cp_parser_omp_context_selector (parser, set, has_parms_p);
+      if (selectors == error_mark_node)
+	{
+	  cp_parser_skip_to_closing_brace (parser);
+	  ret = error_mark_node;
+	}
+      else if (ret != error_mark_node)
+	ret = tree_cons (set, selectors, ret);
+
+      braces.require_close (parser);
+
+      if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
+	cp_lexer_consume_token (parser->lexer);
+      else
+	break;
+    }
+  while (1);
+
+  if (ret == error_mark_node)
+    return ret;
+  return nreverse (ret);
+}
+
+/* Finalize #pragma omp declare variant after a fndecl has been parsed, and put
+   that into "omp declare variant" attribute.  */
+
+static tree
+cp_finish_omp_declare_variant (cp_parser *parser, cp_token *pragma_tok,
+			       tree attrs)
+{
+  matching_parens parens;
+  if (!parens.require_open (parser))
+    {
+     fail:
+      cp_parser_skip_to_pragma_eol (parser, pragma_tok);
+      return attrs;
+    }
+
+  cp_token *token = cp_lexer_peek_token (parser->lexer);
+  tree variant;
+  tree name = cp_parser_id_expression (parser, /*template_p=*/false,
+				       /*check_dependency_p=*/true,
+				       /*template_p=*/NULL,
+				       /*declarator_p=*/false,
+				       /*optional_p=*/false);
+  if (identifier_p (name))
+    variant = cp_parser_lookup_name_simple (parser, name, token->location);
+  else
+    variant = name;
+  if (variant == error_mark_node)
+    {
+      cp_parser_name_lookup_error (parser, name, variant, NLE_NULL,
+				   token->location);
+      variant = error_mark_node;
+    }
+
+  parens.require_close (parser);
+
+  const char *clause = "";
+  location_t match_loc = cp_lexer_peek_token (parser->lexer)->location;
+  if (cp_lexer_next_token_is (parser->lexer, CPP_NAME))
+    clause = IDENTIFIER_POINTER (cp_lexer_peek_token (parser->lexer)->u.value);
+  if (strcmp (clause, "match"))
+    {
+      cp_parser_error (parser, "expected %<match%>");
+      goto fail;
+    }
+
+  cp_lexer_consume_token (parser->lexer);
+
+  if (!parens.require_open (parser))
+    goto fail;
+
+  tree ctx = cp_parser_omp_context_selector_specification (parser, true);
+  if (ctx == error_mark_node)
+    goto fail;
+  ctx = c_omp_check_context_selector (match_loc, ctx);
+  if (ctx != error_mark_node && variant != error_mark_node)
+    {
+      attrs = tree_cons (get_identifier ("omp declare variant"),
+			 build_tree_list (variant, ctx), attrs);
+      if (processing_template_decl)
+	ATTR_IS_DEPENDENT (attrs) = 1;
+    }
+
+  parens.require_close (parser);
+  cp_parser_skip_to_pragma_eol (parser, pragma_tok);
+  return attrs;
+}
+
+
 /* Finalize #pragma omp declare simd clauses after direct declarator has
    been parsed, and put that into "omp declare simd" attribute.  */
 
@@ -40309,8 +40741,9 @@ cp_parser_late_parsing_omp_declare_simd (cp_parser *parser, tree attrs)
 
   if (!data->error_seen && data->fndecl_seen)
     {
-      error ("%<#pragma omp declare simd%> not immediately followed by "
-	     "a single function declaration or definition");
+      error ("%<#pragma omp declare %s%> not immediately followed by "
+	     "a single function declaration or definition",
+	     data->variant_p ? "variant" : "simd");
       data->error_seen = true;
     }
   if (data->error_seen)
@@ -40324,17 +40757,28 @@ cp_parser_late_parsing_omp_declare_simd (cp_parser *parser, tree attrs)
       parser->lexer->in_pragma = true;
       gcc_assert (cp_lexer_peek_token (parser->lexer)->type == CPP_PRAGMA);
       cp_token *pragma_tok = cp_lexer_consume_token (parser->lexer);
+      tree id = cp_lexer_peek_token (parser->lexer)->u.value;
+      const char *kind = IDENTIFIER_POINTER (id);
       cp_lexer_consume_token (parser->lexer);
-      cl = cp_parser_omp_all_clauses (parser, OMP_DECLARE_SIMD_CLAUSE_MASK,
-				      "#pragma omp declare simd", pragma_tok);
+      if (strcmp (kind, "simd") == 0)
+	{
+	  cl = cp_parser_omp_all_clauses (parser, OMP_DECLARE_SIMD_CLAUSE_MASK,
+					  "#pragma omp declare simd",
+					  pragma_tok);
+	  if (cl)
+	    cl = tree_cons (NULL_TREE, cl, NULL_TREE);
+	  c = build_tree_list (get_identifier ("omp declare simd"), cl);
+	  TREE_CHAIN (c) = attrs;
+	  if (processing_template_decl)
+	    ATTR_IS_DEPENDENT (c) = 1;
+	  attrs = c;
+	}
+      else
+	{
+	  gcc_assert (strcmp (kind, "variant") == 0);
+	  attrs = cp_finish_omp_declare_variant (parser, pragma_tok, attrs);
+	}
       cp_parser_pop_lexer (parser);
-      if (cl)
-	cl = tree_cons (NULL_TREE, cl, NULL_TREE);
-      c = build_tree_list (get_identifier ("omp declare simd"), cl);
-      TREE_CHAIN (c) = attrs;
-      if (processing_template_decl)
-	ATTR_IS_DEPENDENT (c) = 1;
-      attrs = c;
     }
 
   data->fndecl_seen = true;
@@ -40898,7 +41342,10 @@ cp_parser_omp_declare_reduction (cp_parser *parser, cp_token *pragma_tok,
    #pragma omp declare simd declare-simd-clauses[optseq] new-line
    #pragma omp declare reduction (reduction-id : typename-list : expression) \
       initializer-clause[opt] new-line
-   #pragma omp declare target new-line  */
+   #pragma omp declare target new-line
+
+   OpenMP 5.0
+   #pragma omp declare variant (identifier) match (context-selector)  */
 
 static bool
 cp_parser_omp_declare (cp_parser *parser, cp_token *pragma_tok,
@@ -40913,7 +41360,14 @@ cp_parser_omp_declare (cp_parser *parser, cp_token *pragma_tok,
 	{
 	  cp_lexer_consume_token (parser->lexer);
 	  cp_parser_omp_declare_simd (parser, pragma_tok,
-				      context);
+				      context, false);
+	  return true;
+	}
+      if (flag_openmp && strcmp (p, "variant") == 0)
+	{
+	  cp_lexer_consume_token (parser->lexer);
+	  cp_parser_omp_declare_simd (parser, pragma_tok,
+				      context, true);
 	  return true;
 	}
       cp_ensure_no_omp_declare_simd (parser);
@@ -40936,8 +41390,8 @@ cp_parser_omp_declare (cp_parser *parser, cp_token *pragma_tok,
 	  return false;
 	}
     }
-  cp_parser_error (parser, "expected %<simd%> or %<reduction%> "
-			   "or %<target%>");
+  cp_parser_error (parser, "expected %<simd%>, %<reduction%>, "
+			   "%<target%> or %<variant%>");
   cp_parser_require_pragma_eol (parser, pragma_tok);
   return false;
 }
diff --git a/gcc/cp/parser.h b/gcc/cp/parser.h
index 2890788..91b5916 100644
--- a/gcc/cp/parser.h
+++ b/gcc/cp/parser.h
@@ -202,10 +202,11 @@ struct GTY (()) cp_parser_context {
 };
 
 
-/* Helper data structure for parsing #pragma omp declare simd.  */
+/* Helper data structure for parsing #pragma omp declare {simd,variant}.  */
 struct cp_omp_declare_simd_data {
   bool error_seen; /* Set if error has been reported.  */
   bool fndecl_seen; /* Set if one fn decl/definition has been seen already.  */
+  bool variant_p; /* Set for #pragma omp declare variant.  */
   vec<cp_token_cache_ptr> tokens;
   tree clauses;
 };
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d03827d..0a4961b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/declare-variant-1.c: New test.
+	* c-c++-common/gomp/declare-variant-2.c: New test.
+	* c-c++-common/gomp/declare-variant-3.c: New test.
+	* g++.dg/gomp/this-1.C: Adjust for diagnostic message spelling fix.
+	* gcc.dg/gomp/declare-variant-1.c: New test.
+	* gcc.dg/gomp/declare-variant-2.c: New test.
+
 2019-10-09  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/90879
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-1.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-1.c
new file mode 100644
index 0000000..8b3cd7f
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-1.c
@@ -0,0 +1,54 @@
+int foo (int, int, int *);
+int bar (int, int, int *);
+#pragma omp declare variant (foo) \
+  match (construct={parallel,for},\
+	 device={isa(avx512f,avx512vl),kind(host,cpu)},\
+	 implementation={vendor(score(0):gnu),unified_shared_memory},\
+	 user={condition(score(0):0)})
+#pragma omp declare variant (bar) \
+  match (device={arch(x86_64,powerpc64),isa(avx512f,popcntb)}, \
+	 implementation={atomic_default_mem_order(seq_cst),made_up_selector("foo", 13, "bar")}, \
+	 user={condition(3-3)})
+int baz (int, int, int *);
+
+int
+qux (void)
+{
+  int i = 3;
+  return baz (1, 2, &i);
+}
+
+int quux (int);
+
+void
+corge (void)
+{
+  int i;
+  #pragma omp declare variant (quux) match (construct={parallel,for})
+  extern int waldo (int);
+  waldo (5);
+  #pragma omp parallel for
+  for (i = 0; i < 3; i++)
+    waldo (6);
+  #pragma omp parallel
+  #pragma omp taskgroup
+  #pragma omp for
+  for (i = 0; i < 3; i++)
+    waldo (7);
+  #pragma omp parallel
+  #pragma omp master    
+  waldo (8);
+}
+
+#pragma omp declare variant (bar) match \
+  (implementation={atomic_default_mem_order(relaxed), \
+		   unified_address, unified_shared_memory, \
+		   dynamic_allocators, reverse_offload})
+int baz2 (int x, int y, int *z)
+{
+  return x + y + *z;
+}
+
+#pragma omp declare variant (bar) match \
+  (implementation={atomic_default_mem_order(score(3): acq_rel)})
+int baz3 (int, int, int *);
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c
new file mode 100644
index 0000000..bc12398
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c
@@ -0,0 +1,122 @@
+void f1 (void);
+#pragma omp declare variant	/* { dg-error "expected '\\(' before end of line" } */
+void f2 (void);
+#pragma omp declare variant (	/* { dg-error "" } */
+void f3 (void);
+#pragma omp declare variant ()	/* { dg-error "" } */
+void f4 (void);
+#pragma omp declare variant match(user={condition(0)})	/* { dg-error "expected '\\(' before 'match'" } */
+void f5 (void);
+#pragma omp declare variant (f1)	/* { dg-error "expected 'match' before end of line" } */
+void f6 (void);
+#pragma omp declare variant (f1) simd	/* { dg-error "expected 'match' before 'simd'" } */
+void f7 (void);
+#pragma omp declare variant (f1) match	/* { dg-error "expected '\\(' before end of line" } */
+void f8 (void);
+#pragma omp declare variant (f1) match(	/* { dg-error "expected 'construct', 'device', 'implementation' or 'user' before end of line" } */
+void f9 (void);
+#pragma omp declare variant (f1) match()	/* { dg-error "expected 'construct', 'device', 'implementation' or 'user' before '\\)' token" } */
+void f10 (void);
+#pragma omp declare variant (f1) match(foo)	/* { dg-error "expected 'construct', 'device', 'implementation' or 'user' before 'foo'" } */
+void f11 (void);
+#pragma omp declare variant (f1) match(something={something})	/* { dg-error "expected 'construct', 'device', 'implementation' or 'user' before 'something'" } */
+void f12 (void);
+#pragma omp declare variant (f1) match(user)	/* { dg-error "expected '=' before '\\)' token" } */
+void f13 (void);
+#pragma omp declare variant (f1) match(user=)	/* { dg-error "expected '\\\{' before '\\)' token" } */
+void f14 (void);
+#pragma omp declare variant (f1) match(user=	/* { dg-error "expected '\\\{' before end of line" } */
+void f15 (void);
+#pragma omp declare variant (f1) match(user={)	/* { dg-error "expected trait selector name before '\\)' token" } */
+void f16 (void);				/* { dg-error "expected '\\\}' before" "" { target c++ } .-1 } */
+#pragma omp declare variant (f1) match(user={})	/* { dg-error "expected trait selector name before '\\\}' token" } */
+void f17 (void);
+#pragma omp declare variant (f1) match(user={condition})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f18 (void);
+#pragma omp declare variant (f1) match(user={condition(})	/* { dg-error "expected \[^\n\r]*expression before '\\\}' token" } */
+void f19 (void);						/* { dg-error "expected '\\)' before '\\\}' token" "" { target c++ } .-1 } */
+#pragma omp declare variant (f1) match(user={condition()})	/* { dg-error "expected \[^\n\r]*expression before '\\)' token" } */
+void f20 (void);
+#pragma omp declare variant (f1) match(user={condition(f1)})	/* { dg-error "property must be constant integer expression" "" { target { c || c++11 } } } */
+void f21 (void);						/* { dg-error "cannot appear in a constant-expression" "" { target c++98_only } .-1 } */
+#pragma omp declare variant (f1) match(user={condition(1, 2, 3)})	/* { dg-error "expected '\\)' before ',' token" } */
+void f22 (void);
+#pragma omp declare variant (f1) match(construct={master})	/* { dg-error "selector 'master' not allowed for context selector set 'construct'" } */
+void f23 (void);
+#pragma omp declare variant (f1) match(construct={teams,parallel,master,for})	/* { dg-error "selector 'master' not allowed for context selector set 'construct'" } */
+void f24 (void);						/* { dg-error "expected '\\\}' before ',' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(construct={parallel(1	/* { dg-error "selector 'parallel' does not accept any properties" } */
+void f25 (void);						/* { dg-error "expected '\\\}' before end of line" "" { target c++ } .-1 } */
+								/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-2 } */
+#pragma omp declare variant (f1) match(construct={parallel(1)})	/* { dg-error "selector 'parallel' does not accept any properties" } */
+void f26 (void);							/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(construct={simd(12)})	/* { dg-error "expected \[^\n\r]* clause before" } */
+void f27 (void);						/* { dg-error "'\\)' before numeric constant" "" { target c++ } .-1 } */
+#pragma omp declare variant (f1) match(construct={parallel},construct={for})	/* { dg-error "selector set 'construct' specified more than once" } */
+void f28 (void);
+#pragma omp declare variant (f1) match(construct={parallel},construct={parallel})	/* { dg-error "selector set 'construct' specified more than once" } */
+void f29 (void);
+#pragma omp declare variant (f1) match(user={condition(0)},construct={target},user={condition(0)})	/* { dg-error "selector set 'user' specified more than once" } */
+void f30 (void);
+#pragma omp declare variant (f1) match(user={condition(0)},user={condition(1)})	/* { dg-error "selector set 'user' specified more than once" } */
+void f31 (void);
+#pragma omp declare variant (f1) match(device={kind})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f32 (void);
+#pragma omp declare variant (f1) match(device={isa})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f33 (void);
+#pragma omp declare variant (f1) match(device={arch})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f34 (void);
+#pragma omp declare variant (f1) match(device={kind,isa,arch})	/* { dg-error "expected '\\(' before ',' token" } */
+void f35 (void);
+#pragma omp declare variant (f1) match(device={kind(})	/* { dg-error "expected identifier before '\\\}' token" } */
+void f36 (void);
+#pragma omp declare variant (f1) match(device={kind(unknown)})	/* { dg-warning "unknown property 'unknown' of 'kind' selector" } */
+void f37 (void);
+#pragma omp declare variant (f1) match(device={kind(unknown,foobar)})	/* { dg-warning "unknown property 'unknown' of 'kind' selector" } */
+void f38 (void);							/* { dg-warning "unknown property 'foobar' of 'kind' selector" "" { target *-*-* } .-1 } */
+#pragma omp declare variant (f1) match(device={isa(1)})	/* { dg-error "expected identifier before numeric constant" } */
+void f39 (void);
+#pragma omp declare variant (f1) match(device={arch(17)})	/* { dg-error "expected identifier before numeric constant" } */
+void f40 (void);
+#pragma omp declare variant (f1) match(device={foobar(3)})
+void f41 (void);
+#pragma omp declare variant (f1) match(device={arch(x86_64)},device={isa(avx512vl)})	/* { dg-error "selector set 'device' specified more than once" } */
+void f42 (void);
+#pragma omp declare variant (f1) match(implementation={foobar(3)})
+void f43 (void);
+#pragma omp declare variant (f1) match(implementation={vendor})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f44 (void);
+#pragma omp declare variant (f1) match(implementation={extension})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f45 (void);
+#pragma omp declare variant (f1) match(implementation={vendor()})	/* { dg-error "expected identifier before '\\)' token" } */
+void f45 (void);
+#pragma omp declare variant (f1) match(implementation={vendor(123-234)})	/* { dg-error "expected identifier before numeric constant" } */
+void f46 (void);
+#pragma omp declare variant (f1) match(implementation={vendor("x86_64")})	/* { dg-error "expected identifier before string constant" } */
+void f47 (void);
+#pragma omp declare variant (f1) match(implementation={unified_address(yes)})	/* { dg-error "selector 'unified_address' does not accept any properties" } */
+void f48 (void);								/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(implementation={unified_shared_memory(no)})	/* { dg-error "selector 'unified_shared_memory' does not accept any properties" } */
+void f49 (void);									/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(implementation={dynamic_allocators(42)})	/* { dg-error "selector 'dynamic_allocators' does not accept any properties" } */
+void f50 (void);								/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(implementation={reverse_offload()})	/* { dg-error "selector 'reverse_offload' does not accept any properties" } */
+void f51 (void);								/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(implementation={atomic_default_mem_order})	/* { dg-error "expected '\\(' before '\\\}' token" } */
+void f52 (void);
+#pragma omp declare variant (f1) match(implementation={atomic_default_mem_order(acquire)})	/* { dg-error "incorrect property 'acquire' of 'atomic_default_mem_order' selector" } */
+void f53 (void);
+#pragma omp declare variant (f1) match(implementation={atomic_default_mem_order(release)})	/* { dg-error "incorrect property 'release' of 'atomic_default_mem_order' selector" } */
+void f54 (void);
+#pragma omp declare variant (f1) match(implementation={atomic_default_mem_order(foobar)})	/* { dg-error "incorrect property 'foobar' of 'atomic_default_mem_order' selector" } */
+void f55 (void);
+#pragma omp declare variant (f1) match(implementation={atomic_default_mem_order(relaxed,seq_cst)})	/* { dg-error "'atomic_default_mem_order' selector must have a single property" } */
+void f56 (void);
+#pragma omp declare variant (f1) match(implementation={atomic_default_mem_order(relaxed)},implementation={atomic_default_mem_order(relaxed)})	/* { dg-error "selector set 'implementation' specified more than once" } */
+void f57 (void);
+#pragma omp declare variant (f1) match(user={foobar(3)})	/* { dg-error "selector 'foobar' not allowed for context selector set 'user'" } */
+void f58 (void);						/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(construct={foobar(3)})	/* { dg-error "selector 'foobar' not allowed for context selector set 'construct'" } */
+void f59 (void);						/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
+#pragma omp declare variant (f1) match(construct={parallel},foobar={bar})	/* { dg-error "expected 'construct', 'device', 'implementation' or 'user' before 'foobar'" } */
+void f60 (void);
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-3.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-3.c
new file mode 100644
index 0000000..34a2a06
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-3.c
@@ -0,0 +1,141 @@
+void f1 (void);
+#pragma omp declare variant (f1) match (construct={target})
+void f2 (void);
+void f3 (void);
+#pragma omp declare variant (f3) match (construct={teams})
+void f4 (void);
+void f5 (void);
+#pragma omp declare variant (f5) match (construct={parallel})
+void f6 (void);
+void f7 (void);
+#pragma omp declare variant (f7) match (construct={for})
+void f8 (void);
+void f9 (void);
+#pragma omp declare variant (f9) match (construct={target,teams,parallel,for})
+void f10 (void);
+void f11 (void);
+#pragma omp declare variant (f11) match (construct={teams,for,parallel})
+void f12 (void);
+void f13 (void);
+#pragma omp declare variant (f13) match (device={kind(any)})
+void f14 (void);
+#pragma omp declare variant (f13) match (device={kind(host)})
+void f15 (void);
+#pragma omp declare variant (f13) match (device={kind(nohost)})
+void f16 (void);
+#pragma omp declare variant (f13) match (device={kind(cpu)})
+void f17 (void);
+#pragma omp declare variant (f13) match (device={kind(gpu)})
+void f18 (void);
+#pragma omp declare variant (f13) match (device={kind(fpga)})
+void f19 (void);
+#pragma omp declare variant (f13) match (device={kind(any,any)})
+void f20 (void);
+#pragma omp declare variant (f13) match (device={kind(host,nohost)})
+void f21 (void);
+#pragma omp declare variant (f13) match (device={kind(cpu,gpu,fpga)})
+void f22 (void);
+#pragma omp declare variant (f13) match (device={kind(any,cpu,nohost)})
+void f23 (void);
+#pragma omp declare variant (f13) match (device={isa(avx)})
+void f24 (void);
+#pragma omp declare variant (f13) match (device={isa(sse4,avx512f,avx512vl,avx512bw)})
+void f25 (void);
+#pragma omp declare variant (f13) match (device={arch(x86_64)})
+void f26 (void);
+#pragma omp declare variant (f13) match (device={arch(riscv64)})
+void f27 (void);
+#pragma omp declare variant (f13) match (device={arch(nvptx)})
+void f28 (void);
+#pragma omp declare variant (f13) match (device={arch(x86_64),isa(avx512f,avx512vl),kind(cpu)})
+void f29 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(amd)})
+void f30 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(arm)})
+void f31 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(bsc)})
+void f32 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(cray)})
+void f33 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(fujitsu)})
+void f34 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(gnu)})
+void f35 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(ibm)})
+void f36 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(intel)})
+void f37 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(llvm)})
+void f38 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(pgi)})
+void f39 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(ti)})
+void f40 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(unknown)})
+void f41 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(gnu,llvm,intel,ibm)})
+void f42 (void);
+#pragma omp declare variant (f13) match (implementation={extension(my_cute_extension)})	/* { dg-warning "unknown property 'my_cute_extension' of 'extension' selector" } */
+void f43 (void);
+#pragma omp declare variant (f13) match (implementation={extension(some_other_ext,another_ext)})	/* { dg-warning "unknown property 'some_other_ext' of 'extension' selector" } */
+void f44 (void);											/* { dg-warning "unknown property 'another_ext' of 'extension' selector" "" { target *-*-* } .-1 } */
+#pragma omp declare variant (f13) match (implementation={unified_shared_memory})
+void f45 (void);
+#pragma omp declare variant (f13) match (implementation={unified_address})
+void f46 (void);
+#pragma omp declare variant (f13) match (implementation={dynamic_allocators})
+void f47 (void);
+#pragma omp declare variant (f13) match (implementation={reverse_offload})
+void f48 (void);
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(seq_cst)})
+void f49 (void);
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(relaxed)})
+void f50 (void);
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(acq_rel)})
+void f51 (void);
+#pragma omp declare variant (f14) match (implementation={atomic_default_mem_order(acq_rel),vendor(gnu),unified_address,extension(foobar)})	/* { dg-warning "unknown property 'foobar' of 'extension' selector" } */
+void f52 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(3):amd)})
+void f53 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(4):arm)})
+void f54 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(5):bsc)})
+void f55 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(6):cray)})
+void f56 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(7):fujitsu)})
+void f57 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(8):gnu)})
+void f58 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(9):ibm)})
+void f59 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(10):intel)})
+void f60 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(11):llvm)})
+void f61 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(12):pgi)})
+void f62 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(13):ti)})
+void f63 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(14):unknown)})
+void f64 (void);
+#pragma omp declare variant (f13) match (implementation={vendor(score(15):gnu,llvm,intel,ibm)})
+void f65 (void);
+#pragma omp declare variant (f13) match (implementation={extension(score(16):my_cute_extension)})	/* { dg-warning "unknown property 'my_cute_extension' of 'extension' selector" } */
+void f66 (void);
+#pragma omp declare variant (f13) match (implementation={extension(score(17):some_other_ext,another_ext)})	/* { dg-warning "unknown property 'some_other_ext' of 'extension' selector" } */
+void f67 (void);												/* { dg-warning "unknown property 'another_ext' of 'extension' selector" "" { target *-*-* } .-1 } */
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(score(18):seq_cst)})
+void f68 (void);
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(score(19):relaxed)})
+void f69 (void);
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(score(20):acq_rel)})
+void f70 (void);
+#pragma omp declare variant (f13) match (implementation={atomic_default_mem_order(score(21):acq_rel),vendor(score(22):gnu),unified_address,extension(score(22):foobar)})	/* { dg-warning "unknown property 'foobar' of 'extension' selector" } */
+void f71 (void);
+#pragma omp declare variant (f13) match (user={condition(0)})
+void f72 (void);
+#pragma omp declare variant (f13) match (user={condition(272-272*1)})
+void f73 (void);
+#pragma omp declare variant (f13) match (user={condition(score(25):1)})
+void f74 (void);
diff --git a/gcc/testsuite/g++.dg/gomp/this-1.C b/gcc/testsuite/g++.dg/gomp/this-1.C
index 0e2dd8c..30ab8b3 100644
--- a/gcc/testsuite/g++.dg/gomp/this-1.C
+++ b/gcc/testsuite/g++.dg/gomp/this-1.C
@@ -3,7 +3,7 @@
 
 struct S
 {
-  #pragma omp declare simd linear(this)		// { dg-error "is not an function argument" }
+  #pragma omp declare simd linear(this)		// { dg-error "is not a function argument" }
   static void foo ();
   void bar ();
 };
@@ -35,7 +35,7 @@ S::bar ()
 template <int N>
 struct T
 {
-  #pragma omp declare simd linear(this)		// { dg-error "is not an function argument" }
+  #pragma omp declare simd linear(this)		// { dg-error "is not a function argument" }
   static void foo ();
   void bar ();
 };
diff --git a/gcc/testsuite/gcc.dg/gomp/declare-variant-1.c b/gcc/testsuite/gcc.dg/gomp/declare-variant-1.c
new file mode 100644
index 0000000..9b20cfe
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gomp/declare-variant-1.c
@@ -0,0 +1,41 @@
+/* Test parsing of #pragma omp declare variant */
+/* { dg-do compile } */
+
+int fn0 (int);
+int fn6 (int);
+
+#pragma omp declare variant (fn0) match (user={condition(0)})
+int a;	/* { dg-error "not immediately followed by a function declaration or definition" } */
+
+#pragma omp declare variant (fn0) match (user={condition(0)})
+int fn1 (int a), fn2 (int a);	/* { dg-error "not immediately followed by a single function declaration or definition" } */
+
+#pragma omp declare variant (fn0) match (user={condition(0)})
+int b, fn3 (int a);	/* { dg-error "not immediately followed by a function declaration or definition" } */
+
+#pragma omp declare variant (fn0) match (user={condition(0)})
+int fn4 (int a), c;	/* { dg-error "not immediately followed by a function declaration or definition" } */
+
+int t;
+
+#pragma omp declare variant (fn0) match (user={condition(0)})
+#pragma omp declare variant (fn6) match (implementation={vendor(unknown)})
+#pragma omp threadprivate(t)	/* { dg-error "must be followed by function declaration or definition or another" } */
+int fn5 (int a);
+
+#pragma omp declare variant (1 + 2) match (user={condition(0)})	/* { dg-error "expected identifier before numeric constant" } */
+int fn7 (int);
+
+#pragma omp declare variant (t) match (user={condition(0)})	/* { dg-error "variant 't' is not a function" } */
+int fn8 (int);
+
+long fn9 (char, short);
+
+#pragma omp declare variant (fn9) match (implementation={vendor(unknown)})	/* { dg-error "variant 'fn9' and base 'fn10' have incompatible types" } */
+int fn10 (int, long long);
+
+#pragma omp declare variant (memcpy) match (implementation={vendor(llvm)})	/* { dg-error "'memcpy' undeclared here" } */
+void *fn11 (void *, const void *, __SIZE_TYPE__);
+
+#pragma omp declare variant (__builtin_memmove) match (implementation={vendor(gnu)})	/* { dg-error "variant '__builtin_memmove' is a built-in" } */
+void *fn12 (void *, const void *, __SIZE_TYPE__);
diff --git a/gcc/testsuite/gcc.dg/gomp/declare-variant-2.c b/gcc/testsuite/gcc.dg/gomp/declare-variant-2.c
new file mode 100644
index 0000000..701d83b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gomp/declare-variant-2.c
@@ -0,0 +1,22 @@
+/* Test parsing of #pragma omp declare variant */
+/* { dg-do compile } */
+
+int f0 (int, int *, int);
+
+int
+f1 (int x)
+{
+  if (x)
+    #pragma omp declare variant (fn0) match (user={condition(0)})
+    extern int f3 (int a, int *b, int c);	/* { dg-error "must be followed by function declaration or definition" } */
+  while (x < 10)
+    #pragma omp declare variant (fn0) match (user={condition(0)})
+    extern int f4 (int a, int *b, int c);	/* { dg-error "must be followed by function declaration or definition" } */
+  {
+lab:
+    #pragma omp declare variant (fn0) match (user={condition(0)})
+    extern int f5 (int a, int *b, int c);	/* { dg-error "must be followed by function declaration or definition" } */
+    x++;					/* { dg-error "expected expression before" "" { target *-*-* } .-1 } */
+  }
+  return x;
+}
-- 
cgit v1.1


From 051fb43f810d34a683a5112112757abf6998325a Mon Sep 17 00:00:00 2001
From: Andreas Krebbel <krebbel@linux.ibm.com>
Date: Thu, 10 Oct 2019 07:56:25 +0000
Subject: S/390: PR91035 Fix call to __morestack

For the call to __morestack we use a special ABI in the S/390 back-end
which requires us to emit a parameter block to the .rodata section.
It contains the label whereto __morestack needs to return.  The
parameter block needs to be explicit in RTL since we also need to take
the address of it loaded into r1 in order to pass its address to
__morestack.  In order to express correctly what __morestack does its
RTX also contained the return label. Hence we had the return label to
occur twice in the insn stream.  This is problematic when it comes to
redirecting edges.  The correlation between these two occurrences of
the label cannot be expressed so when doing a redirect only the label
in the jump RTX gets modified while the parameter block label stays as
is.

The patch avoids having two instancs of the label by merging the
parameter block generation and the __morestack call RTX into one. By
doing this I could also get rid of the unspec which was required for
the parameter block generation so far.

gcc/ChangeLog:

2019-10-10  Andreas Krebbel  <krebbel@linux.ibm.com>

	PR target/91035
	* config/s390/s390-protos.h (s390_output_split_stack_data): Add
	prototype.
	* config/s390/s390.md (UNSPECV_SPLIT_STACK_DATA): Remove.
	("split_stack_data", "split_stack_call")
	("split_stack_call_<mode>", "split_stack_cond_call")
	("split_stack_cond_call_<mode>"): Remove.
	("@split_stack_call<mode>", "@split_stack_cond_call<mode>"): New
	insn definition.
	* config/s390/s390.c (s390_output_split_stack_data): New function.
	(s390_expand_split_stack_prologue): Use the merged expander.

From-SVN: r276790
---
 gcc/ChangeLog                 |  14 ++++++
 gcc/config/s390/s390-protos.h |   1 +
 gcc/config/s390/s390.c        |  78 +++++++++++++++++++++--------
 gcc/config/s390/s390.md       | 111 +++++++++++++-----------------------------
 4 files changed, 109 insertions(+), 95 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ada9be7..6f559bc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2019-10-10  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	PR target/91035
+	* config/s390/s390-protos.h (s390_output_split_stack_data): Add
+	prototype.
+	* config/s390/s390.md (UNSPECV_SPLIT_STACK_DATA): Remove.
+	("split_stack_data", "split_stack_call")
+	("split_stack_call_<mode>", "split_stack_cond_call")
+	("split_stack_cond_call_<mode>"): Remove.
+	("@split_stack_call<mode>", "@split_stack_cond_call<mode>"): New
+	insn definition.
+	* config/s390/s390.c (s390_output_split_stack_data): New function.
+	(s390_expand_split_stack_prologue): Use the merged expander.
+
 2019-10-09  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/90879
diff --git a/gcc/config/s390/s390-protos.h b/gcc/config/s390/s390-protos.h
index ae70b2f..f760f15 100644
--- a/gcc/config/s390/s390-protos.h
+++ b/gcc/config/s390/s390-protos.h
@@ -146,6 +146,7 @@ extern int s390_branch_condition_mask (rtx);
 extern int s390_compare_and_branch_condition_mask (rtx);
 extern bool s390_extzv_shift_ok (int, int, unsigned HOST_WIDE_INT);
 extern void s390_asm_output_function_label (FILE *, const char *, tree);
+extern void s390_output_split_stack_data (rtx, rtx, rtx, rtx);
 
 enum s390_indirect_branch_type
   {
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 062cbd8..8241bd5 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -11600,6 +11600,44 @@ static GTY(()) rtx morestack_ref;
 
 #define SPLIT_STACK_AVAILABLE 1024
 
+/* Emit the parmblock for __morestack into .rodata section.  It
+   consists of 3 pointer size entries:
+   - frame size
+   - size of stack arguments
+   - offset between parm block and __morestack return label  */
+
+void
+s390_output_split_stack_data (rtx parm_block, rtx call_done,
+			      rtx frame_size, rtx args_size)
+{
+  rtx ops[] = { parm_block, call_done };
+
+  switch_to_section (targetm.asm_out.function_rodata_section
+		     (current_function_decl));
+
+  if (TARGET_64BIT)
+    output_asm_insn (".align\t8", NULL);
+  else
+    output_asm_insn (".align\t4", NULL);
+
+  (*targetm.asm_out.internal_label) (asm_out_file, "L",
+				     CODE_LABEL_NUMBER (parm_block));
+  if (TARGET_64BIT)
+    {
+      output_asm_insn (".quad\t%0", &frame_size);
+      output_asm_insn (".quad\t%0", &args_size);
+      output_asm_insn (".quad\t%1-%0", ops);
+    }
+  else
+    {
+      output_asm_insn (".long\t%0", &frame_size);
+      output_asm_insn (".long\t%0", &args_size);
+      output_asm_insn (".long\t%1-%0", ops);
+    }
+
+  switch_to_section (current_function_section ());
+}
+
 /* Emit -fsplit-stack prologue, which goes before the regular function
    prologue.  */
 
@@ -11677,16 +11715,8 @@ s390_expand_split_stack_prologue (void)
 
   call_done = gen_label_rtx ();
   parm_base = gen_label_rtx ();
-
-  /* Emit the parameter block.  */
-  tmp = gen_split_stack_data (parm_base, call_done,
-			      GEN_INT (frame_size),
-			      GEN_INT (args_size));
-  insn = emit_insn (tmp);
-  add_reg_note (insn, REG_LABEL_OPERAND, call_done);
-  LABEL_NUSES (call_done)++;
-  add_reg_note (insn, REG_LABEL_OPERAND, parm_base);
   LABEL_NUSES (parm_base)++;
+  LABEL_NUSES (call_done)++;
 
   /* %r1 = litbase.  */
   insn = emit_move_insn (r1, gen_rtx_LABEL_REF (VOIDmode, parm_base));
@@ -11696,15 +11726,29 @@ s390_expand_split_stack_prologue (void)
   /* Now, we need to call __morestack.  It has very special calling
      conventions: it preserves param/return/static chain registers for
      calling main function body, and looks for its own parameters at %r1. */
+  if (cc != NULL)
+    tmp = gen_split_stack_cond_call (Pmode,
+				     morestack_ref,
+				     parm_base,
+				     call_done,
+				     GEN_INT (frame_size),
+				     GEN_INT (args_size),
+				     cc);
+  else
+    tmp = gen_split_stack_call (Pmode,
+				morestack_ref,
+				parm_base,
+				call_done,
+				GEN_INT (frame_size),
+				GEN_INT (args_size));
+
+  insn = emit_jump_insn (tmp);
+  JUMP_LABEL (insn) = call_done;
+  add_reg_note (insn, REG_LABEL_OPERAND, parm_base);
+  add_reg_note (insn, REG_LABEL_OPERAND, call_done);
 
   if (cc != NULL)
     {
-      tmp = gen_split_stack_cond_call (morestack_ref, cc, call_done);
-
-      insn = emit_jump_insn (tmp);
-      JUMP_LABEL (insn) = call_done;
-      LABEL_NUSES (call_done)++;
-
       /* Mark the jump as very unlikely to be taken.  */
       add_reg_br_prob_note (insn,
 			    profile_probability::very_unlikely ());
@@ -11720,10 +11764,6 @@ s390_expand_split_stack_prologue (void)
     }
   else
     {
-      tmp = gen_split_stack_call (morestack_ref, call_done);
-      insn = emit_jump_insn (tmp);
-      JUMP_LABEL (insn) = call_done;
-      LABEL_NUSES (call_done)++;
       emit_barrier ();
     }
 
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index e4516f6..01e5cf9 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -298,7 +298,6 @@
 
    ; Split stack support
    UNSPECV_SPLIT_STACK_CALL
-   UNSPECV_SPLIT_STACK_DATA
 
    UNSPECV_OSC_BREAK
   ])
@@ -12000,99 +11999,59 @@
   DONE;
 })
 
-;; __morestack parameter block for split stack prologue.  Parameters are:
-;; parameter block label, label to be called by __morestack, frame size,
-;; stack parameter size.
+;; Call to __morestack used by the split stack support
 
-(define_insn "split_stack_data"
-  [(unspec_volatile [(match_operand 0 "" "X")
-		     (match_operand 1 "" "X")
-		     (match_operand 2 "const_int_operand" "X")
-		     (match_operand 3 "const_int_operand" "X")]
-		    UNSPECV_SPLIT_STACK_DATA)]
-  ""
-{
-  switch_to_section (targetm.asm_out.function_rodata_section
-		 (current_function_decl));
+; The insn has 3 parts:
+; 1. A jump to the call done label. The jump will be done as part of
+;    __morestack and will not be explicitly emitted to the insn stream.
+; 2. The call of __morestack including a use for r1 which is supposed to
+;    point to the parameter block for __morestack.
+; 3. 3 USES whose values together with the call done label will be
+;    used to emit the parameter block to the .rodata section. This
+;    needs to be tied into the same insn as 1. since the call done
+;    label is emitted also as part of the parm block.  In order to
+;    allow the edge to the BB with the call done label to be
+;    redirected both need to make use of the same label_ref.
 
-  if (TARGET_64BIT)
-    output_asm_insn (".align\t8", operands);
-  else
-    output_asm_insn (".align\t4", operands);
-  (*targetm.asm_out.internal_label) (asm_out_file, "L",
-				     CODE_LABEL_NUMBER (operands[0]));
-  if (TARGET_64BIT)
-    {
-      output_asm_insn (".quad\t%2", operands);
-      output_asm_insn (".quad\t%3", operands);
-      output_asm_insn (".quad\t%1-%0", operands);
-    }
-  else
-    {
-      output_asm_insn (".long\t%2", operands);
-      output_asm_insn (".long\t%3", operands);
-      output_asm_insn (".long\t%1-%0", operands);
-    }
-
-  switch_to_section (current_function_section ());
-  return "";
-}
-  [(set_attr "length" "0")])
-
-
-;; A jg with minimal fuss for use in split stack prologue.
-
-(define_expand "split_stack_call"
-  [(match_operand 0 "bras_sym_operand" "X")
-   (match_operand 1 "" "")]
-  ""
-{
-  if (TARGET_64BIT)
-    emit_jump_insn (gen_split_stack_call_di (operands[0], operands[1]));
-  else
-    emit_jump_insn (gen_split_stack_call_si (operands[0], operands[1]));
-  DONE;
-})
-
-(define_insn "split_stack_call_<mode>"
-  [(set (pc) (label_ref (match_operand 1 "" "")))
+(define_insn "@split_stack_call<mode>"
+  [(set (pc) (label_ref (match_operand 2 "" "")))     ; call done label
    (set (reg:P 1) (unspec_volatile [(match_operand 0 "bras_sym_operand" "X")
 				    (reg:P 1)]
-				   UNSPECV_SPLIT_STACK_CALL))]
+				   UNSPECV_SPLIT_STACK_CALL))
+   (use (label_ref (match_operand 1 "" "X")))         ; parm block label
+   (use (match_operand 3 "const_int_operand" "X"))    ; frame size
+   (use (match_operand 4 "const_int_operand" "X"))]   ; arg size
   ""
-  "jg\t%0"
+{
+  s390_output_split_stack_data (operands[1], operands[2], operands[3], operands[4]);
+  return "jg\t%0";
+}
   [(set_attr "op_type" "RIL")
    (set_attr "type"  "branch")])
 
-;; Also a conditional one.
-
-(define_expand "split_stack_cond_call"
-  [(match_operand 0 "bras_sym_operand" "X")
-   (match_operand 1 "" "")
-   (match_operand 2 "" "")]
-  ""
-{
-  if (TARGET_64BIT)
-    emit_jump_insn (gen_split_stack_cond_call_di (operands[0], operands[1], operands[2]));
-  else
-    emit_jump_insn (gen_split_stack_cond_call_si (operands[0], operands[1], operands[2]));
-  DONE;
-})
+; As above but with a conditional jump
 
-(define_insn "split_stack_cond_call_<mode>"
+(define_insn "@split_stack_cond_call<mode>"
   [(set (pc)
 	(if_then_else
-	  (match_operand 1 "" "")
-	  (label_ref (match_operand 2 "" ""))
+	  (match_operand 5 "" "")                     ; condition
+	  (label_ref (match_operand 2 "" ""))         ; call done label
 	  (pc)))
    (set (reg:P 1) (unspec_volatile [(match_operand 0 "bras_sym_operand" "X")
 				    (reg:P 1)]
-				   UNSPECV_SPLIT_STACK_CALL))]
+				   UNSPECV_SPLIT_STACK_CALL))
+   (use (label_ref (match_operand 1 "" "X")))         ; parm block label
+   (use (match_operand 3 "const_int_operand" "X"))    ; frame size
+   (use (match_operand 4 "const_int_operand" "X"))]   ; arg size
   ""
-  "jg%C1\t%0"
+{
+  s390_output_split_stack_data (operands[1], operands[2], operands[3], operands[4]);
+  return "jg%C5\t%0";
+}
   [(set_attr "op_type" "RIL")
    (set_attr "type"  "branch")])
 
+
 (define_insn "osc_break"
   [(unspec_volatile [(const_int 0)] UNSPECV_OSC_BREAK)]
   ""
-- 
cgit v1.1


From 4a9150d04a2a9b6f322d3deb65eaf5b4f614ed12 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Thu, 10 Oct 2019 08:48:14 +0000
Subject: [Fortran, OpenMP] Actually pass use_device_addr on to the middle end

        * trans-openmp.c (gfc_trans_omp_clauses): Actually pass
        use_device_addr on to the middle end.

From-SVN: r276791
---
 gcc/fortran/ChangeLog      | 5 +++++
 gcc/fortran/trans-openmp.c | 3 +++
 2 files changed, 8 insertions(+)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7847042..0577659 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  Tobias Burnus  <tobias@codesourcery.com>
+
+	* trans-openmp.c (gfc_trans_omp_clauses): Actually pass use_device_addr
+	on to the middle end.
+
 2019-10-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/91801
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index f83bab4..35c2f28 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -1887,6 +1887,9 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
 	case OMP_LIST_USE_DEVICE_PTR:
 	  clause_code = OMP_CLAUSE_USE_DEVICE_PTR;
 	  goto add_clause;
+	case OMP_LIST_USE_DEVICE_ADDR:
+	  clause_code = OMP_CLAUSE_USE_DEVICE_ADDR;
+	  goto add_clause;
 	case OMP_LIST_IS_DEVICE_PTR:
 	  clause_code = OMP_CLAUSE_IS_DEVICE_PTR;
 	  goto add_clause;
-- 
cgit v1.1


From 80f8cd77304aea092dafc29fe0e7f943b6588062 Mon Sep 17 00:00:00 2001
From: Andreas Krebbel <krebbel@linux.ibm.com>
Date: Thu, 10 Oct 2019 09:04:02 +0000
Subject: S/390: Add support for z15 as CPU name.

So far z15 was identified as arch13. After the machine has been
announced we can now add the real name.

gcc/ChangeLog:

2019-10-10  Andreas Krebbel  <krebbel@linux.ibm.com>

	* common/config/s390/s390-common.c (PF_ARCH13): Rename to...
	(PF_Z15): ... this.
	* config.gcc: Add z15 as option for --with-arch and --with-tune
	configure switches.
	* config/s390/s390-c.c (s390_resolve_overloaded_builtin): Add
	error reporting for unsupported builtins.
	* config/s390/s390-opts.h (enum processor_type): Rename
	PROCESSOR_8561_ARCH13 to PROCESSOR_8561_Z15.
	* config/s390/8561.md: Rename arch13 to z15 throughout the file.
	* config/s390/driver-native.c (s390_host_detect_local_cpu):
	Likewise.
	* config/s390/s390-builtins.def: Likewise.
	* config/s390/s390.c (processor_table): Add z15 as option and keep arch13 as alternative.
	(s390_expand_builtin): Add missing check for unsupported builtins.
	(s390_canonicalize_comparison): Rename TARGET_ARCH13 to TARGET_Z15.
	(s390_rtx_costs): Likewise.
	(s390_get_sched_attrmask): Rename arch13 to z15.
	(s390_get_unit_mask): Likewise.
	(s390_is_fpd): Likewise.
	(s390_is_fxd): Likewise.
	* config/s390/s390.h (enum processor_flags): Likewise.
	* config/s390/s390.md: Likewise.
	* config/s390/vector.md: Likewise.
	* config/s390/vx-builtins.md: Likewise.
	* config/s390/s390.opt: Add z15 to processor_type value.

From-SVN: r276792
---
 gcc/ChangeLog                        | 28 +++++++++++
 gcc/common/config/s390/s390-common.c |  4 +-
 gcc/config.gcc                       |  2 +-
 gcc/config/s390/8561.md              | 92 ++++++++++++++++++------------------
 gcc/config/s390/driver-native.c      |  4 +-
 gcc/config/s390/s390-builtins.def    |  2 +-
 gcc/config/s390/s390-c.c             | 15 ++++++
 gcc/config/s390/s390-opts.h          |  2 +-
 gcc/config/s390/s390.c               | 48 +++++++++++--------
 gcc/config/s390/s390.h               | 18 +++----
 gcc/config/s390/s390.md              | 58 +++++++++++------------
 gcc/config/s390/s390.opt             |  5 +-
 gcc/config/s390/vector.md            |  2 +-
 gcc/config/s390/vx-builtins.md       |  6 +--
 14 files changed, 169 insertions(+), 117 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6f559bc..2e34b80 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,33 @@
 2019-10-10  Andreas Krebbel  <krebbel@linux.ibm.com>
 
+	* common/config/s390/s390-common.c (PF_ARCH13): Rename to...
+	(PF_Z15): ... this.
+	* config.gcc: Add z15 as option for --with-arch and --with-tune
+	configure switches.
+	* config/s390/s390-c.c (s390_resolve_overloaded_builtin): Add
+	error reporting for unsupported builtins.
+	* config/s390/s390-opts.h (enum processor_type): Rename
+	PROCESSOR_8561_ARCH13 to PROCESSOR_8561_Z15.
+	* config/s390/8561.md: Rename arch13 to z15 throughout the file.
+	* config/s390/driver-native.c (s390_host_detect_local_cpu):
+	Likewise.
+	* config/s390/s390-builtins.def: Likewise.
+	* config/s390/s390.c (processor_table): Add z15 as option and keep arch13 as alternative.
+	(s390_expand_builtin): Add missing check for unsupported builtins.
+	(s390_canonicalize_comparison): Rename TARGET_ARCH13 to TARGET_Z15.
+	(s390_rtx_costs): Likewise.
+	(s390_get_sched_attrmask): Rename arch13 to z15.
+	(s390_get_unit_mask): Likewise.
+	(s390_is_fpd): Likewise.
+	(s390_is_fxd): Likewise.
+	* config/s390/s390.h (enum processor_flags): Likewise.
+	* config/s390/s390.md: Likewise.
+	* config/s390/vector.md: Likewise.
+	* config/s390/vx-builtins.md: Likewise.
+	* config/s390/s390.opt: Add z15 to processor_type value.
+
+2019-10-10  Andreas Krebbel  <krebbel@linux.ibm.com>
+
 	PR target/91035
 	* config/s390/s390-protos.h (s390_output_split_stack_data): Add
 	prototype.
diff --git a/gcc/common/config/s390/s390-common.c b/gcc/common/config/s390/s390-common.c
index f9c3a95..2e1914e 100644
--- a/gcc/common/config/s390/s390-common.c
+++ b/gcc/common/config/s390/s390-common.c
@@ -47,9 +47,9 @@ EXPORTED_CONST int processor_flags_table[] =
     /* z14 */    PF_IEEE_FLOAT | PF_ZARCH | PF_LONG_DISPLACEMENT
 		 | PF_EXTIMM | PF_DFP | PF_Z10 | PF_Z196 | PF_ZEC12 | PF_TX
 		 | PF_Z13 | PF_VX | PF_VXE | PF_Z14,
-    /* arch13 */ PF_IEEE_FLOAT | PF_ZARCH | PF_LONG_DISPLACEMENT
+    /* z15 */    PF_IEEE_FLOAT | PF_ZARCH | PF_LONG_DISPLACEMENT
 		 | PF_EXTIMM | PF_DFP | PF_Z10 | PF_Z196 | PF_ZEC12 | PF_TX
-		 | PF_Z13 | PF_VX | PF_VXE | PF_Z14 | PF_VXE2 | PF_ARCH13
+		 | PF_Z13 | PF_VX | PF_VXE | PF_Z14 | PF_VXE2 | PF_Z15
   };
 
 /* Change optimizations to be performed, depending on the
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 511aeb4..bdc2253 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4826,7 +4826,7 @@ case "${target}" in
 		for which in arch tune; do
 			eval "val=\$with_$which"
 			case ${val} in
-			"" | native | z900 | z990 | z9-109 | z9-ec | z10 | z196 | zEC12 | z13 | z14 | arch5 | arch6 | arch7 | arch8 | arch9 | arch10 | arch11 | arch12 | arch13 )
+			"" | native | z900 | z990 | z9-109 | z9-ec | z10 | z196 | zEC12 | z13 | z14 | z15 | arch5 | arch6 | arch7 | arch8 | arch9 | arch10 | arch11 | arch12 | arch13 )
 				# OK
 				;;
 			*)
diff --git a/gcc/config/s390/8561.md b/gcc/config/s390/8561.md
index e5a345f..2442349 100644
--- a/gcc/config/s390/8561.md
+++ b/gcc/config/s390/8561.md
@@ -1,4 +1,4 @@
-;; Scheduling description for arch13.
+;; Scheduling description for z15.
 ;;   Copyright (C) 2019 Free Software Foundation, Inc.
 ;;   Contributed by Robin Dapp (rdapp@linux.ibm.com)
 ;; This file is part of GCC.
@@ -17,12 +17,12 @@
 ;; along with GCC; see the file COPYING3.  If not see
 ;; <http://www.gnu.org/licenses/>.
 
-(define_attr "arch13_unit_fpd" ""
+(define_attr "z15_unit_fpd" ""
 (cond [(eq_attr "mnemonic" "ddb,ddbr,deb,debr,dxbr,sqdb,sqdbr,sqeb,\
 sqebr,sqxbr,vfddb,vfdsb,vfsqdb,vfsqsb,wfddb,wfdsb,wfdxb,wfsqdb,wfsqxb")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_unit_fxa" ""
+(define_attr "z15_unit_fxa" ""
 (cond [(eq_attr "mnemonic" "a,afi,ag,agf,agfi,agfr,agh,aghi,aghik,\
 agr,agrk,ah,ahi,ahik,ahy,al,alc,alcg,alcgr,alcr,alfi,alg,algf,algfi,algfr,\
 alghsik,algr,algrk,alhsik,alr,alrk,aly,ar,ark,ay,bras,brasl,etnd,exrl,flogr,\
@@ -39,7 +39,7 @@ slgrk,sll,sllg,sllk,slr,slrk,sly,sr,sra,srag,srak,srk,srl,srlg,srlk,sy,x,xg,\
 xgr,xgrk,xihf,xilf,xr,xrk,xy")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_unit_fxb" ""
+(define_attr "z15_unit_fxb" ""
 (cond [(eq_attr "mnemonic" "agsi,algsi,alsi,asi,b,bc,bcr,bi,br,brcl,\
 c,cfi,cg,cgf,cgfi,cgfr,cgfrl,cgh,cghi,cghrl,cghsi,cgit,cgr,cgrl,cgrt,ch,\
 chi,chrl,chsi,chy,cit,cl,clfhsi,clfi,clfit,clg,clgf,clgfi,clgfr,clgfrl,\
@@ -52,11 +52,11 @@ tmhl,tml,tmlh,tmll,tmy,vlgvb,vlgvf,vlgvg,vlgvh,vlr,vlvgb,vlvgf,vlvgg,vlvgh,\
 vlvgp,vst,vstef,vsteg,vstl,vstrl,vstrlr,xi,xiy")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_unit_fxd" ""
+(define_attr "z15_unit_fxd" ""
 (cond [(eq_attr "mnemonic" "dlgr,dlr,dr,dsgfr,dsgr")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_unit_lsu" ""
+(define_attr "z15_unit_lsu" ""
 (cond [(eq_attr "mnemonic" "a,adb,aeb,ag,agf,agh,agsi,ah,ahy,al,alc,\
 alcg,alg,algf,algsi,alsi,aly,asi,ay,c,cdb,ceb,cg,cgf,cgfrl,cgh,cghrl,cghsi,\
 cgrl,ch,chrl,chsi,chy,cl,clc,clfhsi,clg,clgf,clgfrl,clghrl,clghsi,clgrl,\
@@ -73,7 +73,7 @@ vllezf,vllezg,vllezh,vllezlf,vlrepb,vlrepf,vlrepg,vlreph,vlrl,vlrlr,vst,\
 vstef,vsteg,vstl,vstrl,vstrlr,x,xg,xi,xiy,xy")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_unit_vfu" ""
+(define_attr "z15_unit_vfu" ""
 (cond [(eq_attr "mnemonic" "adb,adbr,adtr,aeb,aebr,axbr,axtr,cdb,\
 cdbr,cdtr,ceb,cebr,cpsdr,cxbr,cxtr,ddtr,dxtr,fidbr,fidbra,fidtr,fiebr,\
 fiebra,fixbr,fixbra,fixtr,lcdbr,lcebr,lcxbr,ldeb,ldebr,ldetr,le,ledbr,ledtr,\
@@ -115,7 +115,7 @@ wflpxb,wfmadb,wfmasb,wfmaxb,wfmaxxb,wfmdb,wfminxb,wfmsb,wfmsdb,wfmssb,wfmsxb,\
 wfmxb,wfnmaxb,wfnmsxb,wfsdb,wfssb,wfsxb,wldeb,wledb")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_cracked" ""
+(define_attr "z15_cracked" ""
 (cond [(eq_attr "mnemonic" "bas,basr,cdfbr,cdftr,cdgbr,cdgtr,cdlfbr,\
 cdlftr,cdlgbr,cdlgtr,cefbr,cegbr,celfbr,celgbr,cfdbr,cfebr,cfxbr,cgdbr,cgdtr,\
 cgebr,cgxbr,cgxtr,chhsi,clfdbr,clfdtr,clfebr,clfxbr,clfxtr,clgdbr,clgdtr,\
@@ -123,13 +123,13 @@ clgebr,clgxbr,clgxtr,cs,csg,csy,d,efpc,ex,lcgfr,lngfr,lpgfr,lpq,lxr,lzxr,\
 rxsbg,stpq,vgef,vgeg,vscef,vsceg,vsteb,vsteh")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_expanded" ""
+(define_attr "z15_expanded" ""
 (cond [(eq_attr "mnemonic" "cds,cdsg,cdsy,cxfbr,cxftr,cxgbr,cxgtr,\
 cxlfbr,cxlftr,cxlgbr,cxlgtr,dl,dlg,dsg,dsgf,lam,lm,lmg,lmy,sldl,srda,srdl,\
 stam,stm,stmg,stmy,tbegin,tbeginc")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_groupalone" ""
+(define_attr "z15_groupalone" ""
 (cond [(eq_attr "mnemonic" "alc,alcg,alcgr,alcr,axbr,axtr,clc,cxbr,\
 cxtr,dlgr,dlr,dr,dsgfr,dsgr,dxbr,dxtr,fixbr,fixbra,fixtr,flogr,lcxbr,lnxbr,\
 lpxbr,ltxbr,ltxtr,lxdb,lxdbr,lxdtr,lxeb,lxebr,m,madb,maeb,maebr,mfy,mg,mgrk,\
@@ -137,11 +137,11 @@ ml,mlg,mlgr,mlr,mr,msdb,mseb,msebr,mvc,mxbr,mxtr,nc,oc,ppa,sfpc,slb,slbg,\
 slbgr,slbr,sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_endgroup" ""
+(define_attr "z15_endgroup" ""
 (cond [(eq_attr "mnemonic" "bras,brasl,exrl,ipm")
  (const_int 1)] (const_int 0)))
 
-(define_attr "arch13_groupoftwo" ""
+(define_attr "z15_groupoftwo" ""
 (cond [(eq_attr "mnemonic" "vacccq,vacq,vfmadb,vfmasb,vfmsdb,vfmssb,\
 vfnmadb,vfnmasb,vfnmsdb,vfnmssb,vgfmab,vgfmaf,vgfmag,vgfmah,vmaeb,vmaef,vmaeh,\
 vmahb,vmahf,vmahh,vmalb,vmaleb,vmalef,vmaleh,vmalf,vmalhb,vmalhf,vmalhh,\
@@ -149,8 +149,8 @@ vmalhw,vmalob,vmalof,vmaloh,vmaob,vmaof,vmaoh,vmslg,vperm,vsbcbiq,vsbiq,vsel,\
 wfmadb,wfmasb,wfmaxb,wfmsdb,wfmssb,wfmsxb,wfnmaxb,wfnmsxb")
  (const_int 1)] (const_int 0)))
 
-(define_insn_reservation "arch13_0" 0
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_0" 0
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "a,afi,ag,agfi,aghi,aghik,agr,agrk,ahi,ahik,al,\
 alfi,alg,algf,algfi,algfr,alghsik,algr,algrk,alhsik,alr,alrk,aly,ar,ark,ay,\
 b,bc,bcr,bi,br,bras,brasl,brcl,c,cfi,cg,cgfi,cghi,cghsi,cgit,cgr,cgrl,\
@@ -168,8 +168,8 @@ sllk,slr,slrk,sly,sr,sra,srag,srak,srda,srdl,srk,srl,srlg,srlk,sy,tm,tmh,\
 tmhh,tmhl,tml,tmlh,tmll,tmy,vlr,vlvgb,vlvgf,vlvgg,vlvgh,x,xg,xgr,xgrk,xihf,\
 xilf,xr,xrk,xy")) "nothing")
 
-(define_insn_reservation "arch13_1" 1
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_1" 1
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "agf,agfr,agh,agsi,ah,ahy,algsi,alsi,asi,cgf,\
 cgfr,cgfrl,cgh,cghrl,ch,chrl,chy,clm,clmy,cpsdr,laa,laag,lan,lang,lao,laog,\
 lax,laxg,le,ler,ley,loc,locg,locghi,locgr,lochi,locr,mvghi,mvhhi,mvhi,mvi,\
@@ -196,8 +196,8 @@ wfcedb,wfcesb,wfcexb,wfchdb,wfchedb,wfchesb,wfchexb,wfchsb,wfchxb,wflcdb,\
 wflcsb,wflcxb,wflndb,wflnsb,wflnxb,wflpdb,wflpsb,wflpxb,wfmaxxb,wfminxb,xi,\
 xiy")) "nothing")
 
-(define_insn_reservation "arch13_2" 2
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_2" 2
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cdb,cdbr,ceb,cebr,ear,ipm,l,lcbb,lcdbr,lcebr,ld,\
 lde,ldy,lg,lgdr,lgrl,llc,llgc,llgf,llgfrl,llgh,llghrl,llgt,llh,llhrl,lm,\
 lmg,lmy,lndbr,lnebr,lpdbr,lpebr,lrl,ltdbr,ltebr,ly,popcnt,sar,tcdb,tceb,\
@@ -208,8 +208,8 @@ vistrh,vlgvb,vlgvf,vlgvg,vlgvh,vllezb,vllezf,vllezg,vllezh,vllezlf,vlrepb,\
 vlrepf,vlrepg,vlreph,vlrl,vlvgp,vpklsfs,vpklsgs,vpklshs,vpksfs,vpksgs,vpkshs,\
 wfcdb,wfcexbs,wfchexbs,wfchxbs,wfcsb")) "nothing")
 
-(define_insn_reservation "arch13_3" 3
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_3" 3
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cds,cdsy,mgh,mghi,mh,mhi,mhy,std,stdy,ste,stey,\
 vcksm,vfeezbs,vfeezfs,vfeezhs,vgfmab,vgfmaf,vgfmag,vgfmah,vgfmb,vgfmf,vgfmg,\
 vgfmh,vistrbs,vistrfs,vistrhs,vl,vlbb,vll,vlrlr,vmaeb,vmaef,vmaeh,vmahb,\
@@ -218,14 +218,14 @@ vmalob,vmalof,vmaloh,vmaob,vmaof,vmaoh,vmeb,vmef,vmeh,vmhb,vmhf,vmhh,vmlb,\
 vmleb,vmlef,vmleh,vmlf,vmlhb,vmlhf,vmlhh,vmlhw,vmlob,vmlof,vmloh,vmob,vmof,\
 vmoh,vsumb,vsumgf,vsumgh,vsumh,vsumqf,vsumqg,vtm")) "nothing")
 
-(define_insn_reservation "arch13_4" 4
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_4" 4
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "bas,basr,chhsi,clc,ex,lam,lcgfr,lngfr,lpgfr,lxr,\
 lzxr,ms,msfi,msgf,msgfi,msgfr,msr,msy,mvc,nc,oc,ppa,rxsbg,tabort,tbegin,\
 tbeginc,tend,vst,vstef,vsteg,vstl,vstrl,vstrlr,xc")) "nothing")
 
-(define_insn_reservation "arch13_5" 5
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_5" 5
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "adb,adbr,aeb,aebr,alc,alcg,alcgr,alcr,cs,csg,\
 csy,fidbr,fidbra,fiebr,fiebra,ldeb,ldebr,ledbr,madbr,mdb,mdbr,meeb,meebr,\
 msdbr,msrkc,sdb,sdbr,seb,sebr,slb,slbg,slbgr,slbr,stm,stmg,stmy,vfadb,vfasb,\
@@ -233,53 +233,53 @@ vfidb,vfisb,vfmadb,vfmasb,vfmdb,vfmsb,vfmsdb,vfmssb,vfnmadb,vfnmasb,vfnmsdb,\
 vfnmssb,vfsdb,vfssb,vldeb,vledb,vmslg,wfadb,wfasb,wfidb,wfisb,wflld,wfmadb,\
 wfmasb,wfmdb,wfmsb,wfmsdb,wfmssb,wfsdb,wfssb,wldeb,wledb")) "nothing")
 
-(define_insn_reservation "arch13_6" 6
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_6" 6
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "msg,msgr,sfpc")) "nothing")
 
-(define_insn_reservation "arch13_7" 7
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_7" 7
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "adtr,cdtr,fidtr,ldetr,ltdtr,msgrkc,sdtr,tdcdt,\
 tdcet,vgef,vgeg")) "nothing")
 
-(define_insn_reservation "arch13_8" 8
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_8" 8
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cdsg,flogr,lpq,stpq,vsteb,vsteh")) "nothing")
 
-(define_insn_reservation "arch13_9" 9
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_9" 9
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cdfbr,cdgbr,cdlfbr,cdlgbr,cefbr,cegbr,celfbr,\
 celgbr,cxfbr,cxgbr,cxlfbr,cxlgbr,m,madb,maeb,maebr,mfy,ml,mlr,mr,msdb,mseb,\
 msebr,stam,wfaxb,wfixb,wfsxb")) "nothing")
 
-(define_insn_reservation "arch13_10" 10
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_10" 10
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "lxdb,lxdbr,lxeb,lxebr,vscef,vsceg")) "nothing")
 
-(define_insn_reservation "arch13_11" 11
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_11" 11
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cfdbr,cfebr,cgdbr,cgebr,clfdbr,clfebr,clgdbr,\
 clgebr,mg,mgrk,mlg,mlgr")) "nothing")
 
-(define_insn_reservation "arch13_12" 12
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_12" 12
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cxbr,cxftr,cxlftr,cxtr,tcxb,tdcxt")) "nothing")
 
-(define_insn_reservation "arch13_13" 13
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_13" 13
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "axbr,axtr,fixbr,fixbra,fixtr,lcxbr,lnxbr,lpxbr,\
 ltxbr,ltxtr,lxdtr,sxbr,sxtr")) "nothing")
 
-(define_insn_reservation "arch13_14" 14
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_14" 14
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cfxbr,cgxbr,clfxbr,clgxbr,ledtr")) "nothing")
 
-(define_insn_reservation "arch13_16" 16
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_16" 16
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cdftr,cdlftr")) "nothing")
 
-(define_insn_reservation "arch13_20" 20
-  (and (eq_attr "cpu" "arch13")
+(define_insn_reservation "z15_20" 20
+  (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "cdgtr,cdlgtr,cgdtr,cgxtr,clfdtr,clfxtr,clgdtr,\
 clgxtr,cxgtr,cxlgtr,d,ddb,ddbr,ddtr,deb,debr,dl,dlg,dlgr,dlr,dr,dsg,dsgf,\
 dsgfr,dsgr,dxbr,dxtr,efpc,mdtr,mxbr,mxtr,sqdb,sqdbr,sqeb,sqebr,sqxbr,vfddb,\
diff --git a/gcc/config/s390/driver-native.c b/gcc/config/s390/driver-native.c
index a386d63..6bc7d59 100644
--- a/gcc/config/s390/driver-native.c
+++ b/gcc/config/s390/driver-native.c
@@ -121,10 +121,10 @@ s390_host_detect_local_cpu (int argc, const char **argv)
 	      break;
 	    case 0x8561:
 	    case 0x8562:
-	      cpu = "arch13";
+	      cpu = "z15";
 	      break;
 	    default:
-	      cpu = "arch13";
+	      cpu = "z15";
 	      break;
 	    }
 	}
diff --git a/gcc/config/s390/s390-builtins.def b/gcc/config/s390/s390-builtins.def
index cfc6965..7e49d08 100644
--- a/gcc/config/s390/s390-builtins.def
+++ b/gcc/config/s390/s390-builtins.def
@@ -281,7 +281,7 @@
 #define B_HTM   (1 << 1)  /* Builtins requiring the transactional execution facility.  */
 #define B_VX    (1 << 2)  /* Builtins requiring the z13 vector extensions.  */
 #define B_VXE   (1 << 3)  /* Builtins requiring the z14 vector extensions.  */
-#define B_VXE2  (1 << 4)  /* Builtins requiring the arch13 vector extensions.  */
+#define B_VXE2  (1 << 4)  /* Builtins requiring the z15 vector extensions.  */
 #define B_DEP   (1 << 5)  /* Builtin has been deprecated and a warning should be issued.  */
 
 /* B_DEF defines a standard (not overloaded) builtin
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index fd98a39..629c79d 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -905,6 +905,12 @@ s390_resolve_overloaded_builtin (location_t loc,
       return error_mark_node;
     }
 
+  if (!TARGET_VXE2 && (ob_flags & B_VXE2))
+    {
+      error_at (loc, "%qF requires z15 or higher", ob_fndecl);
+      return error_mark_node;
+    }
+
   ob_fcode -= S390_BUILTIN_MAX;
 
   for (b_arg_chain = TYPE_ARG_TYPES (TREE_TYPE (ob_fndecl));
@@ -983,6 +989,15 @@ s390_resolve_overloaded_builtin (location_t loc,
       return error_mark_node;
     }
 
+
+  if (!TARGET_VXE2
+      && bflags_overloaded_builtin_var[last_match_index] & B_VXE2)
+    {
+      error_at (loc, "%qs matching variant requires z15 or higher",
+		IDENTIFIER_POINTER (DECL_NAME (ob_fndecl)));
+      return error_mark_node;
+    }
+
   if (bflags_overloaded_builtin_var[last_match_index] & B_DEP)
     warning_at (loc, 0, "%qs matching variant is deprecated.",
 		IDENTIFIER_POINTER (DECL_NAME (ob_fndecl)));
diff --git a/gcc/config/s390/s390-opts.h b/gcc/config/s390/s390-opts.h
index ab41cb8..502edea 100644
--- a/gcc/config/s390/s390-opts.h
+++ b/gcc/config/s390/s390-opts.h
@@ -37,7 +37,7 @@ enum processor_type
   PROCESSOR_2827_ZEC12,
   PROCESSOR_2964_Z13,
   PROCESSOR_3906_Z14,
-  PROCESSOR_8561_ARCH13,
+  PROCESSOR_8561_Z15,
   PROCESSOR_NATIVE,
   PROCESSOR_max
 };
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 8241bd5..10a9b7b 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -337,7 +337,7 @@ const struct s390_processor processor_table[] =
   { "zEC12",  "zEC12",  PROCESSOR_2827_ZEC12,  &zEC12_cost,  10 },
   { "z13",    "z13",    PROCESSOR_2964_Z13,    &zEC12_cost,  11 },
   { "z14",    "arch12", PROCESSOR_3906_Z14,    &zEC12_cost,  12 },
-  { "arch13", "",       PROCESSOR_8561_ARCH13, &zEC12_cost,  13 },
+  { "z15",    "arch13", PROCESSOR_8561_Z15,    &zEC12_cost,  13 },
   { "native", "",       PROCESSOR_NATIVE,      NULL,         0  }
 };
 
@@ -811,6 +811,12 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED,
 	  error ("Builtin %qF requires z14 or higher.", fndecl);
 	  return const0_rtx;
 	}
+
+      if ((bflags & B_VXE2) && !TARGET_VXE2)
+	{
+	  error ("Builtin %qF requires z15 or higher.", fndecl);
+	  return const0_rtx;
+	}
     }
   if (fcode >= S390_OVERLOADED_BUILTIN_VAR_OFFSET
       && fcode < S390_ALL_BUILTIN_MAX)
@@ -1796,7 +1802,7 @@ s390_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
     }
 
   /* ~a==b -> ~(a^b)==0   ~a!=b -> ~(a^b)!=0 */
-  if (TARGET_ARCH13
+  if (TARGET_Z15
       && (*code == EQ || *code == NE)
       && (GET_MODE (*op0) == DImode || GET_MODE (*op0) == SImode)
       && GET_CODE (*op0) == NOT)
@@ -1808,7 +1814,7 @@ s390_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
     }
 
   /* a&b == -1 -> ~a|~b == 0    a|b == -1 -> ~a&~b == 0  */
-  if (TARGET_ARCH13
+  if (TARGET_Z15
       && (*code == EQ || *code == NE)
       && (GET_CODE (*op0) == AND || GET_CODE (*op0) == IOR)
       && (GET_MODE (*op0) == DImode || GET_MODE (*op0) == SImode)
@@ -3582,7 +3588,7 @@ s390_rtx_costs (rtx x, machine_mode mode, int outer_code,
 
 	/* It is a real IF-THEN-ELSE.  An additional move will be
 	   needed to implement that.  */
-	if (!TARGET_ARCH13
+	if (!TARGET_Z15
 	    && reload_completed
 	    && !rtx_equal_p (dst, then)
 	    && !rtx_equal_p (dst, els))
@@ -3604,7 +3610,7 @@ s390_rtx_costs (rtx x, machine_mode mode, int outer_code,
     case IOR:
 
       /* nnrk, nngrk */
-      if (TARGET_ARCH13
+      if (TARGET_Z15
 	  && (mode == SImode || mode == DImode)
 	  && GET_CODE (XEXP (x, 0)) == NOT
 	  && GET_CODE (XEXP (x, 1)) == NOT)
@@ -3651,7 +3657,7 @@ s390_rtx_costs (rtx x, machine_mode mode, int outer_code,
 
     case AND:
       /* nork, nogrk */
-      if (TARGET_ARCH13
+      if (TARGET_Z15
 	  && (mode == SImode || mode == DImode)
 	  && GET_CODE (XEXP (x, 0)) == NOT
 	  && GET_CODE (XEXP (x, 1)) == NOT)
@@ -3823,7 +3829,7 @@ s390_rtx_costs (rtx x, machine_mode mode, int outer_code,
       *total = COSTS_N_INSNS (1);
 
       /* nxrk, nxgrk ~(a^b)==0 */
-      if (TARGET_ARCH13
+      if (TARGET_Z15
 	  && GET_CODE (XEXP (x, 0)) == NOT
 	  && XEXP (x, 1) == const0_rtx
 	  && GET_CODE (XEXP (XEXP (x, 0), 0)) == XOR
@@ -3838,7 +3844,7 @@ s390_rtx_costs (rtx x, machine_mode mode, int outer_code,
 	}
 
       /* nnrk, nngrk, nork, nogrk */
-      if (TARGET_ARCH13
+      if (TARGET_Z15
 	  && (GET_CODE (XEXP (x, 0)) == AND || GET_CODE (XEXP (x, 0)) == IOR)
 	  && XEXP (x, 1) == const0_rtx
 	  && (GET_MODE (XEXP (x, 0)) == SImode || GET_MODE (XEXP (x, 0)) == DImode)
@@ -14528,16 +14534,16 @@ s390_get_sched_attrmask (rtx_insn *insn)
       if (get_attr_z14_groupoftwo (insn))
 	mask |= S390_SCHED_ATTR_MASK_GROUPOFTWO;
       break;
-    case PROCESSOR_8561_ARCH13:
-      if (get_attr_arch13_cracked (insn))
+    case PROCESSOR_8561_Z15:
+      if (get_attr_z15_cracked (insn))
 	mask |= S390_SCHED_ATTR_MASK_CRACKED;
-      if (get_attr_arch13_expanded (insn))
+      if (get_attr_z15_expanded (insn))
 	mask |= S390_SCHED_ATTR_MASK_EXPANDED;
-      if (get_attr_arch13_endgroup (insn))
+      if (get_attr_z15_endgroup (insn))
 	mask |= S390_SCHED_ATTR_MASK_ENDGROUP;
-      if (get_attr_arch13_groupalone (insn))
+      if (get_attr_z15_groupalone (insn))
 	mask |= S390_SCHED_ATTR_MASK_GROUPALONE;
-      if (get_attr_arch13_groupoftwo (insn))
+      if (get_attr_z15_groupoftwo (insn))
 	mask |= S390_SCHED_ATTR_MASK_GROUPOFTWO;
       break;
     default:
@@ -14575,15 +14581,15 @@ s390_get_unit_mask (rtx_insn *insn, int *units)
       if (get_attr_z14_unit_vfu (insn))
 	mask |= 1 << 3;
       break;
-    case PROCESSOR_8561_ARCH13:
+    case PROCESSOR_8561_Z15:
       *units = 4;
-      if (get_attr_arch13_unit_lsu (insn))
+      if (get_attr_z15_unit_lsu (insn))
 	mask |= 1 << 0;
-      if (get_attr_arch13_unit_fxa (insn))
+      if (get_attr_z15_unit_fxa (insn))
 	mask |= 1 << 1;
-      if (get_attr_arch13_unit_fxb (insn))
+      if (get_attr_z15_unit_fxb (insn))
 	mask |= 1 << 2;
-      if (get_attr_arch13_unit_vfu (insn))
+      if (get_attr_z15_unit_vfu (insn))
 	mask |= 1 << 3;
       break;
     default:
@@ -14599,7 +14605,7 @@ s390_is_fpd (rtx_insn *insn)
     return false;
 
   return get_attr_z13_unit_fpd (insn) || get_attr_z14_unit_fpd (insn)
-    || get_attr_arch13_unit_fpd (insn);
+    || get_attr_z15_unit_fpd (insn);
 }
 
 static bool
@@ -14609,7 +14615,7 @@ s390_is_fxd (rtx_insn *insn)
     return false;
 
   return get_attr_z13_unit_fxd (insn) || get_attr_z14_unit_fxd (insn)
-    || get_attr_arch13_unit_fxd (insn);
+    || get_attr_z15_unit_fxd (insn);
 }
 
 /* Returns TRUE if INSN is a long-running instruction.  */
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index 2658e95..dc38b2e 100644
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -41,12 +41,12 @@ enum processor_flags
   PF_Z14 = 2048,
   PF_VXE = 4096,
   PF_VXE2 = 8192,
-  PF_ARCH13 = 16384
+  PF_Z15 = 16384
 };
 
 /* This is necessary to avoid a warning about comparing different enum
    types.  */
-#define s390_tune_attr ((enum attr_cpu)(s390_tune > PROCESSOR_8561_ARCH13 ? PROCESSOR_8561_ARCH13 : s390_tune ))
+#define s390_tune_attr ((enum attr_cpu)(s390_tune > PROCESSOR_8561_Z15 ? PROCESSOR_8561_Z15 : s390_tune ))
 
 /* These flags indicate that the generated code should run on a cpu
    providing the respective hardware facility regardless of the
@@ -100,10 +100,10 @@ enum processor_flags
 	(s390_arch_flags & PF_VXE)
 #define TARGET_CPU_VXE_P(opts) \
 	(opts->x_s390_arch_flags & PF_VXE)
-#define TARGET_CPU_ARCH13 \
-	(s390_arch_flags & PF_ARCH13)
-#define TARGET_CPU_ARCH13_P(opts) \
-	(opts->x_s390_arch_flags & PF_ARCH13)
+#define TARGET_CPU_Z15 \
+	(s390_arch_flags & PF_Z15)
+#define TARGET_CPU_Z15_P(opts) \
+	(opts->x_s390_arch_flags & PF_Z15)
 #define TARGET_CPU_VXE2 \
 	(s390_arch_flags & PF_VXE2)
 #define TARGET_CPU_VXE2_P(opts) \
@@ -160,9 +160,9 @@ enum processor_flags
 	(TARGET_VX && TARGET_CPU_VXE)
 #define TARGET_VXE_P(opts)						\
 	(TARGET_VX_P (opts) && TARGET_CPU_VXE_P (opts))
-#define TARGET_ARCH13 (TARGET_ZARCH && TARGET_CPU_ARCH13)
-#define TARGET_ARCH13_P(opts)						\
-	(TARGET_ZARCH_P (opts->x_target_flags) && TARGET_CPU_ARCH13_P (opts))
+#define TARGET_Z15 (TARGET_ZARCH && TARGET_CPU_Z15)
+#define TARGET_Z15_P(opts)						\
+	(TARGET_ZARCH_P (opts->x_target_flags) && TARGET_CPU_Z15_P (opts))
 #define TARGET_VXE2					\
 	(TARGET_VX && TARGET_CPU_VXE2)
 #define TARGET_VXE2_P(opts)						\
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 01e5cf9..73a8c35 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -512,11 +512,11 @@
 ;; Processor type.  This attribute must exactly match the processor_type
 ;; enumeration in s390.h.
 
-(define_attr "cpu" "z900,z990,z9_109,z9_ec,z10,z196,zEC12,z13,z14,arch13"
+(define_attr "cpu" "z900,z990,z9_109,z9_ec,z10,z196,zEC12,z13,z14,z15"
   (const (symbol_ref "s390_tune_attr")))
 
 (define_attr "cpu_facility"
-  "standard,ieee,zarch,cpu_zarch,longdisp,extimm,dfp,z10,z196,zEC12,vx,z13,z14,vxe,arch13,vxe2"
+  "standard,ieee,zarch,cpu_zarch,longdisp,extimm,dfp,z10,z196,zEC12,vx,z13,z14,vxe,z15,vxe2"
   (const_string "standard"))
 
 (define_attr "enabled" ""
@@ -574,8 +574,8 @@
 	      (match_test "TARGET_VXE"))
 	 (const_int 1)
 
-	 (and (eq_attr "cpu_facility" "arch13")
-	      (match_test "TARGET_ARCH13"))
+	 (and (eq_attr "cpu_facility" "z15")
+	      (match_test "TARGET_Z15"))
 	 (const_int 1)
 
          (and (eq_attr "cpu_facility" "vxe2")
@@ -612,7 +612,7 @@
 ;; Pipeline description for z14
 (include "3906.md")
 
-;; Pipeline description for arch13
+;; Pipeline description for z15
 (include "8561.md")
 
 ;; Predicates
@@ -641,7 +641,7 @@
 (define_mode_iterator DD_DF [DF DD])
 (define_mode_iterator TD_TF [TF TD])
 
-; 32 bit int<->fp conversion instructions are available since VXE2 (arch13).
+; 32 bit int<->fp conversion instructions are available since VXE2 (z15).
 (define_mode_iterator VX_CONV_BFP [DF (SF "TARGET_VXE2")])
 (define_mode_iterator VX_CONV_INT [DI (SI "TARGET_VXE2")])
 
@@ -6860,7 +6860,7 @@
    stoc<g>%C1\t%3,%0
    stoc<g>%D1\t%4,%0"
   [(set_attr "op_type" "RRF,RRF,RRF,RSY,RSY,RIE,RIE,RSY,RSY")
-   (set_attr "cpu_facility" "*,*,arch13,*,*,z13,z13,*,*")])
+   (set_attr "cpu_facility" "*,*,z15,*,*,z13,z13,*,*")])
 
 ;;
 ;;- Multiply instructions.
@@ -7711,7 +7711,7 @@
 	(and:GPR (not:GPR (match_operand:GPR 1 "nonimmediate_operand" ""))
 		 (match_operand:GPR 2 "general_operand" "")))
    (clobber (reg:CC CC_REGNUM))]
-  "!TARGET_ARCH13
+  "!TARGET_Z15
    && ! reload_completed
    && (GET_CODE (operands[0]) != MEM
       /* Ensure that s390_logical_operator_ok_p will succeed even
@@ -8068,7 +8068,7 @@
    (set (match_operand:GPR 0 "register_operand" "=d")
 	(ANDOR:GPR (not:GPR (match_dup 1))
 		   (match_dup 2)))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "<ANDOR:noxa>c<GPR:g>rk\t%0,%2,%1"
   [(set_attr "op_type" "RRF")])
 
@@ -8080,7 +8080,7 @@
 		    (match_operand:GPR 2 "register_operand" "d"))
 	 (const_int 0)))
    (clobber (match_scratch:GPR 0 "=d"))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "<ANDOR:noxa>c<GPR:g>rk\t%0,%2,%1"
   [(set_attr "op_type" "RRF")])
 
@@ -8090,7 +8090,7 @@
 	(ANDOR:GPR (not:GPR (match_operand:GPR 1 "register_operand" "d"))
 		   (match_operand:GPR 2 "register_operand" "d")))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARCH13"
+  "TARGET_Z15"
   "<ANDOR:noxa>c<GPR:g>rk\t%0,%2,%1"
   [(set_attr "op_type" "RRF")])
 
@@ -8108,7 +8108,7 @@
    (set (match_operand:GPR 0 "register_operand" "=d")
 	(ANDOR:GPR (not:GPR (match_dup 1))
 		   (not:GPR (match_dup 2))))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "n<ANDOR:inv_no><GPR:g>rk\t%0,%1,%2"
   [(set_attr "op_type" "RRF")])
 
@@ -8120,7 +8120,7 @@
 		    (not:GPR (match_operand:GPR 2 "register_operand" "d")))
 	 (const_int 0)))
    (clobber (match_scratch:GPR 0 "=d"))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "n<ANDOR:inv_no><GPR:g>rk\t%0,%1,%2"
   [(set_attr "op_type" "RRF")])
 
@@ -8130,7 +8130,7 @@
 	(ANDOR:GPR (not:GPR (match_operand:GPR 1 "register_operand" "d"))
 		   (not:GPR (match_operand:GPR 2 "register_operand" "d"))))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARCH13"
+  "TARGET_Z15"
   "n<ANDOR:inv_no><GPR:g>rk\t%0,%1,%2"
   [(set_attr "op_type" "RRF")])
 
@@ -8514,7 +8514,7 @@
    (set (match_operand:GPR 0 "register_operand" "=d")
 	(xor:GPR (not:GPR (match_dup 1))
 		    (match_dup 2)))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "nx<GPR:g>rk\t%0,%1,%2"
   [(set_attr "op_type" "RRF")])
 
@@ -8526,7 +8526,7 @@
 			   (match_operand:GPR 2 "register_operand" "d")))
 	 (const_int 0)))
    (clobber (match_scratch:GPR 0 "=d"))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "nx<GPR:g>rk\t%0,%1,%2"
   [(set_attr "op_type" "RRF")])
 
@@ -8536,7 +8536,7 @@
 	(not:GPR (xor:GPR (match_operand:GPR 1 "register_operand" "d")
 			  (match_operand:GPR 2 "register_operand" "d"))))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARCH13"
+  "TARGET_Z15"
   "nx<GPR:g>rk\t%0,%1,%2"
   [(set_attr "op_type" "RRF")])
 
@@ -11495,34 +11495,34 @@
 ; Population count instruction
 ;
 
-(define_insn "*popcountdi_arch13_cc"
+(define_insn "*popcountdi_z15_cc"
   [(set (reg CC_REGNUM)
 	(compare (popcount:DI (match_operand:DI 1 "register_operand" "d"))
 		 (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=d")
 	(match_dup 1))]
-  "TARGET_ARCH13 && s390_match_ccmode (insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode (insn, CCTmode)"
   "popcnt\t%0,%1,8"
   [(set_attr "op_type" "RRF")])
 
-(define_insn "*popcountdi_arch13_cconly"
+(define_insn "*popcountdi_z15_cconly"
   [(set (reg CC_REGNUM)
 	(compare (popcount:DI (match_operand:DI 1 "register_operand" "d"))
 		 (const_int 0)))
    (clobber (match_scratch:DI 0 "=d"))]
-  "TARGET_ARCH13 && s390_match_ccmode(insn, CCTmode)"
+  "TARGET_Z15 && s390_match_ccmode(insn, CCTmode)"
   "popcnt\t%0,%1,8"
   [(set_attr "op_type" "RRF")])
 
-(define_insn "*popcountdi_arch13"
+(define_insn "*popcountdi_z15"
   [(set (match_operand:DI 0 "register_operand" "=d")
 	(popcount:DI (match_operand:DI 1 "register_operand" "d")))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARCH13"
+  "TARGET_Z15"
   "popcnt\t%0,%1,8"
   [(set_attr "op_type" "RRF")])
 
-; The pre-arch13 popcount instruction counts the bits of op1 in 8 byte
+; The pre-z15 popcount instruction counts the bits of op1 in 8 byte
 ; portions and stores the result in the corresponding bytes in op0.
 (define_insn "*popcount<mode>_z196"
   [(set (match_operand:INT 0 "register_operand" "=d")
@@ -11566,7 +11566,7 @@
      (clobber (reg:CC CC_REGNUM))])]
   "TARGET_Z196"
 {
-  if (!TARGET_ARCH13)
+  if (!TARGET_Z15)
     {
       emit_insn (gen_popcountdi2_z196 (operands[0], operands[1]));
       DONE;
@@ -11597,7 +11597,7 @@
 
 ; popcount always counts on the full 64 bit. With the z196 version
 ; counting bits per byte we just ignore the upper 4 bytes.  With the
-; arch13 version we have to zero out the upper 32 bits first.
+; z15 version we have to zero out the upper 32 bits first.
 (define_expand "popcountsi2"
   [(set (match_dup 2)
 	(zero_extend:DI (match_operand:SI 1 "register_operand")))
@@ -11607,7 +11607,7 @@
 	(subreg:SI (match_dup 3) 4))]
   "TARGET_Z196"
 {
-  if (!TARGET_ARCH13)
+  if (!TARGET_Z15)
     {
       emit_insn (gen_popcountsi2_z196 (operands[0], operands[1]));
       DONE;
@@ -11645,7 +11645,7 @@
 	(subreg:HI (match_dup 3) 6))]
   "TARGET_Z196"
 {
-  if (!TARGET_ARCH13)
+  if (!TARGET_Z15)
     {
       emit_insn (gen_popcounthi2_z196 (operands[0], operands[1]));
       DONE;
@@ -11660,7 +11660,7 @@
 ; For popcount on a single byte the old z196 style popcount
 ; instruction is ideal.  Since it anyway does a byte-wise popcount we
 ; just use it instead of zero extending the QImode input to DImode and
-; using the arch13 popcount variant.
+; using the z15 popcount variant.
 (define_expand "popcountqi2"
   [; popcnt op0, op1
    (parallel [(set (match_operand:QI 0 "register_operand" "")
diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
index 639f167..6a6e1f7 100644
--- a/gcc/config/s390/s390.opt
+++ b/gcc/config/s390/s390.opt
@@ -110,7 +110,10 @@ EnumValue
 Enum(processor_type) String(arch12) Value(PROCESSOR_3906_Z14)
 
 EnumValue
-Enum(processor_type) String(arch13) Value(PROCESSOR_8561_ARCH13)
+Enum(processor_type) String(z15) Value(PROCESSOR_8561_Z15)
+
+EnumValue
+Enum(processor_type) String(arch13) Value(PROCESSOR_8561_Z15)
 
 EnumValue
 Enum(processor_type) String(native) Value(PROCESSOR_NATIVE) DriverOnly
diff --git a/gcc/config/s390/vector.md b/gcc/config/s390/vector.md
index 451d07d..127b75f 100644
--- a/gcc/config/s390/vector.md
+++ b/gcc/config/s390/vector.md
@@ -70,7 +70,7 @@
 
 (define_mode_iterator V_128_NOSINGLE [V16QI V8HI V4SI V4SF V2DI V2DF])
 
-; 32 bit int<->fp vector conversion instructions are available since VXE2 (arch13).
+; 32 bit int<->fp vector conversion instructions are available since VXE2 (z15).
 (define_mode_iterator VX_VEC_CONV_BFP [V2DF (V4SF "TARGET_VXE2")])
 (define_mode_iterator VX_VEC_CONV_INT [V2DI (V4SI "TARGET_VXE2")])
 
diff --git a/gcc/config/s390/vx-builtins.md b/gcc/config/s390/vx-builtins.md
index c71aae0..4b6079a 100644
--- a/gcc/config/s390/vx-builtins.md
+++ b/gcc/config/s390/vx-builtins.md
@@ -2147,7 +2147,7 @@
   "<vw>fmax<sdx>b\t%v0,%v1,%v2,%b3"
   [(set_attr "op_type" "VRR")])
 
-; The element reversal builtins introduced with arch13 have been made
+; The element reversal builtins introduced with z15 have been made
 ; available also for older CPUs down to z13.
 (define_expand "eltswap<mode>"
   [(set (match_operand:VEC_HW                 0 "nonimmediate_operand" "")
@@ -2181,8 +2181,8 @@
    vster<bhfgq>\t%v1,%v0"
   [(set_attr "op_type" "*,VRX,VRX")])
 
-; arch13 has instructions for doing element reversal from mem to reg
-; or the other way around.  For reg to reg or on pre arch13 machines
+; z15 has instructions for doing element reversal from mem to reg
+; or the other way around.  For reg to reg or on pre z15 machines
 ; we have to emulate it with vector permute.
 (define_insn_and_split "*eltswap<mode>_emu"
   [(set (match_operand:VEC_HW                 0 "nonimmediate_operand" "=vR")
-- 
cgit v1.1


From 9142736ee21629b159504a474f686cabb1612579 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 10 Oct 2019 09:56:35 +0000
Subject: lto-common.c (unify_scc): Do not merge anonymous NAMESPACE_DECLs.

2019-10-10  Richard Biener  <rguenther@suse.de>

	* lto-common.c (unify_scc): Do not merge anonymous NAMESPACE_DECLs.

From-SVN: r276796
---
 gcc/lto/ChangeLog    | 4 ++++
 gcc/lto/lto-common.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index e410232..393e1c1 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-10  Richard Biener  <rguenther@suse.de>
+
+	* lto-common.c (unify_scc): Do not merge anonymous NAMESPACE_DECLs.
+
 2019-10-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* lto-lang.c (flag_isoc2x): New variable.
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 9a17933..e5c15f2 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -1646,11 +1646,13 @@ unify_scc (class data_in *data_in, unsigned from,
       tree t = streamer_tree_cache_get_tree (cache, from + i);
       scc->entries[i] = t;
       /* Do not merge SCCs with local entities inside them.  Also do
-	 not merge TRANSLATION_UNIT_DECLs and anonymous namespace types.  */
+	 not merge TRANSLATION_UNIT_DECLs and anonymous namespaces
+	 and types therein types.  */
       if (TREE_CODE (t) == TRANSLATION_UNIT_DECL
 	  || (VAR_OR_FUNCTION_DECL_P (t)
 	      && !(TREE_PUBLIC (t) || DECL_EXTERNAL (t)))
 	  || TREE_CODE (t) == LABEL_DECL
+	  || (TREE_CODE (t) == NAMESPACE_DECL && !DECL_NAME (t))
 	  || (TYPE_P (t)
 	      && type_with_linkage_p (TYPE_MAIN_VARIANT (t))
 	      && type_in_anonymous_namespace_p (TYPE_MAIN_VARIANT (t))))
-- 
cgit v1.1


From 019f36a648fd3f35e562eb7ddd3ff6393b30b4c7 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Thu, 10 Oct 2019 15:04:44 +0200
Subject: re PR middle-end/92037 (LTO bootstrap broken in selftests)

	PR middle-end/92037
	* cgraph.c (symbol_table_test::symbol_table_test): Use ggc_alloc
	rather than ggc_alloc_cleared to alloc symbol table.
	* toplev.c (general_init): Likewise.
	* cgraph.h (symbol_table): Explicitly construct every field.

From-SVN: r276804
---
 gcc/ChangeLog |  8 ++++++++
 gcc/cgraph.c  |  2 +-
 gcc/cgraph.h  | 22 ++++++++++++++++------
 gcc/toplev.c  |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2e34b80..e97db14 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-10  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR middle-end/92037
+	* cgraph.c (symbol_table_test::symbol_table_test): Use ggc_alloc
+	rather than ggc_alloc_cleared to alloc symbol table.
+	* toplev.c (general_init): Likewise.
+	* cgraph.h (symbol_table): Explicitly construct every field.
+
 2019-10-10  Andreas Krebbel  <krebbel@linux.ibm.com>
 
 	* common/config/s390/s390-common.c (PF_ARCH13): Rename to...
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 0c3c6e7..8b752d8 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -3835,7 +3835,7 @@ symbol_table_test::symbol_table_test ()
 {
   gcc_assert (saved_symtab == NULL);
   saved_symtab = symtab;
-  symtab = new (ggc_cleared_alloc <symbol_table> ()) symbol_table ();
+  symtab = new (ggc_alloc <symbol_table> ()) symbol_table ();
 }
 
 /* Destructor.  Restore the old value of symtab.  */
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 73b2be6..733d616 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -2095,9 +2095,19 @@ public:
   friend struct cgraph_node;
   friend struct cgraph_edge;
 
-  symbol_table (): cgraph_max_uid (1), cgraph_max_summary_id (0),
-  edges_max_uid (1), edges_max_summary_id (0),
-  cgraph_released_summary_ids (), edge_released_summary_ids ()
+  symbol_table (): 
+  cgraph_count (0), cgraph_max_uid (1), cgraph_max_summary_id (0),
+  edges_count (0), edges_max_uid (1), edges_max_summary_id (0),
+  cgraph_released_summary_ids (), edge_released_summary_ids (),
+  nodes (NULL), asmnodes (NULL), asm_last_node (NULL),
+  order (0), global_info_ready (false), state (PARSING),
+  function_flags_ready (false), cpp_implicit_aliases_done (false),
+  section_hash (NULL), assembler_name_hash (NULL), init_priority_hash (NULL),
+  dump_file (NULL), ipa_clones_dump_file (NULL), cloned_nodes (),
+  m_first_edge_removal_hook (NULL), m_first_cgraph_removal_hook (NULL),
+  m_first_edge_duplicated_hook (NULL), m_first_cgraph_duplicated_hook (NULL),
+  m_first_cgraph_insertion_hook (NULL), m_first_varpool_insertion_hook (NULL),
+  m_first_varpool_removal_hook (NULL)
   {
   }
 
@@ -2343,6 +2353,9 @@ public:
   /* Vector of released summary IDS for cgraph nodes.  */
   vec<int> GTY ((skip)) edge_released_summary_ids;
 
+  /* Return symbol used to separate symbol name from suffix.  */
+  static char symbol_suffix_separator ();
+
   symtab_node* GTY(()) nodes;
   asm_node* GTY(()) asmnodes;
   asm_node* GTY(()) asm_last_node;
@@ -2372,9 +2385,6 @@ public:
 
   FILE* GTY ((skip)) dump_file;
 
-  /* Return symbol used to separate symbol name from suffix.  */
-  static char symbol_suffix_separator ();
-
   FILE* GTY ((skip)) ipa_clones_dump_file;
 
   hash_set <const cgraph_node *> GTY ((skip)) cloned_nodes;
diff --git a/gcc/toplev.c b/gcc/toplev.c
index d741a66..b85d52c 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1170,7 +1170,7 @@ general_init (const char *argv0, bool init_signals)
   /* Create the passes.  */
   g->set_passes (new gcc::pass_manager (g));
 
-  symtab = new (ggc_cleared_alloc <symbol_table> ()) symbol_table ();
+  symtab = new (ggc_alloc <symbol_table> ()) symbol_table ();
 
   statistics_early_init ();
   debuginfo_early_init ();
-- 
cgit v1.1


From 247afa98ba2512c7d90f3e9e05af41067ef756a3 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 10 Oct 2019 14:02:25 +0000
Subject: re PR middle-end/92046 (Command line options (that are per-functions)
 are affecting --params which are global.)

2019-10-10  Richard Biener  <rguenther@suse.de>

	PR middle-end/92046
	* opts.c (finish_options): Do not influence global --params
	from options that are adjustable per function.
	* tree-vect-data-refs.c (vect_enhance_data_refs_alignment):
	Apply --param adjustment based on active cost-model.
	* tree-ssa-phiopt.c (cond_if_else_store_replacement): Disable
	further store-sinking when vectorization or if-conversion
	are not enabled.

From-SVN: r276807
---
 gcc/ChangeLog             | 11 +++++++++++
 gcc/opts.c                | 18 ------------------
 gcc/tree-ssa-phiopt.c     |  6 +++++-
 gcc/tree-vect-data-refs.c | 23 ++++++++++++++---------
 4 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e97db14..e70eb1d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-10  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/92046
+	* opts.c (finish_options): Do not influence global --params
+	from options that are adjustable per function.
+	* tree-vect-data-refs.c (vect_enhance_data_refs_alignment):
+	Apply --param adjustment based on active cost-model.
+	* tree-ssa-phiopt.c (cond_if_else_store_replacement): Disable
+	further store-sinking when vectorization or if-conversion
+	are not enabled.
+
 2019-10-10  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR middle-end/92037
diff --git a/gcc/opts.c b/gcc/opts.c
index 2df0351..83d8a87 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1123,24 +1123,6 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
       && !opts_set->x_flag_reorder_functions)
     opts->x_flag_reorder_functions = 1;
 
-  /* Tune vectorization related parametees according to cost model.  */
-  if (opts->x_flag_vect_cost_model == VECT_COST_MODEL_CHEAP)
-    {
-      maybe_set_param_value (PARAM_VECT_MAX_VERSION_FOR_ALIAS_CHECKS,
-            6, opts->x_param_values, opts_set->x_param_values);
-      maybe_set_param_value (PARAM_VECT_MAX_VERSION_FOR_ALIGNMENT_CHECKS,
-            0, opts->x_param_values, opts_set->x_param_values);
-      maybe_set_param_value (PARAM_VECT_MAX_PEELING_FOR_ALIGNMENT,
-            0, opts->x_param_values, opts_set->x_param_values);
-    }
-
-  /* Set PARAM_MAX_STORES_TO_SINK to 0 if either vectorization or if-conversion
-     is disabled.  */
-  if ((!opts->x_flag_tree_loop_vectorize && !opts->x_flag_tree_slp_vectorize)
-       || !opts->x_flag_tree_loop_if_convert)
-    maybe_set_param_value (PARAM_MAX_STORES_TO_SINK, 0,
-                           opts->x_param_values, opts_set->x_param_values);
-
   /* The -gsplit-dwarf option requires -ggnu-pubnames.  */
   if (opts->x_dwarf_split_debug_info)
     opts->x_debug_generate_pub_sections = 2;
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index b64bde6..38bb8b2 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -2467,7 +2467,11 @@ cond_if_else_store_replacement (basic_block then_bb, basic_block else_bb,
 						 then_assign, else_assign);
     }
 
-  if (MAX_STORES_TO_SINK == 0)
+  /* If either vectorization or if-conversion is disabled then do
+     not sink any stores.  */
+  if (MAX_STORES_TO_SINK == 0
+      || (!flag_tree_loop_vectorize && !flag_tree_slp_vectorize)
+      || !flag_tree_loop_if_convert)
     return false;
 
   /* Find data references.  */
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 6390b19..e2baeb0 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -2075,6 +2075,8 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo)
         {
           unsigned max_allowed_peel
             = PARAM_VALUE (PARAM_VECT_MAX_PEELING_FOR_ALIGNMENT);
+	  if (flag_vect_cost_model == VECT_COST_MODEL_CHEAP)
+	    max_allowed_peel = 0;
           if (max_allowed_peel != (unsigned)-1)
             {
               unsigned max_peel = npeel;
@@ -2168,15 +2170,16 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo)
   /* (2) Versioning to force alignment.  */
 
   /* Try versioning if:
-     1) optimize loop for speed
+     1) optimize loop for speed and the cost-model is not cheap
      2) there is at least one unsupported misaligned data ref with an unknown
         misalignment, and
      3) all misaligned data refs with a known misalignment are supported, and
      4) the number of runtime alignment checks is within reason.  */
 
-  do_versioning =
-	optimize_loop_nest_for_speed_p (loop)
-	&& (!loop->inner); /* FORNOW */
+  do_versioning
+    = (optimize_loop_nest_for_speed_p (loop)
+       && !loop->inner /* FORNOW */
+       && flag_vect_cost_model > VECT_COST_MODEL_CHEAP);
 
   if (do_versioning)
     {
@@ -3641,13 +3644,15 @@ vect_prune_runtime_alias_test_list (loop_vec_info loop_vinfo)
     dump_printf_loc (MSG_NOTE, vect_location,
 		     "improved number of alias checks from %d to %d\n",
 		     may_alias_ddrs.length (), count);
-  if ((int) count > PARAM_VALUE (PARAM_VECT_MAX_VERSION_FOR_ALIAS_CHECKS))
+  unsigned limit = PARAM_VALUE (PARAM_VECT_MAX_VERSION_FOR_ALIAS_CHECKS);
+  if (flag_simd_cost_model == VECT_COST_MODEL_CHEAP)
+    limit = default_param_value
+	      (PARAM_VECT_MAX_VERSION_FOR_ALIAS_CHECKS) * 6 / 10;
+  if (count > limit)
     return opt_result::failure_at
       (vect_location,
-       "number of versioning for alias "
-       "run-time tests exceeds %d "
-       "(--param vect-max-version-for-alias-checks)\n",
-       PARAM_VALUE (PARAM_VECT_MAX_VERSION_FOR_ALIAS_CHECKS));
+       "number of versioning for alias run-time tests exceeds %d "
+       "(--param vect-max-version-for-alias-checks)\n", limit);
 
   return opt_result::success ();
 }
-- 
cgit v1.1


From 73dc68b9226a262bd193fb15592d378dd9768822 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Thu, 10 Oct 2019 14:37:36 +0000
Subject: Make comp_ptr_ttypes_real return bool.

comp_ptr_ttypes_real could use bool instead of int since it only returns
0 or 1.

	* typeck.c (comp_ptr_ttypes_real): Change the return type to bool.
	Use false instead of 0.

From-SVN: r276808
---
 gcc/cp/ChangeLog |  5 +++++
 gcc/cp/typeck.c  | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9ed7311..2e3b7f7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  Marek Polacek  <polacek@redhat.com>
+
+	* typeck.c (comp_ptr_ttypes_real): Change the return type to bool.
+	Use false instead of 0.
+
 2019-10-10  Jakub Jelinek  <jakub@redhat.com>
 
 	* parser.h (struct cp_omp_declare_simd_data): Add variant_p member.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index a67dd4b..38664ec 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -52,7 +52,7 @@ static tree cp_pointer_int_sum (location_t, enum tree_code, tree, tree,
 				tsubst_flags_t);
 static tree rationalize_conditional_expr (enum tree_code, tree, 
 					  tsubst_flags_t);
-static int comp_ptr_ttypes_real (tree, tree, int);
+static bool comp_ptr_ttypes_real (tree, tree, int);
 static bool comp_except_types (tree, tree, bool);
 static bool comp_array_types (const_tree, const_tree, compare_bounds_t, bool);
 static tree pointer_diff (location_t, tree, tree, tree, tsubst_flags_t, tree *);
@@ -9903,7 +9903,7 @@ check_return_expr (tree retval, bool *no_warning)
    If CONSTP is positive, then all outer pointers have been
    const-qualified.  */
 
-static int
+static bool
 comp_ptr_ttypes_real (tree to, tree from, int constp)
 {
   bool to_more_cv_qualified = false;
@@ -9912,12 +9912,12 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
   for (; ; to = TREE_TYPE (to), from = TREE_TYPE (from))
     {
       if (TREE_CODE (to) != TREE_CODE (from))
-	return 0;
+	return false;
 
       if (TREE_CODE (from) == OFFSET_TYPE
 	  && !same_type_p (TYPE_OFFSET_BASETYPE (from),
 			   TYPE_OFFSET_BASETYPE (to)))
-	return 0;
+	return false;
 
       /* Const and volatile mean something different for function and
 	 array types, so the usual checks are not appropriate.  We'll
@@ -9925,12 +9925,12 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
       if (!FUNC_OR_METHOD_TYPE_P (to) && TREE_CODE (to) != ARRAY_TYPE)
 	{
 	  if (!at_least_as_qualified_p (to, from))
-	    return 0;
+	    return false;
 
 	  if (!at_least_as_qualified_p (from, to))
 	    {
 	      if (constp == 0)
-		return 0;
+		return false;
 	      to_more_cv_qualified = true;
 	    }
 
@@ -9946,7 +9946,7 @@ comp_ptr_ttypes_real (tree to, tree from, int constp)
 	 not match, then no conversion is possible.  */
       if (TREE_CODE (to) == ARRAY_TYPE
 	  && !comp_array_types (to, from, bounds_first, /*strict=*/false))
-	return 0;
+	return false;
 
       if (!TYPE_PTR_P (to)
 	  && !TYPE_PTRDATAMEM_P (to)
-- 
cgit v1.1


From f466596d31f5c1402787e6e32ae383ba369c8a95 Mon Sep 17 00:00:00 2001
From: Oleg Endo <olegendo@gcc.gnu.org>
Date: Thu, 10 Oct 2019 15:21:27 +0000
Subject: re PR target/88630 (Incorrect float negating together with convertion
 to int on ST-40)

gcc/
	PR target/88630
	* config/sh/sh.h (TARGET_FPU_SH4_300): New macro.
	* config/sh/sh.c (sh_option_override): Enable fsca and fsrra insns
	also for TARGET_FPU_SH4_300.
	(sh_emit_mode_set): Check for TARGET_FPU_SH4_300 instead of
	TARGET_SH4_300.
	* config/sh/sh.md (toggle_pr): Add TARGET_FPU_SH4_300 condition.
	(negsf2): Expand to either negsf2_fpscr or negsf2_no_fpscr.
	(*negsf2_i): Split into ...
	(negsf2_fpscr, negsf2_no_fpscr): ... these new patterns.
	(abssf2): Expand to either abssf2_fpsc or abssf2_no_fpsc.
	(**abssf2_i): Split into ...
	(abssf2_fpscr, abssf2_no_fpscr): ... these new patterns.
	(negdf2): Expand to either negdf2_fpscr or negdf2_no_fpscr.
	(*negdf2_i): Split into ...
	(negdf2_fpscr, negdf2_no_fpscr): ... these new patterns.
	(absdf2): Expand to either absdf2_fpscr or absdf2_no_fpsc.
	(**abssf2_i): Split into ...
	(absdf2_fpscr, absdf2_no_fpscr): ... these new patterns.

From-SVN: r276809
---
 gcc/ChangeLog       | 22 +++++++++++++
 gcc/config/sh/sh.c  |  8 +++--
 gcc/config/sh/sh.h  |  2 ++
 gcc/config/sh/sh.md | 90 +++++++++++++++++++++++++++++++++++++++++++++--------
 4 files changed, 106 insertions(+), 16 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e70eb1d..f78c4c8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+2019-10-10  Oleg Endo  <olegendo@gcc.gnu.org>
+
+	PR target/88630
+	* config/sh/sh.h (TARGET_FPU_SH4_300): New macro.
+	* config/sh/sh.c (sh_option_override): Enable fsca and fsrra insns
+	also for TARGET_FPU_SH4_300.
+	(sh_emit_mode_set): Check for TARGET_FPU_SH4_300 instead of
+	TARGET_SH4_300.
+	* config/sh/sh.md (toggle_pr): Add TARGET_FPU_SH4_300 condition.
+	(negsf2): Expand to either negsf2_fpscr or negsf2_no_fpscr.
+	(*negsf2_i): Split into ...
+	(negsf2_fpscr, negsf2_no_fpscr): ... these new patterns.
+	(abssf2): Expand to either abssf2_fpsc or abssf2_no_fpsc.
+	(**abssf2_i): Split into ...
+	(abssf2_fpscr, abssf2_no_fpscr): ... these new patterns.
+	(negdf2): Expand to either negdf2_fpscr or negdf2_no_fpscr.
+	(*negdf2_i): Split into ...
+	(negdf2_fpscr, negdf2_no_fpscr): ... these new patterns.
+	(absdf2): Expand to either absdf2_fpscr or absdf2_no_fpsc.
+	(**abssf2_i): Split into ...
+	(absdf2_fpscr, absdf2_no_fpscr): ... these new patterns.
+
 2019-10-10  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/92046
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index ffab94f..521bc09 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -958,11 +958,13 @@ sh_option_override (void)
   if (flag_unsafe_math_optimizations)
     {
       /* Enable fsca insn for SH4A if not otherwise specified by the user.  */
-      if (global_options_set.x_TARGET_FSCA == 0 && TARGET_SH4A_FP)
+      if (global_options_set.x_TARGET_FSCA == 0
+	  && (TARGET_SH4A_FP || TARGET_FPU_SH4_300))
 	TARGET_FSCA = 1;
 
       /* Enable fsrra insn for SH4A if not otherwise specified by the user.  */
-      if (global_options_set.x_TARGET_FSRRA == 0 && TARGET_SH4A_FP)
+      if (global_options_set.x_TARGET_FSRRA == 0
+	  && (TARGET_SH4A_FP || TARGET_FPU_SH4_300))
 	TARGET_FSRRA = 1;
     }
 
@@ -12490,7 +12492,7 @@ static void
 sh_emit_mode_set (int entity ATTRIBUTE_UNUSED, int mode,
 		  int prev_mode, HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
 {
-  if ((TARGET_SH4A_FP || TARGET_SH4_300)
+  if ((TARGET_SH4A_FP || TARGET_FPU_SH4_300)
       && prev_mode != FP_MODE_NONE && prev_mode != mode)
     {
       emit_insn (gen_toggle_pr ());
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 3e38488..cacc674 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -69,6 +69,8 @@ extern int code_for_indirect_jump_scratch;
    FPU is disabled (which makes it compatible with SH4al-dsp).  */
 #define TARGET_SH4A_FP (TARGET_SH4A && TARGET_FPU_ANY)
 
+/* True if the FPU is a SH4-300 variant.  */
+#define TARGET_FPU_SH4_300 (TARGET_FPU_ANY && TARGET_SH4_300)
 
 /* This is not used by the SH2E calling convention  */
 #define TARGET_VARARGS_PRETEND_ARGS(FUN_DECL) \
diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index ed70e34..e687cf2 100644
--- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md
@@ -9163,7 +9163,7 @@
 	(xor:SI (reg:SI FPSCR_REG) (const_int FPSCR_PR)))
    (set (reg:SI FPSCR_MODES_REG)
 	(unspec_volatile:SI [(const_int 0)] UNSPECV_FPSCR_MODES))]
-  "TARGET_SH4A_FP"
+  "TARGET_SH4A_FP || TARGET_FPU_SH4_300"
   "fpchg"
   [(set_attr "type" "fpscr_toggle")])
 
@@ -9391,15 +9391,31 @@
 (define_expand "negsf2"
   [(set (match_operand:SF 0 "fp_arith_reg_operand")
 	(neg:SF (match_operand:SF 1 "fp_arith_reg_operand")))]
-  "TARGET_SH2E")
+  "TARGET_FPU_ANY"
+{
+  if (TARGET_FPU_SH4_300)
+    emit_insn (gen_negsf2_fpscr (operands[0], operands[1]));
+  else
+    emit_insn (gen_negsf2_no_fpscr (operands[0], operands[1]));
+  DONE;
+})
 
-(define_insn "*negsf2_i"
+(define_insn "negsf2_no_fpscr"
   [(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
 	(neg:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))]
-  "TARGET_SH2E"
+  "TARGET_FPU_ANY && !TARGET_FPU_SH4_300"
   "fneg	%0"
   [(set_attr "type" "fmove")])
 
+(define_insn "negsf2_fpscr"
+  [(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
+	(neg:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))
+   (use (reg:SI FPSCR_MODES_REG))]
+  "TARGET_FPU_SH4_300"
+  "fneg	%0"
+  [(set_attr "type" "fmove")
+   (set_attr "fp_mode" "single")])
+
 (define_expand "sqrtsf2"
   [(set (match_operand:SF 0 "fp_arith_reg_operand" "")
 	(sqrt:SF (match_operand:SF 1 "fp_arith_reg_operand" "")))]
@@ -9489,15 +9505,31 @@
 (define_expand "abssf2"
   [(set (match_operand:SF 0 "fp_arith_reg_operand")
 	(abs:SF (match_operand:SF 1 "fp_arith_reg_operand")))]
-  "TARGET_SH2E")
+  "TARGET_FPU_ANY"
+{
+  if (TARGET_FPU_SH4_300)
+    emit_insn (gen_abssf2_fpscr (operands[0], operands[1]));
+  else
+    emit_insn (gen_abssf2_no_fpscr (operands[0], operands[1]));
+  DONE;
+})
 
-(define_insn "*abssf2_i"
+(define_insn "abssf2_no_fpscr"
   [(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
 	(abs:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))]
-  "TARGET_SH2E"
+  "TARGET_FPU_ANY && !TARGET_FPU_SH4_300"
   "fabs	%0"
   [(set_attr "type" "fmove")])
 
+(define_insn "abssf2_fpscr"
+  [(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
+	(abs:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))
+   (use (reg:SI FPSCR_MODES_REG))]
+  "TARGET_FPU_SH4_300"
+  "fabs	%0"
+  [(set_attr "type" "fmove")
+   (set_attr "fp_mode" "single")])
+
 (define_expand "adddf3"
   [(set (match_operand:DF 0 "fp_arith_reg_operand" "")
 	(plus:DF (match_operand:DF 1 "fp_arith_reg_operand" "")
@@ -9673,12 +9705,28 @@
 (define_expand "negdf2"
   [(set (match_operand:DF 0 "fp_arith_reg_operand")
 	(neg:DF (match_operand:DF 1 "fp_arith_reg_operand")))]
-  "TARGET_FPU_DOUBLE")
+  "TARGET_FPU_DOUBLE"
+{
+  if (TARGET_FPU_SH4_300)
+    emit_insn (gen_negdf2_fpscr (operands[0], operands[1]));
+  else
+    emit_insn (gen_negdf2_no_fpscr (operands[0], operands[1]));
+  DONE;
+})
 
-(define_insn "*negdf2_i"
+(define_insn "negdf2_fpscr"
+  [(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
+	(neg:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))
+   (use (reg:SI FPSCR_MODES_REG))]
+  "TARGET_FPU_SH4_300"
+  "fneg	%0"
+  [(set_attr "type" "fmove")
+   (set_attr "fp_mode" "double")])
+
+(define_insn "negdf2_no_fpscr"
   [(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
 	(neg:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))]
-  "TARGET_FPU_DOUBLE"
+  "TARGET_FPU_DOUBLE && !TARGET_FPU_SH4_300"
   "fneg	%0"
   [(set_attr "type" "fmove")])
 
@@ -9704,15 +9752,31 @@
 (define_expand "absdf2"
   [(set (match_operand:DF 0 "fp_arith_reg_operand")
 	(abs:DF (match_operand:DF 1 "fp_arith_reg_operand")))]
-  "TARGET_FPU_DOUBLE")
+  "TARGET_FPU_DOUBLE"
+{
+  if (TARGET_FPU_SH4_300)
+    emit_insn (gen_absdf2_fpscr (operands[0], operands[1]));
+  else
+    emit_insn (gen_absdf2_no_fpscr (operands[0], operands[1]));
+  DONE;
+})
 
-(define_insn "*absdf2_i"
+(define_insn "absdf2_no_fpscr"
   [(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
 	(abs:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))]
-  "TARGET_FPU_DOUBLE"
+  "TARGET_FPU_DOUBLE && !TARGET_FPU_SH4_300"
   "fabs	%0"
   [(set_attr "type" "fmove")])
 
+(define_insn "absdf2_fpscr"
+  [(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
+	(abs:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))
+   (use (reg:SI FPSCR_MODES_REG))]
+  "TARGET_FPU_SH4_300"
+  "fabs	%0"
+  [(set_attr "type" "fmove")
+   (set_attr "fp_mode" "double")])
+
 (define_expand "extendsfdf2"
   [(set (match_operand:DF 0 "fp_arith_reg_operand" "")
 	(float_extend:DF (match_operand:SF 1 "fpul_operand" "")))]
-- 
cgit v1.1


From f4f50084ad13d00dc3c5e554ca6cbacafc34b758 Mon Sep 17 00:00:00 2001
From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 10 Oct 2019 15:22:38 +0000
Subject: [Ada] Use declared type for deciding on SPARK pointer rules

2019-10-10  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* sem_prag.adb (Analyze_Global_In_Decl_Part): Simplify previous
	test, just like in a recent commit we simplified a similar test
	for Depends contract.

From-SVN: r276810
---
 gcc/ada/ChangeLog    | 5444 +-------------------------------------------------
 gcc/ada/sem_prag.adb |    3 +-
 2 files changed, 5 insertions(+), 5442 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0463038..bb08e2d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5441 +1,5 @@
-2019-10-04  Joseph Myers  <joseph@codesourcery.com>
+2019-10-10  Piotr Trojanek  <trojanek@adacore.com>
 
-	* gcc-interface/utils.c (flag_isoc2x): New variable.
-
-2019-10-01  Maciej W. Rozycki  <macro@wdc.com>
-
-	* gcc-interface/Makefile.in (ADA_RTL_DSO_DIR): New variable.
-	(install-gnatlib): Use it in place of ADA_RTL_OBJ_DIR for shared 
-	library installation.
-
-2019-10-01  Maciej W. Rozycki  <macro@wdc.com>
-
-	* gcc-interface/Make-lang.in (ada.install-common): Split into...
-	(gnat-install-tools, gnat-install-lib): ... these.
-
-2019-09-26  Alexandre Oliva <oliva@adacore.com>
-
-	* gcc-interface/decl.c (components_to_record): Set
-	DECL_SIZE_UNIT for zero-sized fields.
-
-2019-09-26  Arnaud Charlet  <charlet@adacore.com>
-
-	* osint.adb (OS_Time_To_GNAT_Time): Remove dependency on To_C/To_Ada
-
-2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* libgnarl/s-osinte__solaris.ads (sysconf): Declare.
-	(SC_NPROCESSORS_ONLN): Define.
-	* libgnarl/s-tasinf__solaris.ads (Number_Of_Processors): Declare.
-	* libgnarl/s-tasinf__solaris.adb (N_CPU): New variable.
-	(Number_Of_Processors): New function.
-
-2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Regular_Loop_to_gnu): Do not rotate the loop
-	if -Og is enabled.
-	(build_return_expr): Do not perform NRV if -Og is enabled.
-	(Subprogram_Body_to_gnu): Likewise.
-	(gnat_to_gnu) <N_Simple_Return_Statement>: Likewise.
-	(Handled_Sequence_Of_Statements_to_gnu): Do not inline finalizers if
-	-Og is enabled.
-	* gcc-interface/utils.c (convert_to_index_type): Return early if -Og
-	is enabled.
-
-2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (gnat_compile_time_expr_list): New variable.
-	(Pragma_to_gnu): Rename local variable.  Save the (first) expression
-	of pragma Compile_Time_{Error|Warning} for later processing.
-	(Compilation_Unit_to_gnu): Process the expressions saved above.
-
-2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Attribute_to_gnu): Test Can_Use_Internal_Rep
-	on the underlying type of the node.
-	(Call_to_gnu): Likewise with the type of the prefix.
-
-2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (components_to_record): Do not reorder fields
-	in packed record types if they contain fixed-size fields that cannot
-	be laid out in a packed manner.
-
-2019-09-19  Tom Tromey  <tromey@adacore.com>
-
-	* gcc-interface/misc.c (gnat_get_type_bias): Return the bias
-	when -fgnat-encodings=gdb.
-
-2019-09-19  Steve Baird  <baird@adacore.com>
-
-	* sem_prag.adb (Preferred_String_Type): A new function. Given an
-	expression, determines whether the preference rules defined for
-	the third-and-later arguments of pragma Annotate suffice to
-	determine the type of the expression. If so, then the preferred
-	type is returned; if not then Empty is returned. Handles
-	concatenations.
-	(Analyze_Pragma): Replace previous code, which dealt only with
-	string literals, with calls to the new Preferred_String_Type
-	function, which also handles concatenations.
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Update
-	documentation for pragma Annotate.
-	* gnat_rm.texi: Regenerate.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_util.adb (Is_Possibly_Unaligned_Slice): Do not return true
-	on pure alignment considerations if the target does not require
-	the strict alignment of memory accesses.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch12.adb (Check_Private_View): Add a comment to indicate
-	future work.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_aggr.adb (Has_Mutable_Components): Look at the underlying
-	type of components to find out whether they are mutable.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch12.adb (Instantiate_Package_Body): Check that the body
-	has not already been instantiated when the body of the parent
-	was being loaded.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_util.adb (In_Instance): Test whether the current unit has
-	been analyzed instead of being on the scope stack to detect the
-	case of actuals of an instantiation of a generic child unit done
-	as a compilation unit.
-
-2019-09-19  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-socket.ads, libgnat/g-socket.adb
-	(Create_Socket_Pair): New routine.
-	* libgnat/g-socthi.ads (OS_Has_Socketpair): Boolean constant.
-	(C_Socketpair): New imported routine.
-	* libgnat/g-socthi__mingw.ads, libgnat/g-socthi__vxworks.ads
-	(Default_Socket_Pair_Family): New constant.
-	(C_Socketpair): New routine.
-	* libgnat/g-socthi__mingw.adb, libgnat/g-socthi__vxworks.adb
-	(C_Socketpair): Is separated in anouther file.
-	* libgnat/g-sthcso.adb (C_Socketpair): Non UNIX implementation.
-	* libgnat/g-stsifd__sockets.adb: Reuse C_Socketpair.
-
-2019-09-19  Yannick Moy  <moy@adacore.com>
-
-	* sem_prag.adb (Analyze_Depends_In_Decl_Part): Simplify previous
-	test.
-
-2019-09-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch7.adb (Install_Parent_Private_Declarations): If a
-	generic child unit is instantiated within a sibling child unit,
-	the analysis of its private part requires that the private part
-	of the ancestor be available, as is done when the context
-	includes an instance of the ancestor.
-
-2019-09-19  Yannick Moy  <moy@adacore.com>
-
-	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add special
-	case for traversal functions.
-
-2019-09-19  Yannick Moy  <moy@adacore.com>
-
-	* sem_prag.adb (Analyze_Global_In_Decl_Part): Do not issue an
-	error when a constant of an access type is used as output in a
-	Global contract.
-	(Analyze_Depends_In_Decl_Part): Do not issue an error when a
-	constant of an access type is used as output in a Depends
-	contract.
-
-2019-09-19  Arnaud Charlet  <charlet@adacore.com>
-
-	* exp_attr.adb: Remove obsolete comment.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch3.adb (Build_Derived_Access_Type): If this is an access-
-	to-subprogram type, copy Can_Use_Internal_Rep from the parent.
-
-2019-09-19  Yannick Moy  <moy@adacore.com>
-
-	* gcc-interface/Make-lang.in: Remove references to sem_spark.
-	* sem_spark.adb, sem_spark.ads: Remove unit.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_attr.adb (Is_Inline_Floating_Point_Attribute): Treat
-	Machine_Rounding as an alias for Rounding.
-	* sem_res.adb (Simplify_Type_Conversion): Likewise.
-
-2019-09-19  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_unst.adb (Unnest_Subprogram): Bypass the transformation of
-	up-level references unless Opt.Generate_C_Code is enabled.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch4.adb (Expand_Array_Equality): If optimization is
-	enabled, generate a simple conjunction of comparisons for the
-	specific case of constrained 1-dimensional 2-element arrays.
-	Fix formatting.
-
-2019-09-19  Piotr Trojanek  <trojanek@adacore.com>
-
-	* exp_dbug.ads, exp_dbug.adb (Get_Homonym_Number): Remove.
-	(Append_Homonym_Number): Use Homonym_Number instead of
-	Get_Homonym_Number.
-	* exp_util.ads, exp_util.adb (Homonym_Number): Mirror style of
-	the removed Get_Homonym_Number routine, i.e. initialize local
-	objects at declaration and refine the type of result.
-	* sem_util.adb (Add_Homonym_Suffix): Use Homonym_Number instead
-	of Get_Homonym_Number.
-
-2019-09-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): Simplify
-	handling of expressions in predicates when the context is a
-	generic unit.
-
-2019-09-19  Bob Duff  <duff@adacore.com>
-
-	* sem_attr.adb (Resolve_Attribute): Make sure the secondary
-	stack is properly managed in the case of a 'Range attribute in a
-	loop.
-
-2019-09-19  Raphael Amiard  <amiard@adacore.com>
-
-	* libgnat/a-cfhase.ads (Set): Add comments to public primitives.
-
-2019-09-19  Raphael Amiard  <amiard@adacore.com>
-
-	* libgnat/a-cbhama.ads, libgnat/a-cbhase.ads,
-	libgnat/a-chtgop.ads (Clear): Refine comments
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch12.adb (Restore_Private_Views): Comment out new code
-	that clear the Is_Generic_Actual_Type also on the full view.
-
-2019-09-19  Bob Duff  <duff@adacore.com>
-
-	* exp_ch3.adb (Rewrite_As_Renaming): Return False if there are
-	any aspect specifications, because otherwise Insert_Actions
-	blows up.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch6.adb (Add_Simple_Call_By_Copy_Code): Add
-	Bit_Packed_Array parameter and documet it. Always insert a copy
-	if it is set True.
-	(Expand_Actuals): Adjust the calls to
-	Add_Simple_Call_By_Copy_Code.
-
-2019-09-19  Bob Duff  <duff@adacore.com>
-
-	* xref_lib.adb (Get_Symbol_Name): If we reach EOF in the first
-	loop without finding the symbol, return "???". Otherwise, it's
-	an infinite loop.
-	(Parse_EOL): Assert that we're not already at EOF.  Remove
-	processing of LF/CR -- there are no operating systems that use
-	that.
-
-2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch6.adb (Is_Legal_Copy): Also return false for an aliased
-	formal and a formal passed by reference in convention Ada.  Add
-	missing guard to the existing test on Is_Valued_Procedure.
-
-2019-09-19  Bob Duff  <duff@adacore.com>
-
-	* rtsfind.ads (RTE_Available): Improve comment.
-
-2019-09-18  Bob Duff  <duff@adacore.com>
-
-	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Move call
-	to RTE_Available later, so it doesn't disturb the elab order.
-	The RE_Copy_Bitfield entity is defined in package
-	System.Bitfields which has a dependency on package
-	System.Bitfield_Utils, which has it its spec:
-	   pragma Elaborate_Body;
-	The query on RTE_Available forces loading and analyzing
-	System.Bitfields and all its withed units.
-
-2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.ads (Alignment_Warnings_Record): Add P component.
-	* checks.adb (Apply_Address_Clause_Check): Be prepared to kill
-	the warning also if the clause is of the form X'Address.
-	(Validate_Alignment_Check_Warning): Kill the warning if the
-	clause is of the form X'Address and the alignment of X is
-	compatible.
-
-2019-09-18  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_res.adb (Set_Mixed_Node_Expression): If a conditional
-	expression has universal_real alternaitves and the context is
-	Universal_Fixed, as when it is an operand in a fixed-point
-	multiplication or division, resolve the expression with a
-	visible fixed-point type, which must be unique.
-
-2019-09-18  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Constrain_Component_Type): For a discriminated
-	type, handle the case of a constraint given by a conversion of a
-	discriminant of the enclosing type. Necessary when compiling a
-	discriminated task for a restricted run-time, when the generated
-	Secondary_Stack component may be set by means of an aspect on
-	the task type.
-
-2019-09-18  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_aggr.adb (Expand_Record_Aggregate, Rewrite_Discriminant):
-	After rewriting a reference to an outer discriminant as a
-	selected component of the enclosing object, analyze the selected
-	component to ensure that the entity of the selector name is
-	properly set. This is necessary when the aggregate appears
-	within an expression that may have been analyzed already.
-
-2019-09-18  Justin Squirek  <squirek@adacore.com>
-
-	* sem_ch8.adb (Use_One_Type): Add guard to prevent warning on a
-	reundant use package clause where there is no previous
-	use_clause in the chain.
-
-2019-09-18  Justin Squirek  <squirek@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Type_Conversion): Add calculation of an
-	alternative operand for the purposes of generating accessibility
-	checks.
-
-2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_aggr.adb (Build_Array_Aggr_Code): In STEP 1 (c), duplicate
-	the expression and reset the Loop_Actions for each loop
-	generated for an others choice.
-
-2019-09-18  Justin Squirek  <squirek@adacore.com>
-
-	* einfo.adb, einfo.ads (Minimum_Accessibility): Added new field.
-	(Set_Minimum_Accessibility): Added to set new field.
-	(Minimum_Accessibility): Added to fetch new field.
-	* exp_ch6.adb (Expand_Subprogram_Call): Modify calls to fetch
-	accessibility levels to the new subprogram Get_Accessibility
-	which handles cases where minimum accessibility might be needed.
-	* sem_ch6.adb (Analyze_Subprogram_Body_Helper): Add section to
-	generate a Minimum_Accessibility object within relevant
-	subprograms.
-	* sem_util.adb, sem_util.ads (Dynamic_Accessibility_Level):
-	Additional documentation added and modify section to use new
-	function Get_Accessibility.
-	(Get_Accessibility): Added to centralize processing of
-	accessibility levels.
-
-2019-09-18  Steve Baird  <baird@adacore.com>
-
-	* sem_util.ads (Interval_Lists): A new visible package. This
-	package is visible because it is also intended for eventual use
-	in Sem_Eval.Subtypes_Statically_Compatible when that function is
-	someday upgraded to handle static predicates correctly.  This
-	new package doesn't really need to be visible for now, but it
-	still seems like a good idea.
-	* sem_util.adb (Gather_Components): Implement AI12-0086 via the
-	following strategy. The existing code knows how to take a static
-	discriminant value and identify the corresponding variant; in
-	the newly-permitted case of a non-static value of a static
-	subtype, we arbitrarily select a value of the subtype and find
-	the corresponding variant using the existing code. Subsequently,
-	we check that every other value of the discriminant's subtype
-	corresponds to the same variant; this is done using the newly
-	introduced Interval_Lists package.
-	(Interval_Lists): Provide a body for the new package.
-
-2019-09-18  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Op_Eq): The frontend assumes that we can
-	do a bit-for-bit comparison of two access to protected
-	subprogram pointers. However, there are two reasons why we may
-	not be able to do that: (1) there may be padding bits for
-	alignment before the access to subprogram, and (2) the access to
-	subprogram itself may not be compared bit-for- bit because the
-	activation record part is undefined: two pointers are equal iff
-	the subprogram addresses are equal. This patch fixes it by
-	forcing a field-by-field comparison.
-	* bindgen.adb (Gen_Adainit): The type No_Param_Proc is defined
-	in the library as having Favor_Top_Level, but when we create an
-	object of that type in the binder file we don't have that
-	pragma, so the types are different. This patch fixes this issue.
-	* libgnarl/s-interr.adb, libgnarl/s-interr__hwint.adb,
-	libgnarl/s-interr__sigaction.adb, libgnarl/s-interr__vxworks.adb
-	(Is_Registered): This routine erroneously assumes that the
-	access to protected subprogram is two addresses. We need to
-	create the same record that the compiler makes to ensure that
-	any padding is the same. Then we have to look at just the first
-	word of the access to subprogram. This patch fixes this issue.
-
-2019-09-18  Bob Duff  <duff@adacore.com>
-
-	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): The call
-	to Copy_Bitfield is now enabled.
-	(Expand_Assign_Array_Bitfield): Multiply 'Length times
-	'Component_Size "by hand" instead of using 'Size.
-
-2019-09-18  Vasiliy Fofanov  <fofanov@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Fix minor
-	formatting issue.
-
-2019-09-18  Javier Miranda  <miranda@adacore.com>
-
-	* exp_disp.adb (Make_DT, Make_Secondary_DT): Remove generation
-	of alignment representation clause for the following tables:
-	Predef_Prims, Iface_DT, TSD, ITable, DT.
-
-2019-09-18  Steve Baird  <baird@adacore.com>
-
-	* sem_eval.adb (Expr_Value): Do not fail "the type of a null
-	literal must be an access type" assertion if errors have already
-	been posted on the given node.
-
-2019-09-18  Piotr Trojanek  <trojanek@adacore.com>
-
-	* exp_dbug.ads, exp_dbug.adb (Get_Homonym_Number): Refine type
-	from Nat to Pos.
-	* sem_util.adb (Add_Homonym_Suffix): Refine type of a local
-	variable.
-
-2019-09-18  Yannick Moy  <moy@adacore.com>
-
-	* exp_dbug.adb (Append_Homonym_Number): Use new function
-	Get_Homonym_Number.
-	(Get_Homonym_Number): New function to return the homonym number.
-	(Qualify_Entity_Name): Remove special case for GNATprove.
-	* exp_dbug.ads (Get_Homonym_Number): Make the new function
-	public for use in GNATprove.
-	* frontend.adb (Frontend): Do not qualify names in GNATprove
-	mode.
-	* sem_util.adb (Unique_Name): Append homonym suffix where needed
-	for entities which have local homonyms in the same scope.
-
-2019-09-18  Nicolas Roche  <roche@adacore.com>
-
-	* libgnat/s-valrea.adb (Scan_Integral_Digits): New procedure.
-	(Scan_Decimal_Digits): New procedure.
-	(As_Digit): New function.
-	(Scan_Real): Use Scan_Integral_Digits and Scan_Decimal_Digits.
-
-2019-09-18  Claire Dross  <dross@adacore.com>
-
-	* exp_attr.adb (Expand_N_Attribute_Reference): Call routine from
-	Exp_Util to know the value of the Constrained attribute in the
-	static case.
-	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Make
-	implicit dereferences inside the Constrained attribute explicit.
-	* exp_util.ads, exp_util.adb
-	(Attribute_Constrained_Static_Value): New routine to compute the
-	value of a statically known reference to the Constrained
-	attribute.
-
-2019-09-18  Vadim Godunko  <godunko@adacore.com>
-
-	* libgnat/g-expect.adb (Expect_Internal): Don't include invalid
-	file descriptors into the set of file descriptors for Poll.
-	Raise Process_Died exception when computed set of file
-	descriptors to monitor is empty.
-
-2019-09-18  Frederic Konrad  <konrad@adacore.com>
-
-	* adaint.c: Include dosFsLib.h and vwModNum.h for VxWorks 6.
-	(__gnat_rename): Map S_dosFsLib_FILE_NOT_FOUND to ENOENT.
-
-2019-09-18  Steve Baird  <baird@adacore.com>
-
-	* freeze.adb (Freeze_Object_Declaration): Do not call
-	Check_Large_Modular_Array when the object declaration being
-	frozen is an ignored ghost entity.
-
-2019-09-18  Tom Tromey  <tromey@adacore.com>
-
-	* make.adb (Initialize): Fix typo.
-
-2019-09-18  Olivier Hainque  <hainque@adacore.com>
-
-	* libgnat/s-win32.ads (DWORD_PTR): New type, pointer size
-	unsigned int.
-	(SYSTEM_INFO): Use it for dwActiveProcessorMask.
-
-2019-09-18  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Improve doc on
-	Warning_As_Error.
-	* gnat_rm.texi: Regenerate.
-
-2019-09-18  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_characteristics.rst,
-	doc/gnat_rm/implementation_defined_pragmas.rst,
-	doc/gnat_rm/implementation_of_specific_ada_features.rst: Remove
-	remaining references to VMS support
-	* gnat_rm.texi: Regenerate.
-
-2019-09-18  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnat/s-stausa.adb: Fix a typo
-
-2019-09-18  Bob Duff  <duff@adacore.com>
-
-	* libgnat/a-cbhama.adb, libgnat/a-cbhase.adb,
-	libgnat/a-cbmutr.adb, libgnat/a-cborma.adb,
-	libgnat/a-cborse.adb, libgnat/a-cobove.adb (Copy): Avoid reading
-	the uninitialized variable C in the Checks = False case. Change
-	variable to be a constant.
-
-2019-09-18  Claire Dross  <dross@adacore.com>
-
-	* libgnat/a-cofuma.adb (Remove, Elements_Equal_Except,
-	Keys_Included, Keys_Included_Except): Rename loop indexes and
-	global constants from I to J.
-
-2019-09-18  Arnaud Charlet  <charlet@adacore.com>
-
-	* exp_unst.adb (Unnest_Subprograms): Refine previous change.
-
-2019-09-17  Claire Dross  <dross@adacore.com>
-
-	* libgnat/a-cofuma.ads, libgnat/a-cofuma.adb (Remove): New
-	function which returns a copy of the input container without a
-	given mapping.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* libgnat/s-arit64.adb (Double_Divide): Correctly handle the
-	special case when rounding.
-
-2019-09-17  Javier Miranda  <miranda@adacore.com>
-
-	* sem_ch3.adb (Complete_Private_Subtype): Propagate attributes
-	Has_Attributes and Predicate_Function to the cloned subtype.
-
-2019-09-17  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem.adb (Do_Analyze): Save Style_Check_Max_Line_Length on
-	entry and restore it on exit instead of recomputing it.
-
-2019-09-17  Tom Tromey  <tromey@adacore.com>
-
-	* exp_dbug.ads: Update character type comment.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* libgnat/s-arit64.adb (Double_Divide): Simplify needlessly
-	complex computation. Fix comments.
-	(Scaled_Divide): Fix comments. Explain why implementation does
-	not suffer from bugs in Algorithm D from 2nd Edition of TAOCP.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* libgnat/s-arit64.adb (Scaled_Divide): Add protection against
-	undesirable wrap-around.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* libgnat/s-arit64.adb (Double_Divide): Fix two possible
-	overflows.
-
-2019-09-17  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* make_util.ads (On_Windows): Move...
-	* osint.ads (On_Windows): There.
-	* osint.adb (OS_Time_To_GNAT_Time): If odd incremented on
-	Windows before conversion to Time_Stamp_Type.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Check_Declaration): Do not check the assignment
-	from an illegal declaration.
-
-2019-09-17  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_and_program_execution.rst: Clarify
-	documentation.
-	* gnat_ugn.texi: Regenerate.
-	* libgnat/s-stausa.ads: Clarify comments.
-
-2019-09-17  Steve Baird  <baird@adacore.com>
-
-	* sem_util.adb (Wrong_Type): In deciding to suppress a message,
-	it is not enough for In_Instance to be True; in addition,
-	In_Generic_Actual (Expr) must be False.
-	* sem_type.adb (In_Generic_Actual): Fix bug where traversal of
-	parents skips every other node.
-
-2019-09-17  Claire Dross  <dross@adacore.com>
-
-	* sem_spark.adb (Get_Observed_Or_Borrowed_Expr): If the
-	definition of a local borrower contains calls to traversal
-	functions, the borrowed expression is the first parameter of the
-	first traversal function call in the definition.
-
-2019-09-17  Ed Falis  <falis@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Remove
-	section.
-	* gnat_rm.texi, gnat_ugn.texi: Regenerate.
-
-2019-09-17  Vadim Godunko  <godunko@adacore.com>
-
-	* libgnat/g-exptty.ads (Close_Input): New subprogram.
-	* libgnat/g-exptty.adb (Close_Input): New subprogram.
-	(Close): Move close of TTY to Close_Input.
-	* terminals.c (__gnat_close_tty): Set file descriptors to
-	invalid value after close.
-
-2019-09-17  Vadim Godunko  <godunko@adacore.com>
-
-	* libgnat/g-expect.adb (Expect_Internal): Try to call 'poll' few
-	times.
-
-2019-09-17  Vadim Godunko  <godunko@adacore.com>
-
-	* libgnat/g-expect.ads, libgnat/g-expect.adb (Close_Input): New
-	subprogram.
-	(Get_Command_Output): Call Close_Input to close input stream.
-	(Expect_Internal): Likewise.
-	(Close): Likewise.
-	* libgnat/g-exptty.adb (Close): Likewise.
-
-2019-09-17  Piotr Trojanek  <trojanek@adacore.com>
-
-	* sem_util.ads, sem_util.adb (Is_Attribute_Old): New utility
-	routine.
-
-2019-09-17  Yannick Moy  <moy@adacore.com>
-
-	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add handling
-	for dispatching operations.
-
-2019-09-17  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): In a
-	generic context, for a Predicate aspect, use
-	Preanalyze_Spec_Expression to verify conformance.
-
-2019-09-17  Javier Miranda  <miranda@adacore.com>
-
-	* sem_ch3.adb (Constrain_Corresponding_Record): Propagate
-	attribute Is_Tagged_Type.
-
-2019-09-17  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch3.adb (Build_Record_Init_Proc): Do not generate code to
-	adjust the tag component when the record is initialized with a
-	raise expression.
-	* sem_aggr.adb (Valid_Limited_Ancestor): Return True for
-	N_Raise_Expression nodes.
-	(Valid_Ancestor_Type): Return True for raise expressions.
-	* sem_ch3.adb (Analyze_Component_Declaration): Do not report an
-	error when a component is initialized with a raise expression.
-	* sem_ch4.adb (Analyze_Qualified_Expression): Do not report an
-	error when the aggregate has a raise expression.
-
-2019-09-17  Piotr Trojanek  <trojanek@adacore.com>
-
-	* ali.ads: Fix casing in comment.
-	* ali-util.ads, ali-util.adb (Read_Withed_ALIs): Remove
-	Ignore_Errors parameter; it was only set to non-default value of
-	True when running in GNATprove_Mode and wrongly reset to False
-	when calling this routine recursively. Now in GNATprove mode we
-	want it to be always True, so in fact it is equivalent to
-	GNATProve_Mode flag itself (which was already used in this
-	routine).
-
-2019-09-17  Arnaud Charlet  <charlet@adacore.com>
-
-	* adaint.c (_REENTRANT, _THREAD_SAFE): Only define if needed.
-
-2019-09-17  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnat/s-bitfie.ads (Val_Bits, Val_Bytes): Define from
-	Long_Long_Integer'Size.
-
-2019-09-17  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch6.ads (Needs_BIP_Task_Actuals): New subprogram.
-	* exp_ch6.adb (Add_Task_Actuals_To_Build_In_Place_Call): Code
-	cleanup.
-	(Check_Number_Of_Actuals): New subprogram.
-	(Make_Build_In_Place_Call_In_Allocator): Adding assertion.
-	(Make_Build_In_Place_Call_In_Anonymous_Context): Adding
-	assertion.
-	(Make_Build_In_Place_Call_In_Assignment): Adding assertion.
-	(Make_Build_In_Place_Call_In_Object_Declaration): Code cleanup
-	plus assertion addition.
-	(Needs_BIP_Task_Actuals): New subprogram.
-	* sem_ch6.adb (Create_Extra_Formals): Rely on
-	Needs_BIP_Task_Actuals() to check if the master of the tasks to
-	be created, and the caller's activation chain formals are
-	needed.
-
-2019-09-17  Bob Duff  <duff@adacore.com>
-
-	* libgnat/s-bituti.adb (Get_Val_2, Set_Val_2): Use new routines
-	for getting and setting a Val_2, avoiding touching the second
-	half when that half might not exist.
-	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Correct
-	tests for potential volatile or independent components. In
-	particular, do not call Prefix unless we know it's a slice.
-
-2019-09-17  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* gsocket.h: Include sys/un.h.
-	* s-oscons-tmplt.c (AF_UNIX): New constant generation.
-	(SIZEOF_sockaddr_un): Idem.
-	* libgnat/g-socket.ads (Family_Type): New value Family_Unix
-	added.
-	(Family_Inet_4_6): New subtype only for network families.
-	(Sock_Addr_Type): Add Unbounded_String field for Family_Unix
-	variant.
-	(Unix_Socket_Address): Create Sock_Addr_Type from socket
-	pathname.
-	(Network_Socket_Address): Create Sock_Addr_Type from
-	Inet_Addr_Type and Port_Type parameters.
-	* libgnat/g-socket.adb: Support local unix address in socket
-	routines.
-	(Get_Address_Info): Disable warning about Result may be
-	referenced before it has a value. Remove duplicated code to exit
-	from Look_For_Supported.
-	* libgnat/g-sothco.ads (Unix_Name_Length): New constant defining
-	maximum number of characters in local socket address path.
-	(Sockaddr): Add variant for Family_Unix address family. Move
-	Sin_Port and Sin_Family to Family_Inet section. Add Sin6_Port
-	and Sin6_Family to Family_Inet6 section.
-	(Set_Address): Add out parameter Length to return valuable
-	Sockaddr data length.
-	(Get_Address): Add input parameter Length to set valuable
-	Sockaddr data length.
-	* libgnat/g-sothco.adb: Support local unix address in socket
-	routines.
-
-2019-09-17  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_attr.adb (Expand_Size_Attribute): Chain the special cases
-	on the back-end path and rewrite the attribute appled to slices
-	of bit-packed arrays into the product of the Length and the
-	Compoent_Size attributes of the slices.
-	* exp_ch5.adb (Expand_Assign_Array_Bitfield): Use Size attribute
-	directly to compute the bitfield's size.
-
-2019-09-17  Bob Duff  <duff@adacore.com>
-
-	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Add tests
-	for potential volatile or independent components.
-	* libgnat/s-bituti.adb (Copy_Small_Bitfield,
-	Copy_Large_Bitfield): Move declarations to more appropriate
-	place.
-
-2019-09-13  Maciej W. Rozycki  <macro@wdc.com>
-
-	* make.adb (Scan_Make_Arg): Also accept `--sysroot=' for the 
-	compiler and the linker.
- 
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (maybe_saturate_size): New function.
-	(gnat_to_gnu_entity): Invoke it on the Esize of types before sending
-	it for back-annotations.
-	* gcc-interface/trans.c: Fix typo.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/ada-tree.h (DECL_FORCED_BY_REF_P): New macro.
-	* gcc-interface/decl.c (gnat_to_gnu_param): Set it on parameters
-	whose mechanism was forced to by-reference.
-	* gcc-interface/trans.c (Call_to_gnu): Do not issue a warning about a
-	misaligned actual parameter if it is based on a CONSTRUCTOR.  Remove
- 	obsolete warning for users of Starlet.  Issue a warning if a temporary
-	is make around the call for a parameter with DECL_FORCED_BY_REF_P set.
-	(addressable_p): Return true for REAL_CST and ADDR_EXPR.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (gnat_to_gnu): Do not set the location on an
-	expression used for a tag.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/gigi.h (aggregate_type_contains_array_p): Declare.
-	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: For an
-	extension, test Has_Record_Rep_Clause instead of Has_Specified_Layout.
-	(adjust_packed): Return 0 if the type of the field is an aggregate
-	type that contains (or is) a self-referential array.
-	(type_has_variable_size): Delete.
-	* gcc-interface/utils.c (inish_record_type): Constify a variable.
-	(aggregate_type_contains_array_p): Add parameter SELF_REFERENTIAL.
-	<RECORD_TYPE>: Pass it in the recursive call.
-	<ARRAY_TYPE>: If it is true, return true only if the array type is
-	self-referential.
-	(create_field_decl): Streamline the setting of the alignment on the
-	field.  Pass false to aggregate_type_contains_array_p.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (lvalue_required_p) <N_Slice>: Adjust GNU_TYPE
-	in the recursive call.
-	<N_Selected_Component>: Likewise.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/utils.c (build_template): Deal with parameters
-	passed by pointer to component of multi-dimensional arrays.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (annotate_value) <CALL_EXPR>: Inline the call
-	also if List_Representation_Info is greater than 3.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Attribute_to_gnu) <Attr_Size>: Add assertion.
-
-2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/gigi.h (gigi_checking_assert): New macro.
-	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Modular_Integer_Type>:
-	Remove redundant test and adjust comments.  Minor tweaks.
-	* gcc-interface/trans.c (Call_to_gnu): Do not generate range checks,
-	instead assert that the Do_Range_Check flag is not set.  Adjust call
-	to convert_with_check.
-	(gnat_to_gnu): Likewise.
-	(assoc_to_constructor): Likewise.
-	(pos_to_constructor): Likewise.  Remove GNAT_COMPONENT_TYPE parameter.
-	(emit_range_check): Delete.
-	(convert_with_check): Remove RANGE_P parameter and adjust.  Do a single
-	overflow check for modular types.
-
-2019-08-23  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/91283
-	* gcc-interface/misc.c (gnat_post_options): Set flag_excess_precision
-	instead of flag_excess_precision_cmdline.
-
-2019-08-21  Vadim Godunko  <godunko@adacore.com>
-
-	* libgnat/g-expect.adb (Expect_Internal): Attempt to read
-	several times when 'read' returns non-positive.
-
-2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
-
-	* einfo.adb (Is_Discriminal): Remove extra parens.
-	(Is_Constant_Object): Simplify by reusing Ekind_In.
-	(Is_Prival): Remove extra parens.
-	* checks.adb, exp_ch4.adb, sem_ch3.adb, sem_spark.adb: Minor
-	reformattings.
-
-2019-08-21  Claire Dross  <dross@adacore.com>
-
-	* libgnat/a-cofove.ads (Vector): Add an Iterable aspect to allow
-	iteration.
-	(Iter_First, Iter_Next): Primitives used for iteration.
-
-2019-08-21  Yannick Moy  <moy@adacore.com>
-
-	* sem_ch3.adb (Analyze_Subtype_Declaration): Inherit RM_Size
-	field for formal type parameters in generic instantiations.
-
-2019-08-21  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb: Update references to the SPARK RM.
-
-2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Array_Info): In -gnatR4 mode, set the
-	relevant flag on the component type here instead of...
-	(List_Object_Info): Likewise for the object type.
-	(List_Entities): ...here.  In -gnatR4 mode, recurse into
-	entities local to a record type.
-	(List_Component_Layout): In -gnatR4 mode, mark the type as
-	relevant.
-
-2019-08-21  Bob Duff  <duff@adacore.com>
-
-	* Makefile.rtl (GNATRTL_NONTASKING_OBJS): Add s-bitutil.o and
-	s-biutin.o.
-	* exp_ch5.adb (Expand_Assign_Array_Bitfield): New function to
-	generate a call to Copy_Bitfield. This is disabled for now.
-	(Expand_Assign_Array_Loop_Or_Bitfield): New function to decide
-	whether to call Expand_Assign_Array_Bitfield.
-	(Expand_Assign_Array): Call Expand_Assign_Array_Loop_Or_Bitfield
-	instead of Expand_Assign_Array_Loop.
-	* libgnat/s-bitfie.ads, libgnat/s-bituti.adb,
-	libgnat/s-bituti.ads: New units.
-	* rtsfind.ads: Add enum literals for accessing Copy_Bitfield.
-
-2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
-
-	* bindo-graphs.ads (Iterate_Edges_To_Successors): Fix typo in
-	pragma Inline.
-	* bindo-graphs.adb (Delete_Edge): Fix layout in parameter list.
-
-2019-08-21  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_ch3.adb (Build_Master): Suppress call to
-	Build_Class_Wide_Master in the case where the
-	access-to-limited-class-wide type was created for a component in
-	an entry's formal parameter
-	block (Is_Parameter_Block_Component_Type), to prevent a master
-	from being created for such access types generated by the front
-	end in a task spec for entry formals in a parameter block.  Add
-	a ??? about whether this suppression should be done more
-	generally (such as by using Comes_From_Source).
-
-2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch6.adb (Expand_N_Extended_Return_Statement): In the case
-	of a built-in-place function that doesn't need a BIP_Alloc_Form
-	parameter but returns unconstrained, build the return
-	consistently using the function's result subtype.  Remove bypass
-	added in previous change.
-
-2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
-
-	* sem_prag.adb (Max_Entry_Queue_Length): Do not substitute
-	expression of the pragma argument with its value during
-	analysis.
-	* sem_util.adb (Get_Max_Queue_Length): Compute value of the
-	pragma argument when needed.
-
-2019-08-21  Yannick Moy  <moy@adacore.com>
-
-	* checks.adb (Install_Null_Excluding_Check): Do not install
-	check in GNATprove mode.
-
-2019-08-21  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Process_Path): Do nothing on address of
-	subprogram.
-
-2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_util.adb (Finalize_Address): Deal consistently with
-	subtypes of private protected types.
-
-2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
-
-	* exp_util.adb (Corresponding_Runtime_Package): Use high-level
-	Is_Protected_Type.
-	* sem_ch8.adb (Analyze_Renamed_Entry): Likewise.
-	* sem_ch9.adb (Analyze_Requeue): Likewise.
-
-2019-08-21  Javier Miranda  <miranda@adacore.com>
-
-	* sem_util.adb (Update_Named_Associations): Update
-	First_Named_Actual when the subprogram call has a single named
-	actual.
-
-2019-08-21  Joel Brobecker  <brobecker@adacore.com>
-
-	* doc/Makefile (mk_empty_dirs): New (PHONY) rule.
-	(%.html, %.pdf, %.txt, %.info, %.texinfo): Add dependencies on
-	mk_empty_dirs.
-
-2019-08-21  Justin Squirek  <squirek@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Modify
-	documentation to reflect expected behavior.
-	* gnat_rm.texi: Regenerate.
-	* sem_prag.adb (Analyze_Pragma): Modify handling of pragma
-	Max_Entry_Queue_Length to not reject integer values of negative
-	one.
-	* sem_util.adb (Get_Max_Queue_Length): Add processing for values
-	of negative one to fit within the current scheme.
-
-2019-08-20  Arnaud Charlet  <charlet@adacore.com>
-
-	* exp_unst.adb (Unnest_Subprograms, Unnest_Subprogram): Take
-	inlining (-gnatn) into account.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch13.adb (Expand_N_Attribute_Definition_Clause, case
-	Storage_Size): If the expression for Storage_Size is not static
-	it may depend on characterstics of another type that may bot be
-	frozen yet, so the elaboration of the expression for the aspect
-	must be attached directly to the freeze actions of the type to
-	which it applies.
-
-2019-08-20  Piotr Trojanek  <trojanek@adacore.com>
-
-	* exp_util.adb (Build_DIC_Procedure_Declaration): Set the last
-	entity of the generated Default_Initial_Condition procedure in
-	order to construct a proper entity chain.
-
-2019-08-20  Yannick Moy  <moy@adacore.com>
-
-	* exp_spark.adb (Expand_SPARK_N_Slice_Or_Indexed_Component):
-	Renaming of function to apply to slices as well.
-	(Expand_SPARK): Expand prefix of slices of access type.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* exp_aggr.adb (Expand_Array_Aggregate): Use build-in-place in
-	the nonlimited case in STEP 4. This improves the efficiency of
-	things like (1 .. 1000 => <>).  We still generate some code for
-	that, unfortunately, but it is much improved.
-	(Aggr_Assignment_OK_For_Backend): Return false if <> components
-	are present.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* exp_ch6.adb (Needs_BIP_Alloc_Form): Call
-	Requires_Transient_Scope rather than checking constrainedness
-	and so forth.  We have previously improved
-	Requires_Transient_Scope to return False in various cases,
-	notably a limited record with an access discriminant. This
-	change takes advantage of that to avoid using the secondary
-	stack for functions returning such types.
-	(Make_Build_In_Place_Call_In_Allocator): Be consistent by
-	calling Needs_BIP_Alloc_Form rather than Is_Constrained and so
-	forth.
-	* sem_ch4.adb (Analyze_Allocator): The above change causes the
-	compiler to generate code that is not legal Ada, in particular
-	an uninitialized allocator for indefinite subtype.  This is
-	harmless, so we suppress the error message in this case.
-
-2019-08-20  Gary Dismukes  <dismukes@adacore.com>
-
-	* ali.adb, ali.ads, aspects.adb, checks.ads, checks.adb,
-	doc/gnat_rm/implementation_defined_pragmas.rst,
-	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
-	einfo.ads, exp_aggr.adb, exp_ch11.adb, exp_ch3.ads, exp_ch4.adb,
-	exp_disp.adb, inline.adb, libgnat/a-locale.ads,
-	libgnat/s-soflin.ads, par_sco.adb, repinfo.adb, sem_ch5.adb,
-	sem_disp.adb, sem_elab.adb, sem_eval.adb, sem_spark.adb,
-	sem_spark.ads, sinfo.ads: Minor reformattings, typo fixes and
-	and rewordings.
-
-2019-08-20  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* adaint.c (__gnat_to_gm_time): On _WIN32, don't round time up
-	to even second.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Analyze_Object_Declaration): If actual type is
-	private and distinct from nominal type in declaration, propagate
-	flags Is_Constr_Subt_For_U_Nominal and _UN_Aliased to full view
-	of private type.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_attr.adb (Expand_Loop_Entry_Attribute): When expanding a
-	loop entry attribute for a while_loop we construct a function
-	that incorporates the expanded condition of the loop. The itypes
-	that may be generated in that expansion must carry the scope of
-	the constructed function for proper handling in gigi.
-
-2019-08-20  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_disp.adb (Build_Class_Wide_Check, Replace_Formals): When a
-	dispatching call tp a subprogram with a class-wide precondition
-	occurrs in the same declarative part as the ancestor subprogram
-	being called, the`expression for the precondition has not been
-	analyzed yet. Such a call may appear, e.g. in an expression
-	function. In that case, the replacement of formals by actuals in
-	the call cannot use the formal entities of the subprogram being
-	called, and the occurrence of the formals in the expression must
-	be located by name (Chars fields) as would be done at a later
-	freeze point, when the expression is resolved in the context of
-	the subprogram itself.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* sem_prag.adb (Persistent_BSS): If an initialization is present
-	because of Initialize_Scalars or Normalize_Scalars, generate an
-	implicit pragma Suppress_Initialization to remove that, because
-	initialization is not allowed for these variables. Other
-	initializations remain illegal.
-
-2019-08-20  Gary Dismukes  <dismukes@adacore.com>
-
-	* sem_ch3.adb (OK_For_Limited_Init_In_05): In the case of type
-	conversions, apply the recursive call to the Original_Node of
-	the expression Exp rather than the Expression of the
-	Original_Node, in the case where Exp has been rewritten;
-	otherwise, when Original_Node is the same as Exp, apply the
-	recursive call to the Expression.
-	(Check_Initialization): Revise condition for special check on
-	type conversions of limited function calls to test Original_Node
-	(avoiding spurious errors on expanded unchecked conversions
-	applied to build-in-place dispatching calls).
-
-2019-08-20  Patrick Bernardi  <bernardi@adacore.com>
-
-	* exp_aggr.adb (Expand_Record_Aggregate): Always convert a
-	record Aggregate to assignment statements if the option
-	Aggregate_Individually_Assign is set.
-	* opt.ads (Aggregate_Individually_Assign): New option.
-	* par-prag.adb (Prag): Add Pragma_Aggregate_Individually_Assign.
-	* sem_prag.adb (Analyze_Pragma): Likewise.
-	* snames.ads-tmpl: Add Pragma_Aggregate_Individually_Assign and
-	Name_Aggregate_Individually_Assign.
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Document
-	pragma Aggregate_Individually_Assign.
-	* gnat_rm.texi: Regenerate.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* par-ch4.adb: Minor wording change in error messages.
-	* sem_aggr.adb (Resolve_Delta_Aggregate): Emit an error for Ada
-	versions prior to Ada 2020.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* freeze.adb (Is_Atomic_VFA_Aggregate): Make the temp for
-	initialization of the atomic variable be constant. This is
-	cleaner, and might improve efficiency.
-
-2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Record_Info): In -gnatR4 mode, set the
-	relevant flag on the implicit base type of a record subtype.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* sem_eval.adb (Expr_Value): Implement the case of an unchecked
-	conversion of a static expression.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* sem_ch13.adb (Is_Null_Array): New function, used to detect the
-	null array case; used to warn about uncheckedly converting to a
-	zero-sized array.  It is unfortunate that we can't just check
-	the size, and warn on all cases of converting from a
-	nonzero-sized type to a zero-sized one. That's because "0" means
-	two different things: "size is zero" and "size is unknown".
-	Until we fix that design flaw, we need this more targeted fix.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* libgnat/a-cborma.adb, libgnat/a-cborse.adb (Clear): Repeatedly
-	call Delete. This avoids clearing the free list, which
-	substantially speeds up future Delete operations.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* sem_ch13.adb (Component_Order_Check): New procedure to check
-	for out-of-order clauses.
-	* warnsw.ads, warnsw.adb: New -gnatw_r switch.
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
-	Document new switch.
-	* gnat_ugn.texi: Regenerate.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* sem_ch13.adb (Object_Size): Give an error for zero. It really
-	rubs me the wrong way that we don't honor "for T'Object_Size use
-	0;", but it's not important enough to fix. In any case, if we're
-	not going to obey the clause, we should give an error.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* errout.adb (Error_Msg_Internal): Set Warn_Err in case of
-	Is_Style_Msg.
-	* erroutc.adb (Output_Msg_Text): Do Warnings_Treated_As_Errors
-	processing and [warning-as-error] modification for style
-	messages.  Clean up code, simplify, remove unnecessary block
-	statement, add renaming of table entry.
-	* erroutc.ads (Warning_Treated_As_Error): Fix comment: no such
-	thing as Set_Warning_As_Error.
-	* opt.ads: Clean up comments and move related declarations near
-	each other.
-	* par-prag.adb: Process Warning_As_Error. This is necessary
-	because many style warning happen during parsing.
-	* sem_prag.adb: Use new Acquire_Warning_Match_String.
-	* sem_util.ads, sem_util.adb (Acquire_Warning_Match_String): New
-	function shared by par-prag.adb and sem_prag.adb. Replaces the
-	procedure in sem_prag.adb. Avoid use of global variables.
-	* stringt.ads, stringt.adb (To_String): New function to convert
-	String_Id to String.
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Document the
-	new feature.
-	* gnat_rm.texi: Regenerate.
-
-2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* lib.ads: Add with clause for GNAT.HTable.
-	Add pragma Inline for Is_Loaded and alphabetize the list.
-	(Unit_Name_Table_Size): New constant.
-	(Unit_Name_Header_Num): New subtype.
-	(Unit_Name_Hash): New function declaration.
-	(Unit_Names): New simple hash table.
-	(Init_Unit_Name): New procedure declaration.
-	* lib.adb (Set_Unit_Name): Unregister the old name in the table,
-	if any, and then register the new name.
-	(Init_Unit_Name): New procedure.
-	(Is_Loaded): Reimplement using a lookup in the names table.
-	(Remove_Unit): Unregister the name.
-	(Unit_Name_Hash): New function.
-	* lib-load.adb (Create_Dummy_Package_Unit): Call Init_Unit_Name.
-	(Load_Unit): Use a lookup in the names table to find out whether
-	the unit has already been loaded.  Call Init_Unit_Name and then
-	Remove_Unit if the loading has failed.
-	(Make_Child_Decl_Unit): Call Init_Unit_Name.
-	(Make_Instance_Unit): Likewise.
-	* lib-writ.adb (Ensure_System_Dependency): Likewise.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* sem_ch13.adb (Record_Hole_Check): Initialize After_Last.
-
-2019-08-20  Piotr Trojanek  <trojanek@adacore.com>
-
-	* impunit.adb (Get_Kind_Of_Unit): Revert change for adapting
-	this routine for gnatprove.
-
-2019-08-20  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Document
-	requirements for Pragma Lock_Free.
-	* gnat_rm.texi: Regenerate.
-
-2019-08-20  Philippe Gil  <gil@adacore.com>
-
-	* bindgen.adb (Gen_Main): Set gnat_argc/gnat_argv to argc/argv
-	only when still uninitialized.
-
-2019-08-20  Bob Duff  <duff@adacore.com>
-
-	* libgnat/g-comlin.ads (Exit_From_Command_Line): Fix
-	documentation for GNAT.Command_Line.
-
-2019-08-20  Pierre-Marie de Rodat  <derodat@adacore.com>
-
-	PR ada/91492
-	* gcc-interface/lang.opt (-fdump-scos): Add missing dot at the
-	end of the documentation.
-
-2019-08-20  Richard Sandiford  <richard.sandiford@arm.com>
-
-	* gcc-interface/misc.c (default_pass_by_ref): Update call to
-	pass_by_reference.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_rm/implementation_advice.rst: Fix documentation for
-	stream oriented attributes.
-	* gnat_rm.texi: Regenerate.
-
-2019-08-19  Gary Dismukes  <dismukes@adacore.com>
-
-	* einfo.ads (E_Function, E_Procedure): Update comments to
-	reflect that Renamed_Entity is also used for nongeneric
-	subprograms.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_prag.adb (Is_Before_First_Decl): Deal with rewritten
-	pragmas.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* sem_warn.adb (Warn_On_Unreferenced_Entity): Suppress warning
-	on formal parameters of dispatching operations.
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_res.adb (Resolve_Call): A call to an expression function
-	freezes when expander is active, unless the call appears within
-	the body of another expression function,
-
-2019-08-19  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/s-os_lib.ads, libgnat/s-os_lib.adb (To_Ada, To_C): New
-	routines.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* exp_attr.adb (Attribute_Valid): Correct the handling of
-	private types where the full type is modular. System.Address is
-	an example. Otherwise, we convert uncheckedly to a signed type,
-	so we get an incorrect range 0 .. -1, for which all values will
-	fail.  The 'Valid attribute is illegal for such types, but we
-	generate such illegal attribute_references for 'Valid_Scalars,
-	and we generate 'Valid_Scalars when the -gnateV switch is used.
-	Rename Btyp --> PBtyp to avoid hiding the outer Btyp, which was
-	confusing.
-	* libgnat/a-except.adb: Set the Exception_Raised component.
-	Otherwise, we have incorrect reads of invalid data.
-
-2019-08-19  Pierre-Marie de Rodat  <derodat@adacore.com>
-
-	* libgnat/a-cgaaso.ads, libgnat/a-cgarso.ads,
-	libgnat/a-cogeso.ads, libgnat/a-contai.ads,
-	libgnat/a-locale.ads: Import documentation from the RM.
-
-2019-08-19  Jerome Guitton  <guitton@adacore.com>
-
-	* Makefile.rtl (system.o): New target to add generation of
-	target properties.
-	* gcc-interface/Makefile.in (install-gnatlib): Install
-	ada_target_properties.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.adb (Add_Inlined_Body): Do not special-case instances
-	that are compilation units.
-	(Add_Pending_Instantiation): Likewise.
-	(Instantiate_Body): Skip instantiations that are compilation
-	units and have already been performed.
-	* sem_ch12.adb (Needs_Body_Instantiated): Do not special-case
-	instances that are compilation units.
-	(Load_Parent_Of_Generic): Be prepared for parent that is a
-	compilation unit but whose instantiation node has not been
-	replaced.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.adb (Initialize, Lock): Deal with
-	Called_Pending_Instantiations.
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch6.adb (Check_Synchronized_Overriding): Complete
-	predicate that applies legality check in 9.4 (11.9/2): if an
-	inherited subprogram is implemented by a protected procedure or
-	entry, its first paarameter must be out, in_out or
-	access_to_varible.
-
-2019-08-19  Javier Miranda  <miranda@adacore.com>
-
-	PR ada/65696
-	* exp_atag.ads, exp_atag.adb (Build_Inherit_Predefined_Prims):
-	Adding formal to specify how many predefined primitives are
-	inherited from the parent type.
-	* exp_disp.adb (Number_Of_Predefined_Prims): New subprogram.
-	(Make_Secondary_DT): Compute the number of predefined primitives
-	of all tagged types (including tagged types not defined at
-	library level).  Previously we unconditionally relied on the
-	Max_Predef_Prims constant value when building the dispatch
-	tables of tagged types not defined at library level (thus
-	consuming more memory for their dispatch tables than required).
-	(Make_DT): Compute the number of predefined primitives that must
-	be inherited from their parent type when building the dispatch
-	tables of tagged types not defined at library level. Previously
-	we unconditionally relied on the Max_Predef_Prims constant value
-	when building the dispatch tables of tagged types not defined at
-	library level (thus copying more data than required from the
-	parent type).
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* sem_ch13.adb (Record_Hole_Check): Procedure to check for holes
-	that incudes processing type extensions. A type extension is
-	processed by first calling Record_Hole_Check recursively on the
-	parent type to compute the bit number after the last component
-	of the parent.
-
-2019-08-19  Gary Dismukes  <dismukes@adacore.com>
-
-	* checks.adb (Length_Mismatch_Info_Message): New function in
-	Selected_Length_Checks to return a message indicating the
-	element counts for the mismatched lengths for a failed
-	compile-time length check.
-	(Plural_Or_Singular_Ending): Support function in
-	Length_Mismatch_Info_Message to return either "" or "s", for
-	concatenating to the end of words.
-	(Selected_Length_Checks): Pass the result of
-	Length_Mismatch_Info_Message as an extra warning message to
-	Compile_Time_Constraint_Error to indicate the mismatched lengths
-	for a failed compile-time length check.
-	* sem_util.ads (Compile_Time_Constraint_Error): Add an optional
-	message formal (Extra_Msg), defaulted to the empty string.
-	* sem_util.adb (Compile_Time_Constraint_Error): Output an extra
-	message following the main warning message (when Extra_Msg is
-	not the empty string).
-
-2019-08-19  Patrick Bernardi  <bernardi@adacore.com>
-
-	* socket.c: Removed the redefinition of getaddrinfo, getnameinfo
-	and freeaddrinfo to internal VxWorks kernel calls because they
-	are, well, internal kernel calls and cannot be called from RTPs.
-	VxWorks provides the necessary components to call these routines
-	directly.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_dist.adb (Is_Generic_Actual_Subtype): New predicate.
-	(Build_From_Any_Call, Build_To_Any_Call, Build_TypeCode_Call):
-	Use it instead of Is_Generic_Actual_Type flag to detect subtypes
-	representing generic actual types.
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_warn.adb (Check_References, Generic_Body_Formal): When a
-	formal parameter of a generic subprogram is not referenced in
-	the body, place the corresponding warning on the corresponding
-	entity in the specification of the generic body, as is done for
-	non-generic subprograms.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* errout.ads (Size_Too_Small_Message): New constant.
-	* errout.adb, freeze.adb, sem_ch13.adb: Use it.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_dist.adb (Build_Package_Stubs): Do not specifically visit
-	the declarations of an N_Subprogram_Instantiation node.
-
-2019-08-19  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Document missing
-	metrics switches.
-
-2019-08-19  Piotr Trojanek  <trojanek@adacore.com>
-
-	* sem_ch12.adb (Get_Unit_Instantiation_Node): Simplify Nkind_In
-	membership test.
-	* sem.adb (Depends_On_Main): Whitespace cleanup; only assign a
-	local variable if needed.
-
-2019-08-19  Claire Dross  <dross@adacore.com>
-
-	* sem_spark.ads, sem_spark.adb (Is_Pledge_Function): New
-	parameter of the generic. Function used to decide whether a
-	function is a pledge function.
-	(Check_Not_Borrowed): Disable check inside the second parameter
-	of a pledge function for the path borrowed by the first
-	parameter. Also disable checks for entities inside a Global
-	contract.
-
-2019-08-19  Joffrey Huguet  <huguet@adacore.com>
-
-	* libgnat/a-cfdlli.ads, libgnat/a-cfhama.ads,
-	libgnat/a-cfinve.ads, libgnat/a-cforma.ads,
-	libgnat/a-cofove.ads, libgnat/a-cofuma.ads,
-	libgnat/a-cofuve.ads: Add formal function parameter "=" (L, R :
-	Element_Type) to the generic packages.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* opt.ads: Clean up left-overs of earlier implementation in
-	comment:
-
-2019-08-19  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Derived_Enumeration_Type): Do no freeze anonymous
-	base type if the bounds in the derived type declaration are
-	literals of the type.
-
-2019-08-19  Yannick Moy  <moy@adacore.com>
-
-	* sem_res.adb (Resolve_Call): Check non-aliasing rules before
-	GNATprove inlining.
-
-2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.adb (Add_Inlined_Body): Do not add pending
-	instantiations.
-	* sem_ch12.adb (Needs_Body_Instantiated): New predicate.
-	(Analyze_Package_Instantiation): Use it to decide whether to add
-	a pending instantiation for the body of the package.
-
-2019-08-19  Olivier Hainque  <hainque@adacore.com>
-
-	* gcc-interface/trans.c (Acc_Loop_to_gnu): Return the openacc
-	BIND_EXPR node we have constructed on purpose.  Remove unused
-	variable.
-
-2019-08-19  Pierre-Marie de Rodat  <derodat@adacore.com>
-
-	* gcc-interface/lang.opt (fdump-scos): Define.
-	* gcc-interface/misc.c (gnat_handle_option): Handle
-	OPT_fdump_scos.
-
-2019-08-14  Joffrey Huguet  <huguet@adacore.com>
-
-	* libgnat/a-cofuba.ads: Add a Length attribute to type
-	Container. Add a type Array_Base which replaces the previous
-	Elements attribute of Container.
-	(Content_Init): New subprogram. It is used to initialize the
-	Base attribute of Container.
-	* libgnat/a-cofuba.adb (Resize): New subprogram. It is used to
-	resize the underlying array of a container if necessary.
-	(=, <=, Find, Get, Intersection, Length, Num_Overlaps, Set,
-	Union): Update to match changes in type declarations.
-	(Add): Modify body to damp the time and space cost in a specific
-	case.
-	(Content_Init): New subprogram. It is used to initialize the
-	Base attribute of Container.
-	(Remove): Modify body to damp the time and space cost in a
-	specific case.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* sem_ch13.adb (Get_Alignment_Value): Return 1 for Alignment 0,
-	and do not give an error.
-	* doc/gnat_rm/representation_clauses_and_pragmas.rst: Update the
-	corresponding documentation.
-	* gnat_rm.texi: Regenerate.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.adb (Add_Pending_Instantiation): Fix off-by-one error
-	in the comparison against the maximum number of instantiations.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.adb (Add_Pending_Instantiation): Use greater-or-equal
-	in the comparison against the maximum number of instantiations.
-
-2019-08-14  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_aux.adb (Next_Rep_Item): If a node in the rep chain
-	involves a Ghost aspect it may have been replaced by a null
-	statement; use the original node to find next Rep_Item.
-	* repinfo.adb (List_Entities): Do not list an Ignored
-	Ghost_Entity, for which information may have been deleted.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* sem_prag.ads, sem_prag.adb
-	(Process_Compile_Time_Warning_Or_Error): In parameterless
-	version, improve detection of whether we are in a generic unit
-	to cover the case of an instance within a generic unit.
-	(Process_Compile_Time_Warning_Or_Error): Rename the
-	two-parameter version to be
-	Validate_Compile_Time_Warning_Or_Error, and do not export it.
-	Issue a warning if the condition is not known at compile time.
-	The key point is that the warning must be given only for pragmas
-	deferred to the back end, because the back end discovers
-	additional values that are known at compile time.  Previous
-	changes in this ticket have enabled this by deferring to the
-	back end without checking for special cases such as 'Size.
-	(Validate_Compile_Time_Warning_Or_Error): Rename to be
-	Defer_Compile_Time_Warning_Error_To_BE.
-	* warnsw.ads, warnsw.adb (Warn_On_Unknown_Compile_Time_Warning):
-	Add new switches -gnatw_c and -gnatw_C to control the above
-	warning.
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
-	Document new switches.
-	* gnat_ugn.texi: Regenerate.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch12.adb (Might_Inline_Subp): Rework comment and restrict
-	the shortcut based on Is_Inlined to the back-end inlining case.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* inline.adb (Check_And_Split_Unconstrained_Function): Ignore
-	protected functions to get rid of spurious error. The
-	transformation done by this procedure triggers legality errors
-	in the generated code in this case.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* sem_prag.adb (Process_Compile_Time_Warning_Or_Error): Defer
-	processing to the back end in all cases where the pragma's
-	condition is not known at compile time during the front end
-	(except in generics), as opposed to detecting 'Size attributes
-	and the like. This ensures that we take advantage of whatever
-	can be compile-time known after running the back end, as opposed
-	to having the front end guess what the back end can do.  Remove
-	a little duplicated code at the call site.
-	* gnat1drv.adb (Post_Compilation_Validation_Checks): Unlock the
-	Elists while in Validate_Compile_Time_Warning_Errors, because it
-	does analysis and name resolution, which sometimes involves
-	adding Elists.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* einfo.ads (Is_Called): Document new usage on E_Package
-	entities.
-	* einfo.adb (Is_Called): Accept E_Package entities.
-	(Set_Is_Called): Likewise.
-	* exp_ch6.adb (Expand_Call_Helper): Move code dealing with
-	instances for back-end inlining to Add_Inlined_Body.
-	* inline.ads: Remove with clauses for Alloc and Table.
-	(Pending_Instantiations): Move to...
-	* inline.adb: Add with clauses for Alloc, Uintp, Table and
-	GNAT.HTable.
-	(Backend_Instances): New variable.
-	(Pending_Instantiations): ...here.
-	(Called_Pending_Instantiations): New table.
-	(Node_Table_Size): New constant.
-	(Node_Header_Num): New subtype.
-	(Node_Hash): New function.
-	(To_Pending_Instantiations): New hash table.
-	(Add_Inlined_Body): Bail out early for subprograms in the main
-	unit or subunit.  Likewise if the Is_Called flag is set.  If the
-	subprogram is an instance, invoke Add_Inlined_Instance.  Call
-	Set_Is_Called earlier.  If the subrogram is within an instance,
-	invoke Add_Inlined_Instance.  Also deal with the case where the
-	call itself is within an instance.
-	(Add_Inlined_Instance): New procedure.
-	(Add_Inlined_Subprogram): Remove conditions always fulfilled.
-	(Add_Pending_Instantiation): Move the defence against ludicruous
-	number of instantiations to here. When back-end inlining is
-	enabled, associate an instantiation with its index in table and
-	mark a few selected kinds of instantiations as always needed.
-	(Initialize): Set Backend_Instances to No_Elist.
-	(Instantiate_Body): New procedure doing the work extracted
-	from...
-	(Instantiate_Bodies): ...here.  When back-end inlining is
-	enabled, loop over Called_Pending_Instantiations instead of
-	Pending_Instantiations.
-	(Is_Nested): Minor tweak.
-	(List_Inlining_Info): Also list the contents of
-	Backend_Instances.
-	* sem_ch12.adb (Might_Inline_Subp): Return early if Is_Inlined
-	is set and otherwise set it before returning true.
-	(Analyze_Package_Instantiation): Remove the defence against
-	ludicruous number of instantiations.  Invoke
-	Remove_Dead_Instance instead of doing the removal manually if
-	there is a guaranteed ABE.
-
-2019-08-14  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_ch3.adb (Predef_Spec_Or_Body): For an equality operation
-	of an interface type, create an expression function (that
-	returns False) rather than declaring an abstract function.
-	* freeze.adb (Check_Inherited_Conditions): Set Needs_Wrapper to
-	False unconditionally at the start of the loop creating wrappers
-	for inherited operations.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* table.adb: Assert that the table is not locked when increasing
-	Last, even if it doesn't cause reallocation.  In other words,
-	assert that on operations that MIGHT cause reallocation.
-	* table.ads: Fix comment accordingly.
-
-2019-08-14  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_ugn/gnat_and_program_execution.rst: Remove
-	documentation of gnatelim.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* sem_prag.adb (Validate_Compile_Time_Warning_Error): Attach the
-	warning to the Sloc of the first pragma argument, rather than to
-	the pragma itself. This is to make pragmas processed after the
-	back end use the same Sloc as pragmas processed earlier, in the
-	front end. There's no reason for this discrepancy, and it
-	hinders further work on this ticket.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* sem.ads (Inside_A_Generic): Remove the ??? comment.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.ads (Pending_Descriptor): Delete.
-	* inline.adb (Initialize): Do not initialize it.
-	* sem_ch12.adb (Delay_Descriptors): Delete.
-	(Analyze_Package_Instantiation): Call
-	Set_Delay_Subprogram_Descriptors instead of Delay_Descriptors
-	throughout.
-
-2019-08-14  Bob Duff  <duff@adacore.com>
-
-	* exp_aggr.adb (Init_Hidden_Discriminants): Avoid processing the
-	wrong discriminant, which could be of the wrong type.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch12.adb (Analyze_Instance_And_Renamings): Do not reset
-	the Is_Generic_Instance flag previously set on the package
-	generated for the instantiation of a generic subprogram.
-
-2019-08-14  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Quantified_Expression): Freeze
-	explicitly the type of the loop parameter.
-
-2019-08-14  Javier Miranda  <miranda@adacore.com>
-
-	* sem_util.adb (New_Copy_Tree.Copy_Node_With_Replacement):
-	Update the Chars attribute of identifiers.
-
-2019-08-14  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb, sem_spark.ads (Is_Legal): New function exposed
-	for use in GNATprove, to test legality rules not related to
-	permissions.
-	(Check_Declaration_Legality): Extract the part of
-	Check_Declaration that checks rules not related to permissions.
-	(Check_Declaration): Call the new Check_Declaration_Legality.
-	(Check_Type_Legality): Rename of Check_Type. Introduce
-	parameters to force or not checking, and update a flag detecting
-	illegalities.
-	(Check_Node): Ignore attribute references in statement position.
-
-2019-08-14  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Check_Old_Loop_Entry): New procedure to check
-	correct use of Old  and Loop_Entry.
-	(Check_Node): Check subprogram contracts.
-	(Check_Pragma): Check Loop_Variant.
-	(Check_Safe_Pointers): Apply checking to library-level
-	subprogram  declarations as well, in order to check their
-	contract.
-
-2019-08-14  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Is_Subpath_Expression): Take into account
-	conversion and qualification.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch7.adb (Install_Private_Declarations)
-	<Swap_Private_Dependents>: Do not rely solely on the
-	Is_Child_Unit flag on the unit to recurse.
-	(Uninstall_Declarations) <Swap_Private_Dependents>: New
-	function.  Use it to recurse on the private dependent entities
-	for child units.
-
-2019-08-14  Javier Miranda  <miranda@adacore.com>
-
-	* exp_aggr.adb (Is_CCG_Supported_Aggregate): Return False for
-	arrays with bounds not known at compile time.
-
-2019-08-14  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_util.adb (New_Copy_Tree, Visit_Entity): A quantified
-	expression includes the implicit declaration of the loop
-	parameter. When a quantified expression is copied during
-	expansion, for example when building the precondition code from
-	the generated pragma, a new loop parameter must be created for
-	the new tree, to prevent duplicate declarations for the same
-	symbol.
-
-2019-08-14  Yannick Moy  <moy@adacore.com>
-
-	* sem_disp.adb (Check_Dispatching_Operation): Update assertion
-	for the separate declarations created in GNATprove mode.
-	* sem_disp.ads (Is_Overriding_Subprogram): Update comment.
-	* sem_elab.adb (SPARK_Processor): Fix test for checking of
-	overriding primitives.
-
-2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* inline.adb (Add_Inlined_Body): Tweak comments.
-	(List_Inlining_Info): Also list information about non-main
-	units.
-
-2019-08-14  Gary Dismukes  <dismukes@adacore.com>
-
-	* sem_ch4.adb (Analyze_Selected_Component): In the case where
-	the prefix is of a concurrent type, and the selected entity
-	matching the selector is the first private declaration of the
-	type (such as the first local variable in a task's body), set
-	Is_Private_Op.
-
-2019-08-14  Piotr Trojanek  <trojanek@adacore.com>
-
-	* einfo.adb (Is_Generic_Actual_Subprogram): Replace repeated
-	calls to Ekind with Ekind_In.
-
-2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
-
-	PR middle-end/91421
-	* gcc-interface/trans.c (gigi): Call set_decl_buillt_in_function.
-	(Call_to_gnu): Use DECL_FE_FUNCTION_CODE instead of DECL_FUNCTION_CODE.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* ali.ads (Linker_Option_Record): Remove Original_Pos component.
-	* ali.adb (Scan_ALI): Do not set it.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch3.adb (Build_Derived_Concurrent_Type): Add a couple of
-	local variables and use them.  When the derived type fully
-	constrains the parent type, rewrite it as a subtype of an
-	implicit (unconstrained) derived type instead of the other way
-	around.
-	(Copy_And_Build): Deal with concurrent types and use predicates.
-	(Build_Derived_Private_Type): Build the full derivation if
-	needed for concurrent types too.
-	(Build_Derived_Record_Type): Add marker comment.
-	(Complete_Private_Subtype): Use predicates.
-
-2019-08-13  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Check_Generic_Ancestor): New subprogram,
-	aubsidiary to Build_Derived_Record_Type. to enforce the rule
-	that a type extension declared in a generic body cznnot have an
-	ancestor that is a generic formal (RM 3.9.1 (4/2)). The rule
-	applies to all ancestors of the type, including interface
-	progenitors.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch3.adb (Build_Underlying_Full_View): Delete.
-	(Complete_Private_Subtype): Do not set the full view on the
-	private subtype here.  If the full base is itself derived from
-	private, do not re-derive the parent type but instead constrain
-	an existing underlying full view.
-	(Prepare_Private_Subtype_Completion): Do not get to the
-	underlying full view, if any.  Set the full view on the private
-	subtype here.
-	(Process_Full_View): Likewise.
-	* sem_ch12.adb (Check_Generic_Actuals): Also set
-	Is_Generic_Actual_Type on the full view if the type of the
-	actual is private.
-	(Restore_Private_Views): Also reset Is_Generic_Actual_Type on
-	the full view if the type of the actual is private.
-	* sem_eval.adb (Subtypes_Statically_Match): Remove bypass for
-	generic actual types.
-
-2019-08-13  Javier Miranda  <miranda@adacore.com>
-
-	* sem_res.adb (Resolve_Selected_Component): When the type of the
-	component is an access to a class-wide type and the type of the
-	context is an access to a tagged type the relevant type is that
-	of the component (since in such case we may need to generate
-	implicit type conversions or dispatching calls).
-
-2019-08-13  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_aggr.adb (Aggr_Assignment_OK_For_Backend):  Preanalyze
-	expression, rather do a full analysis, to prevent unwanted
-	removal of side effects which mask the intent of the expression.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* impunit.adb (Non_Imp_File_Names_95): Add
-	GNAT.Branch_Prediction.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch6.adb: Remove with and use clauses for Sem_Ch12.
-	(Expand_Call_Helper): Swap the back-end inlining case and the
-	special front-end expansion case.  In back-end inlining mode, do
-	not invoke Add_Inlined_Body unless the call may be inlined.
-	* inline.ads (Add_Pending_Instantiation): New function moved
-	from...
-	* inline.adb (Add_Inlined_Body): Simplify comment.  Turn test on
-	the enclosing unit into assertion.
-	(Add_Pending_Instantiation): New function moved from...
-	* sem_ch12.ads (Add_Pending_Instantiation): ...here.
-	* sem_ch12.adb (Add_Pending_Instantiation): ...here.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem.adb (Do_Analyze): Recompute Style_Check_Max_Line_Length
-	after restoring Style_Max_Line_Length.
-
-2019-08-13  Arnaud Charlet  <charlet@adacore.com>
-
-	* sem_ch13.adb (Check_Iterator_Functions): Protect against
-	cascaded errors.
-
-2019-08-13  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch8.adb (Analyze_Subprogram_Renaming): Do no suppress mode
-	conformance checks on child unit instance that is a compilation
-	unit.
-
-2019-08-13  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_dbug.adb (Fully_Qualify_Name): Add full name qualification
-	for the E_Exception case.
-
-2019-08-13  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_aggr.adb (Aggr_Size_OK): Compute the aggregate size using
-	universal arithmetic, to avoid situations where the size
-	computation overflows.
-
-2019-08-13  Justin Squirek  <squirek@adacore.com>
-
-	* repinfo.adb (List_Scalar_Storage_Order): Modify conditionals
-	for displaying ordering to always be triggered when -gnatR4 is
-	in effect.
-
-2019-08-13  Justin Squirek  <squirek@adacore.com>
-
-	* aspects.adb, aspects.ads: Register new aspect.
-	* par-prag.adb (Prag): Register new pragma
-	* sem_ch13.adb (Analyze_Aspect_Specifications): Add processing
-	for new aspect similar to Aspect_Max_Entry_Queue_Length.
-	* sem_prag.adb, sem_prag.ads (Analyze_Pragma): Register new
-	pragma and set it to use the same processing as
-	Pragma_Max_Queue_Length.
-	* snames.ads-tmpl: Move definition of
-	Name_Max_Entry_Queue_Length so that it can be processed as a
-	pragma in addition to a restriction and add an entry for the
-	pragma itself.
-
-2019-08-13  Yannick Moy  <moy@adacore.com>
-
-	* sem_ch4.adb (Analyze_Allocator): Do not insert subtype
-	declaration for allocator inside a spec expression.
-
-2019-08-13  Yannick Moy  <moy@adacore.com>
-
-	* sem_res.adb (Resolve_Call): Do not inline calls inside record
-	types.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch4.adb (Analyze_One_Call): Remove bypass for type
-	mismatch in nested instantiations.
-	* sem_ch8.adb (Find_Nearer_Entity): New function.
-	(Find_Renamed_Entity): Use it to disambiguate the candidates for
-	the renaming generated for an instantiation when it is
-	ambiguous.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat1drv.adb (Adjust_Global_Switches): Do not set
-	Back_End_Inlining in ASIS mode either.
-
-2019-08-13  Olivier Hainque  <hainque@adacore.com>
-
-	* libgnat/s-win32.ads: Define size_t and fix the MapViewOfFile
-	binding to use it instead of DWORD for the dwNumberOfBytesToMap
-	argument.
-	* libgnat/g-sercom__mingw.adb (Read): State which definition of
-	size_t to fetch in call to Last_Index.
-
-2019-08-13  Arnaud Charlet  <charlet@adacore.com>
-
-	* gcc-interface/Make-lang.in: Remove unused TRACE variable. Pass
-	LN_S to relevant gnatlib targets.
-	* gcc-interface/Makefile.in: Systematically pass LN_S to
-	relevant gnatlib targets.
-
-2019-08-13  Yannick Moy  <moy@adacore.com>
-
-	* sem_dim.adb (Analyze_Dimension,
-	Analyze_Dimension_Array_Aggregate, Analyze_Dimension_Call,
-	Analyze_Dimension_Extension_Or_Record_Aggregate): Return
-	immediately when inside an inlined body.
-	* sem_res.adb (Resolve_Call): Remove special checking now done
-	inside Analyze_Dimension_Call.
-
-2019-08-13  Justin Squirek  <squirek@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Allocator): Add condition to detect
-	library-level object declarations
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst
-	(-gnateT): Document Double_Float_Alignment parameter and fix
-	description of Double_Scalar_Alignment parameter.
-	* gnat_ugn.texi: Regenerate.
-
-2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch6.adb (Expand_Call_Helper): If back-end inlining is
-	enabled, also instantiate the body of a generic unit containing
-	a subprogram subject to aspect/pragma Inline_Always at
-	optimization level zero.
-	* sem_ch12.adb (Might_Inline_Subp): Minor tweak.
-	(Analyze_Package_Instantiation): Do not instantiate the package
-	body because of inlining considerations if the instantiation is
-	done in a generic unit.  Move around similar condition involving
-	the main unit.  Add test on Back_End_Inlining to processing for
-	front-end inlining.
-
-2019-08-13  Javier Miranda  <miranda@adacore.com>
-
-	* exp_disp.adb (Make_Secondary_DT): Handle record type
-	derivations that have interface components located at fixed
-	positions and interface components located at variable offset.
-	The offset of components located at fixed positions is computed
-	using the dummy object (similar to the case where all the
-	interface components are located at fixed positions).
-	(Make_DT): Build the dummy object for all tagged types that
-	implement interface types (that is, build it also for types with
-	variable size components), and use the dummy object to compute
-	the offset of all tag components located at fixed positions when
-	initializing the Interface_Table object.
-
-2019-08-13  Justin Squirek  <squirek@adacore.com>
-
-	* gnatcmd.adb (GNATCmd): Add constant for new compiler switch
-	--help-ada, and include usage subprogram. Add line to usage help
-	explaining the new flag.
-	(GNATCmd_Usage): Rename from locally declared Usage so as not to
-	confuse with the newly imported version. Add new argument case
-	for --help-ada and add bug report email to implicit display of
-	help without the --help flag so as to unify output between the
-	two cases.
-
-2019-08-13  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-comlin.adb (Getopt): Quote unrecognized switch in
-	Invalid_Switch exception message.
-
-2019-08-13  Yannick Moy  <moy@adacore.com>
-
-	* sem_util.adb (Traverse_More_Func): Take into account
-	Loop_Actions inside N_Iterated_Component_Association nodes.
-	* sinfo.ads: Document correctly Loop_Actions as a field of nodes
-	of kind N_Iterated_Component_Association.
-
-2019-08-13  Claire Dross  <dross@adacore.com>
-
-	* libgnat/a-cfinve.adb, libgnat/a-cofove.adb (Find_Index,
-	Reverse_Find_Index): Use bigger type to avoid range check
-	failure at the last loop iteration.
-
-2019-08-12  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-socket.adb (Is_IPv6_Address): Check that no less
-	then 2 colons in IPv6 numeric address.
-
-2019-08-12  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-comlin.ads, libgnat/g-comlin.adb (Getopt): Add
-	parameter Quiet. Need to do not output error messages to
-	console. Invalid_Switch exception generation surrounded by an
-	error message.
-
-2019-08-12  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch6.adb (Expand_Actuals. Add_Call_By_Copy_Code): Add code
-	to generate proper checks when an actual for an in-out or out
-	parameter has a non-null access type.  No constraints are
-	applied to an inbound access parameter, but on exit a not-null
-	check must be performed if the type of the actual requires it.
-
-2019-08-12  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_util.adb (Is_Expaned_Priority_Attribute): Check whether
-	call comes from a rewritten attribute before comparing name with
-	Get_Ceiling run-time subprogram.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_util.ads (Component_May_Be_Bit_Aligned): Small comment
-	tweaks.
-	(Possible_Bit_Aligned_Component): Likewise.
-	(Type_May_Have_Bit_Aligned_Components): Likewise.
-	* exp_util.adb (Component_May_Be_Bit_Aligned): Likewise.
-	(Possible_Bit_Aligned_Component): Likewise.
-	(Type_May_Have_Bit_Aligned_Components): Likewise.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Op_Eq): Expand the array equality if
-	either operand is a possibly unaligned slice.
-	* exp_ch6.adb (Expand_Simple_Function_Return): Do not generate a
-	copy for a possibly unaligned object if it is represented as a
-	scalar.
-	* exp_util.adb (Is_Possibly_Unaligned_Slice): Do not always
-	return false if the target doesn't have strict alignment.
-
-2019-08-12  Bob Duff  <duff@adacore.com>
-
-	* sem_ch12.adb (Instantiate_Package_Body): Remove suppression of
-	checks in instances of internal units.
-	* sem_ch6.adb (Analyze_Function_Return): Do not generate a
-	constraint check on an extended_return_statement if the subtype
-	of the return object in the statement is identical to the return
-	subtype of the function.
-
-2019-08-12  Bob Duff  <duff@adacore.com>
-
-	* libgnat/a-cbmutr.adb (Is_Reachable): Declare Idx to be of the
-	base subtype.  Clearly it makes no sense to loop "while Idx >=
-	0", if Idx is of a nonnegative subtype.
-
-2019-08-12  Bob Duff  <duff@adacore.com>
-
-	* libgnat/a-tifiio.adb (Put_Scaled): Prevent AA from being
-	negative, since Field is range 0 .. something.
-
-2019-08-12  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst (gnatmetric, gnatpp,
-	gnatstub): Remove documentation for Ada language version
-	switches, and note that they are no longer needed.
-
-2019-08-12  Gary Dismukes  <dismukes@adacore.com>
-
-	* sem_ch5.adb (Prepare_Param_Spec_Loop): Set the parents of the
-	copied low and high bounds in the case where the loop range is
-	given by a discrete_subtype_indication, to prevent hanging (or
-	Assert_Failure) in Insert_Actions.
-
-2019-08-12  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch6.adb (heck_Untagged_Equality): Verify that user-defined
-	equality has the same profile as the predefined equality before
-	applying legality rule in RM 4.5.2 (9.8).
-
-2019-08-12  Bob Duff  <duff@adacore.com>
-
-	* libgnat/a-except.ads: Update obsolete comment, still making
-	clear that this is a variant.  Add explicit default for Id
-	component of Exception_Occurrence, because that value is used.
-	Define Null_Occurrence less redundantly.
-	* libgnat/a-einuoc.adb: Minor simplification of code.
-
-2019-08-12  Justin Squirek  <squirek@adacore.com>
-
-	* libgnat/a-dhfina.adb, libgnat/a-dhfina.ads (Is_Simple_Name,
-	Is_Root_Directory, Is_Parent_Directory,
-	Is_Current_Directory_Name, Is_Relative_Name, Initial_Directory,
-	Relative_Name, Compose): Add implementation and documentation.
-	* libgnat/a-direct.adb (Containing_Directory): Modify routine to
-	use routines from Ada.Directories.Hierarchical_File_Names and
-	remove incorrect special case for parent directories.
-	(Fetch_Next_Entry): Add check for current directory and parent
-	directory and ignore them under certain circumstances.
-	(Simple_Nmae): Add check for null result from
-	Simple_Name_Internal and raise Name_Error.
-	(Simple_Name_Internal): Add explicit check for root directories,
-	sanitize trailing directory separators, and modify behavior so
-	that current and parent directories are considered valid
-	results.
-	* Makefile.rtl: Add entry to GNATRTL_NONTASKING_OBJS.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* freeze.adb (Freeze_Entity): Give the same error for an
-	Object_Size clause on a variable-sized type as for a Size
-	clause.
-
-2019-08-12  Gary Dismukes  <dismukes@adacore.com>
-
-	* sem_prag.adb (Analyze_Pragma, Pragma_Suppress_Initialization):
-	For private types, set the Suppress_Initialization flag on the
-	Full_View of the entity rather than the entity's base type.
-
-2019-08-12  Yannick Moy  <moy@adacore.com>
-
-	* aspects.adb, aspects.ads (Aspect_No_Caching): New aspect.
-	* contracts.adb, contracts.ads (Add_Contract_Item): Add handling
-	of No_Caching.
-	(Analyze_Object_Contract): Add handling of No_Caching.
-	* einfo.adb, einfo.ads
-	(Get_Pragma): Add handling of No_Caching.
-	* doc/gnat_rm/implementation_defined_aspects.rst,
-	doc/gnat_rm/implementation_defined_pragmas.rst: Document new
-	aspect/pragma.
-	* gnat_rm.texi: Regenerate.
-	* par-prag.adb (Prag): New pragma Pragma_No_Caching.
-	* sem_ch13.adb (Analyze_Aspect_Specifications,
-	Check_Aspect_At_Freeze_Point): Add handling of No_Caching.
-	* sem_prag.adb (Analyze_Pragma): Deal with pragma No_Caching.
-	* sem_prag.ads (Analyze_External_Property_In_Decl_Part): Now
-	applies to No_Caching.
-	* sem_util.adb, sem_util.ads (Is_Effectively_Volatile): Add
-	handling of No_Caching.
-	(No_Caching_Enabled): New query function.
-	* snames.ads-tmpl: New names for pragma.
-
-2019-08-12  Yannick Moy  <moy@adacore.com>
-
-	* sem_util.adb, sem_util.ads (Traverse_More_Func,
-	Traverse_More_Proc): Add formal parameter for Itypes traversal.
-
-2019-08-12  Yannick Moy  <moy@adacore.com>
-
-	* exp_attr.adb, exp_attr.ads (Expand_Size_Attribute): New
-	procedure to share part of the attribute expansion with
-	GNATprove mode.
-	(Expand_N_Attribute_Reference): Extract part of the
-	Size/Object_Size expansion in the new procedure
-	Expand_Size_Attribute.
-	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Expand
-	Size/Object_Size attributes using the new procedure
-	Expand_Size_Attribute.
-
-2019-08-12  Yannick Moy  <moy@adacore.com>
-
-	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Only
-	expand Enum_Rep attribute when its parameter is a literal.
-
-2019-08-12  Justin Squirek  <squirek@adacore.com>
-
-	* sem_eval.adb (Check_Non_Static_Context): Add a condition to
-	determine if a range violation constitues a warning or an error.
-	(Out_Of_Range): Add a condition to determine if a range
-	violation constitues a warning or an error.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch4.adb (Real_Range_Check): Do not rewrite the conversion
-	node but its expression instead, after having fetched its
-	current value.  Clear the Do_Range_Check flag on entry.  Return
-	early for a rewritten float-to-float conversion.  Remove
-	redundant local variable.  Suppress all checks when inserting
-	the temporary and do not reanalyze the node.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sprint.ads: Minor comment tweak.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.adb (Insert_Valid_Check): Do not retrieve the
-	Do_Range_Check flag from the Original_Node but from the
-	Validated_Object.  Remove useless bypass for floating-point
-	types.
-
-2019-08-12  Yannick Moy  <moy@adacore.com>
-
-	* sem_util.adb, sem_util.ads (Traverse_More_Func,
-	Traverse_More_Proc): New traversal subprograms.
-
-2019-08-12  Jerome Lambourg  <lambourg@adacore.com>
-
-	* libgnarl/s-taprop__vxworks.adb (Abort_Handler): Only call
-	s-tpopsp.Self when actually needed.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch4.adb (Discrete_Range_Check): Return if checks are
-	suppressed.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_res.adb: Add with & use clause for Sem_Mech and
-	alphabetize.
-	(Resolve_Actuals): Do not apply a scalar range check for the
-	source of a conversion whose result is passed by reference to a
-	valued procedure.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.adb (Insert_Valid_Check): Reset the Do_Range_Check flag
-	on the validated object.
-	* exp_ch6.adb (Add_Call_By_Copy_Code): Reset the Do_Range_Check
-	flag on the actual here, as well as on the Expression if the
-	actual is a N_Type_Conversion node.
-	(Add_Validation_Call_By_Copy_Code): Generate the incoming range
-	check if needed and reset the Do_Range_Check flag on the
-	Expression if the actual is a N_Type_Conversion node.
-	(Expand_Actuals): Do not reset the Do_Range_Check flag here.
-	Generate the incoming range check for In parameters here instead
-	of...
-	(Expand_Call_Helper): ...here.  Remove redudant condition.
-	* sem_res.adb (Resolve_Actuals): Use local variable A_Typ and
-	remove obsolete comments.
-	(Resolve_Type_Conversion): Do not force the Do_Range_Check flag
-	on the operand if range checks are suppressed.
-
-2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.adb (Activate_Range_Check): Remove redundant argument.
-	(Generate_Range_Check): Likewise.
-	(Apply_Float_Conversion_Check): Reset the Do_Range_Check flag on
-	entry and remove redundant condition.
-
-2019-08-02  Alexandre Oliva  <oliva@adacore.com>
-
-	* libgnat/a-exexpr.adb (Begin_Handler_v1, End_Handler_v1): New.
-	(Claimed_Cleanup): New.
-	(Begin_Handler, End_Handler): Document.
-	* gcc-interface/trans.c (gigi): Switch to exception handler
-	ABI #1.
-	(Exception_Handler_to_gnu_gcc): Save the original cleanup
-	returned by begin handler, pass it to end handler, and use
-	EH_ELSE_EXPR to pass a propagating exception to end handler.
-	(gnat_to_gnu): Leave the exception pointer alone for reraise.
-	(add_cleanup): Handle EH_ELSE_EXPR, require it by itself.
-
-2019-07-23  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations,
-	Freeze_Entity_Checks): Include Aspect_CPU with other aspects
-	whose expresssion may depend on a discriminant, and thus require
-	that components of the type be made visible.
-
-2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.adb (Convert_And_Check_Range): Add Suppress parameter
-	and pass it in the call to Insert_Actions.  Rename local
-	variable.
-	(Generate_Range_Check): Minor comment fixes.  Pass Range_Check
-	in the first call to Convert_And_Check_Range and All_Checks in
-	the second call.
-	* exp_ch4.adb (Expand_N_Type_Conversion): Reset the
-	Do_Overflow_Check flag in the float-to-float case too if there
-	is also a range check.
-
-2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.adb (Activate_Overflow_Check): Remove redundant
-	argument.
-	* exp_ch4.adb (Discrete_Range_Check): Reset the overflow flag.
-	(Expand_N_Type_Conversion): Do not reset it here.
-
-2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Component_Layout): Pass Decimal to UI_Write.
-	(Write_Val): Likewise.
-
-2019-07-23  Ed Schonberg  <schonberg@adacore.com>
-
-	* aspects.ads: New table Operational_Aspect, used to distinguish
-	between aspects that are view-specific, such as those related to
-	iterators, and representation aspects that apply to all views of
-	a type.
-	* aspects.adb (Find_Aspect): If the aspect being sought is
-	operational, do not ecamine the full view of a private type to
-	retrieve it.
-	* sem_ch5.adb (Analyze_Iterator_Specification): Improve error
-	message when the intended domain of iteration does not implement
-	the required iterator aspects.
-
-2019-07-23  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.ads (Is_Local_Context): New function.
-	* sem_spark.adb (Check_Declaration): Issue errors on violations
-	of SPARK RM 3.10(4)
-	(Process_Path): Do not issue error on borrow/observe during
-	elaboration, as these are caught by the new rule.
-
-2019-07-23  Yannick Moy  <moy@adacore.com>
-
-	* exp_ch7.adb (Create_Finalizer): Force finalizer not to be
-	Ghost enabled.
-	* exp_dbug.adb (Get_External_Name): Explain special case of
-	Ghost finalizer.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Entities): Also list compiled-generated
-	types present as Etype of objects.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sinfo.ads: Update the documentation about the
-	Do_Division_Check, Do_Overflow_Check and Do_Range_Check flags.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Type_Conversion): Beef up comment.
-	(Fixup_Universal_Fixed_Operation): Set the base type instead of
-	the type of the enclosing type conversion on the operation.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch4.adb (Expand_N_In): Do not suggest the use of attribute
-	'Valid as a replacement for a range check on a discrete type
-	when the bounds of the range are given by type conversions,
-	because in such a case there are distinct types involved and the
-	subbested attribute replacement would be misplaced.
-
-2019-07-22  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Get_Root_Object, Is_Path_Expression,
-	Is_Subpath_Expression): Add parameter Is_Traversal to adapt
-	these functions to the case of paths returned from a traversal
-	function.
-	(Read_Indexes): Handle the case of an if-expression or
-	case-expression.
-	(Check_Statement): Check Emit_Messages only when issuing an
-	error message. This is important as Emit_Messages may store the
-	information that an error was detected.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* checks.adb (Apply_Type_Conversion_Checks): Do not set
-	Do_Range_Check flag on conversions from fixed-point types
-	either.
-	* exp_attr.adb: Add use and with clause for Expander.
-	(Expand_N_Attribute_Reference) <Fixed_Value, Integer_Value>: Set
-	the Conversion_OK flag and do not generate overflow/range checks
-	manually.
-	* exp_ch4.adb (Expand_N_Qualified_Expression): Remove
-	superfluous clearing of Do_Range_Check flag.
-	(Discrete_Range_Check): New procedure to generate a range check
-	for discrete types.
-	(Real_Range_Check): Remove redundant local variable and adjust.
-	Remove useless shortcut.  Clear Do_Range_Check flag on all
-	paths.
-	(Expand_N_Type_Conversion): Remove redundant test on
-	Conversion_OK.  Call Discrete_Range_Check to generate range
-	checks on discrete types.  Remove obsolete code for
-	float-to-integer conversions.  Add code to generate range checks
-	for conversions involving fixed-point types.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sprint.ads: Fix pasto in comment.
-
-2019-07-22  Javier Miranda  <miranda@adacore.com>
-
-	* sem_res.adb (Resolve_Actuals): Replace code that displaces the
-	pointer to an allocated object to reference its secondary
-	dispatch table by a type conversion (which takes care of
-	handling all cases).
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sprint.adb (Sprint_Node_Actual)
-	<N_Decimal_Fixed_Point_Definition>: Swap a couple of spaces.
-	(Write_Itype): Minor consistency fixes throughout.  Add support
-	for printing ordinary and decimal fixed-point types and
-	subtypes.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_attr.adb (Expand_Loop_Entry_Attribute): Beef up comment.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* libgnat/s-valboo.ads, libgnat/s-valcha.ads,
-	libgnat/s-valdec.ads, libgnat/s-valenu.ads,
-	libgnat/s-valint.ads, libgnat/s-vallld.ads,
-	libgnat/s-vallli.ads, libgnat/s-valllu.ads,
-	libgnat/s-valrea.ads, libgnat/s-valuns.ads,
-	libgnat/s-valwch.ads: Change categorization of packages that
-	implement attribute 'Value from Pure to Preelaborate, to prevent
-	undesirable optimizations when the evaluation of the attribute
-	raises Constraint_Error, but subsequent use of the result of
-	this evsaluation is removed by a subsequent optimization.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_warn.adb (Check_References): Do not emit s warning on a
-	referenced entity with no explicit assignment if the type of the
-	entity has Preelaborable_Initialixation, such as
-	Exception_Occurrence.
-
-2019-07-22  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch4.adb (Size_In_Storage_Elements): Improve the expansion
-	to handle array indexes that are modular type.
-	(Expand_N_Allocator): For 32-bit targets improve the generation
-	of the runtime check associated with large arrays supporting
-	arrays initialized with a qualified expression.
-	* libgnat/s-imenne.adb (Image_Enumeration_8,
-	Image_Enumeration_16, Image_Enumeration_32): Define the index of
-	Index_Table with range Natural'First .. Names'Length since in
-	the worst case all the literals of the enumeration type would be
-	single letter literals and the Table built by the frontend would
-	have as many components as the length of the names string. As a
-	result of this enhancement, the internal tables declared using
-	Index_Table have a length closer to the real needs, thus
-	avoiding the declaration of large arrays on 32-bit CCG targets.
-
-2019-07-22  Yannick Moy  <moy@adacore.com>
-
-	* sem_ch3.adb (Constrain_Access): Issue a message about ignored
-	constraint.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch8.adb (End_Use_Type): Reset the In_Use flag on the
-	class-wide type if the type is tagged.
-	(Use_One_Type): Add commentary on the handling of the class-wide
-	type.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* einfo.ads (Is_For_Access_Subtype): Delete.
-	(Set_Is_For_Access_Subtype): Likewise.
-	* einfo.adb (Is_For_Access_Subtype): Likewise.
-	(Set_Is_For_Access_Subtype): Likewise.
-	(Write_Entity_Flags): Do not write Is_For_Access_Subtype.
-	* exp_ch4.adb (Expand_N_Selected_Component): Do not deal with
-	it.
-	* exp_spark.adb (Expand_SPARK_N_Selected_Component): Likewise.
-	* sem_ch4.adb (Analyze_Explicit_Dereference): Likewise.
-	* sem_ch3.adb (Build_Discriminated_Subtype): Do not build a
-	special private subtype for access-to-record subtypes.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch3.adb (Complete_Private_Subtype): Rework the setting of
-	the Etype of the full view for full base types that cannot
-	contain any discriminant.  Remove code and comment about it in
-	the main path.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Convert_Bound): Subsidiary of
-	Floating_Point_Type_Declaration, to handle properly range
-	specifications with bounds that may include static constants of
-	a given type rather than real literals.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_aggr.adb (Rewrite_Bound): Be prepared for discriminals
-	too.
-	(Rewrite_Range;): Minor tweak.
-	(Resolve_Record_Aggregate): For a component with default
-	initialization whose expression is an array aggregate, also
-	rewrite the bounds of the component associations, if any.
-
-2019-07-22  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_ch5.adb (Expand_N_Case_Statement): In the case where a
-	case statement is rewritten as an equivalent if statement,
-	inherit the From_Condition_Expression flag from the case
-	statement.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch8.adb (Check_Constrained_Object): Further extend the
-	special optimization to all limited types.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_attr.adb (Expand_N_Attribute_Reference)
-	<Attribute_Enum_Val>: Set No_Truncation on the
-	N_Unchecked_Type_Conversion built around the argument passed to
-	the attribute.
-
-2019-07-22  Nicolas Roche  <roche@adacore.com>
-
-	* libgnat/s-valrea.adb (Scan_Real): Ignore non significative
-	digits to avoid converging to infinity in some cases.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* libgnat/g-encstr.adb (Encode_Wide_String): Fix oversight.
-	(Encode_Wide_Wide_String): Likewise.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_warn.adb (Find_Var): Bail out for a function call with an
-	Out or In/Out parameter.
-
-2019-07-22  Nicolas Roche  <roche@adacore.com>
-
-	* terminals.c (__gnat_tty_waitpid): Support both blocking and
-	not blocking mode.
-	* libgnat/g-exptty.ads (Is_Process_Running): New function.
-	* libgnat/g-exptty.adb (Close): Don't try to interrupt/terminate
-	a process if it is already dead.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* freeze.adb (Freeze_Fixed_Point_Type): When freezing a
-	fixed-point subtype, check whether the parent type declarastion
-	includes an aspect specification for the 'Small type attribute,
-	and inherit the specified value.
-
-2019-07-22  Javier Miranda  <miranda@adacore.com>
-
-	* freeze.adb (Freeze_Subprogram): Check that C++ constructors
-	must have external or link name.
-
-2019-07-22  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_res.adb (Resolve_Selected_Component): If the prefix has a
-	deferred reference, generate the correct reference now, to
-	indicate that the previous assignment is used.  This prevents
-	spurious warnings on useless assignments when compiling with all
-	warnings enabled. when there is a subsequent call in the same
-	stqtement list, in which the prefix of the selected component is
-	the actual for an out parameter.
-
-2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_attr.adb (Expand_Loop_Entry_Attribute): Copy the condition
-	of a while loop instead of simply relocating it.
-
-2019-07-18  Arnaud Charlet  <charlet@adacore.com>
-
-	* Makefile.rtl, expect.c, env.c, aux-io.c, mkdir.c, initialize.c,
-	cstreams.c, raise.c, tracebak.c, adadecode.c, init.c, raise-gcc.c,
-	argv.c, adaint.c, adaint.h, ctrl_c.c, sysdep.c, rtinit.c, cio.c,
-	seh_init.c, exit.c, targext.c: Introduce a "STANDALONE" mode where C
-	runtime files do not have any dependency on GCC include files.
-	Remove unnecessary includes.
-	Remove remaining references to VMS in runtime C file.
-	* runtime.h: new File.
-
-2019-07-13  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* Makefile.rtl: Use g-sercom__linux.adb for all linuxes.
-
-2019-07-11  Piotr Trojanek  <trojanek@adacore.com>
-
-	* lib-writ.adb (Ensure_System_Dependency,
-	Up_To_Date_ALI_File_Exists, Write_ALI): Replace low-level access
-	to table with a high-level query.
-
-2019-07-11  Piotr Trojanek  <trojanek@adacore.com>
-
-	* checks.adb: Fix typo in comment.
-	* sem.adb (Semantics): Avoid repeated calls to
-	In_Extended_Main_Source_Unit by reusing an already-cached
-	result.
-	* sem_util.adb (First_Global): Fix style.
-
-2019-07-11  Yannick Moy  <moy@adacore.com>
-
-	* sem_res.adb (Resolve_Call): Do not perform dimensionality
-	checking on inlined bodies.
-
-2019-07-11  Yannick Moy  <moy@adacore.com>
-
-	* debug.adb: Flip meaning of debug switch -gnatdF.
-
-2019-07-11  Yannick Moy  <moy@adacore.com>
-
-	* sem_eval.adb (Is_Same_Value): Add special case for rewritten
-	Loop_Entry attribute.
-
-2019-07-11  Claire Dross  <dross@adacore.com>
-
-	* gnat1drv.adb: SPARK checking rules for pointer aliasing are
-	moved to GNATprove backend.
-	* sem_spark.ads, sem_spark.adb (Sem_SPARK): Is now a generic
-	unit. Takes as parameters:
-	 - Retysp which is used to query the most underlying type
-	   visible in SPARK. We do not introduce aliasing checks for
-	   types which are not visibly deep.
-	 - Component_Is_Visible_In_SPARK is used to avoid doing pointer
-	   aliasing checks on components which are not visible in SPARK.
-	 - Emit_Messages returns True in the second phase of SPARK
-	   analysis. Error messages for failed aliasing checks are only
-	   output in this case.
-	Additionally, errors on constructs not supported in SPARK are
-	removed as duplicates of marking errors. Components are stored
-	in the permission map using their original component to avoid
-	inconsistencies between components of different views of the
-	same type.
-	(Check_Expression): Handle delta constraints.
-	(Is_Deep): Exported so that we can check for SPARK restrictions
-	on deep types inside SPARK semantic checkings.
-	(Is_Traversal_Function): Exported so that we can check for SPARK
-	restrictions on traversal functions inside SPARK semantic
-	checkings.
-	(Check_Call_Statement, Read_Indexes): Check wether we are
-	dealing with a subprogram pointer type before querying called
-	entity.
-	(Is_Subpath_Expression): Image attribute can appear inside a
-	path.
-	(Check_Loop_Statement): Correct order of statements in the loop.
-	(Check_Node): Ignore raise nodes.
-	(Check_Statement): Use Last_Non_Pragma to get the object
-	declaration in an extended return statement.
-
-2019-07-11  Patrick Bernardi  <bernardi@adacore.com>
-
-	* bindgen.adb (Gen_Main): Do not generate a reference to
-	Ada_Main_Program_Name when the Minimal_Binder flag is set.
-	(Gen_Output_File_Ada): Do not output GNAT_Version and
-	Ada_Main_Program_Name info if Minimal_Binder flag is set.
-	* bindusg.adb: Add documentation for new -minimal switch.
-	* gnatbind.adb (Scan_Bind_Arg): Scan -minimal switch.
-	* opt.ads: Add new global flag Minimal_Binder to indicate if the
-	binder should not produce global variables.
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
-	Update documentation with new binder -minimal switch.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-11  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* Makefile.rtl: Add warning note about compilation flags and
-	capitalize.
-
-2019-07-11  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch9.adb (Expand_N_Protected_Type_Declaaration): New
-	subsidiary routine Replace_Access_Definition, to handle properly
-	a protected type PT one of whose private components is of type
-	access PT.
-
-2019-07-11  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-socket.ads (Level_Type): Add enumerators for
-	IP_Protocol_For_ICMP, IP_Protocol_For_IGMP,
-	IP_Protocol_For_RAW_Level.
-	* libgnat/g-socket.adb (Levels): Handle them.
-	* s-oscons-tmplt.c: Import socket protocols defined in
-	netinet/in.h.
-
-2019-07-11  Claire Dross  <dross@adacore.com>
-
-	* libgnat/a-cfhama.adb, libgnat/a-cfhase.adb (Free): Do not
-	reset the Has_Element flag if no element is freed.
-
-2019-07-11  Arnaud Charlet  <charlet@adacore.com>
-
-	* errno.c: Remove obsolete support for MaRTE OS.
-
-2019-07-11  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Type_Conversion): If a predicate check
-	is generated, analyze it with range check suppressed, because
-	that check has been previously applied.
-	* exp_ch5.adb (Expand_N_Assignment_Statement): If the RHS is a
-	type conversion to the type of the LHS, do not apply a predicate
-	check to the RHS because it will have been generated already
-	during its expansion.
-	* exp_ch6.adb (Can_Fold_Predicate_Call): Extend processing to
-	handle a predicate check on a constant entity whose value is
-	static.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo.adb: Remove the documentation of switch -d_N because it
-	is no longer in use.
-	* bindo-graphs.ads, bindo-graphs.adb (Is_Spec_Before_Body_Edge):
-	New routine.
-	* bindo-writers.adb (Write_Dependency_Edge): Add the missing
-	case of a spec-before-body edge.
-
-2019-07-11  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-socket.ads (Mode_Type): Add a Socket_Raw enumerator.
-	* libgnat/g-socket.adb (Modes): Handle Socket_Raw.
-
-2019-07-11  Justin Squirek  <squirek@adacore.com>
-
-	* exp_ch9.adb (Build_Private_Protected_Declaration): Add
-	exception for the moving of pragmas to internally generated
-	specs for pragma Unreferenced.
-
-2019-07-11  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Fix inconsistent
-	documentation for gnatmetric.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-11  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Document gnatpp's
-	--spaces-only switch.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_util.adb (Null_Status): Assume that an erroneous construct
-	has an undefined null status.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* checks.adb, exp_ch6.adb, gnat1drv.adb, sem_aux.adb,
-	sem_ch2.adb, sem_ch8.adb, sem_res.adb: Minor reformatting.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_ch8.adb (Analyze_Object_Renaming): Obtain the object being
-	renamed using routine Get_Object_Name which takes care of
-	various name forms.
-	(Get_Object_Name): New routine.
-
-2019-07-11  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch6.adb (Can_Fold_Predicate_Call): New function,
-	subsidiary of Expand_Call_Helper, to compute statically a
-	predicate check when the argument is a static integer.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_res.adb (Resolve_Op_Not): Do not rewrite an equality
-	operator into a function call when the operator is intrinsic.
-
-2019-07-11  Thomas Quinot  <quinot@adacore.com>
-
-	* sem_prag.adb (Analyze_Pragma, case pragma Check): Do not call
-	Set_SCO_Pragma_Enabled for the dynamic predicate case.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* exp_util.ads, exp_util.adb (Needs_Finalization): Move to
-	Sem_Util.
-	* sem_ch9.adb (Analyze_Protected_Definition): Code cleanup. Mark
-	the protected type as having controlled components when it
-	contains at least one such component.
-	* sem_util.ads, sem_util.adb (Needs_Finalization): New
-	function.
-
-2019-07-11  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* alloc.ads (Rep_JSON_Table_Initial): New constant.
-	(Rep_JSON_Table_Increment): Likewise.
-	* debug.adb: Document -gnatd_j switch.
-	* gcc-interface/Make-lang.in (GNAT_ADA_OBJS): Add
-	repinfo-input.o.
-	* gnat1drv.adb: Add with clause for Repinfo.Input.
-	Add with and use clauses for Sinput.
-	(Read_JSON_Files_For_Repinfo): New procedure.
-	(Gnat1drv1): Deal with -gnatd_j switch.
-	* repinfo-input.ad[sb]: New unit.
-	* snames.ads-tmpl (Name_Discriminant): New constant.
-	(Name_Operands): Likewise.
-
-2019-07-11  Justin Squirek  <squirek@adacore.com>
-
-	* checks.adb (Apply_Accessibility_Check): Add check for constant
-	folded conditions on accessibility checks.
-
-2019-07-11  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnarl/g-thread.ads, libgnarl/g-thread.adb (Get_Thread):
-	Update comments. Add new version taking a Task_Id.
-
-2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo.adb: Update the section of switches and debugging
-	elaboration issues.
-	* bindo.ads: Add type Elaboration_Phase.
-	* bindo-augmentors.adb: Add use clause for
-	Bindo.Writers.Phase_Writers.
-	(Augment_Library_Graph): Signal the start and end of the
-	aubmentation phase.
-	* bindo-builders.adb: Add with and use clause for Bindo.Writers.
-	Add use clause for Bindo.Writers.Phase_Writers.
-	(Build_Invocation_Graph): Signal the start and end of the
-	invocation graph construction phase.
-	(Build_Library_Graph): Signal the start and end of the library
-	graph construction phase.
-	* bindo-diagnostics.adb: Add use clause for
-	Bindo.Writers.Phase_Writers.
-	(Diagnose_Cycle): Signal the start and end of the cycle
-	diagnostic phase.
-	* bindo-elaborators.adb: Add use clause for
-	Bindo.Writers.Phase_Writers.
-	(Elaborate_Units): Signal the start and end of the unit
-	elaboration phase.
-	* bindo-graphs.adb: Add use clause for
-	Bindo.Writers.Phase_Writers.
-	(Find_Components): Signal the start and end of the component
-	discovery phase.
-	(Find_Cycles): Signal the start and end of the cycle discovery
-	phase.
-	* bindo-units.adb: Add with and use clause for Bindo.Writers.
-	Add use clause for Bindo.Writers.Phase_Writers.
-	(Collect_Elaborable_Units): Signal the start and end of the unit
-	collection phase.
-	* bindo-validators.adb: Add with and use clause for
-	Bindo.Writers.  Add use clause for Bindo.Writers.Phase_Writers.
-	(Validate_Cycles, Validate_Elaboration_Order,
-	Validate_Invocation_Graph, Validate_Library_Graph): Signal the
-	start and end of the libray graph validation phase.
-	* bindo-writers.ads, bindo-writers.adb: Add new nested package
-	Phase_Writers.
-	* debug.adb: Update the documentation of switch d_S.
-
-2019-07-11  Yannick Moy  <moy@adacore.com>
-
-	* sem_res.adb (Check_Argument_Order): Special case calls to
-	operators.
-
-2019-07-10  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/s-ststop.adb: Remove System.Strings.Stream_Ops
-	dependence on System.Streams.Stream_IO.
-
-2019-07-10  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch2.adb (Analyze_Integer_Literal): Preserve the type of
-	the literal if prior analysis determined that its type is a
-	modular integer type.
-
-2019-07-10  Doug Rupp  <rupp@adacore.com>
-
-	* init.c: Do not attempt to re-arm guard page on x86_64-vx7(r2).
-
-2019-07-10  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch8.adb (Check_Constrained_Object): A record that is
-	limited because of the presence of a limited component is
-	constrained, and no subtype indiciation needs to be created for
-	it, just as is the case for declared limited records.
-
-2019-07-10  Yannick Moy  <moy@adacore.com>
-
-	* sem_aux.adb, sem_aux.ads (Is_Protected_Operation): New
-	function to determine if a subprogram is protected.
-	* sem_spark.adb (Setup_Protected_Components): New procedure to
-	add protected components to the environment.
-	(Check_Callable_Body): Call the new Setup_Protected_Components.
-	(Check_Package_Spec): Merge local environment with enclosing one
-	when done.
-
-2019-07-10  Claire Dross  <dross@adacore.com>
-
-	* sem_spark.adb (Check_Expression): Allow digits constraints as
-	input.
-	(Illegal_Global_Usage): Pass in the entity.
-	(Is_Subpath_Expression): New function to allow different nodes
-	as inner parts of a path expression.
-	(Read_Indexes): Allow concatenation and aggregates with box
-	expressions.  Allow attributes Update and Loop_Entry.
-	(Check_Expression): Allow richer membership test.
-	(Check_Node): Ignore bodies of generics.
-	(Get_Root_Object): Allow concatenation and attributes.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_ch6.adb (Check_Discriminant_Conformance): Use Find_Type to
-	discover the type of a full view discriminant.
-
-2019-07-10  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_ugn/gnat_and_program_execution.rst: Improve gnatmem's
-	doc for the depth switch.
-
-2019-07-10  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Document gnatpp's
-	--source-line-breaks switch.
-
-2019-07-10  Justin Squirek  <squirek@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_attributes.rst: Add mention
-	of 'Image attribute with 'Img's entry to mention additional
-	added 2012 usage of Obj'Image.
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Correct
-	mispelling of Async_Writers.
-	* gnat_rm.texi: Regenerate.
-	* sem_prag.adb (Analyze_Pragma): Correct mispelling of
-	Async_Writers.
-	* sem_util.adb (State_Has_Enabled_Property): Correct mispelling
-	of Async_Writers.
-
-2019-07-10  Simon Buist  <buist@adacore.com>
-
-	* sem_util.ads (Child_Prefix): New constant.
-	* sem_util.adb (Unique_Name): Add a special prefix to child
-	units that have a nested subprogram or package.
-
-2019-07-10  Arnaud Charlet  <charlet@adacore.com>
-
-	* sfn_scan.adb (Scan_SFN_Pragmas): Add pragma Assert.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_ch3.adb (Check_Nonoverridable_Aspects): Correct the
-	spelling in certain error messages.
-	(Check_Pragma_Implemented): Correct the spelling in certain
-	error messages.
-
-2019-07-10  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* Makefile.rtl (GNATRTL_NONTASKING_OBJS): Add g-brapre.
-	* libgnat/g-brapre.ads: New package specification.
-	* doc/gnat_rm/the_gnat_library.rst: Document it.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-10  Yannick Moy  <moy@adacore.com>
-
-	* osint-c.adb (Set_File_Name): Always add extension for multiple
-	units per file mode.
-
-2019-07-10  Corentin Gay  <gay@adacore.com>
-
-	* sysdep.c: Put include directive for 'vxWorks.h' before any
-	other VxWorks headers.
-
-2019-07-10  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_attributes.rst
-	(Scalar_Storage_Order): Minor tweaks.  Add note about debuggers.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Case_Expression): Mark the generated
-	assignments to the temporary result as being OK because the
-	expansion of case expressions is correct by construction.
-	(Is_Copy_Type): Update the predicate to match the comment
-	within.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo-graphs.adb, bindo.adb, debug.adb, exp_ch6.adb,
-	sem_ch10.adb, sem_ch13.adb, sem_ch3.adb, sem_ch4.adb,
-	sem_ch6.adb, sem_ch7.adb, sem_res.adb, sem_spark.adb,
-	sem_util.adb, warnsw.ads: Minor reformatting.
-
-2019-07-10  Joffrey Huguet  <huguet@adacore.com>
-
-	* libgnat/a-strbou.ads, libgnat/a-strfix.ads,
-	libgnat/a-strunb.ads, libgnat/a-strunb__shared.ads: Add global
-	contracts, contract cases, preconditions and postconditions to
-	procedures and functions.
-
-2019-07-10  Doug Rupp  <rupp@adacore.com>
-
-	* sysdep.c (__gnat_is_file_not_found_error): Reformulate to also
-	work for vxworks7r2 SR0610.
-
-2019-07-10  Doug Rupp  <rupp@adacore.com>
-
-	* env.c (__gnat_environ): Reformulate to also work for
-	vxworks7r2 SR0610.
-
-2019-07-10  Patrick Bernardi  <bernardi@adacore.com>
-
-	* Makefile.rtl: Handle vxworks7r2 ppc target
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo.adb: Update the section on switches.
-	* bindo-graphs.adb
-	(Add_Cycle, Add_Vertex_And_Complement): Remove.
-	(Create): The graph no longer needs a set of recorded cycles
-	because the cycles are not rediscovered in permuted forms.
-	(Cycle_End_Vertices): New routine.
-	(Destroy): The graph no longer needs a set of recorded cycles
-	because the cycles are not rediscovered in permuted forms.
-	(Destroy_Library_Graph_Vertex): Move to the library level.
-	(Find_All_Cycles_Through_Vertex, Find_All_Cycles_With_Edge):
-	Remove.
-	(Find_Cycles_From_Successor, Find_Cycles_From_Vertex,
-	Find_Cycles_In_Component, Has_Elaborate_All_Edge): New routines.
-	(Insert_And_Sort): Remove.
-	(Is_Elaborate_Body_Edge): Use predicate
-	Is_Vertex_With_Elaborate_Body.
-	(Is_Recorded_Cycle): Remove.
-	(Is_Vertex_With_Elaborate_Body): New routine.
-	(Normalize_And_Add_Cycle): Remove.
-	(Precedence): Rename to xxx_Precedence, where xxx relates to the
-	input.  These versions better reflect the desired input
-	precedence.
-	(Record_Cycle): New routine.
-	(Remove_Vertex_And_Complement, Set_Is_Recorded_Cycle): Remove.
-	(Trace_xxx): Update all versions to use debug switch -d_t.
-	(Trace_Component): New routine.
-	(Trace_Eol): Removed.
-	(Trace_Vertex): Do not output the component as this information
-	is already available when the component is traced.
-	(Unvisit, Visit): New routine.
-	* bindo-graphs.ads: Add new instance LGV_Lists.  Remove instance
-	RC_Sets.  Update the structure of type Library_Graph_Attributes
-	to remove the set of recorded cycles.
-	(Destroy_Library_Graph_Vertex): Move to the library level.
-	* bindo-writers.adb (Write_Component_Vertices): Output
-	information about the number of vertices.
-	* debug.adb: Document the use of binder switch -d_t.  Update the
-	use of binder switch -d_T.
-
-2019-07-10  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Get_Root_Object): Replace precondition by error
-	message.
-	(Read_Indexes): Replace precondition by error message.
-	(Check_Callable_Body): Check only traversal function returns an
-	anonymous access type.
-	(Check_Expression): Issue error on unexpected expression as
-	path.
-	* sem_util.adb (First_Global): Fix access to global on
-	entry/task.
-
-2019-07-10  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch6.adb (Is_Class_Wide_Interface_Type): New subprogram.
-	(Expand_Call_Helper): Handle non-limited views when we check if
-	any formal is a class-wide interface type.
-	* exp_disp.adb (Expand_Interface_Actuals): Handle non-limited
-	views when we look for interface type formals to force "this"
-	displacement.
-
-2019-07-10  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_res.adb (Resolve_Equality_Op): Do not replace the resolved
-	operator by its alias if expander is not active, because the
-	operand type may not be frozen yet and its inherited operations
-	have not yet been created.
-
-2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo-elaborators.adb (Elaborate_Units): Set attribute
-	Elab_Position of all elaborated units.
-	(Set_Unit_Elaboration_Positions): New routine.
-
-2019-07-10  Gary Dismukes  <dismukes@adacore.com>
-
-	* exp_util.adb: Reformatting and a typo fix.
-
-2019-07-10  Yannick Moy  <moy@adacore.com>
-
-	* exp_util.adb (Remove_Side_Effects): Prefer renamings for
-	objects of possible owning type in GNATprove mode.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Analyze_Object_Declaration): If the object type
-	is a composite type that has a dynamic predicate and, the
-	expression in the declaration is an aggregate, the generated
-	predicate check must appear after the expanded code for the
-	aggregate, which will appear after the rewritten object
-	declarastion.
-
-2019-07-09  Justin Squirek  <squirek@adacore.com>
-
-	* sem_eval.adb (Expr_Value_E): Add conditional to correctly
-	handle constant enumerated character types.
-
-2019-07-09  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* libgnarl/s-osinte__mingw.ads (CRITICAL_SECTION): Use proper
-	type for SpinCount component.
-
-2019-07-09  Justin Squirek  <squirek@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Allocator): Add conditional to detect
-	the presence of anoymous access type allocators and issue a
-	warning if the appropriate warning flag is enabled.
-	* warnsw.ads: Add new warning flag for anonymous allocators
-	* warnsw.adb (All_Warnings, Restore_Warnings, Save_Warnings,
-	Set_Underscore_Warning_Switch): Register new flags.
-	(WA_Warnings): Register new flag as an "all warnings" switch
-	* usage.adb,
-	doc/gnat_ugn/building_executable_programs_with_gnat.rst:
-	Document new warning switches -gnatw_a and -gnatw_A.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch4.adb (Diagnose_Call): Improve error recovery when a
-	local subprogram name hides a possible candidate name declared
-	in a child package in the context of the current unit.
-	* sem_ch6.adb (Process_Formals): Protect against malformed
-	formal types when the parameter type does not denote an entity.
-
-2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo-augmentors.adb (Visit_Elaboration_Root): Do not start a
-	DFS from an elaboration root whose corresponding unit lacks
-	elaboration code. This behavior mimics that of the old
-	elaboration order mechanism.
-	* bindo-graphs.adb (Find_All_Cycles_Through_Vertex): Move the
-	vertex tracing within the functional branches of the routine.
-	This prevents spurious trace output.
-	(Has_No_Elaboration_Code): New routine.
-	(Trace_Cycle, Trace_Edge): Update the various Ids to use the
-	"standard" trace format.
-	* bindo-graphs.ads (Has_No_Elaboration_Code): New routine.
-	* bindo-units.ads, bindo-units.adb (Has_No_Elaboration_Code):
-	New routine.
-
-2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
-
-	* ali.ads, bindo-graphs.adb, bindo-validators.adb, clean.adb,
-	doc/gnat_ugn/elaboration_order_handling_in_gnat.rst, einfo.ads,
-	exp_aggr.adb, exp_ch13.adb, exp_ch4.adb, exp_ch5.adb,
-	exp_ch6.adb, exp_ch7.adb, exp_ch9.adb, exp_pakd.adb,
-	fname-uf.ads, gnatlink.adb, inline.adb, lib.ads, make.adb,
-	namet.ads, opt.ads, par-ch4.adb, par-ch6.adb, par-labl.adb,
-	prep.adb, sem_aggr.adb, sem_ch13.adb, sem_ch4.adb, sem_ch5.adb,
-	sem_ch6.adb, sem_ch6.ads, sem_ch7.adb, sem_ch8.adb, sem_dim.adb,
-	sem_disp.adb, sem_prag.adb, sem_res.adb, sem_warn.adb,
-	sinfo.ads: Replace ".  " with ". ". Minor reformatting and typo
-	corrections.
-	* gnat_ugn.texi: Generate.
-
-2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo.ads: Move type Precedence_Kind from the private to the
-	visible part of the unit.
-	* bindo-augmentors.adb: Remove the use of global data as it is
-	bad practice.
-	(Augment_Library_Graph): Update the parameter profile.
-	(Is_Visited, Set_Is_Visited): Remove.
-	(Visit_Elaboration_Root, Visit_Elaboration_Roots): Update the
-	parameter profile and comment on usage.
-	(Visit_Vertex): Likewise.  Also keep track of which invocation
-	edge activates a task.
-	* bindo-augmentors.ads (Augment_Library_Graph): Update the
-	parameter profile and comment on usage.
-	* bindo-builders.adb (Create_Forced_Edge,
-	Create_Spec_And_Body_Edge, Create_With_Edge): Update the call to
-	Add_Edge.
-	* bindo-diagnostics.adb: Add with end use clauses for Restrict
-	and Rident.
-	(Output_Dynamic_Model_Suggestions): Remove.
-	(Output_Invocation_Related_Suggestions): New routine.
-	(Output_Suggestions): Output all invocation-related suggestions
-	together.
-	* bindo-elaborators.adb: Remove types Comparator_Ptr and
-	Predicate_Ptr.
-	(Find_Best_Vertex): Update the parameter profile.
-	* bindo-graphs.adb (Activates_Task): New routine.
-	(Add_Body_Before_Spec_Edge): Update the call to
-	Add_Edge_With_Return.
-	(Add_Edge): Update the parameter profile and the call to
-	Add_Edge_With_Return.
-	(Add_Edge_With_Return): Update the parameter profile and comment
-	on usage.
-	(At_Least_One_Edge_Satisfies): New routine.
-	(Contains_Elaborate_All_Edge): Reimplement.
-	(Contains_Static_Successor_Edge, Contains_Task_Activation): New
-	routine.
-	(Contains_Weak_Static_Successor): Remove.
-	(Is_Static_Successor_Edge): New routine.
-	* bindo-graphs.ads: Add types LGE_Predicate_Ptr,
-	LGV_Comparator_Ptr, and LGV_Predicate_Ptr.  Update type
-	Library_Graph_Edge_Attributes to capture whether an invocation
-	edge activates a task.  Update the value of
-	No_Library_Graph_Edge_Attributes.
-	(Activates_Task): Update the parameter profile and comment on
-	usage.
-	(Contains_Static_Successor_Edge, Contains_Task_Activation): New
-	routines.
-	(Contains_Weak_Static_Successor): Remove.
-	* doc/gnat_ugn/elaboration_order_handling_in_gnat.rst:
-	Update the documentation to reflect the new task-related advice.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
-
-	* exp_util.adb (Containing_Package_With_Ext_Axioms): Replace
-	low-level Ekind test with a high-level wrapper.
-
-2019-07-09  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnat/s-memory.adb: Disable calls to Abort defer/undefer
-	when ZCX_By_Default.
-
-2019-07-09  Javier Miranda  <miranda@adacore.com>
-
-	* sem_ch13.adb (Rep_Item_Too_Early): Representation clauses are
-	not allowed for a derivation of a generic type. Extend the
-	current test to check that none of the parents is a generic
-	type.
-
-2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* exp_ch9.adb, exp_util.adb, repinfo.adb, sem_ch12.adb,
-	sem_prag.adb, sem_res.adb, sem_spark.adb, sem_util.adb: Minor
-	reformatting.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_res.adb (Resolve_Equality_Op): If the node was overloaded,
-	set properly the entity to which the node has been resolved. The
-	original entity is the first one found during analysis, and is
-	not necessarily the resolved one.
-	(Resolve_Op_Not): If the argument of negation is an overloaded
-	equality operation, call its resolution directly given that the
-	context type does not participate in overload resolution.
-
-2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo.adb: Remove with and use clauses for Debug.  Add with
-	and use clauses for Opt.
-	(Find_Elaboration_Order): Enable the v4.0 elaboration order. The
-	v3.0 mechanism is now available under binder switch -H.
-	* bindusg.adb (Display): Enable switch -H.
-	* debug.adb: Free compiler switch -gnatd_G.  Free binder switch
-	-d_N.
-	* sem_elab.adb: Update the section on switches to remove
-	-gnatd_G.
-	(Invocation_Graph_Recording_OK): The invocation graph is now
-	unconditionally recorded in ALI files.
-	* switch-b.adb (Scan_Binder_Switches): Scan switch -H.
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
-	Update the documentation on compiler switches related to
-	elaboration.  Update the documentation on binder switches to
-	include switch -H.
-	* doc/gnat_ugn/elaboration_order_handling_in_gnat.rst: Update
-	the documentation on elaboration order handling in GNAT.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-09  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Entities): Disregard formals altogether.
-	(List_Name): Properly escape the double quote in the JSON
-	output.
-
-2019-07-09  Javier Miranda  <miranda@adacore.com>
-
-	* exp_util.adb (Remove_Side_Effects): Preserve the
-	Do_Range_Check flag.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* sinfo.ads: Refine comment for Do_Range_Check.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Expand
-	attribute reference on Enum_Rep.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch12.adb (Instantiate_Formal_Package): Handle properly the
-	case where the actual for a formal package in an instance is the
-	current instance of an enclosing generic package.
-	(Check_Formal_Packages): If the formal package declaration is
-	box-initialized or lacks associations altogether, no internal
-	instance was created to verify conformance, and there is no
-	validating package to remove from tree.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* freeze.adb (Build_Renamed_Body): Do not set body to inline in
-	GNATprove mode.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* exp_util.adb (Expand_Subtype_From_Expr): Still expand the type
-	of static expressions in GNATprove_Mode.
-	* sem_ch3.adb (Analyze_Object_Declaration): Remove obsolete
-	special case for GNATprove_Mode.
-
-2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
-
-	* doc/gnat_rm/the_gnat_library.rst,
-	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
-	erroutc.adb, libgnat/g-comlin.adb, libgnat/g-comlin.ads,
-	libgnat/g-regexp.ads, libgnat/g-regpat.ads,
-	libgnat/g-spipat.ads, libgnat/s-os_lib.ads,
-	libgnat/s-regexp.ads: Reword "wild card" to "wildcard".
-	* gnat_rm.texi, gnat_ugn.texi: Regenerate.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Check_Expression): Handle correctly implicit
-	assignments as part of allocators and (extension) aggregates.
-	(Get_Root_Object): Adapt for new path expressions.
-	(Is_Path_Expression): Return True for (extension) aggregate.
-
-2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
-
-	* einfo.ads: Fix a typo.
-
-2019-07-09  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_util.adb (Scope_Within_Or_Same): Handle properly task
-	bodies and protected bodies, so that local variables within have
-	their proper scopes after these constructs have been rewritten
-	during expansion. This patch resembles but is not identical to
-	the code in Scope_Within.
-
-2019-07-09  Arnaud Charlet  <charlet@adacore.com>
-
-	* gnat1drv.adb (Adjust_Global_Switches): Set
-	Dynamic_Elaboration_Checks to True in CodePeer mode.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Get_Perm_Or_Tree): Issue an error when
-	encountering unknown global variable.
-
-2019-07-09  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Check_Expression): Change signature to take an
-	Extended_Checking_Mode, for handling read permission checking of
-	sub-expressions in an assignment.
-	(Check_Parameter_Or_Global): Adapt to new behavior of
-	Check_Expression for mode Assign.
-	(Check_Safe_Pointers): Do not analyze generic bodies.
-	(Check_Assignment): Separate checking of the target of an
-	assignment.
-
-2019-07-09  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.ads (JSON format): Adjust.
-	* repinfo.adb (Need_Blank_Line): Rename to...
-	(Need_Separator): ...this.
-	(Blank_Line): Rename to...
-	(Write_Separator): ...this and add JSON specific handling.
-	(List_Array_Info): Adjust to above renaming.
-	(List_Object_Info): Likewise.
-	(List_Record_Info): Likewise.
-	(List_Subprogram_Info): Likewise.
-	(List_Type_Info): Likewise.
-	(List_Entities): Do not set Need_Blank_Line.
-	(List_Rep_Info): Set Need_Separator and add JSON specific
-	handling. Output a single JSON stream in the  normal case.
-
-2019-07-09  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_ugn/the_gnat_compilation_model.rst: Update doc on
-	-fdump-ada-spec now that we generate Ada 2012.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-08  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Common_Type_Info): New procedure extracted
-	from...
-	(List_Type_Info): ...here.  Call it for the common information,
-	start with a blank line and output the linker section at the
-	end, if any.
-	(List_Mechanisms): Rename to...
-	(List_Subprogram_Info): ...this.
-	(List_Array_Info): Call List_Common_Type_Info.
-	(List_Entities): Adjust to above change and renaming.
-	(List_Record_Info): Call List_Common_Type_Info.
-
-2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-sercom.ads
-	(Serial_Port_Descriptor): New type.
-	(Serial_Port): Add a comment, make it hold a
-	Serial_Port_Descriptor.
-	(To_Ada, To_C): New procedures.
-	(Port_Data, Port_Data_Access): Remove types.
-	* libgnat/g-sercom.adb (To_Ada): New stub.
-	* libgnat/g-sercom__linux.adb, libgnat/g-sercom__mingw.adb:
-	Update implementations accordingly.
-	* s-oscons-tmplt.c: Bind Serial_Port_Descriptor to
-	System.Win32.HANDLE on Windows, and to Interfaces.C.int on
-	Linux. Add "Interfaces.C." prefix for other basic integer type
-	bindings.
-	* xoscons.adb (Output_Info): Remove the "Interfaces.C." prefix
-	for subtypes generation.
-
-2019-07-08  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_rm/standard_and_implementation_defined_restrictions.rst:
-	Update documentation on No_Exceptions restriction.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/s-os_lib.adb: Do not call __gnat_kill for Invalid_Pid.
-
-2019-07-08  Piotr Trojanek  <trojanek@adacore.com>
-
-	* sem_util.adb (Enclosing_Package_Or_Subprogram): Do not expect
-	package and subprogram bodies.
-
-2019-07-08  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Remove documentation
-	of ignored GNATpp switch.
-
-2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst:
-	Update the documentation of pragma Initialize_Scalars.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-08  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch4.adb (Tagged_Membership): Fix regression silently
-	introduced in r260738 that erroneouslusy causes the evaluation
-	to True of the membership test when the left operand of the
-	membership test is a class-wide interface object and the right
-	operand is a type that implements such interface type.
-
-2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_ch13.adb (Analyze_Attribute_Definition_Clause): Do not
-	register an address clause when its prefix denotes a generic
-	formal object.
-
-2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo-diagnostics.adb (Diagnose_Cycle): Capture the presence
-	of an Elaborate_All edge before iterating over the edges of the
-	cycle.
-	(Output_Elaborate_Body_Transition): Update the parameter profile
-	and the comment on usage. Add a missing case where the edge is
-	within the context of an Elaborate_All.
-	(Output_Transition): Update the call to
-	Output_Elaborate_Body_Transition.
-	* bindo-graphs.ads, bindo-graphs.adb
-	(Contains_Elaborate_All_Edge): New routine.
-
-2019-07-08  Piotr Trojanek  <trojanek@adacore.com>
-
-	* lib-xref-spark_specific.adb (Create_Heap): Set dummy Etype for
-	the fake __HEAP entity.
-
-2019-07-08  Daniel Mercier  <mercier@adacore.com>
-
-	* gnat1drv.adb: Suppress warnings on memory representation in
-	CodePeer compiler mode.
-
-2019-07-08  Nicolas Roche  <roche@adacore.com>
-
-	* rtinit.c (__gnat_runtime_initialize): Remove dependency on
-	CommandLineToArgvW.
-
-2019-07-08  Doug Rupp  <rupp@adacore.com>
-
-	* Makefile.rtl: Handle vxworks7r2 in x86_64 and x86 vxworks7.
-
-2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* Makefile.rtl: Use g-sercom__linux.adb for all linuxes.
-
-2019-07-08  Yannick Moy  <moy@adacore.com>
-
-	* expander.adb (Expand): Do not reset Analyzed flag always.
-	* sem_eval.adb (Fold_Ureal): Mark node as analyzed.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch9.adb (Expand_N_Timed_Entry_Call): Do not insert twice
-	the assignment statement that computes the delay value, to
-	prevent improper tree sharing when the value is a type
-	conversion and Float_Overflow checks are enabled.
-
-2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo.adb: Update the section on terminology to include new
-	concepts.  Update the section on switches to include new
-	entries.
-	* bindo.ads: Add type Precedence_Kind.
-	* bindo-builders.adb: Add with and use clauses for Debug and
-	Bindo.Validators.  Add use clauses for
-	Bindo.Validators.Invocation_Graph_Validators and
-	Bindo.Validators.Library_Graph_Validators.
-	(Build_Invocation_Graph): Validate the graph immediately after
-	it was built.
-	(Build_Library_Graph): Update the parameter profile. The
-	creation of the graph is now elaboration model-agnostic.
-	Validate the graph immediately after it was built.
-	(Create_With_Edge): Create regular with edges for Elaborate and
-	Elaborate_All edges when the appropriate debug switches are in
-	effect.
-	* bindo-builders.ads (Build_Library_Graph): Update the parameter
-	profile.
-	* bindo-diagnostics.adb (Diagnose_Cycle): Track the presence of
-	an Elaborate_All edge throughout the inspection of the cycle's
-	edges.
-	(Output_Dynamic_Model_Suggestions): Output the suggestion only
-	when the cycle contains at least one weak edge where the
-	successor was statically elaborated.
-	(Output_Elaborate_Body_Transition, Output_Forced_Transition,
-	Output_With_Transition): Update the assertions.
-	* bindo-elaborators.adb: Remove use clauses for
-	Bindo.Validators.Invocation_Graph_Validators and
-	Bindo.Validators.Library_Graph_Validators.  Remove strings
-	Add_To_All_Candidates_Msg and Add_To_Comp_Candidates_Msg.
-	Remove type String_Ptr.
-	(Add_Vertex, Add_Vertex_If_Elaborable, Create_All_Candidates_Set
-	Create_Component_Candidates_Set): Remove.
-	(Create_Component_Vertex_Sets, Create_Vertex_Sets): New routine.
-	(Elaborate_Component): Update the parameter profile and the
-	comment on usage.  Reimplement the elaboration of a component.
-	The algorithm will now attempt to elaborate as many vertices
-	possible. If this is not possible, and a weakly elaborable
-	vertex is available use unit was compiled using the dynamic
-	model, the algorithm will elaborate it.
-	(Elaborate_Library_Graph): Reimplement the elaboration of the
-	graph. The algorithm will now attempt to elaborate as many
-	vertices along with their components as possible. If this is not
-	possible, and a weakly elaborable vertex is available use unit
-	was compiled using the dynamic model, the algorithm will
-	elaborate it along with its component.
-	(Elaborate_Units): Merge with the functionality of
-	Elaborate_Units_Common.
-	(Elaborate_Units_Common, Elaborate_Units_Dynamic,
-	Elaborate_Units_Static): Remove.
-	(Elaborate_Vertex): Update the parameter profile and the comment
-	on usage.  Reimplemented.
-	(Find_Best_Candidate): Remove.
-	(Find_Best_Elaborable_Vertex, Find_Best_Vertex,
-	Find_Best_Weakly_Elaborable_Vertex, Has_Elaborable_Body,
-	Insert_Elaborable_Successor, Insert_Vertex): New routines.
-	(Is_Better_Candidate): Remove.
-	(Is_Better_Elaborable_Vertex,
-	Is_Better_Weakly_Elaborable_Vertex,
-	Is_Suitable_Elaborable_Vertex,
-	Is_Suitable_Weakly_Elaborable_Vertex): New routines.
-	(Trace_Candidate_Vertices): Remove.
-	(Trace_Component): Output the number of strong and weak
-	predecessors.
-	(Trace_Unelaborated_Vertices): Remove.
-	(Trace_Vertex): Output the number of strong and weak
-	predecessors.
-	(Trace_Vertices): New routine.
-	(Update_Successor, Update_Successors): Update the parameter
-	profile and the comment on usage.
-	* bindo-graphs.adb: Remove type Precedence_Kind.
-	(Add_Edge_With_Return): Update the increment of pending
-	predecessors.
-	(Add_Vertex): Provide default values for strong and weak
-	predecessors.
-	(Complementary_Vertex): Move the initial declaration to the
-	spec. Update the parameter profile and the comment on usage.
-	(Contains_Weak_Static_Successor): New routine.
-	(Create): Update the parameter profile. The creation of the
-	graph is now elaboration model-agnostic.
-	(Decrement_Pending_Predecessors): Update the parameter profile
-	and the comment on usage. Reimplemented.
-	(Delete_Edge): Update the decrement of pending predecesors.
-	(Has_Elaborate_Body): Do not treat a vertex as being subject to
-	Elaborate_Body when a debug switch is in effect.
-	(Increment_Pending_Predecessors): Update the parameter profile
-	and the comment on usage. Reimplemented.
-	(Is_Elaborable_Component): Reimplemented.
-	(Is_Elaborable_Vertex): Move the initial declaration to the
-	spec.  Reimplemented.
-	(Is_Elaborate_Body_Pair): New routine.
-	(Is_Dynamically_Elaborated): Update the parameter profile.
-	Reimplemented.
-	(Is_Weakly_Elaborable_Vertex): New routine.
-	(Pending_Predecessors): Removed.
-	(Pending_Predecessors_For_Elaboration,
-	Pending_Strong_Predecessors, Pending_Weak_Predecessors,
-	Update_Pending_Predecessors): New routines.
-	(Update_Pending_Predecessors_Of_Components): Update the
-	increment of pending predecessors.
-	* bindo-graphs.ads: Update the components of type
-	Component_Attributes.  Update the components of type
-	Library_Graph_Attributes.  Update the components of type
-	Library_Graph_Vertex_Attributes.  Update the initialization of
-	No_Component_Attributes.  Update the initialization of
-	No_Library_Graph_Vertex_Attributes.
-	(Complementary_Vertex, Contains_Weak_Static_Successor): New
-	routines.
-	(Create): Update the parameter profile and the comment on usage.
-	(Decrement_Pending_Predecessors, Is_Dynamically_Elaborated):
-	Update the parameter profile and the comment on usage.
-	(Is_Elaborate_Body_Pair, Is_Weakly_Elaborable_Vertex): New
-	routines.
-	(Pending_Predecessors): Removed.
-	(Pending_Predecessors_For_Elaboration,
-	Pending_Strong_Predecessors, Pending_Weak_Predecessors): New
-	routines.
-	* bindo-writers.adb (Write_Components): Moved from the spec.
-	(Write_Component): Output the strong and weak predecessors.
-	(Write_Library_Graph): Output the components as part of the
-	graph.
-	(Write_Library_Graph_Vertex): Output the strong and weak
-	predecessors.
-	* bindo-writers.ads (Write_Components): Moved to the body.
-	* debug.adb: Add and document new GNATbind switches -d_a, -d_b,
-	-d_e.
-	* bindo-validators.adb: Minor reformattings.
-
-2019-07-08  Bob Duff  <duff@adacore.com>
-
-	* libgnat/g-sercom.ads, libgnat/g-sercom__linux.adb (Data_Rate):
-	Support additional data rates.
-
-2019-07-08  Olivier Hainque  <hainque@adacore.com>
-
-	* gcc-interface/trans.c (Compilation_Unit_to_gnu): Don't request
-	DECL_ARTIFICIAL_P on elab proc declarations.
-
-2019-07-08  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Record_Info): Declare Incomplete_Layout and
-	Not_In_Extended_Main local exceptions.
-	(List_Structural_Record_Layout): For an extension, raise the
-	former if the parent subtype has not been built and the latter
-	if it is not declared in the main source unit.  Fall back to the
-	flat layout if either exception has been raised.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* libgnat/a-strfix.adb (Delete): The RM describes the semantics
-	of Delete as equivalent to that of Replace_String with a null
-	argument. As a result, deleting a null string that starts past
-	the end of its argument is a noop and must not raise
-	Index_Error.
-
-2019-07-08  Javier Miranda  <miranda@adacore.com>
-
-	* exp_disp.adb (Register_Primitive): When registering a
-	primitive in the secondary dispatch table, handle primitive
-	inherited through several levels of type derivation (required to
-	properly handle inherited 'null' primitive).
-
-2019-07-08  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Document handling of
-	preprocessor directives in GNATpp.
-
-2019-07-08  Javier Miranda  <miranda@adacore.com>
-
-	* gnat1drv.adb (Post_Compilation_Validation_Checks:
-	Validate_Compile_Time_Warning_Errors is now located in sem_prag
-	(instead of sem_ch13).
-	* sem_ch13.ads (Validate_Compile_Time_Warning_Error,
-	Validate_Compile_Time_Warning_Errors): Move to sem_prag.
-	* sem_ch13.adb
-	(Compile_Time_Warnings_Errors): Move to sem_prag.
-	(Initialize): Remove initialization of table
-	Compile_Time_Warning_Errors.
-	(Validate_Compile_Time_Warning_Error,
-	Validate_Compile_Time_Warning_Errors): Move to sem_prag.
-	* sem_prag.ads (Validate_Compile_Time_Warning_Errors): New
-	procedure.
-	* sem_prag.adb (Initialize): Initialize table
-	Compile_Time_Warning_Errors.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Analyze_Aspect_Specifications): For a
-	pre/postcondition of a generic subprogram declaration, do not
-	use Relocate_Node on the aspect expression to construct the
-	corresponding attribute specification, to prevent tree anomalies
-	when the expression is a call with named actual parameters.
-
-2019-07-08  Javier Miranda  <miranda@adacore.com>
-
-	* sem_attr.adb (Analyze_Attribute [Attribute_Size]): For pragmas
-	used to report user defined compile time warning or errors
-	handle 'Size for types with known static RM size.
-
-2019-07-08  Justin Squirek  <squirek@adacore.com>
-
-	* exp_imgv.adb (Build_Enumeration_Image_Tables): Default SSO for
-	the building of image tables.
-	(Expand_Image_Attribute): Minor cleanup.
-
-2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-socket.ads, libgnat/g-socket.adb: Improve
-	documentation.
-	(Get_Socket_Option, Set_Socket_Option): Remove default value for
-	the Level formal.
-
-2019-07-08  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): For an
-	unanalized aspect in a generic context that has not been
-	analyzed yet, if the aspect applies to a type, place the type on
-	the scope stack to make its components visible, before checking
-	conformance with the version of the expression analyzed at the
-	freeze point.
-
-2019-07-05  Justin Squirek  <squirek@adacore.com>
-
-	* checks.adb (Apply_Accessibility_Check): Add logic to fetch the
-	function result accessibility level if one is required within
-	the generated check.
-	* exp_ch6.adb (Needs_Result_Accessibility_Level): Modify
-	controlling elsif block to handle more cases such as anonymous
-	access results and disable checking for coextensions.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch9.adb (Analyze_Accept_Statement): If this is an illegal
-	accept statement for an enclosing entry abandon analysis to
-	prevent scope mismatches and potential infinite loops in
-	compiler.
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* ali.adb (For_Each_Invocation_Construct,
-	For_Each_Invocation_Relation): New version.
-	(Scan_ALI): Initialize field Invocation_Graph_Encoding.
-	(Set_Invocation_Graph_Encoding): Update the setting of the
-	invocation graph encoding.
-	* ali.ads: Move field Invocation_Graph_Encoding from Unit_Record
-	to ALI_Record because the encoding applies to the whole ALI,
-	rather than one of the units (spec or body) for which the ALI
-	file was created.
-	(For_Each_Invocation_Construct, For_Each_Invocation_Relation):
-	New version.
-	* bindo.adb: Update the section on switches.  Complete the
-	section of debugging elaboration order issues.
-	(Find_Elaboration_Order): Prepare the routine for the switch
-	from the old to the new elaboration order mechanism.
-	* bindo-diagnostics.adb (Find_And_Output_Invocation_Paths):
-	Manage a visited set used by Visit_Vertex.
-	(Output_All_Cycles_Suggestions,
-	Output_Dynamic_Model_Suggestions): Clarify the nature of the
-	suggested switch.
-	(Output_Elaborate_Body_Transition): Update the diagnostic to
-	emit a better message.
-	(Output_Forced_Suggestions, Output_Full_Encoding_Suggestions):
-	Clarify the nature of the suggested switch.
-	(Visit_Vertex): Update the parameter profile to add a set of
-	invokers visited during the transition. This set prevents
-	infinite exploration of the graph in case the invocations are
-	recursive.
-	* bindo-elaborators.adb: Add a use clause for
-	Bindo.Writers.Dependency_Writers.
-	(Elaborate_Units_Common): Output the library graph after it has
-	been augmented with invocation edges. Output just the components
-	instead of outputting the whole library graph again.
-	(Elaborate_Units_Dynamic, Elaborate_Units_Static): Output the
-	dependencies as expressed in the library graph.
-	* bindo-units.adb (Invocation_Graph_Encoding): Update the
-	extraction of the invocation graph encoding.
-	* bindo-writers.adb: Add with and use clauses for Binderr and
-	Butil.
-	(palgc, plgc): New debug routine.
-	(Write_Components): Moved to the spec. Add a header for the
-	output.
-	(Write_Dependencies, Write_Dependencies_Of_Vertex,
-	Write_Dependency_Edge): New routine.
-	(Write_Elaboration_Order): Update the logic to follow the format
-	of Binde's order output.
-	(Write_Library_Graph): Do not output the components every time
-	the graph is written.
-	(Write_Unit): Output the invocation graph encoding of the unit.
-	Output the invocation constructs and relations for the unit
-	only.
-	* bindo-writers.ads (Write_Components): Moved from the body.
-	(Write_Dependencies): New routine.
-	* bindusg.adb: Prepare the routine for the switch from the old
-	to the new elaboration order mechanism.
-	* debug.adb: Binder switch -d_O is now not associated with any
-	functionality.
-	* einfo.adb (Is_Elaboration_Target): The attribute applies to
-	packages, as specified by the comment on the attribute usage.
-	* opt.ads: Add a global flag which controls the choice between
-	the new and the legacy elaboration order mechanism.
-	* sem_elab.adb: Add Package_Target to type Target_Kind.
-	(Build_Elaborate_Body_Procedure, Build_Elaborate_Procedure,
-	Build_Elaborate_Spec_Procedure, Check_Elaboration_Scenarios,
-	Check_SPARK_Model_In_Effect): Use Main_Unit_Entity to obtain the
-	entity of the main unit.
-	(Create_Package_Rep): New routine.
-	(Create_Target_Rep): Add processing for packages.
-	(Declaration_Placement_Of_Node, Has_Prior_Elaboration): Use
-	Main_Unit_Entity to obtain the entity of the main
-	 unit.
-	(Invocation_Graph_Recording_OK): Prepare the routine for the
-	switch from the old to the new elaboration order mechanism.
-	(Main_Unit_Entity): New routine.
-	(Meet_Elaboration_Requirement,
-	Process_Conditional_ABE_Variable_Reference): Use
-	Main_Unit_Entity to obtain the entity of the main unit.
-	(Process_Invocation_Instantiation): New routine.
-	(Process_Invocation_Scenario): Add processing for
-	instantiations.
-	* switch-b.adb (Scan_Binder_Switches): Prepare the routine for
-	the switch from the old to the new elaboration order mechanism.
-
-2019-07-05  Joffrey Huguet  <huguet@adacore.com>
-
-	* libgnat/a-textio.adb: Add abstract state refinment.
-	* libgnat/a-textio.ads: Add File_System abstract state.  Add
-	global contracts, contract cases, preconditions and
-	postconditions to procedures and functions.
-	(Set_Input, Set_Output, Set_Error, Standard_Input,
-	Standard_Output, Standard_Error, Current_Input, Current_Output,
-	Current_Error): Turn SPARK_Mode off.
-	(Get_Line): Turn SPARK_Mode off on Get_Line functions.
-	* libgnat/a-tideio.ads, libgnat/a-tienio.ads,
-	libgnat/a-tifiio.ads, libgnat/a-tiflio.ads,
-	libgnat/a-tiinio.ads, libgnat/a-timoio.ads: Add global
-	contracts, contract cases, preconditions and postconditions to
-	procedures and functions.
-
-2019-07-05  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_ugn/platform_specific_information.rst: Refresh doc on
-	installing from the command line on Windows.  Remove obsolete
-	part.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-05  Vasiliy Fofanov  <fofanov@adacore.com>
-
-	* libgnat/a-wichha.ads (Is_Alphanumeric): Replace comment with
-	the correct one.  Also capitalize references to False
-	throughout.
-
-2019-07-05  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Indexed_Component): Do not expand actual
-	parameters of function calls here either.
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindo-units.adb, checks.adb, exp_attr.adb, exp_ch3.adb,
-	exp_ch4.adb, exp_pakd.adb, lib-writ.adb, libgnat/g-traceb.adb,
-	libgnat/g-traceb.ads, libgnat/s-stratt.ads, sem_aux.ads,
-	sem_util.adb: Minor reformatting.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Build_Predicate_Functions): If a subtype that
-	carries a static predicate aspect is frozen immediately after
-	its declaration, ensure that the generated function body created
-	for predicate checking is inserted after the corresponding
-	subprogram declaration, which is created at the point the
-	declaration is elaborated.
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* exp_ch7.adb (Cleanup_Record): Use the underlying type when
-	checking for components with tasks.
-
-2019-07-05  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnarl/s-osinte__linux.ads: Link with -lrt before -lpthread.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_pakd.adb (Expand_Bit_Packed_Element_Set): Add explicit
-	range checks when the index type of the bit-packed array is an
-	enumeration type with a non-standard representation,
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_res.adb (Is_Control_Flow_Statement): Delay statements
-	contain an expression, which in turn may have side effects and
-	affect the infinite recursion. As a result, delay statements
-	should not be treated specially.
-
-2019-07-05  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnarl/s-linux.ads, libgnarl/s-linux__alpha.ads,
-	libgnarl/s-linux__android.ads, libgnarl/s-linux__hppa.ads,
-	libgnarl/s-linux__mips.ads, libgnarl/s-linux__riscv.ads,
-	libgnarl/s-linux__sparc.ads: Fix typos in comments.
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_res.adb (Check_Infinite_Recursion): Reimplemented.
-	(Enclosing_Declaration_Or_Statement,
-	Invoked_With_Different_Arguments, Is_Conditional_Statement,
-	Is_Control_Flow_Statement, Is_Immediately_Within_Body,
-	Is_Raise_Idiom, Is_Raise_Statement, Is_Sole_Statement,
-	Preceded_By_Control_Flow_Statement,
-	Within_Conditional_Statement): New routines.
-
-2019-07-05  Javier Miranda  <miranda@adacore.com>
-
-	* exp_ch4.adb (Expand_N_Type_Conversion): Do not apply an
-	accessibility check when the conversion is an access to
-	class-wide interface type and it is an actual parameter.
-	* exp_ch6.adb (Expand_Call_Helper): Add documentation on the
-	accessibility level of an anonymous allocator defining the value
-	of an access parameter.
-	* sem_util.ads, sem_util.adb (Dynamic_Accessibility_Level): Add
-	support for an anonymous allocator whose type is that of a
-	stand-alone object of an anonymous access to object type.
-
-2019-07-05  Piotr Trojanek  <trojanek@adacore.com>
-
-	* einfo.ads, sem_res.adb: Typo fixes in comments.
-
-2019-07-05  Bob Duff  <duff@adacore.com>
-
-	* exp_ch6.adb (Is_Build_In_Place_Function): Narrow the check for
-	Has_Foreign_Convention to the imported case only.  If a
-	build-in-place function is exported, and called from Ada code,
-	build-in-place protocols should be used.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_util.adb (Encloing_Subprogram): If Enclosing_Dynamic_Scope
-	is a loop, continue climbing the scope stack to find the
-	enclosing subprogram.
-	(Gather_Components): Handle properly a choice in a record
-	aggregate that is given by a subtype with a static predicate.
-
-2019-07-05  Javier Miranda  <miranda@adacore.com>
-
-	* debug.adb (-gnatd.K): Leave available this switch.
-	* contracts.adb (Build_And_Analyze_Contract_Only_Subprograms):
-	Remove.
-	* scil_ll.ads, scil_ll.adb (Contract_Only_Body_Flag,
-	Contract_Only_Body_Nodes, Get_Contract_Only_Body,
-	Is_Contract_Only_Body, Set_Contract_Only_Body): Remove.
-
-2019-07-05  Pierre-Marie de Rodat  <derodat@adacore.com>
-
-	* libgnat/a-strunb.ads: Import documentation from the RM
-
-2019-07-05  Pierre-Marie de Rodat  <derodat@adacore.com>
-
-	* libgnat/a-strfix.ads: Import documentation from the RM
-
-2019-07-05  Yannick Moy  <moy@adacore.com>
-
-	* adabkend.adb (Scan_Back_End_Switches): Accept -Og and -Ofast
-	switches.
-
-2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* ali.adb: Relocate types Invocation_Construct_Record,
-	Invocation_Relation_Record, and Invocation_Signature_Record to
-	the body of ALI.  Relocate tables Invocation_Constructs,
-	Invocation_Relations, and Invocation_Signatures to the body of
-	ALI.  Remove type Body_Placement_Codes.  Add new types
-	Declaration_Placement_Codes, and
-	Invocation_Graph_Encoding_Codes.  Update the literals of type
-	Invocation_Graph_Line_Codes.
-	(Add_Invocation_Construct): Update the parameter profile. Add an
-	invocation construct built from all attributes provided.
-	(Add_Invocation_Relation): Update the parameter profile. Add an
-	invocation relation built from all attributes provided.
-	(Body_Placement): New routine.
-	(Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind):
-	Removed.
-	(Code_To_Declaration_Placement_Kind,
-	Code_To_Invocation_Graph_Encoding_Kind, Column,
-	Declaration_Placement_Kind_To_Code, Extra,
-	For_Each_Invocation_Construct, For_Each_Invocation_Relation,
-	Invocation_Graph_Encoding,
-	Invocation_Graph_Encoding_Kind_To_Code, Invoker, Kind, Line,
-	Locations, Name): New routine.
-	(Scan_Invocation_Construct_Line): Reimplement the scanning
-	mechanism.
-	(Scan_Invocation_Graph_Attributes_Line): New routine.
-	(Scan_Invocation_Graph_Line): Use a case statement to dispatch.
-	(Scan_Invocation_Relation_Line): Reimplement the scanning
-	mechanism.
-	(Scope): New routine.
-	(Set_Invocation_Graph_Encoding, Signature, Spec_Placement,
-	Target): New routine.
-	* ali.ads: Add new type Invocation_Graph_Encoding_Kind.  Add
-	component Invocation_Graph_Encoding to type Unit_Record.
-	Relocate various types and data structures to the body of ALI.
-	(Add_Invocation_Construct, Add_Invocation_Relation): Update the
-	parameter profile.
-	(Body_Placement): New routine.
-	(Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind):
-	Removed.
-	(Code_To_Declaration_Placement_Kind,
-	Code_To_Invocation_Graph_Encoding_Kind, Column,
-	Declaration_Placement_Kind_To_Code, Extra,
-	For_Each_Invocation_Construct, For_Each_Invocation_Relation,
-	Invocation_Graph_Encoding,
-	Invocation_Graph_Encoding_Kind_To_Code, Invoker, Kind, Line,
-	Locations, Name, Scope, Set_Invocation_Graph_Encoding,
-	Signature, Spec_Placement, Target): New routine.
-	* bindo.adb: Add with clause for Binde.  Add with and use
-	clauses for Debug.  Update the documentation.  Add new switches.
-	(Find_Elaboration_Order): Dispatch to the proper elaboration
-	mechanism.
-	* bindo-augmentors.adb:
-	Remove with and use clauses for GNAT and GNAT.Sets.  Remove
-	membership set VS.  Update the parameter profiles of most
-	routines to use better parameter names.  Update the
-	implementation of most routine to use the new parameter names.
-	Remove various redundant assertions.
-	* bindo-builders.adb: Use better names for instantiated data
-	structures. Update all references to these names.  Update the
-	parameter profiles of most routines to use better parameter
-	names.  Update the implementation of most routine to use the new
-	parameter names.
-	(Build_Library_Graph): Update the parameter profile. Update the
-	call to Create.
-	(Create_Vertex): Reimplemented.
-	(Declaration_Placement_Vertex): New routine.
-	* bindo-builders.ads (Build_Library_Graph): Update the parameter
-	profile and comment on usage.
-	* bindo-diagnostics.adb: Almost a new unit.
-	* bindo-diagnostics.ads: Add a use clause for
-	Bindo.Graphs.Invocation_Graphs.  Remove package
-	Cycle_Diagnostics.
-	(Diagnose_Circularities): New routine.
-	* bindo-elaborators.adb: Remove the with and use clauses for
-	Binderr and GNAT.Sets.  Remove the use clause for
-	Bindo.Diagnostics.Cycle_Diagnostics.  Remove membership set VS.
-	Update the parameter profiles of most routines to use better
-	parameter names.  Update the implementation of most routine to
-	use the new parameter names.  (Elaborate_Units_Common): Update
-	the parameter profile. Pass an infication to the library graph
-	builder whether the dynamic model is in effect.
-	(Elaborate_Units_Dynamic, Elaborate_Units_Static): Use
-	Diagnose_Circularities to provide diagnostics.
-	(Update_Successor): Use routine In_Same_Component to determine
-	whether the predecessor and successor reside in different
-	components.
-	* bindo-graphs.adb: Add with and use clauses for Butil, Debug,
-	Output, and Bindo.Writers.  Remove with and use clauses for
-	GNAT.Lists.  Update the parameter profiles of most routines to
-	use better parameter names.  Update the implementation of most
-	routine to use the new parameter names.  Remove various
-	redundant assertions.  Remove doubly linked list EL.  Add new
-	type Precedence_Kind.
-	(Add_Cycle): New routine.
-	(Add_Vertex): Update the parameter profile. Update the creation
-	of vertex attributes.
-	(Add_Vertex_And_Complement, Body_Vertex, Column,
-	Complementary_Vertex, Copy_Cycle_Path, Cycle_Kind_Of): New
-	routines.
-	(Destroy_Invocation_Graph_Edge, Destroy_Library_Graph_Cycle,
-	Destroy_Library_Graph_Edge, Extra, File_Name,
-	Find_All_Cycles_Through_Vertex, Find_All_Cycles_With_Edge,
-	Find_Cycles, Find_First_Lower_Precedence_Cycle,
-	Get_LGC_Attributes, Has_Next, Hash_Library_Graph_Cycle,
-	Hash_Library_Graph_Cycle_Attributes, Highest_Precedence_Cycle,
-	Highest_Precedence_Edge, In_Same_Component, Insert_And_Sort,
-	Invocation_Edge_Count, Invocation_Graph_Encoding,
-	Is_Cycle_Initiating_Edge, Is_Cyclic_Edge,
-	Is_Cyclic_Elaborate_All_Edge, Is_Cyclic_Elaborate_Body_Edge,
-	Is_Cyclic_Elaborate_Edge, Is_Cyclic_Forced_Edge,
-	Is_Cyclic_Invocation_Edge, Is_Cyclic_With_Edge,
-	Is_Dynamically_Elaborated, Is_Elaborate_All_Edge,
-	Is_Elaborate_Body_Edge, Is_Elaborate_Edge: New routines.
-	(Is_Existing_Predecessor_Successor_Relation): Removed.
-	(Is_Forced_Edge, Is_Invocation_Edge, Is_Recorded_Cycle,
-	Is_Recorded_Edge, Is_With_Edge, Iterate_Edges_Of_Cycle, Kind,
-	Length): New routine.
-	(Lib_Vertex): Removed.
-	(Line, Links_Vertices_In_Same_Component,
-	Maximum_Invocation_Edge_Count, Next, Normalize_And_Add_Cycle,
-	Normalize_Cycle_Path, Number_Of_Cycles, Path, Precedence,
-	Remove_Vertex_And_Complement, Sequence_Next_Cycle): New routines.
-	(Sequence_Next_IGE_Id): Renamed to Sequence_Next_Edge.
-	(Sequence_Next_IGV_Id): Renamed to Sequence_Next_Vertex.
-	(Sequence_Next_LGE_Id): Renamed to Sequence_Next_Edge.
-	(Sequence_Next_LGV_Id): Renamed to Sequence_Next_Vertex.
-	(Set_Is_Existing_Predecessor_Successor_Relation): Removed.
-	(Set_Is_Recorded_Cycle, Set_Is_Recorded_Edge,
-	Set_LGC_Attributes, Spec_Vertex, Trace_Cycle, Trace_Edge,
-	Trace_Eol, Trace_Vertex): New routines.
-	* bindo-graphs.ads: Add with and use clauses for Types and
-	GNAT.Lists.  Update the parameter profiles of most routines to
-	use better parameter names.  Update the implementation of most
-	routine to use the new parameter names.  Add the new
-	instantiated data structures IGE_Lists, IGV_Sets, LGC_Lists,
-	LGE_Lists, LGE_Sets, LGV_Sets, and RC_Sets.  Add new type
-	Library_Graph_Cycle_Id along with an empty and initial value.
-	Remove component Lib_Vertex and add new components Body_Vertex
-	and Spec_Vertex to type Invocation_Graph_Vertex_Attributes.  Add
-	new type Library_Graph_Cycle_Kind.  Add new iterators
-	All_Cycle_Iterator and Edges_Of_Cycle_Iterator.  Add new type
-	Library_Graph_Cycle_Attributes.  Add new components
-	Cycle_Attributes, Cycles, and Dynamically_Elaborated to type
-	Library_Graph_Attributes.
-	(Body_Vertex, Column, Destroy_Invocation_Graph_Edge,
-	Destroy_Library_Graph_Cycle_Attributes,
-	Destroy_Library_Graph_Edge, Extra, File_Name, Find_Cycles,
-	Has_Elaborate_All_Cycle, Has_Next, Hash_Library_Graph_Cycle,
-	Hash_Library_Graph_Cycle_Attributes, Highest_Precedence_Cycle,
-	In_Same_Component, Invocation_Edge_Count,
-	Invocation_Graph_Encoding, Is_Dynamically_Elaborated,
-	Is_Elaborate_All_Edge, Is_Elaborate_Body_Edge,
-	Is_Elaborate_Edge, Is_Forced_Edge, Is_Invocation_Edge,
-	Is_With_Edge, Iterate_All_Cycles, Iterate_Edges_Of_Cycle, Kind):
-	New routines.
-	(Length, Lib_Vertex, (Line, Next, Number_Of_Cycles, Present,
-	Same_Library_Graph_Cycle_Attributes, Spec_Vertex): New routines.
-	* bindo-units.adb (File_Name, Invocation_Graph_Encoding): New
-	routines.
-	* bindo-units.ads: Add new instantiated data structure
-	Unit_Sets.
-	(File_Name, Invocation_Graph_Encoding): New routine.
-	* bindo-validators.adb: Remove with and use clauses for GNAT and
-	GNAT.Sets.  Remove membership set US.  Update the parameter
-	profiles of most routines to use better parameter names.  Update
-	the implementation of most routine to use the new parameter
-	names.
-	(Validate_Cycle, Validate_Cycle_Path, Validate_Cycles,
-	Validate_Invocation_Graph_Vertex): Remove the validation of
-	component Lib_Vertex. Add the validation of components
-	Body_Vertex and Spec_Vertex.
-	(Write_Error): New routine.
-	* bindo-validators.ads (Validate_Cycles): New routine.
-	* bindo-writers.adb: Update the parameter profiles of most
-	routines to use better parameter names.  Update the
-	implementation of most routine to use the new parameter names.
-	(Write_Cycle, Write_Cyclic_Edge, Write_Cycles): New routines.
-	(Write_Invocation_Graph_Vertex): Remove the output of component
-	Lib_Vertex. Add the output of components Body_Vertex and
-	Spec_Vertex.
-	* bindo-writers.ads (Write_Cycles): New routine.
-	* debug.adb: Use binder switches -d_C and -d_P, add
-	documentation on their usage.
-	* gnatbind.adb: Remove with and use clauses for Binde.  Delegate
-	the choice of elaboration mechanism to Bindo.
-	* lib-writ.adb (Column, Extra, Invoker, Kind, Line, Locations,
-	Name, Placement, Scope, Signature, Target): Removed.
-	(Write_Invocation_Graph): Moved at the top level.
-	(Write_Invocation_Graph_Attributes): New routine.
-	(Write_Invocation_Relation, Write_Invocation_Signature): Moved
-	at the top level.
-	* lib-writ.ads: Add a documentation section on invocation graph
-	attributes.
-	* sem_elab.adb (Body_Placement_Of): New routine.
-	(Declare_Invocation_Construct): Update the call to
-	Add_Invocation_Construct.
-	(Declaration_Placement_Of_Node): New routine.
-	(Get_Invocation_Attributes): Correct the retrieval of the
-	enclosing subprogram where the postcondition procedure lives.
-	(Placement_Of, Placement_Of_Node): Removed.
-	(Record_Invocation_Graph): Record the encoding format used.
-	(Record_Invocation_Graph_Encoding): New routine.
-	(Record_Invocation_Relation): Update the call to
-	Add_Invocation_Relation.
-	(Spec_Placement_Of): Removed.
-	* libgnat/g-lists.ads, libgnat/g-lists.adb (Equal): New routine.
-
-2019-07-05  Ed Schonberg  <schonberg@adacore.com>
-
-	* checks.adb (Apply_Predicate_Check): Except within the
-	subprogram body that defines the formal, do not apply predicate
-	check on a formal IN parameter: such a check is redundant and
-	its expansion can lead to out-of-scope references when it is
-	originates in a function call in a precondition,
-
-2019-07-05  Yannick Moy  <moy@adacore.com>
-
-	* sem_res.adb (Resolve_Call): Cannot inline in quantified
-	expressions.
-	* sem_util.adb, sem_util.ads (In_Quantified_Expression): New
-	function.
-
-2019-07-05  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_rm/standard_and_implementation_defined_restrictions.rst:
-	Fix typo.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-05  Bob Duff  <duff@adacore.com>
-
-	* exp_attr.adb (Input): Take the No_Stream_Optimizations
-	restriction into account.
-
-2019-07-05  Claire Dross  <dross@adacore.com>
-
-	* libgnat/a-cofove.ads, libgnat/a-cofove.adb: Definite formal
-	vectors are now always bounded so that they do not need to be
-	limited anymore.
-
-2019-07-05  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-traceb.ads, libgnat/g-traceb.adb (Call_Chain): New
-	function.
-
-2019-07-04  James Clarke  <jrtc27@debian.org>
-
-	* libgnarl/s-osinte__kfreebsd-gnu.ads (clockid_t): Make type
-	definition public.
-	(CLOCK_REALTIME): Make value public.
-
-2019-07-04  Javier Miranda  <miranda@adacore.com>
-
-	* exp_tss.adb (Init_Proc): Adding missing support for access to
-	subprograms and access to protected subprograms of non-default
-	C++ constructors.
-
-2019-07-04  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnat1drv.adb (Adjust_Global_Switches): Use proper interface to
-	set the validity settings in CodePeer mode.
-	* par-load.adb (Load): Remove all code dealing with validity
-	settings.
-	* validsw.ads (Validity_Check_Copies): Alphabetize.
-	* validsw.adb (Reset_Validity_Check_Options): Set all options to
-	off.
-	(Save_Validity_Check_Options): Save all options.
-
-2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* exp_ch3.adb, exp_ch4.adb, exp_ch4.ads, exp_ch5.adb,
-	exp_ch7.adb, exp_ch9.adb, exp_ch11.adb, exp_unst.adb,
-	rtsfind.ads, sem_attr.adb, sem_ch10.adb, sem_ch12.adb,
-	sem_ch13.adb, sem_dim.adb, sem_disp.adb, xref_lib.adb: Minor
-	reformatting.
-
-2019-07-04  Joffrey Huguet  <huguet@adacore.com>
-
-	* libgnarl/a-taside.ads: Add assertion policy to ignore
-	preconditions.
-	(Abort_Task, Is_Terminated, Is_Callable): Add preconditions.
-
-2019-07-04  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst: Fix
-	capitalization and parenthesis glitches.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch10.adb (Remove_Context_Clauses): Handle properly the
-	removal of a limited_with_clause which appears in the library
-	unit oF the main unit, when some other unit in the context has a
-	regular with_clause on the same unit, to prevent spurious
-	visibility errors in the subsequent analysis of pending instance
-	bodies.
-
-2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_elab.adb: Add new type Elaboration_Phase_Status along with
-	a global to keep track of the elaboration phase status.
-	Initialize all internal data structures to Nil for services
-	Elaborated_Units, Internal_Representation, and Scenario_Storage.
-	(Build_Call_Marker): Do not create a call marker when the
-	elaboration phase is not active.
-	(Build_Variable_Reference_Marker): Do not create a call marker
-	when the elaboration phase is not active.
-	(Check_Elaboration_Scenarios): Destroy all internal structures
-	when the elaboration phase does not have to run. Do not execute
-	when the elaboration phase is not active.
-	(Elaboration_Phase_Active): New routine.
-	(Finalize_All_Data_Structures): New routine.
-	(Initialize): Initialize all internal data structures and signal
-	that the elaboration phase has started.
-	(Initialize_All_Data_Structures): New routine.
-	(Initialize_Elaborated_Units): Initialize all internal data
-	structures.
-	(Initialize_Internal_Representation): Initialize all internal
-	data structures.
-	(Initialize_Scenario_Storage): Initialize all internal data
-	structures.
-	(Kill_Elaboration_Scenario): Do not execute when the elaboration
-	phase is not active.
-	(Set_Elaboration_Phase): New routine.
-	(Update_Elaboration_Scenario): Do not execute when the
-	elaboration phase is not active.
-
-2019-07-04  Gary Dismukes  <dismukes@adacore.com>
-
-	* sem_ch6.adb (Analyze_Subprogram_Body_Helper): The special
-	treatment of calling Mask_Unfrozen_Types must also be done in
-	the case of an Ignored_Ghost_Entity, because Expander_Active is
-	False in that case.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* sem_prag.adb (Check_Library_Level_Entity): Update for new rule
-	on SPARK_Mode.
-
-2019-07-04  Justin Squirek  <squirek@adacore.com>
-
-	* sem_disp.adb (Check_Controlling_Formals): Obtain the full view
-	before type comparison.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_ch4.ads, exp_ch4.adb (Build_Eq_Call): New visible
-	subprogram, extracted from Expand_Composite_Equality, to handle
-	properly the composition of equality for variant record types.
-	* exp_ch3.adb (MAke_Eq_If): Use Build_Eq_Call for each
-	component, to handle properly the case of a component with a
-	user-defined equality. Revert to predefined equality if the
-	user-defined operation is abstract, to maintain compatibility
-	with older versions,
-
-2019-07-04  Justin Squirek  <squirek@adacore.com>
-
-	* exp_ch3.adb (Build_Initialization_Call): Fixup
-	*_skip_null_excluding_check argument to handle new default.
-	(Init_Formals): Make *_skip_null_excluding_check formal default
-	to False
-	* exp_ch4.adb (Expand_N_Allocator): Add comment to note heavy
-	code duplication
-
-2019-07-04  Bob Duff  <duff@adacore.com>
-
-	* sem_ch3.adb (Access_Definition): Do not create a master unless
-	Tasking_Allowed. Otherwise, this fails on restricted runtimes.
-
-2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* sem_util.adb (Propagate_DIC_Attributes): Do not propagate the
-	Default_Initial_Condition attributes to an incomplete type.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_attr.adb (Check_Array_Type): An array type attribute such
-	as 'First can be applied to an unconstrained array tyope when
-	the attribute reference appears within an aspect specification
-	and the prefix is a current instance, given that the prefix of
-	the attribute will become a formal of the subprogram that
-	implements the aspect (typically a predicate check).
-
-2019-07-04  Piotr Trojanek  <trojanek@adacore.com>
-
-	* sem_util.adb (Yields_Synchronized_Object): Fix typos in
-	comments.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* sem_util.adb (Yields_Synchronized_Object): Adapt to new SPARK
-	rule.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Check_Statement): Only check permission of
-	object in extended return when it is of a deep type.
-
-2019-07-04  Justin Squirek  <squirek@adacore.com>
-
-	* sem_ch12.adb (Perform_Appropriate_Analysis): Added for
-	selecting which type of analysis based on wheither the
-	instantiation is a generic at the library-level. In which case
-	expansion during analysis.
-	(Preanalyze_Actuals): Modify calls to Analyze to use the new
-	routine.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_unst.adb: Handle conditional expressions.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Check_Package_Spec, Check_Package_Body): Only
-	analyze parts of the code marked in SPARK.
-
-2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* erroutc.adb, exp_aggr.adb, inline.adb, opt.adb, sem_ch3.adb:
-	Minor reformatting.
-
-2019-07-04  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Explanation, Get_Expl): New functions to get
-	the explanation for a permission mismatch.
-	(Perm_Error, Perm_Mismatch, Perm_Error_Loop_Exit): Take
-	explanation into account for issuing a more precise error
-	message.
-	(Set_Perm_Prefixes, Set_Perm_Extensions,
-	Set_Perm_Extensions_Move): Pass suitable argument for the
-	explanation node.
-
-2019-07-04  Arnaud Charlet  <charlet@adacore.com>
-
-	* exp_aggr.adb (In_Place_Assign_OK): Moved to top level and add
-	support for record aggregates.
-	(Component_Check): Use Is_CCG_Supported_Aggregate instead of a
-	similar local predicate.
-	(Convert_To_Assignments): Take advantage of In_Place_Assign_OK
-	predicate when possible.
-	(Is_CCG_Supported_Aggregate): Return False for records with
-	representation clauses and fix the logic for dealing with nested
-	aggregates.
-
-2019-07-04  Piotr Trojanek  <trojanek@adacore.com>
-
-	* opt.adb (Set_Config_Switches): Keep assertions policy as
-	enabled when analysing internal units in GNATprove mode.
-
-2019-07-04  Arnaud Charlet  <charlet@adacore.com>
-
-	* exp_ch4.adb (Expand_Short_Circuit_Operator): Strip
-	N_Variable_Reference_Marker when checking for the presence of
-	actions.
-
-2019-07-04  Arnaud Charlet  <charlet@adacore.com>
-
-	* exp_aggr.adb (Check_Component): Take into account type
-	conversions.
-
-2019-07-04  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* doc/gnat_ugn/platform_specific_information.rst: Document
-	Windows socket timeout particularity.
-	* gnat_ugn.texi: Regenerate.
-	* gsocket.h: Include versionhelpers.h.
-	* socket.c (__gnat_minus_500ms): New function.
-	* libgnat/g-sothco.ads (Minus_500ms_Windows_Timeout): New
-	imported function.
-	* libgnat/g-socket.adb (Set_Socket_Option): Refactor to remove
-	500ms from the requested timeout only on old Windows version.
-
-2019-07-04  Thomas Quinot  <quinot@adacore.com>
-
-	* get_scos.adb: Remove bogus, dead code.
-
-2019-07-04  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_dim.adb (Analyze_Dimension_Array_Aggregate): If the
-	component is an entity name, its dimensions are those of its
-	type.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Document new flags in
-	GNATpp.
-
-2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* binde.adb: Remove with clause for System.OS_Lib.
-	(Force_Elab_Order): Refactor the majority of the code in Butil.
-	Use the new forced units iterator to obtain unit names.
-	* bindo-builders.adb: Add with and use clauses for Binderr,
-	Butil, Opt, Output, Types, GNAT, and GNAT.Dynamic_HTables.  Add
-	a hash table which maps units to line number in the forced
-	elaboration order file.
-	(Add_Unit): New routine.
-	(Build_Library_Graph): Create forced edges between pairs of
-	units listed in the forced elaboration order file.
-	(Create_Forced_Edge, Create_Forced_Edges, Destroy_Line_Number,
-	Duplicate_Unit_Error, Hash_Unit, Internal_Unit_Info,
-	Is_Duplicate_Unit, Missing_Unit_Info): New routines.
-	* bindo-graphs.adb (Is_Internal_Unit, Is_Predefined_Unit):
-	Refactor some of the behavior to Bindo-Units.
-	* bindo-graphs.ads: Enable the enumeration literal for forced
-	edges.
-	* bindo-units.adb, bindo-units.ads (Is_Internal_Unit,
-	Is_Predefined_Unit): New routines.
-	* butil.adb: Add with and use clauses for Opt, GNAT, and
-	System.OS_Lib.  Add with clause for Unchecked_Deallocation.
-	(Has_Next, Iterate_Forced_Units, Next, Parse_Next_Unit_Name,
-	Read_Forced_Elab_Order_File): New routines.
-	* butil.ads: Add with and use clauses for Types.  Add new
-	iterator over the units listed in the forced elaboration order
-	file.
-	(Has_Next, Iterate_Forced_Units, Next): New routine.
-	* namet.adb, namet.ads (Present): New routine.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* sem_ch3.adb (Access_Definition): The code was creating a
-	master in the case where the designated type is a class-wide
-	interface type. Create a master in the noninterface case as
-	well. That is, create a master for all limited class-wide types.
-
-2019-07-03  Yannick Moy  <moy@adacore.com>
-
-	* erroutc.adb (Sloc_In_Range): New function to determine whether
-	the range of a pragma Warnings covers a location, taking
-	instantiations into account.
-
-2019-07-03  Johannes Kanig  <kanig@adacore.com>
-
-	* osint.ads, osint.adb (Get_First_Main_File_Name): New routine
-	to access the first file provided on the command line.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* inline.adb (Process_Formals_In_Aspects): New procedure within
-	Expand_Inlined_Call, to perform a replacement of references to
-	formals that appear in aspect specifications within the body
-	being inlined.
-
-2019-07-03  Justin Squirek  <squirek@adacore.com>
-
-	* sem_ch8.adb (Analyze_Object_Renaming): Add call to search for
-	the appropriate actual subtype of the object renaming being
-	analyzed.
-	(Check_Constrained_Object): Minor cleanup.
-
-2019-07-03  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb (Get_Observed_Or_Borrowed_Expr): New function to
-	return go through traversal function call.
-	(Check_Type): Consistently use underlying type.
-	(Get_Perm): Adapt for case of elaboration code where variables
-	are not declared in the environment. Remove incorrect handling
-	of borrow and observe.
-
-2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* inline.adb (Build_Return_Object_Formal): New routine.
-	(Can_Split_Unconstrained_Function): Code clean up.
-	(Copy_Formals,Copy_Return_Object): New routines.
-	(Split_Unconstrained_Function): Code clean up and refactoring.
-
-2019-07-03  Gary Dismukes  <dismukes@adacore.com>
-
-	* bindo-augmentors.adb, bindo-augmentors.ads,
-	bindo-builders.ads, bindo-elaborators.adb, sem_ch12.adb,
-	sem_ch13.adb, sem_spark.adb, sinfo.ads: Minor editorial
-	corrections and reformatting.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* sem_warn.adb (Check_Infinite_Loop_Warning): Avoid the warning
-	if an Iterator_Specification is present.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* doc/gnat_ugn/gnat_utility_programs.rst: Document default
-	new-line behavior.
-
-2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* ali.adb: Add with and use clauses for GNAT,
-	GNAT.Dynamic_HTables, and Snames.  Add a map from invocation
-	signature records to invocation signature ids.  Add various
-	encodings of invocation-related attributes.  Sort and update
-	table Known_ALI_Lines.
-	(Add_Invocation_Construct, Add_Invocation_Relation,
-	Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind,
-	Code_To_Invocation_Construct_Kind, Code_To_Invocation_Kind,
-	Code_To_Invocation_Graph_Line_Kind, Destroy, Hash): New
-	routines.
-	(Initialize_ALI): Sort the initialization sequence. Add
-	initialization for all invocation-related tables.
-	(Invocation_Construct_Kind_To_Code,
-	Invocation_Graph_Line_Kind_To_Code, Invocation_Kind_To_Code,
-	Invocation_Signature_Of, Present): New routines.
-	(Scan_ALI): Add the default values for invocation-related ids.
-	Scan invocation graph lines.
-	(Scan_Invocation_Graph_Line): New routine.
-	* ali.ads: Add with clause for GNAT.Dynamic_Tables.  Add types
-	for invocation constructs, relations, and signatures.  Add
-	tables for invocation constructs, relations, and signatures.
-	Update Unit_Record to capture invocation-related ids.  Relocate
-	table Unit_Id_Tables and subtypes Unit_Id_Table, Unit_Id_Array
-	from Binde.
-	(Add_Invocation_Construct, Add_Invocation_Relation,
-	Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind,
-	Code_To_Invocation_Construct_Kind, Code_To_Invocation_Kind,
-	Code_To_Invocation_Graph_Line_Kind,
-	Invocation_Construct_Kind_To_Code,
-	Invocation_Graph_Line_Kind_To_Code, Invocation_Kind_To_Code,
-	Invocation_Signature_Of, Present): New routines.
-	* binde.adb: Add with and use clause for Types.  Add use clause
-	for ALI.Unit_Id_Tables;
-	* binde.ads: Relocate table Unit_Id_Tables and subtypes
-	Unit_Id_Table, Unit_Id_Array to ALI.
-	* bindgen.adb: Remove with and use clause for ALI.
-	* bindgen.ads: Remove with and use clause for Binde.  Add with
-	and use clause for ALI.
-	* bindo.adb,  bindo.ads, bindo-augmentors.adb,
-	bindo-augmentors.ads, bindo-builders.adb, bindo-builders.ads,
-	bindo-diagnostics.adb, bindo-diagnostics.ads,
-	bindo-elaborators.adb, bindo-elaborators.ads, bindo-graphs.adb,
-	bindo-graphs.ads, bindo-units.adb, bindo-units.ads,
-	bindo-validators.adb, bindo-validators.ads, bindo-writers.adb,
-	bindo-writers.ads: New units.
-	* debug.adb: Use and describe GNAT debug switches -gnatd_F and
-	-gnatd_G.  Add GNATbind debug switches in the ranges dA .. dZ,
-	d.a .. d.z, d.A .. d.Z, d.1 .. d.9, d_a .. d_z, d_A .. d_Z, and
-	d_1 .. d_9.  Use and describe GNATbind debug switches -d_A,
-	-d_I, -d_L, -d_N, -d_O, -d_T, and -d_V.
-	* exp_util.adb, exp_util.ads (Exceptions_OK): Relocate to
-	Sem_Util.
-	* gnatbind.adb: Add with and use clause for Bindo.  Use the new
-	Bindo elaboration order only when -d_N is in effect.
-	* lib-writ.adb
-	(Column, Extra, Invoker, Kind, Line, Locations, Name, Placement,
-	Scope, Signature, Target): New routines.
-	(Write_ALI): Output all invocation-related data.
-	(Write_Invocation_Graph): New routine.
-	* lib-writ.ads: Document the invocation graph ALI line.
-	* namet.adb, namet.ads (Present): New routines.
-	* sem_ch8.adb (Find_Direct_Name): Capture the status of
-	elaboration checks and warnings of an identifier.
-	(Find_Expanded_Name): Capture the status of elaboration checks
-	and warnings of an expanded name.
-	* sem_ch12.adb (Analyze_Generic_Package_Declaration): Ensure
-	that invocation graph-related data within the body of the main
-	unit is encoded in the ALI file.
-	(Analyze_Generic_Subprogram_Declaration): Ensure that invocation
-	graph-related data within the body of the main unit is encoded
-	in the ALI file.
-	(Analyze_Package_Instantiation): Perform minimal decoration of
-	the instance entity.
-	(Analyze_Subprogram_Instantiation): Perform minimal decoration
-	of the instance entity.
-	* sem_elab.adb: Perform heavy refactoring of all code. The unit
-	is now split into "services" which specialize in one area of ABE
-	checks.  Add processing in order to capture invocation-graph
-	related attributes of the main unit, and encode them in the ALI
-	file.  The Processing phase can now operate in multiple modes,
-	all described by type Processing_Kind.  Scenarios and targets
-	are now distinct at the higher level, and carry their own
-	representations. This eliminates the need to constantly
-	recompute their attributes, and offers the various processors a
-	uniform interface.  The various initial states of the Processing
-	phase are now encoded using type Processing_In_State, and
-	xxx_State constants.
-	* sem_elab.ads: Update the literals of type
-	Enclosing_Level_Kind.  Add Inline pragmas on several routines.
-	* sem_prag.adb (Process_Inline): Ensure that invocation
-	graph-related data within the body of the main unit is encoded
-	in the ALI file.
-	* sem_util.adb (Enclosing_Generic_Body, Enclosing_Generic_Unit):
-	Code clean up.
-	(Exceptions_OK): Relocated from Sem_Util.
-	(Mark_Save_Invocation_Graph_Of_Body): New routine.
-	* sem_util.ads (Exceptions_OK): Relocated from Sem_Util.
-	(Mark_Save_Invocation_Graph_Of_Body): New routine.
-	* sinfo.adb (Is_Elaboration_Checks_OK_Node): Now applicable to
-	N_Variable_Reference_Marker.
-	(Is_Elaboration_Warnings_OK_Node): Now applicable to
-	N_Expanded_Name, N_Identifier, N_Variable_Reference_Marker.
-	(Is_Read): Use Flag4.
-	(Is_SPARK_Mode_On_Node): New applicable to
-	N_Variable_Reference_Marker.
-	(Is_Write): Use Flag5.
-	(Save_Invocation_Graph_Of_Body): New routine.
-	(Set_Is_Elaboration_Checks_OK_Node): Now applicable to
-	N_Variable_Reference_Marker.
-	(Set_Is_Elaboration_Warnings_OK_Node): Now applicable to
-	N_Expanded_Name, N_Identifier, N_Variable_Reference_Marker.
-	(Set_Is_SPARK_Mode_On_Node): New applicable to
-	N_Variable_Reference_Marker.
-	(Set_Save_Invocation_Graph_Of_Body): New routine.
-	* sinfo.ads: Update the documentation of attributes
-	Is_Elaboration_Checks_OK_Node, Is_Elaboration_Warnings_OK_Node,
-	Is_SPARK_Mode_On_Node.  Update the flag usage of attributes
-	Is_Read, Is_Write.  Add attribute Save_Invocation_Graph_Of_Body
-	and update its occurrence in nodes.
-	(Save_Invocation_Graph_Of_Body): New routine along with pragma
-	Inline.
-	(Set_Save_Invocation_Graph_Of_Body): New routine along with
-	pragma Inline.
-	* switch-b.adb (Scan_Binder_Switches): Refactor the scanning of
-	debug switches.
-	(Scan_Debug_Switches): New routine.
-	* libgnat/g-dynhta.adb, libgnat/g-dynhta.ads (Contains): New routine.
-	* libgnat/g-graphs.adb (Associate_Vertices): Update the use of
-	Component_Vertex_Iterator.
-	(Contains_Component, Contains_Edge, Contains_Vertex, Has_Next):
-	Reimplemented.
-	(Iterate_Component_Vertices): New routine.
-	(Iterate_Vertices): Removed.
-	(Next): Update the parameter profile.
-	(Number_Of_Component_Vertices, Number_Of_Outgoing_Edges): New
-	routines.
-	* libgnat/g-graphs.ads: Update the initialization of
-	No_Component.  Add type Component_Vertex_Iterator.  Remove type
-	Vertex_Iterator.
-	(Has_Next): Add new versions and remove old ones.
-	(Iterate_Component_Vertices): New routine.
-	(Iterate_Vertices): Removed.
-	(Next): Add new versions and remove old ones.
-	(Number_Of_Component_Vertices, Number_Of_Outgoing_Edges): New
-	routines.
-	* libgnat/g-sets.adb (Contains): Reimplemented.
-	* gcc-interface/Make-lang.in (GNATBIND_OBJS): Add
-	GNAT.Dynamic_HTables, GNAT.Graphs and Bindo units.
-	* rtsfind.ads: Remove extra space.
-
-2019-07-03  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb: Add support for locally borrowing and observing
-	a path.
-	(Get_Root_Object): Add parameter Through_Traversal to denote
-	when we are interesting in getting to the traversed parameter.
-	(Is_Prefix_Or_Almost): New function to support detection of
-	illegal access to borrowed or observed paths.
-	(Check_Pragma): Add analysis of assertion pragmas.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Build_Predicate_Functions): In a generic context
-	we do not build the bodies of predicate fuctions, but the
-	expression in a static predicate must be elaborated to allow
-	case coverage checking within the generic unit.
-	(Build_Discrete_Static_Predicate): In a generic context, return
-	without building function body once the
-	Static_Discrete_Predicate expression for the type has been
-	constructed.
-
-2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* bindgen.adb, inline.adb, layout.adb, sem_ch12.adb,
-	sem_ch13.adb, sem_ch7.adb, styleg.adb: Minor reformatting.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* par-ch3.adb (P_Defining_Identifier): Call
-	Check_Defining_Identifier_Casing.
-	* style.ads, styleg.ads, styleg.adb
-	(Check_Defining_Identifier_Casing): New procedure to check for
-	mixed-case defining identifiers.
-	* stylesw.ads, stylesw.adb (Style_Check_Mixed_Case_Decls): New
-	flag for checking for mixed-case defining identifiers.
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
-	Document new feature.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst
-	(Warning message control): Document that -gnatw.z/Z apply to
-	array types.
-	* freeze.adb (Freeze_Entity): Give -gnatw.z warning for array
-	types as well, but not if the specified alignment is the minimum
-	one.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-03  Bob Duff  <duff@adacore.com>
-
-	* einfo.ads, exp_util.adb, layout.ads, sinfo.ads: Spell "laid"
-	correctly.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch13.adb (Analyze_Attribute_Definition_Clause): No error
-	message on attribute applied to a renaming when the renamed
-	object is an aggregate (from code reading).
-	(Check_Aspect_At_End_Of_Declarations): In a generic context
-	where freeze nodes are not generated, the original expression
-	for an aspect may need to be analyzed to precent spurious
-	conformance errors when compared with the expression that is
-	anakyzed at the end of the current declarative list.
-
-2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* layout.adb (Layout_Type): Do not set the component size of an
-	array with a scalar component if the component type is
-	overaligned.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* inline.adb (Make_Loop_Labels_Unique): New procedure to modify
-	the source code of subprograms that are inlined by the
-	front-end, to prevent accidental duplication between loop labels
-	in the inlined code and the code surrounding the inlined call.
-
-2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* doc/gnat_ugn/elaboration_order_handling_in_gnat.rst: Update
-	the section on resolving elaboration circularities to eliminate
-	certain combinations of switches which together do not produce
-	the desired effect and confuse users.
-	* gnat_ugn.texi: Regenerate.
-
-2019-07-03  Arnaud Charlet  <charlet@adacore.com>
-
-	* bindgen.adb (Gen_Main): Disable generation of reference to
-	Ada_Main_Program_Name for CCG.
-	* bindusg.adb (Display): Add -G to the command-line usage for
-	gnatbind.
-	* opt.ads (Generate_C_Code): Update comment.
-	* switch-b.adb (Scan_Binder_Switches): Add handling for -G.
-
-2019-07-03  Arnaud Charlet  <charlet@adacore.com>
-
-	* sem_ch7.adb (Has_Referencer): Do not consider inlined
-	subprograms when generating C code, which allows us to generate
-	static inline subprograms.
-
-2019-07-03  Justin Squirek  <squirek@adacore.com>
-
-	* sem_ch6.adb (Check_Conformance): Add expression checking for
-	constant modifiers in anonymous access types (in addition to
-	"non-null" types) so that they are considered "matching" for
-	subsequent conformance tests.
-
-2019-07-03  Arnaud Charlet  <charlet@adacore.com>
-
-	* doc/gnat_rm/standard_and_implementation_defined_restrictions.rst:
-	Clarify wording on No_Multiple_Elaboration.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-03  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch8.adb (Find_Selected_Component): If the prefix is the
-	current instance of a type or subtype, complete the resolution
-	of the name by finding the component of the type denoted by the
-	selector name.
-
-2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* doc/gnat_rm/interfacing_to_other_languages.rst (Interfacing to C):
-	Document that boolean types with convention C now map to C99 bool.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-03  Javier Miranda  <miranda@adacore.com>
-
-	* exp_attr.adb (Expand_Min_Max_Attribute): Code cleanup:
-	removing code that it is now never executed in the CCG compiler
-	(dead code).
-
-2019-07-02  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* libgnat/system-darwin-ppc.ads: Set Stack_Check_Probes True for
-	PPC Darwin.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch12.adb (Is_Defaulted): New predicate in
-	Check_Formal_Package_Intance, to skip the conformance of checks
-	on parameters of a formal package that are defaulted,
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* checks.adb, exp_ch9.adb, exp_unst.adb, sem_ch4.adb,
-	sem_prag.adb, sem_spark.adb: Minor reformatting.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_attr.adb (Analyze_Attribute, case Enum_Rep): Allow prefix
-	of attribute to be an attribute reference of a discrete type.
-
-2019-07-01  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* sem_ch12.adb (Analyze_Subprogram_Instantiation): Move up
-	handling of Has_Pragma_Inline_Always and deal with
-	Has_Pragma_No_Inline.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_ch3.adb (Build_Derived_Record_Type): If the parent type is
-	declared as a subtype of a private type with an inherited
-	discriminant constraint, its generated full base appears as a
-	record subtype, so we need to retrieve its oen base type so that
-	the inherited constraint can be applied to it.
-
-2019-07-01  Yannick Moy  <moy@adacore.com>
-
-	* sem_spark.adb: Completely rework the algorithm for ownership
-	checking, as the rules in SPARK RM have changed a lot.
-	* sem_spark.ads: Update comments.
-
-2019-07-01  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* gsocket.h (Has_Sockaddr_Len): Use the offset of sin_family offset in
-	the sockaddr_in structure to determine the existence of length field
-	before the sin_family.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* sem_prag.adb (Analyze_Pragma, case Weak_External): Pragma only
-	applies to entities with run-time addresses, not to types.
-
-2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
-
-	* einfo.adb, sem_ch7.adb, sem_prag.adb, sem_util.adb: Update
-	references to the SPARK RM after the removal of Rule 7.1.4(5).
-
-2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
-
-	* sysdep.c: Cleanup references to LynuxWorks in docs and
-	comments.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* checks.adb (Insert_Valid_Check): Do not apply validity check
-	to variable declared within a protected object that uses the
-	Lock_Free implementation, to prevent unwarranted constant
-	folding, because entities within such an object msut be treated
-	as volatile.
-
-2019-07-01  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* exp_ch9.adb (Check_Inlining): Deal with Has_Pragma_No_Inline.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_unst.adb (Visit_Node, Check_Static_Type): Improve the
-	handling of private and incomplete types whose full view is an
-	access type, to detect additional uplevel references in dynamic
-	bounds. This is relevant to N_Free_Statement among others that
-	manipulate types whose full viww may be an access type.
-
-2019-07-01  Pat Rogers  <rogers@adacore.com>
-
-	* doc/gnat_rm/representation_clauses_and_pragmas.rst: Correct
-	size indicated for R as a component of an array.
-	* gnat_rm.texi: Regenerate.
-
-2019-07-01  Justin Squirek  <squirek@adacore.com>
-
-	* libgnat/s-win32.ads: Add definition for ULONG, modify
-	OVERLAPPED type, and add appropriate pragmas.
-
-2019-07-01  Bob Duff  <duff@adacore.com>
-
-	* gnat1drv.adb (gnat1drv): Call Write_ALI if the main unit is
-	ignored-ghost.
-
-2019-07-01  Yannick Moy  <moy@adacore.com>
-
-	* sem_ch4.adb (Operator_Check): Refine error message.
-
-2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
-
-	* libgnat/a-calend.ads: Revert "Global => null" contracts on
-	non-pure routines.
-
-2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
-
-	* exp_attr.adb, libgnat/g-graphs.ads: Fix typos in comments:
-	componant -> component.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* libgnat/g-graphs.adb: Use type Directed_Graph rather than
-	Instance in various routines.
-	* libgnat/g-graphs.ads: Change type Instance to Directed_Graph.
-	Update various routines that mention the type.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* libgnat/g-sets.adb: Use type Membership_Set rathern than
-	Instance in various routines.
-	* libgnat/g-sets.ads: Change type Instance to Membership_Set.
-	Update various routines that mention the type.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* libgnat/g-lists.adb: Use type Doubly_Linked_List rather than
-	Instance in various routines.
-	* libgnat/g-lists.ads: Change type Instance to
-	Doubly_Linked_List. Update various routines that mention the
-	type.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* libgnat/g-dynhta.adb: Use type Dynamic_Hash_Table rather than
-	Instance in various routines.
-	* libgnat/g-dynhta.ads: Change type Instance to
-	Dynamic_Hash_Table. Update various routines that mention the
-	type.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* exp_attr.adb, exp_ch7.adb, exp_unst.adb, sem_ch3.adb,
-	sem_util.adb, uintp.adb, uintp.ads: Minor reformatting.
-
-2019-07-01  Javier Miranda  <miranda@adacore.com>
-
-	* exp_attr.adb (Expand_Min_Max_Attribute): Disable expansion of
-	'Min/'Max on integer, enumeration, fixed point and floating
-	point types since the CCG backend now provides in file
-	standard.h routines to support it.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* impunit.adb: Add GNAT.Graphs to list Non_Imp_File_Names_95.
-	* Makefile.rtl, gcc-interface/Make-lang.in: Register unit
-	GNAT.Graphs.
-	* libgnat/g-dynhta.adb: Various minor cleanups (use Present
-	rather than direct comparisons).
-	(Delete): Reimplement to use Delete_Node.
-	(Delete_Node): New routine.
-	(Destroy_Bucket): Invoke the provided destructor.
-	(Present): New routines.
-	* libgnat/g-dynhta.ads: Add new generic formal Destroy_Value.
-	Use better names for the components of iterators.
-	* libgnat/g-graphs.adb, libgnat/g-graphs.ads: New unit.
-	* libgnat/g-lists.adb: Various minor cleanups (use Present
-	rather than direct comparisons).
-	(Delete_Node): Invoke the provided destructor.
-	(Present): New routine.
-	* libgnat/g-lists.ads: Add new generic formal Destroy_Element.
-	Use better names for the components of iterators.
-	(Present): New routine.
-	* libgnat/g-sets.adb, libgnat/g-sets.ads (Destroy, Preset,
-	Reset): New routines.
-
-2019-07-01  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	* libgnat/g-sothco.adb (Get_Address): Fix the case when AF_INET6
-	is not defined.
-
-2019-07-01  Ed Schonberg  <schonberg@adacore.com>
-
-	* exp_attr.adb (Expand_Attribute_Reference, case Invalid_Value):
-	Resolve result of call to Get_Simple_Init_Val, which may be a
-	conversion of a literal.
-
-2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
-
-	* freeze.adb (Freeze_Expression): Remove the horrible useless
-	name hiding of N. Insert the freeze nodes generated by the
-	expression prior to the expression when the nearest enclosing
-	scope is transient.
-
-2019-07-01  Pierre-Marie de Rodat  <derodat@adacore.com>
-
-	* doc/gnat_ugn/building_executable_programs_with_gnat.rst: Fix
-	formatting issues in the -gnatR section.
-	* gnat_ugn.texi: Regenerate.
-
-2019-06-30  Iain Sandoe  <iain@sandoe.co.uk>
-
-	* gnatlink.adb (Link_Step): Remove duplicate -static-libgcc switches.
-	Push -shared-libgcc explicitly, when it is the target default (unless
-	overidden by the static flag).
-	When the user has put an instance of shared/static-libgcc do not push
-	a duplicate of this.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (gnat_to_gnu_entity): Beep up comment on SAVED,
-	and tweak comment on the assertion about the scopes of Itypes.  Do not
-	skip the regular processing for Itypes that are E_Record_Subtype with
-	a Cloned_Subtype.  Get the Cloned_Subtype for every E_Record_Subtype
-	if the type is dummy and hasn't got its own freeze node.
-	<E_Record_Subtype>: Save again the DECL of the Cloned_Subtype, if any.
-	<E_Access_Subtype>: Save again the DECL of the equivalent type.
-	(Gigi_Equivalent_Type) <E_Access_Subtype>: New case.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/utils.c (unchecked_convert): Tweak comment.  Only skip
-	dereferences when padding to have the same size on both sides.  Do it
-	for destination types with self-referential size too.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: If the
-	type requires strict alignment, then set the RM size to the type size.
-	Rework handling of alignment and sizes of tagged types in ASIS mode.
-	(validate_size): Rename local variable and remove special handling for
-	strict-alignment types.
-	* gcc-interface/utils.c (finish_record_type): Constify local variables
-	and use properly typed constants.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (gnat_to_gnu_field): Rework error messages for
-	fields requiring strict alignment, add explicit test on Storage_Unit
-	for position and size, and mention type alignment for position.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (mark_visited_r): Set TYPE_SIZES_GIMPLIFIED on
-	the main variant of a type, if any.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (set_nonaliased_component_on_array_type): Add
-	missing guard for the presence of TYPE_CANONICAL.
-	(set_reverse_storage_order_on_array_type): Likewise.
-
-2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/gigi.h (make_packable_type): Remove default value.
-	(value_factor_p): Tweak prototype.
-	* gcc-interface/decl.c (gnat_to_gnu_entity): Add comment.
-	(gnat_to_gnu_component_type): Likewise.
-	(gnat_to_gnu_field): Likewise.  Fetch the position of the field earlier
-	and simplify the condition under which the type is packed.  Declare
- 	local variable is_bitfield.  Pass 1 as max_align to make_packable_type
-	if it is set to true.
-	(copy_and_substitute_in_layout): Pass 0 to make_packable_type.
-	* gcc-interface/utils.c (make_packable_array_type): New function.
-	(make_packable_type): Use it to rewrite the type of array field.
-	(maybe_pad_type): Pass align parameter to make_packable_type.
-	(create_field_decl): Minor tweaks.
-	(value_factor_p): Assert that FACTOR is a power of 2 and replace the
-	modulo computation by a masking operation.
-
-2019-06-25  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (gnat_to_gnu_entity): Remove superfluous test
-	in previous change.
-	* gcc-interface/gigi.h (maybe_character_type): Fix formatting.
-	(maybe_character_value): Likewise.
-
-2019-06-24  Jan Hubicka  <jh@suse.cz>
-
-	* gcc-interface/decl.c (gnat_to_gnu_entity): Check that
-	type is array or integer prior checking string flag.
-	* gcc-interface/gigi.h (maybe_character_type): Likewise.
-	(maybe_character_value): Likewise.
-
-2019-06-24  Martin Sebor  <msebor@redhat.com>
-
-	* gcc-interface/utils.c (handle_nonnull_attribute): Quote attribute
-	name.
-
-2019-06-18  Arnaud Charlet  <charlet@adacore.com>
-
-	PR ada/80590
-	* sem_ch5.adb (Analyze_Loop_Statement): Avoid exception propagation
-	during normal processing.
-
-2019-06-17  Arnaud Charlet  <charlet@adacore.com>
-
-	PR ada/80590
-	* exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two
-	conditions to avoid a unnecessary exception propagation in the default
-	case.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/utils.c (handle_stack_protect_attribute): Move around.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* doc/gnat_rm/implementation_defined_pragmas.rst (Machine_Attribute):
-	Document additional optional parameters.
-	* sem_prag.adb (Analyze_Pragma) <Pragma_Machine_Attribute>: Accept
-	more than one optional parameter.
-	* gcc-interface/decl.c (prepend_one_attribute_pragma): Alphabetize
-	the list of supported pragmas.  Simplify the handling of parameters
-	and add support for more than one optional parameter.
-	* gcc-interface/utils.c (attr_cold_hot_exclusions): New constant.
-	(gnat_internal_attribute_table): Add entry for no_icf, noipa, flatten,
-	used, cold, hot, target and target_clones.
-	(begin_subprog_body): Do not create the RTL for the subprogram here.
-	(handle_noicf_attribute): New static function.
-	(handle_noipa_attribute): Likewise.
-	(handle_flatten_attribute): Likewise.
-	(handle_used_attribute): Likewise.
-	(handle_cold_attribute): Likewise.
-	(handle_hot_attribute): Likewise.
-	(handle_target_attribute): Likewise.
-	(handle_target_clones_attribute): Likewise.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (lvalue_required_for_attribute_p): Return 0
-	for 'Size too.
-	(Identifier_to_gnu): Use the actual subtype for a reference to a
-	packed array in a return statement.
-	(Attribute_to_gnu) <Attr_Size>: Do not strip VIEW_CONVERT_EXPRs from
-	the prefix in every case.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (gnat_to_gnu): Remove superfluous tests on
-	Backend_Overflow_Checks_On_Target and rework comments.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (walk_nesting_tree): New static function.
-	(finalize_nrv): Use it to walk the entire nesting tree.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Subtype>: Remove
-	obsolete test on Is_For_Access_Subtype.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (components_to_record): Set a name on the type
-	created for the REP part, if any.
-	* gcc-interface/utils.c (finish_record_type): Only take the maximum
-	when merging sizes for a variant part at offset 0.
-	(merge_sizes): Rename has_rep parameter into max.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/utils.c (gnat_internal_attribute_table): Add support
-	for stack_protect attribute.
-	(handle_stack_protect_attribute): New static function.
-
-2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (intrin_arglists_compatible_p): Do not return
-	false if the internal builtin uses a variable list.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Call_to_gnu): Do not initialize the temporary
-	created out of addressability concerns if it's for the _Init parameter
-	of an initialization procedure.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/ada-builtin-types.def: New file.
-	* gcc-interface/ada-builtins.def: Likewise.
-	* gcc-interface/ada-tree.h (BUILT_IN_LIKELY): New macro.
-	(BUILT_IN_UNLIKELY): Likewise.
-	* gcc-interface/trans.c (independent_iterations_p): Initialize the
-	auto-vector to 16 elements.
-	(Call_to_gnu): Remove local variable and change the vector of actual
-	parameters to an auto-vector.  Do not convert actual parameters to
-	the argument type for front-end built-in functions.  Add support for
-	front-end built-in functions.
-	(build_noreturn_cond): Use internal instead of built-in function.
-	* gcc-interface/utils.c (c_builtin_type): Include ada-builtin-types.def
-	(install_builtin_function_types): Likewise.
-	(install_builtin_functions): Include ada-builtins.def first.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/utils.c (maybe_pad_type): Issue the warning for the
-	specific case of component types preferably.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Identifier_to_gnu): Minor tweaks.
-	(gnat_to_gnu): Do not convert the result if it is a reference to an
-	unconstrained array used as the prefix of an attribute reference that
-	requires an lvalue.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Gigi_Types_Compatible): New predicate.
-	(Identifier_to_gnu): Use it to assert that the type of the identifier
-	and that of its entity are compatible for gigi.  Rename a couple of
-	local variables and separate the processing of the result type.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Call_to_gnu): Use the unpadded type when
-	putting back an intermediate conversion the type of the actuals.
-
-2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (gnat_to_gnu) <Shift operations>: Convert the
-	count to the unsigned version of its base type before proceeding.
-
-2019-05-16  Martin Sebor  <msebor@redhat.com>
-
-	* gcc-interface/trans.c (check_inlining_for_nested_subprog): Quote
-	reserved names.
-
-2019-05-08  Arnaud Charlet  <charlet@adacore.com>
-
-	* standard.ads.h: New file.
-
-2019-05-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-
-	* gcc-interface/Makefile.in (install-gcc-specs): Use foreach.
-	Honor DESTDIR.
-
-2019-04-29  Michael K. Darling  <darlingm@gmail.com>
-
-	* gnatvsn.ads: Bump Library_Version to 10.
-
-2019-04-24  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
-	    Bernd Edlinger  <bernd.edlinger@hotmail.de>
-	    Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/89093
-	* raise-gcc.c (TARGET_ATTRIBUTE): Define.
-	(continue_unwind, personality_body, PERSONALITY_FUNCTION): Add
-	TARGET_ATTRIBUTE.
-
-2019-04-07  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* libgnat/i-cexten.ads (CFloat_128): New type.
-
-2019-03-22  Dmitriy Anisimkov  <anisimko@adacore.com>
-
-	PR ada/89583
-	* libgnat/g-socket.adb (Bind_Socket, Connect_Socket,
-	Send_Socket): Fix the computation of structure lengths passed to
-	low level routines.
-	(Is_IPv6_Address): Fix the number of expected colons.
-
-2019-03-11  Martin Liska  <mliska@suse.cz>
-
-	* gcc-interface/misc.c (gnat_post_options): Wrap option name in string
-	format message and fix GNU coding style.
-
-2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (gnat_to_gnu) <N_Aggregate>: Minor tweak.
-	* gcc-interface/utils.c (convert): Do not pad when doing an unchecked
-	conversion here.  Use TREE_CONSTANT throughout the function.
-	(unchecked_convert): Also pad if the source is a CONSTRUCTOR and the
-	destination is a more aligned array type or a larger aggregate type,
-	but not between original and packable versions of a type.
-
-2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/utils.c (max_size) <tcc_unary>: Be prepared for an
-	operand with VOID_TYPE.
-
-2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (elaborate_all_entities): Do not elaborate the
-	entities of a package renaming another one.
-
-2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Regular_Loop_to_gnu): Replace tests on
-	individual flag_unswitch_loops and flag_tree_loop_vectorize switches
-	with test on global optimize switch.
-	(Raise_Error_to_gnu): Likewise.
-
-2019-02-07  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* libgnarl/s-linux__sparc.ads (ETIMEDOUT): Set to correct value.
-
-2019-02-06  Arnaud Charlet  <charlet@adacore.com>
-
-	* libgnarl/s-linux__x32.ads: Resync list of signals with s-linux.ads
-
-2019-01-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* repinfo.adb (List_Component_Layout): Remove superfluous space for
-	zero-sized field.
-	* gcc-interface/ada-tree.h (TYPE_IS_EXTRA_SUBTYPE_P): New macro.
-	* gcc-interface/gigi.h (create_extra_subtype): Declare.
-	* gcc-interface/decl.c (TYPE_ARRAY_SIZE_LIMIT): Likewise.
-	(update_n_elem): New function.
-	(gnat_to_gnu_entity): Use create_extra_subtype to create extra subtypes
-	instead of doing it manually.
-	<E_Array_Type>: Use update_n_elem to compute the maximum size.  Use the
- 	index type instead of base type for the bounds. Set TYPE_ARRAY_MAX_SIZE
-	of the array to the maximum size.
-	<E_Array_Subtype>: Create an extra subtype using the index type of the
-	base array type for self-referential bounds.  Use update_n_elem to
-	compute the maximum size.  Set TYPE_ARRAY_MAX_SIZE of the array to the
-	maximum size.
-	(gnat_to_gnu_field): Clear DECL_NONADDRESSABLE_P on discriminants.
-	* gcc-interface/misc.c (gnat_get_alias_set): Return the alias set of
-	the base type for an extra subtype.
-	(gnat_type_max_size): Remove obsolete code.
-	* gcc-interface/trans.c (Attribute_to_gnu): Minor tweak.
-	(can_be_lower_p): Deal with pathological types.
-	* gcc-interface/utils.c (create_extra_subtype): New function.
-	(create_field_decl): Minor tweak.
-	(max_size) <tcc_reference>: Compute a better value by using the extra
- 	subtypes on the self-referential bounds.
-	<tcc_binary>: Rewrite.  Deal with "negative value" in unsigned types.
-	<tcc_expression>: Likewise.
-	* gcc-interface/utils2.c (compare_arrays): Retrieve the original bounds
-	of the arrays upfront.  Swap only if the second length is not constant.
-	Use comparisons on the original bounds consistently for the null tests.
-	(build_binary_op): Use TYPE_IS_EXTRA_SUBTYPE_P macro.
-	(build_allocator): Minor tweak.
-
-2019-01-27  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (array_type_has_nonaliased_component): Return
-	the same value for every dimension of a multidimensional array type.
-
-2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Regular_Loop_to_gnu): Use the SLOC of the
-	iteration scheme, if present, throughout the translation.
-
-2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (gnat_to_gnu) <N_Assignment_Statement>: Use
-	DECL_SIZE_UNIT instead of TYPE_SIZE_UNIT for the size to be assigned
-	by a call to memset if the LHS is a DECL.
-
-2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (struct loop_info_d): Remove artificial field.
-	(Loop_Statement_to_gnu): Do not set it.
-
-2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/trans.c (Iterate_Acc_Clause_Arg): Fix formatting.
-	(Acc_gnat_to_gnu): Likewise.
-	(Acc_Data_to_gnu): Likewise.
-	(Acc_Var_to_gnu): Likewise.
-	(Acc_Reduc_to_gnu): Likewise.
-	(Acc_Size_List_to_gnu): Likewise.
-	(Pragma_to_gnu) <Pragma_Acc_Loop>: Likewise.
-	<Pragma_Acc_Data>): Likewise.
-	(find_loop_for): Remove default value for parameters.
-	* gcc-interface/trans.c (gnat_to_gnu) <N_Op_And>: Merge into...
-	<N_Op_Eq>): ...this.
-
-2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Use test on
-	the sign bit instead of on the sign of the value.
-	<PLUS_EXPR>: Turn addition of negative constant into subtraction.
-	<MULT_EXPR>: Add test for degenerate case.
-	<BIT_AND_EXPR>: Simplify.
-
-2019-01-18  Sebastian Huber  <sebastian.huber@embedded-brains.de>
-
-	* s-oscons-tmplt.c (AF_INET6): Do not undefine for RTEMS.
-
-2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
-
-	PR other/16615
-	* exp_ch11.adb: Change "can not" to "cannot".
-	* sem_ch4.adb: Likewise.
-
-2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
-
-	PR other/16615
-	* exp_ch9.adb: Mechanically replace "can not" with "cannot".
-	* libgnat/s-regpat.ads: Likewise.
-	* par-ch4.adb: Likewise.
-	* set_targ.adb: Likewise.
-	* types.ads: Likewise.
-
-2019-01-08  Justin Squirek  <squirek@adacore.com>
-
-	Revert:
-	2018-07-31  Justin Squirek  <squirek@adacore.com>
-
-	* lib-writ.adb (Write_With_Lines): Modfiy the generation
-	of dependencies within ali files so that source unit
-	bodies are properly listed even if said bodies are
-	missing.  Perform legacy behavior in GNATprove mode.
-	* lib-writ.ads: Modify documentation to reflect current
-	behavior.
-
-	and:
-	2018-09-26  Justin Squirek  <squirek@adacore.com>
-
-	* lib-writ.adb, lib-writ.ads (Write_With_Lines): Add
-	documentation and an extra conditional check for RCI
-	units so that generated ali files will list the spec
-	only instead of a body when a body is not found.
-
-2019-01-04  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* gnatvsn.ads: Bump copyright year.
-
-2019-01-01  Jakub Jelinek  <jakub@redhat.com>
-
-	Update copyright years.
-
- 	* gnat_ugn.texi: Bump @copying's copyright year.
- 	* gnat_rm.texi: Likewise.
-
-Copyright (C) 2019 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
+	* sem_prag.adb (Analyze_Global_In_Decl_Part): Simplify previous
+	test, just like in a recent commit we simplified a similar test
+	for Depends contract.
\ No newline at end of file
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 5f7e6e5..c7c267a8 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -2429,8 +2429,7 @@ package body Sem_Prag is
                --  Constant related checks
 
                elsif Ekind (Item_Id) = E_Constant
-                 and then
-                   not Is_Access_Type (Underlying_Type (Etype (Item_Id)))
+                 and then not Is_Access_Type (Etype (Item_Id))
                then
 
                   --  Unless it is of an access type, a constant is a read-only
-- 
cgit v1.1


From 92219babbb18f8ee2590fe9e1040b0cc09d16b45 Mon Sep 17 00:00:00 2001
From: Patrick Bernardi <bernardi@adacore.com>
Date: Thu, 10 Oct 2019 15:22:55 +0000
Subject: [Ada] Flag Sec_Stack_Used incorrectly set by ghost code

2019-10-10  Patrick Bernardi  <bernardi@adacore.com>

gcc/ada/

	* bindgen.adb (System_Secondary_Stack_Package_In_Closure):
	Renamed flag System_Secondary_Stack_Used to be clearer of what
	it represents.
	(Gen_Adainit): Refactor secondary stack related code to make it
	clearer.
	* rtsfind.adb (Load_RTU): Don't set Sec_Stack_Used flag here
	(RTE): Set Sec_Stack_Used if the System.Secondary_Stack is
	referenced, but not if we're ignoring ghost code.

From-SVN: r276811
---
 gcc/ada/ChangeLog   |  13 +++++--
 gcc/ada/bindgen.adb | 104 +++++++++++++++++++++++++++-------------------------
 gcc/ada/rtsfind.adb |  62 ++++++++++++++++---------------
 3 files changed, 97 insertions(+), 82 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bb08e2d..1788f19 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
-2019-10-10  Piotr Trojanek  <trojanek@adacore.com>
+2019-10-10  Patrick Bernardi  <bernardi@adacore.com>
 
-	* sem_prag.adb (Analyze_Global_In_Decl_Part): Simplify previous
-	test, just like in a recent commit we simplified a similar test
-	for Depends contract.
\ No newline at end of file
+	* bindgen.adb (System_Secondary_Stack_Package_In_Closure):
+	Renamed flag System_Secondary_Stack_Used to be clearer of what
+	it represents.
+	(Gen_Adainit): Refactor secondary stack related code to make it
+	clearer.
+	* rtsfind.adb (Load_RTU): Don't set Sec_Stack_Used flag here
+	(RTE): Set Sec_Stack_Used if the System.Secondary_Stack is
+	referenced, but not if we're ignoring ghost code.
\ No newline at end of file
diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index e60cb7a..9ac50fe 100644
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -81,7 +81,7 @@ package body Bindgen is
    --  domains just before calling the main procedure from the environment
    --  task.
 
-   System_Secondary_Stack_Used : Boolean := False;
+   System_Secondary_Stack_Package_In_Closure : Boolean := False;
    --  Flag indicating whether the unit System.Secondary_Stack is in the
    --  closure of the partition. This is set by Resolve_Binder_Options, and
    --  is used to initialize the package in cases where the run-time brings
@@ -585,29 +585,33 @@ package body Bindgen is
             WBI ("");
          end if;
 
-         --  A restricted run-time may attempt to initialize the main task's
-         --  secondary stack even if the stack is not used. Consequently,
-         --  the binder needs to initialize Binder_Sec_Stacks_Count anytime
-         --  System.Secondary_Stack is in the enclosure of the partition.
+         if System_Secondary_Stack_Package_In_Closure then
+            --  System.Secondary_Stack is in the closure of the program
+            --  because the program uses the secondary stack or the restricted
+            --  run-time is unconditionally calling SS_Init. In both cases,
+            --  SS_Init needs to know the number of secondary stacks created by
+            --  the binder.
 
-         if System_Secondary_Stack_Used then
             WBI ("      Binder_Sec_Stacks_Count : Natural;");
             WBI ("      pragma Import (Ada, Binder_Sec_Stacks_Count, " &
                  """__gnat_binder_ss_count"");");
             WBI ("");
-         end if;
 
-         if Sec_Stack_Used then
-            WBI ("      Default_Secondary_Stack_Size : " &
-                 "System.Parameters.Size_Type;");
-            WBI ("      pragma Import (C, Default_Secondary_Stack_Size, " &
-                 """__gnat_default_ss_size"");");
+            --  Import secondary stack pool variables if the secondary stack
+            --  used. They are not referenced otherwise.
 
-            WBI ("      Default_Sized_SS_Pool : System.Address;");
-            WBI ("      pragma Import (Ada, Default_Sized_SS_Pool, " &
-                 """__gnat_default_ss_pool"");");
+            if Sec_Stack_Used then
+               WBI ("      Default_Secondary_Stack_Size : " &
+                    "System.Parameters.Size_Type;");
+               WBI ("      pragma Import (C, Default_Secondary_Stack_Size, " &
+                    """__gnat_default_ss_size"");");
 
-            WBI ("");
+               WBI ("      Default_Sized_SS_Pool : System.Address;");
+               WBI ("      pragma Import (Ada, Default_Sized_SS_Pool, " &
+                    """__gnat_default_ss_pool"");");
+
+               WBI ("");
+            end if;
          end if;
 
          WBI ("   begin");
@@ -642,48 +646,49 @@ package body Bindgen is
             WBI ("      null;");
          end if;
 
-         --  Generate default-sized secondary stack pool and set secondary
-         --  stack globals.
-
-         if Sec_Stack_Used then
+         --  Generate the default-sized secondary stack pool if the secondary
+         --  stack is used by the program.
 
-            --  Elaborate the body of the binder to initialize the default-
-            --  sized secondary stack pool.
+         if System_Secondary_Stack_Package_In_Closure then
+            if Sec_Stack_Used then
+               --  Elaborate the body of the binder to initialize the default-
+               --  sized secondary stack pool.
 
-            WBI ("");
-            WBI ("      " & Get_Ada_Main_Name & "'Elab_Body;");
+               WBI ("");
+               WBI ("      " & Get_Ada_Main_Name & "'Elab_Body;");
 
-            --  Generate the default-sized secondary stack pool and set the
-            --  related secondary stack globals.
+               --  Generate the default-sized secondary stack pool and set the
+               --  related secondary stack globals.
 
-            Set_String ("      Default_Secondary_Stack_Size := ");
+               Set_String ("      Default_Secondary_Stack_Size := ");
 
-            if Opt.Default_Sec_Stack_Size /= Opt.No_Stack_Size then
-               Set_Int (Opt.Default_Sec_Stack_Size);
-            else
-               Set_String ("System.Parameters.Runtime_Default_Sec_Stack_Size");
-            end if;
+               if Opt.Default_Sec_Stack_Size /= Opt.No_Stack_Size then
+                  Set_Int (Opt.Default_Sec_Stack_Size);
+               else
+                  Set_String
+                    ("System.Parameters.Runtime_Default_Sec_Stack_Size");
+               end if;
 
-            Set_Char (';');
-            Write_Statement_Buffer;
+               Set_Char (';');
+               Write_Statement_Buffer;
 
-            Set_String ("      Binder_Sec_Stacks_Count := ");
-            Set_Int (Num_Sec_Stacks);
-            Set_Char (';');
-            Write_Statement_Buffer;
+               Set_String ("      Binder_Sec_Stacks_Count := ");
+               Set_Int (Num_Sec_Stacks);
+               Set_Char (';');
+               Write_Statement_Buffer;
 
-            WBI ("      Default_Sized_SS_Pool := " &
-                   "Sec_Default_Sized_Stacks'Address;");
-            WBI ("");
+               WBI ("      Default_Sized_SS_Pool := " &
+                      "Sec_Default_Sized_Stacks'Address;");
+               WBI ("");
 
-         --  When a restricted run-time initializes the main task's secondary
-         --  stack but the program does not use it, no secondary stack is
-         --  generated. Binder_Sec_Stacks_Count is set to zero so the run-time
-         --  is aware that the lack of pre-allocated secondary stack is
-         --  expected.
+            else
+               --  The presence of System.Secondary_Stack in the closure of the
+               --  program implies the restricted run-time is unconditionally
+               --  calling SS_Init. Let SS_Init know that no stacks were
+               --  created.
 
-         elsif System_Secondary_Stack_Used then
-            WBI ("      Binder_Sec_Stacks_Count := 0;");
+               WBI ("      Binder_Sec_Stacks_Count := 0;");
+            end if;
          end if;
 
       --  Normal case (standard library not suppressed). Set all global values
@@ -3086,7 +3091,8 @@ package body Bindgen is
          --  Ditto for the use of System.Secondary_Stack
 
          Check_Package
-           (System_Secondary_Stack_Used, "system.secondary_stack%s");
+           (System_Secondary_Stack_Package_In_Closure,
+            "system.secondary_stack%s");
 
          --  Ditto for use of an SMP bareboard runtime
 
diff --git a/gcc/ada/rtsfind.adb b/gcc/ada/rtsfind.adb
index dc77590..65cc8bc 100644
--- a/gcc/ada/rtsfind.adb
+++ b/gcc/ada/rtsfind.adb
@@ -949,22 +949,16 @@ package body Rtsfind is
       Install_Ghost_Region (None, Empty);
       Install_SPARK_Mode   (None, Empty);
 
-      --  Note if secondary stack is used
-
-      if U_Id = System_Secondary_Stack then
-         Opt.Sec_Stack_Used := True;
-      end if;
-
-      --  Otherwise we need to load the unit, First build unit name
-      --  from the enumeration literal name in type RTU_Id.
+      --  Otherwise we need to load the unit, First build unit name from the
+      --  enumeration literal name in type RTU_Id.
 
       U.Uname                := Get_Unit_Name (U_Id);
       U.First_Implicit_With  := Empty;
 
-      --  Now do the load call, note that setting Error_Node to Empty is
-      --  a signal to Load_Unit that we will regard a failure to find the
-      --  file as a fatal error, and that it should not output any kind
-      --  of diagnostics, since we will take care of it here.
+      --  Now do the load call, note that setting Error_Node to Empty is a
+      --  signal to Load_Unit that we will regard a failure to find the file as
+      --  a fatal error, and that it should not output any kind of diagnostics,
+      --  since we will take care of it here.
 
       --  We save style checking switches and turn off style checking for
       --  loading the unit, since we don't want any style checking.
@@ -1245,21 +1239,6 @@ package body Rtsfind is
    ---------
 
    function RTE (E : RE_Id) return Entity_Id is
-      U_Id : constant RTU_Id := RE_Unit_Table (E);
-      U    : RT_Unit_Table_Record renames RT_Unit_Table (U_Id);
-
-      Lib_Unit : Node_Id;
-      Pkg_Ent  : Entity_Id;
-      Ename    : Name_Id;
-
-      --  The following flag is used to disable front-end inlining when RTE
-      --  is invoked. This prevents the analysis of other runtime bodies when
-      --  a particular spec is loaded through Rtsfind. This is both efficient,
-      --  and it prevents spurious visibility conflicts between use-visible
-      --  user entities, and entities in run-time packages.
-
-      Save_Front_End_Inlining : Boolean;
-
       procedure Check_RPC;
       --  Reject programs that make use of distribution features not supported
       --  on the current target. Also check that the PCS is compatible with the
@@ -1351,6 +1330,22 @@ package body Rtsfind is
          return Ent;
       end Find_Local_Entity;
 
+      --  Local variables
+
+      U_Id : constant RTU_Id := RE_Unit_Table (E);
+      U    : RT_Unit_Table_Record renames RT_Unit_Table (U_Id);
+
+      Ename    : Name_Id;
+      Lib_Unit : Node_Id;
+      Pkg_Ent  : Entity_Id;
+
+      Save_Front_End_Inlining : constant Boolean := Front_End_Inlining;
+      --  This flag is used to disable front-end inlining when RTE is invoked.
+      --  This prevents the analysis of other runtime bodies when a particular
+      --  spec is loaded through Rtsfind. This is both efficient, and prevents
+      --  spurious visibility conflicts between use-visible user entities, and
+      --  entities in run-time packages.
+
    --  Start of processing for RTE
 
    begin
@@ -1372,7 +1367,6 @@ package body Rtsfind is
          return Check_CRT (E, Find_Local_Entity (E));
       end if;
 
-      Save_Front_End_Inlining := Front_End_Inlining;
       Front_End_Inlining := False;
 
       --  Load unit if unit not previously loaded
@@ -1435,9 +1429,19 @@ package body Rtsfind is
       end if;
 
    <<Found>>
-      Maybe_Add_With (U);
 
+      --  Record whether the secondary stack is in use in order to generate
+      --  the proper binder code. No action is taken when the secondary stack
+      --  is pulled within an ignored Ghost context because all this code will
+      --  disappear.
+
+      if U_Id = System_Secondary_Stack and then Ghost_Mode /= Ignore then
+         Sec_Stack_Used := True;
+      end if;
+
+      Maybe_Add_With (U);
       Front_End_Inlining := Save_Front_End_Inlining;
+
       return Check_CRT (E, RE_Table (E));
    end RTE;
 
-- 
cgit v1.1


From c223b7646bff69adeea080fdddc499b30179efec Mon Sep 17 00:00:00 2001
From: Ed Schonberg <schonberg@adacore.com>
Date: Thu, 10 Oct 2019 15:23:01 +0000
Subject: [Ada] Spurious visibility error in predicate in generic instance

2019-10-10  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* sem_cat.adb (Set_Categorization_From_Pragma): Do not modify
	any visibility settings if there are no compilation_unit pragmas
	following the package declaration. Add comments for future
	cleanup.

From-SVN: r276812
---
 gcc/ada/ChangeLog   | 14 +++++---------
 gcc/ada/sem_cat.adb | 12 +++++++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1788f19..50654f0 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,10 +1,6 @@
-2019-10-10  Patrick Bernardi  <bernardi@adacore.com>
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
 
-	* bindgen.adb (System_Secondary_Stack_Package_In_Closure):
-	Renamed flag System_Secondary_Stack_Used to be clearer of what
-	it represents.
-	(Gen_Adainit): Refactor secondary stack related code to make it
-	clearer.
-	* rtsfind.adb (Load_RTU): Don't set Sec_Stack_Used flag here
-	(RTE): Set Sec_Stack_Used if the System.Secondary_Stack is
-	referenced, but not if we're ignoring ghost code.
\ No newline at end of file
+	* sem_cat.adb (Set_Categorization_From_Pragma): Do not modify
+	any visibility settings if there are no compilation_unit pragmas
+	following the package declaration. Add comments for future
+	cleanup.
\ No newline at end of file
diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index 663dca4..780fec9 100644
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -721,9 +721,15 @@ package body Sem_Cat is
       --  The purpose is to set categorization flags before analyzing the
       --  unit itself, so as to diagnose violations of categorization as
       --  we process each declaration, even though the pragma appears after
-      --  the unit.
-
-      if Nkind (P) /= N_Compilation_Unit then
+      --  the unit. This processing is only needsd if compilation unit
+      --  pragmas are present.
+      --  Note: this code may be incorrect in the unlikely case a child
+      --  genericc unit is instantiated as a child of its (non-generic)
+      --  parent, so that generic and insstance are siblings,
+
+      if Nkind (P) /= N_Compilation_Unit
+         or else No (First (Pragmas_After (Aux_Decls_Node (P))))
+      then
          return;
       end if;
 
-- 
cgit v1.1


From 2f26abccd0f04f87e348cb0127cc24fc7265f06a Mon Sep 17 00:00:00 2001
From: Bob Duff <duff@adacore.com>
Date: Thu, 10 Oct 2019 15:23:08 +0000
Subject: [Ada] Replace in Ordered_Maps gets tampering failure

2019-10-10  Bob Duff  <duff@adacore.com>

gcc/ada/

	* libgnat/a-cbdlli.adb, libgnat/a-cbhama.adb,
	libgnat/a-cbhase.adb, libgnat/a-cbmutr.adb,
	libgnat/a-cborma.adb, libgnat/a-cborse.adb,
	libgnat/a-cdlili.adb, libgnat/a-cidlli.adb,
	libgnat/a-cihama.adb, libgnat/a-cihase.adb,
	libgnat/a-cimutr.adb, libgnat/a-ciorma.adb,
	libgnat/a-ciorse.adb, libgnat/a-cobove.adb,
	libgnat/a-cohama.adb, libgnat/a-cohase.adb,
	libgnat/a-coinve.adb, libgnat/a-comutr.adb,
	libgnat/a-conhel.adb, libgnat/a-convec.adb,
	libgnat/a-coorma.adb, libgnat/a-coorse.adb (Reference,
	Constant_Reference): Use Busy instead of Lock, so we forbid
	tampering with cursors, rather than tampering with elements.

From-SVN: r276813
---
 gcc/ada/ChangeLog            | 19 ++++++++++++++-----
 gcc/ada/libgnat/a-cbdlli.adb |  6 +++---
 gcc/ada/libgnat/a-cbhama.adb | 10 +++++-----
 gcc/ada/libgnat/a-cbhase.adb | 10 +++++-----
 gcc/ada/libgnat/a-cbmutr.adb |  6 +++---
 gcc/ada/libgnat/a-cborma.adb | 10 +++++-----
 gcc/ada/libgnat/a-cborse.adb | 10 +++++-----
 gcc/ada/libgnat/a-cdlili.adb |  6 +++---
 gcc/ada/libgnat/a-cidlli.adb |  6 +++---
 gcc/ada/libgnat/a-cihama.adb | 10 +++++-----
 gcc/ada/libgnat/a-cihase.adb | 10 +++++-----
 gcc/ada/libgnat/a-cimutr.adb |  6 +++---
 gcc/ada/libgnat/a-ciorma.adb | 10 +++++-----
 gcc/ada/libgnat/a-ciorse.adb | 10 +++++-----
 gcc/ada/libgnat/a-cobove.adb | 10 +++++-----
 gcc/ada/libgnat/a-cohama.adb | 10 +++++-----
 gcc/ada/libgnat/a-cohase.adb | 10 +++++-----
 gcc/ada/libgnat/a-coinve.adb | 10 +++++-----
 gcc/ada/libgnat/a-comutr.adb |  6 +++---
 gcc/ada/libgnat/a-conhel.adb |  4 ++--
 gcc/ada/libgnat/a-convec.adb | 10 +++++-----
 gcc/ada/libgnat/a-coorma.adb | 10 +++++-----
 gcc/ada/libgnat/a-coorse.adb | 10 +++++-----
 23 files changed, 109 insertions(+), 100 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 50654f0..745c7b5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,15 @@
-2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+2019-10-10  Bob Duff  <duff@adacore.com>
 
-	* sem_cat.adb (Set_Categorization_From_Pragma): Do not modify
-	any visibility settings if there are no compilation_unit pragmas
-	following the package declaration. Add comments for future
-	cleanup.
\ No newline at end of file
+	* libgnat/a-cbdlli.adb, libgnat/a-cbhama.adb,
+	libgnat/a-cbhase.adb, libgnat/a-cbmutr.adb,
+	libgnat/a-cborma.adb, libgnat/a-cborse.adb,
+	libgnat/a-cdlili.adb, libgnat/a-cidlli.adb,
+	libgnat/a-cihama.adb, libgnat/a-cihase.adb,
+	libgnat/a-cimutr.adb, libgnat/a-ciorma.adb,
+	libgnat/a-ciorse.adb, libgnat/a-cobove.adb,
+	libgnat/a-cohama.adb, libgnat/a-cohase.adb,
+	libgnat/a-coinve.adb, libgnat/a-comutr.adb,
+	libgnat/a-conhel.adb, libgnat/a-convec.adb,
+	libgnat/a-coorma.adb, libgnat/a-coorse.adb (Reference,
+	Constant_Reference): Use Busy instead of Lock, so we forbid
+	tampering with cursors, rather than tampering with elements.
\ No newline at end of file
diff --git a/gcc/ada/libgnat/a-cbdlli.adb b/gcc/ada/libgnat/a-cbdlli.adb
index 4dea2e6..9a2282b 100644
--- a/gcc/ada/libgnat/a-cbdlli.adb
+++ b/gcc/ada/libgnat/a-cbdlli.adb
@@ -304,7 +304,7 @@ package body Ada.Containers.Bounded_Doubly_Linked_Lists is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1448,7 +1448,7 @@ package body Ada.Containers.Bounded_Doubly_Linked_Lists is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1564,7 +1564,7 @@ package body Ada.Containers.Bounded_Doubly_Linked_Lists is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cbhama.adb b/gcc/ada/libgnat/a-cbhama.adb
index 74e3d95..d5cc820 100644
--- a/gcc/ada/libgnat/a-cbhama.adb
+++ b/gcc/ada/libgnat/a-cbhama.adb
@@ -213,7 +213,7 @@ package body Ada.Containers.Bounded_Hashed_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -239,7 +239,7 @@ package body Ada.Containers.Bounded_Hashed_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -853,7 +853,7 @@ package body Ada.Containers.Bounded_Hashed_Maps is
         Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -987,7 +987,7 @@ package body Ada.Containers.Bounded_Hashed_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -1012,7 +1012,7 @@ package body Ada.Containers.Bounded_Hashed_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cbhase.adb b/gcc/ada/libgnat/a-cbhase.adb
index 390e82b..1fa2c21 100644
--- a/gcc/ada/libgnat/a-cbhase.adb
+++ b/gcc/ada/libgnat/a-cbhase.adb
@@ -231,7 +231,7 @@ package body Ada.Containers.Bounded_Hashed_Sets is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1077,7 +1077,7 @@ package body Ada.Containers.Bounded_Hashed_Sets is
         Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1606,7 +1606,7 @@ package body Ada.Containers.Bounded_Hashed_Sets is
               (Element => N.Element'Access,
                Control => (Controlled with TC))
             do
-               Lock (TC.all);
+               Busy (TC.all);
             end return;
          end;
       end Constant_Reference;
@@ -1787,7 +1787,7 @@ package body Ada.Containers.Bounded_Hashed_Sets is
                      Old_Pos  => Position,
                      Old_Hash => Hash (Key (Position))))
             do
-               Lock (Container.TC);
+               Busy (Container.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -1816,7 +1816,7 @@ package body Ada.Containers.Bounded_Hashed_Sets is
                     Old_Pos => P,
                     Old_Hash => Hash (Key)))
             do
-               Lock (Container.TC);
+               Busy (Container.TC);
             end return;
          end;
       end Reference_Preserving_Key;
diff --git a/gcc/ada/libgnat/a-cbmutr.adb b/gcc/ada/libgnat/a-cbmutr.adb
index 4c0f8fe..ad9edaa 100644
--- a/gcc/ada/libgnat/a-cbmutr.adb
+++ b/gcc/ada/libgnat/a-cbmutr.adb
@@ -600,7 +600,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
            (Element => Container.Elements (Position.Node)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -2291,7 +2291,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2490,7 +2490,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
            (Element => Container.Elements (Position.Node)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cborma.adb b/gcc/ada/libgnat/a-cborma.adb
index e4e4b57..005bca5 100644
--- a/gcc/ada/libgnat/a-cborma.adb
+++ b/gcc/ada/libgnat/a-cborma.adb
@@ -420,7 +420,7 @@ package body Ada.Containers.Bounded_Ordered_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -445,7 +445,7 @@ package body Ada.Containers.Bounded_Ordered_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1256,7 +1256,7 @@ package body Ada.Containers.Bounded_Ordered_Maps is
         Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1376,7 +1376,7 @@ package body Ada.Containers.Bounded_Ordered_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -1401,7 +1401,7 @@ package body Ada.Containers.Bounded_Ordered_Maps is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cborse.adb b/gcc/ada/libgnat/a-cborse.adb
index 7b98378..b553048 100644
--- a/gcc/ada/libgnat/a-cborse.adb
+++ b/gcc/ada/libgnat/a-cborse.adb
@@ -420,7 +420,7 @@ package body Ada.Containers.Bounded_Ordered_Sets is
            (Element => N.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -741,7 +741,7 @@ package body Ada.Containers.Bounded_Ordered_Sets is
               (Element => N.Element'Access,
                Control => (Controlled with TC))
             do
-               Lock (TC.all);
+               Busy (TC.all);
             end return;
          end;
       end Constant_Reference;
@@ -937,7 +937,7 @@ package body Ada.Containers.Bounded_Ordered_Sets is
                               Pos       => Position,
                               Old_Key   => new Key_Type'(Key (Position))))
             do
-               Lock (Container.TC);
+               Busy (Container.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -965,7 +965,7 @@ package body Ada.Containers.Bounded_Ordered_Sets is
                                Pos      => Find (Container, Key),
                                Old_Key  => new Key_Type'(Key)))
             do
-               Lock (Container.TC);
+               Busy (Container.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -1598,7 +1598,7 @@ package body Ada.Containers.Bounded_Ordered_Sets is
         Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
diff --git a/gcc/ada/libgnat/a-cdlili.adb b/gcc/ada/libgnat/a-cdlili.adb
index 9122d57..949fb0f 100644
--- a/gcc/ada/libgnat/a-cdlili.adb
+++ b/gcc/ada/libgnat/a-cdlili.adb
@@ -255,7 +255,7 @@ package body Ada.Containers.Doubly_Linked_Lists is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1226,7 +1226,7 @@ package body Ada.Containers.Doubly_Linked_Lists is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1357,7 +1357,7 @@ package body Ada.Containers.Doubly_Linked_Lists is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cidlli.adb b/gcc/ada/libgnat/a-cidlli.adb
index fd48045..65e4c10 100644
--- a/gcc/ada/libgnat/a-cidlli.adb
+++ b/gcc/ada/libgnat/a-cidlli.adb
@@ -280,7 +280,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
            (Element => Position.Node.Element,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1263,7 +1263,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1405,7 +1405,7 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
            (Element => Position.Node.Element,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cihama.adb b/gcc/ada/libgnat/a-cihama.adb
index 0971a00..b33246d 100644
--- a/gcc/ada/libgnat/a-cihama.adb
+++ b/gcc/ada/libgnat/a-cihama.adb
@@ -220,7 +220,7 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -249,7 +249,7 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
            (Element => Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -911,7 +911,7 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
         Container.HT.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1057,7 +1057,7 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -1086,7 +1086,7 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
            (Element => Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cihase.adb b/gcc/ada/libgnat/a-cihase.adb
index ce158d2..bec48d0 100644
--- a/gcc/ada/libgnat/a-cihase.adb
+++ b/gcc/ada/libgnat/a-cihase.adb
@@ -239,7 +239,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1229,7 +1229,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
         Container.HT.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2044,7 +2044,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
               (Element => Node.Element.all'Access,
                Control => (Controlled with TC))
             do
-               Lock (TC.all);
+               Busy (TC.all);
             end return;
          end;
       end Constant_Reference;
@@ -2232,7 +2232,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
                               Old_Pos   => Position,
                               Old_Hash  => Hash (Key (Position))))
             do
-               Lock (HT.TC);
+               Busy (HT.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -2266,7 +2266,7 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
                               Old_Pos   => P,
                               Old_Hash  => Hash (Key)))
             do
-               Lock (HT.TC);
+               Busy (HT.TC);
             end return;
          end;
       end Reference_Preserving_Key;
diff --git a/gcc/ada/libgnat/a-cimutr.adb b/gcc/ada/libgnat/a-cimutr.adb
index 18bfff0..c5cf221 100644
--- a/gcc/ada/libgnat/a-cimutr.adb
+++ b/gcc/ada/libgnat/a-cimutr.adb
@@ -488,7 +488,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1847,7 +1847,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2044,7 +2044,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-ciorma.adb b/gcc/ada/libgnat/a-ciorma.adb
index 5cc3590..818a2ae 100644
--- a/gcc/ada/libgnat/a-ciorma.adb
+++ b/gcc/ada/libgnat/a-ciorma.adb
@@ -374,7 +374,7 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -402,7 +402,7 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
            (Element => Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1250,7 +1250,7 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
         Container.Tree.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1387,7 +1387,7 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -1415,7 +1415,7 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
            (Element => Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-ciorse.adb b/gcc/ada/libgnat/a-ciorse.adb
index d979e88..7cc7dca 100644
--- a/gcc/ada/libgnat/a-ciorse.adb
+++ b/gcc/ada/libgnat/a-ciorse.adb
@@ -394,7 +394,7 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
            (Element => Position.Node.Element.all'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -788,7 +788,7 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
               (Element => Node.Element.all'Access,
                Control => (Controlled with TC))
             do
-               Lock (TC.all);
+               Busy (TC.all);
             end return;
          end;
       end Constant_Reference;
@@ -1017,7 +1017,7 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
                     Pos       => Position,
                     Old_Key   => new Key_Type'(Key (Position))))
          do
-               Lock (Tree.TC);
+               Busy (Tree.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -1049,7 +1049,7 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
                     Pos       => Find (Container, Key),
                     Old_Key   => new Key_Type'(Key)))
             do
-               Lock (Tree.TC);
+               Busy (Tree.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -1688,7 +1688,7 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
         Container.Tree.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
diff --git a/gcc/ada/libgnat/a-cobove.adb b/gcc/ada/libgnat/a-cobove.adb
index 3e48bc6..7508794 100644
--- a/gcc/ada/libgnat/a-cobove.adb
+++ b/gcc/ada/libgnat/a-cobove.adb
@@ -402,7 +402,7 @@ package body Ada.Containers.Bounded_Vectors is
            (Element => A (J)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -426,7 +426,7 @@ package body Ada.Containers.Bounded_Vectors is
            (Element => A (J)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -2067,7 +2067,7 @@ package body Ada.Containers.Bounded_Vectors is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2183,7 +2183,7 @@ package body Ada.Containers.Bounded_Vectors is
            (Element => A (J)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -2207,7 +2207,7 @@ package body Ada.Containers.Bounded_Vectors is
            (Element => A (J)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cohama.adb b/gcc/ada/libgnat/a-cohama.adb
index 0eb6e7e..e7da020 100644
--- a/gcc/ada/libgnat/a-cohama.adb
+++ b/gcc/ada/libgnat/a-cohama.adb
@@ -213,7 +213,7 @@ package body Ada.Containers.Hashed_Maps is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -238,7 +238,7 @@ package body Ada.Containers.Hashed_Maps is
            (Element => Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -836,7 +836,7 @@ package body Ada.Containers.Hashed_Maps is
         Container.HT.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -937,7 +937,7 @@ package body Ada.Containers.Hashed_Maps is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -962,7 +962,7 @@ package body Ada.Containers.Hashed_Maps is
            (Element => Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-cohase.adb b/gcc/ada/libgnat/a-cohase.adb
index 37e55b8..61ebf87 100644
--- a/gcc/ada/libgnat/a-cohase.adb
+++ b/gcc/ada/libgnat/a-cohase.adb
@@ -223,7 +223,7 @@ package body Ada.Containers.Hashed_Sets is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1119,7 +1119,7 @@ package body Ada.Containers.Hashed_Sets is
         Container.HT.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1839,7 +1839,7 @@ package body Ada.Containers.Hashed_Sets is
               (Element => Node.Element'Access,
                Control => (Controlled with TC))
             do
-               Lock (TC.all);
+               Busy (TC.all);
             end return;
          end;
       end Constant_Reference;
@@ -2025,7 +2025,7 @@ package body Ada.Containers.Hashed_Sets is
                               Old_Pos  => Position,
                               Old_Hash => Hash (Key (Position))))
             do
-               Lock (HT.TC);
+               Busy (HT.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -2055,7 +2055,7 @@ package body Ada.Containers.Hashed_Sets is
                               Old_Pos  => P,
                               Old_Hash => Hash (Key)))
             do
-               Lock (HT.TC);
+               Busy (HT.TC);
             end return;
          end;
       end Reference_Preserving_Key;
diff --git a/gcc/ada/libgnat/a-coinve.adb b/gcc/ada/libgnat/a-coinve.adb
index 22608c1..0dfe1c6 100644
--- a/gcc/ada/libgnat/a-coinve.adb
+++ b/gcc/ada/libgnat/a-coinve.adb
@@ -324,7 +324,7 @@ package body Ada.Containers.Indefinite_Vectors is
            (Element => Container.Elements.EA (Position.Index),
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -348,7 +348,7 @@ package body Ada.Containers.Indefinite_Vectors is
            (Element => Container.Elements.EA (Index),
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -2586,7 +2586,7 @@ package body Ada.Containers.Indefinite_Vectors is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2718,7 +2718,7 @@ package body Ada.Containers.Indefinite_Vectors is
            (Element => Container.Elements.EA (Position.Index),
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -2742,7 +2742,7 @@ package body Ada.Containers.Indefinite_Vectors is
            (Element => Container.Elements.EA (Index),
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-comutr.adb b/gcc/ada/libgnat/a-comutr.adb
index 59ed12b..9e6a00e 100644
--- a/gcc/ada/libgnat/a-comutr.adb
+++ b/gcc/ada/libgnat/a-comutr.adb
@@ -469,7 +469,7 @@ package body Ada.Containers.Multiway_Trees is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1830,7 +1830,7 @@ package body Ada.Containers.Multiway_Trees is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2023,7 +2023,7 @@ package body Ada.Containers.Multiway_Trees is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-conhel.adb b/gcc/ada/libgnat/a-conhel.adb
index 2908530..06af0da 100644
--- a/gcc/ada/libgnat/a-conhel.adb
+++ b/gcc/ada/libgnat/a-conhel.adb
@@ -38,7 +38,7 @@ package body Ada.Containers.Helpers is
       procedure Adjust (Control : in out Reference_Control_Type) is
       begin
          if Control.T_Counts /= null then
-            Lock (Control.T_Counts.all);
+            Busy (Control.T_Counts.all);
          end if;
       end Adjust;
 
@@ -60,7 +60,7 @@ package body Ada.Containers.Helpers is
       procedure Finalize (Control : in out Reference_Control_Type) is
       begin
          if Control.T_Counts /= null then
-            Unlock (Control.T_Counts.all);
+            Unbusy (Control.T_Counts.all);
             Control.T_Counts := null;
          end if;
       end Finalize;
diff --git a/gcc/ada/libgnat/a-convec.adb b/gcc/ada/libgnat/a-convec.adb
index e15ab5d..f5e2eb4 100644
--- a/gcc/ada/libgnat/a-convec.adb
+++ b/gcc/ada/libgnat/a-convec.adb
@@ -294,7 +294,7 @@ package body Ada.Containers.Vectors is
            (Element => Container.Elements.EA (Position.Index)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -316,7 +316,7 @@ package body Ada.Containers.Vectors is
            (Element => Container.Elements.EA (Index)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -2293,7 +2293,7 @@ package body Ada.Containers.Vectors is
       TC : constant Tamper_Counts_Access := Container.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -2409,7 +2409,7 @@ package body Ada.Containers.Vectors is
            (Element => Container.Elements.EA (Position.Index)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -2431,7 +2431,7 @@ package body Ada.Containers.Vectors is
            (Element => Container.Elements.EA (Index)'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-coorma.adb b/gcc/ada/libgnat/a-coorma.adb
index 8275802..e49ae90 100644
--- a/gcc/ada/libgnat/a-coorma.adb
+++ b/gcc/ada/libgnat/a-coorma.adb
@@ -336,7 +336,7 @@ package body Ada.Containers.Ordered_Maps is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -361,7 +361,7 @@ package body Ada.Containers.Ordered_Maps is
            (Element => Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -1180,7 +1180,7 @@ package body Ada.Containers.Ordered_Maps is
         Container.Tree.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
@@ -1307,7 +1307,7 @@ package body Ada.Containers.Ordered_Maps is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
@@ -1332,7 +1332,7 @@ package body Ada.Containers.Ordered_Maps is
            (Element => Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Reference;
diff --git a/gcc/ada/libgnat/a-coorse.adb b/gcc/ada/libgnat/a-coorse.adb
index 462f7f3..d2f8a58 100644
--- a/gcc/ada/libgnat/a-coorse.adb
+++ b/gcc/ada/libgnat/a-coorse.adb
@@ -349,7 +349,7 @@ package body Ada.Containers.Ordered_Sets is
            (Element => Position.Node.Element'Access,
             Control => (Controlled with TC))
          do
-            Lock (TC.all);
+            Busy (TC.all);
          end return;
       end;
    end Constant_Reference;
@@ -706,7 +706,7 @@ package body Ada.Containers.Ordered_Sets is
               (Element => Node.Element'Access,
                Control => (Controlled with TC))
             do
-               Lock (TC.all);
+               Busy (TC.all);
             end return;
          end;
       end Constant_Reference;
@@ -903,7 +903,7 @@ package body Ada.Containers.Ordered_Sets is
                      Pos       => Position,
                      Old_Key   => new Key_Type'(Key (Position))))
             do
-               Lock (Tree.TC);
+               Busy (Tree.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -931,7 +931,7 @@ package body Ada.Containers.Ordered_Sets is
                      Pos       => Find (Container, Key),
                      Old_Key   => new Key_Type'(Key)))
             do
-               Lock (Tree.TC);
+               Busy (Tree.TC);
             end return;
          end;
       end Reference_Preserving_Key;
@@ -1550,7 +1550,7 @@ package body Ada.Containers.Ordered_Sets is
         Container.Tree.TC'Unrestricted_Access;
    begin
       return R : constant Reference_Control_Type := (Controlled with TC) do
-         Lock (TC.all);
+         Busy (TC.all);
       end return;
    end Pseudo_Reference;
 
-- 
cgit v1.1


From 95a7982243dd1e589ed59007d36f36027a3412ef Mon Sep 17 00:00:00 2001
From: Ed Schonberg <schonberg@adacore.com>
Date: Thu, 10 Oct 2019 15:23:14 +0000
Subject: [Ada] Spurious restriction violation on Ghost code

2019-10-10  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* exp_ch6.adb (Expand_Simple_Function_Return_Statement): If the
	function to which the return statement applies is an
	Ignored_Ghost_Function, do not indicate that it uses the
	secondary stack when the return type is unconstrained.

From-SVN: r276814
---
 gcc/ada/ChangeLog   | 19 +++++--------------
 gcc/ada/exp_ch6.adb |  7 ++++++-
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 745c7b5..7579bb3 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,15 +1,6 @@
-2019-10-10  Bob Duff  <duff@adacore.com>
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
 
-	* libgnat/a-cbdlli.adb, libgnat/a-cbhama.adb,
-	libgnat/a-cbhase.adb, libgnat/a-cbmutr.adb,
-	libgnat/a-cborma.adb, libgnat/a-cborse.adb,
-	libgnat/a-cdlili.adb, libgnat/a-cidlli.adb,
-	libgnat/a-cihama.adb, libgnat/a-cihase.adb,
-	libgnat/a-cimutr.adb, libgnat/a-ciorma.adb,
-	libgnat/a-ciorse.adb, libgnat/a-cobove.adb,
-	libgnat/a-cohama.adb, libgnat/a-cohase.adb,
-	libgnat/a-coinve.adb, libgnat/a-comutr.adb,
-	libgnat/a-conhel.adb, libgnat/a-convec.adb,
-	libgnat/a-coorma.adb, libgnat/a-coorse.adb (Reference,
-	Constant_Reference): Use Busy instead of Lock, so we forbid
-	tampering with cursors, rather than tampering with elements.
\ No newline at end of file
+	* exp_ch6.adb (Expand_Simple_Function_Return_Statement): If the
+	function to which the return statement applies is an
+	Ignored_Ghost_Function, do not indicate that it uses the
+	secondary stack when the return type is unconstrained.
\ No newline at end of file
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index c569ca3..b311322 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -6895,7 +6895,12 @@ package body Exp_Ch6 is
       elsif Is_Thunk (Current_Scope) and then Is_Incomplete_Type (Exptyp) then
          return;
 
-      elsif not Requires_Transient_Scope (R_Type) then
+      --  A return statement from a Ghost function does not use the secondary
+      --  stack (or any other one).
+
+      elsif not Requires_Transient_Scope (R_Type)
+        or else Is_Ignored_Ghost_Entity (Scope_Id)
+      then
 
          --  Mutable records with variable-length components are not returned
          --  on the sec-stack, so we need to make sure that the back end will
-- 
cgit v1.1


From d408dbfeabe3b4a65f6e955e97c0bef92056a845 Mon Sep 17 00:00:00 2001
From: Anthony Leonardo Gracio <leonardo@adacore.com>
Date: Thu, 10 Oct 2019 15:23:19 +0000
Subject: [Ada] Mention GNAT Studio instead of GPS

2019-10-10  Anthony Leonardo Gracio  <leonardo@adacore.com>

gcc/ada/

	* doc/gnat_ugn/about_this_guide.rst,
	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
	doc/gnat_ugn/getting_started_with_gnat.rst,
	doc/gnat_ugn/gnat_and_program_execution.rst, errout.ads,
	exp_ch3.adb, gnatls.adb, impunit.adb, lib-writ.ads, opt.ads,
	sem_ch7.adb, sem_prag.adb, sem_res.adb, sem_warn.adb,
	terminals.c: Replace GPS by GNAT Studio.
	* gnat_ugn.texi: Regenerate.

From-SVN: r276815
---
 gcc/ada/ChangeLog                                  | 14 +++++++++-----
 gcc/ada/doc/gnat_ugn/about_this_guide.rst          |  6 +++---
 .../building_executable_programs_with_gnat.rst     |  4 ++--
 gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst |  6 +++---
 .../doc/gnat_ugn/gnat_and_program_execution.rst    |  4 ++--
 gcc/ada/errout.ads                                 |  4 ++--
 gcc/ada/exp_ch3.adb                                |  3 ++-
 gcc/ada/gnat_ugn.texi                              | 22 +++++++++++-----------
 gcc/ada/gnatls.adb                                 |  5 +++--
 gcc/ada/impunit.adb                                |  4 ++--
 gcc/ada/lib-writ.ads                               |  3 ++-
 gcc/ada/opt.ads                                    |  3 ++-
 gcc/ada/sem_ch7.adb                                |  2 +-
 gcc/ada/sem_prag.adb                               |  7 ++++---
 gcc/ada/sem_res.adb                                |  2 +-
 gcc/ada/sem_warn.adb                               |  8 ++++----
 gcc/ada/terminals.c                                |  2 +-
 17 files changed, 54 insertions(+), 45 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7579bb3..029925a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,10 @@
-2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+2019-10-10  Anthony Leonardo Gracio  <leonardo@adacore.com>
 
-	* exp_ch6.adb (Expand_Simple_Function_Return_Statement): If the
-	function to which the return statement applies is an
-	Ignored_Ghost_Function, do not indicate that it uses the
-	secondary stack when the return type is unconstrained.
\ No newline at end of file
+	* doc/gnat_ugn/about_this_guide.rst,
+	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
+	doc/gnat_ugn/getting_started_with_gnat.rst,
+	doc/gnat_ugn/gnat_and_program_execution.rst, errout.ads,
+	exp_ch3.adb, gnatls.adb, impunit.adb, lib-writ.ads, opt.ads,
+	sem_ch7.adb, sem_prag.adb, sem_res.adb, sem_warn.adb,
+	terminals.c: Replace GPS by GNAT Studio.
+	* gnat_ugn.texi: Regenerate.
\ No newline at end of file
diff --git a/gcc/ada/doc/gnat_ugn/about_this_guide.rst b/gcc/ada/doc/gnat_ugn/about_this_guide.rst
index d322b9d..1ab2f4c 100644
--- a/gcc/ada/doc/gnat_ugn/about_this_guide.rst
+++ b/gcc/ada/doc/gnat_ugn/about_this_guide.rst
@@ -90,11 +90,11 @@ following documents:
 * :title:`GNAT Reference_Manual`, which contains all reference material for the GNAT
   implementation of Ada.
 
-* :title:`Using the GNAT Programming Studio`, which describes the GPS
+* :title:`Using GNAT Studio`, which describes the GNAT Studio
   Integrated Development Environment.
 
-* :title:`GNAT Programming Studio Tutorial`, which introduces the
-  main GPS features through examples.
+* :title:`GNAT Studio Tutorial`, which introduces the
+  main GNAT Studio features through examples.
 
 * :title:`Debugging with GDB`,
   for all details on the use of the GNU source-level debugger.
diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
index 6f13452..457646a 100644
--- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
+++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
@@ -2377,7 +2377,7 @@ file) and have the following form:
 
 The first integer after the file name is the line number in the file,
 and the second integer is the column number within the line.
-``GPS`` can parse the error messages
+``GNAT Studio`` can parse the error messages
 and point to the referenced character.
 The following switches provide control over the error message
 format:
@@ -5139,7 +5139,7 @@ checks to be performed. The following checks are defined:
 
 
 .. end of switch description (leave this comment to ease automatic parsing for
-.. GPS
+.. GNAT Studio
 
 In the above rules, appearing in column one is always permitted, that is,
 counts as meeting either a requirement for a required preceding space,
diff --git a/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst b/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst
index 756e301..34dc355 100644
--- a/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst
+++ b/gcc/ada/doc/gnat_ugn/getting_started_with_gnat.rst
@@ -9,11 +9,11 @@ Getting Started with GNAT
 This chapter describes how to use GNAT's command line interface to build
 executable Ada programs.
 On most platforms a visually oriented Integrated Development Environment
-is also available, the GNAT Programming Studio (GPS).
-GPS offers a graphical "look and feel", support for development in
+is also available, the GNAT Programming Studio (GNAT Studio).
+GNAT Studio offers a graphical "look and feel", support for development in
 other programming languages, comprehensive browsing features, and
 many other capabilities.
-For information on GPS please refer to
+For information on GNAT Studio please refer to
 :title:`Using the GNAT Programming Studio`.
 
 
diff --git a/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst b/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst
index 56ee103..cae61e9 100644
--- a/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst
+++ b/gcc/ada/doc/gnat_ugn/gnat_and_program_execution.rst
@@ -116,9 +116,9 @@ Running GDB
 
 This section describes how to initiate the debugger.
 
-The debugger can be launched from a ``GPS`` menu or
+The debugger can be launched from a ``GNAT Studio`` menu or
 directly from the command line. The description below covers the latter use.
-All the commands shown can be used in the ``GPS`` debug console window,
+All the commands shown can be used in the ``GNAT Studio`` debug console window,
 but there are usually more GUI-based ways to achieve the same effect.
 
 The command to run ``GDB`` is
diff --git a/gcc/ada/errout.ads b/gcc/ada/errout.ads
index 9a54c7c..37db3e585 100644
--- a/gcc/ada/errout.ads
+++ b/gcc/ada/errout.ads
@@ -647,8 +647,8 @@ package Errout is
    --  CODEFIX Facility --
    -----------------------
 
-   --  The GPS and GNATBench IDE's have a codefix facility that allows for
-   --  automatic correction of a subset of the errors and warnings issued
+   --  The GNAT Studio and GNATBench IDE's have a codefix facility that allows
+   --  for automatic correction of a subset of the errors and warnings issued
    --  by the compiler. This is done by recognizing the text of specific
    --  messages using appropriate matching patterns.
 
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 18c6aaf..82a58b7 100644
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -6335,7 +6335,8 @@ package body Exp_Ch3 is
          --  would otherwise make two copies. The RM allows removing redunant
          --  Adjust/Finalize calls, but does not allow insertion of extra ones.
 
-         --  This part is disabled for now, because it breaks GPS builds
+         --  This part is disabled for now, because it breaks GNAT Studio
+         --  builds
 
          (False -- ???
             and then Nkind (Expr_Q) = N_Explicit_Dereference
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 5db9c76..a1ef122 100644
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -21,7 +21,7 @@
 
 @copying
 @quotation
-GNAT User's Guide for Native Platforms , Sep 14, 2019
+GNAT User's Guide for Native Platforms , Oct 09, 2019
 
 AdaCore
 
@@ -682,12 +682,12 @@ material for the several revisions of the Ada language standard.
 implementation of Ada.
 
 @item 
-@cite{Using the GNAT Programming Studio}, which describes the GPS
+@cite{Using GNAT Studio}, which describes the GNAT Studio
 Integrated Development Environment.
 
 @item 
-@cite{GNAT Programming Studio Tutorial}, which introduces the
-main GPS features through examples.
+@cite{GNAT Studio Tutorial}, which introduces the
+main GNAT Studio features through examples.
 
 @item 
 @cite{Debugging with GDB},
@@ -897,11 +897,11 @@ the '\' character should be used instead.
 This chapter describes how to use GNAT's command line interface to build
 executable Ada programs.
 On most platforms a visually oriented Integrated Development Environment
-is also available, the GNAT Programming Studio (GPS).
-GPS offers a graphical "look and feel", support for development in
+is also available, the GNAT Programming Studio (GNAT Studio).
+GNAT Studio offers a graphical "look and feel", support for development in
 other programming languages, comprehensive browsing features, and
 many other capabilities.
-For information on GPS please refer to
+For information on GNAT Studio please refer to
 @cite{Using the GNAT Programming Studio}.
 
 @menu
@@ -10446,7 +10446,7 @@ e.adb:4:20: ";" should be "is"
 
 The first integer after the file name is the line number in the file,
 and the second integer is the column number within the line.
-@code{GPS} can parse the error messages
+@code{GNAT Studio} can parse the error messages
 and point to the referenced character.
 The following switches provide control over the error message
 format:
@@ -14110,7 +14110,7 @@ if any.
 
 @c end of switch description (leave this comment to ease automatic parsing for
 
-@c GPS
+@c GNAT Studio
 
 In the above rules, appearing in column one is always permitted, that is,
 counts as meeting either a requirement for a required preceding space,
@@ -19394,9 +19394,9 @@ variables, and more generally to report on the state of execution.
 
 This section describes how to initiate the debugger.
 
-The debugger can be launched from a @code{GPS} menu or
+The debugger can be launched from a @code{GNAT Studio} menu or
 directly from the command line. The description below covers the latter use.
-All the commands shown can be used in the @code{GPS} debug console window,
+All the commands shown can be used in the @code{GNAT Studio} debug console window,
 but there are usually more GUI-based ways to achieve the same effect.
 
 The command to run @code{GDB} is
diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index 4c4a019..b5782aa 100644
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -53,8 +53,9 @@ with GNAT.OS_Lib;               use GNAT.OS_Lib;
 procedure Gnatls is
    pragma Ident (Gnat_Static_Version_String);
 
-   --  NOTE : The following string may be used by other tools, such as GPS. So
-   --  it can only be modified if these other uses are checked and coordinated.
+   --  NOTE : The following string may be used by other tools, such as
+   --  GNAT Studio. So it can only be modified if these other uses are checked
+   --  and coordinated.
 
    Project_Search_Path : constant String := "Project Search Path:";
    --  Label displayed in verbose mode before the directories in the project
diff --git a/gcc/ada/impunit.adb b/gcc/ada/impunit.adb
index 7e67569..7048ab4 100644
--- a/gcc/ada/impunit.adb
+++ b/gcc/ada/impunit.adb
@@ -32,8 +32,8 @@ with Namet;    use Namet;
 with Opt;      use Opt;
 with Uname;    use Uname;
 
---  Note: this package body is used by GPS and GNATBench to supply a list of
---  entries for help on available library routines.
+--  Note: this package body is used by GNAT Studio and GNATBench to supply a
+--  list of entries for help on available library routines.
 
 package body Impunit is
 
diff --git a/gcc/ada/lib-writ.ads b/gcc/ada/lib-writ.ads
index 7248a61..5045b91 100644
--- a/gcc/ada/lib-writ.ads
+++ b/gcc/ada/lib-writ.ads
@@ -56,7 +56,8 @@ package Lib.Writ is
    --  incompatible with new versions of the compiler. Any changes to ali file
    --  formats must be carefully evaluated to understand any such possible
    --  conflicts, and in particular, it is very undesirable to create conflicts
-   --  between older versions of GPS and newer versions of the compiler.
+   --  between older versions of GNAT Studio and newer versions of the
+   --  compiler.
 
    --  If the following guidelines are respected, downward compatibility
    --  problems (old tools reading new ali files) should be minimized:
diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index a07db75..1f068dc 100644
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -501,7 +501,8 @@ package Opt is
    Display_Compilation_Progress : Boolean := False;
    --  GNATMAKE, GPRBUILD
    --  Set True (-d switch) to display information on progress while compiling
-   --  files. Internal flag to be used in conjunction with an IDE (e.g GPS).
+   --  files. Internal flag to be used in conjunction with an IDE
+   --  (e.g GNAT Studio).
 
    type Distribution_Stub_Mode_Type is
    --  GNAT
diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb
index db6bffd..313cb4e 100644
--- a/gcc/ada/sem_ch7.adb
+++ b/gcc/ada/sem_ch7.adb
@@ -1271,7 +1271,7 @@ package body Sem_Ch7 is
 
       procedure Generate_Parent_References;
       --  For a child unit, generate references to parent units, for
-      --  GPS navigation purposes.
+      --  GNAT Studio navigation purposes.
 
       function Is_Public_Child (Child, Unit : Entity_Id) return Boolean;
       --  Child and Unit are entities of compilation units. True if Child
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index c7c267a8..76dd711 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -8194,15 +8194,16 @@ package body Sem_Prag is
             Set_Convention_From_Pragma (E);
 
             --  Treat a pragma Import as an implicit body, and pragma import
-            --  as implicit reference (for navigation in GPS).
+            --  as implicit reference (for navigation in GNAT Studio).
 
             if Prag_Id = Pragma_Import then
                Generate_Reference (E, Id, 'b');
 
             --  For exported entities we restrict the generation of references
             --  to entities exported to foreign languages since entities
-            --  exported to Ada do not provide further information to GPS and
-            --  add undesired references to the output of the gnatxref tool.
+            --  exported to Ada do not provide further information to
+            --  GNAT Studio and add undesired references to the output of the
+            --  gnatxref tool.
 
             elsif Prag_Id = Pragma_Export
               and then Convention (E) /= Convention_Ada
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 28d1352..4a50b09 100644
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -6845,7 +6845,7 @@ package body Sem_Res is
       end if;
 
       --  If this is a dispatching call, generate the appropriate reference,
-      --  for better source navigation in GPS.
+      --  for better source navigation in GNAT Studio.
 
       if Is_Overloadable (Nam)
         and then Present (Controlling_Argument (N))
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index 8f85057..f9a6062 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -821,10 +821,10 @@ package body Sem_Warn is
       function Generic_Body_Formal (E : Entity_Id) return Entity_Id;
       --  Warnings on unused formals of subprograms are placed on the entity
       --  in the subprogram body, which seems preferable because it suggests
-      --  a better codefix for GPS. The analysis of generic subprogram bodies
-      --  uses a different circuitry, so the choice for the proper placement
-      --  of the warning in the generic case takes place here, by finding the
-      --  body entity that corresponds to a formal in a spec.
+      --  a better codefix for GNAT Studio. The analysis of generic subprogram
+      --  bodies uses a different circuitry, so the choice for the proper
+      --  placement of the warning in the generic case takes place here, by
+      --  finding the body entity that corresponds to a formal in a spec.
 
       procedure May_Need_Initialized_Actual (Ent : Entity_Id);
       --  If an entity of a generic type has default initialization, then the
diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
index 0ce3fb7..af4417f 100644
--- a/gcc/ada/terminals.c
+++ b/gcc/ada/terminals.c
@@ -170,7 +170,7 @@ struct TTY_Process {
   BOOL usePipe;
 };
 
-/* Control whether create_child cause the process to inherit GPS'
+/* Control whether create_child cause the process to inherit GNAT Studio'
    error mode setting.  The default is 1, to minimize the possibility of
    subprocesses blocking when accessing unmounted drives.  */
 static int Vw32_start_process_inherit_error_mode = 1;
-- 
cgit v1.1


From f68289d82e55ad4239beea8a8fbb32981f814de0 Mon Sep 17 00:00:00 2001
From: Gary Dismukes <dismukes@adacore.com>
Date: Thu, 10 Oct 2019 15:23:24 +0000
Subject: [Ada] Generation of procedures for blocks occurring in elaboration
 code for LLVM

2019-10-10  Gary Dismukes  <dismukes@adacore.com>

gcc/ada/

	* exp_ch7.adb (Check_Unnesting_Elaboration_Code): Various
	cleanups.
	(Set_Elab_Proc): New procedure to create the defining identifier
	for a procedure created to encapsulate top-level blocks
	occurring as a part of library package elaboration.
	(First_Local_Scope): Function replaced by
	Reset_Scopes_To_Elab_Proc.
	(Reset_Scopes_To_Elab_Proc): New recursive procedure based on
	First_Local_Scope, which it replaces, that is called to traverse
	the statements of a library package body to locate top-level
	blocks and determine whether they contain nested subprograms
	that might address library-level objects of the package. Such
	blocks (and loops) and certain top-level subprograms within the
	statements will have their Scope reset here to match an
	encapsulating procedure created by
	Check_Unnesting_Elaboration_Code that will contain the
	statements.
	(Check_Unnesting_In_Decls_Or_Stmts): Code for handling blocks
	factored out into Unnest_Block. Add handling for package
	declarations and bodies, making recursive calls for
	visible/private declarations, body declarations, statements, and
	exception handlers. Also remove test for Is_Compilation_Unit:
	caller tests for Is_Library_Level_Entity instead.  Also, this
	proc's name was changed from Check_Unnesting_In_Declarations.
	(Check_Unnesting_In_Handlers): New procedure to traverse a
	sequence of exception handlers, calling
	Check_Unnesting_In_Decls_Or_Stmts on the statements of each
	handler.
	(Expand_N_Package_Body): Call Check_Unnesting_* routines only
	when Unnest_Subprogram_Mode is set and the current scope is a
	library-level entity (which includes packages and instantiations
	nested directly within a library unit).
	(Expand_N_Package_Declaration): Call Check_Unnesting_* routines
	only when Unnest_Subprogram_Mode is set and the current scope is
	a library-level entity (which includes packages and
	instantiations nested directly within a library unit).
	(Unnest_Block): New procedure factored out of
	Check_Unnesting_In_Decls_Or_Stmts, for creating a new procedure
	to replace a block statement and resetting the Scope fields of
	the block's top-level entities.

From-SVN: r276816
---
 gcc/ada/ChangeLog   |  50 +++++--
 gcc/ada/exp_ch7.adb | 380 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 269 insertions(+), 161 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 029925a..866de1f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,10 +1,42 @@
-2019-10-10  Anthony Leonardo Gracio  <leonardo@adacore.com>
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
 
-	* doc/gnat_ugn/about_this_guide.rst,
-	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
-	doc/gnat_ugn/getting_started_with_gnat.rst,
-	doc/gnat_ugn/gnat_and_program_execution.rst, errout.ads,
-	exp_ch3.adb, gnatls.adb, impunit.adb, lib-writ.ads, opt.ads,
-	sem_ch7.adb, sem_prag.adb, sem_res.adb, sem_warn.adb,
-	terminals.c: Replace GPS by GNAT Studio.
-	* gnat_ugn.texi: Regenerate.
\ No newline at end of file
+	* exp_ch7.adb (Check_Unnesting_Elaboration_Code): Various
+	cleanups.
+	(Set_Elab_Proc): New procedure to create the defining identifier
+	for a procedure created to encapsulate top-level blocks
+	occurring as a part of library package elaboration.
+	(First_Local_Scope): Function replaced by
+	Reset_Scopes_To_Elab_Proc.
+	(Reset_Scopes_To_Elab_Proc): New recursive procedure based on
+	First_Local_Scope, which it replaces, that is called to traverse
+	the statements of a library package body to locate top-level
+	blocks and determine whether they contain nested subprograms
+	that might address library-level objects of the package. Such
+	blocks (and loops) and certain top-level subprograms within the
+	statements will have their Scope reset here to match an
+	encapsulating procedure created by
+	Check_Unnesting_Elaboration_Code that will contain the
+	statements.
+	(Check_Unnesting_In_Decls_Or_Stmts): Code for handling blocks
+	factored out into Unnest_Block. Add handling for package
+	declarations and bodies, making recursive calls for
+	visible/private declarations, body declarations, statements, and
+	exception handlers. Also remove test for Is_Compilation_Unit:
+	caller tests for Is_Library_Level_Entity instead.  Also, this
+	proc's name was changed from Check_Unnesting_In_Declarations.
+	(Check_Unnesting_In_Handlers): New procedure to traverse a
+	sequence of exception handlers, calling
+	Check_Unnesting_In_Decls_Or_Stmts on the statements of each
+	handler.
+	(Expand_N_Package_Body): Call Check_Unnesting_* routines only
+	when Unnest_Subprogram_Mode is set and the current scope is a
+	library-level entity (which includes packages and instantiations
+	nested directly within a library unit).
+	(Expand_N_Package_Declaration): Call Check_Unnesting_* routines
+	only when Unnest_Subprogram_Mode is set and the current scope is
+	a library-level entity (which includes packages and
+	instantiations nested directly within a library unit).
+	(Unnest_Block): New procedure factored out of
+	Check_Unnesting_In_Decls_Or_Stmts, for creating a new procedure
+	to replace a block statement and resetting the Scope fields of
+	the block's top-level entities.
\ No newline at end of file
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index b00fc92..f1b7279 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -364,20 +364,39 @@ package body Exp_Ch7 is
 
    procedure Check_Unnesting_Elaboration_Code (N : Node_Id);
    --  The statement part of a package body that is a compilation unit may
-   --  contain blocks that declare local subprograms. In Subprogram_Unnesting
+   --  contain blocks that declare local subprograms. In Subprogram_Unnesting_
    --  Mode such subprograms must be handled as nested inside the (implicit)
    --  elaboration procedure that executes that statement part. To handle
    --  properly uplevel references we construct that subprogram explicitly,
    --  to contain blocks and inner subprograms, The statement part becomes
    --  a call to this subprogram. This is only done if blocks are present
-   --  in the statement list of the body.
-
-   procedure Check_Unnesting_In_Declarations (Decls : List_Id);
-   --  Similarly, the declarations in the package body may have created
-   --  blocks with nested subprograms. Such a block must be transformed into a
-   --  procedure followed by a call to it, so that unnesting can handle uplevel
-   --  references within these nested subprograms (typically generated
-   --  subprograms to handle finalization actions).
+   --  in the statement list of the body. (It would be nice to unify this
+   --  procedure with Check_Unnesting_In_Decls_Or_Stmts, if possible, since
+   --  they're doing very similar work, but are structured differently. ???)
+
+   procedure Check_Unnesting_In_Decls_Or_Stmts (Decls_Or_Stmts : List_Id);
+   --  Similarly, the declarations or statements in library-level packages may
+   --  have created blocks blocks with nested subprograms. Such a block must be
+   --  transformed into a procedure followed by a call to it, so that unnesting
+   --  can handle uplevel references within these nested subprograms (typically
+   --  subprograms that handle finalization actions). This also applies to
+   --  nested packages, including instantiations, in which case it must
+   --  recursively process inner bodies.
+
+   procedure Check_Unnesting_In_Handlers (N : Node_Id);
+   --  Similarly, check for blocks with nested subprograms occurring within
+   --  a set of exception handlers associated with a package body N.
+
+   procedure Unnest_Block (Decl : Node_Id);
+   --  Blocks that contain nested subprograms with up-level references need to
+   --  create activation records for them. We do this by rewriting the block as
+   --  a procedure, followed by a call to it in the same declarative list, to
+   --  replicate the semantics of the original block.
+   --
+   --  A common source for such block is a transient block created for a
+   --  construct (declaration, assignment, etc.) that involves controlled
+   --  actions or secondary-stack management, in which case the nested
+   --  subprogram is a finalizer.
 
    procedure Check_Visibly_Controlled
      (Prim : Final_Primitives;
@@ -4020,27 +4039,39 @@ package body Exp_Ch7 is
    --------------------------------------
 
    procedure Check_Unnesting_Elaboration_Code (N : Node_Id) is
-      Loc       : constant Source_Ptr := Sloc (N);
-      First_Ent : Entity_Id := Empty;
-      Loop_Id   : Entity_Id := Empty;
-
-      function First_Local_Scope (L : List_Id) return Entity_Id;
-      --  Find first entity in the elaboration code of the body that contains
-      --  or represents a subprogram body. A body can appear within a block or
-      --  a loop or can appear by itself if generated for an object declaration
-      --  that involves controlled actions. The first such entity encountered
-      --  is used to reset the scopes of all entities that become local to the
-      --  new elaboration procedure. This is needed for subsequent unnesting,
-      --  which depends on the scope links to determine the nesting level of
-      --  each subprogram.
+      Loc             : constant Source_Ptr := Sloc (N);
+      Block_Elab_Proc : Entity_Id           := Empty;
+
+      procedure Set_Block_Elab_Proc;
+      --  Create a defining identifier for a procedure that will replace
+      --  a block with nested subprograms (unless it has already been created,
+      --  in which case this is a no-op).
+
+      procedure Set_Block_Elab_Proc is
+      begin
+         if No (Block_Elab_Proc) then
+            Block_Elab_Proc :=
+              Make_Defining_Identifier (Loc, Chars => New_Internal_Name ('I'));
+         end if;
+      end Set_Block_Elab_Proc;
+
+      procedure Reset_Scopes_To_Block_Elab_Proc (L : List_Id);
+      --  Find entities in the elaboration code of a library package body that
+      --  contain or represent a subprogram body. A body can appear within a
+      --  block or a loop or can appear by itself if generated for an object
+      --  declaration that involves controlled actions. The first such entity
+      --  forces creation of a new procedure entity (via Set_Block_Elab_Proc)
+      --  that will be used to reset the scopes of all entities that become
+      --  local to the new elaboration procedure. This is needed for subsequent
+      --  unnesting actions, which depend on proper setting of the Scope links
+      --  to determine the nesting level of each subprogram.
 
       -----------------------
       --  Find_Local_Scope --
       -----------------------
 
-      function First_Local_Scope (L : List_Id) return Entity_Id is
+      procedure Reset_Scopes_To_Block_Elab_Proc (L : List_Id) is
          Id   : Entity_Id;
-         Scop : Entity_Id;
          Stat : Node_Id;
 
       begin
@@ -4050,41 +4081,36 @@ package body Exp_Ch7 is
                when N_Block_Statement =>
                   Id := Entity (Identifier (Stat));
 
-                  if No (First_Ent) then
-                     First_Ent := Id;
-                  end if;
+                  --  The Scope of this block needs to be reset to the new
+                  --  procedure if the block contains nested subprograms.
 
                   if Present (Id) and then Contains_Subprogram (Id) then
-                     return Id;
+                     Set_Block_Elab_Proc;
+                     Set_Scope (Id, Block_Elab_Proc);
                   end if;
 
                when N_Loop_Statement =>
                   Id := Entity (Identifier (Stat));
 
-                  if No (First_Ent) then
-                     First_Ent := Id;
-                  end if;
-
-                  if Contains_Subprogram (Id) then
+                  if Present (Id) and then Contains_Subprogram (Id) then
                      if Scope (Id) = Current_Scope then
-                        Loop_Id := Id;
+                        Set_Block_Elab_Proc;
+                        Set_Scope (Id, Block_Elab_Proc);
                      end if;
-
-                     return Id;
                   end if;
 
-               when N_If_Statement =>
-                  Scop := First_Local_Scope (Then_Statements (Stat));
+                  --  We traverse the loop's statements as well, which may
+                  --  include other block (etc.) statements that need to have
+                  --  their Scope set to Block_Elab_Proc. (Is this really the
+                  --  case, or do such nested blocks refer to the loop scope
+                  --  rather than the loop's enclosing scope???.)
 
-                  if Present (Scop) then
-                     return Scop;
-                  end if;
+                  Reset_Scopes_To_Block_Elab_Proc (Statements (Stat));
 
-                  Scop := First_Local_Scope (Else_Statements (Stat));
+               when N_If_Statement =>
+                  Reset_Scopes_To_Block_Elab_Proc (Then_Statements (Stat));
 
-                  if Present (Scop) then
-                     return Scop;
-                  end if;
+                  Reset_Scopes_To_Block_Elab_Proc (Else_Statements (Stat));
 
                   declare
                      Elif : Node_Id;
@@ -4092,11 +4118,8 @@ package body Exp_Ch7 is
                   begin
                      Elif := First (Elsif_Parts (Stat));
                      while Present (Elif) loop
-                        Scop := First_Local_Scope (Statements (Elif));
-
-                        if Present (Scop) then
-                           return Scop;
-                        end if;
+                        Reset_Scopes_To_Block_Elab_Proc
+                          (Then_Statements (Elif));
 
                         Next (Elif);
                      end loop;
@@ -4109,24 +4132,19 @@ package body Exp_Ch7 is
                   begin
                      Alt := First (Alternatives (Stat));
                      while Present (Alt) loop
-                        Scop := First_Local_Scope (Statements (Alt));
-
-                        if Present (Scop) then
-                           return Scop;
-                        end if;
+                        Reset_Scopes_To_Block_Elab_Proc (Statements (Alt));
 
                         Next (Alt);
                      end loop;
                   end;
 
+               --  Reset the Scope of a subprogram occurring at the top level
+
                when N_Subprogram_Body =>
                   Id := Defining_Entity (Stat);
 
-                  if No (First_Ent) then
-                     First_Ent := Id;
-                  end if;
-
-                  return Id;
+                  Set_Block_Elab_Proc;
+                  Set_Scope (Id, Block_Elab_Proc);
 
                when others =>
                   null;
@@ -4134,67 +4152,52 @@ package body Exp_Ch7 is
 
             Next (Stat);
          end loop;
-
-         return Empty;
-      end First_Local_Scope;
+      end Reset_Scopes_To_Block_Elab_Proc;
 
       --  Local variables
 
       H_Seq     : constant Node_Id := Handled_Statement_Sequence (N);
       Elab_Body : Node_Id;
       Elab_Call : Node_Id;
-      Elab_Proc : Entity_Id;
-      Ent       : Entity_Id;
 
    --  Start of processing for Check_Unnesting_Elaboration_Code
 
    begin
-      if Unnest_Subprogram_Mode
-        and then Present (H_Seq)
-        and then Is_Compilation_Unit (Current_Scope)
-      then
-         Ent := First_Local_Scope (Statements (H_Seq));
+      if Present (H_Seq) then
+         Reset_Scopes_To_Block_Elab_Proc (Statements (H_Seq));
 
-         --  There msy be subprograms declared in the exception handlers
+         --  There may be subprograms declared in the exception handlers
          --  of the current body.
 
-         if No (Ent) and then Present (Exception_Handlers (H_Seq)) then
+         if Present (Exception_Handlers (H_Seq)) then
             declare
                Handler : Node_Id := First (Exception_Handlers (H_Seq));
             begin
                while Present (Handler) loop
-                  Ent := First_Local_Scope (Statements (Handler));
-                  if Present (Ent) then
-                     First_Ent := Ent;
-                     exit;
-                  end if;
+                  Reset_Scopes_To_Block_Elab_Proc (Statements (Handler));
 
                   Next (Handler);
                end loop;
             end;
          end if;
 
-         if Present (Ent) then
-            Elab_Proc :=
-              Make_Defining_Identifier (Loc,
-                Chars => New_Internal_Name ('I'));
-
+         if Present (Block_Elab_Proc) then
             Elab_Body :=
               Make_Subprogram_Body (Loc,
                 Specification              =>
                   Make_Procedure_Specification (Loc,
-                    Defining_Unit_Name => Elab_Proc),
+                    Defining_Unit_Name => Block_Elab_Proc),
                 Declarations               => New_List,
                 Handled_Statement_Sequence =>
                   Relocate_Node (Handled_Statement_Sequence (N)));
 
             Elab_Call :=
               Make_Procedure_Call_Statement (Loc,
-                Name => New_Occurrence_Of (Elab_Proc, Loc));
+                Name => New_Occurrence_Of (Block_Elab_Proc, Loc));
 
             Append_To (Declarations (N), Elab_Body);
             Analyze (Elab_Body);
-            Set_Has_Nested_Subprogram (Elab_Proc);
+            Set_Has_Nested_Subprogram (Block_Elab_Proc);
 
             Set_Handled_Statement_Sequence (N,
               Make_Handled_Sequence_Of_Statements (Loc,
@@ -4202,85 +4205,81 @@ package body Exp_Ch7 is
 
             Analyze (Elab_Call);
 
-            --  The scope of all blocks and loops in the elaboration code is
-            --  now the constructed elaboration procedure. Nested subprograms
-            --  within those blocks will have activation records if they
-            --  contain references to entities in the enclosing block or
-            --  the package itself.
-
-            Ent := First_Ent;
-            while Present (Ent) loop
-               Set_Scope (Ent, Elab_Proc);
-               Next_Entity (Ent);
-            end loop;
-
-            if Present (Loop_Id) then
-               Set_Scope (Loop_Id, Elab_Proc);
-            end if;
+            --  Could we reset the scopes of entities associated with the new
+            --  procedure here via a loop over entities rather than doing it in
+            --  the recursive Reset_Scopes_To_Elab_Proc procedure???
          end if;
       end if;
    end Check_Unnesting_Elaboration_Code;
 
-   -------------------------------------
-   -- Check_Unnesting_In_Declarations --
-   -------------------------------------
+   ---------------------------------------
+   -- Check_Unnesting_In_Decls_Or_Stmts --
+   ---------------------------------------
 
-   procedure Check_Unnesting_In_Declarations (Decls : List_Id) is
-      Decl       : Node_Id;
-      Ent        : Entity_Id;
-      Loc        : Source_Ptr;
-      Local_Body : Node_Id;
-      Local_Call : Node_Id;
-      Local_Proc : Entity_Id;
+   procedure Check_Unnesting_In_Decls_Or_Stmts (Decls_Or_Stmts : List_Id) is
+      Decl_Or_Stmt : Node_Id;
 
    begin
-      Local_Call := Empty;
-
       if Unnest_Subprogram_Mode
-        and then Present (Decls)
-        and then Is_Compilation_Unit (Current_Scope)
+        and then Present (Decls_Or_Stmts)
       then
-         Decl := First (Decls);
-         while Present (Decl) loop
-            if Nkind (Decl) = N_Block_Statement
-               and then Contains_Subprogram (Entity (Identifier (Decl)))
+         Decl_Or_Stmt := First (Decls_Or_Stmts);
+         while Present (Decl_Or_Stmt) loop
+            if Nkind (Decl_Or_Stmt) = N_Block_Statement
+              and then Contains_Subprogram (Entity (Identifier (Decl_Or_Stmt)))
             then
-               Ent := First_Entity (Entity (Identifier (Decl)));
-               Loc := Sloc (Decl);
-               Local_Proc :=
-                 Make_Defining_Identifier (Loc,
-                   Chars => New_Internal_Name ('P'));
-
-               Local_Body :=
-                 Make_Subprogram_Body (Loc,
-                   Specification              =>
-                     Make_Procedure_Specification (Loc,
-                       Defining_Unit_Name => Local_Proc),
-                       Declarations       => Declarations (Decl),
-                   Handled_Statement_Sequence =>
-                     Handled_Statement_Sequence (Decl));
-
-               Rewrite (Decl, Local_Body);
-               Analyze (Decl);
-               Set_Has_Nested_Subprogram (Local_Proc);
-
-               Local_Call :=
-                 Make_Procedure_Call_Statement (Loc,
-                   Name => New_Occurrence_Of (Local_Proc, Loc));
+               Unnest_Block (Decl_Or_Stmt);
 
-               Insert_After (Decl, Local_Call);
-               Analyze (Local_Call);
+            elsif Nkind (Decl_Or_Stmt) = N_Package_Declaration
+              and then not Modify_Tree_For_C
+            then
+               Check_Unnesting_In_Decls_Or_Stmts
+                 (Visible_Declarations (Specification (Decl_Or_Stmt)));
+               Check_Unnesting_In_Decls_Or_Stmts
+                 (Private_Declarations (Specification (Decl_Or_Stmt)));
 
-               while Present (Ent) loop
-                  Set_Scope (Ent, Local_Proc);
-                  Next_Entity (Ent);
-               end loop;
+            elsif Nkind (Decl_Or_Stmt) = N_Package_Body
+              and then not Modify_Tree_For_C
+            then
+               Check_Unnesting_In_Decls_Or_Stmts (Declarations (Decl_Or_Stmt));
+               if Present (Statements
+                    (Handled_Statement_Sequence (Decl_Or_Stmt)))
+               then
+                  Check_Unnesting_In_Decls_Or_Stmts (Statements
+                    (Handled_Statement_Sequence (Decl_Or_Stmt)));
+                  Check_Unnesting_In_Handlers (Decl_Or_Stmt);
+               end if;
             end if;
 
-            Next (Decl);
+            Next (Decl_Or_Stmt);
          end loop;
       end if;
-   end Check_Unnesting_In_Declarations;
+   end Check_Unnesting_In_Decls_Or_Stmts;
+
+   ---------------------------------
+   -- Check_Unnesting_In_Handlers --
+   ---------------------------------
+
+   procedure Check_Unnesting_In_Handlers (N : Node_Id) is
+      Stmt_Seq : constant Node_Id := Handled_Statement_Sequence (N);
+
+   begin
+      if Present (Stmt_Seq)
+        and then Present (Exception_Handlers (Stmt_Seq))
+      then
+         declare
+            Handler : Node_Id := First (Exception_Handlers (Stmt_Seq));
+         begin
+            while Present (Handler) loop
+               if Present (Statements (Handler)) then
+                  Check_Unnesting_In_Decls_Or_Stmts (Statements (Handler));
+               end if;
+
+               Next (Handler);
+            end loop;
+         end;
+      end if;
+   end Check_Unnesting_In_Handlers;
 
    ------------------------------
    -- Check_Visibly_Controlled --
@@ -5036,8 +5035,20 @@ package body Exp_Ch7 is
          --  end of the body statements.
 
          Expand_Pragma_Initial_Condition (Spec_Id, N);
-         Check_Unnesting_Elaboration_Code (N);
-         Check_Unnesting_In_Declarations (Declarations (N));
+
+         --  If this is a library-level package and unnesting is enabled,
+         --  check for the presence of blocks with nested subprograms occurring
+         --  in elaboration code, and generate procedures to encapsulate the
+         --  blocks in case the nested subprograms make up-level references.
+
+         if Unnest_Subprogram_Mode
+           and then
+             Is_Library_Level_Entity (Current_Scope)
+         then
+            Check_Unnesting_Elaboration_Code (N);
+            Check_Unnesting_In_Decls_Or_Stmts (Declarations (N));
+            Check_Unnesting_In_Handlers (N);
+         end if;
 
          Pop_Scope;
       end if;
@@ -5196,8 +5207,17 @@ package body Exp_Ch7 is
          Set_Finalizer (Id, Fin_Id);
       end if;
 
-      Check_Unnesting_In_Declarations (Visible_Declarations (Spec));
-      Check_Unnesting_In_Declarations (Private_Declarations (Spec));
+      --  If this is a library-level package and unnesting is enabled,
+      --  check for the presence of blocks with nested subprograms occurring
+      --  in elaboration code, and generate procedures to encapsulate the
+      --  blocks in case the nested subprograms make up-level references.
+
+      if Unnest_Subprogram_Mode
+        and then Is_Library_Level_Entity (Current_Scope)
+      then
+         Check_Unnesting_In_Decls_Or_Stmts (Visible_Declarations (Spec));
+         Check_Unnesting_In_Decls_Or_Stmts (Private_Declarations (Spec));
+      end if;
    end Expand_N_Package_Declaration;
 
    ----------------------------
@@ -9180,6 +9200,62 @@ package body Exp_Ch7 is
       Store_Actions_In_Scope (Cleanup, L);
    end Store_Cleanup_Actions_In_Scope;
 
+   ------------------
+   -- Unnest_Block --
+   ------------------
+
+   procedure Unnest_Block (Decl : Node_Id) is
+      Loc        : constant Source_Ptr := Sloc (Decl);
+      Ent        : Entity_Id;
+      Local_Body : Node_Id;
+      Local_Call : Node_Id;
+      Local_Proc : Entity_Id;
+      Local_Scop : Entity_Id;
+
+   begin
+      Local_Scop := Entity (Identifier (Decl));
+      Ent := First_Entity (Local_Scop);
+
+      Local_Proc :=
+        Make_Defining_Identifier (Loc,
+          Chars => New_Internal_Name ('P'));
+
+      Local_Body :=
+        Make_Subprogram_Body (Loc,
+          Specification              =>
+            Make_Procedure_Specification (Loc,
+              Defining_Unit_Name => Local_Proc),
+              Declarations       => Declarations (Decl),
+          Handled_Statement_Sequence =>
+            Handled_Statement_Sequence (Decl));
+
+      Rewrite (Decl, Local_Body);
+      Analyze (Decl);
+      Set_Has_Nested_Subprogram (Local_Proc);
+
+      Local_Call :=
+        Make_Procedure_Call_Statement (Loc,
+          Name => New_Occurrence_Of (Local_Proc, Loc));
+
+      Insert_After (Decl, Local_Call);
+      Analyze (Local_Call);
+
+      --  The new subprogram has the same scope as the original block
+
+      Set_Scope (Local_Proc, Scope (Local_Scop));
+
+      --  And the entity list of the new procedure is that of the block
+
+      Set_First_Entity (Local_Proc, Ent);
+
+      --  Reset the scopes of all the entities to the new procedure
+
+      while Present (Ent) loop
+         Set_Scope (Ent, Local_Proc);
+         Next_Entity (Ent);
+      end loop;
+   end Unnest_Block;
+
    --------------------------------
    -- Wrap_Transient_Declaration --
    --------------------------------
-- 
cgit v1.1


From d145e5628f3a72abb2991e2fe9f45af963500ee5 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@adacore.com>
Date: Thu, 10 Oct 2019 15:23:28 +0000
Subject: [Ada] Fix handling of -gnatceg on incomplete unit

2019-10-10  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* gnat1drv.adb (Gnat1drv): Skip code generation when handling an
	incomplete unit with -gnatceg.

From-SVN: r276817
---
 gcc/ada/ChangeLog    | 44 +++-----------------------------------------
 gcc/ada/gnat1drv.adb | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 43 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 866de1f..f4484cb 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,42 +1,4 @@
-2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+2019-10-10  Arnaud Charlet  <charlet@adacore.com>
 
-	* exp_ch7.adb (Check_Unnesting_Elaboration_Code): Various
-	cleanups.
-	(Set_Elab_Proc): New procedure to create the defining identifier
-	for a procedure created to encapsulate top-level blocks
-	occurring as a part of library package elaboration.
-	(First_Local_Scope): Function replaced by
-	Reset_Scopes_To_Elab_Proc.
-	(Reset_Scopes_To_Elab_Proc): New recursive procedure based on
-	First_Local_Scope, which it replaces, that is called to traverse
-	the statements of a library package body to locate top-level
-	blocks and determine whether they contain nested subprograms
-	that might address library-level objects of the package. Such
-	blocks (and loops) and certain top-level subprograms within the
-	statements will have their Scope reset here to match an
-	encapsulating procedure created by
-	Check_Unnesting_Elaboration_Code that will contain the
-	statements.
-	(Check_Unnesting_In_Decls_Or_Stmts): Code for handling blocks
-	factored out into Unnest_Block. Add handling for package
-	declarations and bodies, making recursive calls for
-	visible/private declarations, body declarations, statements, and
-	exception handlers. Also remove test for Is_Compilation_Unit:
-	caller tests for Is_Library_Level_Entity instead.  Also, this
-	proc's name was changed from Check_Unnesting_In_Declarations.
-	(Check_Unnesting_In_Handlers): New procedure to traverse a
-	sequence of exception handlers, calling
-	Check_Unnesting_In_Decls_Or_Stmts on the statements of each
-	handler.
-	(Expand_N_Package_Body): Call Check_Unnesting_* routines only
-	when Unnest_Subprogram_Mode is set and the current scope is a
-	library-level entity (which includes packages and instantiations
-	nested directly within a library unit).
-	(Expand_N_Package_Declaration): Call Check_Unnesting_* routines
-	only when Unnest_Subprogram_Mode is set and the current scope is
-	a library-level entity (which includes packages and
-	instantiations nested directly within a library unit).
-	(Unnest_Block): New procedure factored out of
-	Check_Unnesting_In_Decls_Or_Stmts, for creating a new procedure
-	to replace a block statement and resetting the Scope fields of
-	the block's top-level entities.
\ No newline at end of file
+	* gnat1drv.adb (Gnat1drv): Skip code generation when handling an
+	incomplete unit with -gnatceg.
\ No newline at end of file
diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index af07a06..7d507aa 100644
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -1412,11 +1412,25 @@ begin
 
       --  It is not an error to analyze in CodePeer mode a spec which requires
       --  a body, in order to generate SCIL for this spec.
-      --  Ditto for Generate_C_Code mode and generate a C header for a spec.
 
-      elsif CodePeer_Mode or Generate_C_Code then
+      elsif CodePeer_Mode then
          Back_End_Mode := Generate_Object;
 
+      --  Differentiate use of -gnatceg to generate a C header from an Ada spec
+      --  to the CCG case (standard.h found) where C code generation should
+      --  only be performed on full units.
+
+      elsif Generate_C_Code then
+         Name_Len := 10;
+         Name_Buffer (1 .. Name_Len) := "standard.h";
+
+         if Find_File (Name_Find, Osint.Source, Full_Name => True) = No_File
+         then
+            Back_End_Mode := Generate_Object;
+         else
+            Back_End_Mode := Skip;
+         end if;
+
       --  It is not an error to analyze in GNATprove mode a spec which requires
       --  a body, when the body is not available. During frame condition
       --  generation, the corresponding ALI file is generated. During
-- 
cgit v1.1


From 08f66419ef908d199ec55f24d9b64cc3287a5c3c Mon Sep 17 00:00:00 2001
From: Bob Duff <duff@adacore.com>
Date: Thu, 10 Oct 2019 15:23:33 +0000
Subject: [Ada] Assertion_Policy (Ignore) ignores invariants

2019-10-10  Bob Duff  <duff@adacore.com>

gcc/ada/

	* einfo.ads, einfo.adb (Invariants_Ignored): New flag on types.
	This leaves just one unused flag.
	* sem_prag.adb (Invariant): Set the flag if appropriate.
	* exp_util.adb (Make_Invariant_Call): Check the flag.

From-SVN: r276818
---
 gcc/ada/ChangeLog    |  8 +++++---
 gcc/ada/einfo.adb    | 15 ++++++++++++++-
 gcc/ada/einfo.ads    | 13 +++++++++++--
 gcc/ada/exp_util.adb | 14 ++++++++++----
 gcc/ada/sem_prag.adb |  9 +++++++++
 5 files changed, 49 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f4484cb..082fcf4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,6 @@
-2019-10-10  Arnaud Charlet  <charlet@adacore.com>
+2019-10-10  Bob Duff  <duff@adacore.com>
 
-	* gnat1drv.adb (Gnat1drv): Skip code generation when handling an
-	incomplete unit with -gnatceg.
\ No newline at end of file
+	* einfo.ads, einfo.adb (Invariants_Ignored): New flag on types.
+	This leaves just one unused flag.
+	* sem_prag.adb (Invariant): Set the flag if appropriate.
+	* exp_util.adb (Make_Invariant_Call): Check the flag.
\ No newline at end of file
diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb
index dcbeac5..98b508f 100644
--- a/gcc/ada/einfo.adb
+++ b/gcc/ada/einfo.adb
@@ -629,8 +629,8 @@ package body Einfo is
    --    Is_Activation_Record            Flag305
    --    Needs_Activation_Record         Flag306
    --    Is_Loop_Parameter               Flag307
+   --    Invariants_Ignored              Flag308
 
-   --    (unused)                        Flag308
    --    (unused)                        Flag309
 
    --  Note: Flag310-317 are defined in atree.ads/adb, but not yet in atree.h
@@ -2077,6 +2077,12 @@ package body Einfo is
       return Node21 (Id);
    end Interface_Name;
 
+   function Invariants_Ignored (Id : E) return B is
+   begin
+      pragma Assert (Is_Type (Id));
+      return Flag308 (Id);
+   end Invariants_Ignored;
+
    function Is_Abstract_Subprogram (Id : E) return B is
    begin
       pragma Assert (Is_Overloadable (Id));
@@ -5278,6 +5284,12 @@ package body Einfo is
       Set_Node21 (Id, V);
    end Set_Interface_Name;
 
+   procedure Set_Invariants_Ignored (Id : E; V : B := True) is
+   begin
+      pragma Assert (Is_Type (Id));
+      Set_Flag308 (Id, V);
+   end Set_Invariants_Ignored;
+
    procedure Set_Is_Abstract_Subprogram (Id : E; V : B := True) is
    begin
       pragma Assert (Is_Overloadable (Id));
@@ -9785,6 +9797,7 @@ package body Einfo is
       W ("In_Package_Body",                 Flag48  (Id));
       W ("In_Private_Part",                 Flag45  (Id));
       W ("In_Use",                          Flag8   (Id));
+      W ("Invariants_Ignored",              Flag308 (Id));
       W ("Is_Abstract_Subprogram",          Flag19  (Id));
       W ("Is_Abstract_Type",                Flag146 (Id));
       W ("Is_Access_Constant",              Flag69  (Id));
diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads
index 3e968a2..5366631 100644
--- a/gcc/ada/einfo.ads
+++ b/gcc/ada/einfo.ads
@@ -1739,7 +1739,7 @@ package Einfo is
 
 --    Has_Inherited_Invariants (Flag291) [base type only]
 --       Defined in all type entities. Set on private extensions and derived
---       types which inherit at least on class-wide invariant from a parent or
+--       types which inherit at least one class-wide invariant from a parent or
 --       an interface type. The flag is also set on the full view of a private
 --       extension for completeness.
 
@@ -1841,7 +1841,7 @@ package Einfo is
 --       when the type is subject to pragma Default_Initial_Condition.
 
 --    Has_Own_Invariants (Flag232) [base type only]
---       Defined in all type entities. Set on any type which defines at least
+--       Defined in all type entities. Set on any type that defines at least
 --       one invariant of its own. The flag is also set on the full view of a
 --       private type for completeness.
 
@@ -2259,6 +2259,11 @@ package Einfo is
 --       implemented by a tagged type that are not already implemented by the
 --       ancestors (Ada 2005: AI-251).
 
+--    Invariants_Ignored (Flag308)
+--       Defined on all types. Indicates whether the type declaration is in
+--       a context where Assertion_Policy is Ignore, in which case no checks
+--       (static or dynamic) must be generated for objects of the type.
+
 --    Invariant_Procedure (synthesized)
 --       Defined in types and subtypes. Set for private types and their full
 --       views if one or more [class-wide] invariants apply to the type, or
@@ -7272,6 +7277,7 @@ package Einfo is
    function Interface_Alias                     (Id : E) return E;
    function Interface_Name                      (Id : E) return N;
    function Interfaces                          (Id : E) return L;
+   function Invariants_Ignored                  (Id : E) return B;
    function Is_Abstract_Subprogram              (Id : E) return B;
    function Is_Abstract_Type                    (Id : E) return B;
    function Is_Access_Constant                  (Id : E) return B;
@@ -7973,6 +7979,7 @@ package Einfo is
    procedure Set_Interface_Alias                 (Id : E; V : E);
    procedure Set_Interface_Name                  (Id : E; V : N);
    procedure Set_Interfaces                      (Id : E; V : L);
+   procedure Set_Invariants_Ignored              (Id : E; V : B := True);
    procedure Set_Is_Abstract_Subprogram          (Id : E; V : B := True);
    procedure Set_Is_Abstract_Type                (Id : E; V : B := True);
    procedure Set_Is_Access_Constant              (Id : E; V : B := True);
@@ -8801,6 +8808,7 @@ package Einfo is
    pragma Inline (Interface_Alias);
    pragma Inline (Interface_Name);
    pragma Inline (Interfaces);
+   pragma Inline (Invariants_Ignored);
    pragma Inline (Is_Abstract_Subprogram);
    pragma Inline (Is_Abstract_Type);
    pragma Inline (Is_Access_Constant);
@@ -9338,6 +9346,7 @@ package Einfo is
    pragma Inline (Set_Interface_Alias);
    pragma Inline (Set_Interface_Name);
    pragma Inline (Set_Interfaces);
+   pragma Inline (Set_Invariants_Ignored);
    pragma Inline (Set_Is_Abstract_Subprogram);
    pragma Inline (Set_Is_Abstract_Type);
    pragma Inline (Set_Is_Access_Constant);
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 6306320..36c900b 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -9388,10 +9388,16 @@ package body Exp_Util is
       Proc_Id := Invariant_Procedure (Typ);
       pragma Assert (Present (Proc_Id));
 
-      return
-        Make_Procedure_Call_Statement (Loc,
-          Name                   => New_Occurrence_Of (Proc_Id, Loc),
-          Parameter_Associations => New_List (Relocate_Node (Expr)));
+      --  Ignore the invariant if that policy is in effect
+
+      if Invariants_Ignored (Typ) then
+         return Make_Null_Statement (Loc);
+      else
+         return
+           Make_Procedure_Call_Statement (Loc,
+             Name                   => New_Occurrence_Of (Proc_Id, Loc),
+             Parameter_Associations => New_List (Relocate_Node (Expr)));
+      end if;
    end Make_Invariant_Call;
 
    ------------------------
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 76dd711..f9ce1d9 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -18816,6 +18816,15 @@ package body Sem_Prag is
 
             Set_Has_Own_Invariants (Typ);
 
+            --  Set the Invariants_Ignored flag if that policy is in effect
+
+            Set_Invariants_Ignored (Typ,
+              Present (Check_Policy_List)
+                and then
+                  (Policy_In_Effect (Name_Invariant) = Name_Ignore
+                     and then
+                   Policy_In_Effect (Name_Type_Invariant) = Name_Ignore));
+
             --  If the invariant is class-wide, then it can be inherited by
             --  derived or interface implementing types. The type is said to
             --  have "inheritable" invariants.
-- 
cgit v1.1


From 81ffc744fb09d51ef79fc69a8d6410ccc97e915e Mon Sep 17 00:00:00 2001
From: Bob Duff <duff@adacore.com>
Date: Thu, 10 Oct 2019 15:23:37 +0000
Subject: [Ada] T'Size in pragma Compile_Time_Error

2019-10-10  Bob Duff  <duff@adacore.com>

gcc/ada/

	* sem_prag.adb (Defer_Compile_Time_Warning_Error_To_BE): In
	addition to saving the pragma for further processing, copy the
	pragma into the main unit if necessary.

From-SVN: r276819
---
 gcc/ada/ChangeLog    | 7 +++----
 gcc/ada/sem_prag.adb | 9 +++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 082fcf4..0182d18 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,5 @@
 2019-10-10  Bob Duff  <duff@adacore.com>
 
-	* einfo.ads, einfo.adb (Invariants_Ignored): New flag on types.
-	This leaves just one unused flag.
-	* sem_prag.adb (Invariant): Set the flag if appropriate.
-	* exp_util.adb (Make_Invariant_Call): Check the flag.
\ No newline at end of file
+	* sem_prag.adb (Defer_Compile_Time_Warning_Error_To_BE): In
+	addition to saving the pragma for further processing, copy the
+	pragma into the main unit if necessary.
\ No newline at end of file
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index f9ce1d9..fbfa0e0 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -32197,6 +32197,15 @@ package body Sem_Prag is
         (New_Val => CTWE_Entry'(Eloc  => Sloc (Arg1),
                                 Scope => Current_Scope,
                                 Prag  => N));
+
+      --  If the Boolean expression contains T'Size, and we're not in the main
+      --  unit being compiled, then we need to copy the pragma into the main
+      --  unit, because otherwise T'Size might never be computed, leaving it
+      --  as 0.
+
+      if not In_Extended_Main_Code_Unit (N) then
+         Insert_Library_Level_Action (New_Copy_Tree (N));
+      end if;
    end Defer_Compile_Time_Warning_Error_To_BE;
 
    ------------------------------------------
-- 
cgit v1.1


From eb73a3a91b45bc473705c2f5f82434b2bcbdae3c Mon Sep 17 00:00:00 2001
From: Vadim Godunko <godunko@adacore.com>
Date: Thu, 10 Oct 2019 15:23:42 +0000
Subject: [Ada] Define default value for Process field

2019-10-10  Vadim Godunko  <godunko@adacore.com>

gcc/ada/

	* libgnat/g-exptty.ads (TTY_Process_Descriptor): Set default
	value for Process.

From-SVN: r276820
---
 gcc/ada/ChangeLog            | 7 +++----
 gcc/ada/libgnat/g-exptty.ads | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0182d18..db07f3b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,4 @@
-2019-10-10  Bob Duff  <duff@adacore.com>
+2019-10-10  Vadim Godunko  <godunko@adacore.com>
 
-	* sem_prag.adb (Defer_Compile_Time_Warning_Error_To_BE): In
-	addition to saving the pragma for further processing, copy the
-	pragma into the main unit if necessary.
\ No newline at end of file
+	* libgnat/g-exptty.ads (TTY_Process_Descriptor): Set default
+	value for Process.
\ No newline at end of file
diff --git a/gcc/ada/libgnat/g-exptty.ads b/gcc/ada/libgnat/g-exptty.ads
index 81068a6..f61ea62 100644
--- a/gcc/ada/libgnat/g-exptty.ads
+++ b/gcc/ada/libgnat/g-exptty.ads
@@ -139,7 +139,7 @@ private
    Still_Active : constant Integer := -1;
 
    type TTY_Process_Descriptor is new Process_Descriptor with record
-      Process     : System.Address;
+      Process     : System.Address := System.Null_Address;
       --  Underlying structure used in C
       Exit_Status : Integer := Still_Active;
       --  Hold the exit status of the process.
-- 
cgit v1.1


From 9d98b6d8dcaed2b0f5c87418ca2036d1bdc5a881 Mon Sep 17 00:00:00 2001
From: Yannick Moy <moy@adacore.com>
Date: Thu, 10 Oct 2019 15:23:47 +0000
Subject: [Ada] Do not inline subprograms with deep parameter/result in
 GNATprove

2019-10-10  Yannick Moy  <moy@adacore.com>

gcc/ada/

	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add subprograms
	with deep parameter or result type as not candidates for
	inlining.

From-SVN: r276821
---
 gcc/ada/ChangeLog  |   7 ++--
 gcc/ada/inline.adb | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index db07f3b..6eca0b8 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,5 @@
-2019-10-10  Vadim Godunko  <godunko@adacore.com>
+2019-10-10  Yannick Moy  <moy@adacore.com>
 
-	* libgnat/g-exptty.ads (TTY_Process_Descriptor): Set default
-	value for Process.
\ No newline at end of file
+	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add subprograms
+	with deep parameter or result type as not candidates for
+	inlining.
\ No newline at end of file
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index dab2275..be22594 100644
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -1493,6 +1493,12 @@ package body Inline is
      (Spec_Id : Entity_Id;
       Body_Id : Entity_Id) return Boolean
    is
+      function Has_Formal_Or_Result_Of_Deep_Type
+        (Id : Entity_Id) return Boolean;
+      --  Returns true if the subprogram has at least one formal parameter or
+      --  a return type of a deep type: either an access type or a composite
+      --  type containing an access type.
+
       function Has_Formal_With_Discriminant_Dependent_Fields
         (Id : Entity_Id) return Boolean;
       --  Returns true if the subprogram has at least one formal parameter of
@@ -1518,6 +1524,104 @@ package body Inline is
       --  knowledge of the SPARK boundary is needed to determine exactly
       --  traversal functions.
 
+      ---------------------------------------
+      -- Has_Formal_Or_Result_Of_Deep_Type --
+      ---------------------------------------
+
+      function Has_Formal_Or_Result_Of_Deep_Type
+        (Id : Entity_Id) return Boolean
+      is
+         function Is_Deep (Typ : Entity_Id) return Boolean;
+         --  Return True if Typ is deep: either an access type or a composite
+         --  type containing an access type.
+
+         -------------
+         -- Is_Deep --
+         -------------
+
+         function Is_Deep (Typ : Entity_Id) return Boolean is
+         begin
+            case Type_Kind'(Ekind (Typ)) is
+               when Access_Kind =>
+                  return True;
+
+               when E_Array_Type
+                  | E_Array_Subtype
+               =>
+                  return Is_Deep (Component_Type (Typ));
+
+               when Record_Kind =>
+                  declare
+                     Comp : Entity_Id := First_Component_Or_Discriminant (Typ);
+                  begin
+                     while Present (Comp) loop
+                        if Is_Deep (Etype (Comp)) then
+                           return True;
+                        end if;
+                        Next_Component_Or_Discriminant (Comp);
+                     end loop;
+                  end;
+                  return False;
+
+               when Scalar_Kind
+                  | E_String_Literal_Subtype
+                  | Concurrent_Kind
+                  | Incomplete_Kind
+                  | E_Exception_Type
+                  | E_Subprogram_Type
+               =>
+                  return False;
+
+               when E_Private_Type
+                  | E_Private_Subtype
+                  | E_Limited_Private_Type
+                  | E_Limited_Private_Subtype
+               =>
+                  --  Conservatively consider that the type might be deep if
+                  --  its completion has not been seen yet.
+
+                  if No (Underlying_Type (Typ)) then
+                     return True;
+                  else
+                     return Is_Deep (Underlying_Type (Typ));
+                  end if;
+            end case;
+         end Is_Deep;
+
+         --  Local variables
+
+         Subp_Id    : constant Entity_Id := Ultimate_Alias (Id);
+         Formal     : Entity_Id;
+         Formal_Typ : Entity_Id;
+
+      --  Start of processing for Has_Formal_Or_Result_Of_Deep_Type
+
+      begin
+         --  Inspect all parameters of the subprogram looking for a formal
+         --  of a deep type.
+
+         Formal := First_Formal (Subp_Id);
+         while Present (Formal) loop
+            Formal_Typ := Etype (Formal);
+
+            if Is_Deep (Formal_Typ) then
+               return True;
+            end if;
+
+            Next_Formal (Formal);
+         end loop;
+
+         --  Check whether this is a function whose return type is deep
+
+         if Ekind (Subp_Id) = E_Function
+           and then Is_Deep (Etype (Subp_Id))
+         then
+            return True;
+         end if;
+
+         return False;
+      end Has_Formal_Or_Result_Of_Deep_Type;
+
       ---------------------------------------------------
       -- Has_Formal_With_Discriminant_Dependent_Fields --
       ---------------------------------------------------
@@ -1777,6 +1881,14 @@ package body Inline is
       elsif Has_Formal_With_Discriminant_Dependent_Fields (Id) then
          return False;
 
+      --  Do not inline subprograms with a formal parameter or return type of
+      --  a deep type, as in that case inlining might generate code that
+      --  violates borrow-checking rules of SPARK 3.10 even if the original
+      --  code did not.
+
+      elsif Has_Formal_Or_Result_Of_Deep_Type (Id) then
+         return False;
+
       --  Do not inline subprograms which may be traversal functions. Such
       --  inlining introduces temporary variables of named access type for
       --  which assignments are move instead of borrow/observe, possibly
-- 
cgit v1.1


From f200341cf868478ffea9626d97ab280d1cad08e7 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 10 Oct 2019 15:23:51 +0000
Subject: [Ada] Plug minor loophole for integer named number

2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* sem_ch3.adb (Analyze_Number_Declaration): Set
	Debug_Info_Needed in the case where the expression is an integer
	literal.

From-SVN: r276822
---
 gcc/ada/ChangeLog   | 8 ++++----
 gcc/ada/sem_ch3.adb | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6eca0b8..1045a89 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,5 @@
-2019-10-10  Yannick Moy  <moy@adacore.com>
+2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
 
-	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add subprograms
-	with deep parameter or result type as not candidates for
-	inlining.
\ No newline at end of file
+	* sem_ch3.adb (Analyze_Number_Declaration): Set
+	Debug_Info_Needed in the case where the expression is an integer
+	literal.
\ No newline at end of file
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index e304e72..6a02192 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -3522,6 +3522,8 @@ package body Sem_Ch3 is
          Set_Etype     (Id, Universal_Integer);
          Set_Ekind     (Id, E_Named_Integer);
          Set_Is_Frozen (Id, True);
+
+         Set_Debug_Info_Needed (Id);
          return;
       end if;
 
-- 
cgit v1.1


From a096f12eae91f891ef17687a9c48fee3de0b2fdd Mon Sep 17 00:00:00 2001
From: Ed Schonberg <schonberg@adacore.com>
Date: Thu, 10 Oct 2019 15:23:56 +0000
Subject: [Ada] Missing Predicated_Parent link on array Itype

2019-10-10  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* sem_aggr.adb (Resolve_Array_Aggregate): Set properly the
	Predicated_Parent link of an itype created for an aggregate, so
	that the predicate_function of the parent can support proofs on
	the object that it initializes.

From-SVN: r276823
---
 gcc/ada/ChangeLog    | 9 +++++----
 gcc/ada/sem_aggr.adb | 9 ++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1045a89..97e2dcf 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,6 @@
-2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
 
-	* sem_ch3.adb (Analyze_Number_Declaration): Set
-	Debug_Info_Needed in the case where the expression is an integer
-	literal.
\ No newline at end of file
+	* sem_aggr.adb (Resolve_Array_Aggregate): Set properly the
+	Predicated_Parent link of an itype created for an aggregate, so
+	that the predicate_function of the parent can support proofs on
+	the object that it initializes.
\ No newline at end of file
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 87fe050..3db998d 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -614,10 +614,17 @@ package body Sem_Aggr is
       if Has_Predicates (Typ) then
          Set_Has_Predicates (Itype);
 
+         --  If the base type has a predicate, capture the predicated parent
+         --  or the existing predicate function for SPARK use.
+
          if Present (Predicate_Function (Typ)) then
             Set_Predicate_Function (Itype, Predicate_Function (Typ));
-         else
+
+         elsif Is_Itype (Typ) then
             Set_Predicated_Parent (Itype, Predicated_Parent (Typ));
+
+         else
+            Set_Predicated_Parent (Itype, Typ);
          end if;
       end if;
 
-- 
cgit v1.1


From f18344b78d624afadca4c13bcca99d3a159135ec Mon Sep 17 00:00:00 2001
From: Bob Duff <duff@adacore.com>
Date: Thu, 10 Oct 2019 15:24:01 +0000
Subject: [Ada] 'others' in conditional_expressions

2019-10-10  Bob Duff  <duff@adacore.com>

gcc/ada/

	* sem_aggr.adb (Resolve_Aggregate): Add missing cases in the
	Others_Allowed => True case -- N_Case_Expression_Alternative and
	N_If_Expression.  Use Nkind_In.
	* atree.adb, atree.ads, sinfo.adb, sinfo.ads (Nkind_In): New
	16-parameter version.

From-SVN: r276824
---
 gcc/ada/ChangeLog    | 11 ++++++-----
 gcc/ada/atree.adb    | 24 ++++++++++++++++++++++++
 gcc/ada/atree.ads    | 21 +++++++++++++++++++++
 gcc/ada/sem_aggr.adb | 48 +++++++++++++++++++++++++-----------------------
 gcc/ada/sinfo.adb    | 38 ++++++++++++++++++++++++++++++++++++++
 gcc/ada/sinfo.ads    | 21 +++++++++++++++++++++
 6 files changed, 135 insertions(+), 28 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 97e2dcf..4685380 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,7 @@
-2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+2019-10-10  Bob Duff  <duff@adacore.com>
 
-	* sem_aggr.adb (Resolve_Array_Aggregate): Set properly the
-	Predicated_Parent link of an itype created for an aggregate, so
-	that the predicate_function of the parent can support proofs on
-	the object that it initializes.
\ No newline at end of file
+	* sem_aggr.adb (Resolve_Aggregate): Add missing cases in the
+	Others_Allowed => True case -- N_Case_Expression_Alternative and
+	N_If_Expression.  Use Nkind_In.
+	* atree.adb, atree.ads, sinfo.adb, sinfo.ads (Nkind_In): New
+	16-parameter version.
\ No newline at end of file
diff --git a/gcc/ada/atree.adb b/gcc/ada/atree.adb
index 1521941..ef1d885 100644
--- a/gcc/ada/atree.adb
+++ b/gcc/ada/atree.adb
@@ -1924,6 +1924,30 @@ package body Atree is
                                   V11);
    end Nkind_In;
 
+   function Nkind_In
+     (N   : Node_Id;
+      V1  : Node_Kind;
+      V2  : Node_Kind;
+      V3  : Node_Kind;
+      V4  : Node_Kind;
+      V5  : Node_Kind;
+      V6  : Node_Kind;
+      V7  : Node_Kind;
+      V8  : Node_Kind;
+      V9  : Node_Kind;
+      V10 : Node_Kind;
+      V11 : Node_Kind;
+      V12 : Node_Kind;
+      V13 : Node_Kind;
+      V14 : Node_Kind;
+      V15 : Node_Kind;
+      V16 : Node_Kind) return Boolean
+   is
+   begin
+      return Nkind_In (Nkind (N), V1, V2, V3, V4, V5, V6, V7, V8, V9, V10,
+                                  V11, V12, V13, V14, V15, V16);
+   end Nkind_In;
+
    --------
    -- No --
    --------
diff --git a/gcc/ada/atree.ads b/gcc/ada/atree.ads
index 7de8a9e..e6617e9 100644
--- a/gcc/ada/atree.ads
+++ b/gcc/ada/atree.ads
@@ -780,6 +780,27 @@ package Atree is
       V10 : Node_Kind;
       V11 : Node_Kind) return Boolean;
 
+   --  12..15-parameter versions are not yet needed
+
+   function Nkind_In
+     (N   : Node_Id;
+      V1  : Node_Kind;
+      V2  : Node_Kind;
+      V3  : Node_Kind;
+      V4  : Node_Kind;
+      V5  : Node_Kind;
+      V6  : Node_Kind;
+      V7  : Node_Kind;
+      V8  : Node_Kind;
+      V9  : Node_Kind;
+      V10 : Node_Kind;
+      V11 : Node_Kind;
+      V12 : Node_Kind;
+      V13 : Node_Kind;
+      V14 : Node_Kind;
+      V15 : Node_Kind;
+      V16 : Node_Kind) return Boolean;
+
    pragma Inline (Nkind_In);
    --  Inline all above functions
 
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 3db998d..d6d7c59 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -893,7 +893,6 @@ package body Sem_Aggr is
 
    procedure Resolve_Aggregate (N : Node_Id; Typ : Entity_Id) is
       Loc   : constant Source_Ptr := Sloc (N);
-      Pkind : constant Node_Kind  := Nkind (Parent (N));
 
       Aggr_Subtyp : Entity_Id;
       --  The actual aggregate subtype. This is not necessarily the same as Typ
@@ -1078,16 +1077,17 @@ package body Sem_Aggr is
             --  permit it, or the aggregate type is unconstrained, an OTHERS
             --  choice is not allowed (except that it is always allowed on the
             --  right-hand side of an assignment statement; in this case the
-            --  constrainedness of the type doesn't matter).
+            --  constrainedness of the type doesn't matter, because an array
+            --  object is always constrained).
 
             --  If expansion is disabled (generic context, or semantics-only
             --  mode) actual subtypes cannot be constructed, and the type of an
             --  object may be its unconstrained nominal type. However, if the
-            --  context is an assignment, we assume that OTHERS is allowed,
-            --  because the target of the assignment will have a constrained
-            --  subtype when fully compiled. Ditto if the context is an
-            --  initialization procedure where a component may have a predicate
-            --  function that carries the base type.
+            --  context is an assignment statement, OTHERS is allowed, because
+            --  the target of the assignment will have a constrained subtype
+            --  when fully compiled. Ditto if the context is an initialization
+            --  procedure where a component may have a predicate function that
+            --  carries the base type.
 
             --  Note that there is no node for Explicit_Actual_Parameter.
             --  To test for this context we therefore have to test for node
@@ -1101,24 +1101,26 @@ package body Sem_Aggr is
 
             Set_Etype (N, Aggr_Typ);  --  May be overridden later on
 
-            if Pkind = N_Assignment_Statement
+            if Nkind (Parent (N)) = N_Assignment_Statement
               or else Inside_Init_Proc
               or else (Is_Constrained (Typ)
-                        and then
-                          (Pkind = N_Parameter_Association     or else
-                           Pkind = N_Function_Call             or else
-                           Pkind = N_Procedure_Call_Statement  or else
-                           Pkind = N_Generic_Association       or else
-                           Pkind = N_Formal_Object_Declaration or else
-                           Pkind = N_Simple_Return_Statement   or else
-                           Pkind = N_Object_Declaration        or else
-                           Pkind = N_Component_Declaration     or else
-                           Pkind = N_Parameter_Specification   or else
-                           Pkind = N_Qualified_Expression      or else
-                           Pkind = N_Reference                 or else
-                           Pkind = N_Aggregate                 or else
-                           Pkind = N_Extension_Aggregate       or else
-                           Pkind = N_Component_Association))
+                        and then Nkind_In (Parent (N),
+                                           N_Parameter_Association,
+                                           N_Function_Call,
+                                           N_Procedure_Call_Statement,
+                                           N_Generic_Association,
+                                           N_Formal_Object_Declaration,
+                                           N_Simple_Return_Statement,
+                                           N_Object_Declaration,
+                                           N_Component_Declaration,
+                                           N_Parameter_Specification,
+                                           N_Qualified_Expression,
+                                           N_Reference,
+                                           N_Aggregate,
+                                           N_Extension_Aggregate,
+                                           N_Component_Association,
+                                           N_Case_Expression_Alternative,
+                                           N_If_Expression))
             then
                Aggr_Resolved :=
                  Resolve_Array_Aggregate
diff --git a/gcc/ada/sinfo.adb b/gcc/ada/sinfo.adb
index d24938c..2689ebe 100644
--- a/gcc/ada/sinfo.adb
+++ b/gcc/ada/sinfo.adb
@@ -7295,6 +7295,44 @@ package body Sinfo is
              T = V11;
    end Nkind_In;
 
+   function Nkind_In
+     (T   : Node_Kind;
+      V1  : Node_Kind;
+      V2  : Node_Kind;
+      V3  : Node_Kind;
+      V4  : Node_Kind;
+      V5  : Node_Kind;
+      V6  : Node_Kind;
+      V7  : Node_Kind;
+      V8  : Node_Kind;
+      V9  : Node_Kind;
+      V10 : Node_Kind;
+      V11 : Node_Kind;
+      V12 : Node_Kind;
+      V13 : Node_Kind;
+      V14 : Node_Kind;
+      V15 : Node_Kind;
+      V16 : Node_Kind) return Boolean
+   is
+   begin
+      return T = V1  or else
+             T = V2  or else
+             T = V3  or else
+             T = V4  or else
+             T = V5  or else
+             T = V6  or else
+             T = V7  or else
+             T = V8  or else
+             T = V9  or else
+             T = V10 or else
+             T = V11 or else
+             T = V12 or else
+             T = V13 or else
+             T = V14 or else
+             T = V15 or else
+             T = V16;
+   end Nkind_In;
+
    --------------------------
    -- Pragma_Name_Unmapped --
    --------------------------
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index dc82800..5a92066 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -11574,6 +11574,27 @@ package Sinfo is
       V10 : Node_Kind;
       V11 : Node_Kind) return Boolean;
 
+   --  12..15-parameter versions are not yet needed
+
+   function Nkind_In
+     (T   : Node_Kind;
+      V1  : Node_Kind;
+      V2  : Node_Kind;
+      V3  : Node_Kind;
+      V4  : Node_Kind;
+      V5  : Node_Kind;
+      V6  : Node_Kind;
+      V7  : Node_Kind;
+      V8  : Node_Kind;
+      V9  : Node_Kind;
+      V10 : Node_Kind;
+      V11 : Node_Kind;
+      V12 : Node_Kind;
+      V13 : Node_Kind;
+      V14 : Node_Kind;
+      V15 : Node_Kind;
+      V16 : Node_Kind) return Boolean;
+
    pragma Inline (Nkind_In);
    --  Inline all above functions
 
-- 
cgit v1.1


From a871b0aa6234573b8e7ec3d876c31f60e45e700f Mon Sep 17 00:00:00 2001
From: Bob Duff <duff@adacore.com>
Date: Thu, 10 Oct 2019 15:24:06 +0000
Subject: [Ada] Debug procedure for printing ancestors

2019-10-10  Bob Duff  <duff@adacore.com>

gcc/ada/

	* treepr.ads, treepr.adb (ppar): New procedure.

From-SVN: r276826
---
 gcc/ada/ChangeLog  | 6 +-----
 gcc/ada/treepr.adb | 8 ++++++++
 gcc/ada/treepr.ads | 4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4685380..16d900a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,7 +1,3 @@
 2019-10-10  Bob Duff  <duff@adacore.com>
 
-	* sem_aggr.adb (Resolve_Aggregate): Add missing cases in the
-	Others_Allowed => True case -- N_Case_Expression_Alternative and
-	N_If_Expression.  Use Nkind_In.
-	* atree.adb, atree.ads, sinfo.adb, sinfo.ads (Nkind_In): New
-	16-parameter version.
\ No newline at end of file
+	* treepr.ads, treepr.adb (ppar): New procedure.
\ No newline at end of file
diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb
index 959b990..55ecbdb 100644
--- a/gcc/ada/treepr.adb
+++ b/gcc/ada/treepr.adb
@@ -242,6 +242,14 @@ package body Treepr is
 
    function par (N : Union_Id) return Node_Or_Entity_Id renames p;
 
+   procedure ppar (N : Union_Id) is
+   begin
+      if N /= Empty_List_Or_Node then
+         pp (N);
+         ppar (Union_Id (p (N)));
+      end if;
+   end ppar;
+
    --------
    -- pe --
    --------
diff --git a/gcc/ada/treepr.ads b/gcc/ada/treepr.ads
index a299250..a63329b 100644
--- a/gcc/ada/treepr.ads
+++ b/gcc/ada/treepr.ads
@@ -82,6 +82,10 @@ package Treepr is
    --  the definition of Union_Id. Historically this was only for printing
    --  nodes, hence the name.
 
+   procedure ppar (N : Union_Id);
+   pragma Export (Ada, ppar);
+   --  Print the node, its parent, its parent's parent, and so on
+
    procedure pt  (N : Union_Id);
    procedure ppp (N : Union_Id);
    pragma Export (Ada, pt);
-- 
cgit v1.1


From ab9e20840f3ae9c5fe731851c6a384cd4f01f844 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 10 Oct 2019 15:24:26 +0000
Subject: [Ada] Get rid of spurious error for _Tag on extension with reverse
 bit order

2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* sem_ch13.adb (Adjust_Record_For_Reverse_Bit_Order): Do not use
	the Esize of the component to compute its layout, but only the
	Component_Clause.  Do not issue a warning for the _Tag
	component.  Also set the Esize of the component at the end of
	the layout.
	(Analyze_Record_Representation_Clause): Remove Hbit local
	variable.  Lay out the Original_Record_Component only if it's
	distinct from the component.
	(Check_Record_Representation_Clause): Fix off-by-one bug for the
	Last_Bit of the artificial clause built for the _Tag component.

From-SVN: r276827
---
 gcc/ada/ChangeLog    | 13 ++++++++++--
 gcc/ada/sem_ch13.adb | 56 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 25 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 16d900a..3d58a8d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
-2019-10-10  Bob Duff  <duff@adacore.com>
+2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
 
-	* treepr.ads, treepr.adb (ppar): New procedure.
\ No newline at end of file
+	* sem_ch13.adb (Adjust_Record_For_Reverse_Bit_Order): Do not use
+	the Esize of the component to compute its layout, but only the
+	Component_Clause.  Do not issue a warning for the _Tag
+	component.  Also set the Esize of the component at the end of
+	the layout.
+	(Analyze_Record_Representation_Clause): Remove Hbit local
+	variable.  Lay out the Original_Record_Component only if it's
+	distinct from the component.
+	(Check_Record_Representation_Clause): Fix off-by-one bug for the
+	Last_Bit of the artificial clause built for the _Tag component.
\ No newline at end of file
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 354d068..67ec0df 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -360,11 +360,11 @@ package body Sem_Ch13 is
       Num_CC : Natural;
 
    begin
-      --  Processing here used to depend on Ada version: the behavior was
-      --  changed by AI95-0133. However this AI is a Binding interpretation,
-      --  so we now implement it even in Ada 95 mode. The original behavior
-      --  from unamended Ada 95 is still available for compatibility under
-      --  debugging switch -gnatd.
+      --  The processing done here used to depend on the Ada version, but the
+      --  behavior has been changed by AI95-0133. However this AI is a Binding
+      --  Interpretation, so we now implement it even in Ada 95 mode. But the
+      --  original behavior from unamended Ada 95 is available for the sake of
+      --  compatibility under the debugging switch -gnatd.p in Ada 95 mode.
 
       if Ada_Version < Ada_2005 and then Debug_Flag_Dot_P then
          Adjust_Record_For_Reverse_Bit_Order_Ada_95 (R);
@@ -376,6 +376,11 @@ package body Sem_Ch13 is
       --  same byte offset and processing them together. Same approach is still
       --  valid in later versions including Ada 2012.
 
+      --  Note that component clauses found on record types may be inherited,
+      --  in which case the layout of the component with such a clause still
+      --  has to be done at this point. Therefore, the processing done here
+      --  must exclusively rely on the Component_Clause of the component.
+
       --  This first loop through components does two things. First it deals
       --  with the case of components with component clauses whose length is
       --  greater than the maximum machine scalar size (either accepting them
@@ -616,13 +621,19 @@ package body Sem_Ch13 is
                   Comp : constant Entity_Id := Comps (C);
                   CC   : constant Node_Id   := Component_Clause (Comp);
 
+                  FB   : constant Uint := Static_Integer (First_Bit (CC));
                   LB   : constant Uint := Static_Integer (Last_Bit (CC));
-                  NFB  : constant Uint := MSS - Uint_1 - LB;
-                  NLB  : constant Uint := NFB + Esize (Comp) - 1;
+                  NFB  : constant Uint := MSS - 1 - LB;
+                  NLB  : constant Uint := NFB + LB - FB;
                   Pos  : constant Uint := Static_Integer (Position (CC));
 
                begin
-                  if Warn_On_Reverse_Bit_Order then
+                  --  Do not warn for the artificial clause built for the tag
+                  --  in Check_Record_Representation_Clause if it is inherited.
+
+                  if Warn_On_Reverse_Bit_Order
+                    and then Chars (Comp) /= Name_uTag
+                  then
                      Error_Msg_Uint_1 := MSS;
                      Error_Msg_N
                        ("info: reverse bit order in machine scalar of "
@@ -642,8 +653,9 @@ package body Sem_Ch13 is
                   end if;
 
                   Set_Component_Bit_Offset (Comp, Pos * SSU + NFB);
-                  Set_Normalized_Position  (Comp, Pos + NFB / SSU);
+                  Set_Esize                (Comp, 1 + (NLB - NFB));
                   Set_Normalized_First_Bit (Comp, NFB mod SSU);
+                  Set_Normalized_Position  (Comp, Pos + NFB / SSU);
                end;
             end loop;
          end loop;
@@ -6937,7 +6949,6 @@ package body Sem_Ch13 is
       CC      : Node_Id;
       Comp    : Entity_Id;
       Fbit    : Uint;
-      Hbit    : Uint := Uint_0;
       Lbit    : Uint;
       Ocomp   : Entity_Id;
       Posit   : Uint;
@@ -7263,6 +7274,9 @@ package body Sem_Ch13 is
                         Set_Normalized_First_Bit (Comp, Fbit mod SSU);
                         Set_Normalized_Position  (Comp, Fbit / SSU);
 
+                        Set_Normalized_Position_Max
+                          (Comp, Normalized_Position (Comp));
+
                         if Warn_On_Overridden_Size
                           and then Has_Size_Clause (Etype (Comp))
                           and then RM_Size (Etype (Comp)) /= Esize (Comp)
@@ -7272,16 +7286,6 @@ package body Sem_Ch13 is
                               Component_Name (CC), Etype (Comp));
                         end if;
 
-                        --  This information is also set in the corresponding
-                        --  component of the base type, found by accessing the
-                        --  Original_Record_Component link if it is present.
-
-                        Ocomp := Original_Record_Component (Comp);
-
-                        if Hbit < Lbit then
-                           Hbit := Lbit;
-                        end if;
-
                         Check_Size
                           (Component_Name (CC),
                            Etype (Comp),
@@ -7291,12 +7295,18 @@ package body Sem_Ch13 is
                         Set_Biased
                           (Comp, First_Node (CC), "component clause", Biased);
 
-                        if Present (Ocomp) then
+                        --  This information is also set in the corresponding
+                        --  component of the base type, found by accessing the
+                        --  Original_Record_Component link if it is present.
+
+                        Ocomp := Original_Record_Component (Comp);
+
+                        if Present (Ocomp) and then Ocomp /= Comp then
                            Set_Component_Clause     (Ocomp, CC);
                            Set_Component_Bit_Offset (Ocomp, Fbit);
+                           Set_Esize                (Ocomp, 1 + (Lbit - Fbit));
                            Set_Normalized_First_Bit (Ocomp, Fbit mod SSU);
                            Set_Normalized_Position  (Ocomp, Fbit / SSU);
-                           Set_Esize                (Ocomp, 1 + (Lbit - Fbit));
 
                            Set_Normalized_Position_Max
                              (Ocomp, Normalized_Position (Ocomp));
@@ -10616,7 +10626,7 @@ package body Sem_Ch13 is
              First_Bit => Make_Integer_Literal (Loc, Uint_0),
              Last_Bit  =>
                Make_Integer_Literal (Loc,
-                 UI_From_Int (System_Address_Size))));
+                 UI_From_Int (System_Address_Size - 1))));
 
          Ccount := Ccount + 1;
       end if;
-- 
cgit v1.1


From dfdd3de1238531889e65fc4c5498a3a5f28ff570 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 10 Oct 2019 15:24:38 +0000
Subject: [Ada] Fix awkward placement of freeze node for actual subtype

2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* sem_ch6.adb (Set_Actual_Subtypes): Put the freeze node of the
	actual subtype after its declaration when the type of the formal
	has a predicate.

From-SVN: r276828
---
 gcc/ada/ChangeLog   | 13 +++----------
 gcc/ada/sem_ch6.adb |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3d58a8d..449c0ab 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,12 +1,5 @@
 2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
 
-	* sem_ch13.adb (Adjust_Record_For_Reverse_Bit_Order): Do not use
-	the Esize of the component to compute its layout, but only the
-	Component_Clause.  Do not issue a warning for the _Tag
-	component.  Also set the Esize of the component at the end of
-	the layout.
-	(Analyze_Record_Representation_Clause): Remove Hbit local
-	variable.  Lay out the Original_Record_Component only if it's
-	distinct from the component.
-	(Check_Record_Representation_Clause): Fix off-by-one bug for the
-	Last_Bit of the artificial clause built for the _Tag component.
\ No newline at end of file
+	* sem_ch6.adb (Set_Actual_Subtypes): Put the freeze node of the
+	actual subtype after its declaration when the type of the formal
+	has a predicate.
\ No newline at end of file
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index eb6768d..b96a5fd 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -12038,7 +12038,7 @@ package body Sem_Ch6 is
             --  predicate may come from an explicit aspect of be inherited.
 
             elsif Has_Predicates (T) then
-               Insert_List_Before_And_Analyze (Decl,
+               Insert_List_After_And_Analyze (Decl,
                  Freeze_Entity (Defining_Identifier (Decl), N));
             end if;
 
-- 
cgit v1.1


From 55160f6c7c838a2e35895cb741fff5ea237b1260 Mon Sep 17 00:00:00 2001
From: Ed Schonberg <schonberg@adacore.com>
Date: Thu, 10 Oct 2019 15:25:03 +0000
Subject: [Ada] Spurious visibility error on formal package with Abstract_State

2019-10-10  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Propagate
	an aspect specification for Abstract_State from generic package
	to formal package, so that it is available when analyzing the
	constructed formal.

From-SVN: r276829
---
 gcc/ada/ChangeLog    |  9 +++++----
 gcc/ada/sem_ch12.adb | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 449c0ab..c5e3f82 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,6 @@
-2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
 
-	* sem_ch6.adb (Set_Actual_Subtypes): Put the freeze node of the
-	actual subtype after its declaration when the type of the formal
-	has a predicate.
\ No newline at end of file
+	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Propagate
+	an aspect specification for Abstract_State from generic package
+	to formal package, so that it is available when analyzing the
+	constructed formal.
\ No newline at end of file
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 4e74f9a..d9fa255 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -2925,6 +2925,41 @@ package body Sem_Ch12 is
       Set_Ekind  (Formal, E_Package);
       Set_Etype  (Formal, Standard_Void_Type);
       Set_Inner_Instances (Formal, New_Elmt_List);
+
+      --  It is unclear that any aspects can apply to a formal package
+      --  declaration, given that they look like a hidden comformance
+      --  requirement on the corresponding actual. However, Abstract_State
+      --  must be treated specially because it generates declarations that
+      --  must appear before other declarations in the specification and
+      --  must be analyzed at once.
+
+      if Present (Aspect_Specifications (Gen_Decl)) then
+         if No (Aspect_Specifications (N)) then
+            Set_Aspect_Specifications (N, New_List);
+            Set_Has_Aspects (N);
+         end if;
+
+         declare
+            ASN   : Node_Id := First (Aspect_Specifications (Gen_Decl));
+            New_A : Node_Id;
+
+         begin
+            while Present (ASN) loop
+               if Get_Aspect_Id (ASN) = Aspect_Abstract_State then
+                  New_A :=
+                    Copy_Generic_Node (ASN, Empty, Instantiating => True);
+                  Set_Entity (New_A, Formal);
+                  Set_Analyzed (New_A, False);
+                  Append (New_A, Aspect_Specifications (N));
+                  Analyze_Aspect_Specifications (N, Formal);
+                  exit;
+               end if;
+
+               Next (ASN);
+            end loop;
+         end;
+      end if;
+
       Push_Scope  (Formal);
 
       --  Manually set the SPARK_Mode from the context because the package
@@ -3023,6 +3058,9 @@ package body Sem_Ch12 is
 
    <<Leave>>
       if Has_Aspects (N) then
+         --  Unclear that any other aspects may appear here, snalyze them
+         --  for completion, given that the grammar allows their appearance.
+
          Analyze_Aspect_Specifications (N, Pack_Id);
       end if;
 
-- 
cgit v1.1


From 6c142b14a07b166fcb2809cd3c3fcd59a748ce7e Mon Sep 17 00:00:00 2001
From: Gary Dismukes <dismukes@adacore.com>
Date: Thu, 10 Oct 2019 15:25:08 +0000
Subject: [Ada] Unnesting issues with entry families and accept statements

2019-10-10  Gary Dismukes  <dismukes@adacore.com>

gcc/ada/

	* sem_util.adb (Enclosing_Subprogram): Handle the case of
	E_Entry_Family, returning the entry family's associated
	Protected_Body_Subprogram (as was already done for E_Entry).
	* exp_ch9.adb (Expand_N_Accept_Statement): Call Reset_Scopes_To
	on the block created for an accept statement to reset the scopes
	of any local entities to the block scope.

From-SVN: r276830
---
 gcc/ada/ChangeLog    | 12 +++++++-----
 gcc/ada/exp_ch9.adb  |  7 +++++++
 gcc/ada/sem_util.adb | 12 ++++++------
 3 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c5e3f82..9cf5172 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,6 +1,8 @@
-2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
 
-	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Propagate
-	an aspect specification for Abstract_State from generic package
-	to formal package, so that it is available when analyzing the
-	constructed formal.
\ No newline at end of file
+	* sem_util.adb (Enclosing_Subprogram): Handle the case of
+	E_Entry_Family, returning the entry family's associated
+	Protected_Body_Subprogram (as was already done for E_Entry).
+	* exp_ch9.adb (Expand_N_Accept_Statement): Call Reset_Scopes_To
+	on the block created for an accept statement to reset the scopes
+	of any local entities to the block scope.
\ No newline at end of file
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 99bd8d2..720c1a9 100644
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -6624,6 +6624,13 @@ package body Exp_Ch9 is
              Declarations               => Declarations (N),
              Handled_Statement_Sequence => Build_Accept_Body (N));
 
+         --  Reset the Scope of local entities associated with the accept
+         --  statement (that currently reference the entry scope) to the
+         --  block scope, to avoid having references to the locals treated
+         --  as up-level references.
+
+         Reset_Scopes_To (Block, Blkent);
+
          --  For the analysis of the generated declarations, the parent node
          --  must be properly set.
 
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 9569919..f488573 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -6997,17 +6997,17 @@ package body Sem_Util is
       elsif Ekind_In (Dyn_Scop, E_Block, E_Loop, E_Return_Statement) then
          return Enclosing_Subprogram (Dyn_Scop);
 
-      elsif Ekind (Dyn_Scop) = E_Entry then
+      elsif Ekind_In (Dyn_Scop, E_Entry, E_Entry_Family) then
 
-         --  For a task entry, return the enclosing subprogram of the
-         --  task itself.
+         --  For a task entry or entry family, return the enclosing subprogram
+         --  of the task itself.
 
          if Ekind (Scope (Dyn_Scop)) = E_Task_Type then
             return Enclosing_Subprogram (Dyn_Scop);
 
-         --  A protected entry is rewritten as a protected procedure which is
-         --  the desired enclosing subprogram. This is relevant when unnesting
-         --  a procedure local to an entry body.
+         --  A protected entry or entry family is rewritten as a protected
+         --  procedure which is the desired enclosing subprogram. This is
+         --  relevant when unnesting a procedure local to an entry body.
 
          else
             return Protected_Body_Subprogram (Dyn_Scop);
-- 
cgit v1.1


From 4e866f08452aee2747a93f416ff1eb7b86d9f32e Mon Sep 17 00:00:00 2001
From: Ed Schonberg <schonberg@adacore.com>
Date: Thu, 10 Oct 2019 15:25:13 +0000
Subject: [Ada] Spurious warning on call with out parameter in expression
 function

2019-10-10  Ed Schonberg  <schonberg@adacore.com>

gcc/ada/

	* sem_warn.adb (Warn_On_Useless_Assignment): Do not warn if the
	second assignment is at the same source position as the first.

From-SVN: r276831
---
 gcc/ada/ChangeLog    | 10 +++-------
 gcc/ada/sem_warn.adb |  6 ++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9cf5172..24c831e 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,8 +1,4 @@
-2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
 
-	* sem_util.adb (Enclosing_Subprogram): Handle the case of
-	E_Entry_Family, returning the entry family's associated
-	Protected_Body_Subprogram (as was already done for E_Entry).
-	* exp_ch9.adb (Expand_N_Accept_Statement): Call Reset_Scopes_To
-	on the block created for an accept statement to reset the scopes
-	of any local entities to the block scope.
\ No newline at end of file
+	* sem_warn.adb (Warn_On_Useless_Assignment): Do not warn if the
+	second assignment is at the same source position as the first.
\ No newline at end of file
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index f9a6062..04e7acf 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -4546,9 +4546,15 @@ package body Sem_Warn is
       --  to capture the value. We are not going to capture any value, but
       --  the warning message depends on the same kind of conditions.
 
+      --  If the assignment appears as an out-parameter in a call within an
+      --  expression function it may be detected twice: once when expression
+      --  itself is analyzed, and once when the constructed body is analyzed.
+      --  We don't want to emit a spurious warning in this case.
+
       if Is_Assignable (Ent)
         and then not Is_Return_Object (Ent)
         and then Present (Last_Assignment (Ent))
+        and then Last_Assignment (Ent) /= N
         and then not Is_Imported (Ent)
         and then not Is_Exported (Ent)
         and then Safe_To_Capture_Value (N, Ent)
-- 
cgit v1.1


From 60f66f34a669f4f15c2fc178d95f12b081f83005 Mon Sep 17 00:00:00 2001
From: Gary Dismukes <dismukes@adacore.com>
Date: Thu, 10 Oct 2019 15:25:18 +0000
Subject: [Ada] Various minor typo fixes

2019-10-10  Gary Dismukes  <dismukes@adacore.com>

gcc/ada/

	* exp_ch4.adb, sem_cat.adb, sem_ch12.adb, sem_ch3.adb,
	sem_ch6.adb, sem_prag.adb, sem_util.adb, sem_util.ads: Minor
	typo fixes.

From-SVN: r276832
---
 gcc/ada/ChangeLog    |  7 ++++---
 gcc/ada/exp_ch4.adb  |  6 +++---
 gcc/ada/sem_cat.adb  | 10 +++++-----
 gcc/ada/sem_ch12.adb |  2 +-
 gcc/ada/sem_ch3.adb  |  4 ++--
 gcc/ada/sem_ch6.adb  |  6 +++---
 gcc/ada/sem_prag.adb |  2 +-
 gcc/ada/sem_util.adb |  4 ++--
 gcc/ada/sem_util.ads |  2 +-
 9 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 24c831e..adc61c4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,5 @@
-2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
 
-	* sem_warn.adb (Warn_On_Useless_Assignment): Do not warn if the
-	second assignment is at the same source position as the first.
\ No newline at end of file
+	* exp_ch4.adb, sem_cat.adb, sem_ch12.adb, sem_ch3.adb,
+	sem_ch6.adb, sem_prag.adb, sem_util.adb, sem_util.ads: Minor
+	typo fixes.
\ No newline at end of file
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 82145b4..158dcb5 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -9577,9 +9577,9 @@ package body Exp_Ch4 is
       Typ : constant Entity_Id := Etype (Left_Opnd (N));
 
    begin
-      --  Case of elementary type with standard operator.  But if
-      --  unnesting, handle elementary types whose Equivalent_Types are
-      --  records because there may be padding or undefined fields.
+      --  Case of elementary type with standard operator. But if unnesting,
+      --  handle elementary types whose Equivalent_Types are records because
+      --  there may be padding or undefined fields.
 
       if Is_Elementary_Type (Typ)
         and then Sloc (Entity (N)) = Standard_Location
diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index 780fec9..833df88 100644
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -721,11 +721,11 @@ package body Sem_Cat is
       --  The purpose is to set categorization flags before analyzing the
       --  unit itself, so as to diagnose violations of categorization as
       --  we process each declaration, even though the pragma appears after
-      --  the unit. This processing is only needsd if compilation unit
-      --  pragmas are present.
-      --  Note: this code may be incorrect in the unlikely case a child
-      --  genericc unit is instantiated as a child of its (non-generic)
-      --  parent, so that generic and insstance are siblings,
+      --  the unit. This processing is only needed if compilation unit pragmas
+      --  are present.
+      --  Note: This code may be incorrect in the unlikely case a child generic
+      --  unit is instantiated as a child of its (nongeneric) parent, so that
+      --  generic and instance are siblings.
 
       if Nkind (P) /= N_Compilation_Unit
          or else No (First (Pragmas_After (Aux_Decls_Node (P))))
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index d9fa255..8c3559f 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -2927,7 +2927,7 @@ package body Sem_Ch12 is
       Set_Inner_Instances (Formal, New_Elmt_List);
 
       --  It is unclear that any aspects can apply to a formal package
-      --  declaration, given that they look like a hidden comformance
+      --  declaration, given that they look like a hidden conformance
       --  requirement on the corresponding actual. However, Abstract_State
       --  must be treated specially because it generates declarations that
       --  must appear before other declarations in the specification and
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 6a02192..b12f69b 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -13456,8 +13456,8 @@ package body Sem_Ch3 is
             --  After expansion of discriminated task types, the value
             --  of the discriminant may be converted to a run-time type
             --  for restricted run-times. Propagate the value of the
-            --  discriminant ss well, so that e.g. the secondary stack
-            --  component has a static constraint. Necessry for LLVM.
+            --  discriminant as well, so that e.g. the secondary stack
+            --  component has a static constraint. Necessary for LLVM.
 
             elsif Nkind (Expr) = N_Type_Conversion
               and then Is_Discriminant (Expression (Expr))
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index b96a5fd..5af3b7b 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -4262,11 +4262,11 @@ package body Sem_Ch6 is
       --  object can then be used instead of the formal in case it is used
       --  in an actual to a call to a nested subprogram.
 
-      --  This method is used to suppliment our "small integer model" for
-      --  accessibility check generation (for more information see
+      --  This method is used to supplement our "small integer model" for
+      --  accessibility-check generation (for more information see
       --  Dynamic_Accessibility_Level).
 
-      --  Because we allow accesibility values greater than our expected value
+      --  Because we allow accessibility values greater than our expected value
       --  passing along the same extra accessibility formal as an actual
       --  to a nested subprogram becomes a problem because high values mean
       --  different things to the callee even though they are the same to the
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index fbfa0e0..7b36f8e 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -13093,7 +13093,7 @@ package body Sem_Prag is
             --  Infer the type to use for a string literal or a concatentation
             --  of operands whose types can be inferred. For such expressions,
             --  returns the "narrowest" of the three predefined string types
-            --  that can represent the characters occuring in the expression.
+            --  that can represent the characters occurring in the expression.
             --  For other expressions, returns Empty.
 
             function Preferred_String_Type (Expr : Node_Id) return Entity_Id is
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index f488573..9ca80aa 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -9071,8 +9071,8 @@ package body Sem_Util is
             --  components are being gathered for an aggregate, in which case
             --  the caller must check Report_Errors.
             --
-            --  In Ada2020 the above rules are relaxed. A non-static governing
-            --  discriminant is ok as long as it has a static subtype and
+            --  In Ada 2020 the above rules are relaxed. A nonstatic governing
+            --  discriminant is OK as long as it has a static subtype and
             --  every value of that subtype (and there must be at least one)
             --  selects the same variant.
 
diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads
index b41b875..7df8140 100644
--- a/gcc/ada/sem_util.ads
+++ b/gcc/ada/sem_util.ads
@@ -2991,7 +2991,7 @@ package Sem_Util is
       function Choice_List_Intervals (Discrete_Choices : List_Id)
                                      return Discrete_Interval_List;
       --  Given a discrete choice list, returns the (unique) interval
-      --  list representing the chosen values..
+      --  list representing the chosen values.
 
       function Is_Subset (Subset, Of_Set : Discrete_Interval_List)
         return Boolean;
-- 
cgit v1.1


From 5913d1b7c060ba061e912850bec290c83b06c7aa Mon Sep 17 00:00:00 2001
From: Yannick Moy <moy@adacore.com>
Date: Thu, 10 Oct 2019 15:25:22 +0000
Subject: [Ada] Fix inlining of subprograms with deep param/result in GNATprove

2019-10-10  Yannick Moy  <moy@adacore.com>

gcc/ada/

	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Do not peek
	under private types whose completion is SPARK_Mode Off.

From-SVN: r276833
---
 gcc/ada/ChangeLog  |  7 +++----
 gcc/ada/inline.adb | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index adc61c4..ce35fcd 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,4 @@
-2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+2019-10-10  Yannick Moy  <moy@adacore.com>
 
-	* exp_ch4.adb, sem_cat.adb, sem_ch12.adb, sem_ch3.adb,
-	sem_ch6.adb, sem_prag.adb, sem_util.adb, sem_util.ads: Minor
-	typo fixes.
\ No newline at end of file
+	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Do not peek
+	under private types whose completion is SPARK_Mode Off.
\ No newline at end of file
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index be22594..0d80ab2 100644
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -1582,6 +1582,20 @@ package body Inline is
 
                   if No (Underlying_Type (Typ)) then
                      return True;
+
+                  --  Do not peek under a private type if its completion has
+                  --  SPARK_Mode Off. In such a case, a deep type is considered
+                  --  by GNATprove to be not deep.
+
+                  elsif Present (Full_View (Typ))
+                    and then Present (SPARK_Pragma (Full_View (Typ)))
+                    and then Get_SPARK_Mode_From_Annotation
+                      (SPARK_Pragma (Full_View (Typ))) = Off
+                  then
+                     return False;
+
+                  --  Otherwise peek under the private type.
+
                   else
                      return Is_Deep (Underlying_Type (Typ));
                   end if;
-- 
cgit v1.1


From 96dd5bb6b75ca662fc038f2358059bfbbd609895 Mon Sep 17 00:00:00 2001
From: Gary Dismukes <dismukes@adacore.com>
Date: Thu, 10 Oct 2019 15:25:27 +0000
Subject: [Ada] Add pragma Preelaborable_Initialization to Stream_IO.File_Type

2019-10-10  Gary Dismukes  <dismukes@adacore.com>

gcc/ada/

	* libgnat/a-ststio.ads (File_Type): Apply pragma
	Preelaborable_Initialization to the type.

From-SVN: r276834
---
 gcc/ada/ChangeLog            | 6 +++---
 gcc/ada/libgnat/a-ststio.ads | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ce35fcd..a0084fa 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,4 @@
-2019-10-10  Yannick Moy  <moy@adacore.com>
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
 
-	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Do not peek
-	under private types whose completion is SPARK_Mode Off.
\ No newline at end of file
+	* libgnat/a-ststio.ads (File_Type): Apply pragma
+	Preelaborable_Initialization to the type.
\ No newline at end of file
diff --git a/gcc/ada/libgnat/a-ststio.ads b/gcc/ada/libgnat/a-ststio.ads
index 5314ce8..30be158 100644
--- a/gcc/ada/libgnat/a-ststio.ads
+++ b/gcc/ada/libgnat/a-ststio.ads
@@ -42,6 +42,7 @@ package Ada.Streams.Stream_IO is
    type Stream_Access is access all Root_Stream_Type'Class;
 
    type File_Type is limited private with Default_Initial_Condition;
+   pragma Preelaborable_Initialization (File_Type);
 
    type File_Mode is (In_File, Out_File, Append_File);
 
-- 
cgit v1.1


From ebeabe0454975d7600af111a9461a85e75863641 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@adacore.com>
Date: Thu, 10 Oct 2019 15:25:32 +0000
Subject: [Ada] Ensure constructor is a C++ constructor

2019-10-10  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* freeze.adb (Freeze_Subprogram): Ensure constructor is a C++
	constructor.

From-SVN: r276835
---
 gcc/ada/ChangeLog  | 6 +++---
 gcc/ada/freeze.adb | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a0084fa..b17b608 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,4 @@
-2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+2019-10-10  Arnaud Charlet  <charlet@adacore.com>
 
-	* libgnat/a-ststio.ads (File_Type): Apply pragma
-	Preelaborable_Initialization to the type.
\ No newline at end of file
+	* freeze.adb (Freeze_Subprogram): Ensure constructor is a C++
+	constructor.
\ No newline at end of file
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 93e91b2..5e1b775 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -8780,6 +8780,7 @@ package body Freeze is
       --  (either in pragma CPP_Constructor or in a pragma import).
 
       if Is_Constructor (E)
+        and then Convention (E) = Convention_CPP
         and then
            (No (Interface_Name (E))
               or else String_Equal
-- 
cgit v1.1


From 7e536bfd0600341f83d85312cf9c909205ec4d18 Mon Sep 17 00:00:00 2001
From: Gary Dismukes <dismukes@adacore.com>
Date: Thu, 10 Oct 2019 15:25:36 +0000
Subject: [Ada] Handling up-level references in loops within library-level
 declarations

2019-10-10  Gary Dismukes  <dismukes@adacore.com>

gcc/ada/

	* exp_ch7.adb (Check_Unnesting_In_Decls_Or_Stmts): When
	encountering a loop at the top level of a package declaration
	list (that is, within the declarations of a package spec or
	body) that has nested subprograms, call Unnest_Loop to create a
	new library-level procedure that will contain the loop, to allow
	for proper handling of up-level references from within nested
	subprograms, such as to loop parameters.
	(Unnest_Loop): New procedure that takes a loop statement and
	creates a new procedure body to enclose the loop statement,
	along with generating a call to the procedure.

From-SVN: r276836
---
 gcc/ada/ChangeLog   | 14 +++++++--
 gcc/ada/exp_ch7.adb | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b17b608..4b829cf 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,4 +1,12 @@
-2019-10-10  Arnaud Charlet  <charlet@adacore.com>
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
 
-	* freeze.adb (Freeze_Subprogram): Ensure constructor is a C++
-	constructor.
\ No newline at end of file
+	* exp_ch7.adb (Check_Unnesting_In_Decls_Or_Stmts): When
+	encountering a loop at the top level of a package declaration
+	list (that is, within the declarations of a package spec or
+	body) that has nested subprograms, call Unnest_Loop to create a
+	new library-level procedure that will contain the loop, to allow
+	for proper handling of up-level references from within nested
+	subprograms, such as to loop parameters.
+	(Unnest_Loop): New procedure that takes a loop statement and
+	creates a new procedure body to enclose the loop statement,
+	along with generating a call to the procedure.
\ No newline at end of file
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index f1b7279..297e27d 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -398,6 +398,14 @@ package body Exp_Ch7 is
    --  actions or secondary-stack management, in which case the nested
    --  subprogram is a finalizer.
 
+   procedure Unnest_Loop (Loop_Stmt : Node_Id);
+   --  Top-level Loops that contain nested subprograms with up-level references
+   --  need to have activation records. We do this by rewriting the loop as a
+   --  procedure containing the loop, followed by a call to the procedure in
+   --  the same library-level declarative list, to replicate the semantics of
+   --  the original loop. Such loops can occur due to aggregate expansions and
+   --  other constructs.
+
    procedure Check_Visibly_Controlled
      (Prim : Final_Primitives;
       Typ  : Entity_Id;
@@ -4230,6 +4238,23 @@ package body Exp_Ch7 is
             then
                Unnest_Block (Decl_Or_Stmt);
 
+            elsif Nkind (Decl_Or_Stmt) = N_Loop_Statement then
+               declare
+                  Id : constant Entity_Id :=
+                         Entity (Identifier (Decl_Or_Stmt));
+
+               begin
+                  --  When a top-level loop within declarations of a library
+                  --  package spec or body contains nested subprograms, we wrap
+                  --  it in a procedure to handle possible up-level references
+                  --  to entities associated with the loop (such as loop
+                  --  parameters).
+
+                  if Present (Id) and then Contains_Subprogram (Id) then
+                     Unnest_Loop (Decl_Or_Stmt);
+                  end if;
+               end;
+
             elsif Nkind (Decl_Or_Stmt) = N_Package_Declaration
               and then not Modify_Tree_For_C
             then
@@ -9256,6 +9281,67 @@ package body Exp_Ch7 is
       end loop;
    end Unnest_Block;
 
+   -----------------
+   -- Unnest_Loop --
+   -----------------
+
+   procedure Unnest_Loop (Loop_Stmt : Node_Id) is
+      Loc        : constant Source_Ptr := Sloc (Loop_Stmt);
+      Ent        : Entity_Id;
+      Local_Body : Node_Id;
+      Local_Call : Node_Id;
+      Local_Proc : Entity_Id;
+      Local_Scop : Entity_Id;
+      Loop_Copy  : constant Node_Id :=
+                     Relocate_Node (Loop_Stmt);
+   begin
+      Local_Scop := Entity (Identifier (Loop_Stmt));
+      Ent := First_Entity (Local_Scop);
+
+      Local_Proc :=
+        Make_Defining_Identifier (Loc,
+          Chars => New_Internal_Name ('P'));
+
+      Local_Body :=
+        Make_Subprogram_Body (Loc,
+          Specification              =>
+            Make_Procedure_Specification (Loc,
+              Defining_Unit_Name => Local_Proc),
+              Declarations       => Empty_List,
+          Handled_Statement_Sequence =>
+            Make_Handled_Sequence_Of_Statements (Loc,
+              Statements => New_List (Loop_Copy)));
+
+      Set_First_Real_Statement
+        (Handled_Statement_Sequence (Local_Body), Loop_Copy);
+
+      Rewrite (Loop_Stmt, Local_Body);
+      Analyze (Loop_Stmt);
+
+      Set_Has_Nested_Subprogram (Local_Proc);
+
+      Local_Call :=
+        Make_Procedure_Call_Statement (Loc,
+          Name => New_Occurrence_Of (Local_Proc, Loc));
+
+      Insert_After (Loop_Stmt, Local_Call);
+      Analyze (Local_Call);
+
+      --  New procedure has the same scope as the original loop, and the scope
+      --  of the loop is the new procedure.
+
+      Set_Scope (Local_Proc, Scope (Local_Scop));
+      Set_Scope (Local_Scop, Local_Proc);
+
+      --  The entity list of the new procedure is that of the loop
+
+      Set_First_Entity (Local_Proc, Ent);
+
+      --  Note that the entities associated with the loop don't need to have
+      --  their Scope fields reset, since they're still associated with the
+      --  same loop entity that now belongs to the copied loop statement.
+   end Unnest_Loop;
+
    --------------------------------
    -- Wrap_Transient_Declaration --
    --------------------------------
-- 
cgit v1.1


From e5da0a1d01bc0d1d3a36593f4b4fc118bd404691 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 10 Oct 2019 18:11:10 +0200
Subject: re PR target/92022 (ICE in alpha_handle_trap_shadows, at
 config/alpha/alpha.c:8847)

	PR target/92022
	* config/alpha/alpha.c (alpha_handle_trap_shadows): Skip DEBUG_INSN.

testsuite/ChangeLog:

	PR target/92022
	* g++.dg/pr92022.C: New test.

From-SVN: r276839
---
 gcc/ChangeLog                  |  5 +++++
 gcc/config/alpha/alpha.c       |  3 +++
 gcc/testsuite/ChangeLog        |  5 +++++
 gcc/testsuite/g++.dg/pr92022.C | 13 +++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/pr92022.C

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f78c4c8..ce7b389 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/92022
+	* config/alpha/alpha.c (alpha_handle_trap_shadows): Skip DEBUG_INSN.
+
 2019-10-10  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/88630
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index f01305b..a7d5454 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -8708,6 +8708,9 @@ alpha_handle_trap_shadows (void)
 		    case CODE_LABEL:
 		      goto close_shadow;
 
+		    case DEBUG_INSN:
+		      break;
+
 		    default:
 		      gcc_unreachable ();
 		    }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a4961b..3b1e63b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/92022
+	* g++.dg/pr92022.C: New test.
+
 2019-10-10  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-c++-common/gomp/declare-variant-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/pr92022.C b/gcc/testsuite/g++.dg/pr92022.C
new file mode 100644
index 0000000..066d984
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr92022.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target alpha*-*-* } }
+// { dg-options "-O1 -g -fno-var-tracking -mcpu=ev4 -mieee" }
+
+struct a {
+  a(long);
+};
+long b;
+void c() {
+  a d(1);
+  double e = b;
+  for (; b;)
+    d = e;
+}
-- 
cgit v1.1


From d26082357676a3c3843595dfe88a6c682b56e334 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Thu, 10 Oct 2019 16:57:30 +0000
Subject: pretty-print: support URL escape sequences (PR 87488)

https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
describes an emerging standard for embedding URLs in escape sequences
for marking up text output.  This is supported e.g. by recent releases
of GNOME Terminal.

This patch adds support to our pretty-printing framework for emitting
URLs.

A followup patch uses this to add URLs to the pertinent documentation
for the output of -fdiagnostics-show-option.

gcc/ChangeLog:
	PR 87488
	* common.opt (fdiagnostics-urls=): New option.
	(diagnostic-url.h): Add SourceInclude.
	(diagnostic_url_rule): New enum.
	* diagnostic-color.c: Include "diagnostic-url.h".
	(diagnostic_urls_enabled_p): New function.
	* diagnostic-url.h: New file.
	* diagnostic.c: Include "diagnostic-url.h".
	(diagnostic_urls_init): New function.
	* diagnostic.h (diagnostic_urls_init): New decl.
	* doc/invoke.texi (Diagnostic Message Formatting Options): Add
	-fdiagnostics-urls to the list.
	(-fdiagnostics-urls): New option.
	* gcc.c (driver_handle_option): Handle OPT_fdiagnostics_urls_.
	(driver::global_initializations): Call diagnostic_urls_init.
	* opts-global.c (init_options_once): Likewise.
	* opts.c (common_handle_option): Handle OPT_fdiagnostics_urls_.
	* pretty-print.c (pretty_printer::pretty_printer): Initialize
	show_urls.
	(pp_begin_url): New function.
	(pp_end_url): New function.
	(selftest::test_urls): New selftest.
	(selftest::pretty_print_c_tests): Call it.
	* pretty-print.h (pretty_printer::show_urls): New field.
	(pp_begin_url): New decl.
	(pp_end_url): New decl.

gcc/testsuite/ChangeLog:
	PR 87488
	* lib/prune.exp (TEST_ALWAYS_FLAGS): Add -fdiagnostics-urls=never.

From-SVN: r276841
---
 gcc/ChangeLog               | 29 ++++++++++++++++++++
 gcc/common.opt              | 20 ++++++++++++++
 gcc/diagnostic-color.c      | 20 ++++++++++++++
 gcc/diagnostic-url.h        | 36 +++++++++++++++++++++++++
 gcc/diagnostic.c            | 13 +++++++++
 gcc/diagnostic.h            |  1 +
 gcc/doc/invoke.texi         | 13 +++++++++
 gcc/gcc.c                   |  5 ++++
 gcc/opts-global.c           |  1 +
 gcc/opts.c                  |  4 +++
 gcc/pretty-print.c          | 65 ++++++++++++++++++++++++++++++++++++++++++++-
 gcc/pretty-print.h          |  6 +++++
 gcc/testsuite/ChangeLog     |  5 ++++
 gcc/testsuite/lib/prune.exp |  2 +-
 14 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 gcc/diagnostic-url.h

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce7b389..e3c1a4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,32 @@
+2019-10-10  David Malcolm  <dmalcolm@redhat.com>
+
+	PR 87488
+	* common.opt (fdiagnostics-urls=): New option.
+	(diagnostic-url.h): Add SourceInclude.
+	(diagnostic_url_rule): New enum.
+	* diagnostic-color.c: Include "diagnostic-url.h".
+	(diagnostic_urls_enabled_p): New function.
+	* diagnostic-url.h: New file.
+	* diagnostic.c: Include "diagnostic-url.h".
+	(diagnostic_urls_init): New function.
+	* diagnostic.h (diagnostic_urls_init): New decl.
+	* doc/invoke.texi (Diagnostic Message Formatting Options): Add
+	-fdiagnostics-urls to the list.
+	(-fdiagnostics-urls): New option.
+	* gcc.c (driver_handle_option): Handle OPT_fdiagnostics_urls_.
+	(driver::global_initializations): Call diagnostic_urls_init.
+	* opts-global.c (init_options_once): Likewise.
+	* opts.c (common_handle_option): Handle OPT_fdiagnostics_urls_.
+	* pretty-print.c (pretty_printer::pretty_printer): Initialize
+	show_urls.
+	(pp_begin_url): New function.
+	(pp_end_url): New function.
+	(selftest::test_urls): New selftest.
+	(selftest::pretty_print_c_tests): Call it.
+	* pretty-print.h (pretty_printer::show_urls): New field.
+	(pp_begin_url): New decl.
+	(pp_end_url): New decl.
+
 2019-10-10  Uroš Bizjak  <ubizjak@gmail.com>
 
 	PR target/92022
diff --git a/gcc/common.opt b/gcc/common.opt
index 1b9e0f3..124e8cf 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1281,6 +1281,26 @@ Enum(diagnostic_color_rule) String(always) Value(DIAGNOSTICS_COLOR_YES)
 EnumValue
 Enum(diagnostic_color_rule) String(auto) Value(DIAGNOSTICS_COLOR_AUTO)
 
+fdiagnostics-urls=
+Driver Common Joined RejectNegative Var(flag_diagnostics_show_urls) Enum(diagnostic_url_rule) Init(DIAGNOSTICS_URL_AUTO)
+-fdiagnostics-urls=[never|always|auto]	Embed URLs in diagnostics.
+
+; Required for these enum values.
+SourceInclude
+diagnostic-url.h
+
+Enum
+Name(diagnostic_url_rule) Type(int)
+
+EnumValue
+Enum(diagnostic_url_rule) String(never) Value(DIAGNOSTICS_URL_NO)
+
+EnumValue
+Enum(diagnostic_url_rule) String(always) Value(DIAGNOSTICS_URL_YES)
+
+EnumValue
+Enum(diagnostic_url_rule) String(auto) Value(DIAGNOSTICS_URL_AUTO)
+
 fdiagnostics-format=
 Common Joined RejectNegative Enum(diagnostics_output_format)
 -fdiagnostics-format=[text|json] Select output format.
diff --git a/gcc/diagnostic-color.c b/gcc/diagnostic-color.c
index 69e759f..abc919f 100644
--- a/gcc/diagnostic-color.c
+++ b/gcc/diagnostic-color.c
@@ -19,6 +19,7 @@
 #include "config.h"
 #include "system.h"
 #include "diagnostic-color.h"
+#include "diagnostic-url.h"
 
 #ifdef __MINGW32__
 #  include <windows.h>
@@ -236,3 +237,22 @@ colorize_init (diagnostic_color_rule_t rule)
       gcc_unreachable ();
     }
 }
+
+/* Determine if URLs should be enabled, based on RULE.
+   This reuses the logic for colorization.  */
+
+bool
+diagnostic_urls_enabled_p (diagnostic_url_rule_t rule)
+{
+  switch (rule)
+    {
+    case DIAGNOSTICS_URL_NO:
+      return false;
+    case DIAGNOSTICS_URL_YES:
+      return true;
+    case DIAGNOSTICS_URL_AUTO:
+      return should_colorize ();
+    default:
+      gcc_unreachable ();
+    }
+}
diff --git a/gcc/diagnostic-url.h b/gcc/diagnostic-url.h
new file mode 100644
index 0000000..ce0de45
--- /dev/null
+++ b/gcc/diagnostic-url.h
@@ -0,0 +1,36 @@
+/* Copyright (C) 2019 Free Software Foundation, Inc.
+   Contributed by David Malcolm <dmalcolm@redhat.com>.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_DIAGNOSTIC_URL_H
+#define GCC_DIAGNOSTIC_URL_H
+
+/* Whether to add URLs to diagnostics:
+   - DIAGNOSTICS_URL_NO: never
+   - DIAGNOSTICS_URL_YES: always
+   - DIAGNOSTICS_URL_AUTO: depending on the output stream.  */
+typedef enum
+{
+  DIAGNOSTICS_URL_NO       = 0,
+  DIAGNOSTICS_URL_YES      = 1,
+  DIAGNOSTICS_URL_AUTO     = 2
+} diagnostic_url_rule_t;
+
+extern bool diagnostic_urls_enabled_p (diagnostic_url_rule_t);
+
+#endif /* ! GCC_DIAGNOSTIC_URL_H */
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 1b3306c..467cc396 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "backtrace.h"
 #include "diagnostic.h"
 #include "diagnostic-color.h"
+#include "diagnostic-url.h"
 #include "edit-context.h"
 #include "selftest.h"
 #include "selftest-diagnostic.h"
@@ -246,6 +247,18 @@ diagnostic_color_init (diagnostic_context *context, int value /*= -1 */)
     = colorize_init ((diagnostic_color_rule_t) value);
 }
 
+/* Initialize URL support within CONTEXT based on VALUE, handling "auto".  */
+
+void
+diagnostic_urls_init (diagnostic_context *context, int value /*= -1 */)
+{
+  if (value < 0)
+    value = DIAGNOSTICS_COLOR_DEFAULT;
+
+  context->printer->show_urls
+    = diagnostic_urls_enabled_p ((diagnostic_url_rule_t) value);
+}
+
 /* Do any cleaning up required after the last diagnostic is emitted.  */
 
 void
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index 530acb4..f0ea8e8 100644
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -331,6 +331,7 @@ diagnostic_override_option_index (diagnostic_info *info, int optidx)
 /* Diagnostic related functions.  */
 extern void diagnostic_initialize (diagnostic_context *, int);
 extern void diagnostic_color_init (diagnostic_context *, int value = -1);
+extern void diagnostic_urls_init (diagnostic_context *, int value = -1);
 extern void diagnostic_finish (diagnostic_context *);
 extern void diagnostic_report_current_module (diagnostic_context *, location_t);
 extern void diagnostic_show_locus (diagnostic_context *,
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 9247603..bdbcd95 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -273,6 +273,7 @@ Objective-C and Objective-C++ Dialects}.
 @gccoptlist{-fmessage-length=@var{n}  @gol
 -fdiagnostics-show-location=@r{[}once@r{|}every-line@r{]}  @gol
 -fdiagnostics-color=@r{[}auto@r{|}never@r{|}always@r{]}  @gol
+-fdiagnostics-urls=@r{[}auto@r{|}never@r{|}always@r{]}  @gol
 -fdiagnostics-format=@r{[}text@r{|}json@r{]}  @gol
 -fno-diagnostics-show-option  -fno-diagnostics-show-caret @gol
 -fno-diagnostics-show-labels  -fno-diagnostics-show-line-numbers @gol
@@ -3908,6 +3909,18 @@ SGR substring for highlighting mismatching types within template
 arguments in the C++ frontend.
 @end table
 
+@item -fdiagnostics-urls[=@var{WHEN}]
+@opindex fdiagnostics-urls
+@cindex urls
+Use escape sequences to embed URLs in diagnostics.  For example, when
+@option{-fdiagnostics-show-option} emits text showing the command-line
+option controlling a diagnostic, embed a URL for documentation of that
+option.
+
+@var{WHEN} is @samp{never}, @samp{always}, or @samp{auto}.
+The default is @samp{auto}, which means to use URL escape sequences only
+when the standard error is a terminal.
+
 @item -fno-diagnostics-show-option
 @opindex fno-diagnostics-show-option
 @opindex fdiagnostics-show-option
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 1216cdd..c45a1df 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -4041,6 +4041,10 @@ driver_handle_option (struct gcc_options *opts,
       diagnostic_color_init (dc, value);
       break;
 
+    case OPT_fdiagnostics_urls_:
+      diagnostic_urls_init (dc, value);
+      break;
+
     case OPT_fdiagnostics_format_:
       diagnostic_output_format_init (dc,
 				     (enum diagnostics_output_format)value);
@@ -7443,6 +7447,7 @@ driver::global_initializations ()
 
   diagnostic_initialize (global_dc, 0);
   diagnostic_color_init (global_dc);
+  diagnostic_urls_init (global_dc);
 
 #ifdef GCC_DRIVER_HOST_INITIALIZATION
   /* Perform host dependent initialization when needed.  */
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 7c5bd16..b51c2fb 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -255,6 +255,7 @@ init_options_once (void)
      construct their pretty-printers means that all previous settings
      are overriden.  */
   diagnostic_color_init (global_dc);
+  diagnostic_urls_init (global_dc);
 }
 
 /* Decode command-line options to an array, like
diff --git a/gcc/opts.c b/gcc/opts.c
index 83d8a87..1070b9d 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -2474,6 +2474,10 @@ common_handle_option (struct gcc_options *opts,
       diagnostic_color_init (dc, value);
       break;
 
+    case OPT_fdiagnostics_urls_:
+      diagnostic_urls_init (dc, value);
+      break;
+
     case OPT_fdiagnostics_format_:
       diagnostic_output_format_init (dc,
 				     (enum diagnostics_output_format)value);
diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index 2b6c585..c57a3db 100644
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -1579,7 +1579,8 @@ pretty_printer::pretty_printer (int maximum_length)
     emitted_prefix (),
     need_newline (),
     translate_identifiers (true),
-    show_color ()
+    show_color (),
+    show_urls (false)
 {
   pp_line_cutoff (this) = maximum_length;
   /* By default, we emit prefixes once per message.  */
@@ -2028,6 +2029,41 @@ identifier_to_locale (const char *ident)
   }
 }
 
+/* Support for encoding URLs.
+   See egmontkob/Hyperlinks_in_Terminal_Emulators.md
+   ( https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda ).
+
+   > A hyperlink is opened upon encountering an OSC 8 escape sequence with
+   > the target URI. The syntax is
+   >
+   >  OSC 8 ; params ; URI ST
+   >
+   > A hyperlink is closed with the same escape sequence, omitting the
+   > parameters and the URI but keeping the separators:
+   >
+   > OSC 8 ; ; ST
+   >
+   > OSC (operating system command) is typically ESC ].  */
+
+/* If URL-printing is enabled, write an "open URL" escape sequence to PP
+   for the given URL.  */
+
+void
+pp_begin_url (pretty_printer *pp, const char *url)
+{
+  if (pp->show_urls)
+    pp_printf (pp, "\33]8;;%s\33\\", url);
+}
+
+/* If URL-printing is enabled, write a "close URL" escape sequence to PP.  */
+
+void
+pp_end_url (pretty_printer *pp)
+{
+  if (pp->show_urls)
+    pp_string (pp, "\33]8;;\33\\");
+}
+
 #if CHECKING_P
 
 namespace selftest {
@@ -2312,6 +2348,32 @@ test_prefixes_and_wrapping ()
 
 }
 
+/* Verify that URL-printing works as expected.  */
+
+void
+test_urls ()
+{
+  {
+    pretty_printer pp;
+    pp.show_urls = false;
+    pp_begin_url (&pp, "http://example.com");
+    pp_string (&pp, "This is a link");
+    pp_end_url (&pp);
+    ASSERT_STREQ ("This is a link",
+		  pp_formatted_text (&pp));
+  }
+
+  {
+    pretty_printer pp;
+    pp.show_urls = true;
+    pp_begin_url (&pp, "http://example.com");
+    pp_string (&pp, "This is a link");
+    pp_end_url (&pp);
+    ASSERT_STREQ ("\33]8;;http://example.com\33\\This is a link\33]8;;\33\\",
+		  pp_formatted_text (&pp));
+  }
+}
+
 /* Run all of the selftests within this file.  */
 
 void
@@ -2320,6 +2382,7 @@ pretty_print_c_tests ()
   test_basic_printing ();
   test_pp_format ();
   test_prefixes_and_wrapping ();
+  test_urls ();
 }
 
 } // namespace selftest
diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 2d03b3f..c73fc30 100644
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -273,6 +273,9 @@ public:
 
   /* Nonzero means that text should be colorized.  */
   bool show_color;
+
+  /* Nonzero means that URLs should be emitted.  */
+  bool show_urls;
 };
 
 static inline const char *
@@ -393,6 +396,9 @@ extern void pp_maybe_space (pretty_printer *);
 extern void pp_begin_quote (pretty_printer *, bool);
 extern void pp_end_quote (pretty_printer *, bool);
 
+extern void pp_begin_url (pretty_printer *pp, const char *url);
+extern void pp_end_url (pretty_printer *pp);
+
 /* Switch into verbatim mode and return the old mode.  */
 static inline pp_wrapping_mode_t
 pp_set_verbatim_wrapping_ (pretty_printer *pp)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3b1e63b..b6e9d88 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  David Malcolm  <dmalcolm@redhat.com>
+
+	PR 87488
+	* lib/prune.exp (TEST_ALWAYS_FLAGS): Add -fdiagnostics-urls=never.
+
 2019-10-10  Uroš Bizjak  <ubizjak@gmail.com>
 
 	PR target/92022
diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 812c59e..a9beef4 100644
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -21,7 +21,7 @@ load_lib multiline.exp
 if ![info exists TEST_ALWAYS_FLAGS] {
     set TEST_ALWAYS_FLAGS ""
 }
-set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret -fno-diagnostics-show-line-numbers -fdiagnostics-color=never $TEST_ALWAYS_FLAGS"
+set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret -fno-diagnostics-show-line-numbers -fdiagnostics-color=never  -fdiagnostics-urls=never $TEST_ALWAYS_FLAGS"
 
 proc prune_gcc_output { text } {
     global srcdir
-- 
cgit v1.1


From 3245582f7d5cf4a5f69218add91a15aa606e8822 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Thu, 10 Oct 2019 17:00:29 +0000
Subject: [PATCH 1/3] S/390: Do not use signaling vector comparisons on z13

z13 supports only non-signaling vector comparisons.  This means we
cannot vectorize LT, LE, GT, GE and LTGT when compiling for z13.  Notify
middle-end about this by using more restrictive operator predicate in
vcond<V_HW:mode><V_HW2:mode>.

gcc/ChangeLog:

2019-10-10  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR target/77918
	* config/s390/vector.md (vcond_comparison_operator): New
	predicate.
	(vcond<V_HW:mode><V_HW2:mode>): Use vcond_comparison_operator.

From-SVN: r276842
---
 gcc/ChangeLog             |  7 +++++++
 gcc/config/s390/vector.md | 22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3c1a4f..9c34213 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-10  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	PR target/77918
+	* config/s390/vector.md (vcond_comparison_operator): New
+	predicate.
+	(vcond<V_HW:mode><V_HW2:mode>): Use vcond_comparison_operator.
+
 2019-10-10  David Malcolm  <dmalcolm@redhat.com>
 
 	PR 87488
diff --git a/gcc/config/s390/vector.md b/gcc/config/s390/vector.md
index 127b75f..e50047b 100644
--- a/gcc/config/s390/vector.md
+++ b/gcc/config/s390/vector.md
@@ -614,10 +614,30 @@
   operands[2] = GEN_INT (GET_MODE_NUNITS (<MODE>mode) - 1);
 })
 
+(define_predicate "vcond_comparison_operator"
+  (match_operand 0 "comparison_operator")
+{
+  if (!HONOR_NANS (GET_MODE (XEXP (op, 0)))
+      && !HONOR_NANS (GET_MODE (XEXP (op, 1))))
+    return true;
+  switch (GET_CODE (op))
+    {
+    case LE:
+    case LT:
+    case GE:
+    case GT:
+    case LTGT:
+      /* Signaling vector comparisons are supported only on z14+.  */
+      return TARGET_Z14;
+    default:
+      return true;
+    }
+})
+
 (define_expand "vcond<V_HW:mode><V_HW2:mode>"
   [(set (match_operand:V_HW 0 "register_operand" "")
 	(if_then_else:V_HW
-	 (match_operator 3 "comparison_operator"
+	 (match_operator 3 "vcond_comparison_operator"
 			 [(match_operand:V_HW2 4 "register_operand" "")
 			  (match_operand:V_HW2 5 "nonmemory_operand" "")])
 	 (match_operand:V_HW 1 "nonmemory_operand" "")
-- 
cgit v1.1


From b4c7ca2ef3915a0b2292499dabcaabefdca04d89 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Thu, 10 Oct 2019 17:03:46 +0000
Subject: Documentation hyperlinks for [-Wname-of-option] (PR 87488)

This patch uses the support for pretty-printing escaped URLs added in
the previous patch (PR 87488) so that in a sufficiently capable terminal
the [-Wname-of-option] emitted at the end of each diagnostic becomes a
hyperlink to the documentation for that option on the GCC website.

I've tested it with Fedora 30's GNOME Terminal (3.32.2 with VTE 0.56.3);
the option text is printed with a dotted underline, hovering shows the
URL, and on right-clicking it offers menu items to visit/copy the URL.

gcc/ChangeLog:
	PR 87488
	* Makefile.in (CFLAGS-opts.o): Pass in DOCUMENTATION_ROOT_URL via
	-D.
	* configure.ac (--with-documentation-root-url): New option.
	* configure: Regenerate.
	* diagnostic-format-json.cc (json_end_diagnostic): If there is an
	option URL, add it as a new string field of the diagnostic option.
	* diagnostic.c (diagnostic_initialize): Initialize get_option_url.
	(print_option_information): If get_option_url is non-NULL, call
	it, and if the result is non-NULL, potentially emit an escape
	sequence to markup the option text with the resulting URL.
	* diagnostic.h (diagnostic_context::get_option_url): New callback.
	* doc/invoke.texi (-fdiagnostics-format=): Add "option_url" to
	example of JSON output.
	* opts-diagnostic.h (get_option_url): New decl.
	* opts.c (get_option_url): New function.
	* toplev.c (general_init): Initialize the get_option_url callback.

gcc/testsuite/ChangeLog:
	PR 87488
	* c-c++-common/diagnostic-format-json-2.c: Expect an "option_url"
	field.
	* c-c++-common/diagnostic-format-json-3.c: Likewise.
	* gfortran.dg/diagnostic-format-json-2.F90: Likewise.
	* gfortran.dg/diagnostic-format-json-3.F90: Likewise.
	* jit.dg/test-error-array-bounds.c (create_code): Ensure that
	error messages don't contain escaped URLs.

From-SVN: r276843
---
 gcc/ChangeLog                                      | 20 +++++++++++++++++
 gcc/Makefile.in                                    |  2 ++
 gcc/configure                                      | 25 ++++++++++++++++++++--
 gcc/configure.ac                                   | 14 ++++++++++++
 gcc/diagnostic-format-json.cc                      | 11 ++++++++++
 gcc/diagnostic.c                                   | 12 +++++++++++
 gcc/diagnostic.h                                   |  6 ++++++
 gcc/doc/invoke.texi                                |  1 +
 gcc/opts-diagnostic.h                              |  3 +++
 gcc/opts.c                                         | 21 ++++++++++++++++++
 gcc/testsuite/ChangeLog                            | 11 ++++++++++
 .../c-c++-common/diagnostic-format-json-2.c        |  1 +
 .../c-c++-common/diagnostic-format-json-3.c        |  1 +
 .../c-c++-common/diagnostic-format-json-4.c        | 10 +++++++--
 .../gfortran.dg/diagnostic-format-json-2.F90       |  1 +
 .../gfortran.dg/diagnostic-format-json-3.F90       |  1 +
 gcc/testsuite/jit.dg/test-error-array-bounds.c     |  5 +++--
 gcc/toplev.c                                       |  1 +
 18 files changed, 140 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9c34213..4409d45 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -8,6 +8,26 @@
 2019-10-10  David Malcolm  <dmalcolm@redhat.com>
 
 	PR 87488
+	* Makefile.in (CFLAGS-opts.o): Pass in DOCUMENTATION_ROOT_URL via
+	-D.
+	* configure.ac (--with-documentation-root-url): New option.
+	* configure: Regenerate.
+	* diagnostic-format-json.cc (json_end_diagnostic): If there is an
+	option URL, add it as a new string field of the diagnostic option.
+	* diagnostic.c (diagnostic_initialize): Initialize get_option_url.
+	(print_option_information): If get_option_url is non-NULL, call
+	it, and if the result is non-NULL, potentially emit an escape
+	sequence to markup the option text with the resulting URL.
+	* diagnostic.h (diagnostic_context::get_option_url): New callback.
+	* doc/invoke.texi (-fdiagnostics-format=): Add "option_url" to
+	example of JSON output.
+	* opts-diagnostic.h (get_option_url): New decl.
+	* opts.c (get_option_url): New function.
+	* toplev.c (general_init): Initialize the get_option_url callback.
+
+2019-10-10  David Malcolm  <dmalcolm@redhat.com>
+
+	PR 87488
 	* common.opt (fdiagnostics-urls=): New option.
 	(diagnostic-url.h): Add SourceInclude.
 	(diagnostic_url_rule): New enum.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 59adfaa..c82858f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2142,6 +2142,8 @@ lto-wrapper$(exeext): $(LTO_WRAPPER_OBJS) libcommon-target.a $(LIBDEPS)
 	   $(LTO_WRAPPER_OBJS) libcommon-target.a $(LIBS)
 	mv -f T$@ $@
 
+CFLAGS-opts.o += -DDOCUMENTATION_ROOT_URL=\"@DOCUMENTATION_ROOT_URL@\"
+
 # Files used by all variants of C or by the stand-alone pre-processor.
 
 CFLAGS-c-family/c-opts.o += @TARGET_SYSTEM_ROOT_DEFINE@
diff --git a/gcc/configure b/gcc/configure
index dc9f5fe..9de9ef8 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -815,6 +815,7 @@ accel_dir_suffix
 real_target_noncanonical
 enable_as_accelerator
 gnat_install_lib
+DOCUMENTATION_ROOT_URL
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
 PKGVERSION
@@ -960,6 +961,7 @@ enable_gcov
 with_specs
 with_pkgversion
 with_bugurl
+with_documentation_root_url
 enable_languages
 with_multilib_list
 with_zstd
@@ -1788,6 +1790,8 @@ Optional Packages:
   --with-specs=SPECS      add SPECS to driver command-line processing
   --with-pkgversion=PKG   Use PKG in the version string in place of "GCC"
   --with-bugurl=URL       Direct users to URL to report a bug
+  --with-documentation-root-url=URL
+                          Root for documentation URLs
   --with-multilib-list    select multilibs (AArch64, SH and x86-64 only)
   --with-zstd=PATH        specify prefix directory for installed zstd library.
                           Equivalent to --with-zstd-include=PATH/include plus
@@ -7802,6 +7806,23 @@ fi
 
 
 
+# Allow overriding the default URL for documentation
+
+# Check whether --with-documentation-root-url was given.
+if test "${with_documentation_root_url+set}" = set; then :
+  withval=$with_documentation_root_url; case "$withval" in
+      yes) as_fn_error $? "documentation root URL not specified" "$LINENO" 5 ;;
+      no)  as_fn_error $? "documentation root URL not specified" "$LINENO" 5 ;;
+      *)   DOCUMENTATION_ROOT_URL="$withval"
+	   ;;
+     esac
+else
+  DOCUMENTATION_ROOT_URL="https://gcc.gnu.org/onlinedocs/gcc/"
+
+fi
+
+
+
 # Sanity check enable_languages in case someone does not run the toplevel
 # configure # script.
 # Check whether --enable-languages was given.
@@ -18830,7 +18851,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 18833 "configure"
+#line 18854 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18936,7 +18957,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 18939 "configure"
+#line 18960 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 54a6715..62f4b26 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -960,6 +960,20 @@ AC_SUBST(CONFIGURE_SPECS)
 ACX_PKGVERSION([GCC])
 ACX_BUGURL([https://gcc.gnu.org/bugs/])
 
+# Allow overriding the default URL for documentation
+AC_ARG_WITH(documentation-root-url,
+    AS_HELP_STRING([--with-documentation-root-url=URL],
+                   [Root for documentation URLs]),
+    [case "$withval" in
+      yes) AC_MSG_ERROR([documentation root URL not specified]) ;;
+      no)  AC_MSG_ERROR([documentation root URL not specified]) ;;
+      *)   DOCUMENTATION_ROOT_URL="$withval"
+	   ;;
+     esac],
+     DOCUMENTATION_ROOT_URL="https://gcc.gnu.org/onlinedocs/gcc/"
+)
+AC_SUBST(DOCUMENTATION_ROOT_URL)
+
 # Sanity check enable_languages in case someone does not run the toplevel
 # configure # script.
 AC_ARG_ENABLE(languages,
diff --git a/gcc/diagnostic-format-json.cc b/gcc/diagnostic-format-json.cc
index 53c3b63..eb99952 100644
--- a/gcc/diagnostic-format-json.cc
+++ b/gcc/diagnostic-format-json.cc
@@ -154,6 +154,17 @@ json_end_diagnostic (diagnostic_context *context, diagnostic_info *diagnostic,
       free (option_text);
     }
 
+  if (context->get_option_url)
+    {
+      char *option_url = context->get_option_url (context,
+						  diagnostic->option_index);
+      if (option_url)
+	{
+	  diag_obj->set ("option_url", new json::string (option_url));
+	  free (option_url);
+	}
+    }
+
   /* If we've already emitted a diagnostic within this auto_diagnostic_group,
      then add diag_obj to its "children" array.  */
   if (cur_group)
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 467cc396..a29bcf1 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -200,6 +200,7 @@ diagnostic_initialize (diagnostic_context *context, int n_opts)
   context->option_enabled = NULL;
   context->option_state = NULL;
   context->option_name = NULL;
+  context->get_option_url = NULL;
   context->last_location = UNKNOWN_LOCATION;
   context->last_module = 0;
   context->x_data = NULL;
@@ -912,11 +913,22 @@ print_option_information (diagnostic_context *context,
 
   if (option_text)
     {
+      char *option_url = NULL;
+      if (context->get_option_url)
+	option_url = context->get_option_url (context,
+					      diagnostic->option_index);
       pretty_printer *pp = context->printer;
       pp_string (pp, " [");
       pp_string (pp, colorize_start (pp_show_color (pp),
 				     diagnostic_kind_color[diagnostic->kind]));
+      if (option_url)
+	pp_begin_url (pp, option_url);
       pp_string (pp, option_text);
+      if (option_url)
+	{
+	  pp_end_url (pp);
+	  free (option_url);
+	}
       pp_string (pp, colorize_stop (pp_show_color (pp)));
       pp_character (pp, ']');
       free (option_text);
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index f0ea8e8..91e4c50 100644
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -194,6 +194,12 @@ struct diagnostic_context
      May be passed 0 as well as the index of a particular option.  */
   char *(*option_name) (diagnostic_context *, int, diagnostic_t, diagnostic_t);
 
+  /* Client hook to return a URL describing the option that controls
+     a diagnostic.  Returns malloced memory.  May return NULL if no URL
+     is available.  May be passed 0 as well as the index of a
+     particular option.  */
+  char *(*get_option_url) (diagnostic_context *, int);
+
   /* Auxiliary data for client.  */
   void *x_data;
 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index bdbcd95..085e8b0 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -4116,6 +4116,7 @@ might be printed in JSON form (after formatting) like this:
         ],
         "message": "this \u2018if\u2019 clause does not guard...",
         "option": "-Wmisleading-indentation",
+        "option_url": "https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmisleading-indentation",
         "children": [
             @{
                 "kind": "note",
diff --git a/gcc/opts-diagnostic.h b/gcc/opts-diagnostic.h
index 08110af..3f58ae9 100644
--- a/gcc/opts-diagnostic.h
+++ b/gcc/opts-diagnostic.h
@@ -22,4 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 
 extern char *option_name (diagnostic_context *context, int option_index,
 			  diagnostic_t orig_diag_kind, diagnostic_t diag_kind);
+
+extern char *get_option_url (diagnostic_context *context, int option_index);
+
 #endif
diff --git a/gcc/opts.c b/gcc/opts.c
index 1070b9d..32869ca 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -3218,3 +3218,24 @@ option_name (diagnostic_context *context, int option_index,
   else
     return NULL;
 }
+
+/* Return malloced memory for a URL describing the option OPTION_INDEX
+   which enabled a diagnostic (context CONTEXT).  */
+
+char *
+get_option_url (diagnostic_context *, int option_index)
+{
+  if (option_index)
+    /* DOCUMENTATION_ROOT_URL should be supplied via -D by the Makefile
+       (see --with-documentation-root-url).
+
+       Expect an anchor of the form "index-Wfoo" e.g.
+       <a name="index-Wformat"></a>, and thus an id within
+       the URL of "#index-Wformat".  */
+    return concat (DOCUMENTATION_ROOT_URL,
+		   "Warning-Options.html",
+		   "#index", cl_options[option_index].opt_text,
+		   NULL);
+  else
+    return NULL;
+}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b6e9d88..c3f5880 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,17 @@
 2019-10-10  David Malcolm  <dmalcolm@redhat.com>
 
 	PR 87488
+	* c-c++-common/diagnostic-format-json-2.c: Expect an "option_url"
+	field.
+	* c-c++-common/diagnostic-format-json-3.c: Likewise.
+	* gfortran.dg/diagnostic-format-json-2.F90: Likewise.
+	* gfortran.dg/diagnostic-format-json-3.F90: Likewise.
+	* jit.dg/test-error-array-bounds.c (create_code): Ensure that
+	error messages don't contain escaped URLs.
+
+2019-10-10  David Malcolm  <dmalcolm@redhat.com>
+
+	PR 87488
 	* lib/prune.exp (TEST_ALWAYS_FLAGS): Add -fdiagnostics-urls=never.
 
 2019-10-10  Uroš Bizjak  <ubizjak@gmail.com>
diff --git a/gcc/testsuite/c-c++-common/diagnostic-format-json-2.c b/gcc/testsuite/c-c++-common/diagnostic-format-json-2.c
index 239c75e..557ccf8 100644
--- a/gcc/testsuite/c-c++-common/diagnostic-format-json-2.c
+++ b/gcc/testsuite/c-c++-common/diagnostic-format-json-2.c
@@ -10,6 +10,7 @@
 /* { dg-regexp "\"kind\": \"warning\"" } */
 /* { dg-regexp "\"message\": \"#warning message\"" } */
 /* { dg-regexp "\"option\": \"-Wcpp\"" } */
+/* { dg-regexp "\"option_url\": \"https:\[^\n\r\"\]*#index-Wcpp\"" } */
 
 /* { dg-regexp "\"caret\": \{" } */
 /* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-2.c\"" } */
diff --git a/gcc/testsuite/c-c++-common/diagnostic-format-json-3.c b/gcc/testsuite/c-c++-common/diagnostic-format-json-3.c
index 1c54eca..378205c 100644
--- a/gcc/testsuite/c-c++-common/diagnostic-format-json-3.c
+++ b/gcc/testsuite/c-c++-common/diagnostic-format-json-3.c
@@ -10,6 +10,7 @@
 /* { dg-regexp "\"kind\": \"error\"" } */
 /* { dg-regexp "\"message\": \"#warning message\"" } */
 /* { dg-regexp "\"option\": \"-Werror=cpp\"" } */
+/* { dg-regexp "\"option_url\": \"https:\[^\n\r\"\]*#index-Wcpp\"" } */
 
 /* { dg-regexp "\"caret\": \{" } */
 /* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-3.c\"" } */
diff --git a/gcc/testsuite/c-c++-common/diagnostic-format-json-4.c b/gcc/testsuite/c-c++-common/diagnostic-format-json-4.c
index 1c3b034..2738be6 100644
--- a/gcc/testsuite/c-c++-common/diagnostic-format-json-4.c
+++ b/gcc/testsuite/c-c++-common/diagnostic-format-json-4.c
@@ -30,13 +30,12 @@ int test (void)
 /* { dg-regexp "\"line\": 8" } */
 /* { dg-regexp "\"column\": 10" } */
 
-/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
-
 /* The outer diagnostic.  */
 
 /* { dg-regexp "\"kind\": \"warning\"" } */
 /* { dg-regexp "\"message\": \"this 'if' clause does not guard...\"" } */
 /* { dg-regexp "\"option\": \"-Wmisleading-indentation\"" } */
+/* { dg-regexp "\"option_url\": \"https:\[^\n\r\"\]*#index-Wmisleading-indentation\"" } */
 
 /* { dg-regexp "\"caret\": \{" } */
 /* { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-4.c\"" } */
@@ -48,6 +47,13 @@ int test (void)
 /* { dg-regexp "\"line\": 6" } */
 /* { dg-regexp "\"column\": 4" } */
 
+/* More from the nested diagnostic (we can't guarantee what order the
+   "file" keys are consumed).  */
+
+/* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
+
+/* More from the outer diagnostic.  */
+
 /* { dg-regexp "\"locations\": \[\[\{\}, \]*\]" } */
 
 /* { dg-regexp "\"children\": \[\[\{\}, \]*\]" } */
diff --git a/gcc/testsuite/gfortran.dg/diagnostic-format-json-2.F90 b/gcc/testsuite/gfortran.dg/diagnostic-format-json-2.F90
index a6d27d9..bebcf68 100644
--- a/gcc/testsuite/gfortran.dg/diagnostic-format-json-2.F90
+++ b/gcc/testsuite/gfortran.dg/diagnostic-format-json-2.F90
@@ -10,6 +10,7 @@
 ! { dg-regexp "\"kind\": \"warning\"" }
 ! { dg-regexp "\"message\": \"#warning message\"" }
 ! { dg-regexp "\"option\": \"-Wcpp\"" }
+! { dg-regexp "\"option_url\": \"\[^\n\r\"\]*#index-Wcpp\"" }
 
 ! { dg-regexp "\"caret\": \{" }
 ! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-2.F90\"" }
diff --git a/gcc/testsuite/gfortran.dg/diagnostic-format-json-3.F90 b/gcc/testsuite/gfortran.dg/diagnostic-format-json-3.F90
index 702a937..7ab78eb 100644
--- a/gcc/testsuite/gfortran.dg/diagnostic-format-json-3.F90
+++ b/gcc/testsuite/gfortran.dg/diagnostic-format-json-3.F90
@@ -10,6 +10,7 @@
 ! { dg-regexp "\"kind\": \"error\"" }
 ! { dg-regexp "\"message\": \"#warning message\"" }
 ! { dg-regexp "\"option\": \"-Werror=cpp\"" }
+! { dg-regexp "\"option_url\": \"\[^\n\r\"\]*#index-Wcpp\"" }
 
 ! { dg-regexp "\"caret\": \{" }
 ! { dg-regexp "\"file\": \"\[^\n\r\"\]*diagnostic-format-json-3.F90\"" }
diff --git a/gcc/testsuite/jit.dg/test-error-array-bounds.c b/gcc/testsuite/jit.dg/test-error-array-bounds.c
index 889c517..cd9361f 100644
--- a/gcc/testsuite/jit.dg/test-error-array-bounds.c
+++ b/gcc/testsuite/jit.dg/test-error-array-bounds.c
@@ -20,9 +20,10 @@ create_code (gcc_jit_context *ctxt, void *user_data)
   gcc_jit_context_add_command_line_option (ctxt, "-Warray-bounds");
   gcc_jit_context_add_command_line_option (ctxt, "-ftree-vrp");
 
-  /* Ensure that the error message doesn't contain colorization codes,
-     even if run at a TTY.  */
+  /* Ensure that the error message doesn't contain colorization codes
+     or escaped URLs, even if run at a TTY.  */
   gcc_jit_context_add_command_line_option (ctxt, "-fdiagnostics-color=never");
+  gcc_jit_context_add_command_line_option (ctxt, "-fdiagnostics-urls=never");
 
   gcc_jit_type *char_type =
     gcc_jit_context_get_type (ctxt, GCC_JIT_TYPE_CHAR);
diff --git a/gcc/toplev.c b/gcc/toplev.c
index b85d52c..1c7002f 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1110,6 +1110,7 @@ general_init (const char *argv0, bool init_signals)
   global_dc->option_enabled = option_enabled;
   global_dc->option_state = &global_options;
   global_dc->option_name = option_name;
+  global_dc->get_option_url = get_option_url;
 
   if (init_signals)
     {
-- 
cgit v1.1


From d102b039463a39f0baf66a223300f9440dbb04d2 Mon Sep 17 00:00:00 2001
From: Michael Meissner <meissner@linux.ibm.com>
Date: Thu, 10 Oct 2019 18:54:50 +0000
Subject: Add check for prefixed addresses.

2019-10-10  Michael Meissner  <meissner@linux.ibm.com>

	* config/rs6000/rs6000.c (quad_address_p): Add check for prefixed
	addresses.
	(mem_operand_gpr): Add check for prefixed addresses.
	(mem_operand_ds_form): Add check for prefixed addresses.
	(rs6000_legitimate_offset_address_p): If we support prefixed
	addresses, check for a 34-bit offset instead of 16-bit.
	(rs6000_legitimate_address_p): Add check for prefixed addresses.
	Do not allow load/store with update if the address is prefixed.
	(rs6000_mode_dependent_address):  If we support prefixed
	addresses, check for a 34-bit offset instead of 16-bit.

From-SVN: r276846
---
 gcc/ChangeLog              | 13 +++++++++++++
 gcc/config/rs6000/rs6000.c | 42 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 52 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4409d45..fea0085 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-10  Michael Meissner  <meissner@linux.ibm.com>
+
+	* config/rs6000/rs6000.c (quad_address_p): Add check for prefixed
+	addresses.
+	(mem_operand_gpr): Add check for prefixed addresses.
+	(mem_operand_ds_form): Add check for prefixed addresses.
+	(rs6000_legitimate_offset_address_p): If we support prefixed
+	addresses, check for a 34-bit offset instead of 16-bit.
+	(rs6000_legitimate_address_p): Add check for prefixed addresses.
+	Do not allow load/store with update if the address is prefixed.
+	(rs6000_mode_dependent_address):  If we support prefixed
+	addresses, check for a 34-bit offset instead of 16-bit.
+
 2019-10-10  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	PR target/77918
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index a4a3882..3421faf 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -7250,6 +7250,13 @@ quad_address_p (rtx addr, machine_mode mode, bool strict)
   if (VECTOR_MODE_P (mode) && !mode_supports_dq_form (mode))
     return false;
 
+  /* Is this a valid prefixed address?  If the bottom four bits of the offset
+     are non-zero, we could use a prefixed instruction (which does not have the
+     DQ-form constraint that the traditional instruction had) instead of
+     forcing the unaligned offset to a GPR.  */
+  if (address_is_prefixed (addr, mode, NON_PREFIXED_DQ))
+    return true;
+
   if (GET_CODE (addr) != PLUS)
     return false;
 
@@ -7351,6 +7358,13 @@ mem_operand_gpr (rtx op, machine_mode mode)
       && legitimate_indirect_address_p (XEXP (addr, 0), false))
     return true;
 
+  /* Allow prefixed instructions if supported.  If the bottom two bits of the
+     offset are non-zero, we could use a prefixed instruction (which does not
+     have the DS-form constraint that the traditional instruction had) instead
+     of forcing the unaligned offset to a GPR.  */
+  if (address_is_prefixed (addr, mode, NON_PREFIXED_DS))
+    return true;
+
   /* Don't allow non-offsettable addresses.  See PRs 83969 and 84279.  */
   if (!rs6000_offsettable_memref_p (op, mode, false))
     return false;
@@ -7385,6 +7399,13 @@ mem_operand_ds_form (rtx op, machine_mode mode)
   int extra;
   rtx addr = XEXP (op, 0);
 
+  /* Allow prefixed instructions if supported.  If the bottom two bits of the
+     offset are non-zero, we could use a prefixed instruction (which does not
+     have the DS-form constraint that the traditional instruction had) instead
+     of forcing the unaligned offset to a GPR.  */
+  if (address_is_prefixed (addr, mode, NON_PREFIXED_DS))
+    return true;
+
   if (!offsettable_address_p (false, mode, addr))
     return false;
 
@@ -7754,7 +7775,10 @@ rs6000_legitimate_offset_address_p (machine_mode mode, rtx x,
       break;
     }
 
-  return SIGNED_16BIT_OFFSET_EXTRA_P (offset, extra);
+  if (TARGET_PREFIXED_ADDR)
+    return SIGNED_34BIT_OFFSET_EXTRA_P (offset, extra);
+  else
+    return SIGNED_16BIT_OFFSET_EXTRA_P (offset, extra);
 }
 
 bool
@@ -8651,6 +8675,11 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
       && mode_supports_pre_incdec_p (mode)
       && legitimate_indirect_address_p (XEXP (x, 0), reg_ok_strict))
     return 1;
+
+  /* Handle prefixed addresses (PC-relative or 34-bit offset).  */
+  if (address_is_prefixed (x, mode, NON_PREFIXED_DEFAULT))
+    return 1;
+
   /* Handle restricted vector d-form offsets in ISA 3.0.  */
   if (quad_offset_p)
     {
@@ -8709,7 +8738,11 @@ rs6000_legitimate_address_p (machine_mode mode, rtx x, bool reg_ok_strict)
 	  || (!avoiding_indexed_address_p (mode)
 	      && legitimate_indexed_address_p (XEXP (x, 1), reg_ok_strict)))
       && rtx_equal_p (XEXP (XEXP (x, 1), 0), XEXP (x, 0)))
-    return 1;
+    {
+      /* There is no prefixed version of the load/store with update.  */
+      rtx addr = XEXP (x, 1);
+      return !address_is_prefixed (addr, mode, NON_PREFIXED_DEFAULT);
+    }
   if (reg_offset_p && !quad_offset_p
       && legitimate_lo_sum_address_p (mode, x, reg_ok_strict))
     return 1;
@@ -8773,7 +8806,10 @@ rs6000_mode_dependent_address (const_rtx addr)
 	{
 	  HOST_WIDE_INT val = INTVAL (XEXP (addr, 1));
 	  HOST_WIDE_INT extra = TARGET_POWERPC64 ? 8 : 12;
-	  return !SIGNED_16BIT_OFFSET_EXTRA_P (val, extra);
+	  if (TARGET_PREFIXED_ADDR)
+	    return !SIGNED_34BIT_OFFSET_EXTRA_P (val, extra);
+	  else
+	    return !SIGNED_16BIT_OFFSET_EXTRA_P (val, extra);
 	}
       break;
 
-- 
cgit v1.1


From eb870e5e5ed4d5b784533d23afee637543e7dacc Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Thu, 10 Oct 2019 19:04:33 +0000
Subject: [Objective-C, NeXT ABI]  Identify V2 IVAR refs by metadata.

For the NeXT 64b ABI, IVAR refs are supposed to be indirected for
Mach-O PIC.  Identify them so that we can act as needed.

gcc/objc/ChangeLog:

2019-10-10  Iain Sandoe  <iain@sandoe.co.uk>

	* objc-next-metadata-tags.h (OCTI_RT_META_IVAR_REF): New.
	(meta_ivar_ref): New.
	* objc-next-runtime-abi-02.c
	(next_runtime_abi_02_init_metadata_attributes): Create the
	IVAR ref metadata identifier.
	(ivar_offset_ref): Tag IVAR refs with specific metadata.

From-SVN: r276847
---
 gcc/objc/ChangeLog                  | 9 +++++++++
 gcc/objc/objc-next-metadata-tags.h  | 4 ++++
 gcc/objc/objc-next-runtime-abi-02.c | 6 ++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 2b8f889..7919c3e 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-10  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* objc-next-metadata-tags.h (OCTI_RT_META_IVAR_REF): New.
+	(meta_ivar_ref): New.
+	* objc-next-runtime-abi-02.c
+	(next_runtime_abi_02_init_metadata_attributes): Create the
+	IVAR ref metadata identifier.
+	(ivar_offset_ref): Tag IVAR refs with specific metadata.
+
 2019-06-05  Martin Sebor  <msebor@redhat.com>
 
 	* objc-act.c (objc_build_setter_call): Adjust quoting and hyphenation.
diff --git a/gcc/objc/objc-next-metadata-tags.h b/gcc/objc/objc-next-metadata-tags.h
index 1822aa7..933f08c 100644
--- a/gcc/objc/objc-next-metadata-tags.h
+++ b/gcc/objc/objc-next-metadata-tags.h
@@ -74,6 +74,8 @@ enum objc_runtime_tree_index
 
   OCTI_RT_META_CONST_STR,
 
+  OCTI_RT_META_IVAR_REF,
+
   OCTI_RT_META_MAX
 };
 
@@ -167,6 +169,8 @@ enum objc_runtime_tree_index
 
 #define meta_const_str	objc_rt_trees[OCTI_RT_META_CONST_STR]
 
+#define meta_ivar_ref	objc_rt_trees[OCTI_RT_META_IVAR_REF]
+
 #define OBJCMETA(DECL,VERS,KIND)					\
   if (VERS)								\
     DECL_ATTRIBUTES (DECL) = build_tree_list ((VERS), (KIND));
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index aa1cbde..3e38b7d 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -345,6 +345,8 @@ next_runtime_abi_02_init_metadata_attributes (void)
   meta_ehtype = get_identifier ("V2_EHTY");
 
   meta_const_str = get_identifier ("V2_CSTR");
+
+  meta_ivar_ref = get_identifier ("V2_IVRF");
 }
 
 static void next_runtime_02_initialize (void)
@@ -2795,8 +2797,8 @@ ivar_offset_ref (tree class_name, tree field_decl)
   else
     decl = create_hidden_decl (TREE_TYPE (size_zero_node), buf);
 
-  /* Make sure it ends up in an ObjC section.  */
-  OBJCMETA (decl, objc_meta, meta_base);
+  /* Identify so that we can indirect these where the ABI requires.  */
+  OBJCMETA (decl, objc_meta, meta_ivar_ref);
 
   e.decl = decl;
   e.offset = byte_position (field_decl);
-- 
cgit v1.1


From 3a73cd7c9d4e51013aa526988e154a73b86e4970 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Thu, 10 Oct 2019 19:14:07 +0000
Subject: [Darwin, machopic 4/n] Arrange to indirect IVARs when needed.

Objective C V2 (m64) IVAR offset refs from Apple GCC-4.x have an indirection
for m64 code on PPC (which is the only 64b user for Mach-O PIC).  Apple GCC
4.x places the indirections in the .data section, however this seems to have
been unintentional - and we are placing the indirections in the non-lazy
symbol pointers section.

gcc/ChangeLog:

2019-10-10  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c: Lookup Objective C metadata and force indirection
	for IVAR refs.

From-SVN: r276848
---
 gcc/ChangeLog       |  5 +++++
 gcc/config/darwin.c | 11 +++++++++++
 2 files changed, 16 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fea0085..f91ff7e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c: Lookup Objective C metadata and force indirection
+	for IVAR refs.
+
 2019-10-10  Michael Meissner  <meissner@linux.ibm.com>
 
 	* config/rs6000/rs6000.c (quad_address_p): Add check for prefixed
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index f490f62..539ef75 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1270,6 +1270,17 @@ darwin_encode_section_info (tree decl, rtx rtl, int first)
       || (DECL_WEAK (decl) && ! MACHO_SYMBOL_HIDDEN_VIS_P (sym_ref))
       || lookup_attribute ("weakref", DECL_ATTRIBUTES (decl)))
      SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_MUST_INDIRECT;
+
+#if DARWIN_PPC
+  /* Objective C V2 (m64) IVAR offset refs from Apple GCC-4.x have an
+     indirection for m64 code on PPC.  Historically, these indirections
+     also appear in the .data section.  */
+  tree o2meta = lookup_attribute ("OBJC2META", DECL_ATTRIBUTES (decl));
+  o2meta = o2meta ? TREE_VALUE (o2meta) : NULL_TREE;
+
+  if (o2meta && strncmp (IDENTIFIER_POINTER (o2meta), "V2_IVRF",7) == 0)
+    SYMBOL_REF_FLAGS (sym_ref) |= MACHO_SYMBOL_FLAG_MUST_INDIRECT;
+#endif
 }
 
 void
-- 
cgit v1.1


From cd8589ab05a8d926c5330055c1099d300d64a0a8 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Thu, 10 Oct 2019 21:20:01 +0200
Subject: * ipa-reference.c (propagate): Fix releasing of IPA summaries.

From-SVN: r276849
---
 gcc/ChangeLog       | 4 ++++
 gcc/ipa-reference.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f91ff7e..6307ea3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-10  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-reference.c (propagate): Fix releasing of IPA summaries.
+
 2019-10-10  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c: Lookup Objective C metadata and force indirection
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 78737aa..e95a724 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -891,13 +891,12 @@ propagate (void)
 
   bitmap_obstack_release (&local_info_obstack);
 
-  if (ipa_ref_var_info_summaries == NULL)
+  if (ipa_ref_var_info_summaries != NULL)
     {
       delete ipa_ref_var_info_summaries;
       ipa_ref_var_info_summaries = NULL;
     }
 
-  ipa_ref_var_info_summaries = NULL;
   if (dump_file)
     splay_tree_delete (reference_vars_to_consider);
   reference_vars_to_consider = NULL;
-- 
cgit v1.1


From 6488759f404f3aff6642b005242a9c82a1c2cee2 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Thu, 10 Oct 2019 21:31:58 +0200
Subject: ipa-reference.c: Do not include splay-tree.h

	* ipa-reference.c: Do not include splay-tree.h
	(reference_vars_to_consider): Turn to hash map.
	(get_static_name, ipa_init, analyze_function, propagate,
	stream_out_bitmap, ipa_reference_write_optimization_summary,
	ipa_reference_write_optimization_summary): Update.

From-SVN: r276850
---
 gcc/ChangeLog       |  8 ++++++++
 gcc/ipa-reference.c | 32 ++++++++++++++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6307ea3..6a86dd8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-10  Jan Hubicka  <hubicka@ucw.cz>
 
+	* ipa-reference.c: Do not include splay-tree.h
+	(reference_vars_to_consider): Turn to hash map.
+	(get_static_name, ipa_init, analyze_function, propagate,
+	stream_out_bitmap, ipa_reference_write_optimization_summary,
+	ipa_reference_write_optimization_summary): Update.
+
+2019-10-10  Jan Hubicka  <hubicka@ucw.cz>
+
 	* ipa-reference.c (propagate): Fix releasing of IPA summaries.
 
 2019-10-10  Iain Sandoe  <iain@sandoe.co.uk>
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index e95a724..977eb2d 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -46,7 +46,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "cgraph.h"
 #include "data-streamer.h"
 #include "calls.h"
-#include "splay-tree.h"
 #include "ipa-utils.h"
 #include "ipa-reference.h"
 #include "symbol-summary.h"
@@ -92,9 +91,11 @@ struct ipa_reference_vars_info_d
 
 typedef struct ipa_reference_vars_info_d *ipa_reference_vars_info_t;
 
-/* This splay tree contains all of the static variables that are
+/* This map contains all of the static variables that are
    being considered by the compilation level alias analysis.  */
-static splay_tree reference_vars_to_consider;
+typedef hash_map<int_hash <unsigned int, -1U>, tree>
+	 reference_vars_to_consider_t;
+static reference_vars_to_consider_t *reference_vars_to_consider;
 
 /* Set of all interesting module statics.  A bit is set for every module
    static we are considering.  This is added to the local info when asm
@@ -272,9 +273,7 @@ is_proper_for_analysis (tree t)
 static const char *
 get_static_name (int index)
 {
-  splay_tree_node stn =
-    splay_tree_lookup (reference_vars_to_consider, index);
-  return fndecl_name ((tree)(stn->value));
+  return fndecl_name (*reference_vars_to_consider->get (index));
 }
 
 /* Dump a set of static vars to FILE.  */
@@ -416,7 +415,7 @@ ipa_init (void)
   ipa_init_p = true;
 
   if (dump_file)
-    reference_vars_to_consider = splay_tree_new (splay_tree_compare_ints, 0, 0);
+    reference_vars_to_consider = new reference_vars_to_consider_t(251);
 
   bitmap_obstack_initialize (&local_info_obstack);
   bitmap_obstack_initialize (&optimization_summary_obstack);
@@ -476,9 +475,8 @@ analyze_function (struct cgraph_node *fn)
 	  && bitmap_set_bit (all_module_statics, ipa_reference_var_uid (var)))
 	{
 	  if (dump_file)
-	    splay_tree_insert (reference_vars_to_consider,
-			       ipa_reference_var_uid (var),
-			       (splay_tree_value)var);
+	    reference_vars_to_consider->put (ipa_reference_var_uid (var),
+						var);
 	}
       switch (ref->use)
 	{
@@ -898,7 +896,7 @@ propagate (void)
     }
 
   if (dump_file)
-    splay_tree_delete (reference_vars_to_consider);
+    delete reference_vars_to_consider;
   reference_vars_to_consider = NULL;
   return remove_p ? TODO_remove_functions : 0;
 }
@@ -968,8 +966,7 @@ stream_out_bitmap (struct lto_simple_output_block *ob,
     return;
   EXECUTE_IF_AND_IN_BITMAP (bits, ltrans_statics, 0, index, bi)
     {
-      tree decl = (tree)splay_tree_lookup (reference_vars_to_consider,
-					   index)->value;
+      tree decl = *reference_vars_to_consider->get (index);
       lto_output_var_decl_index (ob->decl_state, ob->main_stream, decl);
     }
 }
@@ -987,7 +984,7 @@ ipa_reference_write_optimization_summary (void)
   auto_bitmap ltrans_statics;
   int i;
 
-  reference_vars_to_consider = splay_tree_new (splay_tree_compare_ints, 0, 0);
+  reference_vars_to_consider = new reference_vars_to_consider_t (251);
 
   /* See what variables we are interested in.  */
   for (i = 0; i < lto_symtab_encoder_size (encoder); i++)
@@ -1001,9 +998,8 @@ ipa_reference_write_optimization_summary (void)
 	{
 	  tree decl = vnode->decl;
 	  bitmap_set_bit (ltrans_statics, ipa_reference_var_uid (decl));
-	  splay_tree_insert (reference_vars_to_consider,
-			     ipa_reference_var_uid (decl),
-			     (splay_tree_value)decl);
+	  reference_vars_to_consider->put
+		 (ipa_reference_var_uid (decl), decl);
 	  ltrans_statics_bitcount ++;
 	}
     }
@@ -1045,7 +1041,7 @@ ipa_reference_write_optimization_summary (void)
 	  }
       }
   lto_destroy_simple_output_block (ob);
-  splay_tree_delete (reference_vars_to_consider);
+  delete reference_vars_to_consider;
 }
 
 /* Deserialize the ipa info for lto.  */
-- 
cgit v1.1


From 8faf3ed95357002fdc53890d80c931784beb74eb Mon Sep 17 00:00:00 2001
From: Xiong Hu Luo <luoxhu@linux.ibm.com>
Date: Thu, 10 Oct 2019 19:44:26 +0000
Subject: re PR middle-end/26241 (None of the IPA passes are documented in
 passes.texi)

2019-10-10  Xiong Hu Luo  <luoxhu@linux.ibm.com>
	    Sandra Loosemore  <sandra@codesourcery.com>

	gcc/

	PR middle-end/26241
	* doc/lto.texi (IPA): Reference to the IPA passes.
	* doc/passes.texi (Pass manager): Add node IPA passes and
	  description for each IPA pass.

Co-Authored-By: Sandra Loosemore <sandra@codesourcery.com>

From-SVN: r276851
---
 gcc/ChangeLog       |   8 ++
 gcc/doc/lto.texi    |   9 +-
 gcc/doc/passes.texi | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 285 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6a86dd8..b9bcaba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-10  Xiong Hu Luo  <luoxhu@linux.ibm.com>
+	    Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR middle-end/26241
+	* doc/lto.texi (IPA): Reference to the IPA passes.
+	* doc/passes.texi (Pass manager): Add node IPA passes and
+	  description for each IPA pass.
+
 2019-10-10  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-reference.c: Do not include splay-tree.h
diff --git a/gcc/doc/lto.texi b/gcc/doc/lto.texi
index 771e827..09f0184 100644
--- a/gcc/doc/lto.texi
+++ b/gcc/doc/lto.texi
@@ -350,10 +350,11 @@ while the @emph{Read summary}, @emph{Execute}, and
 @end itemize
 
 To simplify development, the GCC pass manager differentiates
-between normal inter-procedural passes and small inter-procedural
-passes.  A @emph{small inter-procedural pass}
-(@code{SIMPLE_IPA_PASS}) is a pass that does
-everything at once and thus it cannot be executed during WPA in
+between normal inter-procedural passes (@pxref{Regular IPA passes}),
+small inter-procedural passes (@pxref{Small IPA passes})
+and late inter-procedural passes (@pxref{Late IPA passes}).
+A small or late IPA pass (@code{SIMPLE_IPA_PASS}) does
+everything at once and thus cannot be executed during WPA in
 WHOPR mode.  It defines only the @emph{Execute} stage and during
 this stage it accesses and modifies the function bodies.  Such
 passes are useful for optimization at LGEN or LTRANS time and are
diff --git a/gcc/doc/passes.texi b/gcc/doc/passes.texi
index 6edb9a0..889fa0f 100644
--- a/gcc/doc/passes.texi
+++ b/gcc/doc/passes.texi
@@ -20,6 +20,7 @@ where near complete.
 * Parsing pass::         The language front end turns text into bits.
 * Gimplification pass::  The bits are turned into something we can optimize.
 * Pass manager::         Sequencing the optimization passes.
+* IPA passes::           Inter-procedural optimizations.
 * Tree SSA passes::      Optimizations on a high-level representation.
 * RTL passes::           Optimizations on a low-level representation.
 * Optimization info::    Dumping optimization information from passes.
@@ -178,6 +179,277 @@ TODO: describe the global variables set up by the pass manager,
 and a brief description of how a new pass should use it.
 I need to look at what info RTL passes use first@enddots{}
 
+@node IPA passes
+@section Inter-procedural optimization passes
+@cindex IPA passes
+@cindex inter-procedural optimization passes
+
+The inter-procedural optimization (IPA) passes use call graph
+information to perform transformations across function boundaries.
+IPA is a critical part of link-time optimization (LTO) and
+whole-program (WHOPR) optimization, and these passes are structured
+with the needs of LTO and WHOPR in mind by dividing their operations
+into stages.  For detailed discussion of the LTO/WHOPR IPA pass stages
+and interfaces, see @ref{IPA}.
+
+The following briefly describes the inter-procedural optimization (IPA)
+passes, which are split into small IPA passes, regular IPA passes,
+and late IPA passes, according to the LTO/WHOPR processing model.
+
+@menu
+* Small IPA passes::
+* Regular IPA passes::
+* Late IPA passes::
+@end menu
+
+@node Small IPA passes
+@subsection Small IPA passes
+@cindex small IPA passes
+A small IPA pass is a pass derived from @code{simple_ipa_opt_pass}.
+As described in @ref{IPA}, it does everything at once and 
+defines only the @emph{Execute} stage.  During this
+stage it accesses and modifies the function bodies.
+No @code{generate_summary}, @code{read_summary}, or @code{write_summary}
+hooks are defined.
+
+@itemize @bullet
+@item IPA free lang data
+
+This pass frees resources that are used by the front end but are
+not needed once it is done.  It is located in @file{tree.c} and is described by
+@code{pass_ipa_free_lang_data}.
+
+@item IPA function and variable visibility
+
+This is a local function pass handling visibilities of all symbols.  This
+happens before LTO streaming, so @option{-fwhole-program} should be ignored
+at this level.  It is located in @file{ipa-visibility.c} and is described by
+@code{pass_ipa_function_and_variable_visibility}.
+
+@item IPA remove symbols
+
+This pass performs reachability analysis and reclaims all unreachable nodes.
+It is located in @file{passes.c} and is described by
+@code{pass_ipa_remove_symbols}.
+
+@item IPA OpenACC
+
+This is a pass group for OpenACC processing.  It is located in
+@file{tree-ssa-loop.c} and is described by @code{pass_ipa_oacc}.
+
+@item IPA points-to analysis
+
+This is a tree-based points-to analysis pass. The idea behind this analyzer
+is to generate set constraints from the program, then solve the resulting
+constraints in order to generate the points-to sets.  It is located in 
+@file{tree-ssa-structalias.c} and is described by @code{pass_ipa_pta}.
+
+@item IPA OpenACC kernels
+
+This is a pass group for processing OpenACC kernels regions.  It is a
+subpass of the IPA OpenACC pass group that runs on offloaded functions
+containing OpenACC kernels loops.  It is located in
+@file{tree-ssa-loop.c} and is described by
+@code{pass_ipa_oacc_kernels}.
+
+@item Target clone
+
+This is a pass for parsing functions with multiple target attributes.
+It is located in @file{multiple_target.c} and is described by
+@code{pass_target_clone}.
+
+@item IPA auto profile
+
+This pass uses AutoFDO profiling data to annotate the control flow graph.
+It is located in @file{auto-profile.c} and is described by
+@code{pass_ipa_auto_profile}.
+
+@item IPA tree profile
+
+This pass does profiling for all functions in the call graph. 
+It calculates branch
+probabilities and basic block execution counts. It is located
+in @file{tree-profile.c} and is described by @code{pass_ipa_tree_profile}.
+
+@item IPA free function summary
+
+This pass is a small IPA pass when argument @code{small_p} is true.
+It releases inline function summaries and call summaries.
+It is located in @file{ipa-fnsummary.c} and is described by
+@code{pass_ipa_free_free_fn_summary}.
+
+@item IPA increase alignment
+
+This pass increases the alignment of global arrays to improve
+vectorization. It is located in @file{tree-vectorizer.c}
+and is described by @code{pass_ipa_increase_alignment}.
+
+@item IPA transactional memory
+
+This pass is for transactional memory support.
+It is located in @file{trans-mem.c} and is described by
+@code{pass_ipa_tm}.
+
+@item IPA lower emulated TLS
+
+This pass lowers thread-local storage (TLS) operations
+to emulation functions provided by libgcc.
+It is located in @file{tree-emutls.c} and is described by
+@code{pass_ipa_lower_emutls}.
+
+@end itemize
+
+@node Regular IPA passes
+@subsection Regular IPA passes
+@cindex regular IPA passes
+
+A regular IPA pass is a pass derived from @code{ipa_opt_pass_d} that
+is executed in WHOPR compilation. Regular IPA passes may have summary
+hooks implemented in any of the LGEN, WPA or LTRANS stages (@pxref{IPA}).
+
+@itemize @bullet
+@item IPA whole program visibility
+
+This pass performs various optimizations involving symbol visibility
+with @option{-fwhole-program}, including symbol privatization,
+discovering local functions, and dismantling comdat groups.  It is
+located in @file{ipa-visibility.c} and is described by
+@code{pass_ipa_whole_program_visibility}.
+
+@item IPA profile
+
+The IPA profile pass propagates profiling frequencies across the call
+graph.  It is located in @file{ipa-profile.c} and is described by
+@code{pass_ipa_profile}.
+
+@item IPA identical code folding
+
+This is the inter-procedural identical code folding pass.
+The goal of this transformation is to discover functions
+and read-only variables that have exactly the same semantics.  It is
+located in @file{ipa-icf.c} and is described by @code{pass_ipa_icf}.
+
+@item IPA devirtualization
+
+This pass performs speculative devirtualization based on the type
+inheritance graph.  When a polymorphic call has only one likely target
+in the unit, it is turned into a speculative call. It is located in
+@file{ipa-devirt.c} and is described by @code{pass_ipa_devirt}.
+
+@item IPA constant propagation
+
+The goal of this pass is to discover functions that are always invoked
+with some arguments with the same known constant values and to modify
+the functions accordingly.  It can also do partial specialization and
+type-based devirtualization.  It is located in @file{ipa-cp.c} and is
+described by @code{pass_ipa_cp}.
+
+@item IPA scalar replacement of aggregates
+
+This pass can replace an aggregate parameter with a set of other parameters
+representing part of the original, turning those passed by reference
+into new ones which pass the value directly.  It also removes unused
+function return values and unused function parameters.  This pass is
+located in @file{ipa-sra.c} and is described by @code{pass_ipa_sra}.
+
+@item IPA constructor/destructor merge
+
+This pass merges multiple constructors and destructors for static
+objects into single functions.  It's only run at LTO time unless the
+target doesn't support constructors and destructors natively.  The
+pass is located in @file{ipa.c} and is described by
+@code{pass_ipa_cdtor_merge}.
+
+@item IPA HSA
+
+This pass is part of the GCC support for HSA (Heterogeneous System
+Architecture) accelerators.  It is responsible for creation of HSA
+clones and emitting HSAIL instructions for them.  It is located in
+@file{ipa-hsa.c} and is described by @code{pass_ipa_hsa}.
+
+@item IPA function summary
+
+This pass provides function analysis for inter-procedural passes.
+It collects estimates of function body size, execution time, and frame
+size for each function.  It also estimates information about function
+calls: call statement size, time and how often the parameters change
+for each call.  It is located in @file{ipa-fnsummary.c} and is
+described by @code{pass_ipa_fn_summary}.
+
+@item IPA inline
+
+The IPA inline pass handles function inlining with whole-program
+knowledge. Small functions that are candidates for inlining are
+ordered in increasing badness, bounded by unit growth parameters.
+Unreachable functions are removed from the call graph.  Functions called
+once and not exported from the unit are inlined.  This pass is located in
+@file{ipa-inline.c} and is described by @code{pass_ipa_inline}.
+
+@item IPA pure/const analysis
+
+This pass marks functions as being either const (@code{TREE_READONLY}) or
+pure (@code{DECL_PURE_P}).  The per-function information is produced
+by @code{pure_const_generate_summary}, then the global information is computed
+by performing a transitive closure over the call graph.   It is located in
+@file{ipa-pure-const.c} and is described by @code{pass_ipa_pure_const}.
+
+@item IPA free function summary
+
+This pass is a regular IPA pass when argument @code{small_p} is false.
+It releases inline function summaries and call summaries.
+It is located in @file{ipa-fnsummary.c} and is described by
+@code{pass_ipa_free_fn_summary}.
+
+@item IPA reference
+
+This pass gathers information about how variables whose scope is
+confined to the compilation unit are used.  It is located in
+@file{ipa-reference.c} and is described by @code{pass_ipa_reference}.
+
+@item IPA single use
+
+This pass checks whether variables are used by a single function.
+It is located in @file{ipa.c} and is described by
+@code{pass_ipa_single_use}.
+
+@item IPA comdats
+
+This pass looks for static symbols that are used exclusively
+within one comdat group, and moves them into that comdat group. It is
+located in @file{ipa-comdats.c} and is described by
+@code{pass_ipa_comdats}.
+
+@end itemize
+
+@node Late IPA passes
+@subsection Late IPA passes
+@cindex late IPA passes
+
+Late IPA passes are simple IPA passes executed after
+the regular passes.  In WHOPR mode the passes are executed after
+partitioning and thus see just parts of the compiled unit.
+
+@itemize @bullet
+@item Materialize all clones
+
+Once all functions from compilation unit are in memory, produce all clones
+and update all calls.  It is located in @file{ipa.c} and is described by
+@code{pass_materialize_all_clones}.
+
+@item IPA points-to analysis
+
+Points-to analysis; this is the same as the points-to-analysis pass
+run with the small IPA passes (@pxref{Small IPA passes}).
+
+@item OpenMP simd clone
+
+This is the OpenMP constructs' SIMD clone pass.  It creates the appropriate
+SIMD clones for functions tagged as elemental SIMD functions.
+It is located in @file{omp-simd-clone.c} and is described by
+@code{pass_omp_simd_clone}.
+
+@end itemize
+
 @node Tree SSA passes
 @section Tree SSA passes
 
-- 
cgit v1.1


From 27dfdc0f92850a7a837a99e69ec7b680c056dc18 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 10 Oct 2019 23:54:33 +0100
Subject: Update DFP macros in float.h for C2x and TS 18661-2.

GCC's <float.h> includes various macros for decimal floating-point
types, defined if __STDC_WANT_DEC_FP__, as defined in TS 24732.

TS 18661-2 and C2X make some changes to those macros.  In TS 18661-2,
they are to be defined if __STDC_WANT_IEC_60559_DFP_EXT__, and the
*_SUBNORMAL_MIN macros are renamed to *_TRUE_MIN.  In C2X, the macros
are to be defined whenever DFP is supported, without needing any
feature test macro to be defined.

This patch updates the header accordingly.  There is no existing
predefined macro for whether the target supports DFP; rather than
adding a new macro for that purpose, this patch changes the predefined
macros used in <float.h> so that they are only defined when DFP is
supported and thus can be used as conditionals; this is the same way
predefined macros for _FloatN and _FloatNx types work.  Although
formally TR 24732 and TS 18661-2 say nothing about implementations
lacking DFP support, it seems appropriate to avoid defining the macros
in <float.h>, in the absence of DFP support, even if the respective
feature test macros are defined.

Bootstrapped with no regressions on x86_64-pc-linux-gnu.  Also tested
the c2x-float-no-dfp-* tests for aarch64-linux-gnu to make sure they
do pass in a no-DFP configuration.

gcc:
	* ginclude/float.h [!__DEC32_MANT_DIG__]: Do not define DFP
	macros.
	[__STDC_WANT_IEC_60559_DFP_EXT__ || __STDC_VERSION__ > 201710L]:
	Also define DFP macros for these conditions.
	[!__STDC_WANT_DEC_FP__] (DEC32_SUBNORMAL_MIN, DEC64_SUBNORMAL_MIN,
	DEC128_SUBNORMAL_MIN): Do not define.
	[__STDC_WANT_IEC_60559_DFP_EXT__ || __STDC_VERSION__ > 201710L]
	(DEC32_TRUE_MIN, DEC64_TRUE_MIN, DEC128_TRUE_MIN): New macros.

gcc/c-family:
	* c-cppbuiltin.c (c_cpp_builtins): Do not define macros for DFP
	types if DFP not supported.

gcc/testsuite:
	* gcc.dg/c11-float-dfp-1.c, gcc.dg/c2x-float-no-dfp-1.c,
	gcc.dg/c2x-float-no-dfp-2.c, gcc.dg/dfp/c2x-float-dfp-1.c,
	gcc.dg/dfp/c2x-float-dfp-2.c, gcc.dg/dfp/c2x-float-dfp-3.c,
	gcc.dg/dfp/tr24732-float-dfp-1.c,
	gcc.dg/dfp/ts18661-2-float-dfp-1.c: New tests.

From-SVN: r276854
---
 gcc/ChangeLog                                    |  11 +++
 gcc/c-family/ChangeLog                           |   5 ++
 gcc/c-family/c-cppbuiltin.c                      |  14 ++-
 gcc/ginclude/float.h                             |  47 +++++++---
 gcc/testsuite/ChangeLog                          |   8 ++
 gcc/testsuite/gcc.dg/c11-float-dfp-1.c           |   5 ++
 gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c        | 101 +++++++++++++++++++++
 gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c        |   9 ++
 gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c       | 103 ++++++++++++++++++++++
 gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c       |   8 ++
 gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c       | 103 ++++++++++++++++++++++
 gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c   | 106 +++++++++++++++++++++++
 gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c |   8 ++
 13 files changed, 512 insertions(+), 16 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/c11-float-dfp-1.c
 create mode 100644 gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
 create mode 100644 gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9bcaba..3d9af72 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* ginclude/float.h [!__DEC32_MANT_DIG__]: Do not define DFP
+	macros.
+	[__STDC_WANT_IEC_60559_DFP_EXT__ || __STDC_VERSION__ > 201710L]:
+	Also define DFP macros for these conditions.
+	[!__STDC_WANT_DEC_FP__] (DEC32_SUBNORMAL_MIN, DEC64_SUBNORMAL_MIN,
+	DEC128_SUBNORMAL_MIN): Do not define.
+	[__STDC_WANT_IEC_60559_DFP_EXT__ || __STDC_VERSION__ > 201710L]
+	(DEC32_TRUE_MIN, DEC64_TRUE_MIN, DEC128_TRUE_MIN): New macros.
+
 2019-10-10  Xiong Hu Luo  <luoxhu@linux.ibm.com>
 	    Sandra Loosemore  <sandra@codesourcery.com>
 
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 598fea4..a41e910 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-cppbuiltin.c (c_cpp_builtins): Do not define macros for DFP
+	types if DFP not supported.
+
 2019-10-10  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-common.h (c_omp_check_context_selector,
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index d9941e7..8a66c91 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -1151,10 +1151,16 @@ c_cpp_builtins (cpp_reader *pfile)
 				      csuffix, FLOATN_NX_TYPE_NODE (i));
     }
 
-  /* For decfloat.h.  */
-  builtin_define_decimal_float_constants ("DEC32", "DF", dfloat32_type_node);
-  builtin_define_decimal_float_constants ("DEC64", "DD", dfloat64_type_node);
-  builtin_define_decimal_float_constants ("DEC128", "DL", dfloat128_type_node);
+  /* For float.h.  */
+  if (targetm.decimal_float_supported_p ())
+    {
+      builtin_define_decimal_float_constants ("DEC32", "DF",
+					      dfloat32_type_node);
+      builtin_define_decimal_float_constants ("DEC64", "DD",
+					      dfloat64_type_node);
+      builtin_define_decimal_float_constants ("DEC128", "DL",
+					      dfloat128_type_node);
+    }
 
   /* For fixed-point fibt, ibit, max, min, and epsilon.  */
   if (targetm.fixed_point_supported_p ())
diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h
index 4767d7b..dc91c75 100644
--- a/gcc/ginclude/float.h
+++ b/gcc/ginclude/float.h
@@ -426,9 +426,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 #endif /* __STDC_WANT_IEC_60559_TYPES_EXT__.  */
 
-#ifdef __STDC_WANT_DEC_FP__
-/* Draft Technical Report 24732, extension for decimal floating-point
-   arithmetic: Characteristic of decimal floating types <float.h>.  */
+#ifdef __DEC32_MANT_DIG__
+#if (defined __STDC_WANT_DEC_FP__ \
+     || defined __STDC_WANT_IEC_60559_DFP_EXT__ \
+     || (defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L))
+/* C2X; formerly Technical Report 24732, extension for decimal
+   floating-point arithmetic: Characteristic of decimal floating types
+   <float.h>, and TS 18661-2.  */
 
 /* Number of base-FLT_RADIX digits in the significand, p.  */
 #undef DEC32_MANT_DIG
@@ -480,14 +484,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define DEC64_MIN	__DEC64_MIN__
 #define DEC128_MIN	__DEC128_MIN__
 
-/* Minimum subnormal positive floating-point number. */
-#undef DEC32_SUBNORMAL_MIN
-#undef DEC64_SUBNORMAL_MIN
-#undef DEC128_SUBNORMAL_MIN
-#define DEC32_SUBNORMAL_MIN       __DEC32_SUBNORMAL_MIN__
-#define DEC64_SUBNORMAL_MIN       __DEC64_SUBNORMAL_MIN__
-#define DEC128_SUBNORMAL_MIN      __DEC128_SUBNORMAL_MIN__
-
 /* The floating-point expression evaluation method.
          -1  indeterminate
          0  evaluate all operations and constants just to the range and
@@ -502,6 +498,33 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #undef DEC_EVAL_METHOD
 #define DEC_EVAL_METHOD	__DEC_EVAL_METHOD__
 
-#endif /* __STDC_WANT_DEC_FP__ */
+#endif /* __STDC_WANT_DEC_FP__ || __STDC_WANT_IEC_60559_DFP_EXT__ || C2X.  */
+
+#ifdef __STDC_WANT_DEC_FP__
+
+/* Minimum subnormal positive floating-point number. */
+#undef DEC32_SUBNORMAL_MIN
+#undef DEC64_SUBNORMAL_MIN
+#undef DEC128_SUBNORMAL_MIN
+#define DEC32_SUBNORMAL_MIN       __DEC32_SUBNORMAL_MIN__
+#define DEC64_SUBNORMAL_MIN       __DEC64_SUBNORMAL_MIN__
+#define DEC128_SUBNORMAL_MIN      __DEC128_SUBNORMAL_MIN__
+
+#endif /* __STDC_WANT_DEC_FP__.  */
+
+#if (defined __STDC_WANT_IEC_60559_DFP_EXT__ \
+     || (defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L))
+
+/* Minimum subnormal positive floating-point number. */
+#undef DEC32_TRUE_MIN
+#undef DEC64_TRUE_MIN
+#undef DEC128_TRUE_MIN
+#define DEC32_TRUE_MIN       __DEC32_SUBNORMAL_MIN__
+#define DEC64_TRUE_MIN       __DEC64_SUBNORMAL_MIN__
+#define DEC128_TRUE_MIN      __DEC128_SUBNORMAL_MIN__
+
+#endif /* __STDC_WANT_IEC_60559_DFP_EXT__ || C2X.  */
+
+#endif /* __DEC32_MANT_DIG__ */
 
 #endif /* _FLOAT_H___ */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c3f5880..76e634e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/c11-float-dfp-1.c, gcc.dg/c2x-float-no-dfp-1.c,
+	gcc.dg/c2x-float-no-dfp-2.c, gcc.dg/dfp/c2x-float-dfp-1.c,
+	gcc.dg/dfp/c2x-float-dfp-2.c, gcc.dg/dfp/c2x-float-dfp-3.c,
+	gcc.dg/dfp/tr24732-float-dfp-1.c,
+	gcc.dg/dfp/ts18661-2-float-dfp-1.c: New tests.
+
 2019-10-10  David Malcolm  <dmalcolm@redhat.com>
 
 	PR 87488
diff --git a/gcc/testsuite/gcc.dg/c11-float-dfp-1.c b/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
new file mode 100644
index 0000000..8d86b1b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
@@ -0,0 +1,5 @@
+/* Test DFP macros not defined in <float.h> for C11.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c11" } */
+
+#include "c2x-float-no-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
new file mode 100644
index 0000000..73610c8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
@@ -0,0 +1,101 @@
+/* Test DFP macros not defined in <float.h> if no DFP support.  */
+/* { dg-do compile { target { ! dfp } } } */
+/* { dg-options "-std=c2x" } */
+
+#include <float.h>
+
+#ifdef DEC32_MANT_DIG
+# error "DEC32_MANT_DIG defined"
+#endif
+
+#ifdef DEC64_MANT_DIG
+# error "DEC64_MANT_DIG defined"
+#endif
+
+#ifdef DEC128_MANT_DIG
+# error "DEC128_MANT_DIG defined"
+#endif
+
+#ifdef DEC32_MIN_EXP
+# error "DEC32_MIN_EXP defined"
+#endif
+
+#ifdef DEC64_MIN_EXP
+# error "DEC64_MIN_EXP defined"
+#endif
+
+#ifdef DEC128_MIN_EXP
+# error "DEC128_MIN_EXP defined"
+#endif
+
+#ifdef DEC32_MAX_EXP
+# error "DEC32_MAX_EXP defined"
+#endif
+
+#ifdef DEC64_MAX_EXP
+# error "DEC64_MAX_EXP defined"
+#endif
+
+#ifdef DEC128_MAX_EXP
+# error "DEC128_MAX_EXP defined"
+#endif
+
+#ifdef DEC32_MAX
+# error "DEC32_MAX defined"
+#endif
+
+#ifdef DEC64_MAX
+# error "DEC64_MAX defined"
+#endif
+
+#ifdef DEC128_MAX
+# error "DEC128_MAX defined"
+#endif
+
+#ifdef DEC32_EPSILON
+# error "DEC32_EPSILON defined"
+#endif
+
+#ifdef DEC64_EPSILON
+# error "DEC64_EPSILON defined"
+#endif
+
+#ifdef DEC128_EPSILON
+# error "DEC128_EPSILON defined"
+#endif
+
+#ifdef DEC32_MIN
+# error "DEC32_MIN defined"
+#endif
+
+#ifdef DEC64_MIN
+# error "DEC64_MIN defined"
+#endif
+
+#ifdef DEC128_MIN
+# error "DEC128_MIN defined"
+#endif
+
+#ifdef DEC32_TRUE_MIN
+# error "DEC32_TRUE_MIN defined"
+#endif
+
+#ifdef DEC64_TRUE_MIN
+# error "DEC64_TRUE_MIN defined"
+#endif
+
+#ifdef DEC128_TRUE_MIN
+# error "DEC128_TRUE_MIN defined"
+#endif
+
+#ifdef DEC32_SUBNORMAL_MIN
+# error "DEC32_SUBNORMAL_MIN defined"
+#endif
+
+#ifdef DEC64_SUBNORMAL_MIN
+# error "DEC64_SUBNORMAL_MIN defined"
+#endif
+
+#ifdef DEC128_SUBNORMAL_MIN
+# error "DEC128_SUBNORMAL_MIN defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
new file mode 100644
index 0000000..730ce89
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
@@ -0,0 +1,9 @@
+/* Test DFP macros not defined in <float.h> if no DFP support.  Test
+   with feature test macros defined.  */
+/* { dg-do compile { target { ! dfp } } } */
+/* { dg-options "-std=c2x" } */
+
+#define __STDC_WANT_DEC_FP__
+#define __STDC_WANT_IEC_60559_DFP_EXT__
+
+#include "c2x-float-no-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
new file mode 100644
index 0000000..ee5e678
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
@@ -0,0 +1,103 @@
+/* Test DFP macros defined in <float.h> with DFP support.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x" } */
+
+#include <float.h>
+
+#ifndef DEC32_MANT_DIG
+# error "DEC32_MANT_DIG not defined"
+#endif
+
+#ifndef DEC64_MANT_DIG
+# error "DEC64_MANT_DIG not defined"
+#endif
+
+#ifndef DEC128_MANT_DIG
+# error "DEC128_MANT_DIG not defined"
+#endif
+
+#ifndef DEC32_MIN_EXP
+# error "DEC32_MIN_EXP not defined"
+#endif
+
+#ifndef DEC64_MIN_EXP
+# error "DEC64_MIN_EXP not defined"
+#endif
+
+#ifndef DEC128_MIN_EXP
+# error "DEC128_MIN_EXP not defined"
+#endif
+
+#ifndef DEC32_MAX_EXP
+# error "DEC32_MAX_EXP not defined"
+#endif
+
+#ifndef DEC64_MAX_EXP
+# error "DEC64_MAX_EXP not defined"
+#endif
+
+#ifndef DEC128_MAX_EXP
+# error "DEC128_MAX_EXP not defined"
+#endif
+
+#ifndef DEC32_MAX
+# error "DEC32_MAX not defined"
+#endif
+
+#ifndef DEC64_MAX
+# error "DEC64_MAX not defined"
+#endif
+
+#ifndef DEC128_MAX
+# error "DEC128_MAX not defined"
+#endif
+
+#ifndef DEC32_EPSILON
+# error "DEC32_EPSILON not defined"
+#endif
+
+#ifndef DEC64_EPSILON
+# error "DEC64_EPSILON not defined"
+#endif
+
+#ifndef DEC128_EPSILON
+# error "DEC128_EPSILON not defined"
+#endif
+
+#ifndef DEC32_MIN
+# error "DEC32_MIN not defined"
+#endif
+
+#ifndef DEC64_MIN
+# error "DEC64_MIN not defined"
+#endif
+
+#ifndef DEC128_MIN
+# error "DEC128_MIN not defined"
+#endif
+
+#ifndef DEC32_TRUE_MIN
+# error "DEC32_TRUE_MIN not defined"
+#endif
+
+#ifndef DEC64_TRUE_MIN
+# error "DEC64_TRUE_MIN not defined"
+#endif
+
+#ifndef DEC128_TRUE_MIN
+# error "DEC128_TRUE_MIN not defined"
+#endif
+
+/* These macros from TR 24732 should not be defined.  */
+
+#ifdef DEC32_SUBNORMAL_MIN
+# error "DEC32_SUBNORMAL_MIN defined"
+#endif
+
+#ifdef DEC64_SUBNORMAL_MIN
+# error "DEC64_SUBNORMAL_MIN defined"
+#endif
+
+#ifdef DEC128_SUBNORMAL_MIN
+# error "DEC128_SUBNORMAL_MIN defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
new file mode 100644
index 0000000..9ba5690
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
@@ -0,0 +1,8 @@
+/* Test DFP macros defined in <float.h> with DFP support.  TS 18661-2
+   feature test macro does not change what is defined.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x" } */
+
+#define __STDC_WANT_IEC_60559_DFP_EXT__
+
+#include "c2x-float-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
new file mode 100644
index 0000000..00b51a4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
@@ -0,0 +1,103 @@
+/* Test DFP macros defined in <float.h> with DFP support.  TR 24732
+   feature test macro causes *_SUBNORMAL_MIN macros to be defined.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x" } */
+
+#define __STDC_WANT_DEC_FP__
+#include <float.h>
+
+#ifndef DEC32_MANT_DIG
+# error "DEC32_MANT_DIG not defined"
+#endif
+
+#ifndef DEC64_MANT_DIG
+# error "DEC64_MANT_DIG not defined"
+#endif
+
+#ifndef DEC128_MANT_DIG
+# error "DEC128_MANT_DIG not defined"
+#endif
+
+#ifndef DEC32_MIN_EXP
+# error "DEC32_MIN_EXP not defined"
+#endif
+
+#ifndef DEC64_MIN_EXP
+# error "DEC64_MIN_EXP not defined"
+#endif
+
+#ifndef DEC128_MIN_EXP
+# error "DEC128_MIN_EXP not defined"
+#endif
+
+#ifndef DEC32_MAX_EXP
+# error "DEC32_MAX_EXP not defined"
+#endif
+
+#ifndef DEC64_MAX_EXP
+# error "DEC64_MAX_EXP not defined"
+#endif
+
+#ifndef DEC128_MAX_EXP
+# error "DEC128_MAX_EXP not defined"
+#endif
+
+#ifndef DEC32_MAX
+# error "DEC32_MAX not defined"
+#endif
+
+#ifndef DEC64_MAX
+# error "DEC64_MAX not defined"
+#endif
+
+#ifndef DEC128_MAX
+# error "DEC128_MAX not defined"
+#endif
+
+#ifndef DEC32_EPSILON
+# error "DEC32_EPSILON not defined"
+#endif
+
+#ifndef DEC64_EPSILON
+# error "DEC64_EPSILON not defined"
+#endif
+
+#ifndef DEC128_EPSILON
+# error "DEC128_EPSILON not defined"
+#endif
+
+#ifndef DEC32_MIN
+# error "DEC32_MIN not defined"
+#endif
+
+#ifndef DEC64_MIN
+# error "DEC64_MIN not defined"
+#endif
+
+#ifndef DEC128_MIN
+# error "DEC128_MIN not defined"
+#endif
+
+#ifndef DEC32_TRUE_MIN
+# error "DEC32_TRUE_MIN not defined"
+#endif
+
+#ifndef DEC64_TRUE_MIN
+# error "DEC64_TRUE_MIN not defined"
+#endif
+
+#ifndef DEC128_TRUE_MIN
+# error "DEC128_TRUE_MIN not defined"
+#endif
+
+#ifndef DEC32_SUBNORMAL_MIN
+# error "DEC32_SUBNORMAL_MIN not defined"
+#endif
+
+#ifndef DEC64_SUBNORMAL_MIN
+# error "DEC64_SUBNORMAL_MIN not defined"
+#endif
+
+#ifndef DEC128_SUBNORMAL_MIN
+# error "DEC128_SUBNORMAL_MIN not defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c
new file mode 100644
index 0000000..c196816
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c
@@ -0,0 +1,106 @@
+/* Test DFP macros defined in <float.h> with DFP support.  TR 24732
+   feature test macro causes SUBNORMAL_MIN macros to be defined but
+   not TRUE_MIN ones.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99" } */
+
+#define __STDC_WANT_DEC_FP__
+#include <float.h>
+
+#ifndef DEC32_MANT_DIG
+# error "DEC32_MANT_DIG not defined"
+#endif
+
+#ifndef DEC64_MANT_DIG
+# error "DEC64_MANT_DIG not defined"
+#endif
+
+#ifndef DEC128_MANT_DIG
+# error "DEC128_MANT_DIG not defined"
+#endif
+
+#ifndef DEC32_MIN_EXP
+# error "DEC32_MIN_EXP not defined"
+#endif
+
+#ifndef DEC64_MIN_EXP
+# error "DEC64_MIN_EXP not defined"
+#endif
+
+#ifndef DEC128_MIN_EXP
+# error "DEC128_MIN_EXP not defined"
+#endif
+
+#ifndef DEC32_MAX_EXP
+# error "DEC32_MAX_EXP not defined"
+#endif
+
+#ifndef DEC64_MAX_EXP
+# error "DEC64_MAX_EXP not defined"
+#endif
+
+#ifndef DEC128_MAX_EXP
+# error "DEC128_MAX_EXP not defined"
+#endif
+
+#ifndef DEC32_MAX
+# error "DEC32_MAX not defined"
+#endif
+
+#ifndef DEC64_MAX
+# error "DEC64_MAX not defined"
+#endif
+
+#ifndef DEC128_MAX
+# error "DEC128_MAX not defined"
+#endif
+
+#ifndef DEC32_EPSILON
+# error "DEC32_EPSILON not defined"
+#endif
+
+#ifndef DEC64_EPSILON
+# error "DEC64_EPSILON not defined"
+#endif
+
+#ifndef DEC128_EPSILON
+# error "DEC128_EPSILON not defined"
+#endif
+
+#ifndef DEC32_MIN
+# error "DEC32_MIN not defined"
+#endif
+
+#ifndef DEC64_MIN
+# error "DEC64_MIN not defined"
+#endif
+
+#ifndef DEC128_MIN
+# error "DEC128_MIN not defined"
+#endif
+
+#ifndef DEC32_SUBNORMAL_MIN
+# error "DEC32_SUBNORMAL_MIN not defined"
+#endif
+
+#ifndef DEC64_SUBNORMAL_MIN
+# error "DEC64_SUBNORMAL_MIN not defined"
+#endif
+
+#ifndef DEC128_SUBNORMAL_MIN
+# error "DEC128_SUBNORMAL_MIN not defined"
+#endif
+
+/* These macros from C2X should not be defined.  */
+
+#ifdef DEC32_TRUE_MIN
+# error "DEC32_TRUE_MIN defined"
+#endif
+
+#ifdef DEC64_TRUE_MIN
+# error "DEC64_TRUE_MIN defined"
+#endif
+
+#ifdef DEC128_TRUE_MIN
+# error "DEC128_TRUE_MIN defined"
+#endif
diff --git a/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
new file mode 100644
index 0000000..f0a0824
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
@@ -0,0 +1,8 @@
+/* Test DFP macros defined in <float.h> with DFP support.  TS 18661-2
+   feature test macro causes same macros to be defined as for C2X.  */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99" } */
+
+#define __STDC_WANT_IEC_60559_DFP_EXT__
+
+#include "c2x-float-dfp-1.c"
-- 
cgit v1.1


From 192eaafbaa6404523c96f2926ff41b773c905a4d Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Fri, 11 Oct 2019 00:16:43 +0000
Subject: Daily bump.

From-SVN: r276858
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index caa1d99..e21f9c0 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191010
+20191011
-- 
cgit v1.1


From 1e99e6fe6bb61ad2011030324cfdf84d2a67e75d Mon Sep 17 00:00:00 2001
From: Kewen Lin <linkw@gcc.gnu.org>
Date: Fri, 11 Oct 2019 06:01:30 +0000
Subject: vec_promote_demote cost to 1 for non-Power7 VSX architectures

2019-10-11  Kewen Lin  <linkw@gcc.gnu.org>

    * config/rs6000/rs6000.c (rs6000_builtin_vectorization_cost): Lower
    vec_promote_demote cost to 1 for non-Power7 VSX architectures.

From-SVN: r276859
---
 gcc/ChangeLog              | 5 +++++
 gcc/config/rs6000/rs6000.c | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d9af72..df124f07 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Kewen Lin  <linkw@gcc.gnu.org>
+
+	* config/rs6000/rs6000.c (rs6000_builtin_vectorization_cost): Lower
+	vec_promote_demote cost to 1 for non-Power7 VSX architectures.
+
 2019-10-10  Joseph Myers  <joseph@codesourcery.com>
 
 	* ginclude/float.h [!__DEC32_MANT_DIG__]: Do not define DFP
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 3421faf..d1434a9 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4781,10 +4781,11 @@ rs6000_builtin_vectorization_cost (enum vect_cost_for_stmt type_of_cost,
 	  return 1;
 
       case vec_promote_demote:
-        if (TARGET_VSX)
-          return 4;
-        else
-          return 1;
+	/* Power7 has only one permute/pack unit, make it a bit expensive.  */
+	if (TARGET_VSX && rs6000_tune == PROCESSOR_POWER7)
+	  return 4;
+	else
+	  return 1;
 
       case cond_branch_taken:
         return 3;
-- 
cgit v1.1


From 1a37b6d9a7e57c71b1bfe449ebd275eb408117fb Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 11 Oct 2019 09:36:07 +0200
Subject: re PR c++/91987 (-fstrict-eval-order issues)

	PR c++/91987
cp/
	* decl2.c (grok_array_decl): For -fstrong-eval-order, when array ref
	operands have been swapped and at least one operand has side-effects,
	revert the swapping before calling build_array_ref.
	* typeck.c (cp_build_array_ref): For non-ARRAY_TYPE array ref with
	side-effects on the index operand, if -fstrong-eval-order use
	save_expr around the array operand.
	(cp_build_binary_op): For shifts with side-effects in the second
	operand, wrap first operand into SAVE_EXPR and evaluate it before
	the shift.
	* semantics.c (handle_omp_array_sections_1): Temporarily disable
	flag_strong_eval_order during OMP_CLAUSE_REDUCTION array section
	processing.
	* cp-gimplify.c (gimplify_to_rvalue): New function.
	(cp_gimplify_expr): Use it.
testsuite/
	* g++.dg/cpp1z/eval-order6.C: New test.
	* g++.dg/cpp1z/eval-order7.C: New test.
	* g++.dg/cpp1z/eval-order8.C: New test.
	* c-c++-common/gomp/pr91987.c: New test.

From-SVN: r276860
---
 gcc/cp/ChangeLog                          | 18 ++++++++++++++++
 gcc/cp/cp-gimplify.c                      | 25 ++++++++++++++++-------
 gcc/cp/decl2.c                            | 10 +++++++--
 gcc/cp/semantics.c                        |  9 ++++++++
 gcc/cp/typeck.c                           | 34 ++++++++++++++++++++++++-------
 gcc/testsuite/ChangeLog                   |  8 ++++++++
 gcc/testsuite/c-c++-common/gomp/pr91987.c | 26 +++++++++++++++++++++++
 gcc/testsuite/g++.dg/cpp1z/eval-order6.C  | 20 ++++++++++++++++++
 gcc/testsuite/g++.dg/cpp1z/eval-order7.C  | 23 +++++++++++++++++++++
 gcc/testsuite/g++.dg/cpp1z/eval-order8.C  | 20 ++++++++++++++++++
 10 files changed, 177 insertions(+), 16 deletions(-)
 create mode 100644 gcc/testsuite/c-c++-common/gomp/pr91987.c
 create mode 100644 gcc/testsuite/g++.dg/cpp1z/eval-order6.C
 create mode 100644 gcc/testsuite/g++.dg/cpp1z/eval-order7.C
 create mode 100644 gcc/testsuite/g++.dg/cpp1z/eval-order8.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2e3b7f7..95f6831 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,21 @@
+2019-10-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91987
+	* decl2.c (grok_array_decl): For -fstrong-eval-order, when array ref
+	operands have been swapped and at least one operand has side-effects,
+	revert the swapping before calling build_array_ref.
+	* typeck.c (cp_build_array_ref): For non-ARRAY_TYPE array ref with
+	side-effects on the index operand, if -fstrong-eval-order use
+	save_expr around the array operand.
+	(cp_build_binary_op): For shifts with side-effects in the second
+	operand, wrap first operand into SAVE_EXPR and evaluate it before
+	the shift.
+	* semantics.c (handle_omp_array_sections_1): Temporarily disable
+	flag_strong_eval_order during OMP_CLAUSE_REDUCTION array section
+	processing.
+	* cp-gimplify.c (gimplify_to_rvalue): New function.
+	(cp_gimplify_expr): Use it.
+
 2019-10-10  Marek Polacek  <polacek@redhat.com>
 
 	* typeck.c (comp_ptr_ttypes_real): Change the return type to bool.
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 6545392..154fa70 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -638,6 +638,22 @@ lvalue_has_side_effects (tree e)
     return TREE_SIDE_EFFECTS (e);
 }
 
+/* Gimplify *EXPR_P as rvalue into an expression that can't be modified
+   by expressions with side-effects in other operands.  */
+
+static enum gimplify_status
+gimplify_to_rvalue (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
+		    bool (*gimple_test_f) (tree))
+{
+  enum gimplify_status t
+    = gimplify_expr (expr_p, pre_p, post_p, gimple_test_f, fb_rvalue);
+  if (t == GS_ERROR)
+    return GS_ERROR;
+  else if (is_gimple_variable (*expr_p) && TREE_CODE (*expr_p) != SSA_NAME)
+    *expr_p = get_initialized_tmp_var (*expr_p, pre_p, NULL);
+  return t;
+}
+
 /* Do C++-specific gimplification.  Args are as for gimplify_expr.  */
 
 int
@@ -823,15 +839,10 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
 	  && cp_get_callee_fndecl_nofold (*expr_p) == NULL_TREE)
 	{
 	  enum gimplify_status t
-	    = gimplify_expr (&CALL_EXPR_FN (*expr_p), pre_p, NULL,
-			     is_gimple_call_addr, fb_rvalue);
+	    = gimplify_to_rvalue (&CALL_EXPR_FN (*expr_p), pre_p, NULL,
+				  is_gimple_call_addr);
 	  if (t == GS_ERROR)
 	    ret = GS_ERROR;
-	  else if (is_gimple_variable (CALL_EXPR_FN (*expr_p))
-		   && TREE_CODE (CALL_EXPR_FN (*expr_p)) != SSA_NAME)
-	    CALL_EXPR_FN (*expr_p)
-	      = get_initialized_tmp_var (CALL_EXPR_FN (*expr_p), pre_p,
-					 NULL);
 	}
       if (!CALL_EXPR_FN (*expr_p))
 	/* Internal function call.  */;
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index a28e776..ee198cd 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -405,6 +405,7 @@ grok_array_decl (location_t loc, tree array_expr, tree index_exp,
   else
     {
       tree p1, p2, i1, i2;
+      bool swapped = false;
 
       /* Otherwise, create an ARRAY_REF for a pointer or array type.
 	 It is a little-known fact that, if `a' is an array and `i' is
@@ -431,7 +432,7 @@ grok_array_decl (location_t loc, tree array_expr, tree index_exp,
       if (p1 && i2)
 	array_expr = p1, index_exp = i2;
       else if (i1 && p2)
-	array_expr = p2, index_exp = i1;
+	swapped = true, array_expr = p2, index_exp = i1;
       else
 	{
 	  error_at (loc, "invalid types %<%T[%T]%> for array subscript",
@@ -447,7 +448,12 @@ grok_array_decl (location_t loc, tree array_expr, tree index_exp,
       else
 	array_expr = mark_lvalue_use_nonread (array_expr);
       index_exp = mark_rvalue_use (index_exp);
-      expr = build_array_ref (input_location, array_expr, index_exp);
+      if (swapped
+	  && flag_strong_eval_order == 2
+	  && (TREE_SIDE_EFFECTS (array_expr) || TREE_SIDE_EFFECTS (index_exp)))
+	expr = build_array_ref (input_location, index_exp, array_expr);
+      else
+	expr = build_array_ref (input_location, array_expr, index_exp);
     }
   if (processing_template_decl && expr != error_mark_node)
     {
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 1839013..f93bb93 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5060,6 +5060,15 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types,
       TREE_PURPOSE (t) = lb;
       low_bound = lb;
     }
+  /* Temporarily disable -fstrong-eval-order for array reductions.
+     The SAVE_EXPR and COMPOUND_EXPR added if low_bound has side-effects
+     is something the middle-end can't cope with and more importantly,
+     it needs to be the actual base variable that is privatized, not some
+     temporary assigned previous value of it.  That, together with OpenMP
+     saying how many times the side-effects are evaluated is unspecified,
+     makes int *a, *b; ... reduction(+:a[a = b, 3:10]) really unspecified.  */
+  warning_sentinel s (flag_strong_eval_order,
+		      OMP_CLAUSE_CODE (c) == OMP_CLAUSE_REDUCTION);
   ret = grok_array_decl (OMP_CLAUSE_LOCATION (c), ret, low_bound, false);
   return ret;
 }
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 38664ec..74ff885 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3560,6 +3560,10 @@ cp_build_array_ref (location_t loc, tree array, tree idx,
   {
     tree ar = cp_default_conversion (array, complain);
     tree ind = cp_default_conversion (idx, complain);
+    tree first = NULL_TREE;
+
+    if (flag_strong_eval_order == 2 && TREE_SIDE_EFFECTS (ind))
+      ar = first = save_expr (ar);
 
     /* Put the integer in IND to simplify error checking.  */
     if (TREE_CODE (TREE_TYPE (ar)) == INTEGER_TYPE)
@@ -3583,11 +3587,10 @@ cp_build_array_ref (location_t loc, tree array, tree idx,
 
     warn_array_subscript_with_type_char (loc, idx);
 
-    ret = cp_build_indirect_ref (cp_build_binary_op (input_location,
-						     PLUS_EXPR, ar, ind,
-						     complain),
-                                 RO_ARRAY_INDEXING,
-                                 complain);
+    ret = cp_build_binary_op (input_location, PLUS_EXPR, ar, ind, complain);
+    if (first)
+      ret = build2_loc (loc, COMPOUND_EXPR, TREE_TYPE (ret), first, ret);
+    ret = cp_build_indirect_ref (ret, RO_ARRAY_INDEXING, complain);
     protected_set_expr_location (ret, loc);
     if (non_lvalue)
       ret = non_lvalue_loc (loc, ret);
@@ -5574,6 +5577,17 @@ cp_build_binary_op (const op_location_t &location,
   if (build_type == NULL_TREE)
     build_type = result_type;
 
+  if (doing_shift
+      && flag_strong_eval_order == 2
+      && TREE_SIDE_EFFECTS (op1)
+      && !processing_template_decl)
+    {
+      /* In C++17, in both op0 << op1 and op0 >> op1 op0 is sequenced before
+	 op1, so if op1 has side-effects, use SAVE_EXPR around op0.  */
+      op0 = cp_save_expr (op0);
+      instrument_expr = op0;
+    }
+
   if (sanitize_flags_p ((SANITIZE_SHIFT
 			 | SANITIZE_DIVIDE | SANITIZE_FLOAT_DIVIDE))
       && current_function_decl != NULL_TREE
@@ -5585,6 +5599,7 @@ cp_build_binary_op (const op_location_t &location,
       op1 = cp_save_expr (op1);
       op0 = fold_non_dependent_expr (op0, complain);
       op1 = fold_non_dependent_expr (op1, complain);
+      tree instrument_expr1 = NULL_TREE;
       if (doing_div_or_mod
 	  && sanitize_flags_p (SANITIZE_DIVIDE | SANITIZE_FLOAT_DIVIDE))
 	{
@@ -5597,10 +5612,15 @@ cp_build_binary_op (const op_location_t &location,
 	    cop0 = cp_convert (orig_type, op0, complain);
 	  if (TREE_TYPE (cop1) != orig_type)
 	    cop1 = cp_convert (orig_type, op1, complain);
-	  instrument_expr = ubsan_instrument_division (location, cop0, cop1);
+	  instrument_expr1 = ubsan_instrument_division (location, cop0, cop1);
 	}
       else if (doing_shift && sanitize_flags_p (SANITIZE_SHIFT))
-	instrument_expr = ubsan_instrument_shift (location, code, op0, op1);
+	instrument_expr1 = ubsan_instrument_shift (location, code, op0, op1);
+      if (instrument_expr != NULL)
+	instrument_expr = add_stmt_to_compound (instrument_expr,
+						instrument_expr1);
+      else
+	instrument_expr = instrument_expr1;
     }
 
   result = build2_loc (location, resultcode, build_type, op0, op1);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 76e634e..0f55eec 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/91987
+	* g++.dg/cpp1z/eval-order6.C: New test.
+	* g++.dg/cpp1z/eval-order7.C: New test.
+	* g++.dg/cpp1z/eval-order8.C: New test.
+	* c-c++-common/gomp/pr91987.c: New test.
+
 2019-10-10  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/c11-float-dfp-1.c, gcc.dg/c2x-float-no-dfp-1.c,
diff --git a/gcc/testsuite/c-c++-common/gomp/pr91987.c b/gcc/testsuite/c-c++-common/gomp/pr91987.c
new file mode 100644
index 0000000..516bb80
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/pr91987.c
@@ -0,0 +1,26 @@
+/* PR c++/91987 */
+
+int bar (void);
+void baz (int *);
+#pragma omp declare target to (baz)
+
+void
+foo (int *a, int (*b)[10][10])
+{
+  #pragma omp target map(a[bar ()])
+  baz (a);
+  #pragma omp target map(a[bar ():1])
+  baz (a);
+  #pragma omp target map(a[10:bar ()])
+  baz (a);
+  #pragma omp task depend(inout:a[10:bar ()])
+  baz (a);
+  #pragma omp task depend(inout:a[10:bar ()])
+  baz (a);
+  #pragma omp parallel reduction(+:a[bar ():2])
+  baz (a);
+  #pragma omp parallel reduction(+:a[2:bar ()])
+  baz (a);
+  #pragma omp parallel reduction(+:b[bar ():2][bar ():10][bar ():10])
+  baz (a);
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/eval-order6.C b/gcc/testsuite/g++.dg/cpp1z/eval-order6.C
new file mode 100644
index 0000000..c8fb0b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/eval-order6.C
@@ -0,0 +1,20 @@
+// PR c++/91987
+// { dg-do run }
+// { dg-options "-fstrong-eval-order" }
+
+int
+foo ()
+{
+  int x = 5;
+  int r = x << (x = 3, 2);
+  if (x != 3)
+    __builtin_abort ();
+  return r;
+}
+
+int
+main ()
+{
+  if (foo () != (5 << 2))
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/eval-order7.C b/gcc/testsuite/g++.dg/cpp1z/eval-order7.C
new file mode 100644
index 0000000..c6f3cc2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/eval-order7.C
@@ -0,0 +1,23 @@
+// PR c++/91987
+// { dg-do run }
+// { dg-options "-fstrong-eval-order" }
+
+int a[4] = { 1, 2, 3, 4 };
+int b[4] = { 5, 6, 7, 8 };
+
+int
+foo ()
+{
+  int *x = a;
+  int r = x[(x = b, 3)];
+  if (x != b)
+    __builtin_abort ();
+  return r;
+}
+
+int
+main ()
+{
+  if (foo () != 4)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/eval-order8.C b/gcc/testsuite/g++.dg/cpp1z/eval-order8.C
new file mode 100644
index 0000000..a8a4240
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/eval-order8.C
@@ -0,0 +1,20 @@
+// PR c++/91987
+// { dg-do run }
+// { dg-options "-fstrong-eval-order" }
+
+int a[4] = { 1, 2, 3, 4 };
+int b;
+
+int
+main ()
+{
+  int *x = a;
+  b = 1;
+  int r = (b = 4, x)[(b *= 2, 3)];
+  if (b != 8 || r != 4)
+    __builtin_abort ();
+  b = 1;
+  r = (b = 3, 2)[(b *= 2, x)];
+  if (b != 6 || r != 3)
+    __builtin_abort ();
+}
-- 
cgit v1.1


From 848830dcf75bf887e7ff59a50a0be1463b7a8570 Mon Sep 17 00:00:00 2001
From: Pierre-Marie de Rodat <pmderodat@gcc.gnu.org>
Date: Fri, 11 Oct 2019 07:56:41 +0000
Subject: [Ada] Repair ChangeLog entries

My scripts and I unexpectedly erased gcc/ada/ChangeLog yesterday. This
commit restores the ChangeLog file to its previous state and adds the
entries for my commits yesterday.

From-SVN: r276861
---
 gcc/ada/ChangeLog | 5660 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 5659 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4b829cf..da7858b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -9,4 +9,5662 @@
 	subprograms, such as to loop parameters.
 	(Unnest_Loop): New procedure that takes a loop statement and
 	creates a new procedure body to enclose the loop statement,
-	along with generating a call to the procedure.
\ No newline at end of file
+	along with generating a call to the procedure.
+
+2019-10-10  Arnaud Charlet  <charlet@adacore.com>
+
+	* freeze.adb (Freeze_Subprogram): Ensure constructor is a C++
+	constructor.
+
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+
+	* libgnat/a-ststio.ads (File_Type): Apply pragma
+	Preelaborable_Initialization to the type.
+
+2019-10-10  Yannick Moy  <moy@adacore.com>
+
+	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Do not peek
+	under private types whose completion is SPARK_Mode Off.
+
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_ch4.adb, sem_cat.adb, sem_ch12.adb, sem_ch3.adb,
+	sem_ch6.adb, sem_prag.adb, sem_util.adb, sem_util.ads: Minor
+	typo fixes.
+
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_warn.adb (Warn_On_Useless_Assignment): Do not warn if the
+	second assignment is at the same source position as the first.
+
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_util.adb (Enclosing_Subprogram): Handle the case of
+	E_Entry_Family, returning the entry family's associated
+	Protected_Body_Subprogram (as was already done for E_Entry).
+	* exp_ch9.adb (Expand_N_Accept_Statement): Call Reset_Scopes_To
+	on the block created for an accept statement to reset the scopes
+	of any local entities to the block scope.
+
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch12.adb (Analyze_Formal_Package_Declaration): Propagate
+	an aspect specification for Abstract_State from generic package
+	to formal package, so that it is available when analyzing the
+	constructed formal.
+
+2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch6.adb (Set_Actual_Subtypes): Put the freeze node of the
+	actual subtype after its declaration when the type of the formal
+	has a predicate.
+
+2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch13.adb (Adjust_Record_For_Reverse_Bit_Order): Do not use
+	the Esize of the component to compute its layout, but only the
+	Component_Clause.  Do not issue a warning for the _Tag
+	component.  Also set the Esize of the component at the end of
+	the layout.
+	(Analyze_Record_Representation_Clause): Remove Hbit local
+	variable.  Lay out the Original_Record_Component only if it's
+	distinct from the component.
+	(Check_Record_Representation_Clause): Fix off-by-one bug for the
+	Last_Bit of the artificial clause built for the _Tag component.
+
+2019-10-10  Bob Duff  <duff@adacore.com>
+
+	* treepr.ads, treepr.adb (ppar): New procedure.
+
+2019-10-10  Bob Duff  <duff@adacore.com>
+
+	* sem_aggr.adb (Resolve_Aggregate): Add missing cases in the
+	Others_Allowed => True case -- N_Case_Expression_Alternative and
+	N_If_Expression.  Use Nkind_In.
+	* atree.adb, atree.ads, sinfo.adb, sinfo.ads (Nkind_In): New
+	16-parameter version.
+
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_aggr.adb (Resolve_Array_Aggregate): Set properly the
+	Predicated_Parent link of an itype created for an aggregate, so
+	that the predicate_function of the parent can support proofs on
+	the object that it initializes.
+
+2019-10-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Analyze_Number_Declaration): Set
+	Debug_Info_Needed in the case where the expression is an integer
+	literal.
+
+2019-10-10  Yannick Moy  <moy@adacore.com>
+
+	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add subprograms
+	with deep parameter or result type as not candidates for
+	inlining.
+
+2019-10-10  Vadim Godunko  <godunko@adacore.com>
+
+	* libgnat/g-exptty.ads (TTY_Process_Descriptor): Set default
+	value for Process.
+
+2019-10-10  Bob Duff  <duff@adacore.com>
+
+	* sem_prag.adb (Defer_Compile_Time_Warning_Error_To_BE): In
+	addition to saving the pragma for further processing, copy the
+	pragma into the main unit if necessary.
+
+2019-10-10  Bob Duff  <duff@adacore.com>
+
+	* einfo.ads, einfo.adb (Invariants_Ignored): New flag on types.
+	This leaves just one unused flag.
+	* sem_prag.adb (Invariant): Set the flag if appropriate.
+	* exp_util.adb (Make_Invariant_Call): Check the flag.
+
+2019-10-10  Arnaud Charlet  <charlet@adacore.com>
+
+	* gnat1drv.adb (Gnat1drv): Skip code generation when handling an
+	incomplete unit with -gnatceg.
+
+2019-10-10  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_ch7.adb (Check_Unnesting_Elaboration_Code): Various
+	cleanups.
+	(Set_Elab_Proc): New procedure to create the defining identifier
+	for a procedure created to encapsulate top-level blocks
+	occurring as a part of library package elaboration.
+	(First_Local_Scope): Function replaced by
+	Reset_Scopes_To_Elab_Proc.
+	(Reset_Scopes_To_Elab_Proc): New recursive procedure based on
+	First_Local_Scope, which it replaces, that is called to traverse
+	the statements of a library package body to locate top-level
+	blocks and determine whether they contain nested subprograms
+	that might address library-level objects of the package. Such
+	blocks (and loops) and certain top-level subprograms within the
+	statements will have their Scope reset here to match an
+	encapsulating procedure created by
+	Check_Unnesting_Elaboration_Code that will contain the
+	statements.
+	(Check_Unnesting_In_Decls_Or_Stmts): Code for handling blocks
+	factored out into Unnest_Block. Add handling for package
+	declarations and bodies, making recursive calls for
+	visible/private declarations, body declarations, statements, and
+	exception handlers. Also remove test for Is_Compilation_Unit:
+	caller tests for Is_Library_Level_Entity instead.  Also, this
+	proc's name was changed from Check_Unnesting_In_Declarations.
+	(Check_Unnesting_In_Handlers): New procedure to traverse a
+	sequence of exception handlers, calling
+	Check_Unnesting_In_Decls_Or_Stmts on the statements of each
+	handler.
+	(Expand_N_Package_Body): Call Check_Unnesting_* routines only
+	when Unnest_Subprogram_Mode is set and the current scope is a
+	library-level entity (which includes packages and instantiations
+	nested directly within a library unit).
+	(Expand_N_Package_Declaration): Call Check_Unnesting_* routines
+	only when Unnest_Subprogram_Mode is set and the current scope is
+	a library-level entity (which includes packages and
+	instantiations nested directly within a library unit).
+	(Unnest_Block): New procedure factored out of
+	Check_Unnesting_In_Decls_Or_Stmts, for creating a new procedure
+	to replace a block statement and resetting the Scope fields of
+	the block's top-level entities.
+
+2019-10-10  Anthony Leonardo Gracio  <leonardo@adacore.com>
+
+	* doc/gnat_ugn/about_this_guide.rst,
+	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
+	doc/gnat_ugn/getting_started_with_gnat.rst,
+	doc/gnat_ugn/gnat_and_program_execution.rst, errout.ads,
+	exp_ch3.adb, gnatls.adb, impunit.adb, lib-writ.ads, opt.ads,
+	sem_ch7.adb, sem_prag.adb, sem_res.adb, sem_warn.adb,
+	terminals.c: Replace GPS by GNAT Studio.
+	* gnat_ugn.texi: Regenerate.
+
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch6.adb (Expand_Simple_Function_Return_Statement): If the
+	function to which the return statement applies is an
+	Ignored_Ghost_Function, do not indicate that it uses the
+	secondary stack when the return type is unconstrained.
+
+2019-10-10  Bob Duff  <duff@adacore.com>
+
+	* libgnat/a-cbdlli.adb, libgnat/a-cbhama.adb,
+	libgnat/a-cbhase.adb, libgnat/a-cbmutr.adb,
+	libgnat/a-cborma.adb, libgnat/a-cborse.adb,
+	libgnat/a-cdlili.adb, libgnat/a-cidlli.adb,
+	libgnat/a-cihama.adb, libgnat/a-cihase.adb,
+	libgnat/a-cimutr.adb, libgnat/a-ciorma.adb,
+	libgnat/a-ciorse.adb, libgnat/a-cobove.adb,
+	libgnat/a-cohama.adb, libgnat/a-cohase.adb,
+	libgnat/a-coinve.adb, libgnat/a-comutr.adb,
+	libgnat/a-conhel.adb, libgnat/a-convec.adb,
+	libgnat/a-coorma.adb, libgnat/a-coorse.adb (Reference,
+	Constant_Reference): Use Busy instead of Lock, so we forbid
+	tampering with cursors, rather than tampering with elements.
+
+2019-10-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_cat.adb (Set_Categorization_From_Pragma): Do not modify
+	any visibility settings if there are no compilation_unit pragmas
+	following the package declaration. Add comments for future
+	cleanup.
+
+2019-10-10  Patrick Bernardi  <bernardi@adacore.com>
+
+	* bindgen.adb (System_Secondary_Stack_Package_In_Closure):
+	Renamed flag System_Secondary_Stack_Used to be clearer of what
+	it represents.
+	(Gen_Adainit): Refactor secondary stack related code to make it
+	clearer.
+	* rtsfind.adb (Load_RTU): Don't set Sec_Stack_Used flag here
+	(RTE): Set Sec_Stack_Used if the System.Secondary_Stack is
+	referenced, but not if we're ignoring ghost code.
+
+2019-10-10  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_prag.adb (Analyze_Global_In_Decl_Part): Simplify previous
+	test, just like in a recent commit we simplified a similar test
+	for Depends contract.
+
+2019-10-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc-interface/utils.c (flag_isoc2x): New variable.
+
+2019-10-01  Maciej W. Rozycki  <macro@wdc.com>
+
+	* gcc-interface/Makefile.in (ADA_RTL_DSO_DIR): New variable.
+	(install-gnatlib): Use it in place of ADA_RTL_OBJ_DIR for shared 
+	library installation.
+
+2019-10-01  Maciej W. Rozycki  <macro@wdc.com>
+
+	* gcc-interface/Make-lang.in (ada.install-common): Split into...
+	(gnat-install-tools, gnat-install-lib): ... these.
+
+2019-09-26  Alexandre Oliva <oliva@adacore.com>
+
+	* gcc-interface/decl.c (components_to_record): Set
+	DECL_SIZE_UNIT for zero-sized fields.
+
+2019-09-26  Arnaud Charlet  <charlet@adacore.com>
+
+	* osint.adb (OS_Time_To_GNAT_Time): Remove dependency on To_C/To_Ada
+
+2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* libgnarl/s-osinte__solaris.ads (sysconf): Declare.
+	(SC_NPROCESSORS_ONLN): Define.
+	* libgnarl/s-tasinf__solaris.ads (Number_Of_Processors): Declare.
+	* libgnarl/s-tasinf__solaris.adb (N_CPU): New variable.
+	(Number_Of_Processors): New function.
+
+2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Regular_Loop_to_gnu): Do not rotate the loop
+	if -Og is enabled.
+	(build_return_expr): Do not perform NRV if -Og is enabled.
+	(Subprogram_Body_to_gnu): Likewise.
+	(gnat_to_gnu) <N_Simple_Return_Statement>: Likewise.
+	(Handled_Sequence_Of_Statements_to_gnu): Do not inline finalizers if
+	-Og is enabled.
+	* gcc-interface/utils.c (convert_to_index_type): Return early if -Og
+	is enabled.
+
+2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (gnat_compile_time_expr_list): New variable.
+	(Pragma_to_gnu): Rename local variable.  Save the (first) expression
+	of pragma Compile_Time_{Error|Warning} for later processing.
+	(Compilation_Unit_to_gnu): Process the expressions saved above.
+
+2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Attribute_to_gnu): Test Can_Use_Internal_Rep
+	on the underlying type of the node.
+	(Call_to_gnu): Likewise with the type of the prefix.
+
+2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (components_to_record): Do not reorder fields
+	in packed record types if they contain fixed-size fields that cannot
+	be laid out in a packed manner.
+
+2019-09-19  Tom Tromey  <tromey@adacore.com>
+
+	* gcc-interface/misc.c (gnat_get_type_bias): Return the bias
+	when -fgnat-encodings=gdb.
+
+2019-09-19  Steve Baird  <baird@adacore.com>
+
+	* sem_prag.adb (Preferred_String_Type): A new function. Given an
+	expression, determines whether the preference rules defined for
+	the third-and-later arguments of pragma Annotate suffice to
+	determine the type of the expression. If so, then the preferred
+	type is returned; if not then Empty is returned. Handles
+	concatenations.
+	(Analyze_Pragma): Replace previous code, which dealt only with
+	string literals, with calls to the new Preferred_String_Type
+	function, which also handles concatenations.
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Update
+	documentation for pragma Annotate.
+	* gnat_rm.texi: Regenerate.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_util.adb (Is_Possibly_Unaligned_Slice): Do not return true
+	on pure alignment considerations if the target does not require
+	the strict alignment of memory accesses.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch12.adb (Check_Private_View): Add a comment to indicate
+	future work.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_aggr.adb (Has_Mutable_Components): Look at the underlying
+	type of components to find out whether they are mutable.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch12.adb (Instantiate_Package_Body): Check that the body
+	has not already been instantiated when the body of the parent
+	was being loaded.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_util.adb (In_Instance): Test whether the current unit has
+	been analyzed instead of being on the scope stack to detect the
+	case of actuals of an instantiation of a generic child unit done
+	as a compilation unit.
+
+2019-09-19  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-socket.ads, libgnat/g-socket.adb
+	(Create_Socket_Pair): New routine.
+	* libgnat/g-socthi.ads (OS_Has_Socketpair): Boolean constant.
+	(C_Socketpair): New imported routine.
+	* libgnat/g-socthi__mingw.ads, libgnat/g-socthi__vxworks.ads
+	(Default_Socket_Pair_Family): New constant.
+	(C_Socketpair): New routine.
+	* libgnat/g-socthi__mingw.adb, libgnat/g-socthi__vxworks.adb
+	(C_Socketpair): Is separated in anouther file.
+	* libgnat/g-sthcso.adb (C_Socketpair): Non UNIX implementation.
+	* libgnat/g-stsifd__sockets.adb: Reuse C_Socketpair.
+
+2019-09-19  Yannick Moy  <moy@adacore.com>
+
+	* sem_prag.adb (Analyze_Depends_In_Decl_Part): Simplify previous
+	test.
+
+2019-09-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch7.adb (Install_Parent_Private_Declarations): If a
+	generic child unit is instantiated within a sibling child unit,
+	the analysis of its private part requires that the private part
+	of the ancestor be available, as is done when the context
+	includes an instance of the ancestor.
+
+2019-09-19  Yannick Moy  <moy@adacore.com>
+
+	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add special
+	case for traversal functions.
+
+2019-09-19  Yannick Moy  <moy@adacore.com>
+
+	* sem_prag.adb (Analyze_Global_In_Decl_Part): Do not issue an
+	error when a constant of an access type is used as output in a
+	Global contract.
+	(Analyze_Depends_In_Decl_Part): Do not issue an error when a
+	constant of an access type is used as output in a Depends
+	contract.
+
+2019-09-19  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_attr.adb: Remove obsolete comment.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Build_Derived_Access_Type): If this is an access-
+	to-subprogram type, copy Can_Use_Internal_Rep from the parent.
+
+2019-09-19  Yannick Moy  <moy@adacore.com>
+
+	* gcc-interface/Make-lang.in: Remove references to sem_spark.
+	* sem_spark.adb, sem_spark.ads: Remove unit.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_attr.adb (Is_Inline_Floating_Point_Attribute): Treat
+	Machine_Rounding as an alias for Rounding.
+	* sem_res.adb (Simplify_Type_Conversion): Likewise.
+
+2019-09-19  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_unst.adb (Unnest_Subprogram): Bypass the transformation of
+	up-level references unless Opt.Generate_C_Code is enabled.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch4.adb (Expand_Array_Equality): If optimization is
+	enabled, generate a simple conjunction of comparisons for the
+	specific case of constrained 1-dimensional 2-element arrays.
+	Fix formatting.
+
+2019-09-19  Piotr Trojanek  <trojanek@adacore.com>
+
+	* exp_dbug.ads, exp_dbug.adb (Get_Homonym_Number): Remove.
+	(Append_Homonym_Number): Use Homonym_Number instead of
+	Get_Homonym_Number.
+	* exp_util.ads, exp_util.adb (Homonym_Number): Mirror style of
+	the removed Get_Homonym_Number routine, i.e. initialize local
+	objects at declaration and refine the type of result.
+	* sem_util.adb (Add_Homonym_Suffix): Use Homonym_Number instead
+	of Get_Homonym_Number.
+
+2019-09-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): Simplify
+	handling of expressions in predicates when the context is a
+	generic unit.
+
+2019-09-19  Bob Duff  <duff@adacore.com>
+
+	* sem_attr.adb (Resolve_Attribute): Make sure the secondary
+	stack is properly managed in the case of a 'Range attribute in a
+	loop.
+
+2019-09-19  Raphael Amiard  <amiard@adacore.com>
+
+	* libgnat/a-cfhase.ads (Set): Add comments to public primitives.
+
+2019-09-19  Raphael Amiard  <amiard@adacore.com>
+
+	* libgnat/a-cbhama.ads, libgnat/a-cbhase.ads,
+	libgnat/a-chtgop.ads (Clear): Refine comments
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch12.adb (Restore_Private_Views): Comment out new code
+	that clear the Is_Generic_Actual_Type also on the full view.
+
+2019-09-19  Bob Duff  <duff@adacore.com>
+
+	* exp_ch3.adb (Rewrite_As_Renaming): Return False if there are
+	any aspect specifications, because otherwise Insert_Actions
+	blows up.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch6.adb (Add_Simple_Call_By_Copy_Code): Add
+	Bit_Packed_Array parameter and documet it. Always insert a copy
+	if it is set True.
+	(Expand_Actuals): Adjust the calls to
+	Add_Simple_Call_By_Copy_Code.
+
+2019-09-19  Bob Duff  <duff@adacore.com>
+
+	* xref_lib.adb (Get_Symbol_Name): If we reach EOF in the first
+	loop without finding the symbol, return "???". Otherwise, it's
+	an infinite loop.
+	(Parse_EOL): Assert that we're not already at EOF.  Remove
+	processing of LF/CR -- there are no operating systems that use
+	that.
+
+2019-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch6.adb (Is_Legal_Copy): Also return false for an aliased
+	formal and a formal passed by reference in convention Ada.  Add
+	missing guard to the existing test on Is_Valued_Procedure.
+
+2019-09-19  Bob Duff  <duff@adacore.com>
+
+	* rtsfind.ads (RTE_Available): Improve comment.
+
+2019-09-18  Bob Duff  <duff@adacore.com>
+
+	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Move call
+	to RTE_Available later, so it doesn't disturb the elab order.
+	The RE_Copy_Bitfield entity is defined in package
+	System.Bitfields which has a dependency on package
+	System.Bitfield_Utils, which has it its spec:
+	   pragma Elaborate_Body;
+	The query on RTE_Available forces loading and analyzing
+	System.Bitfields and all its withed units.
+
+2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.ads (Alignment_Warnings_Record): Add P component.
+	* checks.adb (Apply_Address_Clause_Check): Be prepared to kill
+	the warning also if the clause is of the form X'Address.
+	(Validate_Alignment_Check_Warning): Kill the warning if the
+	clause is of the form X'Address and the alignment of X is
+	compatible.
+
+2019-09-18  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_res.adb (Set_Mixed_Node_Expression): If a conditional
+	expression has universal_real alternaitves and the context is
+	Universal_Fixed, as when it is an operand in a fixed-point
+	multiplication or division, resolve the expression with a
+	visible fixed-point type, which must be unique.
+
+2019-09-18  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Constrain_Component_Type): For a discriminated
+	type, handle the case of a constraint given by a conversion of a
+	discriminant of the enclosing type. Necessary when compiling a
+	discriminated task for a restricted run-time, when the generated
+	Secondary_Stack component may be set by means of an aspect on
+	the task type.
+
+2019-09-18  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_aggr.adb (Expand_Record_Aggregate, Rewrite_Discriminant):
+	After rewriting a reference to an outer discriminant as a
+	selected component of the enclosing object, analyze the selected
+	component to ensure that the entity of the selector name is
+	properly set. This is necessary when the aggregate appears
+	within an expression that may have been analyzed already.
+
+2019-09-18  Justin Squirek  <squirek@adacore.com>
+
+	* sem_ch8.adb (Use_One_Type): Add guard to prevent warning on a
+	reundant use package clause where there is no previous
+	use_clause in the chain.
+
+2019-09-18  Justin Squirek  <squirek@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Type_Conversion): Add calculation of an
+	alternative operand for the purposes of generating accessibility
+	checks.
+
+2019-09-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_aggr.adb (Build_Array_Aggr_Code): In STEP 1 (c), duplicate
+	the expression and reset the Loop_Actions for each loop
+	generated for an others choice.
+
+2019-09-18  Justin Squirek  <squirek@adacore.com>
+
+	* einfo.adb, einfo.ads (Minimum_Accessibility): Added new field.
+	(Set_Minimum_Accessibility): Added to set new field.
+	(Minimum_Accessibility): Added to fetch new field.
+	* exp_ch6.adb (Expand_Subprogram_Call): Modify calls to fetch
+	accessibility levels to the new subprogram Get_Accessibility
+	which handles cases where minimum accessibility might be needed.
+	* sem_ch6.adb (Analyze_Subprogram_Body_Helper): Add section to
+	generate a Minimum_Accessibility object within relevant
+	subprograms.
+	* sem_util.adb, sem_util.ads (Dynamic_Accessibility_Level):
+	Additional documentation added and modify section to use new
+	function Get_Accessibility.
+	(Get_Accessibility): Added to centralize processing of
+	accessibility levels.
+
+2019-09-18  Steve Baird  <baird@adacore.com>
+
+	* sem_util.ads (Interval_Lists): A new visible package. This
+	package is visible because it is also intended for eventual use
+	in Sem_Eval.Subtypes_Statically_Compatible when that function is
+	someday upgraded to handle static predicates correctly.  This
+	new package doesn't really need to be visible for now, but it
+	still seems like a good idea.
+	* sem_util.adb (Gather_Components): Implement AI12-0086 via the
+	following strategy. The existing code knows how to take a static
+	discriminant value and identify the corresponding variant; in
+	the newly-permitted case of a non-static value of a static
+	subtype, we arbitrarily select a value of the subtype and find
+	the corresponding variant using the existing code. Subsequently,
+	we check that every other value of the discriminant's subtype
+	corresponds to the same variant; this is done using the newly
+	introduced Interval_Lists package.
+	(Interval_Lists): Provide a body for the new package.
+
+2019-09-18  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Op_Eq): The frontend assumes that we can
+	do a bit-for-bit comparison of two access to protected
+	subprogram pointers. However, there are two reasons why we may
+	not be able to do that: (1) there may be padding bits for
+	alignment before the access to subprogram, and (2) the access to
+	subprogram itself may not be compared bit-for- bit because the
+	activation record part is undefined: two pointers are equal iff
+	the subprogram addresses are equal. This patch fixes it by
+	forcing a field-by-field comparison.
+	* bindgen.adb (Gen_Adainit): The type No_Param_Proc is defined
+	in the library as having Favor_Top_Level, but when we create an
+	object of that type in the binder file we don't have that
+	pragma, so the types are different. This patch fixes this issue.
+	* libgnarl/s-interr.adb, libgnarl/s-interr__hwint.adb,
+	libgnarl/s-interr__sigaction.adb, libgnarl/s-interr__vxworks.adb
+	(Is_Registered): This routine erroneously assumes that the
+	access to protected subprogram is two addresses. We need to
+	create the same record that the compiler makes to ensure that
+	any padding is the same. Then we have to look at just the first
+	word of the access to subprogram. This patch fixes this issue.
+
+2019-09-18  Bob Duff  <duff@adacore.com>
+
+	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): The call
+	to Copy_Bitfield is now enabled.
+	(Expand_Assign_Array_Bitfield): Multiply 'Length times
+	'Component_Size "by hand" instead of using 'Size.
+
+2019-09-18  Vasiliy Fofanov  <fofanov@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Fix minor
+	formatting issue.
+
+2019-09-18  Javier Miranda  <miranda@adacore.com>
+
+	* exp_disp.adb (Make_DT, Make_Secondary_DT): Remove generation
+	of alignment representation clause for the following tables:
+	Predef_Prims, Iface_DT, TSD, ITable, DT.
+
+2019-09-18  Steve Baird  <baird@adacore.com>
+
+	* sem_eval.adb (Expr_Value): Do not fail "the type of a null
+	literal must be an access type" assertion if errors have already
+	been posted on the given node.
+
+2019-09-18  Piotr Trojanek  <trojanek@adacore.com>
+
+	* exp_dbug.ads, exp_dbug.adb (Get_Homonym_Number): Refine type
+	from Nat to Pos.
+	* sem_util.adb (Add_Homonym_Suffix): Refine type of a local
+	variable.
+
+2019-09-18  Yannick Moy  <moy@adacore.com>
+
+	* exp_dbug.adb (Append_Homonym_Number): Use new function
+	Get_Homonym_Number.
+	(Get_Homonym_Number): New function to return the homonym number.
+	(Qualify_Entity_Name): Remove special case for GNATprove.
+	* exp_dbug.ads (Get_Homonym_Number): Make the new function
+	public for use in GNATprove.
+	* frontend.adb (Frontend): Do not qualify names in GNATprove
+	mode.
+	* sem_util.adb (Unique_Name): Append homonym suffix where needed
+	for entities which have local homonyms in the same scope.
+
+2019-09-18  Nicolas Roche  <roche@adacore.com>
+
+	* libgnat/s-valrea.adb (Scan_Integral_Digits): New procedure.
+	(Scan_Decimal_Digits): New procedure.
+	(As_Digit): New function.
+	(Scan_Real): Use Scan_Integral_Digits and Scan_Decimal_Digits.
+
+2019-09-18  Claire Dross  <dross@adacore.com>
+
+	* exp_attr.adb (Expand_N_Attribute_Reference): Call routine from
+	Exp_Util to know the value of the Constrained attribute in the
+	static case.
+	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Make
+	implicit dereferences inside the Constrained attribute explicit.
+	* exp_util.ads, exp_util.adb
+	(Attribute_Constrained_Static_Value): New routine to compute the
+	value of a statically known reference to the Constrained
+	attribute.
+
+2019-09-18  Vadim Godunko  <godunko@adacore.com>
+
+	* libgnat/g-expect.adb (Expect_Internal): Don't include invalid
+	file descriptors into the set of file descriptors for Poll.
+	Raise Process_Died exception when computed set of file
+	descriptors to monitor is empty.
+
+2019-09-18  Frederic Konrad  <konrad@adacore.com>
+
+	* adaint.c: Include dosFsLib.h and vwModNum.h for VxWorks 6.
+	(__gnat_rename): Map S_dosFsLib_FILE_NOT_FOUND to ENOENT.
+
+2019-09-18  Steve Baird  <baird@adacore.com>
+
+	* freeze.adb (Freeze_Object_Declaration): Do not call
+	Check_Large_Modular_Array when the object declaration being
+	frozen is an ignored ghost entity.
+
+2019-09-18  Tom Tromey  <tromey@adacore.com>
+
+	* make.adb (Initialize): Fix typo.
+
+2019-09-18  Olivier Hainque  <hainque@adacore.com>
+
+	* libgnat/s-win32.ads (DWORD_PTR): New type, pointer size
+	unsigned int.
+	(SYSTEM_INFO): Use it for dwActiveProcessorMask.
+
+2019-09-18  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Improve doc on
+	Warning_As_Error.
+	* gnat_rm.texi: Regenerate.
+
+2019-09-18  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_characteristics.rst,
+	doc/gnat_rm/implementation_defined_pragmas.rst,
+	doc/gnat_rm/implementation_of_specific_ada_features.rst: Remove
+	remaining references to VMS support
+	* gnat_rm.texi: Regenerate.
+
+2019-09-18  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnat/s-stausa.adb: Fix a typo
+
+2019-09-18  Bob Duff  <duff@adacore.com>
+
+	* libgnat/a-cbhama.adb, libgnat/a-cbhase.adb,
+	libgnat/a-cbmutr.adb, libgnat/a-cborma.adb,
+	libgnat/a-cborse.adb, libgnat/a-cobove.adb (Copy): Avoid reading
+	the uninitialized variable C in the Checks = False case. Change
+	variable to be a constant.
+
+2019-09-18  Claire Dross  <dross@adacore.com>
+
+	* libgnat/a-cofuma.adb (Remove, Elements_Equal_Except,
+	Keys_Included, Keys_Included_Except): Rename loop indexes and
+	global constants from I to J.
+
+2019-09-18  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_unst.adb (Unnest_Subprograms): Refine previous change.
+
+2019-09-17  Claire Dross  <dross@adacore.com>
+
+	* libgnat/a-cofuma.ads, libgnat/a-cofuma.adb (Remove): New
+	function which returns a copy of the input container without a
+	given mapping.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* libgnat/s-arit64.adb (Double_Divide): Correctly handle the
+	special case when rounding.
+
+2019-09-17  Javier Miranda  <miranda@adacore.com>
+
+	* sem_ch3.adb (Complete_Private_Subtype): Propagate attributes
+	Has_Attributes and Predicate_Function to the cloned subtype.
+
+2019-09-17  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem.adb (Do_Analyze): Save Style_Check_Max_Line_Length on
+	entry and restore it on exit instead of recomputing it.
+
+2019-09-17  Tom Tromey  <tromey@adacore.com>
+
+	* exp_dbug.ads: Update character type comment.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* libgnat/s-arit64.adb (Double_Divide): Simplify needlessly
+	complex computation. Fix comments.
+	(Scaled_Divide): Fix comments. Explain why implementation does
+	not suffer from bugs in Algorithm D from 2nd Edition of TAOCP.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* libgnat/s-arit64.adb (Scaled_Divide): Add protection against
+	undesirable wrap-around.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* libgnat/s-arit64.adb (Double_Divide): Fix two possible
+	overflows.
+
+2019-09-17  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* make_util.ads (On_Windows): Move...
+	* osint.ads (On_Windows): There.
+	* osint.adb (OS_Time_To_GNAT_Time): If odd incremented on
+	Windows before conversion to Time_Stamp_Type.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Check_Declaration): Do not check the assignment
+	from an illegal declaration.
+
+2019-09-17  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_and_program_execution.rst: Clarify
+	documentation.
+	* gnat_ugn.texi: Regenerate.
+	* libgnat/s-stausa.ads: Clarify comments.
+
+2019-09-17  Steve Baird  <baird@adacore.com>
+
+	* sem_util.adb (Wrong_Type): In deciding to suppress a message,
+	it is not enough for In_Instance to be True; in addition,
+	In_Generic_Actual (Expr) must be False.
+	* sem_type.adb (In_Generic_Actual): Fix bug where traversal of
+	parents skips every other node.
+
+2019-09-17  Claire Dross  <dross@adacore.com>
+
+	* sem_spark.adb (Get_Observed_Or_Borrowed_Expr): If the
+	definition of a local borrower contains calls to traversal
+	functions, the borrowed expression is the first parameter of the
+	first traversal function call in the definition.
+
+2019-09-17  Ed Falis  <falis@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Remove
+	section.
+	* gnat_rm.texi, gnat_ugn.texi: Regenerate.
+
+2019-09-17  Vadim Godunko  <godunko@adacore.com>
+
+	* libgnat/g-exptty.ads (Close_Input): New subprogram.
+	* libgnat/g-exptty.adb (Close_Input): New subprogram.
+	(Close): Move close of TTY to Close_Input.
+	* terminals.c (__gnat_close_tty): Set file descriptors to
+	invalid value after close.
+
+2019-09-17  Vadim Godunko  <godunko@adacore.com>
+
+	* libgnat/g-expect.adb (Expect_Internal): Try to call 'poll' few
+	times.
+
+2019-09-17  Vadim Godunko  <godunko@adacore.com>
+
+	* libgnat/g-expect.ads, libgnat/g-expect.adb (Close_Input): New
+	subprogram.
+	(Get_Command_Output): Call Close_Input to close input stream.
+	(Expect_Internal): Likewise.
+	(Close): Likewise.
+	* libgnat/g-exptty.adb (Close): Likewise.
+
+2019-09-17  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_util.ads, sem_util.adb (Is_Attribute_Old): New utility
+	routine.
+
+2019-09-17  Yannick Moy  <moy@adacore.com>
+
+	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add handling
+	for dispatching operations.
+
+2019-09-17  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): In a
+	generic context, for a Predicate aspect, use
+	Preanalyze_Spec_Expression to verify conformance.
+
+2019-09-17  Javier Miranda  <miranda@adacore.com>
+
+	* sem_ch3.adb (Constrain_Corresponding_Record): Propagate
+	attribute Is_Tagged_Type.
+
+2019-09-17  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch3.adb (Build_Record_Init_Proc): Do not generate code to
+	adjust the tag component when the record is initialized with a
+	raise expression.
+	* sem_aggr.adb (Valid_Limited_Ancestor): Return True for
+	N_Raise_Expression nodes.
+	(Valid_Ancestor_Type): Return True for raise expressions.
+	* sem_ch3.adb (Analyze_Component_Declaration): Do not report an
+	error when a component is initialized with a raise expression.
+	* sem_ch4.adb (Analyze_Qualified_Expression): Do not report an
+	error when the aggregate has a raise expression.
+
+2019-09-17  Piotr Trojanek  <trojanek@adacore.com>
+
+	* ali.ads: Fix casing in comment.
+	* ali-util.ads, ali-util.adb (Read_Withed_ALIs): Remove
+	Ignore_Errors parameter; it was only set to non-default value of
+	True when running in GNATprove_Mode and wrongly reset to False
+	when calling this routine recursively. Now in GNATprove mode we
+	want it to be always True, so in fact it is equivalent to
+	GNATProve_Mode flag itself (which was already used in this
+	routine).
+
+2019-09-17  Arnaud Charlet  <charlet@adacore.com>
+
+	* adaint.c (_REENTRANT, _THREAD_SAFE): Only define if needed.
+
+2019-09-17  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnat/s-bitfie.ads (Val_Bits, Val_Bytes): Define from
+	Long_Long_Integer'Size.
+
+2019-09-17  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch6.ads (Needs_BIP_Task_Actuals): New subprogram.
+	* exp_ch6.adb (Add_Task_Actuals_To_Build_In_Place_Call): Code
+	cleanup.
+	(Check_Number_Of_Actuals): New subprogram.
+	(Make_Build_In_Place_Call_In_Allocator): Adding assertion.
+	(Make_Build_In_Place_Call_In_Anonymous_Context): Adding
+	assertion.
+	(Make_Build_In_Place_Call_In_Assignment): Adding assertion.
+	(Make_Build_In_Place_Call_In_Object_Declaration): Code cleanup
+	plus assertion addition.
+	(Needs_BIP_Task_Actuals): New subprogram.
+	* sem_ch6.adb (Create_Extra_Formals): Rely on
+	Needs_BIP_Task_Actuals() to check if the master of the tasks to
+	be created, and the caller's activation chain formals are
+	needed.
+
+2019-09-17  Bob Duff  <duff@adacore.com>
+
+	* libgnat/s-bituti.adb (Get_Val_2, Set_Val_2): Use new routines
+	for getting and setting a Val_2, avoiding touching the second
+	half when that half might not exist.
+	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Correct
+	tests for potential volatile or independent components. In
+	particular, do not call Prefix unless we know it's a slice.
+
+2019-09-17  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* gsocket.h: Include sys/un.h.
+	* s-oscons-tmplt.c (AF_UNIX): New constant generation.
+	(SIZEOF_sockaddr_un): Idem.
+	* libgnat/g-socket.ads (Family_Type): New value Family_Unix
+	added.
+	(Family_Inet_4_6): New subtype only for network families.
+	(Sock_Addr_Type): Add Unbounded_String field for Family_Unix
+	variant.
+	(Unix_Socket_Address): Create Sock_Addr_Type from socket
+	pathname.
+	(Network_Socket_Address): Create Sock_Addr_Type from
+	Inet_Addr_Type and Port_Type parameters.
+	* libgnat/g-socket.adb: Support local unix address in socket
+	routines.
+	(Get_Address_Info): Disable warning about Result may be
+	referenced before it has a value. Remove duplicated code to exit
+	from Look_For_Supported.
+	* libgnat/g-sothco.ads (Unix_Name_Length): New constant defining
+	maximum number of characters in local socket address path.
+	(Sockaddr): Add variant for Family_Unix address family. Move
+	Sin_Port and Sin_Family to Family_Inet section. Add Sin6_Port
+	and Sin6_Family to Family_Inet6 section.
+	(Set_Address): Add out parameter Length to return valuable
+	Sockaddr data length.
+	(Get_Address): Add input parameter Length to set valuable
+	Sockaddr data length.
+	* libgnat/g-sothco.adb: Support local unix address in socket
+	routines.
+
+2019-09-17  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_attr.adb (Expand_Size_Attribute): Chain the special cases
+	on the back-end path and rewrite the attribute appled to slices
+	of bit-packed arrays into the product of the Length and the
+	Compoent_Size attributes of the slices.
+	* exp_ch5.adb (Expand_Assign_Array_Bitfield): Use Size attribute
+	directly to compute the bitfield's size.
+
+2019-09-17  Bob Duff  <duff@adacore.com>
+
+	* exp_ch5.adb (Expand_Assign_Array_Loop_Or_Bitfield): Add tests
+	for potential volatile or independent components.
+	* libgnat/s-bituti.adb (Copy_Small_Bitfield,
+	Copy_Large_Bitfield): Move declarations to more appropriate
+	place.
+
+2019-09-13  Maciej W. Rozycki  <macro@wdc.com>
+
+	* make.adb (Scan_Make_Arg): Also accept `--sysroot=' for the 
+	compiler and the linker.
+ 
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (maybe_saturate_size): New function.
+	(gnat_to_gnu_entity): Invoke it on the Esize of types before sending
+	it for back-annotations.
+	* gcc-interface/trans.c: Fix typo.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/ada-tree.h (DECL_FORCED_BY_REF_P): New macro.
+	* gcc-interface/decl.c (gnat_to_gnu_param): Set it on parameters
+	whose mechanism was forced to by-reference.
+	* gcc-interface/trans.c (Call_to_gnu): Do not issue a warning about a
+	misaligned actual parameter if it is based on a CONSTRUCTOR.  Remove
+ 	obsolete warning for users of Starlet.  Issue a warning if a temporary
+	is make around the call for a parameter with DECL_FORCED_BY_REF_P set.
+	(addressable_p): Return true for REAL_CST and ADDR_EXPR.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (gnat_to_gnu): Do not set the location on an
+	expression used for a tag.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/gigi.h (aggregate_type_contains_array_p): Declare.
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: For an
+	extension, test Has_Record_Rep_Clause instead of Has_Specified_Layout.
+	(adjust_packed): Return 0 if the type of the field is an aggregate
+	type that contains (or is) a self-referential array.
+	(type_has_variable_size): Delete.
+	* gcc-interface/utils.c (inish_record_type): Constify a variable.
+	(aggregate_type_contains_array_p): Add parameter SELF_REFERENTIAL.
+	<RECORD_TYPE>: Pass it in the recursive call.
+	<ARRAY_TYPE>: If it is true, return true only if the array type is
+	self-referential.
+	(create_field_decl): Streamline the setting of the alignment on the
+	field.  Pass false to aggregate_type_contains_array_p.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (lvalue_required_p) <N_Slice>: Adjust GNU_TYPE
+	in the recursive call.
+	<N_Selected_Component>: Likewise.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (build_template): Deal with parameters
+	passed by pointer to component of multi-dimensional arrays.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (annotate_value) <CALL_EXPR>: Inline the call
+	also if List_Representation_Info is greater than 3.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Attribute_to_gnu) <Attr_Size>: Add assertion.
+
+2019-08-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/gigi.h (gigi_checking_assert): New macro.
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Modular_Integer_Type>:
+	Remove redundant test and adjust comments.  Minor tweaks.
+	* gcc-interface/trans.c (Call_to_gnu): Do not generate range checks,
+	instead assert that the Do_Range_Check flag is not set.  Adjust call
+	to convert_with_check.
+	(gnat_to_gnu): Likewise.
+	(assoc_to_constructor): Likewise.
+	(pos_to_constructor): Likewise.  Remove GNAT_COMPONENT_TYPE parameter.
+	(emit_range_check): Delete.
+	(convert_with_check): Remove RANGE_P parameter and adjust.  Do a single
+	overflow check for modular types.
+
+2019-08-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/91283
+	* gcc-interface/misc.c (gnat_post_options): Set flag_excess_precision
+	instead of flag_excess_precision_cmdline.
+
+2019-08-21  Vadim Godunko  <godunko@adacore.com>
+
+	* libgnat/g-expect.adb (Expect_Internal): Attempt to read
+	several times when 'read' returns non-positive.
+
+2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
+
+	* einfo.adb (Is_Discriminal): Remove extra parens.
+	(Is_Constant_Object): Simplify by reusing Ekind_In.
+	(Is_Prival): Remove extra parens.
+	* checks.adb, exp_ch4.adb, sem_ch3.adb, sem_spark.adb: Minor
+	reformattings.
+
+2019-08-21  Claire Dross  <dross@adacore.com>
+
+	* libgnat/a-cofove.ads (Vector): Add an Iterable aspect to allow
+	iteration.
+	(Iter_First, Iter_Next): Primitives used for iteration.
+
+2019-08-21  Yannick Moy  <moy@adacore.com>
+
+	* sem_ch3.adb (Analyze_Subtype_Declaration): Inherit RM_Size
+	field for formal type parameters in generic instantiations.
+
+2019-08-21  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb: Update references to the SPARK RM.
+
+2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Array_Info): In -gnatR4 mode, set the
+	relevant flag on the component type here instead of...
+	(List_Object_Info): Likewise for the object type.
+	(List_Entities): ...here.  In -gnatR4 mode, recurse into
+	entities local to a record type.
+	(List_Component_Layout): In -gnatR4 mode, mark the type as
+	relevant.
+
+2019-08-21  Bob Duff  <duff@adacore.com>
+
+	* Makefile.rtl (GNATRTL_NONTASKING_OBJS): Add s-bitutil.o and
+	s-biutin.o.
+	* exp_ch5.adb (Expand_Assign_Array_Bitfield): New function to
+	generate a call to Copy_Bitfield. This is disabled for now.
+	(Expand_Assign_Array_Loop_Or_Bitfield): New function to decide
+	whether to call Expand_Assign_Array_Bitfield.
+	(Expand_Assign_Array): Call Expand_Assign_Array_Loop_Or_Bitfield
+	instead of Expand_Assign_Array_Loop.
+	* libgnat/s-bitfie.ads, libgnat/s-bituti.adb,
+	libgnat/s-bituti.ads: New units.
+	* rtsfind.ads: Add enum literals for accessing Copy_Bitfield.
+
+2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
+
+	* bindo-graphs.ads (Iterate_Edges_To_Successors): Fix typo in
+	pragma Inline.
+	* bindo-graphs.adb (Delete_Edge): Fix layout in parameter list.
+
+2019-08-21  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_ch3.adb (Build_Master): Suppress call to
+	Build_Class_Wide_Master in the case where the
+	access-to-limited-class-wide type was created for a component in
+	an entry's formal parameter
+	block (Is_Parameter_Block_Component_Type), to prevent a master
+	from being created for such access types generated by the front
+	end in a task spec for entry formals in a parameter block.  Add
+	a ??? about whether this suppression should be done more
+	generally (such as by using Comes_From_Source).
+
+2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch6.adb (Expand_N_Extended_Return_Statement): In the case
+	of a built-in-place function that doesn't need a BIP_Alloc_Form
+	parameter but returns unconstrained, build the return
+	consistently using the function's result subtype.  Remove bypass
+	added in previous change.
+
+2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_prag.adb (Max_Entry_Queue_Length): Do not substitute
+	expression of the pragma argument with its value during
+	analysis.
+	* sem_util.adb (Get_Max_Queue_Length): Compute value of the
+	pragma argument when needed.
+
+2019-08-21  Yannick Moy  <moy@adacore.com>
+
+	* checks.adb (Install_Null_Excluding_Check): Do not install
+	check in GNATprove mode.
+
+2019-08-21  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Process_Path): Do nothing on address of
+	subprogram.
+
+2019-08-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_util.adb (Finalize_Address): Deal consistently with
+	subtypes of private protected types.
+
+2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
+
+	* exp_util.adb (Corresponding_Runtime_Package): Use high-level
+	Is_Protected_Type.
+	* sem_ch8.adb (Analyze_Renamed_Entry): Likewise.
+	* sem_ch9.adb (Analyze_Requeue): Likewise.
+
+2019-08-21  Javier Miranda  <miranda@adacore.com>
+
+	* sem_util.adb (Update_Named_Associations): Update
+	First_Named_Actual when the subprogram call has a single named
+	actual.
+
+2019-08-21  Joel Brobecker  <brobecker@adacore.com>
+
+	* doc/Makefile (mk_empty_dirs): New (PHONY) rule.
+	(%.html, %.pdf, %.txt, %.info, %.texinfo): Add dependencies on
+	mk_empty_dirs.
+
+2019-08-21  Justin Squirek  <squirek@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Modify
+	documentation to reflect expected behavior.
+	* gnat_rm.texi: Regenerate.
+	* sem_prag.adb (Analyze_Pragma): Modify handling of pragma
+	Max_Entry_Queue_Length to not reject integer values of negative
+	one.
+	* sem_util.adb (Get_Max_Queue_Length): Add processing for values
+	of negative one to fit within the current scheme.
+
+2019-08-20  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_unst.adb (Unnest_Subprograms, Unnest_Subprogram): Take
+	inlining (-gnatn) into account.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch13.adb (Expand_N_Attribute_Definition_Clause, case
+	Storage_Size): If the expression for Storage_Size is not static
+	it may depend on characterstics of another type that may bot be
+	frozen yet, so the elaboration of the expression for the aspect
+	must be attached directly to the freeze actions of the type to
+	which it applies.
+
+2019-08-20  Piotr Trojanek  <trojanek@adacore.com>
+
+	* exp_util.adb (Build_DIC_Procedure_Declaration): Set the last
+	entity of the generated Default_Initial_Condition procedure in
+	order to construct a proper entity chain.
+
+2019-08-20  Yannick Moy  <moy@adacore.com>
+
+	* exp_spark.adb (Expand_SPARK_N_Slice_Or_Indexed_Component):
+	Renaming of function to apply to slices as well.
+	(Expand_SPARK): Expand prefix of slices of access type.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* exp_aggr.adb (Expand_Array_Aggregate): Use build-in-place in
+	the nonlimited case in STEP 4. This improves the efficiency of
+	things like (1 .. 1000 => <>).  We still generate some code for
+	that, unfortunately, but it is much improved.
+	(Aggr_Assignment_OK_For_Backend): Return false if <> components
+	are present.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* exp_ch6.adb (Needs_BIP_Alloc_Form): Call
+	Requires_Transient_Scope rather than checking constrainedness
+	and so forth.  We have previously improved
+	Requires_Transient_Scope to return False in various cases,
+	notably a limited record with an access discriminant. This
+	change takes advantage of that to avoid using the secondary
+	stack for functions returning such types.
+	(Make_Build_In_Place_Call_In_Allocator): Be consistent by
+	calling Needs_BIP_Alloc_Form rather than Is_Constrained and so
+	forth.
+	* sem_ch4.adb (Analyze_Allocator): The above change causes the
+	compiler to generate code that is not legal Ada, in particular
+	an uninitialized allocator for indefinite subtype.  This is
+	harmless, so we suppress the error message in this case.
+
+2019-08-20  Gary Dismukes  <dismukes@adacore.com>
+
+	* ali.adb, ali.ads, aspects.adb, checks.ads, checks.adb,
+	doc/gnat_rm/implementation_defined_pragmas.rst,
+	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
+	einfo.ads, exp_aggr.adb, exp_ch11.adb, exp_ch3.ads, exp_ch4.adb,
+	exp_disp.adb, inline.adb, libgnat/a-locale.ads,
+	libgnat/s-soflin.ads, par_sco.adb, repinfo.adb, sem_ch5.adb,
+	sem_disp.adb, sem_elab.adb, sem_eval.adb, sem_spark.adb,
+	sem_spark.ads, sinfo.ads: Minor reformattings, typo fixes and
+	and rewordings.
+
+2019-08-20  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* adaint.c (__gnat_to_gm_time): On _WIN32, don't round time up
+	to even second.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Analyze_Object_Declaration): If actual type is
+	private and distinct from nominal type in declaration, propagate
+	flags Is_Constr_Subt_For_U_Nominal and _UN_Aliased to full view
+	of private type.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_attr.adb (Expand_Loop_Entry_Attribute): When expanding a
+	loop entry attribute for a while_loop we construct a function
+	that incorporates the expanded condition of the loop. The itypes
+	that may be generated in that expansion must carry the scope of
+	the constructed function for proper handling in gigi.
+
+2019-08-20  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_disp.adb (Build_Class_Wide_Check, Replace_Formals): When a
+	dispatching call tp a subprogram with a class-wide precondition
+	occurrs in the same declarative part as the ancestor subprogram
+	being called, the`expression for the precondition has not been
+	analyzed yet. Such a call may appear, e.g. in an expression
+	function. In that case, the replacement of formals by actuals in
+	the call cannot use the formal entities of the subprogram being
+	called, and the occurrence of the formals in the expression must
+	be located by name (Chars fields) as would be done at a later
+	freeze point, when the expression is resolved in the context of
+	the subprogram itself.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* sem_prag.adb (Persistent_BSS): If an initialization is present
+	because of Initialize_Scalars or Normalize_Scalars, generate an
+	implicit pragma Suppress_Initialization to remove that, because
+	initialization is not allowed for these variables. Other
+	initializations remain illegal.
+
+2019-08-20  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_ch3.adb (OK_For_Limited_Init_In_05): In the case of type
+	conversions, apply the recursive call to the Original_Node of
+	the expression Exp rather than the Expression of the
+	Original_Node, in the case where Exp has been rewritten;
+	otherwise, when Original_Node is the same as Exp, apply the
+	recursive call to the Expression.
+	(Check_Initialization): Revise condition for special check on
+	type conversions of limited function calls to test Original_Node
+	(avoiding spurious errors on expanded unchecked conversions
+	applied to build-in-place dispatching calls).
+
+2019-08-20  Patrick Bernardi  <bernardi@adacore.com>
+
+	* exp_aggr.adb (Expand_Record_Aggregate): Always convert a
+	record Aggregate to assignment statements if the option
+	Aggregate_Individually_Assign is set.
+	* opt.ads (Aggregate_Individually_Assign): New option.
+	* par-prag.adb (Prag): Add Pragma_Aggregate_Individually_Assign.
+	* sem_prag.adb (Analyze_Pragma): Likewise.
+	* snames.ads-tmpl: Add Pragma_Aggregate_Individually_Assign and
+	Name_Aggregate_Individually_Assign.
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Document
+	pragma Aggregate_Individually_Assign.
+	* gnat_rm.texi: Regenerate.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* par-ch4.adb: Minor wording change in error messages.
+	* sem_aggr.adb (Resolve_Delta_Aggregate): Emit an error for Ada
+	versions prior to Ada 2020.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* freeze.adb (Is_Atomic_VFA_Aggregate): Make the temp for
+	initialization of the atomic variable be constant. This is
+	cleaner, and might improve efficiency.
+
+2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Record_Info): In -gnatR4 mode, set the
+	relevant flag on the implicit base type of a record subtype.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* sem_eval.adb (Expr_Value): Implement the case of an unchecked
+	conversion of a static expression.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* sem_ch13.adb (Is_Null_Array): New function, used to detect the
+	null array case; used to warn about uncheckedly converting to a
+	zero-sized array.  It is unfortunate that we can't just check
+	the size, and warn on all cases of converting from a
+	nonzero-sized type to a zero-sized one. That's because "0" means
+	two different things: "size is zero" and "size is unknown".
+	Until we fix that design flaw, we need this more targeted fix.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* libgnat/a-cborma.adb, libgnat/a-cborse.adb (Clear): Repeatedly
+	call Delete. This avoids clearing the free list, which
+	substantially speeds up future Delete operations.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* sem_ch13.adb (Component_Order_Check): New procedure to check
+	for out-of-order clauses.
+	* warnsw.ads, warnsw.adb: New -gnatw_r switch.
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
+	Document new switch.
+	* gnat_ugn.texi: Regenerate.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* sem_ch13.adb (Object_Size): Give an error for zero. It really
+	rubs me the wrong way that we don't honor "for T'Object_Size use
+	0;", but it's not important enough to fix. In any case, if we're
+	not going to obey the clause, we should give an error.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* errout.adb (Error_Msg_Internal): Set Warn_Err in case of
+	Is_Style_Msg.
+	* erroutc.adb (Output_Msg_Text): Do Warnings_Treated_As_Errors
+	processing and [warning-as-error] modification for style
+	messages.  Clean up code, simplify, remove unnecessary block
+	statement, add renaming of table entry.
+	* erroutc.ads (Warning_Treated_As_Error): Fix comment: no such
+	thing as Set_Warning_As_Error.
+	* opt.ads: Clean up comments and move related declarations near
+	each other.
+	* par-prag.adb: Process Warning_As_Error. This is necessary
+	because many style warning happen during parsing.
+	* sem_prag.adb: Use new Acquire_Warning_Match_String.
+	* sem_util.ads, sem_util.adb (Acquire_Warning_Match_String): New
+	function shared by par-prag.adb and sem_prag.adb. Replaces the
+	procedure in sem_prag.adb. Avoid use of global variables.
+	* stringt.ads, stringt.adb (To_String): New function to convert
+	String_Id to String.
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Document the
+	new feature.
+	* gnat_rm.texi: Regenerate.
+
+2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* lib.ads: Add with clause for GNAT.HTable.
+	Add pragma Inline for Is_Loaded and alphabetize the list.
+	(Unit_Name_Table_Size): New constant.
+	(Unit_Name_Header_Num): New subtype.
+	(Unit_Name_Hash): New function declaration.
+	(Unit_Names): New simple hash table.
+	(Init_Unit_Name): New procedure declaration.
+	* lib.adb (Set_Unit_Name): Unregister the old name in the table,
+	if any, and then register the new name.
+	(Init_Unit_Name): New procedure.
+	(Is_Loaded): Reimplement using a lookup in the names table.
+	(Remove_Unit): Unregister the name.
+	(Unit_Name_Hash): New function.
+	* lib-load.adb (Create_Dummy_Package_Unit): Call Init_Unit_Name.
+	(Load_Unit): Use a lookup in the names table to find out whether
+	the unit has already been loaded.  Call Init_Unit_Name and then
+	Remove_Unit if the loading has failed.
+	(Make_Child_Decl_Unit): Call Init_Unit_Name.
+	(Make_Instance_Unit): Likewise.
+	* lib-writ.adb (Ensure_System_Dependency): Likewise.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* sem_ch13.adb (Record_Hole_Check): Initialize After_Last.
+
+2019-08-20  Piotr Trojanek  <trojanek@adacore.com>
+
+	* impunit.adb (Get_Kind_Of_Unit): Revert change for adapting
+	this routine for gnatprove.
+
+2019-08-20  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Document
+	requirements for Pragma Lock_Free.
+	* gnat_rm.texi: Regenerate.
+
+2019-08-20  Philippe Gil  <gil@adacore.com>
+
+	* bindgen.adb (Gen_Main): Set gnat_argc/gnat_argv to argc/argv
+	only when still uninitialized.
+
+2019-08-20  Bob Duff  <duff@adacore.com>
+
+	* libgnat/g-comlin.ads (Exit_From_Command_Line): Fix
+	documentation for GNAT.Command_Line.
+
+2019-08-20  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	PR ada/91492
+	* gcc-interface/lang.opt (-fdump-scos): Add missing dot at the
+	end of the documentation.
+
+2019-08-20  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc-interface/misc.c (default_pass_by_ref): Update call to
+	pass_by_reference.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_rm/implementation_advice.rst: Fix documentation for
+	stream oriented attributes.
+	* gnat_rm.texi: Regenerate.
+
+2019-08-19  Gary Dismukes  <dismukes@adacore.com>
+
+	* einfo.ads (E_Function, E_Procedure): Update comments to
+	reflect that Renamed_Entity is also used for nongeneric
+	subprograms.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_prag.adb (Is_Before_First_Decl): Deal with rewritten
+	pragmas.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* sem_warn.adb (Warn_On_Unreferenced_Entity): Suppress warning
+	on formal parameters of dispatching operations.
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_res.adb (Resolve_Call): A call to an expression function
+	freezes when expander is active, unless the call appears within
+	the body of another expression function,
+
+2019-08-19  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/s-os_lib.ads, libgnat/s-os_lib.adb (To_Ada, To_C): New
+	routines.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* exp_attr.adb (Attribute_Valid): Correct the handling of
+	private types where the full type is modular. System.Address is
+	an example. Otherwise, we convert uncheckedly to a signed type,
+	so we get an incorrect range 0 .. -1, for which all values will
+	fail.  The 'Valid attribute is illegal for such types, but we
+	generate such illegal attribute_references for 'Valid_Scalars,
+	and we generate 'Valid_Scalars when the -gnateV switch is used.
+	Rename Btyp --> PBtyp to avoid hiding the outer Btyp, which was
+	confusing.
+	* libgnat/a-except.adb: Set the Exception_Raised component.
+	Otherwise, we have incorrect reads of invalid data.
+
+2019-08-19  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* libgnat/a-cgaaso.ads, libgnat/a-cgarso.ads,
+	libgnat/a-cogeso.ads, libgnat/a-contai.ads,
+	libgnat/a-locale.ads: Import documentation from the RM.
+
+2019-08-19  Jerome Guitton  <guitton@adacore.com>
+
+	* Makefile.rtl (system.o): New target to add generation of
+	target properties.
+	* gcc-interface/Makefile.in (install-gnatlib): Install
+	ada_target_properties.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.adb (Add_Inlined_Body): Do not special-case instances
+	that are compilation units.
+	(Add_Pending_Instantiation): Likewise.
+	(Instantiate_Body): Skip instantiations that are compilation
+	units and have already been performed.
+	* sem_ch12.adb (Needs_Body_Instantiated): Do not special-case
+	instances that are compilation units.
+	(Load_Parent_Of_Generic): Be prepared for parent that is a
+	compilation unit but whose instantiation node has not been
+	replaced.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.adb (Initialize, Lock): Deal with
+	Called_Pending_Instantiations.
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch6.adb (Check_Synchronized_Overriding): Complete
+	predicate that applies legality check in 9.4 (11.9/2): if an
+	inherited subprogram is implemented by a protected procedure or
+	entry, its first paarameter must be out, in_out or
+	access_to_varible.
+
+2019-08-19  Javier Miranda  <miranda@adacore.com>
+
+	PR ada/65696
+	* exp_atag.ads, exp_atag.adb (Build_Inherit_Predefined_Prims):
+	Adding formal to specify how many predefined primitives are
+	inherited from the parent type.
+	* exp_disp.adb (Number_Of_Predefined_Prims): New subprogram.
+	(Make_Secondary_DT): Compute the number of predefined primitives
+	of all tagged types (including tagged types not defined at
+	library level).  Previously we unconditionally relied on the
+	Max_Predef_Prims constant value when building the dispatch
+	tables of tagged types not defined at library level (thus
+	consuming more memory for their dispatch tables than required).
+	(Make_DT): Compute the number of predefined primitives that must
+	be inherited from their parent type when building the dispatch
+	tables of tagged types not defined at library level. Previously
+	we unconditionally relied on the Max_Predef_Prims constant value
+	when building the dispatch tables of tagged types not defined at
+	library level (thus copying more data than required from the
+	parent type).
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* sem_ch13.adb (Record_Hole_Check): Procedure to check for holes
+	that incudes processing type extensions. A type extension is
+	processed by first calling Record_Hole_Check recursively on the
+	parent type to compute the bit number after the last component
+	of the parent.
+
+2019-08-19  Gary Dismukes  <dismukes@adacore.com>
+
+	* checks.adb (Length_Mismatch_Info_Message): New function in
+	Selected_Length_Checks to return a message indicating the
+	element counts for the mismatched lengths for a failed
+	compile-time length check.
+	(Plural_Or_Singular_Ending): Support function in
+	Length_Mismatch_Info_Message to return either "" or "s", for
+	concatenating to the end of words.
+	(Selected_Length_Checks): Pass the result of
+	Length_Mismatch_Info_Message as an extra warning message to
+	Compile_Time_Constraint_Error to indicate the mismatched lengths
+	for a failed compile-time length check.
+	* sem_util.ads (Compile_Time_Constraint_Error): Add an optional
+	message formal (Extra_Msg), defaulted to the empty string.
+	* sem_util.adb (Compile_Time_Constraint_Error): Output an extra
+	message following the main warning message (when Extra_Msg is
+	not the empty string).
+
+2019-08-19  Patrick Bernardi  <bernardi@adacore.com>
+
+	* socket.c: Removed the redefinition of getaddrinfo, getnameinfo
+	and freeaddrinfo to internal VxWorks kernel calls because they
+	are, well, internal kernel calls and cannot be called from RTPs.
+	VxWorks provides the necessary components to call these routines
+	directly.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_dist.adb (Is_Generic_Actual_Subtype): New predicate.
+	(Build_From_Any_Call, Build_To_Any_Call, Build_TypeCode_Call):
+	Use it instead of Is_Generic_Actual_Type flag to detect subtypes
+	representing generic actual types.
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_warn.adb (Check_References, Generic_Body_Formal): When a
+	formal parameter of a generic subprogram is not referenced in
+	the body, place the corresponding warning on the corresponding
+	entity in the specification of the generic body, as is done for
+	non-generic subprograms.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* errout.ads (Size_Too_Small_Message): New constant.
+	* errout.adb, freeze.adb, sem_ch13.adb: Use it.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_dist.adb (Build_Package_Stubs): Do not specifically visit
+	the declarations of an N_Subprogram_Instantiation node.
+
+2019-08-19  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Document missing
+	metrics switches.
+
+2019-08-19  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_ch12.adb (Get_Unit_Instantiation_Node): Simplify Nkind_In
+	membership test.
+	* sem.adb (Depends_On_Main): Whitespace cleanup; only assign a
+	local variable if needed.
+
+2019-08-19  Claire Dross  <dross@adacore.com>
+
+	* sem_spark.ads, sem_spark.adb (Is_Pledge_Function): New
+	parameter of the generic. Function used to decide whether a
+	function is a pledge function.
+	(Check_Not_Borrowed): Disable check inside the second parameter
+	of a pledge function for the path borrowed by the first
+	parameter. Also disable checks for entities inside a Global
+	contract.
+
+2019-08-19  Joffrey Huguet  <huguet@adacore.com>
+
+	* libgnat/a-cfdlli.ads, libgnat/a-cfhama.ads,
+	libgnat/a-cfinve.ads, libgnat/a-cforma.ads,
+	libgnat/a-cofove.ads, libgnat/a-cofuma.ads,
+	libgnat/a-cofuve.ads: Add formal function parameter "=" (L, R :
+	Element_Type) to the generic packages.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* opt.ads: Clean up left-overs of earlier implementation in
+	comment:
+
+2019-08-19  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Derived_Enumeration_Type): Do no freeze anonymous
+	base type if the bounds in the derived type declaration are
+	literals of the type.
+
+2019-08-19  Yannick Moy  <moy@adacore.com>
+
+	* sem_res.adb (Resolve_Call): Check non-aliasing rules before
+	GNATprove inlining.
+
+2019-08-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.adb (Add_Inlined_Body): Do not add pending
+	instantiations.
+	* sem_ch12.adb (Needs_Body_Instantiated): New predicate.
+	(Analyze_Package_Instantiation): Use it to decide whether to add
+	a pending instantiation for the body of the package.
+
+2019-08-19  Olivier Hainque  <hainque@adacore.com>
+
+	* gcc-interface/trans.c (Acc_Loop_to_gnu): Return the openacc
+	BIND_EXPR node we have constructed on purpose.  Remove unused
+	variable.
+
+2019-08-19  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* gcc-interface/lang.opt (fdump-scos): Define.
+	* gcc-interface/misc.c (gnat_handle_option): Handle
+	OPT_fdump_scos.
+
+2019-08-14  Joffrey Huguet  <huguet@adacore.com>
+
+	* libgnat/a-cofuba.ads: Add a Length attribute to type
+	Container. Add a type Array_Base which replaces the previous
+	Elements attribute of Container.
+	(Content_Init): New subprogram. It is used to initialize the
+	Base attribute of Container.
+	* libgnat/a-cofuba.adb (Resize): New subprogram. It is used to
+	resize the underlying array of a container if necessary.
+	(=, <=, Find, Get, Intersection, Length, Num_Overlaps, Set,
+	Union): Update to match changes in type declarations.
+	(Add): Modify body to damp the time and space cost in a specific
+	case.
+	(Content_Init): New subprogram. It is used to initialize the
+	Base attribute of Container.
+	(Remove): Modify body to damp the time and space cost in a
+	specific case.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* sem_ch13.adb (Get_Alignment_Value): Return 1 for Alignment 0,
+	and do not give an error.
+	* doc/gnat_rm/representation_clauses_and_pragmas.rst: Update the
+	corresponding documentation.
+	* gnat_rm.texi: Regenerate.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.adb (Add_Pending_Instantiation): Fix off-by-one error
+	in the comparison against the maximum number of instantiations.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.adb (Add_Pending_Instantiation): Use greater-or-equal
+	in the comparison against the maximum number of instantiations.
+
+2019-08-14  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_aux.adb (Next_Rep_Item): If a node in the rep chain
+	involves a Ghost aspect it may have been replaced by a null
+	statement; use the original node to find next Rep_Item.
+	* repinfo.adb (List_Entities): Do not list an Ignored
+	Ghost_Entity, for which information may have been deleted.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* sem_prag.ads, sem_prag.adb
+	(Process_Compile_Time_Warning_Or_Error): In parameterless
+	version, improve detection of whether we are in a generic unit
+	to cover the case of an instance within a generic unit.
+	(Process_Compile_Time_Warning_Or_Error): Rename the
+	two-parameter version to be
+	Validate_Compile_Time_Warning_Or_Error, and do not export it.
+	Issue a warning if the condition is not known at compile time.
+	The key point is that the warning must be given only for pragmas
+	deferred to the back end, because the back end discovers
+	additional values that are known at compile time.  Previous
+	changes in this ticket have enabled this by deferring to the
+	back end without checking for special cases such as 'Size.
+	(Validate_Compile_Time_Warning_Or_Error): Rename to be
+	Defer_Compile_Time_Warning_Error_To_BE.
+	* warnsw.ads, warnsw.adb (Warn_On_Unknown_Compile_Time_Warning):
+	Add new switches -gnatw_c and -gnatw_C to control the above
+	warning.
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
+	Document new switches.
+	* gnat_ugn.texi: Regenerate.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch12.adb (Might_Inline_Subp): Rework comment and restrict
+	the shortcut based on Is_Inlined to the back-end inlining case.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* inline.adb (Check_And_Split_Unconstrained_Function): Ignore
+	protected functions to get rid of spurious error. The
+	transformation done by this procedure triggers legality errors
+	in the generated code in this case.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* sem_prag.adb (Process_Compile_Time_Warning_Or_Error): Defer
+	processing to the back end in all cases where the pragma's
+	condition is not known at compile time during the front end
+	(except in generics), as opposed to detecting 'Size attributes
+	and the like. This ensures that we take advantage of whatever
+	can be compile-time known after running the back end, as opposed
+	to having the front end guess what the back end can do.  Remove
+	a little duplicated code at the call site.
+	* gnat1drv.adb (Post_Compilation_Validation_Checks): Unlock the
+	Elists while in Validate_Compile_Time_Warning_Errors, because it
+	does analysis and name resolution, which sometimes involves
+	adding Elists.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* einfo.ads (Is_Called): Document new usage on E_Package
+	entities.
+	* einfo.adb (Is_Called): Accept E_Package entities.
+	(Set_Is_Called): Likewise.
+	* exp_ch6.adb (Expand_Call_Helper): Move code dealing with
+	instances for back-end inlining to Add_Inlined_Body.
+	* inline.ads: Remove with clauses for Alloc and Table.
+	(Pending_Instantiations): Move to...
+	* inline.adb: Add with clauses for Alloc, Uintp, Table and
+	GNAT.HTable.
+	(Backend_Instances): New variable.
+	(Pending_Instantiations): ...here.
+	(Called_Pending_Instantiations): New table.
+	(Node_Table_Size): New constant.
+	(Node_Header_Num): New subtype.
+	(Node_Hash): New function.
+	(To_Pending_Instantiations): New hash table.
+	(Add_Inlined_Body): Bail out early for subprograms in the main
+	unit or subunit.  Likewise if the Is_Called flag is set.  If the
+	subprogram is an instance, invoke Add_Inlined_Instance.  Call
+	Set_Is_Called earlier.  If the subrogram is within an instance,
+	invoke Add_Inlined_Instance.  Also deal with the case where the
+	call itself is within an instance.
+	(Add_Inlined_Instance): New procedure.
+	(Add_Inlined_Subprogram): Remove conditions always fulfilled.
+	(Add_Pending_Instantiation): Move the defence against ludicruous
+	number of instantiations to here. When back-end inlining is
+	enabled, associate an instantiation with its index in table and
+	mark a few selected kinds of instantiations as always needed.
+	(Initialize): Set Backend_Instances to No_Elist.
+	(Instantiate_Body): New procedure doing the work extracted
+	from...
+	(Instantiate_Bodies): ...here.  When back-end inlining is
+	enabled, loop over Called_Pending_Instantiations instead of
+	Pending_Instantiations.
+	(Is_Nested): Minor tweak.
+	(List_Inlining_Info): Also list the contents of
+	Backend_Instances.
+	* sem_ch12.adb (Might_Inline_Subp): Return early if Is_Inlined
+	is set and otherwise set it before returning true.
+	(Analyze_Package_Instantiation): Remove the defence against
+	ludicruous number of instantiations.  Invoke
+	Remove_Dead_Instance instead of doing the removal manually if
+	there is a guaranteed ABE.
+
+2019-08-14  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_ch3.adb (Predef_Spec_Or_Body): For an equality operation
+	of an interface type, create an expression function (that
+	returns False) rather than declaring an abstract function.
+	* freeze.adb (Check_Inherited_Conditions): Set Needs_Wrapper to
+	False unconditionally at the start of the loop creating wrappers
+	for inherited operations.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* table.adb: Assert that the table is not locked when increasing
+	Last, even if it doesn't cause reallocation.  In other words,
+	assert that on operations that MIGHT cause reallocation.
+	* table.ads: Fix comment accordingly.
+
+2019-08-14  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_ugn/gnat_and_program_execution.rst: Remove
+	documentation of gnatelim.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* sem_prag.adb (Validate_Compile_Time_Warning_Error): Attach the
+	warning to the Sloc of the first pragma argument, rather than to
+	the pragma itself. This is to make pragmas processed after the
+	back end use the same Sloc as pragmas processed earlier, in the
+	front end. There's no reason for this discrepancy, and it
+	hinders further work on this ticket.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* sem.ads (Inside_A_Generic): Remove the ??? comment.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.ads (Pending_Descriptor): Delete.
+	* inline.adb (Initialize): Do not initialize it.
+	* sem_ch12.adb (Delay_Descriptors): Delete.
+	(Analyze_Package_Instantiation): Call
+	Set_Delay_Subprogram_Descriptors instead of Delay_Descriptors
+	throughout.
+
+2019-08-14  Bob Duff  <duff@adacore.com>
+
+	* exp_aggr.adb (Init_Hidden_Discriminants): Avoid processing the
+	wrong discriminant, which could be of the wrong type.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch12.adb (Analyze_Instance_And_Renamings): Do not reset
+	the Is_Generic_Instance flag previously set on the package
+	generated for the instantiation of a generic subprogram.
+
+2019-08-14  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Quantified_Expression): Freeze
+	explicitly the type of the loop parameter.
+
+2019-08-14  Javier Miranda  <miranda@adacore.com>
+
+	* sem_util.adb (New_Copy_Tree.Copy_Node_With_Replacement):
+	Update the Chars attribute of identifiers.
+
+2019-08-14  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb, sem_spark.ads (Is_Legal): New function exposed
+	for use in GNATprove, to test legality rules not related to
+	permissions.
+	(Check_Declaration_Legality): Extract the part of
+	Check_Declaration that checks rules not related to permissions.
+	(Check_Declaration): Call the new Check_Declaration_Legality.
+	(Check_Type_Legality): Rename of Check_Type. Introduce
+	parameters to force or not checking, and update a flag detecting
+	illegalities.
+	(Check_Node): Ignore attribute references in statement position.
+
+2019-08-14  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Check_Old_Loop_Entry): New procedure to check
+	correct use of Old  and Loop_Entry.
+	(Check_Node): Check subprogram contracts.
+	(Check_Pragma): Check Loop_Variant.
+	(Check_Safe_Pointers): Apply checking to library-level
+	subprogram  declarations as well, in order to check their
+	contract.
+
+2019-08-14  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Is_Subpath_Expression): Take into account
+	conversion and qualification.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch7.adb (Install_Private_Declarations)
+	<Swap_Private_Dependents>: Do not rely solely on the
+	Is_Child_Unit flag on the unit to recurse.
+	(Uninstall_Declarations) <Swap_Private_Dependents>: New
+	function.  Use it to recurse on the private dependent entities
+	for child units.
+
+2019-08-14  Javier Miranda  <miranda@adacore.com>
+
+	* exp_aggr.adb (Is_CCG_Supported_Aggregate): Return False for
+	arrays with bounds not known at compile time.
+
+2019-08-14  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_util.adb (New_Copy_Tree, Visit_Entity): A quantified
+	expression includes the implicit declaration of the loop
+	parameter. When a quantified expression is copied during
+	expansion, for example when building the precondition code from
+	the generated pragma, a new loop parameter must be created for
+	the new tree, to prevent duplicate declarations for the same
+	symbol.
+
+2019-08-14  Yannick Moy  <moy@adacore.com>
+
+	* sem_disp.adb (Check_Dispatching_Operation): Update assertion
+	for the separate declarations created in GNATprove mode.
+	* sem_disp.ads (Is_Overriding_Subprogram): Update comment.
+	* sem_elab.adb (SPARK_Processor): Fix test for checking of
+	overriding primitives.
+
+2019-08-14  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* inline.adb (Add_Inlined_Body): Tweak comments.
+	(List_Inlining_Info): Also list information about non-main
+	units.
+
+2019-08-14  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_ch4.adb (Analyze_Selected_Component): In the case where
+	the prefix is of a concurrent type, and the selected entity
+	matching the selector is the first private declaration of the
+	type (such as the first local variable in a task's body), set
+	Is_Private_Op.
+
+2019-08-14  Piotr Trojanek  <trojanek@adacore.com>
+
+	* einfo.adb (Is_Generic_Actual_Subprogram): Replace repeated
+	calls to Ekind with Ekind_In.
+
+2019-08-13  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR middle-end/91421
+	* gcc-interface/trans.c (gigi): Call set_decl_buillt_in_function.
+	(Call_to_gnu): Use DECL_FE_FUNCTION_CODE instead of DECL_FUNCTION_CODE.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* ali.ads (Linker_Option_Record): Remove Original_Pos component.
+	* ali.adb (Scan_ALI): Do not set it.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Build_Derived_Concurrent_Type): Add a couple of
+	local variables and use them.  When the derived type fully
+	constrains the parent type, rewrite it as a subtype of an
+	implicit (unconstrained) derived type instead of the other way
+	around.
+	(Copy_And_Build): Deal with concurrent types and use predicates.
+	(Build_Derived_Private_Type): Build the full derivation if
+	needed for concurrent types too.
+	(Build_Derived_Record_Type): Add marker comment.
+	(Complete_Private_Subtype): Use predicates.
+
+2019-08-13  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Check_Generic_Ancestor): New subprogram,
+	aubsidiary to Build_Derived_Record_Type. to enforce the rule
+	that a type extension declared in a generic body cznnot have an
+	ancestor that is a generic formal (RM 3.9.1 (4/2)). The rule
+	applies to all ancestors of the type, including interface
+	progenitors.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Build_Underlying_Full_View): Delete.
+	(Complete_Private_Subtype): Do not set the full view on the
+	private subtype here.  If the full base is itself derived from
+	private, do not re-derive the parent type but instead constrain
+	an existing underlying full view.
+	(Prepare_Private_Subtype_Completion): Do not get to the
+	underlying full view, if any.  Set the full view on the private
+	subtype here.
+	(Process_Full_View): Likewise.
+	* sem_ch12.adb (Check_Generic_Actuals): Also set
+	Is_Generic_Actual_Type on the full view if the type of the
+	actual is private.
+	(Restore_Private_Views): Also reset Is_Generic_Actual_Type on
+	the full view if the type of the actual is private.
+	* sem_eval.adb (Subtypes_Statically_Match): Remove bypass for
+	generic actual types.
+
+2019-08-13  Javier Miranda  <miranda@adacore.com>
+
+	* sem_res.adb (Resolve_Selected_Component): When the type of the
+	component is an access to a class-wide type and the type of the
+	context is an access to a tagged type the relevant type is that
+	of the component (since in such case we may need to generate
+	implicit type conversions or dispatching calls).
+
+2019-08-13  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_aggr.adb (Aggr_Assignment_OK_For_Backend):  Preanalyze
+	expression, rather do a full analysis, to prevent unwanted
+	removal of side effects which mask the intent of the expression.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* impunit.adb (Non_Imp_File_Names_95): Add
+	GNAT.Branch_Prediction.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch6.adb: Remove with and use clauses for Sem_Ch12.
+	(Expand_Call_Helper): Swap the back-end inlining case and the
+	special front-end expansion case.  In back-end inlining mode, do
+	not invoke Add_Inlined_Body unless the call may be inlined.
+	* inline.ads (Add_Pending_Instantiation): New function moved
+	from...
+	* inline.adb (Add_Inlined_Body): Simplify comment.  Turn test on
+	the enclosing unit into assertion.
+	(Add_Pending_Instantiation): New function moved from...
+	* sem_ch12.ads (Add_Pending_Instantiation): ...here.
+	* sem_ch12.adb (Add_Pending_Instantiation): ...here.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem.adb (Do_Analyze): Recompute Style_Check_Max_Line_Length
+	after restoring Style_Max_Line_Length.
+
+2019-08-13  Arnaud Charlet  <charlet@adacore.com>
+
+	* sem_ch13.adb (Check_Iterator_Functions): Protect against
+	cascaded errors.
+
+2019-08-13  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch8.adb (Analyze_Subprogram_Renaming): Do no suppress mode
+	conformance checks on child unit instance that is a compilation
+	unit.
+
+2019-08-13  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_dbug.adb (Fully_Qualify_Name): Add full name qualification
+	for the E_Exception case.
+
+2019-08-13  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_aggr.adb (Aggr_Size_OK): Compute the aggregate size using
+	universal arithmetic, to avoid situations where the size
+	computation overflows.
+
+2019-08-13  Justin Squirek  <squirek@adacore.com>
+
+	* repinfo.adb (List_Scalar_Storage_Order): Modify conditionals
+	for displaying ordering to always be triggered when -gnatR4 is
+	in effect.
+
+2019-08-13  Justin Squirek  <squirek@adacore.com>
+
+	* aspects.adb, aspects.ads: Register new aspect.
+	* par-prag.adb (Prag): Register new pragma
+	* sem_ch13.adb (Analyze_Aspect_Specifications): Add processing
+	for new aspect similar to Aspect_Max_Entry_Queue_Length.
+	* sem_prag.adb, sem_prag.ads (Analyze_Pragma): Register new
+	pragma and set it to use the same processing as
+	Pragma_Max_Queue_Length.
+	* snames.ads-tmpl: Move definition of
+	Name_Max_Entry_Queue_Length so that it can be processed as a
+	pragma in addition to a restriction and add an entry for the
+	pragma itself.
+
+2019-08-13  Yannick Moy  <moy@adacore.com>
+
+	* sem_ch4.adb (Analyze_Allocator): Do not insert subtype
+	declaration for allocator inside a spec expression.
+
+2019-08-13  Yannick Moy  <moy@adacore.com>
+
+	* sem_res.adb (Resolve_Call): Do not inline calls inside record
+	types.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch4.adb (Analyze_One_Call): Remove bypass for type
+	mismatch in nested instantiations.
+	* sem_ch8.adb (Find_Nearer_Entity): New function.
+	(Find_Renamed_Entity): Use it to disambiguate the candidates for
+	the renaming generated for an instantiation when it is
+	ambiguous.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat1drv.adb (Adjust_Global_Switches): Do not set
+	Back_End_Inlining in ASIS mode either.
+
+2019-08-13  Olivier Hainque  <hainque@adacore.com>
+
+	* libgnat/s-win32.ads: Define size_t and fix the MapViewOfFile
+	binding to use it instead of DWORD for the dwNumberOfBytesToMap
+	argument.
+	* libgnat/g-sercom__mingw.adb (Read): State which definition of
+	size_t to fetch in call to Last_Index.
+
+2019-08-13  Arnaud Charlet  <charlet@adacore.com>
+
+	* gcc-interface/Make-lang.in: Remove unused TRACE variable. Pass
+	LN_S to relevant gnatlib targets.
+	* gcc-interface/Makefile.in: Systematically pass LN_S to
+	relevant gnatlib targets.
+
+2019-08-13  Yannick Moy  <moy@adacore.com>
+
+	* sem_dim.adb (Analyze_Dimension,
+	Analyze_Dimension_Array_Aggregate, Analyze_Dimension_Call,
+	Analyze_Dimension_Extension_Or_Record_Aggregate): Return
+	immediately when inside an inlined body.
+	* sem_res.adb (Resolve_Call): Remove special checking now done
+	inside Analyze_Dimension_Call.
+
+2019-08-13  Justin Squirek  <squirek@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Allocator): Add condition to detect
+	library-level object declarations
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst
+	(-gnateT): Document Double_Float_Alignment parameter and fix
+	description of Double_Scalar_Alignment parameter.
+	* gnat_ugn.texi: Regenerate.
+
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch6.adb (Expand_Call_Helper): If back-end inlining is
+	enabled, also instantiate the body of a generic unit containing
+	a subprogram subject to aspect/pragma Inline_Always at
+	optimization level zero.
+	* sem_ch12.adb (Might_Inline_Subp): Minor tweak.
+	(Analyze_Package_Instantiation): Do not instantiate the package
+	body because of inlining considerations if the instantiation is
+	done in a generic unit.  Move around similar condition involving
+	the main unit.  Add test on Back_End_Inlining to processing for
+	front-end inlining.
+
+2019-08-13  Javier Miranda  <miranda@adacore.com>
+
+	* exp_disp.adb (Make_Secondary_DT): Handle record type
+	derivations that have interface components located at fixed
+	positions and interface components located at variable offset.
+	The offset of components located at fixed positions is computed
+	using the dummy object (similar to the case where all the
+	interface components are located at fixed positions).
+	(Make_DT): Build the dummy object for all tagged types that
+	implement interface types (that is, build it also for types with
+	variable size components), and use the dummy object to compute
+	the offset of all tag components located at fixed positions when
+	initializing the Interface_Table object.
+
+2019-08-13  Justin Squirek  <squirek@adacore.com>
+
+	* gnatcmd.adb (GNATCmd): Add constant for new compiler switch
+	--help-ada, and include usage subprogram. Add line to usage help
+	explaining the new flag.
+	(GNATCmd_Usage): Rename from locally declared Usage so as not to
+	confuse with the newly imported version. Add new argument case
+	for --help-ada and add bug report email to implicit display of
+	help without the --help flag so as to unify output between the
+	two cases.
+
+2019-08-13  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-comlin.adb (Getopt): Quote unrecognized switch in
+	Invalid_Switch exception message.
+
+2019-08-13  Yannick Moy  <moy@adacore.com>
+
+	* sem_util.adb (Traverse_More_Func): Take into account
+	Loop_Actions inside N_Iterated_Component_Association nodes.
+	* sinfo.ads: Document correctly Loop_Actions as a field of nodes
+	of kind N_Iterated_Component_Association.
+
+2019-08-13  Claire Dross  <dross@adacore.com>
+
+	* libgnat/a-cfinve.adb, libgnat/a-cofove.adb (Find_Index,
+	Reverse_Find_Index): Use bigger type to avoid range check
+	failure at the last loop iteration.
+
+2019-08-12  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-socket.adb (Is_IPv6_Address): Check that no less
+	then 2 colons in IPv6 numeric address.
+
+2019-08-12  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-comlin.ads, libgnat/g-comlin.adb (Getopt): Add
+	parameter Quiet. Need to do not output error messages to
+	console. Invalid_Switch exception generation surrounded by an
+	error message.
+
+2019-08-12  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch6.adb (Expand_Actuals. Add_Call_By_Copy_Code): Add code
+	to generate proper checks when an actual for an in-out or out
+	parameter has a non-null access type.  No constraints are
+	applied to an inbound access parameter, but on exit a not-null
+	check must be performed if the type of the actual requires it.
+
+2019-08-12  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_util.adb (Is_Expaned_Priority_Attribute): Check whether
+	call comes from a rewritten attribute before comparing name with
+	Get_Ceiling run-time subprogram.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_util.ads (Component_May_Be_Bit_Aligned): Small comment
+	tweaks.
+	(Possible_Bit_Aligned_Component): Likewise.
+	(Type_May_Have_Bit_Aligned_Components): Likewise.
+	* exp_util.adb (Component_May_Be_Bit_Aligned): Likewise.
+	(Possible_Bit_Aligned_Component): Likewise.
+	(Type_May_Have_Bit_Aligned_Components): Likewise.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Op_Eq): Expand the array equality if
+	either operand is a possibly unaligned slice.
+	* exp_ch6.adb (Expand_Simple_Function_Return): Do not generate a
+	copy for a possibly unaligned object if it is represented as a
+	scalar.
+	* exp_util.adb (Is_Possibly_Unaligned_Slice): Do not always
+	return false if the target doesn't have strict alignment.
+
+2019-08-12  Bob Duff  <duff@adacore.com>
+
+	* sem_ch12.adb (Instantiate_Package_Body): Remove suppression of
+	checks in instances of internal units.
+	* sem_ch6.adb (Analyze_Function_Return): Do not generate a
+	constraint check on an extended_return_statement if the subtype
+	of the return object in the statement is identical to the return
+	subtype of the function.
+
+2019-08-12  Bob Duff  <duff@adacore.com>
+
+	* libgnat/a-cbmutr.adb (Is_Reachable): Declare Idx to be of the
+	base subtype.  Clearly it makes no sense to loop "while Idx >=
+	0", if Idx is of a nonnegative subtype.
+
+2019-08-12  Bob Duff  <duff@adacore.com>
+
+	* libgnat/a-tifiio.adb (Put_Scaled): Prevent AA from being
+	negative, since Field is range 0 .. something.
+
+2019-08-12  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst (gnatmetric, gnatpp,
+	gnatstub): Remove documentation for Ada language version
+	switches, and note that they are no longer needed.
+
+2019-08-12  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_ch5.adb (Prepare_Param_Spec_Loop): Set the parents of the
+	copied low and high bounds in the case where the loop range is
+	given by a discrete_subtype_indication, to prevent hanging (or
+	Assert_Failure) in Insert_Actions.
+
+2019-08-12  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch6.adb (heck_Untagged_Equality): Verify that user-defined
+	equality has the same profile as the predefined equality before
+	applying legality rule in RM 4.5.2 (9.8).
+
+2019-08-12  Bob Duff  <duff@adacore.com>
+
+	* libgnat/a-except.ads: Update obsolete comment, still making
+	clear that this is a variant.  Add explicit default for Id
+	component of Exception_Occurrence, because that value is used.
+	Define Null_Occurrence less redundantly.
+	* libgnat/a-einuoc.adb: Minor simplification of code.
+
+2019-08-12  Justin Squirek  <squirek@adacore.com>
+
+	* libgnat/a-dhfina.adb, libgnat/a-dhfina.ads (Is_Simple_Name,
+	Is_Root_Directory, Is_Parent_Directory,
+	Is_Current_Directory_Name, Is_Relative_Name, Initial_Directory,
+	Relative_Name, Compose): Add implementation and documentation.
+	* libgnat/a-direct.adb (Containing_Directory): Modify routine to
+	use routines from Ada.Directories.Hierarchical_File_Names and
+	remove incorrect special case for parent directories.
+	(Fetch_Next_Entry): Add check for current directory and parent
+	directory and ignore them under certain circumstances.
+	(Simple_Nmae): Add check for null result from
+	Simple_Name_Internal and raise Name_Error.
+	(Simple_Name_Internal): Add explicit check for root directories,
+	sanitize trailing directory separators, and modify behavior so
+	that current and parent directories are considered valid
+	results.
+	* Makefile.rtl: Add entry to GNATRTL_NONTASKING_OBJS.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* freeze.adb (Freeze_Entity): Give the same error for an
+	Object_Size clause on a variable-sized type as for a Size
+	clause.
+
+2019-08-12  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_prag.adb (Analyze_Pragma, Pragma_Suppress_Initialization):
+	For private types, set the Suppress_Initialization flag on the
+	Full_View of the entity rather than the entity's base type.
+
+2019-08-12  Yannick Moy  <moy@adacore.com>
+
+	* aspects.adb, aspects.ads (Aspect_No_Caching): New aspect.
+	* contracts.adb, contracts.ads (Add_Contract_Item): Add handling
+	of No_Caching.
+	(Analyze_Object_Contract): Add handling of No_Caching.
+	* einfo.adb, einfo.ads
+	(Get_Pragma): Add handling of No_Caching.
+	* doc/gnat_rm/implementation_defined_aspects.rst,
+	doc/gnat_rm/implementation_defined_pragmas.rst: Document new
+	aspect/pragma.
+	* gnat_rm.texi: Regenerate.
+	* par-prag.adb (Prag): New pragma Pragma_No_Caching.
+	* sem_ch13.adb (Analyze_Aspect_Specifications,
+	Check_Aspect_At_Freeze_Point): Add handling of No_Caching.
+	* sem_prag.adb (Analyze_Pragma): Deal with pragma No_Caching.
+	* sem_prag.ads (Analyze_External_Property_In_Decl_Part): Now
+	applies to No_Caching.
+	* sem_util.adb, sem_util.ads (Is_Effectively_Volatile): Add
+	handling of No_Caching.
+	(No_Caching_Enabled): New query function.
+	* snames.ads-tmpl: New names for pragma.
+
+2019-08-12  Yannick Moy  <moy@adacore.com>
+
+	* sem_util.adb, sem_util.ads (Traverse_More_Func,
+	Traverse_More_Proc): Add formal parameter for Itypes traversal.
+
+2019-08-12  Yannick Moy  <moy@adacore.com>
+
+	* exp_attr.adb, exp_attr.ads (Expand_Size_Attribute): New
+	procedure to share part of the attribute expansion with
+	GNATprove mode.
+	(Expand_N_Attribute_Reference): Extract part of the
+	Size/Object_Size expansion in the new procedure
+	Expand_Size_Attribute.
+	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Expand
+	Size/Object_Size attributes using the new procedure
+	Expand_Size_Attribute.
+
+2019-08-12  Yannick Moy  <moy@adacore.com>
+
+	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Only
+	expand Enum_Rep attribute when its parameter is a literal.
+
+2019-08-12  Justin Squirek  <squirek@adacore.com>
+
+	* sem_eval.adb (Check_Non_Static_Context): Add a condition to
+	determine if a range violation constitues a warning or an error.
+	(Out_Of_Range): Add a condition to determine if a range
+	violation constitues a warning or an error.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch4.adb (Real_Range_Check): Do not rewrite the conversion
+	node but its expression instead, after having fetched its
+	current value.  Clear the Do_Range_Check flag on entry.  Return
+	early for a rewritten float-to-float conversion.  Remove
+	redundant local variable.  Suppress all checks when inserting
+	the temporary and do not reanalyze the node.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sprint.ads: Minor comment tweak.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.adb (Insert_Valid_Check): Do not retrieve the
+	Do_Range_Check flag from the Original_Node but from the
+	Validated_Object.  Remove useless bypass for floating-point
+	types.
+
+2019-08-12  Yannick Moy  <moy@adacore.com>
+
+	* sem_util.adb, sem_util.ads (Traverse_More_Func,
+	Traverse_More_Proc): New traversal subprograms.
+
+2019-08-12  Jerome Lambourg  <lambourg@adacore.com>
+
+	* libgnarl/s-taprop__vxworks.adb (Abort_Handler): Only call
+	s-tpopsp.Self when actually needed.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch4.adb (Discrete_Range_Check): Return if checks are
+	suppressed.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_res.adb: Add with & use clause for Sem_Mech and
+	alphabetize.
+	(Resolve_Actuals): Do not apply a scalar range check for the
+	source of a conversion whose result is passed by reference to a
+	valued procedure.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.adb (Insert_Valid_Check): Reset the Do_Range_Check flag
+	on the validated object.
+	* exp_ch6.adb (Add_Call_By_Copy_Code): Reset the Do_Range_Check
+	flag on the actual here, as well as on the Expression if the
+	actual is a N_Type_Conversion node.
+	(Add_Validation_Call_By_Copy_Code): Generate the incoming range
+	check if needed and reset the Do_Range_Check flag on the
+	Expression if the actual is a N_Type_Conversion node.
+	(Expand_Actuals): Do not reset the Do_Range_Check flag here.
+	Generate the incoming range check for In parameters here instead
+	of...
+	(Expand_Call_Helper): ...here.  Remove redudant condition.
+	* sem_res.adb (Resolve_Actuals): Use local variable A_Typ and
+	remove obsolete comments.
+	(Resolve_Type_Conversion): Do not force the Do_Range_Check flag
+	on the operand if range checks are suppressed.
+
+2019-08-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.adb (Activate_Range_Check): Remove redundant argument.
+	(Generate_Range_Check): Likewise.
+	(Apply_Float_Conversion_Check): Reset the Do_Range_Check flag on
+	entry and remove redundant condition.
+
+2019-08-02  Alexandre Oliva  <oliva@adacore.com>
+
+	* libgnat/a-exexpr.adb (Begin_Handler_v1, End_Handler_v1): New.
+	(Claimed_Cleanup): New.
+	(Begin_Handler, End_Handler): Document.
+	* gcc-interface/trans.c (gigi): Switch to exception handler
+	ABI #1.
+	(Exception_Handler_to_gnu_gcc): Save the original cleanup
+	returned by begin handler, pass it to end handler, and use
+	EH_ELSE_EXPR to pass a propagating exception to end handler.
+	(gnat_to_gnu): Leave the exception pointer alone for reraise.
+	(add_cleanup): Handle EH_ELSE_EXPR, require it by itself.
+
+2019-07-23  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations,
+	Freeze_Entity_Checks): Include Aspect_CPU with other aspects
+	whose expresssion may depend on a discriminant, and thus require
+	that components of the type be made visible.
+
+2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.adb (Convert_And_Check_Range): Add Suppress parameter
+	and pass it in the call to Insert_Actions.  Rename local
+	variable.
+	(Generate_Range_Check): Minor comment fixes.  Pass Range_Check
+	in the first call to Convert_And_Check_Range and All_Checks in
+	the second call.
+	* exp_ch4.adb (Expand_N_Type_Conversion): Reset the
+	Do_Overflow_Check flag in the float-to-float case too if there
+	is also a range check.
+
+2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.adb (Activate_Overflow_Check): Remove redundant
+	argument.
+	* exp_ch4.adb (Discrete_Range_Check): Reset the overflow flag.
+	(Expand_N_Type_Conversion): Do not reset it here.
+
+2019-07-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Component_Layout): Pass Decimal to UI_Write.
+	(Write_Val): Likewise.
+
+2019-07-23  Ed Schonberg  <schonberg@adacore.com>
+
+	* aspects.ads: New table Operational_Aspect, used to distinguish
+	between aspects that are view-specific, such as those related to
+	iterators, and representation aspects that apply to all views of
+	a type.
+	* aspects.adb (Find_Aspect): If the aspect being sought is
+	operational, do not ecamine the full view of a private type to
+	retrieve it.
+	* sem_ch5.adb (Analyze_Iterator_Specification): Improve error
+	message when the intended domain of iteration does not implement
+	the required iterator aspects.
+
+2019-07-23  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.ads (Is_Local_Context): New function.
+	* sem_spark.adb (Check_Declaration): Issue errors on violations
+	of SPARK RM 3.10(4)
+	(Process_Path): Do not issue error on borrow/observe during
+	elaboration, as these are caught by the new rule.
+
+2019-07-23  Yannick Moy  <moy@adacore.com>
+
+	* exp_ch7.adb (Create_Finalizer): Force finalizer not to be
+	Ghost enabled.
+	* exp_dbug.adb (Get_External_Name): Explain special case of
+	Ghost finalizer.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Entities): Also list compiled-generated
+	types present as Etype of objects.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sinfo.ads: Update the documentation about the
+	Do_Division_Check, Do_Overflow_Check and Do_Range_Check flags.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Type_Conversion): Beef up comment.
+	(Fixup_Universal_Fixed_Operation): Set the base type instead of
+	the type of the enclosing type conversion on the operation.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch4.adb (Expand_N_In): Do not suggest the use of attribute
+	'Valid as a replacement for a range check on a discrete type
+	when the bounds of the range are given by type conversions,
+	because in such a case there are distinct types involved and the
+	subbested attribute replacement would be misplaced.
+
+2019-07-22  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Get_Root_Object, Is_Path_Expression,
+	Is_Subpath_Expression): Add parameter Is_Traversal to adapt
+	these functions to the case of paths returned from a traversal
+	function.
+	(Read_Indexes): Handle the case of an if-expression or
+	case-expression.
+	(Check_Statement): Check Emit_Messages only when issuing an
+	error message. This is important as Emit_Messages may store the
+	information that an error was detected.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* checks.adb (Apply_Type_Conversion_Checks): Do not set
+	Do_Range_Check flag on conversions from fixed-point types
+	either.
+	* exp_attr.adb: Add use and with clause for Expander.
+	(Expand_N_Attribute_Reference) <Fixed_Value, Integer_Value>: Set
+	the Conversion_OK flag and do not generate overflow/range checks
+	manually.
+	* exp_ch4.adb (Expand_N_Qualified_Expression): Remove
+	superfluous clearing of Do_Range_Check flag.
+	(Discrete_Range_Check): New procedure to generate a range check
+	for discrete types.
+	(Real_Range_Check): Remove redundant local variable and adjust.
+	Remove useless shortcut.  Clear Do_Range_Check flag on all
+	paths.
+	(Expand_N_Type_Conversion): Remove redundant test on
+	Conversion_OK.  Call Discrete_Range_Check to generate range
+	checks on discrete types.  Remove obsolete code for
+	float-to-integer conversions.  Add code to generate range checks
+	for conversions involving fixed-point types.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sprint.ads: Fix pasto in comment.
+
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* sem_res.adb (Resolve_Actuals): Replace code that displaces the
+	pointer to an allocated object to reference its secondary
+	dispatch table by a type conversion (which takes care of
+	handling all cases).
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sprint.adb (Sprint_Node_Actual)
+	<N_Decimal_Fixed_Point_Definition>: Swap a couple of spaces.
+	(Write_Itype): Minor consistency fixes throughout.  Add support
+	for printing ordinary and decimal fixed-point types and
+	subtypes.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_attr.adb (Expand_Loop_Entry_Attribute): Beef up comment.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* libgnat/s-valboo.ads, libgnat/s-valcha.ads,
+	libgnat/s-valdec.ads, libgnat/s-valenu.ads,
+	libgnat/s-valint.ads, libgnat/s-vallld.ads,
+	libgnat/s-vallli.ads, libgnat/s-valllu.ads,
+	libgnat/s-valrea.ads, libgnat/s-valuns.ads,
+	libgnat/s-valwch.ads: Change categorization of packages that
+	implement attribute 'Value from Pure to Preelaborate, to prevent
+	undesirable optimizations when the evaluation of the attribute
+	raises Constraint_Error, but subsequent use of the result of
+	this evsaluation is removed by a subsequent optimization.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_warn.adb (Check_References): Do not emit s warning on a
+	referenced entity with no explicit assignment if the type of the
+	entity has Preelaborable_Initialixation, such as
+	Exception_Occurrence.
+
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch4.adb (Size_In_Storage_Elements): Improve the expansion
+	to handle array indexes that are modular type.
+	(Expand_N_Allocator): For 32-bit targets improve the generation
+	of the runtime check associated with large arrays supporting
+	arrays initialized with a qualified expression.
+	* libgnat/s-imenne.adb (Image_Enumeration_8,
+	Image_Enumeration_16, Image_Enumeration_32): Define the index of
+	Index_Table with range Natural'First .. Names'Length since in
+	the worst case all the literals of the enumeration type would be
+	single letter literals and the Table built by the frontend would
+	have as many components as the length of the names string. As a
+	result of this enhancement, the internal tables declared using
+	Index_Table have a length closer to the real needs, thus
+	avoiding the declaration of large arrays on 32-bit CCG targets.
+
+2019-07-22  Yannick Moy  <moy@adacore.com>
+
+	* sem_ch3.adb (Constrain_Access): Issue a message about ignored
+	constraint.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch8.adb (End_Use_Type): Reset the In_Use flag on the
+	class-wide type if the type is tagged.
+	(Use_One_Type): Add commentary on the handling of the class-wide
+	type.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* einfo.ads (Is_For_Access_Subtype): Delete.
+	(Set_Is_For_Access_Subtype): Likewise.
+	* einfo.adb (Is_For_Access_Subtype): Likewise.
+	(Set_Is_For_Access_Subtype): Likewise.
+	(Write_Entity_Flags): Do not write Is_For_Access_Subtype.
+	* exp_ch4.adb (Expand_N_Selected_Component): Do not deal with
+	it.
+	* exp_spark.adb (Expand_SPARK_N_Selected_Component): Likewise.
+	* sem_ch4.adb (Analyze_Explicit_Dereference): Likewise.
+	* sem_ch3.adb (Build_Discriminated_Subtype): Do not build a
+	special private subtype for access-to-record subtypes.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch3.adb (Complete_Private_Subtype): Rework the setting of
+	the Etype of the full view for full base types that cannot
+	contain any discriminant.  Remove code and comment about it in
+	the main path.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Convert_Bound): Subsidiary of
+	Floating_Point_Type_Declaration, to handle properly range
+	specifications with bounds that may include static constants of
+	a given type rather than real literals.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_aggr.adb (Rewrite_Bound): Be prepared for discriminals
+	too.
+	(Rewrite_Range;): Minor tweak.
+	(Resolve_Record_Aggregate): For a component with default
+	initialization whose expression is an array aggregate, also
+	rewrite the bounds of the component associations, if any.
+
+2019-07-22  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_ch5.adb (Expand_N_Case_Statement): In the case where a
+	case statement is rewritten as an equivalent if statement,
+	inherit the From_Condition_Expression flag from the case
+	statement.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch8.adb (Check_Constrained_Object): Further extend the
+	special optimization to all limited types.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_attr.adb (Expand_N_Attribute_Reference)
+	<Attribute_Enum_Val>: Set No_Truncation on the
+	N_Unchecked_Type_Conversion built around the argument passed to
+	the attribute.
+
+2019-07-22  Nicolas Roche  <roche@adacore.com>
+
+	* libgnat/s-valrea.adb (Scan_Real): Ignore non significative
+	digits to avoid converging to infinity in some cases.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* libgnat/g-encstr.adb (Encode_Wide_String): Fix oversight.
+	(Encode_Wide_Wide_String): Likewise.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_warn.adb (Find_Var): Bail out for a function call with an
+	Out or In/Out parameter.
+
+2019-07-22  Nicolas Roche  <roche@adacore.com>
+
+	* terminals.c (__gnat_tty_waitpid): Support both blocking and
+	not blocking mode.
+	* libgnat/g-exptty.ads (Is_Process_Running): New function.
+	* libgnat/g-exptty.adb (Close): Don't try to interrupt/terminate
+	a process if it is already dead.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* freeze.adb (Freeze_Fixed_Point_Type): When freezing a
+	fixed-point subtype, check whether the parent type declarastion
+	includes an aspect specification for the 'Small type attribute,
+	and inherit the specified value.
+
+2019-07-22  Javier Miranda  <miranda@adacore.com>
+
+	* freeze.adb (Freeze_Subprogram): Check that C++ constructors
+	must have external or link name.
+
+2019-07-22  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_res.adb (Resolve_Selected_Component): If the prefix has a
+	deferred reference, generate the correct reference now, to
+	indicate that the previous assignment is used.  This prevents
+	spurious warnings on useless assignments when compiling with all
+	warnings enabled. when there is a subsequent call in the same
+	stqtement list, in which the prefix of the selected component is
+	the actual for an out parameter.
+
+2019-07-22  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_attr.adb (Expand_Loop_Entry_Attribute): Copy the condition
+	of a while loop instead of simply relocating it.
+
+2019-07-18  Arnaud Charlet  <charlet@adacore.com>
+
+	* Makefile.rtl, expect.c, env.c, aux-io.c, mkdir.c, initialize.c,
+	cstreams.c, raise.c, tracebak.c, adadecode.c, init.c, raise-gcc.c,
+	argv.c, adaint.c, adaint.h, ctrl_c.c, sysdep.c, rtinit.c, cio.c,
+	seh_init.c, exit.c, targext.c: Introduce a "STANDALONE" mode where C
+	runtime files do not have any dependency on GCC include files.
+	Remove unnecessary includes.
+	Remove remaining references to VMS in runtime C file.
+	* runtime.h: new File.
+
+2019-07-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.rtl: Use g-sercom__linux.adb for all linuxes.
+
+2019-07-11  Piotr Trojanek  <trojanek@adacore.com>
+
+	* lib-writ.adb (Ensure_System_Dependency,
+	Up_To_Date_ALI_File_Exists, Write_ALI): Replace low-level access
+	to table with a high-level query.
+
+2019-07-11  Piotr Trojanek  <trojanek@adacore.com>
+
+	* checks.adb: Fix typo in comment.
+	* sem.adb (Semantics): Avoid repeated calls to
+	In_Extended_Main_Source_Unit by reusing an already-cached
+	result.
+	* sem_util.adb (First_Global): Fix style.
+
+2019-07-11  Yannick Moy  <moy@adacore.com>
+
+	* sem_res.adb (Resolve_Call): Do not perform dimensionality
+	checking on inlined bodies.
+
+2019-07-11  Yannick Moy  <moy@adacore.com>
+
+	* debug.adb: Flip meaning of debug switch -gnatdF.
+
+2019-07-11  Yannick Moy  <moy@adacore.com>
+
+	* sem_eval.adb (Is_Same_Value): Add special case for rewritten
+	Loop_Entry attribute.
+
+2019-07-11  Claire Dross  <dross@adacore.com>
+
+	* gnat1drv.adb: SPARK checking rules for pointer aliasing are
+	moved to GNATprove backend.
+	* sem_spark.ads, sem_spark.adb (Sem_SPARK): Is now a generic
+	unit. Takes as parameters:
+	 - Retysp which is used to query the most underlying type
+	   visible in SPARK. We do not introduce aliasing checks for
+	   types which are not visibly deep.
+	 - Component_Is_Visible_In_SPARK is used to avoid doing pointer
+	   aliasing checks on components which are not visible in SPARK.
+	 - Emit_Messages returns True in the second phase of SPARK
+	   analysis. Error messages for failed aliasing checks are only
+	   output in this case.
+	Additionally, errors on constructs not supported in SPARK are
+	removed as duplicates of marking errors. Components are stored
+	in the permission map using their original component to avoid
+	inconsistencies between components of different views of the
+	same type.
+	(Check_Expression): Handle delta constraints.
+	(Is_Deep): Exported so that we can check for SPARK restrictions
+	on deep types inside SPARK semantic checkings.
+	(Is_Traversal_Function): Exported so that we can check for SPARK
+	restrictions on traversal functions inside SPARK semantic
+	checkings.
+	(Check_Call_Statement, Read_Indexes): Check wether we are
+	dealing with a subprogram pointer type before querying called
+	entity.
+	(Is_Subpath_Expression): Image attribute can appear inside a
+	path.
+	(Check_Loop_Statement): Correct order of statements in the loop.
+	(Check_Node): Ignore raise nodes.
+	(Check_Statement): Use Last_Non_Pragma to get the object
+	declaration in an extended return statement.
+
+2019-07-11  Patrick Bernardi  <bernardi@adacore.com>
+
+	* bindgen.adb (Gen_Main): Do not generate a reference to
+	Ada_Main_Program_Name when the Minimal_Binder flag is set.
+	(Gen_Output_File_Ada): Do not output GNAT_Version and
+	Ada_Main_Program_Name info if Minimal_Binder flag is set.
+	* bindusg.adb: Add documentation for new -minimal switch.
+	* gnatbind.adb (Scan_Bind_Arg): Scan -minimal switch.
+	* opt.ads: Add new global flag Minimal_Binder to indicate if the
+	binder should not produce global variables.
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
+	Update documentation with new binder -minimal switch.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.rtl: Add warning note about compilation flags and
+	capitalize.
+
+2019-07-11  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch9.adb (Expand_N_Protected_Type_Declaaration): New
+	subsidiary routine Replace_Access_Definition, to handle properly
+	a protected type PT one of whose private components is of type
+	access PT.
+
+2019-07-11  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-socket.ads (Level_Type): Add enumerators for
+	IP_Protocol_For_ICMP, IP_Protocol_For_IGMP,
+	IP_Protocol_For_RAW_Level.
+	* libgnat/g-socket.adb (Levels): Handle them.
+	* s-oscons-tmplt.c: Import socket protocols defined in
+	netinet/in.h.
+
+2019-07-11  Claire Dross  <dross@adacore.com>
+
+	* libgnat/a-cfhama.adb, libgnat/a-cfhase.adb (Free): Do not
+	reset the Has_Element flag if no element is freed.
+
+2019-07-11  Arnaud Charlet  <charlet@adacore.com>
+
+	* errno.c: Remove obsolete support for MaRTE OS.
+
+2019-07-11  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Type_Conversion): If a predicate check
+	is generated, analyze it with range check suppressed, because
+	that check has been previously applied.
+	* exp_ch5.adb (Expand_N_Assignment_Statement): If the RHS is a
+	type conversion to the type of the LHS, do not apply a predicate
+	check to the RHS because it will have been generated already
+	during its expansion.
+	* exp_ch6.adb (Can_Fold_Predicate_Call): Extend processing to
+	handle a predicate check on a constant entity whose value is
+	static.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo.adb: Remove the documentation of switch -d_N because it
+	is no longer in use.
+	* bindo-graphs.ads, bindo-graphs.adb (Is_Spec_Before_Body_Edge):
+	New routine.
+	* bindo-writers.adb (Write_Dependency_Edge): Add the missing
+	case of a spec-before-body edge.
+
+2019-07-11  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-socket.ads (Mode_Type): Add a Socket_Raw enumerator.
+	* libgnat/g-socket.adb (Modes): Handle Socket_Raw.
+
+2019-07-11  Justin Squirek  <squirek@adacore.com>
+
+	* exp_ch9.adb (Build_Private_Protected_Declaration): Add
+	exception for the moving of pragmas to internally generated
+	specs for pragma Unreferenced.
+
+2019-07-11  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Fix inconsistent
+	documentation for gnatmetric.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-11  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Document gnatpp's
+	--spaces-only switch.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_util.adb (Null_Status): Assume that an erroneous construct
+	has an undefined null status.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* checks.adb, exp_ch6.adb, gnat1drv.adb, sem_aux.adb,
+	sem_ch2.adb, sem_ch8.adb, sem_res.adb: Minor reformatting.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_ch8.adb (Analyze_Object_Renaming): Obtain the object being
+	renamed using routine Get_Object_Name which takes care of
+	various name forms.
+	(Get_Object_Name): New routine.
+
+2019-07-11  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch6.adb (Can_Fold_Predicate_Call): New function,
+	subsidiary of Expand_Call_Helper, to compute statically a
+	predicate check when the argument is a static integer.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_res.adb (Resolve_Op_Not): Do not rewrite an equality
+	operator into a function call when the operator is intrinsic.
+
+2019-07-11  Thomas Quinot  <quinot@adacore.com>
+
+	* sem_prag.adb (Analyze_Pragma, case pragma Check): Do not call
+	Set_SCO_Pragma_Enabled for the dynamic predicate case.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_util.ads, exp_util.adb (Needs_Finalization): Move to
+	Sem_Util.
+	* sem_ch9.adb (Analyze_Protected_Definition): Code cleanup. Mark
+	the protected type as having controlled components when it
+	contains at least one such component.
+	* sem_util.ads, sem_util.adb (Needs_Finalization): New
+	function.
+
+2019-07-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* alloc.ads (Rep_JSON_Table_Initial): New constant.
+	(Rep_JSON_Table_Increment): Likewise.
+	* debug.adb: Document -gnatd_j switch.
+	* gcc-interface/Make-lang.in (GNAT_ADA_OBJS): Add
+	repinfo-input.o.
+	* gnat1drv.adb: Add with clause for Repinfo.Input.
+	Add with and use clauses for Sinput.
+	(Read_JSON_Files_For_Repinfo): New procedure.
+	(Gnat1drv1): Deal with -gnatd_j switch.
+	* repinfo-input.ad[sb]: New unit.
+	* snames.ads-tmpl (Name_Discriminant): New constant.
+	(Name_Operands): Likewise.
+
+2019-07-11  Justin Squirek  <squirek@adacore.com>
+
+	* checks.adb (Apply_Accessibility_Check): Add check for constant
+	folded conditions on accessibility checks.
+
+2019-07-11  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnarl/g-thread.ads, libgnarl/g-thread.adb (Get_Thread):
+	Update comments. Add new version taking a Task_Id.
+
+2019-07-11  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo.adb: Update the section of switches and debugging
+	elaboration issues.
+	* bindo.ads: Add type Elaboration_Phase.
+	* bindo-augmentors.adb: Add use clause for
+	Bindo.Writers.Phase_Writers.
+	(Augment_Library_Graph): Signal the start and end of the
+	aubmentation phase.
+	* bindo-builders.adb: Add with and use clause for Bindo.Writers.
+	Add use clause for Bindo.Writers.Phase_Writers.
+	(Build_Invocation_Graph): Signal the start and end of the
+	invocation graph construction phase.
+	(Build_Library_Graph): Signal the start and end of the library
+	graph construction phase.
+	* bindo-diagnostics.adb: Add use clause for
+	Bindo.Writers.Phase_Writers.
+	(Diagnose_Cycle): Signal the start and end of the cycle
+	diagnostic phase.
+	* bindo-elaborators.adb: Add use clause for
+	Bindo.Writers.Phase_Writers.
+	(Elaborate_Units): Signal the start and end of the unit
+	elaboration phase.
+	* bindo-graphs.adb: Add use clause for
+	Bindo.Writers.Phase_Writers.
+	(Find_Components): Signal the start and end of the component
+	discovery phase.
+	(Find_Cycles): Signal the start and end of the cycle discovery
+	phase.
+	* bindo-units.adb: Add with and use clause for Bindo.Writers.
+	Add use clause for Bindo.Writers.Phase_Writers.
+	(Collect_Elaborable_Units): Signal the start and end of the unit
+	collection phase.
+	* bindo-validators.adb: Add with and use clause for
+	Bindo.Writers.  Add use clause for Bindo.Writers.Phase_Writers.
+	(Validate_Cycles, Validate_Elaboration_Order,
+	Validate_Invocation_Graph, Validate_Library_Graph): Signal the
+	start and end of the libray graph validation phase.
+	* bindo-writers.ads, bindo-writers.adb: Add new nested package
+	Phase_Writers.
+	* debug.adb: Update the documentation of switch d_S.
+
+2019-07-11  Yannick Moy  <moy@adacore.com>
+
+	* sem_res.adb (Check_Argument_Order): Special case calls to
+	operators.
+
+2019-07-10  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/s-ststop.adb: Remove System.Strings.Stream_Ops
+	dependence on System.Streams.Stream_IO.
+
+2019-07-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch2.adb (Analyze_Integer_Literal): Preserve the type of
+	the literal if prior analysis determined that its type is a
+	modular integer type.
+
+2019-07-10  Doug Rupp  <rupp@adacore.com>
+
+	* init.c: Do not attempt to re-arm guard page on x86_64-vx7(r2).
+
+2019-07-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch8.adb (Check_Constrained_Object): A record that is
+	limited because of the presence of a limited component is
+	constrained, and no subtype indiciation needs to be created for
+	it, just as is the case for declared limited records.
+
+2019-07-10  Yannick Moy  <moy@adacore.com>
+
+	* sem_aux.adb, sem_aux.ads (Is_Protected_Operation): New
+	function to determine if a subprogram is protected.
+	* sem_spark.adb (Setup_Protected_Components): New procedure to
+	add protected components to the environment.
+	(Check_Callable_Body): Call the new Setup_Protected_Components.
+	(Check_Package_Spec): Merge local environment with enclosing one
+	when done.
+
+2019-07-10  Claire Dross  <dross@adacore.com>
+
+	* sem_spark.adb (Check_Expression): Allow digits constraints as
+	input.
+	(Illegal_Global_Usage): Pass in the entity.
+	(Is_Subpath_Expression): New function to allow different nodes
+	as inner parts of a path expression.
+	(Read_Indexes): Allow concatenation and aggregates with box
+	expressions.  Allow attributes Update and Loop_Entry.
+	(Check_Expression): Allow richer membership test.
+	(Check_Node): Ignore bodies of generics.
+	(Get_Root_Object): Allow concatenation and attributes.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_ch6.adb (Check_Discriminant_Conformance): Use Find_Type to
+	discover the type of a full view discriminant.
+
+2019-07-10  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_ugn/gnat_and_program_execution.rst: Improve gnatmem's
+	doc for the depth switch.
+
+2019-07-10  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Document gnatpp's
+	--source-line-breaks switch.
+
+2019-07-10  Justin Squirek  <squirek@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_attributes.rst: Add mention
+	of 'Image attribute with 'Img's entry to mention additional
+	added 2012 usage of Obj'Image.
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Correct
+	mispelling of Async_Writers.
+	* gnat_rm.texi: Regenerate.
+	* sem_prag.adb (Analyze_Pragma): Correct mispelling of
+	Async_Writers.
+	* sem_util.adb (State_Has_Enabled_Property): Correct mispelling
+	of Async_Writers.
+
+2019-07-10  Simon Buist  <buist@adacore.com>
+
+	* sem_util.ads (Child_Prefix): New constant.
+	* sem_util.adb (Unique_Name): Add a special prefix to child
+	units that have a nested subprogram or package.
+
+2019-07-10  Arnaud Charlet  <charlet@adacore.com>
+
+	* sfn_scan.adb (Scan_SFN_Pragmas): Add pragma Assert.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_ch3.adb (Check_Nonoverridable_Aspects): Correct the
+	spelling in certain error messages.
+	(Check_Pragma_Implemented): Correct the spelling in certain
+	error messages.
+
+2019-07-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.rtl (GNATRTL_NONTASKING_OBJS): Add g-brapre.
+	* libgnat/g-brapre.ads: New package specification.
+	* doc/gnat_rm/the_gnat_library.rst: Document it.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-10  Yannick Moy  <moy@adacore.com>
+
+	* osint-c.adb (Set_File_Name): Always add extension for multiple
+	units per file mode.
+
+2019-07-10  Corentin Gay  <gay@adacore.com>
+
+	* sysdep.c: Put include directive for 'vxWorks.h' before any
+	other VxWorks headers.
+
+2019-07-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_attributes.rst
+	(Scalar_Storage_Order): Minor tweaks.  Add note about debuggers.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Case_Expression): Mark the generated
+	assignments to the temporary result as being OK because the
+	expansion of case expressions is correct by construction.
+	(Is_Copy_Type): Update the predicate to match the comment
+	within.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo-graphs.adb, bindo.adb, debug.adb, exp_ch6.adb,
+	sem_ch10.adb, sem_ch13.adb, sem_ch3.adb, sem_ch4.adb,
+	sem_ch6.adb, sem_ch7.adb, sem_res.adb, sem_spark.adb,
+	sem_util.adb, warnsw.ads: Minor reformatting.
+
+2019-07-10  Joffrey Huguet  <huguet@adacore.com>
+
+	* libgnat/a-strbou.ads, libgnat/a-strfix.ads,
+	libgnat/a-strunb.ads, libgnat/a-strunb__shared.ads: Add global
+	contracts, contract cases, preconditions and postconditions to
+	procedures and functions.
+
+2019-07-10  Doug Rupp  <rupp@adacore.com>
+
+	* sysdep.c (__gnat_is_file_not_found_error): Reformulate to also
+	work for vxworks7r2 SR0610.
+
+2019-07-10  Doug Rupp  <rupp@adacore.com>
+
+	* env.c (__gnat_environ): Reformulate to also work for
+	vxworks7r2 SR0610.
+
+2019-07-10  Patrick Bernardi  <bernardi@adacore.com>
+
+	* Makefile.rtl: Handle vxworks7r2 ppc target
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo.adb: Update the section on switches.
+	* bindo-graphs.adb
+	(Add_Cycle, Add_Vertex_And_Complement): Remove.
+	(Create): The graph no longer needs a set of recorded cycles
+	because the cycles are not rediscovered in permuted forms.
+	(Cycle_End_Vertices): New routine.
+	(Destroy): The graph no longer needs a set of recorded cycles
+	because the cycles are not rediscovered in permuted forms.
+	(Destroy_Library_Graph_Vertex): Move to the library level.
+	(Find_All_Cycles_Through_Vertex, Find_All_Cycles_With_Edge):
+	Remove.
+	(Find_Cycles_From_Successor, Find_Cycles_From_Vertex,
+	Find_Cycles_In_Component, Has_Elaborate_All_Edge): New routines.
+	(Insert_And_Sort): Remove.
+	(Is_Elaborate_Body_Edge): Use predicate
+	Is_Vertex_With_Elaborate_Body.
+	(Is_Recorded_Cycle): Remove.
+	(Is_Vertex_With_Elaborate_Body): New routine.
+	(Normalize_And_Add_Cycle): Remove.
+	(Precedence): Rename to xxx_Precedence, where xxx relates to the
+	input.  These versions better reflect the desired input
+	precedence.
+	(Record_Cycle): New routine.
+	(Remove_Vertex_And_Complement, Set_Is_Recorded_Cycle): Remove.
+	(Trace_xxx): Update all versions to use debug switch -d_t.
+	(Trace_Component): New routine.
+	(Trace_Eol): Removed.
+	(Trace_Vertex): Do not output the component as this information
+	is already available when the component is traced.
+	(Unvisit, Visit): New routine.
+	* bindo-graphs.ads: Add new instance LGV_Lists.  Remove instance
+	RC_Sets.  Update the structure of type Library_Graph_Attributes
+	to remove the set of recorded cycles.
+	(Destroy_Library_Graph_Vertex): Move to the library level.
+	* bindo-writers.adb (Write_Component_Vertices): Output
+	information about the number of vertices.
+	* debug.adb: Document the use of binder switch -d_t.  Update the
+	use of binder switch -d_T.
+
+2019-07-10  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Get_Root_Object): Replace precondition by error
+	message.
+	(Read_Indexes): Replace precondition by error message.
+	(Check_Callable_Body): Check only traversal function returns an
+	anonymous access type.
+	(Check_Expression): Issue error on unexpected expression as
+	path.
+	* sem_util.adb (First_Global): Fix access to global on
+	entry/task.
+
+2019-07-10  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch6.adb (Is_Class_Wide_Interface_Type): New subprogram.
+	(Expand_Call_Helper): Handle non-limited views when we check if
+	any formal is a class-wide interface type.
+	* exp_disp.adb (Expand_Interface_Actuals): Handle non-limited
+	views when we look for interface type formals to force "this"
+	displacement.
+
+2019-07-10  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_res.adb (Resolve_Equality_Op): Do not replace the resolved
+	operator by its alias if expander is not active, because the
+	operand type may not be frozen yet and its inherited operations
+	have not yet been created.
+
+2019-07-10  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo-elaborators.adb (Elaborate_Units): Set attribute
+	Elab_Position of all elaborated units.
+	(Set_Unit_Elaboration_Positions): New routine.
+
+2019-07-10  Gary Dismukes  <dismukes@adacore.com>
+
+	* exp_util.adb: Reformatting and a typo fix.
+
+2019-07-10  Yannick Moy  <moy@adacore.com>
+
+	* exp_util.adb (Remove_Side_Effects): Prefer renamings for
+	objects of possible owning type in GNATprove mode.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Analyze_Object_Declaration): If the object type
+	is a composite type that has a dynamic predicate and, the
+	expression in the declaration is an aggregate, the generated
+	predicate check must appear after the expanded code for the
+	aggregate, which will appear after the rewritten object
+	declarastion.
+
+2019-07-09  Justin Squirek  <squirek@adacore.com>
+
+	* sem_eval.adb (Expr_Value_E): Add conditional to correctly
+	handle constant enumerated character types.
+
+2019-07-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* libgnarl/s-osinte__mingw.ads (CRITICAL_SECTION): Use proper
+	type for SpinCount component.
+
+2019-07-09  Justin Squirek  <squirek@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Allocator): Add conditional to detect
+	the presence of anoymous access type allocators and issue a
+	warning if the appropriate warning flag is enabled.
+	* warnsw.ads: Add new warning flag for anonymous allocators
+	* warnsw.adb (All_Warnings, Restore_Warnings, Save_Warnings,
+	Set_Underscore_Warning_Switch): Register new flags.
+	(WA_Warnings): Register new flag as an "all warnings" switch
+	* usage.adb,
+	doc/gnat_ugn/building_executable_programs_with_gnat.rst:
+	Document new warning switches -gnatw_a and -gnatw_A.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch4.adb (Diagnose_Call): Improve error recovery when a
+	local subprogram name hides a possible candidate name declared
+	in a child package in the context of the current unit.
+	* sem_ch6.adb (Process_Formals): Protect against malformed
+	formal types when the parameter type does not denote an entity.
+
+2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo-augmentors.adb (Visit_Elaboration_Root): Do not start a
+	DFS from an elaboration root whose corresponding unit lacks
+	elaboration code. This behavior mimics that of the old
+	elaboration order mechanism.
+	* bindo-graphs.adb (Find_All_Cycles_Through_Vertex): Move the
+	vertex tracing within the functional branches of the routine.
+	This prevents spurious trace output.
+	(Has_No_Elaboration_Code): New routine.
+	(Trace_Cycle, Trace_Edge): Update the various Ids to use the
+	"standard" trace format.
+	* bindo-graphs.ads (Has_No_Elaboration_Code): New routine.
+	* bindo-units.ads, bindo-units.adb (Has_No_Elaboration_Code):
+	New routine.
+
+2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
+
+	* ali.ads, bindo-graphs.adb, bindo-validators.adb, clean.adb,
+	doc/gnat_ugn/elaboration_order_handling_in_gnat.rst, einfo.ads,
+	exp_aggr.adb, exp_ch13.adb, exp_ch4.adb, exp_ch5.adb,
+	exp_ch6.adb, exp_ch7.adb, exp_ch9.adb, exp_pakd.adb,
+	fname-uf.ads, gnatlink.adb, inline.adb, lib.ads, make.adb,
+	namet.ads, opt.ads, par-ch4.adb, par-ch6.adb, par-labl.adb,
+	prep.adb, sem_aggr.adb, sem_ch13.adb, sem_ch4.adb, sem_ch5.adb,
+	sem_ch6.adb, sem_ch6.ads, sem_ch7.adb, sem_ch8.adb, sem_dim.adb,
+	sem_disp.adb, sem_prag.adb, sem_res.adb, sem_warn.adb,
+	sinfo.ads: Replace ".  " with ". ". Minor reformatting and typo
+	corrections.
+	* gnat_ugn.texi: Generate.
+
+2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo.ads: Move type Precedence_Kind from the private to the
+	visible part of the unit.
+	* bindo-augmentors.adb: Remove the use of global data as it is
+	bad practice.
+	(Augment_Library_Graph): Update the parameter profile.
+	(Is_Visited, Set_Is_Visited): Remove.
+	(Visit_Elaboration_Root, Visit_Elaboration_Roots): Update the
+	parameter profile and comment on usage.
+	(Visit_Vertex): Likewise.  Also keep track of which invocation
+	edge activates a task.
+	* bindo-augmentors.ads (Augment_Library_Graph): Update the
+	parameter profile and comment on usage.
+	* bindo-builders.adb (Create_Forced_Edge,
+	Create_Spec_And_Body_Edge, Create_With_Edge): Update the call to
+	Add_Edge.
+	* bindo-diagnostics.adb: Add with end use clauses for Restrict
+	and Rident.
+	(Output_Dynamic_Model_Suggestions): Remove.
+	(Output_Invocation_Related_Suggestions): New routine.
+	(Output_Suggestions): Output all invocation-related suggestions
+	together.
+	* bindo-elaborators.adb: Remove types Comparator_Ptr and
+	Predicate_Ptr.
+	(Find_Best_Vertex): Update the parameter profile.
+	* bindo-graphs.adb (Activates_Task): New routine.
+	(Add_Body_Before_Spec_Edge): Update the call to
+	Add_Edge_With_Return.
+	(Add_Edge): Update the parameter profile and the call to
+	Add_Edge_With_Return.
+	(Add_Edge_With_Return): Update the parameter profile and comment
+	on usage.
+	(At_Least_One_Edge_Satisfies): New routine.
+	(Contains_Elaborate_All_Edge): Reimplement.
+	(Contains_Static_Successor_Edge, Contains_Task_Activation): New
+	routine.
+	(Contains_Weak_Static_Successor): Remove.
+	(Is_Static_Successor_Edge): New routine.
+	* bindo-graphs.ads: Add types LGE_Predicate_Ptr,
+	LGV_Comparator_Ptr, and LGV_Predicate_Ptr.  Update type
+	Library_Graph_Edge_Attributes to capture whether an invocation
+	edge activates a task.  Update the value of
+	No_Library_Graph_Edge_Attributes.
+	(Activates_Task): Update the parameter profile and comment on
+	usage.
+	(Contains_Static_Successor_Edge, Contains_Task_Activation): New
+	routines.
+	(Contains_Weak_Static_Successor): Remove.
+	* doc/gnat_ugn/elaboration_order_handling_in_gnat.rst:
+	Update the documentation to reflect the new task-related advice.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
+
+	* exp_util.adb (Containing_Package_With_Ext_Axioms): Replace
+	low-level Ekind test with a high-level wrapper.
+
+2019-07-09  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnat/s-memory.adb: Disable calls to Abort defer/undefer
+	when ZCX_By_Default.
+
+2019-07-09  Javier Miranda  <miranda@adacore.com>
+
+	* sem_ch13.adb (Rep_Item_Too_Early): Representation clauses are
+	not allowed for a derivation of a generic type. Extend the
+	current test to check that none of the parents is a generic
+	type.
+
+2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_ch9.adb, exp_util.adb, repinfo.adb, sem_ch12.adb,
+	sem_prag.adb, sem_res.adb, sem_spark.adb, sem_util.adb: Minor
+	reformatting.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_res.adb (Resolve_Equality_Op): If the node was overloaded,
+	set properly the entity to which the node has been resolved. The
+	original entity is the first one found during analysis, and is
+	not necessarily the resolved one.
+	(Resolve_Op_Not): If the argument of negation is an overloaded
+	equality operation, call its resolution directly given that the
+	context type does not participate in overload resolution.
+
+2019-07-09  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo.adb: Remove with and use clauses for Debug.  Add with
+	and use clauses for Opt.
+	(Find_Elaboration_Order): Enable the v4.0 elaboration order. The
+	v3.0 mechanism is now available under binder switch -H.
+	* bindusg.adb (Display): Enable switch -H.
+	* debug.adb: Free compiler switch -gnatd_G.  Free binder switch
+	-d_N.
+	* sem_elab.adb: Update the section on switches to remove
+	-gnatd_G.
+	(Invocation_Graph_Recording_OK): The invocation graph is now
+	unconditionally recorded in ALI files.
+	* switch-b.adb (Scan_Binder_Switches): Scan switch -H.
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
+	Update the documentation on compiler switches related to
+	elaboration.  Update the documentation on binder switches to
+	include switch -H.
+	* doc/gnat_ugn/elaboration_order_handling_in_gnat.rst: Update
+	the documentation on elaboration order handling in GNAT.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Entities): Disregard formals altogether.
+	(List_Name): Properly escape the double quote in the JSON
+	output.
+
+2019-07-09  Javier Miranda  <miranda@adacore.com>
+
+	* exp_util.adb (Remove_Side_Effects): Preserve the
+	Do_Range_Check flag.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* sinfo.ads: Refine comment for Do_Range_Check.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* exp_spark.adb (Expand_SPARK_N_Attribute_Reference): Expand
+	attribute reference on Enum_Rep.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch12.adb (Instantiate_Formal_Package): Handle properly the
+	case where the actual for a formal package in an instance is the
+	current instance of an enclosing generic package.
+	(Check_Formal_Packages): If the formal package declaration is
+	box-initialized or lacks associations altogether, no internal
+	instance was created to verify conformance, and there is no
+	validating package to remove from tree.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* freeze.adb (Build_Renamed_Body): Do not set body to inline in
+	GNATprove mode.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* exp_util.adb (Expand_Subtype_From_Expr): Still expand the type
+	of static expressions in GNATprove_Mode.
+	* sem_ch3.adb (Analyze_Object_Declaration): Remove obsolete
+	special case for GNATprove_Mode.
+
+2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
+
+	* doc/gnat_rm/the_gnat_library.rst,
+	doc/gnat_ugn/building_executable_programs_with_gnat.rst,
+	erroutc.adb, libgnat/g-comlin.adb, libgnat/g-comlin.ads,
+	libgnat/g-regexp.ads, libgnat/g-regpat.ads,
+	libgnat/g-spipat.ads, libgnat/s-os_lib.ads,
+	libgnat/s-regexp.ads: Reword "wild card" to "wildcard".
+	* gnat_rm.texi, gnat_ugn.texi: Regenerate.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Check_Expression): Handle correctly implicit
+	assignments as part of allocators and (extension) aggregates.
+	(Get_Root_Object): Adapt for new path expressions.
+	(Is_Path_Expression): Return True for (extension) aggregate.
+
+2019-07-09  Piotr Trojanek  <trojanek@adacore.com>
+
+	* einfo.ads: Fix a typo.
+
+2019-07-09  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_util.adb (Scope_Within_Or_Same): Handle properly task
+	bodies and protected bodies, so that local variables within have
+	their proper scopes after these constructs have been rewritten
+	during expansion. This patch resembles but is not identical to
+	the code in Scope_Within.
+
+2019-07-09  Arnaud Charlet  <charlet@adacore.com>
+
+	* gnat1drv.adb (Adjust_Global_Switches): Set
+	Dynamic_Elaboration_Checks to True in CodePeer mode.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Get_Perm_Or_Tree): Issue an error when
+	encountering unknown global variable.
+
+2019-07-09  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Check_Expression): Change signature to take an
+	Extended_Checking_Mode, for handling read permission checking of
+	sub-expressions in an assignment.
+	(Check_Parameter_Or_Global): Adapt to new behavior of
+	Check_Expression for mode Assign.
+	(Check_Safe_Pointers): Do not analyze generic bodies.
+	(Check_Assignment): Separate checking of the target of an
+	assignment.
+
+2019-07-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.ads (JSON format): Adjust.
+	* repinfo.adb (Need_Blank_Line): Rename to...
+	(Need_Separator): ...this.
+	(Blank_Line): Rename to...
+	(Write_Separator): ...this and add JSON specific handling.
+	(List_Array_Info): Adjust to above renaming.
+	(List_Object_Info): Likewise.
+	(List_Record_Info): Likewise.
+	(List_Subprogram_Info): Likewise.
+	(List_Type_Info): Likewise.
+	(List_Entities): Do not set Need_Blank_Line.
+	(List_Rep_Info): Set Need_Separator and add JSON specific
+	handling. Output a single JSON stream in the  normal case.
+
+2019-07-09  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_ugn/the_gnat_compilation_model.rst: Update doc on
+	-fdump-ada-spec now that we generate Ada 2012.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Common_Type_Info): New procedure extracted
+	from...
+	(List_Type_Info): ...here.  Call it for the common information,
+	start with a blank line and output the linker section at the
+	end, if any.
+	(List_Mechanisms): Rename to...
+	(List_Subprogram_Info): ...this.
+	(List_Array_Info): Call List_Common_Type_Info.
+	(List_Entities): Adjust to above change and renaming.
+	(List_Record_Info): Call List_Common_Type_Info.
+
+2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-sercom.ads
+	(Serial_Port_Descriptor): New type.
+	(Serial_Port): Add a comment, make it hold a
+	Serial_Port_Descriptor.
+	(To_Ada, To_C): New procedures.
+	(Port_Data, Port_Data_Access): Remove types.
+	* libgnat/g-sercom.adb (To_Ada): New stub.
+	* libgnat/g-sercom__linux.adb, libgnat/g-sercom__mingw.adb:
+	Update implementations accordingly.
+	* s-oscons-tmplt.c: Bind Serial_Port_Descriptor to
+	System.Win32.HANDLE on Windows, and to Interfaces.C.int on
+	Linux. Add "Interfaces.C." prefix for other basic integer type
+	bindings.
+	* xoscons.adb (Output_Info): Remove the "Interfaces.C." prefix
+	for subtypes generation.
+
+2019-07-08  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_rm/standard_and_implementation_defined_restrictions.rst:
+	Update documentation on No_Exceptions restriction.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/s-os_lib.adb: Do not call __gnat_kill for Invalid_Pid.
+
+2019-07-08  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_util.adb (Enclosing_Package_Or_Subprogram): Do not expect
+	package and subprogram bodies.
+
+2019-07-08  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Remove documentation
+	of ignored GNATpp switch.
+
+2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst:
+	Update the documentation of pragma Initialize_Scalars.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-08  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch4.adb (Tagged_Membership): Fix regression silently
+	introduced in r260738 that erroneouslusy causes the evaluation
+	to True of the membership test when the left operand of the
+	membership test is a class-wide interface object and the right
+	operand is a type that implements such interface type.
+
+2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_ch13.adb (Analyze_Attribute_Definition_Clause): Do not
+	register an address clause when its prefix denotes a generic
+	formal object.
+
+2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo-diagnostics.adb (Diagnose_Cycle): Capture the presence
+	of an Elaborate_All edge before iterating over the edges of the
+	cycle.
+	(Output_Elaborate_Body_Transition): Update the parameter profile
+	and the comment on usage. Add a missing case where the edge is
+	within the context of an Elaborate_All.
+	(Output_Transition): Update the call to
+	Output_Elaborate_Body_Transition.
+	* bindo-graphs.ads, bindo-graphs.adb
+	(Contains_Elaborate_All_Edge): New routine.
+
+2019-07-08  Piotr Trojanek  <trojanek@adacore.com>
+
+	* lib-xref-spark_specific.adb (Create_Heap): Set dummy Etype for
+	the fake __HEAP entity.
+
+2019-07-08  Daniel Mercier  <mercier@adacore.com>
+
+	* gnat1drv.adb: Suppress warnings on memory representation in
+	CodePeer compiler mode.
+
+2019-07-08  Nicolas Roche  <roche@adacore.com>
+
+	* rtinit.c (__gnat_runtime_initialize): Remove dependency on
+	CommandLineToArgvW.
+
+2019-07-08  Doug Rupp  <rupp@adacore.com>
+
+	* Makefile.rtl: Handle vxworks7r2 in x86_64 and x86 vxworks7.
+
+2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* Makefile.rtl: Use g-sercom__linux.adb for all linuxes.
+
+2019-07-08  Yannick Moy  <moy@adacore.com>
+
+	* expander.adb (Expand): Do not reset Analyzed flag always.
+	* sem_eval.adb (Fold_Ureal): Mark node as analyzed.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch9.adb (Expand_N_Timed_Entry_Call): Do not insert twice
+	the assignment statement that computes the delay value, to
+	prevent improper tree sharing when the value is a type
+	conversion and Float_Overflow checks are enabled.
+
+2019-07-08  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo.adb: Update the section on terminology to include new
+	concepts.  Update the section on switches to include new
+	entries.
+	* bindo.ads: Add type Precedence_Kind.
+	* bindo-builders.adb: Add with and use clauses for Debug and
+	Bindo.Validators.  Add use clauses for
+	Bindo.Validators.Invocation_Graph_Validators and
+	Bindo.Validators.Library_Graph_Validators.
+	(Build_Invocation_Graph): Validate the graph immediately after
+	it was built.
+	(Build_Library_Graph): Update the parameter profile. The
+	creation of the graph is now elaboration model-agnostic.
+	Validate the graph immediately after it was built.
+	(Create_With_Edge): Create regular with edges for Elaborate and
+	Elaborate_All edges when the appropriate debug switches are in
+	effect.
+	* bindo-builders.ads (Build_Library_Graph): Update the parameter
+	profile.
+	* bindo-diagnostics.adb (Diagnose_Cycle): Track the presence of
+	an Elaborate_All edge throughout the inspection of the cycle's
+	edges.
+	(Output_Dynamic_Model_Suggestions): Output the suggestion only
+	when the cycle contains at least one weak edge where the
+	successor was statically elaborated.
+	(Output_Elaborate_Body_Transition, Output_Forced_Transition,
+	Output_With_Transition): Update the assertions.
+	* bindo-elaborators.adb: Remove use clauses for
+	Bindo.Validators.Invocation_Graph_Validators and
+	Bindo.Validators.Library_Graph_Validators.  Remove strings
+	Add_To_All_Candidates_Msg and Add_To_Comp_Candidates_Msg.
+	Remove type String_Ptr.
+	(Add_Vertex, Add_Vertex_If_Elaborable, Create_All_Candidates_Set
+	Create_Component_Candidates_Set): Remove.
+	(Create_Component_Vertex_Sets, Create_Vertex_Sets): New routine.
+	(Elaborate_Component): Update the parameter profile and the
+	comment on usage.  Reimplement the elaboration of a component.
+	The algorithm will now attempt to elaborate as many vertices
+	possible. If this is not possible, and a weakly elaborable
+	vertex is available use unit was compiled using the dynamic
+	model, the algorithm will elaborate it.
+	(Elaborate_Library_Graph): Reimplement the elaboration of the
+	graph. The algorithm will now attempt to elaborate as many
+	vertices along with their components as possible. If this is not
+	possible, and a weakly elaborable vertex is available use unit
+	was compiled using the dynamic model, the algorithm will
+	elaborate it along with its component.
+	(Elaborate_Units): Merge with the functionality of
+	Elaborate_Units_Common.
+	(Elaborate_Units_Common, Elaborate_Units_Dynamic,
+	Elaborate_Units_Static): Remove.
+	(Elaborate_Vertex): Update the parameter profile and the comment
+	on usage.  Reimplemented.
+	(Find_Best_Candidate): Remove.
+	(Find_Best_Elaborable_Vertex, Find_Best_Vertex,
+	Find_Best_Weakly_Elaborable_Vertex, Has_Elaborable_Body,
+	Insert_Elaborable_Successor, Insert_Vertex): New routines.
+	(Is_Better_Candidate): Remove.
+	(Is_Better_Elaborable_Vertex,
+	Is_Better_Weakly_Elaborable_Vertex,
+	Is_Suitable_Elaborable_Vertex,
+	Is_Suitable_Weakly_Elaborable_Vertex): New routines.
+	(Trace_Candidate_Vertices): Remove.
+	(Trace_Component): Output the number of strong and weak
+	predecessors.
+	(Trace_Unelaborated_Vertices): Remove.
+	(Trace_Vertex): Output the number of strong and weak
+	predecessors.
+	(Trace_Vertices): New routine.
+	(Update_Successor, Update_Successors): Update the parameter
+	profile and the comment on usage.
+	* bindo-graphs.adb: Remove type Precedence_Kind.
+	(Add_Edge_With_Return): Update the increment of pending
+	predecessors.
+	(Add_Vertex): Provide default values for strong and weak
+	predecessors.
+	(Complementary_Vertex): Move the initial declaration to the
+	spec. Update the parameter profile and the comment on usage.
+	(Contains_Weak_Static_Successor): New routine.
+	(Create): Update the parameter profile. The creation of the
+	graph is now elaboration model-agnostic.
+	(Decrement_Pending_Predecessors): Update the parameter profile
+	and the comment on usage. Reimplemented.
+	(Delete_Edge): Update the decrement of pending predecesors.
+	(Has_Elaborate_Body): Do not treat a vertex as being subject to
+	Elaborate_Body when a debug switch is in effect.
+	(Increment_Pending_Predecessors): Update the parameter profile
+	and the comment on usage. Reimplemented.
+	(Is_Elaborable_Component): Reimplemented.
+	(Is_Elaborable_Vertex): Move the initial declaration to the
+	spec.  Reimplemented.
+	(Is_Elaborate_Body_Pair): New routine.
+	(Is_Dynamically_Elaborated): Update the parameter profile.
+	Reimplemented.
+	(Is_Weakly_Elaborable_Vertex): New routine.
+	(Pending_Predecessors): Removed.
+	(Pending_Predecessors_For_Elaboration,
+	Pending_Strong_Predecessors, Pending_Weak_Predecessors,
+	Update_Pending_Predecessors): New routines.
+	(Update_Pending_Predecessors_Of_Components): Update the
+	increment of pending predecessors.
+	* bindo-graphs.ads: Update the components of type
+	Component_Attributes.  Update the components of type
+	Library_Graph_Attributes.  Update the components of type
+	Library_Graph_Vertex_Attributes.  Update the initialization of
+	No_Component_Attributes.  Update the initialization of
+	No_Library_Graph_Vertex_Attributes.
+	(Complementary_Vertex, Contains_Weak_Static_Successor): New
+	routines.
+	(Create): Update the parameter profile and the comment on usage.
+	(Decrement_Pending_Predecessors, Is_Dynamically_Elaborated):
+	Update the parameter profile and the comment on usage.
+	(Is_Elaborate_Body_Pair, Is_Weakly_Elaborable_Vertex): New
+	routines.
+	(Pending_Predecessors): Removed.
+	(Pending_Predecessors_For_Elaboration,
+	Pending_Strong_Predecessors, Pending_Weak_Predecessors): New
+	routines.
+	* bindo-writers.adb (Write_Components): Moved from the spec.
+	(Write_Component): Output the strong and weak predecessors.
+	(Write_Library_Graph): Output the components as part of the
+	graph.
+	(Write_Library_Graph_Vertex): Output the strong and weak
+	predecessors.
+	* bindo-writers.ads (Write_Components): Moved to the body.
+	* debug.adb: Add and document new GNATbind switches -d_a, -d_b,
+	-d_e.
+	* bindo-validators.adb: Minor reformattings.
+
+2019-07-08  Bob Duff  <duff@adacore.com>
+
+	* libgnat/g-sercom.ads, libgnat/g-sercom__linux.adb (Data_Rate):
+	Support additional data rates.
+
+2019-07-08  Olivier Hainque  <hainque@adacore.com>
+
+	* gcc-interface/trans.c (Compilation_Unit_to_gnu): Don't request
+	DECL_ARTIFICIAL_P on elab proc declarations.
+
+2019-07-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Record_Info): Declare Incomplete_Layout and
+	Not_In_Extended_Main local exceptions.
+	(List_Structural_Record_Layout): For an extension, raise the
+	former if the parent subtype has not been built and the latter
+	if it is not declared in the main source unit.  Fall back to the
+	flat layout if either exception has been raised.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* libgnat/a-strfix.adb (Delete): The RM describes the semantics
+	of Delete as equivalent to that of Replace_String with a null
+	argument. As a result, deleting a null string that starts past
+	the end of its argument is a noop and must not raise
+	Index_Error.
+
+2019-07-08  Javier Miranda  <miranda@adacore.com>
+
+	* exp_disp.adb (Register_Primitive): When registering a
+	primitive in the secondary dispatch table, handle primitive
+	inherited through several levels of type derivation (required to
+	properly handle inherited 'null' primitive).
+
+2019-07-08  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Document handling of
+	preprocessor directives in GNATpp.
+
+2019-07-08  Javier Miranda  <miranda@adacore.com>
+
+	* gnat1drv.adb (Post_Compilation_Validation_Checks:
+	Validate_Compile_Time_Warning_Errors is now located in sem_prag
+	(instead of sem_ch13).
+	* sem_ch13.ads (Validate_Compile_Time_Warning_Error,
+	Validate_Compile_Time_Warning_Errors): Move to sem_prag.
+	* sem_ch13.adb
+	(Compile_Time_Warnings_Errors): Move to sem_prag.
+	(Initialize): Remove initialization of table
+	Compile_Time_Warning_Errors.
+	(Validate_Compile_Time_Warning_Error,
+	Validate_Compile_Time_Warning_Errors): Move to sem_prag.
+	* sem_prag.ads (Validate_Compile_Time_Warning_Errors): New
+	procedure.
+	* sem_prag.adb (Initialize): Initialize table
+	Compile_Time_Warning_Errors.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Analyze_Aspect_Specifications): For a
+	pre/postcondition of a generic subprogram declaration, do not
+	use Relocate_Node on the aspect expression to construct the
+	corresponding attribute specification, to prevent tree anomalies
+	when the expression is a call with named actual parameters.
+
+2019-07-08  Javier Miranda  <miranda@adacore.com>
+
+	* sem_attr.adb (Analyze_Attribute [Attribute_Size]): For pragmas
+	used to report user defined compile time warning or errors
+	handle 'Size for types with known static RM size.
+
+2019-07-08  Justin Squirek  <squirek@adacore.com>
+
+	* exp_imgv.adb (Build_Enumeration_Image_Tables): Default SSO for
+	the building of image tables.
+	(Expand_Image_Attribute): Minor cleanup.
+
+2019-07-08  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-socket.ads, libgnat/g-socket.adb: Improve
+	documentation.
+	(Get_Socket_Option, Set_Socket_Option): Remove default value for
+	the Level formal.
+
+2019-07-08  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Check_Aspect_At_End_Of_Declarations): For an
+	unanalized aspect in a generic context that has not been
+	analyzed yet, if the aspect applies to a type, place the type on
+	the scope stack to make its components visible, before checking
+	conformance with the version of the expression analyzed at the
+	freeze point.
+
+2019-07-05  Justin Squirek  <squirek@adacore.com>
+
+	* checks.adb (Apply_Accessibility_Check): Add logic to fetch the
+	function result accessibility level if one is required within
+	the generated check.
+	* exp_ch6.adb (Needs_Result_Accessibility_Level): Modify
+	controlling elsif block to handle more cases such as anonymous
+	access results and disable checking for coextensions.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch9.adb (Analyze_Accept_Statement): If this is an illegal
+	accept statement for an enclosing entry abandon analysis to
+	prevent scope mismatches and potential infinite loops in
+	compiler.
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* ali.adb (For_Each_Invocation_Construct,
+	For_Each_Invocation_Relation): New version.
+	(Scan_ALI): Initialize field Invocation_Graph_Encoding.
+	(Set_Invocation_Graph_Encoding): Update the setting of the
+	invocation graph encoding.
+	* ali.ads: Move field Invocation_Graph_Encoding from Unit_Record
+	to ALI_Record because the encoding applies to the whole ALI,
+	rather than one of the units (spec or body) for which the ALI
+	file was created.
+	(For_Each_Invocation_Construct, For_Each_Invocation_Relation):
+	New version.
+	* bindo.adb: Update the section on switches.  Complete the
+	section of debugging elaboration order issues.
+	(Find_Elaboration_Order): Prepare the routine for the switch
+	from the old to the new elaboration order mechanism.
+	* bindo-diagnostics.adb (Find_And_Output_Invocation_Paths):
+	Manage a visited set used by Visit_Vertex.
+	(Output_All_Cycles_Suggestions,
+	Output_Dynamic_Model_Suggestions): Clarify the nature of the
+	suggested switch.
+	(Output_Elaborate_Body_Transition): Update the diagnostic to
+	emit a better message.
+	(Output_Forced_Suggestions, Output_Full_Encoding_Suggestions):
+	Clarify the nature of the suggested switch.
+	(Visit_Vertex): Update the parameter profile to add a set of
+	invokers visited during the transition. This set prevents
+	infinite exploration of the graph in case the invocations are
+	recursive.
+	* bindo-elaborators.adb: Add a use clause for
+	Bindo.Writers.Dependency_Writers.
+	(Elaborate_Units_Common): Output the library graph after it has
+	been augmented with invocation edges. Output just the components
+	instead of outputting the whole library graph again.
+	(Elaborate_Units_Dynamic, Elaborate_Units_Static): Output the
+	dependencies as expressed in the library graph.
+	* bindo-units.adb (Invocation_Graph_Encoding): Update the
+	extraction of the invocation graph encoding.
+	* bindo-writers.adb: Add with and use clauses for Binderr and
+	Butil.
+	(palgc, plgc): New debug routine.
+	(Write_Components): Moved to the spec. Add a header for the
+	output.
+	(Write_Dependencies, Write_Dependencies_Of_Vertex,
+	Write_Dependency_Edge): New routine.
+	(Write_Elaboration_Order): Update the logic to follow the format
+	of Binde's order output.
+	(Write_Library_Graph): Do not output the components every time
+	the graph is written.
+	(Write_Unit): Output the invocation graph encoding of the unit.
+	Output the invocation constructs and relations for the unit
+	only.
+	* bindo-writers.ads (Write_Components): Moved from the body.
+	(Write_Dependencies): New routine.
+	* bindusg.adb: Prepare the routine for the switch from the old
+	to the new elaboration order mechanism.
+	* debug.adb: Binder switch -d_O is now not associated with any
+	functionality.
+	* einfo.adb (Is_Elaboration_Target): The attribute applies to
+	packages, as specified by the comment on the attribute usage.
+	* opt.ads: Add a global flag which controls the choice between
+	the new and the legacy elaboration order mechanism.
+	* sem_elab.adb: Add Package_Target to type Target_Kind.
+	(Build_Elaborate_Body_Procedure, Build_Elaborate_Procedure,
+	Build_Elaborate_Spec_Procedure, Check_Elaboration_Scenarios,
+	Check_SPARK_Model_In_Effect): Use Main_Unit_Entity to obtain the
+	entity of the main unit.
+	(Create_Package_Rep): New routine.
+	(Create_Target_Rep): Add processing for packages.
+	(Declaration_Placement_Of_Node, Has_Prior_Elaboration): Use
+	Main_Unit_Entity to obtain the entity of the main
+	 unit.
+	(Invocation_Graph_Recording_OK): Prepare the routine for the
+	switch from the old to the new elaboration order mechanism.
+	(Main_Unit_Entity): New routine.
+	(Meet_Elaboration_Requirement,
+	Process_Conditional_ABE_Variable_Reference): Use
+	Main_Unit_Entity to obtain the entity of the main unit.
+	(Process_Invocation_Instantiation): New routine.
+	(Process_Invocation_Scenario): Add processing for
+	instantiations.
+	* switch-b.adb (Scan_Binder_Switches): Prepare the routine for
+	the switch from the old to the new elaboration order mechanism.
+
+2019-07-05  Joffrey Huguet  <huguet@adacore.com>
+
+	* libgnat/a-textio.adb: Add abstract state refinment.
+	* libgnat/a-textio.ads: Add File_System abstract state.  Add
+	global contracts, contract cases, preconditions and
+	postconditions to procedures and functions.
+	(Set_Input, Set_Output, Set_Error, Standard_Input,
+	Standard_Output, Standard_Error, Current_Input, Current_Output,
+	Current_Error): Turn SPARK_Mode off.
+	(Get_Line): Turn SPARK_Mode off on Get_Line functions.
+	* libgnat/a-tideio.ads, libgnat/a-tienio.ads,
+	libgnat/a-tifiio.ads, libgnat/a-tiflio.ads,
+	libgnat/a-tiinio.ads, libgnat/a-timoio.ads: Add global
+	contracts, contract cases, preconditions and postconditions to
+	procedures and functions.
+
+2019-07-05  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_ugn/platform_specific_information.rst: Refresh doc on
+	installing from the command line on Windows.  Remove obsolete
+	part.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-05  Vasiliy Fofanov  <fofanov@adacore.com>
+
+	* libgnat/a-wichha.ads (Is_Alphanumeric): Replace comment with
+	the correct one.  Also capitalize references to False
+	throughout.
+
+2019-07-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Indexed_Component): Do not expand actual
+	parameters of function calls here either.
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindo-units.adb, checks.adb, exp_attr.adb, exp_ch3.adb,
+	exp_ch4.adb, exp_pakd.adb, lib-writ.adb, libgnat/g-traceb.adb,
+	libgnat/g-traceb.ads, libgnat/s-stratt.ads, sem_aux.ads,
+	sem_util.adb: Minor reformatting.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Build_Predicate_Functions): If a subtype that
+	carries a static predicate aspect is frozen immediately after
+	its declaration, ensure that the generated function body created
+	for predicate checking is inserted after the corresponding
+	subprogram declaration, which is created at the point the
+	declaration is elaborated.
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_ch7.adb (Cleanup_Record): Use the underlying type when
+	checking for components with tasks.
+
+2019-07-05  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnarl/s-osinte__linux.ads: Link with -lrt before -lpthread.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_pakd.adb (Expand_Bit_Packed_Element_Set): Add explicit
+	range checks when the index type of the bit-packed array is an
+	enumeration type with a non-standard representation,
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_res.adb (Is_Control_Flow_Statement): Delay statements
+	contain an expression, which in turn may have side effects and
+	affect the infinite recursion. As a result, delay statements
+	should not be treated specially.
+
+2019-07-05  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnarl/s-linux.ads, libgnarl/s-linux__alpha.ads,
+	libgnarl/s-linux__android.ads, libgnarl/s-linux__hppa.ads,
+	libgnarl/s-linux__mips.ads, libgnarl/s-linux__riscv.ads,
+	libgnarl/s-linux__sparc.ads: Fix typos in comments.
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_res.adb (Check_Infinite_Recursion): Reimplemented.
+	(Enclosing_Declaration_Or_Statement,
+	Invoked_With_Different_Arguments, Is_Conditional_Statement,
+	Is_Control_Flow_Statement, Is_Immediately_Within_Body,
+	Is_Raise_Idiom, Is_Raise_Statement, Is_Sole_Statement,
+	Preceded_By_Control_Flow_Statement,
+	Within_Conditional_Statement): New routines.
+
+2019-07-05  Javier Miranda  <miranda@adacore.com>
+
+	* exp_ch4.adb (Expand_N_Type_Conversion): Do not apply an
+	accessibility check when the conversion is an access to
+	class-wide interface type and it is an actual parameter.
+	* exp_ch6.adb (Expand_Call_Helper): Add documentation on the
+	accessibility level of an anonymous allocator defining the value
+	of an access parameter.
+	* sem_util.ads, sem_util.adb (Dynamic_Accessibility_Level): Add
+	support for an anonymous allocator whose type is that of a
+	stand-alone object of an anonymous access to object type.
+
+2019-07-05  Piotr Trojanek  <trojanek@adacore.com>
+
+	* einfo.ads, sem_res.adb: Typo fixes in comments.
+
+2019-07-05  Bob Duff  <duff@adacore.com>
+
+	* exp_ch6.adb (Is_Build_In_Place_Function): Narrow the check for
+	Has_Foreign_Convention to the imported case only.  If a
+	build-in-place function is exported, and called from Ada code,
+	build-in-place protocols should be used.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_util.adb (Encloing_Subprogram): If Enclosing_Dynamic_Scope
+	is a loop, continue climbing the scope stack to find the
+	enclosing subprogram.
+	(Gather_Components): Handle properly a choice in a record
+	aggregate that is given by a subtype with a static predicate.
+
+2019-07-05  Javier Miranda  <miranda@adacore.com>
+
+	* debug.adb (-gnatd.K): Leave available this switch.
+	* contracts.adb (Build_And_Analyze_Contract_Only_Subprograms):
+	Remove.
+	* scil_ll.ads, scil_ll.adb (Contract_Only_Body_Flag,
+	Contract_Only_Body_Nodes, Get_Contract_Only_Body,
+	Is_Contract_Only_Body, Set_Contract_Only_Body): Remove.
+
+2019-07-05  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* libgnat/a-strunb.ads: Import documentation from the RM
+
+2019-07-05  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* libgnat/a-strfix.ads: Import documentation from the RM
+
+2019-07-05  Yannick Moy  <moy@adacore.com>
+
+	* adabkend.adb (Scan_Back_End_Switches): Accept -Og and -Ofast
+	switches.
+
+2019-07-05  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* ali.adb: Relocate types Invocation_Construct_Record,
+	Invocation_Relation_Record, and Invocation_Signature_Record to
+	the body of ALI.  Relocate tables Invocation_Constructs,
+	Invocation_Relations, and Invocation_Signatures to the body of
+	ALI.  Remove type Body_Placement_Codes.  Add new types
+	Declaration_Placement_Codes, and
+	Invocation_Graph_Encoding_Codes.  Update the literals of type
+	Invocation_Graph_Line_Codes.
+	(Add_Invocation_Construct): Update the parameter profile. Add an
+	invocation construct built from all attributes provided.
+	(Add_Invocation_Relation): Update the parameter profile. Add an
+	invocation relation built from all attributes provided.
+	(Body_Placement): New routine.
+	(Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind):
+	Removed.
+	(Code_To_Declaration_Placement_Kind,
+	Code_To_Invocation_Graph_Encoding_Kind, Column,
+	Declaration_Placement_Kind_To_Code, Extra,
+	For_Each_Invocation_Construct, For_Each_Invocation_Relation,
+	Invocation_Graph_Encoding,
+	Invocation_Graph_Encoding_Kind_To_Code, Invoker, Kind, Line,
+	Locations, Name): New routine.
+	(Scan_Invocation_Construct_Line): Reimplement the scanning
+	mechanism.
+	(Scan_Invocation_Graph_Attributes_Line): New routine.
+	(Scan_Invocation_Graph_Line): Use a case statement to dispatch.
+	(Scan_Invocation_Relation_Line): Reimplement the scanning
+	mechanism.
+	(Scope): New routine.
+	(Set_Invocation_Graph_Encoding, Signature, Spec_Placement,
+	Target): New routine.
+	* ali.ads: Add new type Invocation_Graph_Encoding_Kind.  Add
+	component Invocation_Graph_Encoding to type Unit_Record.
+	Relocate various types and data structures to the body of ALI.
+	(Add_Invocation_Construct, Add_Invocation_Relation): Update the
+	parameter profile.
+	(Body_Placement): New routine.
+	(Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind):
+	Removed.
+	(Code_To_Declaration_Placement_Kind,
+	Code_To_Invocation_Graph_Encoding_Kind, Column,
+	Declaration_Placement_Kind_To_Code, Extra,
+	For_Each_Invocation_Construct, For_Each_Invocation_Relation,
+	Invocation_Graph_Encoding,
+	Invocation_Graph_Encoding_Kind_To_Code, Invoker, Kind, Line,
+	Locations, Name, Scope, Set_Invocation_Graph_Encoding,
+	Signature, Spec_Placement, Target): New routine.
+	* bindo.adb: Add with clause for Binde.  Add with and use
+	clauses for Debug.  Update the documentation.  Add new switches.
+	(Find_Elaboration_Order): Dispatch to the proper elaboration
+	mechanism.
+	* bindo-augmentors.adb:
+	Remove with and use clauses for GNAT and GNAT.Sets.  Remove
+	membership set VS.  Update the parameter profiles of most
+	routines to use better parameter names.  Update the
+	implementation of most routine to use the new parameter names.
+	Remove various redundant assertions.
+	* bindo-builders.adb: Use better names for instantiated data
+	structures. Update all references to these names.  Update the
+	parameter profiles of most routines to use better parameter
+	names.  Update the implementation of most routine to use the new
+	parameter names.
+	(Build_Library_Graph): Update the parameter profile. Update the
+	call to Create.
+	(Create_Vertex): Reimplemented.
+	(Declaration_Placement_Vertex): New routine.
+	* bindo-builders.ads (Build_Library_Graph): Update the parameter
+	profile and comment on usage.
+	* bindo-diagnostics.adb: Almost a new unit.
+	* bindo-diagnostics.ads: Add a use clause for
+	Bindo.Graphs.Invocation_Graphs.  Remove package
+	Cycle_Diagnostics.
+	(Diagnose_Circularities): New routine.
+	* bindo-elaborators.adb: Remove the with and use clauses for
+	Binderr and GNAT.Sets.  Remove the use clause for
+	Bindo.Diagnostics.Cycle_Diagnostics.  Remove membership set VS.
+	Update the parameter profiles of most routines to use better
+	parameter names.  Update the implementation of most routine to
+	use the new parameter names.  (Elaborate_Units_Common): Update
+	the parameter profile. Pass an infication to the library graph
+	builder whether the dynamic model is in effect.
+	(Elaborate_Units_Dynamic, Elaborate_Units_Static): Use
+	Diagnose_Circularities to provide diagnostics.
+	(Update_Successor): Use routine In_Same_Component to determine
+	whether the predecessor and successor reside in different
+	components.
+	* bindo-graphs.adb: Add with and use clauses for Butil, Debug,
+	Output, and Bindo.Writers.  Remove with and use clauses for
+	GNAT.Lists.  Update the parameter profiles of most routines to
+	use better parameter names.  Update the implementation of most
+	routine to use the new parameter names.  Remove various
+	redundant assertions.  Remove doubly linked list EL.  Add new
+	type Precedence_Kind.
+	(Add_Cycle): New routine.
+	(Add_Vertex): Update the parameter profile. Update the creation
+	of vertex attributes.
+	(Add_Vertex_And_Complement, Body_Vertex, Column,
+	Complementary_Vertex, Copy_Cycle_Path, Cycle_Kind_Of): New
+	routines.
+	(Destroy_Invocation_Graph_Edge, Destroy_Library_Graph_Cycle,
+	Destroy_Library_Graph_Edge, Extra, File_Name,
+	Find_All_Cycles_Through_Vertex, Find_All_Cycles_With_Edge,
+	Find_Cycles, Find_First_Lower_Precedence_Cycle,
+	Get_LGC_Attributes, Has_Next, Hash_Library_Graph_Cycle,
+	Hash_Library_Graph_Cycle_Attributes, Highest_Precedence_Cycle,
+	Highest_Precedence_Edge, In_Same_Component, Insert_And_Sort,
+	Invocation_Edge_Count, Invocation_Graph_Encoding,
+	Is_Cycle_Initiating_Edge, Is_Cyclic_Edge,
+	Is_Cyclic_Elaborate_All_Edge, Is_Cyclic_Elaborate_Body_Edge,
+	Is_Cyclic_Elaborate_Edge, Is_Cyclic_Forced_Edge,
+	Is_Cyclic_Invocation_Edge, Is_Cyclic_With_Edge,
+	Is_Dynamically_Elaborated, Is_Elaborate_All_Edge,
+	Is_Elaborate_Body_Edge, Is_Elaborate_Edge: New routines.
+	(Is_Existing_Predecessor_Successor_Relation): Removed.
+	(Is_Forced_Edge, Is_Invocation_Edge, Is_Recorded_Cycle,
+	Is_Recorded_Edge, Is_With_Edge, Iterate_Edges_Of_Cycle, Kind,
+	Length): New routine.
+	(Lib_Vertex): Removed.
+	(Line, Links_Vertices_In_Same_Component,
+	Maximum_Invocation_Edge_Count, Next, Normalize_And_Add_Cycle,
+	Normalize_Cycle_Path, Number_Of_Cycles, Path, Precedence,
+	Remove_Vertex_And_Complement, Sequence_Next_Cycle): New routines.
+	(Sequence_Next_IGE_Id): Renamed to Sequence_Next_Edge.
+	(Sequence_Next_IGV_Id): Renamed to Sequence_Next_Vertex.
+	(Sequence_Next_LGE_Id): Renamed to Sequence_Next_Edge.
+	(Sequence_Next_LGV_Id): Renamed to Sequence_Next_Vertex.
+	(Set_Is_Existing_Predecessor_Successor_Relation): Removed.
+	(Set_Is_Recorded_Cycle, Set_Is_Recorded_Edge,
+	Set_LGC_Attributes, Spec_Vertex, Trace_Cycle, Trace_Edge,
+	Trace_Eol, Trace_Vertex): New routines.
+	* bindo-graphs.ads: Add with and use clauses for Types and
+	GNAT.Lists.  Update the parameter profiles of most routines to
+	use better parameter names.  Update the implementation of most
+	routine to use the new parameter names.  Add the new
+	instantiated data structures IGE_Lists, IGV_Sets, LGC_Lists,
+	LGE_Lists, LGE_Sets, LGV_Sets, and RC_Sets.  Add new type
+	Library_Graph_Cycle_Id along with an empty and initial value.
+	Remove component Lib_Vertex and add new components Body_Vertex
+	and Spec_Vertex to type Invocation_Graph_Vertex_Attributes.  Add
+	new type Library_Graph_Cycle_Kind.  Add new iterators
+	All_Cycle_Iterator and Edges_Of_Cycle_Iterator.  Add new type
+	Library_Graph_Cycle_Attributes.  Add new components
+	Cycle_Attributes, Cycles, and Dynamically_Elaborated to type
+	Library_Graph_Attributes.
+	(Body_Vertex, Column, Destroy_Invocation_Graph_Edge,
+	Destroy_Library_Graph_Cycle_Attributes,
+	Destroy_Library_Graph_Edge, Extra, File_Name, Find_Cycles,
+	Has_Elaborate_All_Cycle, Has_Next, Hash_Library_Graph_Cycle,
+	Hash_Library_Graph_Cycle_Attributes, Highest_Precedence_Cycle,
+	In_Same_Component, Invocation_Edge_Count,
+	Invocation_Graph_Encoding, Is_Dynamically_Elaborated,
+	Is_Elaborate_All_Edge, Is_Elaborate_Body_Edge,
+	Is_Elaborate_Edge, Is_Forced_Edge, Is_Invocation_Edge,
+	Is_With_Edge, Iterate_All_Cycles, Iterate_Edges_Of_Cycle, Kind):
+	New routines.
+	(Length, Lib_Vertex, (Line, Next, Number_Of_Cycles, Present,
+	Same_Library_Graph_Cycle_Attributes, Spec_Vertex): New routines.
+	* bindo-units.adb (File_Name, Invocation_Graph_Encoding): New
+	routines.
+	* bindo-units.ads: Add new instantiated data structure
+	Unit_Sets.
+	(File_Name, Invocation_Graph_Encoding): New routine.
+	* bindo-validators.adb: Remove with and use clauses for GNAT and
+	GNAT.Sets.  Remove membership set US.  Update the parameter
+	profiles of most routines to use better parameter names.  Update
+	the implementation of most routine to use the new parameter
+	names.
+	(Validate_Cycle, Validate_Cycle_Path, Validate_Cycles,
+	Validate_Invocation_Graph_Vertex): Remove the validation of
+	component Lib_Vertex. Add the validation of components
+	Body_Vertex and Spec_Vertex.
+	(Write_Error): New routine.
+	* bindo-validators.ads (Validate_Cycles): New routine.
+	* bindo-writers.adb: Update the parameter profiles of most
+	routines to use better parameter names.  Update the
+	implementation of most routine to use the new parameter names.
+	(Write_Cycle, Write_Cyclic_Edge, Write_Cycles): New routines.
+	(Write_Invocation_Graph_Vertex): Remove the output of component
+	Lib_Vertex. Add the output of components Body_Vertex and
+	Spec_Vertex.
+	* bindo-writers.ads (Write_Cycles): New routine.
+	* debug.adb: Use binder switches -d_C and -d_P, add
+	documentation on their usage.
+	* gnatbind.adb: Remove with and use clauses for Binde.  Delegate
+	the choice of elaboration mechanism to Bindo.
+	* lib-writ.adb (Column, Extra, Invoker, Kind, Line, Locations,
+	Name, Placement, Scope, Signature, Target): Removed.
+	(Write_Invocation_Graph): Moved at the top level.
+	(Write_Invocation_Graph_Attributes): New routine.
+	(Write_Invocation_Relation, Write_Invocation_Signature): Moved
+	at the top level.
+	* lib-writ.ads: Add a documentation section on invocation graph
+	attributes.
+	* sem_elab.adb (Body_Placement_Of): New routine.
+	(Declare_Invocation_Construct): Update the call to
+	Add_Invocation_Construct.
+	(Declaration_Placement_Of_Node): New routine.
+	(Get_Invocation_Attributes): Correct the retrieval of the
+	enclosing subprogram where the postcondition procedure lives.
+	(Placement_Of, Placement_Of_Node): Removed.
+	(Record_Invocation_Graph): Record the encoding format used.
+	(Record_Invocation_Graph_Encoding): New routine.
+	(Record_Invocation_Relation): Update the call to
+	Add_Invocation_Relation.
+	(Spec_Placement_Of): Removed.
+	* libgnat/g-lists.ads, libgnat/g-lists.adb (Equal): New routine.
+
+2019-07-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* checks.adb (Apply_Predicate_Check): Except within the
+	subprogram body that defines the formal, do not apply predicate
+	check on a formal IN parameter: such a check is redundant and
+	its expansion can lead to out-of-scope references when it is
+	originates in a function call in a precondition,
+
+2019-07-05  Yannick Moy  <moy@adacore.com>
+
+	* sem_res.adb (Resolve_Call): Cannot inline in quantified
+	expressions.
+	* sem_util.adb, sem_util.ads (In_Quantified_Expression): New
+	function.
+
+2019-07-05  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_rm/standard_and_implementation_defined_restrictions.rst:
+	Fix typo.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-05  Bob Duff  <duff@adacore.com>
+
+	* exp_attr.adb (Input): Take the No_Stream_Optimizations
+	restriction into account.
+
+2019-07-05  Claire Dross  <dross@adacore.com>
+
+	* libgnat/a-cofove.ads, libgnat/a-cofove.adb: Definite formal
+	vectors are now always bounded so that they do not need to be
+	limited anymore.
+
+2019-07-05  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-traceb.ads, libgnat/g-traceb.adb (Call_Chain): New
+	function.
+
+2019-07-04  James Clarke  <jrtc27@debian.org>
+
+	* libgnarl/s-osinte__kfreebsd-gnu.ads (clockid_t): Make type
+	definition public.
+	(CLOCK_REALTIME): Make value public.
+
+2019-07-04  Javier Miranda  <miranda@adacore.com>
+
+	* exp_tss.adb (Init_Proc): Adding missing support for access to
+	subprograms and access to protected subprograms of non-default
+	C++ constructors.
+
+2019-07-04  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat1drv.adb (Adjust_Global_Switches): Use proper interface to
+	set the validity settings in CodePeer mode.
+	* par-load.adb (Load): Remove all code dealing with validity
+	settings.
+	* validsw.ads (Validity_Check_Copies): Alphabetize.
+	* validsw.adb (Reset_Validity_Check_Options): Set all options to
+	off.
+	(Save_Validity_Check_Options): Save all options.
+
+2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_ch3.adb, exp_ch4.adb, exp_ch4.ads, exp_ch5.adb,
+	exp_ch7.adb, exp_ch9.adb, exp_ch11.adb, exp_unst.adb,
+	rtsfind.ads, sem_attr.adb, sem_ch10.adb, sem_ch12.adb,
+	sem_ch13.adb, sem_dim.adb, sem_disp.adb, xref_lib.adb: Minor
+	reformatting.
+
+2019-07-04  Joffrey Huguet  <huguet@adacore.com>
+
+	* libgnarl/a-taside.ads: Add assertion policy to ignore
+	preconditions.
+	(Abort_Task, Is_Terminated, Is_Callable): Add preconditions.
+
+2019-07-04  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst: Fix
+	capitalization and parenthesis glitches.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch10.adb (Remove_Context_Clauses): Handle properly the
+	removal of a limited_with_clause which appears in the library
+	unit oF the main unit, when some other unit in the context has a
+	regular with_clause on the same unit, to prevent spurious
+	visibility errors in the subsequent analysis of pending instance
+	bodies.
+
+2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_elab.adb: Add new type Elaboration_Phase_Status along with
+	a global to keep track of the elaboration phase status.
+	Initialize all internal data structures to Nil for services
+	Elaborated_Units, Internal_Representation, and Scenario_Storage.
+	(Build_Call_Marker): Do not create a call marker when the
+	elaboration phase is not active.
+	(Build_Variable_Reference_Marker): Do not create a call marker
+	when the elaboration phase is not active.
+	(Check_Elaboration_Scenarios): Destroy all internal structures
+	when the elaboration phase does not have to run. Do not execute
+	when the elaboration phase is not active.
+	(Elaboration_Phase_Active): New routine.
+	(Finalize_All_Data_Structures): New routine.
+	(Initialize): Initialize all internal data structures and signal
+	that the elaboration phase has started.
+	(Initialize_All_Data_Structures): New routine.
+	(Initialize_Elaborated_Units): Initialize all internal data
+	structures.
+	(Initialize_Internal_Representation): Initialize all internal
+	data structures.
+	(Initialize_Scenario_Storage): Initialize all internal data
+	structures.
+	(Kill_Elaboration_Scenario): Do not execute when the elaboration
+	phase is not active.
+	(Set_Elaboration_Phase): New routine.
+	(Update_Elaboration_Scenario): Do not execute when the
+	elaboration phase is not active.
+
+2019-07-04  Gary Dismukes  <dismukes@adacore.com>
+
+	* sem_ch6.adb (Analyze_Subprogram_Body_Helper): The special
+	treatment of calling Mask_Unfrozen_Types must also be done in
+	the case of an Ignored_Ghost_Entity, because Expander_Active is
+	False in that case.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* sem_prag.adb (Check_Library_Level_Entity): Update for new rule
+	on SPARK_Mode.
+
+2019-07-04  Justin Squirek  <squirek@adacore.com>
+
+	* sem_disp.adb (Check_Controlling_Formals): Obtain the full view
+	before type comparison.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch4.ads, exp_ch4.adb (Build_Eq_Call): New visible
+	subprogram, extracted from Expand_Composite_Equality, to handle
+	properly the composition of equality for variant record types.
+	* exp_ch3.adb (MAke_Eq_If): Use Build_Eq_Call for each
+	component, to handle properly the case of a component with a
+	user-defined equality. Revert to predefined equality if the
+	user-defined operation is abstract, to maintain compatibility
+	with older versions,
+
+2019-07-04  Justin Squirek  <squirek@adacore.com>
+
+	* exp_ch3.adb (Build_Initialization_Call): Fixup
+	*_skip_null_excluding_check argument to handle new default.
+	(Init_Formals): Make *_skip_null_excluding_check formal default
+	to False
+	* exp_ch4.adb (Expand_N_Allocator): Add comment to note heavy
+	code duplication
+
+2019-07-04  Bob Duff  <duff@adacore.com>
+
+	* sem_ch3.adb (Access_Definition): Do not create a master unless
+	Tasking_Allowed. Otherwise, this fails on restricted runtimes.
+
+2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_util.adb (Propagate_DIC_Attributes): Do not propagate the
+	Default_Initial_Condition attributes to an incomplete type.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_attr.adb (Check_Array_Type): An array type attribute such
+	as 'First can be applied to an unconstrained array tyope when
+	the attribute reference appears within an aspect specification
+	and the prefix is a current instance, given that the prefix of
+	the attribute will become a formal of the subprogram that
+	implements the aspect (typically a predicate check).
+
+2019-07-04  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_util.adb (Yields_Synchronized_Object): Fix typos in
+	comments.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* sem_util.adb (Yields_Synchronized_Object): Adapt to new SPARK
+	rule.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Check_Statement): Only check permission of
+	object in extended return when it is of a deep type.
+
+2019-07-04  Justin Squirek  <squirek@adacore.com>
+
+	* sem_ch12.adb (Perform_Appropriate_Analysis): Added for
+	selecting which type of analysis based on wheither the
+	instantiation is a generic at the library-level. In which case
+	expansion during analysis.
+	(Preanalyze_Actuals): Modify calls to Analyze to use the new
+	routine.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_unst.adb: Handle conditional expressions.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Check_Package_Spec, Check_Package_Body): Only
+	analyze parts of the code marked in SPARK.
+
+2019-07-04  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* erroutc.adb, exp_aggr.adb, inline.adb, opt.adb, sem_ch3.adb:
+	Minor reformatting.
+
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Explanation, Get_Expl): New functions to get
+	the explanation for a permission mismatch.
+	(Perm_Error, Perm_Mismatch, Perm_Error_Loop_Exit): Take
+	explanation into account for issuing a more precise error
+	message.
+	(Set_Perm_Prefixes, Set_Perm_Extensions,
+	Set_Perm_Extensions_Move): Pass suitable argument for the
+	explanation node.
+
+2019-07-04  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_aggr.adb (In_Place_Assign_OK): Moved to top level and add
+	support for record aggregates.
+	(Component_Check): Use Is_CCG_Supported_Aggregate instead of a
+	similar local predicate.
+	(Convert_To_Assignments): Take advantage of In_Place_Assign_OK
+	predicate when possible.
+	(Is_CCG_Supported_Aggregate): Return False for records with
+	representation clauses and fix the logic for dealing with nested
+	aggregates.
+
+2019-07-04  Piotr Trojanek  <trojanek@adacore.com>
+
+	* opt.adb (Set_Config_Switches): Keep assertions policy as
+	enabled when analysing internal units in GNATprove mode.
+
+2019-07-04  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_ch4.adb (Expand_Short_Circuit_Operator): Strip
+	N_Variable_Reference_Marker when checking for the presence of
+	actions.
+
+2019-07-04  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_aggr.adb (Check_Component): Take into account type
+	conversions.
+
+2019-07-04  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* doc/gnat_ugn/platform_specific_information.rst: Document
+	Windows socket timeout particularity.
+	* gnat_ugn.texi: Regenerate.
+	* gsocket.h: Include versionhelpers.h.
+	* socket.c (__gnat_minus_500ms): New function.
+	* libgnat/g-sothco.ads (Minus_500ms_Windows_Timeout): New
+	imported function.
+	* libgnat/g-socket.adb (Set_Socket_Option): Refactor to remove
+	500ms from the requested timeout only on old Windows version.
+
+2019-07-04  Thomas Quinot  <quinot@adacore.com>
+
+	* get_scos.adb: Remove bogus, dead code.
+
+2019-07-04  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_dim.adb (Analyze_Dimension_Array_Aggregate): If the
+	component is an entity name, its dimensions are those of its
+	type.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Document new flags in
+	GNATpp.
+
+2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* binde.adb: Remove with clause for System.OS_Lib.
+	(Force_Elab_Order): Refactor the majority of the code in Butil.
+	Use the new forced units iterator to obtain unit names.
+	* bindo-builders.adb: Add with and use clauses for Binderr,
+	Butil, Opt, Output, Types, GNAT, and GNAT.Dynamic_HTables.  Add
+	a hash table which maps units to line number in the forced
+	elaboration order file.
+	(Add_Unit): New routine.
+	(Build_Library_Graph): Create forced edges between pairs of
+	units listed in the forced elaboration order file.
+	(Create_Forced_Edge, Create_Forced_Edges, Destroy_Line_Number,
+	Duplicate_Unit_Error, Hash_Unit, Internal_Unit_Info,
+	Is_Duplicate_Unit, Missing_Unit_Info): New routines.
+	* bindo-graphs.adb (Is_Internal_Unit, Is_Predefined_Unit):
+	Refactor some of the behavior to Bindo-Units.
+	* bindo-graphs.ads: Enable the enumeration literal for forced
+	edges.
+	* bindo-units.adb, bindo-units.ads (Is_Internal_Unit,
+	Is_Predefined_Unit): New routines.
+	* butil.adb: Add with and use clauses for Opt, GNAT, and
+	System.OS_Lib.  Add with clause for Unchecked_Deallocation.
+	(Has_Next, Iterate_Forced_Units, Next, Parse_Next_Unit_Name,
+	Read_Forced_Elab_Order_File): New routines.
+	* butil.ads: Add with and use clauses for Types.  Add new
+	iterator over the units listed in the forced elaboration order
+	file.
+	(Has_Next, Iterate_Forced_Units, Next): New routine.
+	* namet.adb, namet.ads (Present): New routine.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* sem_ch3.adb (Access_Definition): The code was creating a
+	master in the case where the designated type is a class-wide
+	interface type. Create a master in the noninterface case as
+	well. That is, create a master for all limited class-wide types.
+
+2019-07-03  Yannick Moy  <moy@adacore.com>
+
+	* erroutc.adb (Sloc_In_Range): New function to determine whether
+	the range of a pragma Warnings covers a location, taking
+	instantiations into account.
+
+2019-07-03  Johannes Kanig  <kanig@adacore.com>
+
+	* osint.ads, osint.adb (Get_First_Main_File_Name): New routine
+	to access the first file provided on the command line.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* inline.adb (Process_Formals_In_Aspects): New procedure within
+	Expand_Inlined_Call, to perform a replacement of references to
+	formals that appear in aspect specifications within the body
+	being inlined.
+
+2019-07-03  Justin Squirek  <squirek@adacore.com>
+
+	* sem_ch8.adb (Analyze_Object_Renaming): Add call to search for
+	the appropriate actual subtype of the object renaming being
+	analyzed.
+	(Check_Constrained_Object): Minor cleanup.
+
+2019-07-03  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb (Get_Observed_Or_Borrowed_Expr): New function to
+	return go through traversal function call.
+	(Check_Type): Consistently use underlying type.
+	(Get_Perm): Adapt for case of elaboration code where variables
+	are not declared in the environment. Remove incorrect handling
+	of borrow and observe.
+
+2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* inline.adb (Build_Return_Object_Formal): New routine.
+	(Can_Split_Unconstrained_Function): Code clean up.
+	(Copy_Formals,Copy_Return_Object): New routines.
+	(Split_Unconstrained_Function): Code clean up and refactoring.
+
+2019-07-03  Gary Dismukes  <dismukes@adacore.com>
+
+	* bindo-augmentors.adb, bindo-augmentors.ads,
+	bindo-builders.ads, bindo-elaborators.adb, sem_ch12.adb,
+	sem_ch13.adb, sem_spark.adb, sinfo.ads: Minor editorial
+	corrections and reformatting.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* sem_warn.adb (Check_Infinite_Loop_Warning): Avoid the warning
+	if an Iterator_Specification is present.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* doc/gnat_ugn/gnat_utility_programs.rst: Document default
+	new-line behavior.
+
+2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* ali.adb: Add with and use clauses for GNAT,
+	GNAT.Dynamic_HTables, and Snames.  Add a map from invocation
+	signature records to invocation signature ids.  Add various
+	encodings of invocation-related attributes.  Sort and update
+	table Known_ALI_Lines.
+	(Add_Invocation_Construct, Add_Invocation_Relation,
+	Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind,
+	Code_To_Invocation_Construct_Kind, Code_To_Invocation_Kind,
+	Code_To_Invocation_Graph_Line_Kind, Destroy, Hash): New
+	routines.
+	(Initialize_ALI): Sort the initialization sequence. Add
+	initialization for all invocation-related tables.
+	(Invocation_Construct_Kind_To_Code,
+	Invocation_Graph_Line_Kind_To_Code, Invocation_Kind_To_Code,
+	Invocation_Signature_Of, Present): New routines.
+	(Scan_ALI): Add the default values for invocation-related ids.
+	Scan invocation graph lines.
+	(Scan_Invocation_Graph_Line): New routine.
+	* ali.ads: Add with clause for GNAT.Dynamic_Tables.  Add types
+	for invocation constructs, relations, and signatures.  Add
+	tables for invocation constructs, relations, and signatures.
+	Update Unit_Record to capture invocation-related ids.  Relocate
+	table Unit_Id_Tables and subtypes Unit_Id_Table, Unit_Id_Array
+	from Binde.
+	(Add_Invocation_Construct, Add_Invocation_Relation,
+	Body_Placement_Kind_To_Code, Code_To_Body_Placement_Kind,
+	Code_To_Invocation_Construct_Kind, Code_To_Invocation_Kind,
+	Code_To_Invocation_Graph_Line_Kind,
+	Invocation_Construct_Kind_To_Code,
+	Invocation_Graph_Line_Kind_To_Code, Invocation_Kind_To_Code,
+	Invocation_Signature_Of, Present): New routines.
+	* binde.adb: Add with and use clause for Types.  Add use clause
+	for ALI.Unit_Id_Tables;
+	* binde.ads: Relocate table Unit_Id_Tables and subtypes
+	Unit_Id_Table, Unit_Id_Array to ALI.
+	* bindgen.adb: Remove with and use clause for ALI.
+	* bindgen.ads: Remove with and use clause for Binde.  Add with
+	and use clause for ALI.
+	* bindo.adb,  bindo.ads, bindo-augmentors.adb,
+	bindo-augmentors.ads, bindo-builders.adb, bindo-builders.ads,
+	bindo-diagnostics.adb, bindo-diagnostics.ads,
+	bindo-elaborators.adb, bindo-elaborators.ads, bindo-graphs.adb,
+	bindo-graphs.ads, bindo-units.adb, bindo-units.ads,
+	bindo-validators.adb, bindo-validators.ads, bindo-writers.adb,
+	bindo-writers.ads: New units.
+	* debug.adb: Use and describe GNAT debug switches -gnatd_F and
+	-gnatd_G.  Add GNATbind debug switches in the ranges dA .. dZ,
+	d.a .. d.z, d.A .. d.Z, d.1 .. d.9, d_a .. d_z, d_A .. d_Z, and
+	d_1 .. d_9.  Use and describe GNATbind debug switches -d_A,
+	-d_I, -d_L, -d_N, -d_O, -d_T, and -d_V.
+	* exp_util.adb, exp_util.ads (Exceptions_OK): Relocate to
+	Sem_Util.
+	* gnatbind.adb: Add with and use clause for Bindo.  Use the new
+	Bindo elaboration order only when -d_N is in effect.
+	* lib-writ.adb
+	(Column, Extra, Invoker, Kind, Line, Locations, Name, Placement,
+	Scope, Signature, Target): New routines.
+	(Write_ALI): Output all invocation-related data.
+	(Write_Invocation_Graph): New routine.
+	* lib-writ.ads: Document the invocation graph ALI line.
+	* namet.adb, namet.ads (Present): New routines.
+	* sem_ch8.adb (Find_Direct_Name): Capture the status of
+	elaboration checks and warnings of an identifier.
+	(Find_Expanded_Name): Capture the status of elaboration checks
+	and warnings of an expanded name.
+	* sem_ch12.adb (Analyze_Generic_Package_Declaration): Ensure
+	that invocation graph-related data within the body of the main
+	unit is encoded in the ALI file.
+	(Analyze_Generic_Subprogram_Declaration): Ensure that invocation
+	graph-related data within the body of the main unit is encoded
+	in the ALI file.
+	(Analyze_Package_Instantiation): Perform minimal decoration of
+	the instance entity.
+	(Analyze_Subprogram_Instantiation): Perform minimal decoration
+	of the instance entity.
+	* sem_elab.adb: Perform heavy refactoring of all code. The unit
+	is now split into "services" which specialize in one area of ABE
+	checks.  Add processing in order to capture invocation-graph
+	related attributes of the main unit, and encode them in the ALI
+	file.  The Processing phase can now operate in multiple modes,
+	all described by type Processing_Kind.  Scenarios and targets
+	are now distinct at the higher level, and carry their own
+	representations. This eliminates the need to constantly
+	recompute their attributes, and offers the various processors a
+	uniform interface.  The various initial states of the Processing
+	phase are now encoded using type Processing_In_State, and
+	xxx_State constants.
+	* sem_elab.ads: Update the literals of type
+	Enclosing_Level_Kind.  Add Inline pragmas on several routines.
+	* sem_prag.adb (Process_Inline): Ensure that invocation
+	graph-related data within the body of the main unit is encoded
+	in the ALI file.
+	* sem_util.adb (Enclosing_Generic_Body, Enclosing_Generic_Unit):
+	Code clean up.
+	(Exceptions_OK): Relocated from Sem_Util.
+	(Mark_Save_Invocation_Graph_Of_Body): New routine.
+	* sem_util.ads (Exceptions_OK): Relocated from Sem_Util.
+	(Mark_Save_Invocation_Graph_Of_Body): New routine.
+	* sinfo.adb (Is_Elaboration_Checks_OK_Node): Now applicable to
+	N_Variable_Reference_Marker.
+	(Is_Elaboration_Warnings_OK_Node): Now applicable to
+	N_Expanded_Name, N_Identifier, N_Variable_Reference_Marker.
+	(Is_Read): Use Flag4.
+	(Is_SPARK_Mode_On_Node): New applicable to
+	N_Variable_Reference_Marker.
+	(Is_Write): Use Flag5.
+	(Save_Invocation_Graph_Of_Body): New routine.
+	(Set_Is_Elaboration_Checks_OK_Node): Now applicable to
+	N_Variable_Reference_Marker.
+	(Set_Is_Elaboration_Warnings_OK_Node): Now applicable to
+	N_Expanded_Name, N_Identifier, N_Variable_Reference_Marker.
+	(Set_Is_SPARK_Mode_On_Node): New applicable to
+	N_Variable_Reference_Marker.
+	(Set_Save_Invocation_Graph_Of_Body): New routine.
+	* sinfo.ads: Update the documentation of attributes
+	Is_Elaboration_Checks_OK_Node, Is_Elaboration_Warnings_OK_Node,
+	Is_SPARK_Mode_On_Node.  Update the flag usage of attributes
+	Is_Read, Is_Write.  Add attribute Save_Invocation_Graph_Of_Body
+	and update its occurrence in nodes.
+	(Save_Invocation_Graph_Of_Body): New routine along with pragma
+	Inline.
+	(Set_Save_Invocation_Graph_Of_Body): New routine along with
+	pragma Inline.
+	* switch-b.adb (Scan_Binder_Switches): Refactor the scanning of
+	debug switches.
+	(Scan_Debug_Switches): New routine.
+	* libgnat/g-dynhta.adb, libgnat/g-dynhta.ads (Contains): New routine.
+	* libgnat/g-graphs.adb (Associate_Vertices): Update the use of
+	Component_Vertex_Iterator.
+	(Contains_Component, Contains_Edge, Contains_Vertex, Has_Next):
+	Reimplemented.
+	(Iterate_Component_Vertices): New routine.
+	(Iterate_Vertices): Removed.
+	(Next): Update the parameter profile.
+	(Number_Of_Component_Vertices, Number_Of_Outgoing_Edges): New
+	routines.
+	* libgnat/g-graphs.ads: Update the initialization of
+	No_Component.  Add type Component_Vertex_Iterator.  Remove type
+	Vertex_Iterator.
+	(Has_Next): Add new versions and remove old ones.
+	(Iterate_Component_Vertices): New routine.
+	(Iterate_Vertices): Removed.
+	(Next): Add new versions and remove old ones.
+	(Number_Of_Component_Vertices, Number_Of_Outgoing_Edges): New
+	routines.
+	* libgnat/g-sets.adb (Contains): Reimplemented.
+	* gcc-interface/Make-lang.in (GNATBIND_OBJS): Add
+	GNAT.Dynamic_HTables, GNAT.Graphs and Bindo units.
+	* rtsfind.ads: Remove extra space.
+
+2019-07-03  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb: Add support for locally borrowing and observing
+	a path.
+	(Get_Root_Object): Add parameter Through_Traversal to denote
+	when we are interesting in getting to the traversed parameter.
+	(Is_Prefix_Or_Almost): New function to support detection of
+	illegal access to borrowed or observed paths.
+	(Check_Pragma): Add analysis of assertion pragmas.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Build_Predicate_Functions): In a generic context
+	we do not build the bodies of predicate fuctions, but the
+	expression in a static predicate must be elaborated to allow
+	case coverage checking within the generic unit.
+	(Build_Discrete_Static_Predicate): In a generic context, return
+	without building function body once the
+	Static_Discrete_Predicate expression for the type has been
+	constructed.
+
+2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* bindgen.adb, inline.adb, layout.adb, sem_ch12.adb,
+	sem_ch13.adb, sem_ch7.adb, styleg.adb: Minor reformatting.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* par-ch3.adb (P_Defining_Identifier): Call
+	Check_Defining_Identifier_Casing.
+	* style.ads, styleg.ads, styleg.adb
+	(Check_Defining_Identifier_Casing): New procedure to check for
+	mixed-case defining identifiers.
+	* stylesw.ads, stylesw.adb (Style_Check_Mixed_Case_Decls): New
+	flag for checking for mixed-case defining identifiers.
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst:
+	Document new feature.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst
+	(Warning message control): Document that -gnatw.z/Z apply to
+	array types.
+	* freeze.adb (Freeze_Entity): Give -gnatw.z warning for array
+	types as well, but not if the specified alignment is the minimum
+	one.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-03  Bob Duff  <duff@adacore.com>
+
+	* einfo.ads, exp_util.adb, layout.ads, sinfo.ads: Spell "laid"
+	correctly.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch13.adb (Analyze_Attribute_Definition_Clause): No error
+	message on attribute applied to a renaming when the renamed
+	object is an aggregate (from code reading).
+	(Check_Aspect_At_End_Of_Declarations): In a generic context
+	where freeze nodes are not generated, the original expression
+	for an aspect may need to be analyzed to precent spurious
+	conformance errors when compared with the expression that is
+	anakyzed at the end of the current declarative list.
+
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* layout.adb (Layout_Type): Do not set the component size of an
+	array with a scalar component if the component type is
+	overaligned.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* inline.adb (Make_Loop_Labels_Unique): New procedure to modify
+	the source code of subprograms that are inlined by the
+	front-end, to prevent accidental duplication between loop labels
+	in the inlined code and the code surrounding the inlined call.
+
+2019-07-03  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* doc/gnat_ugn/elaboration_order_handling_in_gnat.rst: Update
+	the section on resolving elaboration circularities to eliminate
+	certain combinations of switches which together do not produce
+	the desired effect and confuse users.
+	* gnat_ugn.texi: Regenerate.
+
+2019-07-03  Arnaud Charlet  <charlet@adacore.com>
+
+	* bindgen.adb (Gen_Main): Disable generation of reference to
+	Ada_Main_Program_Name for CCG.
+	* bindusg.adb (Display): Add -G to the command-line usage for
+	gnatbind.
+	* opt.ads (Generate_C_Code): Update comment.
+	* switch-b.adb (Scan_Binder_Switches): Add handling for -G.
+
+2019-07-03  Arnaud Charlet  <charlet@adacore.com>
+
+	* sem_ch7.adb (Has_Referencer): Do not consider inlined
+	subprograms when generating C code, which allows us to generate
+	static inline subprograms.
+
+2019-07-03  Justin Squirek  <squirek@adacore.com>
+
+	* sem_ch6.adb (Check_Conformance): Add expression checking for
+	constant modifiers in anonymous access types (in addition to
+	"non-null" types) so that they are considered "matching" for
+	subsequent conformance tests.
+
+2019-07-03  Arnaud Charlet  <charlet@adacore.com>
+
+	* doc/gnat_rm/standard_and_implementation_defined_restrictions.rst:
+	Clarify wording on No_Multiple_Elaboration.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-03  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch8.adb (Find_Selected_Component): If the prefix is the
+	current instance of a type or subtype, complete the resolution
+	of the name by finding the component of the type denoted by the
+	selector name.
+
+2019-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/gnat_rm/interfacing_to_other_languages.rst (Interfacing to C):
+	Document that boolean types with convention C now map to C99 bool.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-03  Javier Miranda  <miranda@adacore.com>
+
+	* exp_attr.adb (Expand_Min_Max_Attribute): Code cleanup:
+	removing code that it is now never executed in the CCG compiler
+	(dead code).
+
+2019-07-02  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* libgnat/system-darwin-ppc.ads: Set Stack_Check_Probes True for
+	PPC Darwin.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch12.adb (Is_Defaulted): New predicate in
+	Check_Formal_Package_Intance, to skip the conformance of checks
+	on parameters of a formal package that are defaulted,
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* checks.adb, exp_ch9.adb, exp_unst.adb, sem_ch4.adb,
+	sem_prag.adb, sem_spark.adb: Minor reformatting.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_attr.adb (Analyze_Attribute, case Enum_Rep): Allow prefix
+	of attribute to be an attribute reference of a discrete type.
+
+2019-07-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem_ch12.adb (Analyze_Subprogram_Instantiation): Move up
+	handling of Has_Pragma_Inline_Always and deal with
+	Has_Pragma_No_Inline.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch3.adb (Build_Derived_Record_Type): If the parent type is
+	declared as a subtype of a private type with an inherited
+	discriminant constraint, its generated full base appears as a
+	record subtype, so we need to retrieve its oen base type so that
+	the inherited constraint can be applied to it.
+
+2019-07-01  Yannick Moy  <moy@adacore.com>
+
+	* sem_spark.adb: Completely rework the algorithm for ownership
+	checking, as the rules in SPARK RM have changed a lot.
+	* sem_spark.ads: Update comments.
+
+2019-07-01  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* gsocket.h (Has_Sockaddr_Len): Use the offset of sin_family offset in
+	the sockaddr_in structure to determine the existence of length field
+	before the sin_family.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_prag.adb (Analyze_Pragma, case Weak_External): Pragma only
+	applies to entities with run-time addresses, not to types.
+
+2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
+
+	* einfo.adb, sem_ch7.adb, sem_prag.adb, sem_util.adb: Update
+	references to the SPARK RM after the removal of Rule 7.1.4(5).
+
+2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sysdep.c: Cleanup references to LynuxWorks in docs and
+	comments.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* checks.adb (Insert_Valid_Check): Do not apply validity check
+	to variable declared within a protected object that uses the
+	Lock_Free implementation, to prevent unwarranted constant
+	folding, because entities within such an object msut be treated
+	as volatile.
+
+2019-07-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* exp_ch9.adb (Check_Inlining): Deal with Has_Pragma_No_Inline.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_unst.adb (Visit_Node, Check_Static_Type): Improve the
+	handling of private and incomplete types whose full view is an
+	access type, to detect additional uplevel references in dynamic
+	bounds. This is relevant to N_Free_Statement among others that
+	manipulate types whose full viww may be an access type.
+
+2019-07-01  Pat Rogers  <rogers@adacore.com>
+
+	* doc/gnat_rm/representation_clauses_and_pragmas.rst: Correct
+	size indicated for R as a component of an array.
+	* gnat_rm.texi: Regenerate.
+
+2019-07-01  Justin Squirek  <squirek@adacore.com>
+
+	* libgnat/s-win32.ads: Add definition for ULONG, modify
+	OVERLAPPED type, and add appropriate pragmas.
+
+2019-07-01  Bob Duff  <duff@adacore.com>
+
+	* gnat1drv.adb (gnat1drv): Call Write_ALI if the main unit is
+	ignored-ghost.
+
+2019-07-01  Yannick Moy  <moy@adacore.com>
+
+	* sem_ch4.adb (Operator_Check): Refine error message.
+
+2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
+
+	* libgnat/a-calend.ads: Revert "Global => null" contracts on
+	non-pure routines.
+
+2019-07-01  Piotr Trojanek  <trojanek@adacore.com>
+
+	* exp_attr.adb, libgnat/g-graphs.ads: Fix typos in comments:
+	componant -> component.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* libgnat/g-graphs.adb: Use type Directed_Graph rather than
+	Instance in various routines.
+	* libgnat/g-graphs.ads: Change type Instance to Directed_Graph.
+	Update various routines that mention the type.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* libgnat/g-sets.adb: Use type Membership_Set rathern than
+	Instance in various routines.
+	* libgnat/g-sets.ads: Change type Instance to Membership_Set.
+	Update various routines that mention the type.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* libgnat/g-lists.adb: Use type Doubly_Linked_List rather than
+	Instance in various routines.
+	* libgnat/g-lists.ads: Change type Instance to
+	Doubly_Linked_List. Update various routines that mention the
+	type.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* libgnat/g-dynhta.adb: Use type Dynamic_Hash_Table rather than
+	Instance in various routines.
+	* libgnat/g-dynhta.ads: Change type Instance to
+	Dynamic_Hash_Table. Update various routines that mention the
+	type.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_attr.adb, exp_ch7.adb, exp_unst.adb, sem_ch3.adb,
+	sem_util.adb, uintp.adb, uintp.ads: Minor reformatting.
+
+2019-07-01  Javier Miranda  <miranda@adacore.com>
+
+	* exp_attr.adb (Expand_Min_Max_Attribute): Disable expansion of
+	'Min/'Max on integer, enumeration, fixed point and floating
+	point types since the CCG backend now provides in file
+	standard.h routines to support it.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* impunit.adb: Add GNAT.Graphs to list Non_Imp_File_Names_95.
+	* Makefile.rtl, gcc-interface/Make-lang.in: Register unit
+	GNAT.Graphs.
+	* libgnat/g-dynhta.adb: Various minor cleanups (use Present
+	rather than direct comparisons).
+	(Delete): Reimplement to use Delete_Node.
+	(Delete_Node): New routine.
+	(Destroy_Bucket): Invoke the provided destructor.
+	(Present): New routines.
+	* libgnat/g-dynhta.ads: Add new generic formal Destroy_Value.
+	Use better names for the components of iterators.
+	* libgnat/g-graphs.adb, libgnat/g-graphs.ads: New unit.
+	* libgnat/g-lists.adb: Various minor cleanups (use Present
+	rather than direct comparisons).
+	(Delete_Node): Invoke the provided destructor.
+	(Present): New routine.
+	* libgnat/g-lists.ads: Add new generic formal Destroy_Element.
+	Use better names for the components of iterators.
+	(Present): New routine.
+	* libgnat/g-sets.adb, libgnat/g-sets.ads (Destroy, Preset,
+	Reset): New routines.
+
+2019-07-01  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	* libgnat/g-sothco.adb (Get_Address): Fix the case when AF_INET6
+	is not defined.
+
+2019-07-01  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_attr.adb (Expand_Attribute_Reference, case Invalid_Value):
+	Resolve result of call to Get_Simple_Init_Val, which may be a
+	conversion of a literal.
+
+2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* freeze.adb (Freeze_Expression): Remove the horrible useless
+	name hiding of N. Insert the freeze nodes generated by the
+	expression prior to the expression when the nearest enclosing
+	scope is transient.
+
+2019-07-01  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* doc/gnat_ugn/building_executable_programs_with_gnat.rst: Fix
+	formatting issues in the -gnatR section.
+	* gnat_ugn.texi: Regenerate.
+
+2019-06-30  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gnatlink.adb (Link_Step): Remove duplicate -static-libgcc switches.
+	Push -shared-libgcc explicitly, when it is the target default (unless
+	overidden by the static flag).
+	When the user has put an instance of shared/static-libgcc do not push
+	a duplicate of this.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity): Beep up comment on SAVED,
+	and tweak comment on the assertion about the scopes of Itypes.  Do not
+	skip the regular processing for Itypes that are E_Record_Subtype with
+	a Cloned_Subtype.  Get the Cloned_Subtype for every E_Record_Subtype
+	if the type is dummy and hasn't got its own freeze node.
+	<E_Record_Subtype>: Save again the DECL of the Cloned_Subtype, if any.
+	<E_Access_Subtype>: Save again the DECL of the equivalent type.
+	(Gigi_Equivalent_Type) <E_Access_Subtype>: New case.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (unchecked_convert): Tweak comment.  Only skip
+	dereferences when padding to have the same size on both sides.  Do it
+	for destination types with self-referential size too.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Type>: If the
+	type requires strict alignment, then set the RM size to the type size.
+	Rework handling of alignment and sizes of tagged types in ASIS mode.
+	(validate_size): Rename local variable and remove special handling for
+	strict-alignment types.
+	* gcc-interface/utils.c (finish_record_type): Constify local variables
+	and use properly typed constants.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_field): Rework error messages for
+	fields requiring strict alignment, add explicit test on Storage_Unit
+	for position and size, and mention type alignment for position.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (mark_visited_r): Set TYPE_SIZES_GIMPLIFIED on
+	the main variant of a type, if any.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (set_nonaliased_component_on_array_type): Add
+	missing guard for the presence of TYPE_CANONICAL.
+	(set_reverse_storage_order_on_array_type): Likewise.
+
+2019-06-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/gigi.h (make_packable_type): Remove default value.
+	(value_factor_p): Tweak prototype.
+	* gcc-interface/decl.c (gnat_to_gnu_entity): Add comment.
+	(gnat_to_gnu_component_type): Likewise.
+	(gnat_to_gnu_field): Likewise.  Fetch the position of the field earlier
+	and simplify the condition under which the type is packed.  Declare
+ 	local variable is_bitfield.  Pass 1 as max_align to make_packable_type
+	if it is set to true.
+	(copy_and_substitute_in_layout): Pass 0 to make_packable_type.
+	* gcc-interface/utils.c (make_packable_array_type): New function.
+	(make_packable_type): Use it to rewrite the type of array field.
+	(maybe_pad_type): Pass align parameter to make_packable_type.
+	(create_field_decl): Minor tweaks.
+	(value_factor_p): Assert that FACTOR is a power of 2 and replace the
+	modulo computation by a masking operation.
+
+2019-06-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity): Remove superfluous test
+	in previous change.
+	* gcc-interface/gigi.h (maybe_character_type): Fix formatting.
+	(maybe_character_value): Likewise.
+
+2019-06-24  Jan Hubicka  <jh@suse.cz>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity): Check that
+	type is array or integer prior checking string flag.
+	* gcc-interface/gigi.h (maybe_character_type): Likewise.
+	(maybe_character_value): Likewise.
+
+2019-06-24  Martin Sebor  <msebor@redhat.com>
+
+	* gcc-interface/utils.c (handle_nonnull_attribute): Quote attribute
+	name.
+
+2019-06-18  Arnaud Charlet  <charlet@adacore.com>
+
+	PR ada/80590
+	* sem_ch5.adb (Analyze_Loop_Statement): Avoid exception propagation
+	during normal processing.
+
+2019-06-17  Arnaud Charlet  <charlet@adacore.com>
+
+	PR ada/80590
+	* exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two
+	conditions to avoid a unnecessary exception propagation in the default
+	case.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (handle_stack_protect_attribute): Move around.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/gnat_rm/implementation_defined_pragmas.rst (Machine_Attribute):
+	Document additional optional parameters.
+	* sem_prag.adb (Analyze_Pragma) <Pragma_Machine_Attribute>: Accept
+	more than one optional parameter.
+	* gcc-interface/decl.c (prepend_one_attribute_pragma): Alphabetize
+	the list of supported pragmas.  Simplify the handling of parameters
+	and add support for more than one optional parameter.
+	* gcc-interface/utils.c (attr_cold_hot_exclusions): New constant.
+	(gnat_internal_attribute_table): Add entry for no_icf, noipa, flatten,
+	used, cold, hot, target and target_clones.
+	(begin_subprog_body): Do not create the RTL for the subprogram here.
+	(handle_noicf_attribute): New static function.
+	(handle_noipa_attribute): Likewise.
+	(handle_flatten_attribute): Likewise.
+	(handle_used_attribute): Likewise.
+	(handle_cold_attribute): Likewise.
+	(handle_hot_attribute): Likewise.
+	(handle_target_attribute): Likewise.
+	(handle_target_clones_attribute): Likewise.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (lvalue_required_for_attribute_p): Return 0
+	for 'Size too.
+	(Identifier_to_gnu): Use the actual subtype for a reference to a
+	packed array in a return statement.
+	(Attribute_to_gnu) <Attr_Size>: Do not strip VIEW_CONVERT_EXPRs from
+	the prefix in every case.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (gnat_to_gnu): Remove superfluous tests on
+	Backend_Overflow_Checks_On_Target and rework comments.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (walk_nesting_tree): New static function.
+	(finalize_nrv): Use it to walk the entire nesting tree.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Subtype>: Remove
+	obsolete test on Is_For_Access_Subtype.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (components_to_record): Set a name on the type
+	created for the REP part, if any.
+	* gcc-interface/utils.c (finish_record_type): Only take the maximum
+	when merging sizes for a variant part at offset 0.
+	(merge_sizes): Rename has_rep parameter into max.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (gnat_internal_attribute_table): Add support
+	for stack_protect attribute.
+	(handle_stack_protect_attribute): New static function.
+
+2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (intrin_arglists_compatible_p): Do not return
+	false if the internal builtin uses a variable list.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Call_to_gnu): Do not initialize the temporary
+	created out of addressability concerns if it's for the _Init parameter
+	of an initialization procedure.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/ada-builtin-types.def: New file.
+	* gcc-interface/ada-builtins.def: Likewise.
+	* gcc-interface/ada-tree.h (BUILT_IN_LIKELY): New macro.
+	(BUILT_IN_UNLIKELY): Likewise.
+	* gcc-interface/trans.c (independent_iterations_p): Initialize the
+	auto-vector to 16 elements.
+	(Call_to_gnu): Remove local variable and change the vector of actual
+	parameters to an auto-vector.  Do not convert actual parameters to
+	the argument type for front-end built-in functions.  Add support for
+	front-end built-in functions.
+	(build_noreturn_cond): Use internal instead of built-in function.
+	* gcc-interface/utils.c (c_builtin_type): Include ada-builtin-types.def
+	(install_builtin_function_types): Likewise.
+	(install_builtin_functions): Include ada-builtins.def first.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (maybe_pad_type): Issue the warning for the
+	specific case of component types preferably.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Identifier_to_gnu): Minor tweaks.
+	(gnat_to_gnu): Do not convert the result if it is a reference to an
+	unconstrained array used as the prefix of an attribute reference that
+	requires an lvalue.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Gigi_Types_Compatible): New predicate.
+	(Identifier_to_gnu): Use it to assert that the type of the identifier
+	and that of its entity are compatible for gigi.  Rename a couple of
+	local variables and separate the processing of the result type.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Call_to_gnu): Use the unpadded type when
+	putting back an intermediate conversion the type of the actuals.
+
+2019-05-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (gnat_to_gnu) <Shift operations>: Convert the
+	count to the unsigned version of its base type before proceeding.
+
+2019-05-16  Martin Sebor  <msebor@redhat.com>
+
+	* gcc-interface/trans.c (check_inlining_for_nested_subprog): Quote
+	reserved names.
+
+2019-05-08  Arnaud Charlet  <charlet@adacore.com>
+
+	* standard.ads.h: New file.
+
+2019-05-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gcc-interface/Makefile.in (install-gcc-specs): Use foreach.
+	Honor DESTDIR.
+
+2019-04-29  Michael K. Darling  <darlingm@gmail.com>
+
+	* gnatvsn.ads: Bump Library_Version to 10.
+
+2019-04-24  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+	    Bernd Edlinger  <bernd.edlinger@hotmail.de>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/89093
+	* raise-gcc.c (TARGET_ATTRIBUTE): Define.
+	(continue_unwind, personality_body, PERSONALITY_FUNCTION): Add
+	TARGET_ATTRIBUTE.
+
+2019-04-07  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* libgnat/i-cexten.ads (CFloat_128): New type.
+
+2019-03-22  Dmitriy Anisimkov  <anisimko@adacore.com>
+
+	PR ada/89583
+	* libgnat/g-socket.adb (Bind_Socket, Connect_Socket,
+	Send_Socket): Fix the computation of structure lengths passed to
+	low level routines.
+	(Is_IPv6_Address): Fix the number of expected colons.
+
+2019-03-11  Martin Liska  <mliska@suse.cz>
+
+	* gcc-interface/misc.c (gnat_post_options): Wrap option name in string
+	format message and fix GNU coding style.
+
+2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (gnat_to_gnu) <N_Aggregate>: Minor tweak.
+	* gcc-interface/utils.c (convert): Do not pad when doing an unchecked
+	conversion here.  Use TREE_CONSTANT throughout the function.
+	(unchecked_convert): Also pad if the source is a CONSTRUCTOR and the
+	destination is a more aligned array type or a larger aggregate type,
+	but not between original and packable versions of a type.
+
+2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (max_size) <tcc_unary>: Be prepared for an
+	operand with VOID_TYPE.
+
+2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (elaborate_all_entities): Do not elaborate the
+	entities of a package renaming another one.
+
+2019-02-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Regular_Loop_to_gnu): Replace tests on
+	individual flag_unswitch_loops and flag_tree_loop_vectorize switches
+	with test on global optimize switch.
+	(Raise_Error_to_gnu): Likewise.
+
+2019-02-07  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* libgnarl/s-linux__sparc.ads (ETIMEDOUT): Set to correct value.
+
+2019-02-06  Arnaud Charlet  <charlet@adacore.com>
+
+	* libgnarl/s-linux__x32.ads: Resync list of signals with s-linux.ads
+
+2019-01-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* repinfo.adb (List_Component_Layout): Remove superfluous space for
+	zero-sized field.
+	* gcc-interface/ada-tree.h (TYPE_IS_EXTRA_SUBTYPE_P): New macro.
+	* gcc-interface/gigi.h (create_extra_subtype): Declare.
+	* gcc-interface/decl.c (TYPE_ARRAY_SIZE_LIMIT): Likewise.
+	(update_n_elem): New function.
+	(gnat_to_gnu_entity): Use create_extra_subtype to create extra subtypes
+	instead of doing it manually.
+	<E_Array_Type>: Use update_n_elem to compute the maximum size.  Use the
+ 	index type instead of base type for the bounds. Set TYPE_ARRAY_MAX_SIZE
+	of the array to the maximum size.
+	<E_Array_Subtype>: Create an extra subtype using the index type of the
+	base array type for self-referential bounds.  Use update_n_elem to
+	compute the maximum size.  Set TYPE_ARRAY_MAX_SIZE of the array to the
+	maximum size.
+	(gnat_to_gnu_field): Clear DECL_NONADDRESSABLE_P on discriminants.
+	* gcc-interface/misc.c (gnat_get_alias_set): Return the alias set of
+	the base type for an extra subtype.
+	(gnat_type_max_size): Remove obsolete code.
+	* gcc-interface/trans.c (Attribute_to_gnu): Minor tweak.
+	(can_be_lower_p): Deal with pathological types.
+	* gcc-interface/utils.c (create_extra_subtype): New function.
+	(create_field_decl): Minor tweak.
+	(max_size) <tcc_reference>: Compute a better value by using the extra
+ 	subtypes on the self-referential bounds.
+	<tcc_binary>: Rewrite.  Deal with "negative value" in unsigned types.
+	<tcc_expression>: Likewise.
+	* gcc-interface/utils2.c (compare_arrays): Retrieve the original bounds
+	of the arrays upfront.  Swap only if the second length is not constant.
+	Use comparisons on the original bounds consistently for the null tests.
+	(build_binary_op): Use TYPE_IS_EXTRA_SUBTYPE_P macro.
+	(build_allocator): Minor tweak.
+
+2019-01-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (array_type_has_nonaliased_component): Return
+	the same value for every dimension of a multidimensional array type.
+
+2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Regular_Loop_to_gnu): Use the SLOC of the
+	iteration scheme, if present, throughout the translation.
+
+2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (gnat_to_gnu) <N_Assignment_Statement>: Use
+	DECL_SIZE_UNIT instead of TYPE_SIZE_UNIT for the size to be assigned
+	by a call to memset if the LHS is a DECL.
+
+2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (struct loop_info_d): Remove artificial field.
+	(Loop_Statement_to_gnu): Do not set it.
+
+2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/trans.c (Iterate_Acc_Clause_Arg): Fix formatting.
+	(Acc_gnat_to_gnu): Likewise.
+	(Acc_Data_to_gnu): Likewise.
+	(Acc_Var_to_gnu): Likewise.
+	(Acc_Reduc_to_gnu): Likewise.
+	(Acc_Size_List_to_gnu): Likewise.
+	(Pragma_to_gnu) <Pragma_Acc_Loop>: Likewise.
+	<Pragma_Acc_Data>): Likewise.
+	(find_loop_for): Remove default value for parameters.
+	* gcc-interface/trans.c (gnat_to_gnu) <N_Op_And>: Merge into...
+	<N_Op_Eq>): ...this.
+
+2019-01-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Use test on
+	the sign bit instead of on the sign of the value.
+	<PLUS_EXPR>: Turn addition of negative constant into subtraction.
+	<MULT_EXPR>: Add test for degenerate case.
+	<BIT_AND_EXPR>: Simplify.
+
+2019-01-18  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	* s-oscons-tmplt.c (AF_INET6): Do not undefine for RTEMS.
+
+2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR other/16615
+	* exp_ch11.adb: Change "can not" to "cannot".
+	* sem_ch4.adb: Likewise.
+
+2019-01-09  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR other/16615
+	* exp_ch9.adb: Mechanically replace "can not" with "cannot".
+	* libgnat/s-regpat.ads: Likewise.
+	* par-ch4.adb: Likewise.
+	* set_targ.adb: Likewise.
+	* types.ads: Likewise.
+
+2019-01-08  Justin Squirek  <squirek@adacore.com>
+
+	Revert:
+	2018-07-31  Justin Squirek  <squirek@adacore.com>
+
+	* lib-writ.adb (Write_With_Lines): Modfiy the generation
+	of dependencies within ali files so that source unit
+	bodies are properly listed even if said bodies are
+	missing.  Perform legacy behavior in GNATprove mode.
+	* lib-writ.ads: Modify documentation to reflect current
+	behavior.
+
+	and:
+	2018-09-26  Justin Squirek  <squirek@adacore.com>
+
+	* lib-writ.adb, lib-writ.ads (Write_With_Lines): Add
+	documentation and an extra conditional check for RCI
+	units so that generated ali files will list the spec
+	only instead of a body when a body is not found.
+
+2019-01-04  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnatvsn.ads: Bump copyright year.
+
+2019-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+	Update copyright years.
+
+ 	* gnat_ugn.texi: Bump @copying's copyright year.
+ 	* gnat_rm.texi: Likewise.
+
+Copyright (C) 2019 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
-- 
cgit v1.1


From 104099b897fe28c5d28b81a83d7655ea3b91c0c8 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 11 Oct 2019 08:19:03 +0000
Subject: decl.c (gnat_to_gnu_entity): New case to deal with the definition of
 named numbers.

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Named_{Integer|Real}>:
	New case to deal with the definition of named numbers.
	<E_Variable>: Minor tweaks.  Set DECL_IGNORED_P on the CONST_DECL
	if a corresponding variable is built.
	* gcc-interface/trans.c (gnat_to_gnu) <N_Integer_Literal>: Return
	error_mark_node instead of aborting on overflow for named numbers.
	<N_Number_Declaration>: Reuse the <N_Object_Declaration> case and
	deal with error_mark_node specifically.
	* gcc-interface/utils.c (create_var_decl): Do not set DECL_IGNORED_P
	on CONST_DECLs.
	(gnat_write_global_declarations): Output global constants.

From-SVN: r276864
---
 gcc/ada/ChangeLog             | 14 ++++++++++++++
 gcc/ada/gcc-interface/decl.c  | 34 ++++++++++++++++++++++++++++------
 gcc/ada/gcc-interface/trans.c | 29 +++++++++++++++++++++--------
 gcc/ada/gcc-interface/utils.c | 15 +++++++++------
 4 files changed, 72 insertions(+), 20 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index da7858b..896efda 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,17 @@
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Named_{Integer|Real}>:
+	New case to deal with the definition of named numbers.
+	<E_Variable>: Minor tweaks.  Set DECL_IGNORED_P on the CONST_DECL
+	if a corresponding variable is built.
+	* gcc-interface/trans.c (gnat_to_gnu) <N_Integer_Literal>: Return
+	error_mark_node instead of aborting on overflow for named numbers.
+	<N_Number_Declaration>: Reuse the <N_Object_Declaration> case and
+	deal with error_mark_node specifically.
+	* gcc-interface/utils.c (create_var_decl): Do not set DECL_IGNORED_P
+	on CONST_DECLs.
+	(gnat_write_global_declarations): Output global constants.
+
 2019-10-10  Gary Dismukes  <dismukes@adacore.com>
 
 	* exp_ch7.adb (Check_Unnesting_In_Decls_Or_Stmts): When
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 77c6c9f..4878f5e 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -585,6 +585,29 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
 	gcc_unreachable ();
       }
 
+    case E_Named_Integer:
+    case E_Named_Real:
+      {
+	tree gnu_ext_name = NULL_TREE;
+
+	if (Is_Public (gnat_entity))
+	  gnu_ext_name = create_concat_name (gnat_entity, NULL);
+
+	/* All references are supposed to be folded in the front-end.  */
+	gcc_assert (definition && gnu_expr);
+
+	gnu_type = gnat_to_gnu_type (Etype (gnat_entity));
+	gnu_expr = convert (gnu_type, gnu_expr);
+
+	/* Build a CONST_DECL for debugging purposes exclusively.  */
+	gnu_decl
+	  = create_var_decl (gnu_entity_name, gnu_ext_name, gnu_type,
+			     gnu_expr, true, Is_Public (gnat_entity),
+			     false, false, false, artificial_p,
+			     debug_info_p, NULL, gnat_entity, true);
+      }
+      break;
+
     case E_Constant:
       /* Ignore constant definitions already marked with the error node.  See
 	 the N_Object_Declaration case of gnat_to_gnu for the rationale.  */
@@ -1519,18 +1542,16 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
 	/* If this is a constant and we are defining it or it generates a real
 	   symbol at the object level and we are referencing it, we may want
 	   or need to have a true variable to represent it:
-	     - if optimization isn't enabled, for debugging purposes,
 	     - if the constant is public and not overlaid on something else,
 	     - if its address is taken,
-	     - if either itself or its type is aliased.  */
+	     - if it is aliased,
+	     - if optimization isn't enabled, for debugging purposes.  */
 	if (TREE_CODE (gnu_decl) == CONST_DECL
 	    && (definition || Sloc (gnat_entity) > Standard_Location)
-	    && ((!optimize && debug_info_p)
-		|| (Is_Public (gnat_entity)
-		    && No (Address_Clause (gnat_entity)))
+	    && ((Is_Public (gnat_entity) && No (Address_Clause (gnat_entity)))
 		|| Address_Taken (gnat_entity)
 		|| Is_Aliased (gnat_entity)
-		|| Is_Aliased (gnat_type)))
+		|| (!optimize && debug_info_p)))
 	  {
 	    tree gnu_corr_var
 	      = create_var_decl (gnu_entity_name, gnu_ext_name, gnu_type,
@@ -1540,6 +1561,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
 				 attr_list, gnat_entity, false);
 
 	    SET_DECL_CONST_CORRESPONDING_VAR (gnu_decl, gnu_corr_var);
+	    DECL_IGNORED_P (gnu_decl) = 1;
 	  }
 
 	/* If this is a constant, even if we don't need a true variable, we
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 7b842d4..1ee9732 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -6881,11 +6881,17 @@ gnat_to_gnu (Node_Id gnat_node)
 	gnu_result = UI_To_gnu (Intval (gnat_node), gnu_type);
 
 	/* If the result overflows (meaning it doesn't fit in its base type),
-	   abort.  We would like to check that the value is within the range
-	   of the subtype, but that causes problems with subtypes whose usage
-	   will raise Constraint_Error and with biased representation, so
-	   we don't.  */
-	gcc_assert (!TREE_OVERFLOW (gnu_result));
+	   abort, unless this is for a named number because that's not fatal.
+	   We would like to check that the value is within the range of the
+	   subtype, but that causes problems with subtypes whose usage will
+	   raise Constraint_Error and also with biased representation.  */
+	if (TREE_OVERFLOW (gnu_result))
+	  {
+	    if (Nkind (Parent (gnat_node)) == N_Number_Declaration)
+	      gnu_result = error_mark_node;
+	    else
+	      gcc_unreachable ();
+	  }
       }
       break;
 
@@ -7030,6 +7036,7 @@ gnat_to_gnu (Node_Id gnat_node)
       break;
 
     case N_Object_Declaration:
+    case N_Number_Declaration:
     case N_Exception_Declaration:
       gnat_temp = Defining_Entity (gnat_node);
       gnu_result = alloc_stmt_list ();
@@ -7052,8 +7059,15 @@ gnat_to_gnu (Node_Id gnat_node)
 
 	  gnu_expr = gnat_to_gnu (Expression (gnat_node));
 
-	  if (type_annotate_only && TREE_CODE (gnu_expr) == ERROR_MARK)
-	    gnu_expr = NULL_TREE;
+	  if (TREE_CODE (gnu_expr) == ERROR_MARK)
+	    {
+	      /* If this is a named number for which we cannot manipulate
+		 the value, just skip the declaration altogether.  */
+	      if (kind == N_Number_Declaration)
+		break;
+	      else if (type_annotate_only)
+		gnu_expr = NULL_TREE;
+	    }
 	}
       else
 	gnu_expr = NULL_TREE;
@@ -7163,7 +7177,6 @@ gnat_to_gnu (Node_Id gnat_node)
       gnu_result = alloc_stmt_list ();
       break;
 
-    case N_Number_Declaration:
     case N_Package_Renaming_Declaration:
       /* These are fully handled in the front end.  */
       /* ??? For package renamings, find a way to use GENERIC namespaces so
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index d2891f2..e14645a 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -2731,13 +2731,11 @@ create_var_decl (tree name, tree asm_name, tree type, tree init,
       && !have_global_bss_p ())
     DECL_COMMON (var_decl) = 1;
 
-  /* Do not emit debug info for a CONST_DECL if optimization isn't enabled,
-     since we will create an associated variable.  Likewise for an external
-     constant whose initializer is not absolute, because this would mean a
-     global relocation in a read-only section which runs afoul of the PE-COFF
-     run-time relocation mechanism.  */
+  /* Do not emit debug info if not requested, or for an external constant whose
+     initializer is not absolute because this would require a global relocation
+     in a read-only section which runs afoul of the PE-COFF run-time relocation
+     mechanism.  */
   if (!debug_info_p
-      || (TREE_CODE (var_decl) == CONST_DECL && !optimize)
       || (extern_flag
 	  && constant_p
 	  && init
@@ -5840,6 +5838,11 @@ gnat_write_global_declarations (void)
 	&& DECL_FUNCTION_IS_DEF (iter))
       debug_hooks->early_global_decl (iter);
 
+  /* Output global constants.  */
+  FOR_EACH_VEC_SAFE_ELT (global_decls, i, iter)
+    if (TREE_CODE (iter) == CONST_DECL && !DECL_IGNORED_P (iter))
+      debug_hooks->early_global_decl (iter);
+
   /* Then output the global variables.  We need to do that after the debug
      information for global types is emitted so that they are finalized.  Skip
      external global variables, unless we need to emit debug info for them:
-- 
cgit v1.1


From 43b60e578393cc58f1d75387b811cc90bc74297b Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 11 Oct 2019 08:33:03 +0000
Subject: decl.c (Gigi_Equivalent_Type): New case.

	* gcc-interface/decl.c (Gigi_Equivalent_Type) <E_Array_Subtype>: New
	case.  Return the base type if the subtype is not constrained.

From-SVN: r276865
---
 gcc/ada/ChangeLog                     |  5 +++++
 gcc/ada/gcc-interface/decl.c          |  5 +++++
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/gnat.dg/array38.adb     | 11 +++++++++++
 gcc/testsuite/gnat.dg/array38_pkg.adb |  8 ++++++++
 gcc/testsuite/gnat.dg/array38_pkg.ads | 18 ++++++++++++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 gcc/testsuite/gnat.dg/array38.adb
 create mode 100644 gcc/testsuite/gnat.dg/array38_pkg.adb
 create mode 100644 gcc/testsuite/gnat.dg/array38_pkg.ads

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 896efda..8e11108 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gcc-interface/decl.c (Gigi_Equivalent_Type) <E_Array_Subtype>: New
+	case.  Return the base type if the subtype is not constrained.
+
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Named_{Integer|Real}>:
 	New case to deal with the definition of named numbers.
 	<E_Variable>: Minor tweaks.  Set DECL_IGNORED_P on the CONST_DECL
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 4878f5e..2529824 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -5026,6 +5026,11 @@ Gigi_Equivalent_Type (Entity_Id gnat_entity)
       gnat_equiv = Etype (gnat_entity);
       break;
 
+    case E_Array_Subtype:
+      if (!Is_Constrained (gnat_entity))
+	gnat_equiv = Etype (gnat_entity);
+      break;
+
     case E_Class_Wide_Type:
       gnat_equiv = Root_Type (gnat_entity);
       break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0f55eec..612b22b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/array38.adb: New test.
+	* gnat.dg/array38_pkg.ad[sb]: New helper.
+
 2019-10-11  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/91987
diff --git a/gcc/testsuite/gnat.dg/array38.adb b/gcc/testsuite/gnat.dg/array38.adb
new file mode 100644
index 0000000..fe37b65
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/array38.adb
@@ -0,0 +1,11 @@
+-- { dg-do compile }
+
+with Array38_Pkg; use Array38_Pkg;
+
+procedure Array38 is
+
+  function My_F is new F (Index, Byte, Bytes, Integer);
+
+begin
+  null;
+end;
diff --git a/gcc/testsuite/gnat.dg/array38_pkg.adb b/gcc/testsuite/gnat.dg/array38_pkg.adb
new file mode 100644
index 0000000..ebaa66e
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/array38_pkg.adb
@@ -0,0 +1,8 @@
+package body Array38_Pkg is
+
+   function F (Data : Array_Type) return Value_Type is
+   begin
+      return Value_Type'First;
+   end;
+
+end Array38_Pkg;
diff --git a/gcc/testsuite/gnat.dg/array38_pkg.ads b/gcc/testsuite/gnat.dg/array38_pkg.ads
new file mode 100644
index 0000000..17c3ef4
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/array38_pkg.ads
@@ -0,0 +1,18 @@
+package Array38_Pkg is
+
+   type Byte is mod 2**8;
+
+   type Length is new Natural;
+   subtype Index is Length range 1 .. Length'Last;
+
+   type Bytes is array (Index range <>) of Byte with
+     Predicate => Bytes'Length > 0;
+
+   generic
+      type Index_Type   is (<>);
+      type Element_Type is (<>);
+      type Array_Type   is array (Index_Type range <>) of Element_Type;
+      type Value_Type   is (<>);
+   function F (Data : Array_Type) return Value_Type;
+
+end Array38_Pkg;
-- 
cgit v1.1


From 05626b02e8d02720771d361677b1d6cc38df9ddc Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 11 Oct 2019 08:57:18 +0000
Subject: decl.c (annotate_value): Really test the sign of the value when
 deciding to build a NEGATE_EXPR.

	* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Really test the
	sign of the value when deciding to build a NEGATE_EXPR.
	<PLUS_EXPR>: Remove redundant line.
	<BIT_AND_EXPR>: Do the negation here.

From-SVN: r276866
---
 gcc/ada/ChangeLog            |  7 +++++++
 gcc/ada/gcc-interface/decl.c | 16 +++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8e11108..792db56 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Really test the
+	sign of the value when deciding to build a NEGATE_EXPR.
+	<PLUS_EXPR>: Remove redundant line.
+	<BIT_AND_EXPR>: Do the negation here.
+
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* gcc-interface/decl.c (Gigi_Equivalent_Type) <E_Array_Subtype>: New
 	case.  Return the base type if the subtype is not constrained.
 
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 2529824..2c5f573 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -8287,9 +8287,8 @@ annotate_value (tree gnu_size)
     {
     case INTEGER_CST:
       /* For negative values, build NEGATE_EXPR of the opposite.  Such values
-	 can appear for discriminants in expressions for variants.  Note that,
-	 sizetype being unsigned, we don't directly use tree_int_cst_sgn.  */
-      if (tree_int_cst_sign_bit (gnu_size))
+	 can appear for discriminants in expressions for variants.  */
+      if (tree_int_cst_sgn (gnu_size) < 0)
 	{
 	  tree t = wide_int_to_tree (sizetype, -wi::to_wide (gnu_size));
 	  tcode = Negate_Expr;
@@ -8367,9 +8366,8 @@ annotate_value (tree gnu_size)
 	  && tree_int_cst_sign_bit (TREE_OPERAND (gnu_size, 1)))
 	{
 	  tcode = Minus_Expr;
-	  ops[0] = annotate_value (TREE_OPERAND (gnu_size, 0));
-	  wide_int op1 = -wi::to_wide (TREE_OPERAND (gnu_size, 1));
-	  ops[1] = annotate_value (wide_int_to_tree (sizetype, op1));
+	  wide_int wop1 = -wi::to_wide (TREE_OPERAND (gnu_size, 1));
+	  ops[1] = annotate_value (wide_int_to_tree (sizetype, wop1));
 	  break;
 	}
 
@@ -8410,9 +8408,9 @@ annotate_value (tree gnu_size)
 	 Such values can appear in expressions with aligning patterns.  */
       if (TREE_CODE (TREE_OPERAND (gnu_size, 1)) == INTEGER_CST)
 	{
-	  wide_int op1 = wi::sext (wi::to_wide (TREE_OPERAND (gnu_size, 1)),
-				   TYPE_PRECISION (sizetype));
-	  ops[1] = annotate_value (wide_int_to_tree (sizetype, op1));
+	  wide_int wop1 = -wi::to_wide (TREE_OPERAND (gnu_size, 1));
+	  tree op1 = wide_int_to_tree (sizetype, wop1);
+	  ops[1] = annotate_value (build1 (NEGATE_EXPR, sizetype, op1));
 	}
       break;
 
-- 
cgit v1.1


From 1fcf52a6a2208a57e4542e1b830a7ac5cfa216a2 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Fri, 11 Oct 2019 10:59:16 +0200
Subject: Do not allocate ggc during streaming.

	* gimple-streamer-out.c (output_gimple_stmt): Add explicit function
	parameter.
	* lto-streamer-out.c: Include tree-dfa.h.
	(output_cfg): Do not use cfun.
	(lto_prepare_function_for_streaming): New.
	(output_function): Do not push cfun; do not initialize loop optimizer.
	* lto-streamer.h (lto_prepare_function_for_streaming): Declare.
	* passes.c (ipa_write_summaries): Use it.
	(ipa_write_optimization_summaries): Do not modify bodies.
	* tree-dfa.c (renumber_gimple_stmt_uids): Add function parameter.
	* tree.dfa.h (renumber_gimple_stmt_uids): Update prototype.
	* tree-ssa-dse.c (pass_dse::execute): Update use of
	renumber_gimple_stmt_uids.
	* tree-ssa-math-opts.c (pass_optimize_widening_mul::execute): Likewise.

	* lto.c (lto_wpa_write_files): Prepare all bodies for streaming.

From-SVN: r276870
---
 gcc/ChangeLog             | 17 +++++++++++++++++
 gcc/gimple-streamer-out.c | 10 +++++-----
 gcc/lto-streamer-out.c    | 43 ++++++++++++++++++++++++-------------------
 gcc/lto-streamer.h        |  1 +
 gcc/lto/ChangeLog         |  4 ++++
 gcc/lto/lto.c             |  7 +++++++
 gcc/passes.c              | 37 +++++++------------------------------
 gcc/tree-dfa.c            | 10 +++++-----
 gcc/tree-dfa.h            |  2 +-
 gcc/tree-ssa-dse.c        |  2 +-
 gcc/tree-ssa-math-opts.c  |  2 +-
 11 files changed, 73 insertions(+), 62 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df124f07..667ada7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gimple-streamer-out.c (output_gimple_stmt): Add explicit function
+	parameter.
+	* lto-streamer-out.c: Include tree-dfa.h.
+	(output_cfg): Do not use cfun.
+	(lto_prepare_function_for_streaming): New.
+	(output_function): Do not push cfun; do not initialize loop optimizer.
+	* lto-streamer.h (lto_prepare_function_for_streaming): Declare.
+	* passes.c (ipa_write_summaries): Use it.
+	(ipa_write_optimization_summaries): Do not modify bodies.
+	* tree-dfa.c (renumber_gimple_stmt_uids): Add function parameter.
+	* tree.dfa.h (renumber_gimple_stmt_uids): Update prototype.
+	* tree-ssa-dse.c (pass_dse::execute): Update use of
+	renumber_gimple_stmt_uids.
+	* tree-ssa-math-opts.c (pass_optimize_widening_mul::execute): Likewise.
+
 2019-10-11  Kewen Lin  <linkw@gcc.gnu.org>
 
 	* config/rs6000/rs6000.c (rs6000_builtin_vectorization_cost): Lower
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index 34b8d6f..7185c07 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -57,7 +57,7 @@ output_phi (struct output_block *ob, gphi *phi)
 /* Emit statement STMT on the main stream of output block OB.  */
 
 static void
-output_gimple_stmt (struct output_block *ob, gimple *stmt)
+output_gimple_stmt (struct output_block *ob, struct function *fn, gimple *stmt)
 {
   unsigned i;
   enum gimple_code code;
@@ -80,7 +80,7 @@ output_gimple_stmt (struct output_block *ob, gimple *stmt)
 		     as_a <gassign *> (stmt)),
 		   1);
   bp_pack_value (&bp, gimple_has_volatile_ops (stmt), 1);
-  hist = gimple_histogram_value (cfun, stmt);
+  hist = gimple_histogram_value (fn, stmt);
   bp_pack_value (&bp, hist != NULL, 1);
   bp_pack_var_len_unsigned (&bp, stmt->subcode);
 
@@ -139,7 +139,7 @@ output_gimple_stmt (struct output_block *ob, gimple *stmt)
 	     so that we do not have to deal with type mismatches on
 	     merged symbols during IL read in.  The first operand
 	     of GIMPLE_DEBUG must be a decl, not MEM_REF, though.  */
-	  if (op && (i || !is_gimple_debug (stmt)))
+	  if (!flag_wpa && op && (i || !is_gimple_debug (stmt)))
 	    {
 	      basep = &op;
 	      if (TREE_CODE (*basep) == ADDR_EXPR)
@@ -147,7 +147,7 @@ output_gimple_stmt (struct output_block *ob, gimple *stmt)
 	      while (handled_component_p (*basep))
 		basep = &TREE_OPERAND (*basep, 0);
 	      if (VAR_P (*basep)
-		  && !auto_var_in_fn_p (*basep, current_function_decl)
+		  && !auto_var_in_fn_p (*basep, fn->decl)
 		  && !DECL_REGISTER (*basep))
 		{
 		  bool volatilep = TREE_THIS_VOLATILE (*basep);
@@ -228,7 +228,7 @@ output_bb (struct output_block *ob, basic_block bb, struct function *fn)
 	      print_gimple_stmt (streamer_dump_file, stmt, 0, TDF_SLIM);
 	    }
 
-	  output_gimple_stmt (ob, stmt);
+	  output_gimple_stmt (ob, fn, stmt);
 
 	  /* Emit the EH region holding STMT.  */
 	  region = lookup_stmt_eh_lp_fn (fn, stmt);
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index d85b03a..c494c73 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "debug.h"
 #include "omp-offload.h"
 #include "print-tree.h"
+#include "tree-dfa.h"
 
 
 static void lto_write_tree (struct output_block*, tree, bool);
@@ -1893,7 +1894,7 @@ output_cfg (struct output_block *ob, struct function *fn)
 
   streamer_write_hwi (ob, -1);
 
-  bb = ENTRY_BLOCK_PTR_FOR_FN (cfun);
+  bb = ENTRY_BLOCK_PTR_FOR_FN (fn);
   while (bb->next_bb)
     {
       streamer_write_hwi (ob, bb->next_bb->index);
@@ -1902,9 +1903,6 @@ output_cfg (struct output_block *ob, struct function *fn)
 
   streamer_write_hwi (ob, -1);
 
-  /* ???  The cfgloop interface is tied to cfun.  */
-  gcc_assert (cfun == fn);
-
   /* Output the number of loops.  */
   streamer_write_uhwi (ob, number_of_loops (fn));
 
@@ -2062,6 +2060,22 @@ collect_block_tree_leafs (tree root, vec<tree> &leafs)
       collect_block_tree_leafs (BLOCK_SUBBLOCKS (root), leafs);
 }
 
+/* This performs function body modifications that are needed for streaming
+   to work.  */
+
+void
+lto_prepare_function_for_streaming (struct cgraph_node *node)
+{
+  if (number_of_loops (DECL_STRUCT_FUNCTION (node->decl)))
+    {
+      push_cfun (DECL_STRUCT_FUNCTION (node->decl));
+      loop_optimizer_init (AVOID_CFG_MODIFICATIONS);
+      loop_optimizer_finalize ();
+      pop_cfun ();
+    }
+  renumber_gimple_stmt_uids (DECL_STRUCT_FUNCTION (node->decl));
+}
+
 /* Output the body of function NODE->DECL.  */
 
 static void
@@ -2085,9 +2099,6 @@ output_function (struct cgraph_node *node)
 
   gcc_assert (current_function_decl == NULL_TREE && cfun == NULL);
 
-  /* Set current_function_decl and cfun.  */
-  push_cfun (fn);
-
   /* Make string 0 be a NULL string.  */
   streamer_write_char_stream (ob->string_stream, 0);
 
@@ -2124,9 +2135,6 @@ output_function (struct cgraph_node *node)
      debug info.  */
   if (gimple_has_body_p (function))
     {
-      /* Fixup loops if required to match discovery done in the reader.  */
-      loop_optimizer_init (AVOID_CFG_MODIFICATIONS);
-
       streamer_write_uhwi (ob, 1);
       output_struct_function_base (ob, fn);
 
@@ -2143,8 +2151,8 @@ output_function (struct cgraph_node *node)
 	 statement numbers.  We do not assign UIDs to PHIs here because
 	 virtual PHIs get re-computed on-the-fly which would make numbers
 	 inconsistent.  */
-      set_gimple_stmt_max_uid (cfun, 0);
-      FOR_ALL_BB_FN (bb, cfun)
+      set_gimple_stmt_max_uid (fn, 0);
+      FOR_ALL_BB_FN (bb, fn)
 	{
 	  for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
 	       gsi_next (&gsi))
@@ -2153,25 +2161,25 @@ output_function (struct cgraph_node *node)
 
 	      /* Virtual PHIs are not going to be streamed.  */
 	      if (!virtual_operand_p (gimple_phi_result (stmt)))
-	        gimple_set_uid (stmt, inc_gimple_stmt_max_uid (cfun));
+	        gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
 	    }
 	  for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi);
 	       gsi_next (&gsi))
 	    {
 	      gimple *stmt = gsi_stmt (gsi);
-	      gimple_set_uid (stmt, inc_gimple_stmt_max_uid (cfun));
+	      gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
 	    }
 	}
       /* To avoid keeping duplicate gimple IDs in the statements, renumber
 	 virtual phis now.  */
-      FOR_ALL_BB_FN (bb, cfun)
+      FOR_ALL_BB_FN (bb, fn)
 	{
 	  for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
 	       gsi_next (&gsi))
 	    {
 	      gphi *stmt = gsi.phi ();
 	      if (virtual_operand_p (gimple_phi_result (stmt)))
-	        gimple_set_uid (stmt, inc_gimple_stmt_max_uid (cfun));
+	        gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
 	    }
 	}
 
@@ -2183,9 +2191,6 @@ output_function (struct cgraph_node *node)
       streamer_write_record_start (ob, LTO_null);
 
       output_cfg (ob, fn);
-
-      loop_optimizer_finalize ();
-      pop_cfun ();
    }
   else
     streamer_write_uhwi (ob, 0);
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index ddf3de0..9f787c4 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -909,6 +909,7 @@ void lto_output_decl_state_refs (struct output_block *,
 			         struct lto_out_decl_state *);
 void lto_output_location (struct output_block *, struct bitpack_d *, location_t);
 void lto_output_init_mode_table (void);
+void lto_prepare_function_for_streaming (cgraph_node *);
 
 
 /* In lto-cgraph.c  */
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 393e1c1..5fd02df 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
+
+	* lto.c (lto_wpa_write_files): Prepare all bodies for streaming.
+
 2019-10-10  Richard Biener  <rguenther@suse.de>
 
 	* lto-common.c (unify_scc): Do not merge anonymous NAMESPACE_DECLs.
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index af3590c..f7452c2 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -304,6 +304,13 @@ lto_wpa_write_files (void)
 
   timevar_push (TV_WHOPR_WPA_IO);
 
+  cgraph_node *node;
+  /* Do body modifications needed for streaming before we fork out
+     worker processes.  */
+  FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (node)
+    if (gimple_has_body_p (node->decl))
+      lto_prepare_function_for_streaming (node);
+
   /* Generate a prefix for the LTRANS unit files.  */
   blen = strlen (ltrans_output_list);
   temp_filename = (char *) xmalloc (blen + sizeof ("2147483648.o"));
diff --git a/gcc/passes.c b/gcc/passes.c
index f715c67..863605d 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -2705,20 +2705,12 @@ ipa_write_summaries (void)
     {
       struct cgraph_node *node = order[i];
 
-      if (gimple_has_body_p (node->decl))
+      if (node->definition && node->need_lto_streaming)
 	{
-	  /* When streaming out references to statements as part of some IPA
-	     pass summary, the statements need to have uids assigned and the
-	     following does that for all the IPA passes here. Naturally, this
-	     ordering then matches the one IPA-passes get in their stmt_fixup
-	     hooks.  */
-
-	  push_cfun (DECL_STRUCT_FUNCTION (node->decl));
-	  renumber_gimple_stmt_uids ();
-	  pop_cfun ();
+	  if (gimple_has_body_p (node->decl))
+	    lto_prepare_function_for_streaming (node);
+	  lto_set_symtab_encoder_in_partition (encoder, node);
 	}
-      if (node->definition && node->need_lto_streaming)
-        lto_set_symtab_encoder_in_partition (encoder, node);
     }
 
   FOR_EACH_DEFINED_FUNCTION (node)
@@ -2786,28 +2778,13 @@ void
 ipa_write_optimization_summaries (lto_symtab_encoder_t encoder)
 {
   struct lto_out_decl_state *state = lto_new_out_decl_state ();
-  lto_symtab_encoder_iterator lsei;
   state->symtab_node_encoder = encoder;
 
   lto_output_init_mode_table ();
   lto_push_out_decl_state (state);
-  for (lsei = lsei_start_function_in_partition (encoder);
-       !lsei_end_p (lsei); lsei_next_function_in_partition (&lsei))
-    {
-      struct cgraph_node *node = lsei_cgraph_node (lsei);
-      /* When streaming out references to statements as part of some IPA
-	 pass summary, the statements need to have uids assigned.
-
-	 For functions newly born at WPA stage we need to initialize
-	 the uids here.  */
-      if (node->definition
-	  && gimple_has_body_p (node->decl))
-	{
-	  push_cfun (DECL_STRUCT_FUNCTION (node->decl));
-	  renumber_gimple_stmt_uids ();
-	  pop_cfun ();
-	}
-    }
+
+  /* Be sure that we did not forget to renumber stmt uids.  */
+  gcc_checking_assert (flag_wpa);
 
   gcc_assert (flag_wpa);
   pass_manager *passes = g->get_passes ();
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 9ba627c..64991ba 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -61,23 +61,23 @@ static void collect_dfa_stats (struct dfa_stats_d *);
 /* Renumber all of the gimple stmt uids.  */
 
 void
-renumber_gimple_stmt_uids (void)
+renumber_gimple_stmt_uids (struct function *fun)
 {
   basic_block bb;
 
-  set_gimple_stmt_max_uid (cfun, 0);
-  FOR_ALL_BB_FN (bb, cfun)
+  set_gimple_stmt_max_uid (fun, 0);
+  FOR_ALL_BB_FN (bb, fun)
     {
       gimple_stmt_iterator bsi;
       for (bsi = gsi_start_phis (bb); !gsi_end_p (bsi); gsi_next (&bsi))
 	{
 	  gimple *stmt = gsi_stmt (bsi);
-	  gimple_set_uid (stmt, inc_gimple_stmt_max_uid (cfun));
+	  gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fun));
 	}
       for (bsi = gsi_start_bb (bb); !gsi_end_p (bsi); gsi_next (&bsi))
 	{
 	  gimple *stmt = gsi_stmt (bsi);
-	  gimple_set_uid (stmt, inc_gimple_stmt_max_uid (cfun));
+	  gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fun));
 	}
     }
 }
diff --git a/gcc/tree-dfa.h b/gcc/tree-dfa.h
index 9881008..aa4ab7e 100644
--- a/gcc/tree-dfa.h
+++ b/gcc/tree-dfa.h
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_TREE_DFA_H
 #define GCC_TREE_DFA_H
 
-extern void renumber_gimple_stmt_uids (void);
+extern void renumber_gimple_stmt_uids (struct function *);
 extern void renumber_gimple_stmt_uids_in_blocks (basic_block *, int);
 extern void dump_variable (FILE *, tree);
 extern void debug_variable (tree);
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index d8f7089..25cd470 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -1113,7 +1113,7 @@ pass_dse::execute (function *fun)
 {
   need_eh_cleanup = BITMAP_ALLOC (NULL);
 
-  renumber_gimple_stmt_uids ();
+  renumber_gimple_stmt_uids (cfun);
 
   /* We might consider making this a property of each pass so that it
      can be [re]computed on an as-needed basis.  Particularly since
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index 5fea155..013ef93 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -3850,7 +3850,7 @@ pass_optimize_widening_mul::execute (function *fun)
 
   memset (&widen_mul_stats, 0, sizeof (widen_mul_stats));
   calculate_dominance_info (CDI_DOMINATORS);
-  renumber_gimple_stmt_uids ();
+  renumber_gimple_stmt_uids (cfun);
 
   math_opts_dom_walker (&cfg_changed).walk (ENTRY_BLOCK_PTR_FOR_FN (cfun));
 
-- 
cgit v1.1


From d0a0cacaba651f428208832fdb8a26dbd12acc38 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Fri, 11 Oct 2019 09:00:26 +0000
Subject: S/390: Use signaling FP comparison instructions

dg-torture.exp=inf-compare-1.c is failing, because (qNaN > +Inf)
comparison is compiled to CDB instruction, which does not signal an
invalid operation exception. KDB should have been used instead.

This patch introduces a new CCmode and a new pattern in order to
generate signaling instructions in this and similar cases.

gcc/ChangeLog:

2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR target/77918
	* config/s390/2827.md: Add new opcodes.
	* config/s390/2964.md: Likewise.
	* config/s390/3906.md: Likewise.
	* config/s390/8561.md: Likewise.
	* config/s390/s390-builtins.def (s390_vfchesb): Use
	the new vec_cmpgev4sf_quiet_nocc.
	(s390_vfchedb): Use the new vec_cmpgev2df_quiet_nocc.
	(s390_vfchsb): Use the new vec_cmpgtv4sf_quiet_nocc.
	(s390_vfchdb): Use the new vec_cmpgtv2df_quiet_nocc.
	(vec_cmplev4sf): Use the new vec_cmplev4sf_quiet_nocc.
	(vec_cmplev2df): Use the new vec_cmplev2df_quiet_nocc.
	(vec_cmpltv4sf): Use the new vec_cmpltv4sf_quiet_nocc.
	(vec_cmpltv2df): Use the new vec_cmpltv2df_quiet_nocc.
	* config/s390/s390-modes.def (CCSFPS): New mode.
	* config/s390/s390.c (s390_match_ccmode_set): Support CCSFPS.
	(s390_select_ccmode): Return CCSFPS for LT, LE, GT, GE and LTGT.
	(s390_branch_condition_mask): Reuse CCS for CCSFPS.
	(s390_expand_vec_compare): Use non-signaling patterns where
	necessary.
	(s390_reverse_condition): Support CCSFPS.
	* config/s390/s390.md (*cmp<mode>_ccsfps): New pattern.
	* config/s390/vector.md: (VFCMP_HW_OP): Remove.
	(asm_fcmp_op): Likewise.
	(*smaxv2df3_vx): Use pattern for quiet comparison.
	(*sminv2df3_vx): Likewise.
	(*vec_cmp<VFCMP_HW_OP:code><mode>_nocc): Remove.
	(*vec_cmpeq<mode>_quiet_nocc): New pattern.
	(vec_cmpgt<mode>_quiet_nocc): Likewise.
	(vec_cmplt<mode>_quiet_nocc): New expander.
	(vec_cmpge<mode>_quiet_nocc): New pattern.
	(vec_cmple<mode>_quiet_nocc): New expander.
	(*vec_cmpeq<mode>_signaling_nocc): New pattern.
	(*vec_cmpgt<mode>_signaling_nocc): Likewise.
	(*vec_cmpgt<mode>_signaling_finite_nocc): Likewise.
	(*vec_cmpge<mode>_signaling_nocc): Likewise.
	(*vec_cmpge<mode>_signaling_finite_nocc): Likewise.
	(vec_cmpungt<mode>): New expander.
	(vec_cmpunge<mode>): Likewise.
	(vec_cmpuneq<mode>): Use quiet patterns.
	(vec_cmpltgt<mode>): Allow only on z14+.
	(vec_cmpordered<mode>): Use quiet patterns.
	(vec_cmpunordered<mode>): Likewise.
	(VEC_CMP_EXPAND): Add ungt and unge.

gcc/testsuite/ChangeLog:

2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>

	* gcc.target/s390/vector/vec-scalar-cmp-1.c: Adjust
	expectations.

From-SVN: r276871
---
 gcc/ChangeLog                                      |  47 ++++++
 gcc/config/s390/2827.md                            |  14 +-
 gcc/config/s390/2964.md                            |  13 +-
 gcc/config/s390/3906.md                            |  17 +-
 gcc/config/s390/8561.md                            |  19 ++-
 gcc/config/s390/s390-builtins.def                  |  16 +-
 gcc/config/s390/s390-modes.def                     |   8 +
 gcc/config/s390/s390.c                             |  34 ++--
 gcc/config/s390/s390.md                            |  14 ++
 gcc/config/s390/vector.md                          | 171 +++++++++++++++++----
 gcc/testsuite/ChangeLog                            |   5 +
 .../gcc.target/s390/vector/vec-scalar-cmp-1.c      |   8 +-
 12 files changed, 292 insertions(+), 74 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 667ada7..f48f7f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,50 @@
+2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	PR target/77918
+	* config/s390/2827.md: Add new opcodes.
+	* config/s390/2964.md: Likewise.
+	* config/s390/3906.md: Likewise.
+	* config/s390/8561.md: Likewise.
+	* config/s390/s390-builtins.def (s390_vfchesb): Use
+	the new vec_cmpgev4sf_quiet_nocc.
+	(s390_vfchedb): Use the new vec_cmpgev2df_quiet_nocc.
+	(s390_vfchsb): Use the new vec_cmpgtv4sf_quiet_nocc.
+	(s390_vfchdb): Use the new vec_cmpgtv2df_quiet_nocc.
+	(vec_cmplev4sf): Use the new vec_cmplev4sf_quiet_nocc.
+	(vec_cmplev2df): Use the new vec_cmplev2df_quiet_nocc.
+	(vec_cmpltv4sf): Use the new vec_cmpltv4sf_quiet_nocc.
+	(vec_cmpltv2df): Use the new vec_cmpltv2df_quiet_nocc.
+	* config/s390/s390-modes.def (CCSFPS): New mode.
+	* config/s390/s390.c (s390_match_ccmode_set): Support CCSFPS.
+	(s390_select_ccmode): Return CCSFPS for LT, LE, GT, GE and LTGT.
+	(s390_branch_condition_mask): Reuse CCS for CCSFPS.
+	(s390_expand_vec_compare): Use non-signaling patterns where
+	necessary.
+	(s390_reverse_condition): Support CCSFPS.
+	* config/s390/s390.md (*cmp<mode>_ccsfps): New pattern.
+	* config/s390/vector.md: (VFCMP_HW_OP): Remove.
+	(asm_fcmp_op): Likewise.
+	(*smaxv2df3_vx): Use pattern for quiet comparison.
+	(*sminv2df3_vx): Likewise.
+	(*vec_cmp<VFCMP_HW_OP:code><mode>_nocc): Remove.
+	(*vec_cmpeq<mode>_quiet_nocc): New pattern.
+	(vec_cmpgt<mode>_quiet_nocc): Likewise.
+	(vec_cmplt<mode>_quiet_nocc): New expander.
+	(vec_cmpge<mode>_quiet_nocc): New pattern.
+	(vec_cmple<mode>_quiet_nocc): New expander.
+	(*vec_cmpeq<mode>_signaling_nocc): New pattern.
+	(*vec_cmpgt<mode>_signaling_nocc): Likewise.
+	(*vec_cmpgt<mode>_signaling_finite_nocc): Likewise.
+	(*vec_cmpge<mode>_signaling_nocc): Likewise.
+	(*vec_cmpge<mode>_signaling_finite_nocc): Likewise.
+	(vec_cmpungt<mode>): New expander.
+	(vec_cmpunge<mode>): Likewise.
+	(vec_cmpuneq<mode>): Use quiet patterns.
+	(vec_cmpltgt<mode>): Allow only on z14+.
+	(vec_cmpordered<mode>): Use quiet patterns.
+	(vec_cmpunordered<mode>): Likewise.
+	(VEC_CMP_EXPAND): Add ungt and unge.
+
 2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
 
 	* gimple-streamer-out.c (output_gimple_stmt): Add explicit function
diff --git a/gcc/config/s390/2827.md b/gcc/config/s390/2827.md
index 3f63f82..aafe8e2 100644
--- a/gcc/config/s390/2827.md
+++ b/gcc/config/s390/2827.md
@@ -44,7 +44,7 @@
 
 (define_insn_reservation "zEC12_normal_fp" 8
   (and (eq_attr "cpu" "zEC12")
-       (eq_attr "mnemonic" "lnebr,sdbr,sebr,clfxtr,adbr,aebr,celfbr,clfebr,lpebr,msebr,lndbr,clfdbr,cebr,maebr,ltebr,clfdtr,cdlgbr,cxlftr,lpdbr,cdfbr,lcebr,clfxbr,msdbr,cdbr,madbr,meebr,clgxbr,clgdtr,ledbr,cegbr,cdlftr,cdlgtr,mdbr,clgebr,ltdbr,cdlfbr,cdgbr,clgxtr,lcdbr,celgbr,clgdbr,ldebr,cefbr,fidtr,fixtr,madb,msdb,mseb,fiebra,fidbra,aeb,mdb,seb,cdb,tcdb,sdb,adb,tceb,maeb,ceb,meeb,ldeb")) "nothing")
+       (eq_attr "mnemonic" "lnebr,sdbr,sebr,clfxtr,adbr,aebr,celfbr,clfebr,lpebr,msebr,lndbr,clfdbr,cebr,maebr,ltebr,clfdtr,cdlgbr,cxlftr,lpdbr,cdfbr,lcebr,clfxbr,msdbr,cdbr,madbr,meebr,clgxbr,clgdtr,ledbr,cegbr,cdlftr,cdlgtr,mdbr,clgebr,ltdbr,cdlfbr,cdgbr,clgxtr,lcdbr,celgbr,clgdbr,ldebr,cefbr,fidtr,fixtr,madb,msdb,mseb,fiebra,fidbra,aeb,mdb,seb,cdb,tcdb,sdb,adb,tceb,maeb,ceb,meeb,ldeb,keb,kebr,kdb,kdbr")) "nothing")
 
 (define_insn_reservation "zEC12_cgdbr" 2
   (and (eq_attr "cpu" "zEC12")
@@ -426,6 +426,10 @@
   (and (eq_attr "cpu" "zEC12")
        (eq_attr "mnemonic" "cxbr")) "nothing")
 
+(define_insn_reservation "zEC12_kxbr" 18
+  (and (eq_attr "cpu" "zEC12")
+       (eq_attr "mnemonic" "kxbr")) "nothing")
+
 (define_insn_reservation "zEC12_ddbr" 36
   (and (eq_attr "cpu" "zEC12")
        (eq_attr "mnemonic" "ddbr")) "nothing")
@@ -578,10 +582,18 @@
   (and (eq_attr "cpu" "zEC12")
        (eq_attr "mnemonic" "cdtr")) "nothing")
 
+(define_insn_reservation "zEC12_kdtr" 11
+  (and (eq_attr "cpu" "zEC12")
+       (eq_attr "mnemonic" "kdtr")) "nothing")
+
 (define_insn_reservation "zEC12_cxtr" 14
   (and (eq_attr "cpu" "zEC12")
        (eq_attr "mnemonic" "cxtr")) "nothing")
 
+(define_insn_reservation "zEC12_kxtr" 14
+  (and (eq_attr "cpu" "zEC12")
+       (eq_attr "mnemonic" "kxtr")) "nothing")
+
 (define_insn_reservation "zEC12_slbg" 3
   (and (eq_attr "cpu" "zEC12")
        (eq_attr "mnemonic" "slbg")) "nothing")
diff --git a/gcc/config/s390/2964.md b/gcc/config/s390/2964.md
index a7897bc..4396e3b 100644
--- a/gcc/config/s390/2964.md
+++ b/gcc/config/s390/2964.md
@@ -69,7 +69,7 @@ ng,ni,niy,ntstg,ny,o,og,oi,oiy,oy,s,sar,sdb,seb,sfpc,sg,sgf,sh,shy,sl,\
 slb,slbg,slg,slgf,sly,sqdb,sqeb,st,stc,stcy,std,stdy,ste,stey,stg,stgrl,\
 sth,sthrl,sthy,stoc,stocg,strl,strv,strvg,strvh,sty,sy,tabort,tm,tmy,vl,\
 vlbb,vleb,vlef,vleg,vleh,vll,vllezb,vllezf,vllezg,vllezh,vllezlf,vlrepb,\
-vlrepf,vlrepg,vlreph,vst,vstl,x,xg,xi,xiy,xy")
+vlrepf,vlrepg,vlreph,vst,vstl,x,xg,xi,xiy,xy,kdb")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z13_unit_vfu" ""
@@ -109,7 +109,8 @@ vuplhh,vuplhw,vupllb,vupllf,vupllh,vx,vzero,wcdgb,wcdlgb,wcgdb,wclgdb,wfadb,\
 wfasb,wfaxb,wfcdb,wfcedb,wfcesb,wfcexbs,wfchdb,wfchedb,wfchesb,wfchexb,\
 wfchexbs,wfchsb,wfchxb,wfchxbs,wfcsb,wfisb,wfixb,wflcdb,wflcsb,wflcxb,wflld,\
 wflndb,wflnsb,wflnxb,wflpdb,wflpsb,wflpxb,wfmadb,wfmasb,wfmaxb,wfmdb,wfmsb,\
-wfmsdb,wfmssb,wfmsxb,wfmxb,wfsdb,wfssb,wfsxb,wldeb,wledb")
+wfmsdb,wfmssb,wfmsxb,wfmxb,wfsdb,wfssb,wfsxb,wldeb,wledb,kebr,kdb,kdbr,kxbr,\
+kdtr,kxtr,wfkdb,wfksb")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z13_cracked" ""
@@ -131,7 +132,7 @@ stmg,stmy,tbegin,tbeginc")
 cxtr,dlgr,dlr,dr,dsgfr,dsgr,dxbr,dxtr,fixbr,fixbra,fixtr,flogr,lcxbr,lnxbr,\
 lpxbr,ltxbr,ltxtr,lxdb,lxdbr,lxdtr,lxeb,lxebr,m,madb,maeb,maebr,mfy,ml,mlg,\
 mlgr,mlr,mr,msdb,mseb,msebr,mvc,mxbr,mxtr,oc,sfpc,slb,slbg,slbgr,slbr,\
-sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc")
+sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc,kxbr,kxtr")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z13_endgroup" ""
@@ -198,7 +199,7 @@ vchlhs,vfcedbs,vfcesbs,vfchdbs,vfchedbs,vfchesbs,vfchsbs,vfeeb,vfeef,vfeeh,\
 vfeneb,vfenef,vfeneh,vfenezb,vfenezf,vfenezh,vftcidb,vftcisb,vistrb,vistrf,\
 vistrh,vllezb,vllezf,vllezg,vllezh,vllezlf,vlrepb,vlrepf,vlrepg,vlreph,vlvgp,\
 vpklsfs,vpklsgs,vpklshs,vpksfs,vpksgs,vpkshs,vslb,vsrab,vsrlb,wfcdb,wfcexbs,\
-wfchexbs,wfchxbs,wfcsb")) "nothing")
+wfchexbs,wfchxbs,wfcsb,kebr,kdb,kdbr,wfkdb,wfksb")) "nothing")
 
 (define_insn_reservation "z13_3" 3
   (and (eq_attr "cpu" "z13")
@@ -232,7 +233,7 @@ wfmdb,wfmsb,wfmsdb,wfmssb,wfmsxb,wfmxb,wfsdb,wfssb,wfsxb,wldeb,wledb")) "nothing
   (and (eq_attr "cpu" "z13")
 (eq_attr "mnemonic" "adtr,cdtr,fidtr,ldetr,msg,msgr,sdtr,tdcdt,tdcet,\
 vcdgb,vcdlgb,vcgdb,vclgdb,vfadb,vfasb,vfidb,vfisb,vfmadb,vfmasb,vfmdb,vfmsb,\
-vfmsdb,vfmssb,vfsdb,vfssb,vldeb,vledb")) "nothing")
+vfmsdb,vfmssb,vfsdb,vfssb,vldeb,vledb,kdtr")) "nothing")
 
 (define_insn_reservation "z13_8" 8
   (and (eq_attr "cpu" "z13")
@@ -254,7 +255,7 @@ celgbr,flogr,m,madb,maeb,maebr,mfy,ml,mlr,mr,msdb,mseb,msebr")) "nothing")
 (define_insn_reservation "z13_12" 12
   (and (eq_attr "cpu" "z13")
 (eq_attr "mnemonic" "cfdbr,cfebr,cgdbr,cgebr,clfdbr,clfebr,clgdbr,\
-clgebr,cxbr,cxtr,mlg,mlgr,tcxb,tdcxt")) "nothing")
+clgebr,cxbr,cxtr,mlg,mlgr,tcxb,tdcxt,kxbr,kxtr")) "nothing")
 
 (define_insn_reservation "z13_13" 13
   (and (eq_attr "cpu" "z13")
diff --git a/gcc/config/s390/3906.md b/gcc/config/s390/3906.md
index 8cb4565..1212d8b 100644
--- a/gcc/config/s390/3906.md
+++ b/gcc/config/s390/3906.md
@@ -71,7 +71,7 @@ sgh,sh,shy,sl,slb,slbg,slg,slgf,sly,sqdb,sqeb,st,stc,stcy,std,stdy,ste,\
 stey,stg,stgrl,sth,sthrl,sthy,stoc,stocg,strl,strv,strvg,strvh,sty,sy,\
 tabort,tm,tmy,vl,vlbb,vleb,vlef,vleg,vleh,vll,vllezb,vllezf,vllezg,vllezh,\
 vllezlf,vlrepb,vlrepf,vlrepg,vlreph,vlrl,vlrlr,vst,vstl,vstrl,vstrlr,x,xg,xi,\
-xiy,xy")
+xiy,xy,kdb")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z14_unit_vfu" ""
@@ -113,7 +113,8 @@ wfadb,wfasb,wfaxb,wfcdb,wfcedb,wfcesb,wfcexbs,wfchdb,wfchedb,wfchesb,\
 wfchexb,wfchexbs,wfchsb,wfchxb,wfchxbs,wfcsb,wfisb,wfixb,wflcdb,wflcsb,wflcxb,\
 wflld,wflndb,wflnsb,wflnxb,wflpdb,wflpsb,wflpxb,wfmadb,wfmasb,wfmaxb,\
 wfmaxxb,wfmdb,wfminxb,wfmsb,wfmsdb,wfmssb,wfmsxb,wfmxb,wfnmaxb,wfnmsxb,wfsdb,\
-wfssb,wfsxb,wldeb,wledb")
+wfssb,wfsxb,wldeb,wledb,kebr,kdb,kdbr,kxbr,kdtr,kxtr,wfkdb,wfksb,vfkesb,\
+vfkedb,vfkhsb,vfkhdb,wfkhxb,vfkhesb,vfkhedb,wfkhexb")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z14_cracked" ""
@@ -135,7 +136,7 @@ stmg,stmy,tbegin,tbeginc")
 cxtr,dlgr,dlr,dr,dsgfr,dsgr,dxbr,dxtr,fixbr,fixbra,fixtr,flogr,lcxbr,lnxbr,\
 lpxbr,ltxbr,ltxtr,lxdb,lxdbr,lxdtr,lxeb,lxebr,m,madb,maeb,maebr,mfy,mg,mgrk,\
 ml,mlg,mlgr,mlr,mr,msdb,mseb,msebr,mvc,mxbr,mxtr,oc,ppa,sfpc,slb,slbg,\
-slbgr,slbr,sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc")
+slbgr,slbr,sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc,kxbr,kxtr")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z14_endgroup" ""
@@ -192,7 +193,8 @@ vrepig,vrepih,vsb,vsbiq,vscbib,vscbif,vscbig,vscbih,vscbiq,vsegb,vsegf,vsegh,\
 vsel,vsf,vsg,vsh,vsl,vslb,vsldb,vsq,vsra,vsrab,vsrl,vsrlb,vuphb,vuphf,\
 vuphh,vuplb,vuplf,vuplhb,vuplhf,vuplhh,vuplhw,vupllb,vupllf,vupllh,vx,vzero,\
 wfcedb,wfcesb,wfchdb,wfchedb,wfchesb,wfchexb,wfchsb,wfchxb,wflcdb,wflcsb,\
-wflcxb,wflndb,wflnsb,wflnxb,wflpdb,wflpsb,wflpxb,wfmaxxb,wfminxb,xi,xiy")) "nothing")
+wflcxb,wflndb,wflnsb,wflnxb,wflpdb,wflpsb,wflpxb,wfmaxxb,wfminxb,xi,xiy,\
+vfkesb,vfkedb,vfkhsb,vfkhdb,wfkhxb,vfkhesb,vfkhedb,wfkhexb")) "nothing")
 
 (define_insn_reservation "z14_2" 2
   (and (eq_attr "cpu" "z14")
@@ -204,7 +206,7 @@ vchlhs,vfcedbs,vfcesbs,vfchdbs,vfchedbs,vfchesbs,vfchsbs,vfeeb,vfeef,vfeeh,\
 vfeneb,vfenef,vfeneh,vfenezb,vfenezf,vfenezh,vftcidb,vftcisb,vistrb,vistrf,\
 vistrh,vlgvf,vlgvg,vlgvh,vllezb,vllezf,vllezg,vllezh,vllezlf,vlrepb,vlrepf,\
 vlrepg,vlreph,vlrl,vlvgp,vpklsfs,vpklsgs,vpklshs,vpksfs,vpksgs,vpkshs,wfcdb,\
-wfcexbs,wfchexbs,wfchxbs,wfcsb")) "nothing")
+wfcexbs,wfchexbs,wfchxbs,wfcsb,kebr,kdb,kdbr,wfkdb,wfksb")) "nothing")
 
 (define_insn_reservation "z14_3" 3
   (and (eq_attr "cpu" "z14")
@@ -238,7 +240,8 @@ wfmasb,wfmdb,wfmsb,wfmsdb,wfmssb,wfsdb,wfssb,wldeb,wledb")) "nothing")
 (define_insn_reservation "z14_7" 7
   (and (eq_attr "cpu" "z14")
 (eq_attr "mnemonic" "adtr,cdtr,fidtr,ldetr,msgrkc,sdtr,tdcdt,tdcet,\
-vfasb,vfisb,vfmasb,vfmsb,vfmssb,vfnmssb,vfssb,vgef,vgeg,wflld")) "nothing")
+vfasb,vfisb,vfmasb,vfmsb,vfmssb,vfnmssb,vfssb,vgef,vgeg,wflld,kdtr"))
+"nothing")
 
 (define_insn_reservation "z14_8" 8
   (and (eq_attr "cpu" "z14")
@@ -261,7 +264,7 @@ celgbr,madb,maeb,maebr,msdb,mseb,msebr,vscef,vsceg")) "nothing")
 (define_insn_reservation "z14_12" 12
   (and (eq_attr "cpu" "z14")
 (eq_attr "mnemonic" "cfdbr,cfebr,cgdbr,cgebr,clfdbr,clfebr,clgdbr,\
-clgebr,cxbr,cxtr,tcxb,tdcxt")) "nothing")
+clgebr,cxbr,cxtr,tcxb,tdcxt,kxbr,kxtr")) "nothing")
 
 (define_insn_reservation "z14_13" 13
   (and (eq_attr "cpu" "z14")
diff --git a/gcc/config/s390/8561.md b/gcc/config/s390/8561.md
index 2442349..6bb0386 100644
--- a/gcc/config/s390/8561.md
+++ b/gcc/config/s390/8561.md
@@ -70,7 +70,7 @@ sar,sdb,seb,sfpc,sg,sgf,sgh,sh,shy,sl,slb,slbg,slg,slgf,sly,sqdb,sqeb,st,\
 stc,stcy,std,stdy,ste,stey,stg,stgrl,sth,sthrl,sthy,stoc,stocg,strl,strv,\
 strvg,strvh,sty,sy,tabort,tm,tmy,vl,vlbb,vleb,vlef,vleg,vleh,vll,vllezb,\
 vllezf,vllezg,vllezh,vllezlf,vlrepb,vlrepf,vlrepg,vlreph,vlrl,vlrlr,vst,\
-vstef,vsteg,vstl,vstrl,vstrlr,x,xg,xi,xiy,xy")
+vstef,vsteg,vstl,vstrl,vstrlr,x,xg,xi,xiy,xy,keb,kdb")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z15_unit_vfu" ""
@@ -112,7 +112,9 @@ vupllf,vupllh,vx,vzero,wfadb,wfasb,wfaxb,wfcdb,wfcedb,wfcesb,wfcexb,wfcexbs,\
 wfchdb,wfchedb,wfchesb,wfchexb,wfchexbs,wfchsb,wfchxb,wfchxbs,wfcsb,wfidb,\
 wfisb,wfixb,wflcdb,wflcsb,wflcxb,wflld,wflndb,wflnsb,wflnxb,wflpdb,wflpsb,\
 wflpxb,wfmadb,wfmasb,wfmaxb,wfmaxxb,wfmdb,wfminxb,wfmsb,wfmsdb,wfmssb,wfmsxb,\
-wfmxb,wfnmaxb,wfnmsxb,wfsdb,wfssb,wfsxb,wldeb,wledb")
+wfmxb,wfnmaxb,wfnmsxb,wfsdb,wfssb,wfsxb,wldeb,wledb,keb,kebr,kdb,kdbr,kxbr,\
+kdtr,kxtr,wfkdb,wfksb,vfkesb,vfkedb,wfkexb,vfkhsb,vfkhdb,wfkhxb,vfkhesb,\
+vfkhedb,wfkhexb")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z15_cracked" ""
@@ -134,7 +136,7 @@ stam,stm,stmg,stmy,tbegin,tbeginc")
 cxtr,dlgr,dlr,dr,dsgfr,dsgr,dxbr,dxtr,fixbr,fixbra,fixtr,flogr,lcxbr,lnxbr,\
 lpxbr,ltxbr,ltxtr,lxdb,lxdbr,lxdtr,lxeb,lxebr,m,madb,maeb,maebr,mfy,mg,mgrk,\
 ml,mlg,mlgr,mlr,mr,msdb,mseb,msebr,mvc,mxbr,mxtr,nc,oc,ppa,sfpc,slb,slbg,\
-slbgr,slbr,sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc")
+slbgr,slbr,sqxbr,sxbr,sxtr,tabort,tcxb,tdcxt,tend,xc,kxbr,kxtr")
  (const_int 1)] (const_int 0)))
 
 (define_attr "z15_endgroup" ""
@@ -194,7 +196,8 @@ vsel,vsf,vsg,vsh,vsl,vslb,vsldb,vsq,vsra,vsrab,vsrl,vsrlb,vuphb,vuphf,\
 vuphh,vuplb,vuplf,vuplhb,vuplhf,vuplhh,vuplhw,vupllb,vupllf,vupllh,vx,vzero,\
 wfcedb,wfcesb,wfcexb,wfchdb,wfchedb,wfchesb,wfchexb,wfchsb,wfchxb,wflcdb,\
 wflcsb,wflcxb,wflndb,wflnsb,wflnxb,wflpdb,wflpsb,wflpxb,wfmaxxb,wfminxb,xi,\
-xiy")) "nothing")
+xiy,vfkesb,vfkedb,wfkexb,vfkhsb,vfkhdb,wfkhxb,vfkhesb,vfkhedb,wfkhexb"))
+"nothing")
 
 (define_insn_reservation "z15_2" 2
   (and (eq_attr "cpu" "z15")
@@ -206,7 +209,8 @@ vchlhs,vfcedbs,vfcesbs,vfchdbs,vfchedbs,vfchesbs,vfchsbs,vfeeb,vfeef,vfeeh,\
 vfeneb,vfenef,vfeneh,vfenezb,vfenezf,vfenezh,vftcidb,vftcisb,vistrb,vistrf,\
 vistrh,vlgvb,vlgvf,vlgvg,vlgvh,vllezb,vllezf,vllezg,vllezh,vllezlf,vlrepb,\
 vlrepf,vlrepg,vlreph,vlrl,vlvgp,vpklsfs,vpklsgs,vpklshs,vpksfs,vpksgs,vpkshs,\
-wfcdb,wfcexbs,wfchexbs,wfchxbs,wfcsb")) "nothing")
+wfcdb,wfcexbs,wfchexbs,wfchxbs,wfcsb,keb,kebr,kdb,kdbr,wfkdb,wfksb"))
+"nothing")
 
 (define_insn_reservation "z15_3" 3
   (and (eq_attr "cpu" "z15")
@@ -240,7 +244,7 @@ wfmasb,wfmdb,wfmsb,wfmsdb,wfmssb,wfsdb,wfssb,wldeb,wledb")) "nothing")
 (define_insn_reservation "z15_7" 7
   (and (eq_attr "cpu" "z15")
 (eq_attr "mnemonic" "adtr,cdtr,fidtr,ldetr,ltdtr,msgrkc,sdtr,tdcdt,\
-tdcet,vgef,vgeg")) "nothing")
+tdcet,vgef,vgeg,kdtr")) "nothing")
 
 (define_insn_reservation "z15_8" 8
   (and (eq_attr "cpu" "z15")
@@ -263,7 +267,8 @@ clgebr,mg,mgrk,mlg,mlgr")) "nothing")
 
 (define_insn_reservation "z15_12" 12
   (and (eq_attr "cpu" "z15")
-(eq_attr "mnemonic" "cxbr,cxftr,cxlftr,cxtr,tcxb,tdcxt")) "nothing")
+(eq_attr "mnemonic" "cxbr,cxftr,cxlftr,cxtr,tcxb,tdcxt,kxbr,kxtr"))
+"nothing")
 
 (define_insn_reservation "z15_13" 13
   (and (eq_attr "cpu" "z15")
diff --git a/gcc/config/s390/s390-builtins.def b/gcc/config/s390/s390-builtins.def
index 7e49d08..a6519da 100644
--- a/gcc/config/s390/s390-builtins.def
+++ b/gcc/config/s390/s390-builtins.def
@@ -1495,8 +1495,8 @@ B_DEF      (vec_cmpgev4si,              vec_cmpgev4si,      0,
 B_DEF      (vec_cmpgeuv4si,             vec_cmpgeuv4si,     0,                  B_INT | B_VX,       0,                  BT_FN_V4SI_UV4SI_UV4SI)
 B_DEF      (vec_cmpgev2di,              vec_cmpgev2di,      0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_UV2DI_UV2DI)
 B_DEF      (vec_cmpgeuv2di,             vec_cmpgeuv2di,     0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_UV2DI_UV2DI)
-B_DEF      (s390_vfchesb,               vec_cmpgev4sf,      0,                  B_VXE,              0,                  BT_FN_V4SI_V4SF_V4SF)
-B_DEF      (s390_vfchedb,               vec_cmpgev2df,      0,                  B_VX,               0,                  BT_FN_V2DI_V2DF_V2DF)
+B_DEF      (s390_vfchesb,               vec_cmpgev4sf_quiet_nocc,0,             B_VXE,              0,                  BT_FN_V4SI_V4SF_V4SF)
+B_DEF      (s390_vfchedb,               vec_cmpgev2df_quiet_nocc,0,             B_VX,               0,                  BT_FN_V2DI_V2DF_V2DF)
 
 OB_DEF     (s390_vec_cmpgt,             s390_vec_cmpgt_s8,  s390_vec_cmpgt_dbl, B_VX,               BT_FN_OV4SI_OV4SI_OV4SI)
 OB_DEF_VAR (s390_vec_cmpgt_s8,          s390_vchb,          0,                  0,                  BT_OV_BV16QI_V16QI_V16QI)
@@ -1518,8 +1518,8 @@ B_DEF      (s390_vchf,                  vec_cmpgtv4si,      0,
 B_DEF      (s390_vchlf,                 vec_cmpgtuv4si,     0,                  B_VX,               0,                  BT_FN_V4SI_UV4SI_UV4SI)
 B_DEF      (s390_vchg,                  vec_cmpgtv2di,      0,                  B_VX,               0,                  BT_FN_V2DI_V2DI_V2DI)
 B_DEF      (s390_vchlg,                 vec_cmpgtuv2di,     0,                  B_VX,               0,                  BT_FN_V2DI_UV2DI_UV2DI)
-B_DEF      (s390_vfchsb,                vec_cmpgtv4sf,      0,                  B_VXE,              0,                  BT_FN_V4SI_V4SF_V4SF)
-B_DEF      (s390_vfchdb,                vec_cmpgtv2df,      0,                  B_VX,               0,                  BT_FN_V2DI_V2DF_V2DF)
+B_DEF      (s390_vfchsb,                vec_cmpgtv4sf_quiet_nocc,0,             B_VXE,              0,                  BT_FN_V4SI_V4SF_V4SF)
+B_DEF      (s390_vfchdb,                vec_cmpgtv2df_quiet_nocc,0,             B_VX,               0,                  BT_FN_V2DI_V2DF_V2DF)
 
 OB_DEF     (s390_vec_cmple,             s390_vec_cmple_s8,  s390_vec_cmple_dbl, B_VX,               BT_FN_OV4SI_OV4SI_OV4SI)
 OB_DEF_VAR (s390_vec_cmple_s8,          vec_cmplev16qi,     0,                  0,                  BT_OV_BV16QI_V16QI_V16QI)
@@ -1541,8 +1541,8 @@ B_DEF      (vec_cmplev4si,              vec_cmplev4si,      0,
 B_DEF      (vec_cmpleuv4si,             vec_cmpleuv4si,     0,                  B_INT | B_VX,       0,                  BT_FN_V4SI_UV4SI_UV4SI)
 B_DEF      (vec_cmplev2di,              vec_cmplev2di,      0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_UV2DI_UV2DI)
 B_DEF      (vec_cmpleuv2di,             vec_cmpleuv2di,     0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_UV2DI_UV2DI)
-B_DEF      (vec_cmplev4sf,              vec_cmplev4sf,      0,                  B_INT | B_VXE,      0,                  BT_FN_V4SI_V4SF_V4SF)
-B_DEF      (vec_cmplev2df,              vec_cmplev2df,      0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_V2DF_V2DF)
+B_DEF      (vec_cmplev4sf,              vec_cmplev4sf_quiet_nocc,0,             B_INT | B_VXE,      0,                  BT_FN_V4SI_V4SF_V4SF)
+B_DEF      (vec_cmplev2df,              vec_cmplev2df_quiet_nocc,0,             B_INT | B_VX,       0,                  BT_FN_V2DI_V2DF_V2DF)
 
 OB_DEF     (s390_vec_cmplt,             s390_vec_cmplt_s8,  s390_vec_cmplt_dbl, B_VX,               BT_FN_OV4SI_OV4SI_OV4SI)
 OB_DEF_VAR (s390_vec_cmplt_s8,          vec_cmpltv16qi,     0,                  0,                  BT_OV_BV16QI_V16QI_V16QI)
@@ -1564,8 +1564,8 @@ B_DEF      (vec_cmpltv4si,              vec_cmpltv4si,      0,
 B_DEF      (vec_cmpltuv4si,             vec_cmpltuv4si,     0,                  B_INT | B_VX,       0,                  BT_FN_V4SI_UV4SI_UV4SI)
 B_DEF      (vec_cmpltv2di,              vec_cmpltv2di,      0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_UV2DI_UV2DI)
 B_DEF      (vec_cmpltuv2di,             vec_cmpltuv2di,     0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_UV2DI_UV2DI)
-B_DEF      (vec_cmpltv4sf,              vec_cmpltv4sf,      0,                  B_INT | B_VXE,      0,                  BT_FN_V4SI_V4SF_V4SF)
-B_DEF      (vec_cmpltv2df,              vec_cmpltv2df,      0,                  B_INT | B_VX,       0,                  BT_FN_V2DI_V2DF_V2DF)
+B_DEF      (vec_cmpltv4sf,              vec_cmpltv4sf_quiet_nocc,0,             B_INT | B_VXE,      0,                  BT_FN_V4SI_V4SF_V4SF)
+B_DEF      (vec_cmpltv2df,              vec_cmpltv2df_quiet_nocc,0,             B_INT | B_VX,       0,                  BT_FN_V2DI_V2DF_V2DF)
 
 OB_DEF     (s390_vec_cntlz,             s390_vec_cntlz_s8,  s390_vec_cntlz_u64, B_VX,               BT_FN_OV4SI_OV4SI)
 OB_DEF_VAR (s390_vec_cntlz_s8,          s390_vclzb,         0,                  0,                  BT_OV_UV16QI_V16QI)
diff --git a/gcc/config/s390/s390-modes.def b/gcc/config/s390/s390-modes.def
index 7b7c114..a5e8b94 100644
--- a/gcc/config/s390/s390-modes.def
+++ b/gcc/config/s390/s390-modes.def
@@ -52,6 +52,8 @@ CCS:  EQ          LT           GT          UNORDERED  (LTGFR, LTGR, LTR, ICM/Y,
                                                        ADB/R, AEB/R, SDB/R, SEB/R,
                                                        SRAG, SRA, SRDA)
 CCSR: EQ          GT           LT          UNORDERED  (CGF/R, CH/Y)
+CCSFPS: EQ        LT           GT          UNORDERED  (KEB/R, KDB/R, KXBR, KDTR,
+						       KXTR, WFK)
 
 Condition codes resulting from add with overflow
 
@@ -140,6 +142,11 @@ around. The following both modes can be considered as CCS and CCU modes with
 exchanged operands.
 
 
+CCSFPS
+
+This mode is used for signaling rtxes: LT, LE, GT, GE and LTGT.
+
+
 CCL1, CCL2
 
 These modes represent the result of overflow checks.
@@ -226,6 +233,7 @@ CC_MODE (CCU);
 CC_MODE (CCUR);
 CC_MODE (CCS);
 CC_MODE (CCSR);
+CC_MODE (CCSFPS);
 CC_MODE (CCT);
 CC_MODE (CCT1);
 CC_MODE (CCT2);
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 10a9b7b..9fed7d3 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -1382,6 +1382,7 @@ s390_match_ccmode_set (rtx set, machine_mode req_mode)
     case E_CCZ1mode:
     case E_CCSmode:
     case E_CCSRmode:
+    case E_CCSFPSmode:
     case E_CCUmode:
     case E_CCURmode:
     case E_CCOmode:
@@ -1565,6 +1566,12 @@ s390_select_ccmode (enum rtx_code code, rtx op0, rtx op1)
 	    else
 	      return CCAPmode;
 	  }
+
+	/* Fall through.  */
+      case LTGT:
+	if (HONOR_NANS (op0) || HONOR_NANS (op1))
+	  return CCSFPSmode;
+
 	/* Fall through.  */
       case UNORDERED:
       case ORDERED:
@@ -1573,7 +1580,6 @@ s390_select_ccmode (enum rtx_code code, rtx op0, rtx op1)
       case UNLT:
       case UNGE:
       case UNGT:
-      case LTGT:
 	if ((GET_CODE (op0) == SIGN_EXTEND || GET_CODE (op0) == ZERO_EXTEND)
 	    && GET_CODE (op1) != CONST_INT)
 	  return CCSRmode;
@@ -2088,6 +2094,7 @@ s390_branch_condition_mask (rtx code)
       break;
 
     case E_CCSmode:
+    case E_CCSFPSmode:
       switch (GET_CODE (code))
 	{
 	case EQ:	return CC0;
@@ -6510,18 +6517,23 @@ s390_expand_vec_compare (rtx target, enum rtx_code cond,
 	{
 	  /* NE a != b -> !(a == b) */
 	case NE:   cond = EQ; neg_p = true;                break;
-	  /* UNGT a u> b -> !(b >= a) */
-	case UNGT: cond = GE; neg_p = true; swap_p = true; break;
-	  /* UNGE a u>= b -> !(b > a) */
-	case UNGE: cond = GT; neg_p = true; swap_p = true; break;
-	  /* LE: a <= b -> b >= a */
+	case UNGT:
+	  emit_insn (gen_vec_cmpungt (target, cmp_op1, cmp_op2));
+	  return;
+	case UNGE:
+	  emit_insn (gen_vec_cmpunge (target, cmp_op1, cmp_op2));
+	  return;
 	case LE:   cond = GE;               swap_p = true; break;
-	  /* UNLE: a u<= b -> !(a > b) */
-	case UNLE: cond = GT; neg_p = true;                break;
+	  /* UNLE: (a u<= b) -> (b u>= a).  */
+	case UNLE:
+	  emit_insn (gen_vec_cmpunge (target, cmp_op2, cmp_op1));
+	  return;
 	  /* LT: a < b -> b > a */
 	case LT:   cond = GT;               swap_p = true; break;
-	  /* UNLT: a u< b -> !(a >= b) */
-	case UNLT: cond = GE; neg_p = true;                break;
+	  /* UNLT: (a u< b) -> (b u> a).  */
+	case UNLT:
+	  emit_insn (gen_vec_cmpungt (target, cmp_op2, cmp_op1));
+	  return;
 	case UNEQ:
 	  emit_insn (gen_vec_cmpuneq (target, cmp_op1, cmp_op2));
 	  return;
@@ -6684,7 +6696,7 @@ s390_reverse_condition (machine_mode mode, enum rtx_code code)
 {
   /* Reversal of FP compares takes care -- an ordered compare
      becomes an unordered compare and vice versa.  */
-  if (mode == CCVFALLmode || mode == CCVFANYmode)
+  if (mode == CCVFALLmode || mode == CCVFANYmode || mode == CCSFPSmode)
     return reverse_condition_maybe_unordered (code);
   else if (mode == CCVIALLmode || mode == CCVIANYmode)
     return reverse_condition (code);
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 73a8c35..4f7bde6 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -1423,6 +1423,20 @@
    (set_attr "cpu_facility" "*,*,vx,vxe")
    (set_attr "enabled" "*,<DSF>,<DF>,<SF>")])
 
+(define_insn "*cmp<mode>_ccsfps"
+  [(set (reg CC_REGNUM)
+	(compare (match_operand:FP 0 "register_operand" "f,f,v,v")
+		 (match_operand:FP 1 "general_operand"  "f,R,v,v")))]
+  "s390_match_ccmode (insn, CCSFPSmode) && TARGET_HARD_FLOAT"
+  "@
+   k<xde><bt>r\t%0,%1
+   k<xde>b\t%0,%1
+   wfkdb\t%0,%1
+   wfksb\t%0,%1"
+  [(set_attr "op_type" "RRE,RXE,VRR,VRR")
+   (set_attr "cpu_facility" "*,*,vx,vxe")
+   (set_attr "enabled" "*,<DSF>,<DF>,<SF>")])
+
 ; Compare and Branch instructions
 
 ; cij, cgij, crj, cgrj, cfi, cgfi, cr, cgr
diff --git a/gcc/config/s390/vector.md b/gcc/config/s390/vector.md
index e50047b..d40e310 100644
--- a/gcc/config/s390/vector.md
+++ b/gcc/config/s390/vector.md
@@ -168,10 +168,6 @@
 (define_mode_attr vec_halfnumelts
   [(V4SF "V2SF") (V4SI "V2SI")])
 
-; The comparisons not setting CC iterate over the rtx code.
-(define_code_iterator VFCMP_HW_OP [eq gt ge])
-(define_code_attr asm_fcmp_op [(eq "e") (gt "h") (ge "he")])
-
 
 
 ; Comparison operators on int and fp compares which are directly
@@ -1377,7 +1373,8 @@
   "#"
   "&& 1"
   [(set (match_dup 3)
-	(gt:V2DI (match_dup 1) (match_dup 2)))
+	(not:V2DI
+	 (unge:V2DI (match_dup 2) (match_dup 1))))
    (set (match_dup 0)
 	(if_then_else:V2DF
 	 (eq (match_dup 3) (match_dup 4))
@@ -1412,7 +1409,8 @@
   "#"
   "&& 1"
   [(set (match_dup 3)
-	(gt:V2DI (match_dup 1) (match_dup 2)))
+	(not:V2DI
+	 (unge:V2DI (match_dup 2) (match_dup 1))))
    (set (match_dup 0)
 	(if_then_else:V2DF
 	 (eq (match_dup 3) (match_dup 4))
@@ -1466,27 +1464,134 @@
 ;; Floating point compares
 ;;
 
-; EQ, GT, GE
-; vfcesb, vfcedb, wfcexb, vfchsb, vfchdb, wfchxb, vfchesb, vfchedb, wfchexb
-(define_insn "*vec_cmp<VFCMP_HW_OP:code><mode>_nocc"
-  [(set (match_operand:<tointvec>                  0 "register_operand" "=v")
-	(VFCMP_HW_OP:<tointvec> (match_operand:VFT 1 "register_operand"  "v")
-			     (match_operand:VFT 2 "register_operand"  "v")))]
-   "TARGET_VX"
-   "<vw>fc<VFCMP_HW_OP:asm_fcmp_op><sdx>b\t%v0,%v1,%v2"
+; vfcesb, vfcedb, wfcexb: non-signaling "==" comparison (a == b)
+(define_insn "*vec_cmpeq<mode>_quiet_nocc"
+  [(set (match_operand:<tointvec>         0 "register_operand" "=v")
+	(eq:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+		       (match_operand:VFT 2 "register_operand" "v")))]
+  "TARGET_VX"
+  "<vw>fce<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+; vfchsb, vfchdb, wfchxb: non-signaling > comparison (!(b u>= a))
+(define_insn "vec_cmpgt<mode>_quiet_nocc"
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unge:<tointvec> (match_operand:VFT 2 "register_operand" "v")
+			  (match_operand:VFT 1 "register_operand" "v"))))]
+  "TARGET_VX"
+  "<vw>fch<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+(define_expand "vec_cmplt<mode>_quiet_nocc"
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unge:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+			  (match_operand:VFT 2 "register_operand" "v"))))]
+  "TARGET_VX")
+
+; vfchesb, vfchedb, wfchexb: non-signaling >= comparison (!(a u< b))
+(define_insn "vec_cmpge<mode>_quiet_nocc"
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unlt:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+			  (match_operand:VFT 2 "register_operand" "v"))))]
+  "TARGET_VX"
+  "<vw>fche<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+(define_expand "vec_cmple<mode>_quiet_nocc"
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unlt:<tointvec> (match_operand:VFT 2 "register_operand" "v")
+			  (match_operand:VFT 1 "register_operand" "v"))))]
+  "TARGET_VX")
+
+; vfkesb, vfkedb, wfkexb: signaling == comparison ((a >= b) & (b >= a))
+(define_insn "*vec_cmpeq<mode>_signaling_nocc"
+  [(set (match_operand:<tointvec>          0 "register_operand" "=v")
+	(and:<tointvec>
+	 (ge:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+			(match_operand:VFT 2 "register_operand" "v"))
+	 (ge:<tointvec> (match_dup         2)
+			(match_dup         1))))]
+  "TARGET_VXE"
+  "<vw>fke<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+; vfkhsb, vfkhdb, wfkhxb: signaling > comparison (a > b)
+(define_insn "*vec_cmpgt<mode>_signaling_nocc"
+  [(set (match_operand:<tointvec>         0 "register_operand" "=v")
+	(gt:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+		       (match_operand:VFT 2 "register_operand" "v")))]
+  "TARGET_VXE"
+  "<vw>fkh<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+(define_insn "*vec_cmpgt<mode>_signaling_finite_nocc"
+  [(set (match_operand:<tointvec>         0 "register_operand" "=v")
+	(gt:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+		       (match_operand:VFT 2 "register_operand" "v")))]
+  "TARGET_VX && !TARGET_VXE && flag_finite_math_only"
+  "<vw>fch<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+; vfkhesb, vfkhedb, wfkhexb: signaling >= comparison (a >= b)
+(define_insn "*vec_cmpge<mode>_signaling_nocc"
+  [(set (match_operand:<tointvec>         0 "register_operand" "=v")
+	(ge:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+		       (match_operand:VFT 2 "register_operand" "v")))]
+  "TARGET_VXE"
+  "<vw>fkhe<sdx>b\t%v0,%v1,%v2"
+  [(set_attr "op_type" "VRR")])
+
+(define_insn "*vec_cmpge<mode>_signaling_finite_nocc"
+  [(set (match_operand:<tointvec>         0 "register_operand" "=v")
+	(ge:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+		       (match_operand:VFT 2 "register_operand" "v")))]
+  "TARGET_VX && !TARGET_VXE && flag_finite_math_only"
+  "<vw>fche<sdx>b\t%v0,%v1,%v2"
   [(set_attr "op_type" "VRR")])
 
 ; Expanders for not directly supported comparisons
+; Signaling comparisons must be expressed via signaling rtxes only,
+; and quiet comparisons must be expressed via quiet rtxes only.
+
+; UNGT a u> b -> !!(b u< a)
+(define_expand "vec_cmpungt<mode>"
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unlt:<tointvec> (match_operand:VFT 2 "register_operand" "v")
+			  (match_operand:VFT 1 "register_operand" "v"))))
+   (set (match_dup                           0)
+	(not:<tointvec> (match_dup           0)))]
+  "TARGET_VX")
 
-; UNEQ a u== b -> !(a > b | b > a)
+; UNGE a u>= b -> !!(a u>= b)
+(define_expand "vec_cmpunge<mode>"
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unge:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+			  (match_operand:VFT 2 "register_operand" "v"))))
+   (set (match_dup                           0)
+	(not:<tointvec> (match_dup           0)))]
+  "TARGET_VX")
+
+; UNEQ a u== b -> !(!(a u>= b) | !(b u>= a))
 (define_expand "vec_cmpuneq<mode>"
-  [(set (match_operand:<tointvec>         0 "register_operand" "=v")
-	(gt:<tointvec> (match_operand:VFT 1 "register_operand"  "v")
-		    (match_operand:VFT 2 "register_operand"  "v")))
-   (set (match_dup 3)
-	(gt:<tointvec> (match_dup 2) (match_dup 1)))
-   (set (match_dup 0) (ior:<tointvec> (match_dup 0) (match_dup 3)))
-   (set (match_dup 0) (not:<tointvec> (match_dup 0)))]
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unge:<tointvec> (match_operand:VFT 1 "register_operand"  "v")
+		          (match_operand:VFT 2 "register_operand"  "v"))))
+   (set (match_dup                           3)
+	(not:<tointvec>
+	 (unge:<tointvec> (match_dup         2)
+	                  (match_dup         1))))
+   (set (match_dup                           0)
+	(ior:<tointvec> (match_dup           0)
+			(match_dup           3)))
+   (set (match_dup                           0)
+	(not:<tointvec> (match_dup           0)))]
   "TARGET_VX"
 {
   operands[3] = gen_reg_rtx (<tointvec>mode);
@@ -1499,18 +1604,24 @@
 		    (match_operand:VFT 2 "register_operand"  "v")))
    (set (match_dup 3) (gt:<tointvec> (match_dup 2) (match_dup 1)))
    (set (match_dup 0) (ior:<tointvec> (match_dup 0) (match_dup 3)))]
-  "TARGET_VX"
+  "TARGET_VXE"
 {
   operands[3] = gen_reg_rtx (<tointvec>mode);
 })
 
-; ORDERED (a, b): a >= b | b > a
+; ORDERED (a, b): !(a u< b) | !(a u>= b)
 (define_expand "vec_cmpordered<mode>"
-  [(set (match_operand:<tointvec>          0 "register_operand" "=v")
-	(ge:<tointvec> (match_operand:VFT 1 "register_operand"  "v")
-		 (match_operand:VFT 2 "register_operand"  "v")))
-   (set (match_dup 3) (gt:<tointvec> (match_dup 2) (match_dup 1)))
-   (set (match_dup 0) (ior:<tointvec> (match_dup 0) (match_dup 3)))]
+  [(set (match_operand:<tointvec>            0 "register_operand" "=v")
+	(not:<tointvec>
+	 (unlt:<tointvec> (match_operand:VFT 1 "register_operand" "v")
+		          (match_operand:VFT 2 "register_operand" "v"))))
+   (set (match_dup                           3)
+	(not:<tointvec>
+	 (unge:<tointvec> (match_dup         1)
+			  (match_dup         2))))
+   (set (match_dup                           0)
+	(ior:<tointvec> (match_dup           0)
+			(match_dup           3)))]
   "TARGET_VX"
 {
   operands[3] = gen_reg_rtx (<tointvec>mode);
@@ -1530,7 +1641,7 @@
 })
 
 (define_code_iterator VEC_CMP_EXPAND
-  [uneq ltgt ordered unordered])
+  [ungt unge uneq ltgt ordered unordered])
 
 (define_expand "vec_cmp<code>"
   [(match_operand 0 "register_operand" "")
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 612b22b..668abb6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* gcc.target/s390/vector/vec-scalar-cmp-1.c: Adjust
+	expectations.
+
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/array38.adb: New test.
diff --git a/gcc/testsuite/gcc.target/s390/vector/vec-scalar-cmp-1.c b/gcc/testsuite/gcc.target/s390/vector/vec-scalar-cmp-1.c
index ea51d0c..073d574 100644
--- a/gcc/testsuite/gcc.target/s390/vector/vec-scalar-cmp-1.c
+++ b/gcc/testsuite/gcc.target/s390/vector/vec-scalar-cmp-1.c
@@ -34,7 +34,7 @@ gt (double a, double b)
   return a > b;
 }
 
-/* { dg-final { scan-assembler "gt:\n\[^:\]*\twfcdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinh\t%r2,0" } } */
+/* { dg-final { scan-assembler "gt:\n\[^:\]*\twfkdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinh\t%r2,0" } } */
 
 int
 ge (double a, double b)
@@ -45,7 +45,7 @@ ge (double a, double b)
   return a >= b;
 }
 
-/* { dg-final { scan-assembler "ge:\n\[^:\]*\twfcdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinhe\t%r2,0" } } */
+/* { dg-final { scan-assembler "ge:\n\[^:\]*\twfkdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinhe\t%r2,0" } } */
 
 int
 lt (double a, double b)
@@ -56,7 +56,7 @@ lt (double a, double b)
   return a < b;
 }
 
-/* { dg-final { scan-assembler "lt:\n\[^:\]*\twfcdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinl\t%r2,0" } } */
+/* { dg-final { scan-assembler "lt:\n\[^:\]*\twfkdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinl\t%r2,0" } } */
 
 int
 le (double a, double b)
@@ -67,4 +67,4 @@ le (double a, double b)
   return a <= b;
 }
 
-/* { dg-final { scan-assembler "le:\n\[^:\]*\twfcdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinle\t%r2,0" } } */
+/* { dg-final { scan-assembler "le:\n\[^:\]*\twfkdb\t%v\[0-9\]*,%v\[0-9\]*\n\t\[^:\]+\tlochinle\t%r2,0" } } */
-- 
cgit v1.1


From 76dcb70dab490c5dbabaf1b982a1650da2a341cf Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Fri, 11 Oct 2019 09:03:00 +0000
Subject: S/390: Test signaling FP comparison instructions

gcc/testsuite/ChangeLog:

2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>

	PR target/77918
	* gcc.target/s390/s390.exp: Enable Fortran tests.
	* gcc.target/s390/zvector/autovec-double-quiet-eq.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-ge.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-gt.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-le.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-lt.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-ordered.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-uneq.c: New test.
	* gcc.target/s390/zvector/autovec-double-quiet-unordered.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-eq-z13-finite.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-eq-z13.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-eq.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-ge-z13-finite.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-ge-z13.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-ge.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-gt-z13-finite.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-gt-z13.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-gt.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-le-z13-finite.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-le-z13.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-le.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-lt-z13-finite.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-lt-z13.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-lt.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13-finite.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13.c: New test.
	* gcc.target/s390/zvector/autovec-double-signaling-ltgt.c: New test.
	* gcc.target/s390/zvector/autovec-double-smax-z13.F90: New test.
	* gcc.target/s390/zvector/autovec-double-smax.F90: New test.
	* gcc.target/s390/zvector/autovec-double-smin-z13.F90: New test.
	* gcc.target/s390/zvector/autovec-double-smin.F90: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-eq.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-ge.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-gt.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-le.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-lt.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-ordered.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-uneq.c: New test.
	* gcc.target/s390/zvector/autovec-float-quiet-unordered.c: New test.
	* gcc.target/s390/zvector/autovec-float-signaling-eq.c: New test.
	* gcc.target/s390/zvector/autovec-float-signaling-ge.c: New test.
	* gcc.target/s390/zvector/autovec-float-signaling-gt.c: New test.
	* gcc.target/s390/zvector/autovec-float-signaling-le.c: New test.
	* gcc.target/s390/zvector/autovec-float-signaling-lt.c: New test.
	* gcc.target/s390/zvector/autovec-float-signaling-ltgt.c: New test.
	* gcc.target/s390/zvector/autovec-fortran.h: New test.
	* gcc.target/s390/zvector/autovec-long-double-signaling-ge.c: New test.
	* gcc.target/s390/zvector/autovec-long-double-signaling-gt.c: New test.
	* gcc.target/s390/zvector/autovec-long-double-signaling-le.c: New test.
	* gcc.target/s390/zvector/autovec-long-double-signaling-lt.c: New test.
	* gcc.target/s390/zvector/autovec.h: New test.

From-SVN: r276872
---
 gcc/testsuite/ChangeLog                            | 55 ++++++++++++++++++++++
 gcc/testsuite/gcc.target/s390/s390.exp             |  8 ++++
 .../s390/zvector/autovec-double-quiet-eq.c         |  8 ++++
 .../s390/zvector/autovec-double-quiet-ge.c         |  8 ++++
 .../s390/zvector/autovec-double-quiet-gt.c         |  8 ++++
 .../s390/zvector/autovec-double-quiet-le.c         |  8 ++++
 .../s390/zvector/autovec-double-quiet-lt.c         |  8 ++++
 .../s390/zvector/autovec-double-quiet-ordered.c    | 10 ++++
 .../s390/zvector/autovec-double-quiet-uneq.c       | 10 ++++
 .../s390/zvector/autovec-double-quiet-unordered.c  | 11 +++++
 .../autovec-double-signaling-eq-z13-finite.c       | 10 ++++
 .../s390/zvector/autovec-double-signaling-eq-z13.c |  9 ++++
 .../s390/zvector/autovec-double-signaling-eq.c     | 11 +++++
 .../autovec-double-signaling-ge-z13-finite.c       | 10 ++++
 .../s390/zvector/autovec-double-signaling-ge-z13.c |  9 ++++
 .../s390/zvector/autovec-double-signaling-ge.c     |  8 ++++
 .../autovec-double-signaling-gt-z13-finite.c       | 10 ++++
 .../s390/zvector/autovec-double-signaling-gt-z13.c |  9 ++++
 .../s390/zvector/autovec-double-signaling-gt.c     |  8 ++++
 .../autovec-double-signaling-le-z13-finite.c       | 10 ++++
 .../s390/zvector/autovec-double-signaling-le-z13.c |  9 ++++
 .../s390/zvector/autovec-double-signaling-le.c     |  8 ++++
 .../autovec-double-signaling-lt-z13-finite.c       | 10 ++++
 .../s390/zvector/autovec-double-signaling-lt-z13.c |  9 ++++
 .../s390/zvector/autovec-double-signaling-lt.c     |  8 ++++
 .../autovec-double-signaling-ltgt-z13-finite.c     |  9 ++++
 .../zvector/autovec-double-signaling-ltgt-z13.c    |  9 ++++
 .../s390/zvector/autovec-double-signaling-ltgt.c   |  9 ++++
 .../s390/zvector/autovec-double-smax-z13.F90       | 11 +++++
 .../s390/zvector/autovec-double-smax.F90           |  8 ++++
 .../s390/zvector/autovec-double-smin-z13.F90       | 11 +++++
 .../s390/zvector/autovec-double-smin.F90           |  8 ++++
 .../s390/zvector/autovec-float-quiet-eq.c          |  8 ++++
 .../s390/zvector/autovec-float-quiet-ge.c          |  8 ++++
 .../s390/zvector/autovec-float-quiet-gt.c          |  8 ++++
 .../s390/zvector/autovec-float-quiet-le.c          |  8 ++++
 .../s390/zvector/autovec-float-quiet-lt.c          |  8 ++++
 .../s390/zvector/autovec-float-quiet-ordered.c     | 10 ++++
 .../s390/zvector/autovec-float-quiet-uneq.c        | 10 ++++
 .../s390/zvector/autovec-float-quiet-unordered.c   | 11 +++++
 .../s390/zvector/autovec-float-signaling-eq.c      | 11 +++++
 .../s390/zvector/autovec-float-signaling-ge.c      |  8 ++++
 .../s390/zvector/autovec-float-signaling-gt.c      |  8 ++++
 .../s390/zvector/autovec-float-signaling-le.c      |  8 ++++
 .../s390/zvector/autovec-float-signaling-lt.c      |  8 ++++
 .../s390/zvector/autovec-float-signaling-ltgt.c    |  9 ++++
 .../gcc.target/s390/zvector/autovec-fortran.h      |  7 +++
 .../zvector/autovec-long-double-signaling-ge.c     |  8 ++++
 .../zvector/autovec-long-double-signaling-gt.c     |  8 ++++
 .../zvector/autovec-long-double-signaling-le.c     |  8 ++++
 .../zvector/autovec-long-double-signaling-lt.c     |  8 ++++
 gcc/testsuite/gcc.target/s390/zvector/autovec.h    | 43 +++++++++++++++++
 52 files changed, 542 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-eq.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ge.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-gt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-le.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-lt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ordered.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-uneq.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-unordered.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13-finite.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13-finite.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13-finite.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13-finite.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13-finite.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13-finite.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax-z13.F90
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax.F90
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin-z13.F90
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin.F90
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-eq.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ge.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-gt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-le.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-lt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ordered.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-uneq.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-unordered.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-eq.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ge.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-gt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-le.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-lt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ltgt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-fortran.h
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-ge.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-gt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-le.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-lt.c
 create mode 100644 gcc/testsuite/gcc.target/s390/zvector/autovec.h

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 668abb6..c565dae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,60 @@
 2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>
 
+	PR target/77918
+	* gcc.target/s390/s390.exp: Enable Fortran tests.
+	* gcc.target/s390/zvector/autovec-double-quiet-eq.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-ge.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-gt.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-le.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-lt.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-ordered.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-uneq.c: New test.
+	* gcc.target/s390/zvector/autovec-double-quiet-unordered.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-eq-z13-finite.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-eq-z13.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-eq.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-ge-z13-finite.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-ge-z13.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-ge.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-gt-z13-finite.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-gt-z13.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-gt.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-le-z13-finite.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-le-z13.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-le.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-lt-z13-finite.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-lt-z13.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-lt.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13-finite.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13.c: New test.
+	* gcc.target/s390/zvector/autovec-double-signaling-ltgt.c: New test.
+	* gcc.target/s390/zvector/autovec-double-smax-z13.F90: New test.
+	* gcc.target/s390/zvector/autovec-double-smax.F90: New test.
+	* gcc.target/s390/zvector/autovec-double-smin-z13.F90: New test.
+	* gcc.target/s390/zvector/autovec-double-smin.F90: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-eq.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-ge.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-gt.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-le.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-lt.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-ordered.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-uneq.c: New test.
+	* gcc.target/s390/zvector/autovec-float-quiet-unordered.c: New test.
+	* gcc.target/s390/zvector/autovec-float-signaling-eq.c: New test.
+	* gcc.target/s390/zvector/autovec-float-signaling-ge.c: New test.
+	* gcc.target/s390/zvector/autovec-float-signaling-gt.c: New test.
+	* gcc.target/s390/zvector/autovec-float-signaling-le.c: New test.
+	* gcc.target/s390/zvector/autovec-float-signaling-lt.c: New test.
+	* gcc.target/s390/zvector/autovec-float-signaling-ltgt.c: New test.
+	* gcc.target/s390/zvector/autovec-fortran.h: New test.
+	* gcc.target/s390/zvector/autovec-long-double-signaling-ge.c: New test.
+	* gcc.target/s390/zvector/autovec-long-double-signaling-gt.c: New test.
+	* gcc.target/s390/zvector/autovec-long-double-signaling-le.c: New test.
+	* gcc.target/s390/zvector/autovec-long-double-signaling-lt.c: New test.
+	* gcc.target/s390/zvector/autovec.h: New test.
+
+2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>
+
 	* gcc.target/s390/vector/vec-scalar-cmp-1.c: Adjust
 	expectations.
 
diff --git a/gcc/testsuite/gcc.target/s390/s390.exp b/gcc/testsuite/gcc.target/s390/s390.exp
index 86f7e43..925eb56 100644
--- a/gcc/testsuite/gcc.target/s390/s390.exp
+++ b/gcc/testsuite/gcc.target/s390/s390.exp
@@ -27,6 +27,7 @@ if ![istarget s390*-*-*] then {
 # Load support procs.
 load_lib gcc-dg.exp
 load_lib target-supports.exp
+load_lib gfortran-dg.exp
 
 # Return 1 if the the assembler understands .machine and .machinemode.  The
 # target attribute needs that feature to work.
@@ -193,6 +194,10 @@ global DEFAULT_CFLAGS
 if ![info exists DEFAULT_CFLAGS] then {
     set DEFAULT_CFLAGS " -ansi -pedantic-errors"
 }
+global DEFAULT_FFLAGS
+if ![info exists DEFAULT_FFLAGS] then {
+    set DEFAULT_FFLAGS " -pedantic-errors"
+}
 
 # Initialize `dg'.
 dg-init
@@ -209,6 +214,9 @@ dg-runtest [lsort [prune [glob -nocomplain $srcdir/$subdir/*.{c,S}] \
 dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*vector*/*.{c,S}]] \
 	"" $DEFAULT_CFLAGS
 
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*vector*/*.F90]] \
+	"" $DEFAULT_FFLAGS
+
 dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/target-attribute/*.{c,S}]] \
 	"" $DEFAULT_CFLAGS
 
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-eq.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-eq.c
new file mode 100644
index 0000000..46bef83
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-eq.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_EQ);
+
+/* { dg-final { scan-assembler {\n\tvfcedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ge.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ge.c
new file mode 100644
index 0000000..4dbbd8f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ge.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_GE);
+
+/* { dg-final { scan-assembler {\n\tvfchedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-gt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-gt.c
new file mode 100644
index 0000000..57f7cef
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-gt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_GT);
+
+/* { dg-final { scan-assembler {\n\tvfchdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-le.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-le.c
new file mode 100644
index 0000000..3de425c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-le.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_LE);
+
+/* { dg-final { scan-assembler {\n\tvfchedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-lt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-lt.c
new file mode 100644
index 0000000..0817846
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-lt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_LT);
+
+/* { dg-final { scan-assembler {\n\tvfchdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ordered.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ordered.c
new file mode 100644
index 0000000..65b0240
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-ordered.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_ORDERED);
+
+/* { dg-final { scan-assembler {\n\tvfchedb\t} } } */
+/* { dg-final { scan-assembler {\n\tvfchdb\t} } } */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-uneq.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-uneq.c
new file mode 100644
index 0000000..3d6da30
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-uneq.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_UNEQ);
+
+/* { dg-final { scan-assembler-times {\n\tvfchdb\t} 2 } } */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
+/* { dg-final { scan-assembler {\n\tvx\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-unordered.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-unordered.c
new file mode 100644
index 0000000..1f6fb78
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-quiet-unordered.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (QUIET_UNORDERED);
+
+/* { dg-final { scan-assembler {\n\tvfchedb\t} } } */
+/* { dg-final { scan-assembler {\n\tvfchdb\t} } } */
+/* combine prefers to reorder vsel args instead of using vno.  */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13-finite.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13-finite.c
new file mode 100644
index 0000000..461ff8d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13-finite.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -ffinite-math-only -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_EQ);
+
+/* We can use non-signaling vector comparison instructions with
+   -ffinite-math-only.  */
+/* { dg-final { scan-assembler {\n\tvfcedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13.c
new file mode 100644
index 0000000..1806fa8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq-z13.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_EQ);
+
+/* z13 does not have signaling vector comparison instructions.  */
+/* { dg-final { scan-assembler {\n\tkdbr\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq.c
new file mode 100644
index 0000000..a8402b9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-eq.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_EQ);
+
+/* The vectorizer produces <= and ==, which rtl passes cannot turn into vfkedb
+   yet.  */
+/* { dg-final { scan-assembler {\n\tvfcedb\t} } } */
+/* { dg-final { scan-assembler {\n\tvfkhedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13-finite.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13-finite.c
new file mode 100644
index 0000000..518f5d7
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13-finite.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -ffinite-math-only -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_GE);
+
+/* We can use non-signaling vector comparison instructions with
+   -ffinite-math-only.  */
+/* { dg-final { scan-assembler {\n\tvfchedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13.c
new file mode 100644
index 0000000..1e1737f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge-z13.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_GE);
+
+/* z13 does not have signaling vector comparison instructions.  */
+/* { dg-final { scan-assembler {\n\tkdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge.c
new file mode 100644
index 0000000..49172f5
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ge.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_GE);
+
+/* { dg-final { scan-assembler {\n\tvfkhedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13-finite.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13-finite.c
new file mode 100644
index 0000000..cf54ada
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13-finite.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -ffinite-math-only -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_GT);
+
+/* We can use non-signaling vector comparison instructions with
+   -ffinite-math-only.  */
+/* { dg-final { scan-assembler {\n\tvfchdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13.c
new file mode 100644
index 0000000..8a9e03a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt-z13.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_GT);
+
+/* z13 does not have signaling vector comparison instructions.  */
+/* { dg-final { scan-assembler {\n\tkdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt.c
new file mode 100644
index 0000000..af62e1f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-gt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_GT);
+
+/* { dg-final { scan-assembler {\n\tvfkhdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13-finite.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13-finite.c
new file mode 100644
index 0000000..100366e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13-finite.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -ffinite-math-only -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LE);
+
+/* We can use non-signaling vector comparison instructions with
+   -ffinite-math-only.  */
+/* { dg-final { scan-assembler {\n\tvfchedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13.c
new file mode 100644
index 0000000..c0714ef
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le-z13.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LE);
+
+/* z13 does not have signaling vector comparison instructions.  */
+/* { dg-final { scan-assembler {\n\tkdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le.c
new file mode 100644
index 0000000..33266d4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-le.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LE);
+
+/* { dg-final { scan-assembler {\n\tvfkhedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13-finite.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13-finite.c
new file mode 100644
index 0000000..f587364
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13-finite.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -ffinite-math-only -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LT);
+
+/* We can use non-signaling vector comparison instructions with
+   -ffinite-math-only.  */
+/* { dg-final { scan-assembler {\n\tvfchdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13.c
new file mode 100644
index 0000000..18e81be
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt-z13.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LT);
+
+/* z13 does not have signaling vector comparison instructions.  */
+/* { dg-final { scan-assembler {\n\tkdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt.c
new file mode 100644
index 0000000..1ceea1b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-lt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LT);
+
+/* { dg-final { scan-assembler {\n\tvfkhdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13-finite.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13-finite.c
new file mode 100644
index 0000000..8ee3cce
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13-finite.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -ffinite-math-only -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LTGT);
+
+/* ltgt is the same as eq with -ffinite-math-only.  */
+/* { dg-final { scan-assembler {\n\tvfcedb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13.c
new file mode 100644
index 0000000..d270887
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt-z13.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z13 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LTGT);
+
+/* z13 does not have signaling vector comparison instructions.  */
+/* { dg-final { scan-assembler {\n\tkdb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt.c
new file mode 100644
index 0000000..9dfae8f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-signaling-ltgt.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_DOUBLE (SIGNALING_LTGT);
+
+/* { dg-final { scan-assembler-times {\n\tvfkhdb\t} 2 } } */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax-z13.F90 b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax-z13.F90
new file mode 100644
index 0000000..8a23566
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax-z13.F90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! { dg-options "-ffree-line-length-256 -O3 -march=z13 -mzvector -mzarch" }
+
+#include "autovec-fortran.h"
+
+AUTOVEC_FORTRAN (max)
+
+! Fortran's max does not specify whether or not an exception should be raised in
+! face of qNaNs, and neither does gcc's smax.  Vectorize max using quiet
+! comparison, because that's the only one we have on z13.
+! { dg-final { scan-assembler {\n\tvfchdb\t} } }
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax.F90 b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax.F90
new file mode 100644
index 0000000..c877053
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smax.F90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! { dg-options "-ffree-line-length-256 -O3 -march=z14 -mzvector -mzarch" }
+
+#include "autovec-fortran.h"
+
+AUTOVEC_FORTRAN (max)
+
+! { dg-final { scan-assembler {\n\tvfmaxdb\t} } }
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin-z13.F90 b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin-z13.F90
new file mode 100644
index 0000000..37711f9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin-z13.F90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! { dg-options "-ffree-line-length-256 -O3 -march=z13 -mzvector -mzarch" }
+
+#include "autovec-fortran.h"
+
+AUTOVEC_FORTRAN (min)
+
+! Fortran's min does not specify whether or not an exception should be raised in
+! face of qNaNs, and neither does gcc's smin.  Vectorize min using quiet
+! comparison, because that's the only one we have on z13.
+! { dg-final { scan-assembler {\n\tvfchdb\t} } }
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin.F90 b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin.F90
new file mode 100644
index 0000000..25d6213
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-double-smin.F90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! { dg-options "-ffree-line-length-256 -O3 -march=z14 -mzvector -mzarch" }
+
+#include "autovec-fortran.h"
+
+AUTOVEC_FORTRAN (min)
+
+! { dg-final { scan-assembler {\n\tvfmindb\t} } }
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-eq.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-eq.c
new file mode 100644
index 0000000..216063f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-eq.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_EQ);
+
+/* { dg-final { scan-assembler {\n\tvfcesb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ge.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ge.c
new file mode 100644
index 0000000..eddf8d6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ge.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_GE);
+
+/* { dg-final { scan-assembler {\n\tvfchesb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-gt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-gt.c
new file mode 100644
index 0000000..69fbb25
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-gt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_GT);
+
+/* { dg-final { scan-assembler {\n\tvfchsb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-le.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-le.c
new file mode 100644
index 0000000..49374e4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-le.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_LE);
+
+/* { dg-final { scan-assembler {\n\tvfchesb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-lt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-lt.c
new file mode 100644
index 0000000..403534c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-lt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_LT);
+
+/* { dg-final { scan-assembler {\n\tvfchsb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ordered.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ordered.c
new file mode 100644
index 0000000..ae799fb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-ordered.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_UNORDERED);
+
+/* { dg-final { scan-assembler {\n\tvfchesb\t} } } */
+/* { dg-final { scan-assembler {\n\tvfchsb\t} } } */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-uneq.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-uneq.c
new file mode 100644
index 0000000..1df53a9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-uneq.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_UNEQ);
+
+/* { dg-final { scan-assembler-times {\n\tvfchsb\t} 2 } } */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
+/* { dg-final { scan-assembler {\n\tvx\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-unordered.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-unordered.c
new file mode 100644
index 0000000..3eb44da
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-quiet-unordered.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (QUIET_UNORDERED);
+
+/* { dg-final { scan-assembler {\n\tvfchesb\t} } } */
+/* { dg-final { scan-assembler {\n\tvfchsb\t} } } */
+/* combine prefers to reorder vsel args instead of using vno.  */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-eq.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-eq.c
new file mode 100644
index 0000000..7dd91a5
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-eq.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (SIGNALING_EQ);
+
+/* The vectorizer produces <= and ==, which rtl passes cannot turn into vfkesb
+   yet.  */
+/* { dg-final { scan-assembler {\n\tvfcesb\t} } } */
+/* { dg-final { scan-assembler {\n\tvfkhesb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ge.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ge.c
new file mode 100644
index 0000000..884203b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ge.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (SIGNALING_GE);
+
+/* { dg-final { scan-assembler {\n\tvfkhesb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-gt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-gt.c
new file mode 100644
index 0000000..8e4401e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-gt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (SIGNALING_GT);
+
+/* { dg-final { scan-assembler {\n\tvfkhsb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-le.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-le.c
new file mode 100644
index 0000000..14ff8b4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-le.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (SIGNALING_LE);
+
+/* { dg-final { scan-assembler {\n\tvfkhesb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-lt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-lt.c
new file mode 100644
index 0000000..420c7ca
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-lt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (SIGNALING_LT);
+
+/* { dg-final { scan-assembler {\n\tvfkhsb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ltgt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ltgt.c
new file mode 100644
index 0000000..c34cf09
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-float-signaling-ltgt.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_FLOAT (SIGNALING_LTGT);
+
+/* { dg-final { scan-assembler-times {\n\tvfkhsb\t} 2 } } */
+/* { dg-final { scan-assembler {\n\tvo\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-fortran.h b/gcc/testsuite/gcc.target/s390/zvector/autovec-fortran.h
new file mode 100644
index 0000000..8e44cb2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-fortran.h
@@ -0,0 +1,7 @@
+#define AUTOVEC_FORTRAN(OP) subroutine f (r, x, y); \
+  real(kind=kind (1.0d0)) :: r(1000000), x(1000000), y(1000000); \
+  integer :: i; \
+  do i = 1, 1000000; \
+    r(i) = OP (x(i), y(i)); \
+  end do; \
+end
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-ge.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-ge.c
new file mode 100644
index 0000000..e4d01b5
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-ge.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_LONG_DOUBLE (SIGNALING_GE);
+
+/* { dg-final { scan-assembler {\n\twfkhexb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-gt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-gt.c
new file mode 100644
index 0000000..b9417ac
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-gt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_LONG_DOUBLE (SIGNALING_GT);
+
+/* { dg-final { scan-assembler {\n\twfkhxb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-le.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-le.c
new file mode 100644
index 0000000..1a76b1d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-le.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_LONG_DOUBLE (SIGNALING_LE);
+
+/* { dg-final { scan-assembler {\n\twfkhexb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-lt.c b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-lt.c
new file mode 100644
index 0000000..0a1c5cd
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec-long-double-signaling-lt.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O3 -march=z14 -mzvector -mzarch" } */
+
+#include "autovec.h"
+
+AUTOVEC_LONG_DOUBLE (SIGNALING_LT);
+
+/* { dg-final { scan-assembler {\n\twfkhxb\t} } } */
diff --git a/gcc/testsuite/gcc.target/s390/zvector/autovec.h b/gcc/testsuite/gcc.target/s390/zvector/autovec.h
new file mode 100644
index 0000000..d7977a1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/autovec.h
@@ -0,0 +1,43 @@
+#ifndef AUTOVEC_H
+#define AUTOVEC_H 1
+
+#define QUIET_EQ(x, y) ((x) == (y))
+#define QUIET_GE __builtin_isgreaterequal
+#define QUIET_GT __builtin_isgreater
+#define QUIET_LE __builtin_islessequal
+#define QUIET_LT __builtin_isless
+#define QUIET_ORDERED(x, y) (!__builtin_isunordered ((x), (y)))
+#define QUIET_UNEQ(x, y) (__builtin_isless ((x), (y)) \
+                          || __builtin_isgreater ((x), (y)))
+#define QUIET_UNORDERED __builtin_isunordered
+#define SIGNALING_EQ(x, y) (((x) <= (y)) && ((x) >= (y)))
+#define SIGNALING_GE(x, y) ((x) >= (y))
+#define SIGNALING_GT(x, y) ((x) > (y))
+#define SIGNALING_LE(x, y) ((x) <= (y))
+#define SIGNALING_LT(x, y) ((x) < (y))
+#define SIGNALING_LTGT(x, y) (((x) < (y)) || ((x) > (y)))
+
+#define AUTOVEC(RESULT_TYPE, OP_TYPE, OP) void \
+f (RESULT_TYPE *r, const OP_TYPE *x, const OP_TYPE *y) \
+{ \
+  int i; \
+\
+  for (i = 0; i < 1000000; i++) \
+    { \
+      OP_TYPE xi = x[i], yi = y[i]; \
+\
+      r[i] = OP (xi, yi); \
+    } \
+}
+
+#define AUTOVEC_DOUBLE(OP) AUTOVEC (long long, double, OP)
+
+#define AUTOVEC_FLOAT(OP) AUTOVEC (int, float, OP)
+
+#ifdef __SIZEOF_INT128__
+typedef __int128 v1ti __attribute__ ((vector_size (16)));
+typedef long double v1tf __attribute__ ((vector_size (16)));
+#define AUTOVEC_LONG_DOUBLE(OP) AUTOVEC (v1ti, v1tf, OP)
+#endif
+
+#endif
-- 
cgit v1.1


From 75a582cd9f98b4cdea2eb8e961d53dc8d30fd462 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 11 Oct 2019 09:09:40 +0000
Subject: decl.c (gnat_to_gnu_field): Adjust again the packing for a field
 without strict alignment and with an...

	* gcc-interface/decl.c (gnat_to_gnu_field): Adjust again the packing
	for a field without strict alignment and with an oversized clause.

From-SVN: r276873
---
 gcc/ada/ChangeLog                            |  5 +++++
 gcc/ada/gcc-interface/decl.c                 |  7 +++++++
 gcc/testsuite/ChangeLog                      |  4 ++++
 gcc/testsuite/gnat.dg/specs/size_clause4.ads | 20 ++++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 gcc/testsuite/gnat.dg/specs/size_clause4.ads

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 792db56..ae9fd4c 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gcc-interface/decl.c (gnat_to_gnu_field): Adjust again the packing
+	for a field without strict alignment and with an oversized clause.
+
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* gcc-interface/decl.c (annotate_value) <INTEGER_CST>: Really test the
 	sign of the value when deciding to build a NEGATE_EXPR.
 	<PLUS_EXPR>: Remove redundant line.
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 2c5f573..b3f8d58 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -7229,10 +7229,17 @@ gnat_to_gnu_field (Entity_Id gnat_field, tree gnu_record_type, int packed,
 	  && INTEGRAL_TYPE_P (TREE_TYPE (TYPE_FIELDS (gnu_field_type))))
 	gnu_field_type = TREE_TYPE (TYPE_FIELDS (gnu_field_type));
 
+      orig_field_type = gnu_field_type;
       gnu_field_type
 	= make_type_from_size (gnu_field_type, gnu_size,
 			       Has_Biased_Representation (gnat_field));
 
+      /* If the type has been extended, we may need to cap the alignment.  */
+      if (!needs_strict_alignment
+	  && gnu_field_type != orig_field_type
+	  && tree_int_cst_lt (TYPE_SIZE (orig_field_type), gnu_size))
+	packed = adjust_packed (gnu_field_type, gnu_record_type, packed);
+
       orig_field_type = gnu_field_type;
       gnu_field_type = maybe_pad_type (gnu_field_type, gnu_size, 0, gnat_field,
 				       false, false, definition, true);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c565dae..07dc579 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/specs/size_clause4.ads: New test.
+
 2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	PR target/77918
diff --git a/gcc/testsuite/gnat.dg/specs/size_clause4.ads b/gcc/testsuite/gnat.dg/specs/size_clause4.ads
new file mode 100644
index 0000000..4aa8c8f
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/specs/size_clause4.ads
@@ -0,0 +1,20 @@
+-- { dg-do compile }
+
+with System;
+
+package Size_Clause4 is
+
+  type Rec is record
+    A1 : System.Address;  
+    A2 : System.Address;  
+    I  : aliased Integer; 
+  end record;
+       
+  for Rec use record
+    A1 at 0  range 0 .. 63; 
+    A2 at 8  range 0 .. 63;
+    I  at 16 range 0 .. 31;  
+  end record;
+  for Rec'Size use 160;
+
+end Size_Clause4;
-- 
cgit v1.1


From b67e2ad80d3e080c5258ff64ddb6f40e8d783e0b Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 11 Oct 2019 09:17:23 +0000
Subject: decl.c (elaborate_reference_1): Specifically deal with pointer
 displacement.

	* gcc-interface/decl.c (elaborate_reference_1): Specifically deal with
	pointer displacement.

	* gcc-interface/decl.c (components_to_record): Use proper name.

	* gcc-interface/trans.c (Sloc_to_locus): Use standard types.

From-SVN: r276874
---
 gcc/ada/ChangeLog             |  9 +++++++++
 gcc/ada/gcc-interface/decl.c  | 11 ++++++++++-
 gcc/ada/gcc-interface/trans.c |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ae9fd4c..adbfa70 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gcc-interface/decl.c (elaborate_reference_1): Specifically deal with
+	pointer displacement.
+
+	* gcc-interface/decl.c (components_to_record): Use proper name.
+
+	* gcc-interface/trans.c (Sloc_to_locus): Use standard types.
+
+2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* gcc-interface/decl.c (gnat_to_gnu_field): Adjust again the packing
 	for a field without strict alignment and with an oversized clause.
 
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index b3f8d58..29c5a8e 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -6782,6 +6782,15 @@ elaborate_reference_1 (tree ref, void *data)
 		   elaborate_reference_1 (TREE_OPERAND (ref, 0), data),
 		   TREE_OPERAND (ref, 1), NULL_TREE);
 
+  /* If this is the displacement of a pointer, elaborate the pointer and then
+     displace the result.  The actual purpose here is to drop the location on
+     the expression, which may be problematic if replicated on references.  */
+  if (TREE_CODE (ref) == POINTER_PLUS_EXPR
+      && TREE_CODE (TREE_OPERAND (ref, 1)) == INTEGER_CST)
+    return build2 (POINTER_PLUS_EXPR, TREE_TYPE (ref),
+		   elaborate_reference_1 (TREE_OPERAND (ref, 0), data),
+		   TREE_OPERAND (ref, 1));
+
   sprintf (suffix, "EXP%d", ++er->n);
   return
     elaborate_expression_1 (ref, er->entity, suffix, er->definition, false);
@@ -7923,7 +7932,7 @@ components_to_record (Node_Id gnat_component_list, Entity_Id gnat_record_type,
        && !(Is_Packed (gnat_record_type)
 	    ? has_non_packed_fixed_size_field
 	    : Optimize_Alignment_Space (gnat_record_type))
-       && !debug__debug_flag_dot_r);
+       && !Debug_Flag_Dot_R);
   const bool w_reorder
     = (Convention (gnat_record_type) == Convention_Ada
        && Warn_On_Questionable_Layout
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 1ee9732..61e05d5 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -10848,8 +10848,8 @@ Sloc_to_locus (Source_Ptr Sloc, location_t *locus, bool clear_column,
     }
 
   Source_File_Index file = Get_Source_File_Index (Sloc);
-  Logical_Line_Number line = Get_Logical_Line_Number (Sloc);
-  Column_Number column = (clear_column ? 0 : Get_Column_Number (Sloc));
+  Line_Number_Type line = Get_Logical_Line_Number (Sloc);
+  Column_Number_Type column = (clear_column ? 0 : Get_Column_Number (Sloc));
   line_map_ordinary *map = LINEMAPS_ORDINARY_MAP_AT (line_table, file - 1);
 
   /* We can have zero if pragma Source_Reference is in effect.  */
-- 
cgit v1.1


From 08c14aaaab2b01f1a31989a8d94bae312d87c8f7 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Fri, 11 Oct 2019 09:17:49 +0000
Subject: [OpenMP,Fortran] Fix several OpenMP use_device_addr/map/update errors

	gcc/fortran/
	* f95-lang.c (LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR): Re-define to
	gfc_omp_is_allocatable_or_ptr.
	* trans-decl.c (create_function_arglist): Set GFC_DECL_OPTIONAL_ARGUMENT
	only if not passed by value.
	* trans-openmp.c (gfc_omp_is_allocatable_or_ptr): New.
	(gfc_trans_omp_clauses): For MAP, handle (present) optional arguments;
	for target update, handle allocatable/pointer scalars.
	* trans.h (gfc_omp_is_allocatable_or_ptr): Declare.

	gcc/
	* langhooks-def.h (LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR): Define.
	(LANG_HOOKS_DECLS): Add it.
	* langhooks.h (lang_hooks_for_decls): Add omp_is_allocatable_or_ptr;
	update comment for omp_is_optional_argument.
	* omp-general.c (omp_is_allocatable_or_ptr): New.
	* omp-general.h (omp_is_allocatable_or_ptr): Declare.
	* omp-low.c (scan_sharing_clauses, lower_omp_target): Handle
	Fortran's optional arguments and allocatable/pointer scalars
	with use_device_addr.

	libgomp/
	* testsuite/libgomp.fortran/use_device_addr-1.f90: New.
	* testsuite/libgomp.fortran/use_device_addr-2.f90: New.

From-SVN: r276875
---
 gcc/ChangeLog              | 12 ++++++++++++
 gcc/fortran/ChangeLog      | 11 +++++++++++
 gcc/fortran/f95-lang.c     |  2 ++
 gcc/fortran/trans-decl.c   |  3 ++-
 gcc/fortran/trans-openmp.c | 32 ++++++++++++++++++++++++++++----
 gcc/fortran/trans.h        |  1 +
 gcc/langhooks-def.h        |  2 ++
 gcc/langhooks.h            |  9 ++++++++-
 gcc/omp-general.c          |  8 ++++++++
 gcc/omp-general.h          |  1 +
 gcc/omp-low.c              | 38 ++++++++++++++++++++++++++++++--------
 11 files changed, 105 insertions(+), 14 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f48f7f3..cbc0b2f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
+
+	* langhooks-def.h (LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR): Define.
+	(LANG_HOOKS_DECLS): Add it.
+	* langhooks.h (lang_hooks_for_decls): Add omp_is_allocatable_or_ptr;
+	update comment for omp_is_optional_argument.
+	* omp-general.c (omp_is_allocatable_or_ptr): New.
+	* omp-general.h (omp_is_allocatable_or_ptr): Declare.
+	* omp-low.c (scan_sharing_clauses, lower_omp_target): Handle
+	Fortran's optional arguments and allocatable/pointer scalars
+	with use_device_addr.
+
 2019-10-11  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	PR target/77918
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0577659..82bc450 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
+
+	* f95-lang.c (LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR): Re-define to
+	gfc_omp_is_allocatable_or_ptr.
+	* trans-decl.c (create_function_arglist): Set GFC_DECL_OPTIONAL_ARGUMENT
+	only if not passed by value.
+	* trans-openmp.c (gfc_omp_is_allocatable_or_ptr): New.
+	(gfc_trans_omp_clauses): For MAP, handle (present) optional arguments;
+	for target update, handle allocatable/pointer scalars.
+	* trans.h (gfc_omp_is_allocatable_or_ptr): Declare.
+
 2019-10-10  Tobias Burnus  <tobias@codesourcery.com>
 
 	* trans-openmp.c (gfc_trans_omp_clauses): Actually pass use_device_addr
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 2467cd9..0f72ab9 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -113,6 +113,7 @@ static const struct attribute_spec gfc_attribute_table[] =
 #undef LANG_HOOKS_TYPE_FOR_MODE
 #undef LANG_HOOKS_TYPE_FOR_SIZE
 #undef LANG_HOOKS_INIT_TS
+#undef LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR
 #undef LANG_HOOKS_OMP_IS_OPTIONAL_ARGUMENT
 #undef LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE
 #undef LANG_HOOKS_OMP_PREDETERMINED_SHARING
@@ -146,6 +147,7 @@ static const struct attribute_spec gfc_attribute_table[] =
 #define LANG_HOOKS_TYPE_FOR_MODE	gfc_type_for_mode
 #define LANG_HOOKS_TYPE_FOR_SIZE	gfc_type_for_size
 #define LANG_HOOKS_INIT_TS		gfc_init_ts
+#define LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR	gfc_omp_is_allocatable_or_ptr
 #define LANG_HOOKS_OMP_IS_OPTIONAL_ARGUMENT	gfc_omp_is_optional_argument
 #define LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE	gfc_omp_privatize_by_reference
 #define LANG_HOOKS_OMP_PREDETERMINED_SHARING	gfc_omp_predetermined_sharing
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index b701f49..3ad802e 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -2691,8 +2691,9 @@ create_function_arglist (gfc_symbol * sym)
 	  && (!f->sym->attr.proc_pointer
 	      && f->sym->attr.flavor != FL_PROCEDURE))
 	DECL_BY_REFERENCE (parm) = 1;
-      if (f->sym->attr.optional)
+      if (f->sym->attr.optional && !f->sym->attr.value)
 	{
+	  /* With value, the argument is passed as is.  */
 	  gfc_allocate_lang_decl (parm);
 	  GFC_DECL_OPTIONAL_ARGUMENT (parm) = 1;
 	}
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 35c2f28..dad11a2 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -47,7 +47,21 @@ along with GCC; see the file COPYING3.  If not see
 
 int ompws_flags;
 
-/* True if OpenMP should treat this DECL as an optional argument.  */
+/* True if OpenMP should regard this DECL as being a scalar which has Fortran's
+   allocatable or pointer attribute.  */
+
+bool
+gfc_omp_is_allocatable_or_ptr (const_tree decl)
+{
+  return (DECL_P (decl)
+	  && (GFC_DECL_GET_SCALAR_POINTER (decl)
+	      || GFC_DECL_GET_SCALAR_ALLOCATABLE (decl)));
+}
+
+/* True if OpenMP should treat this DECL as an optional argument;  note: for
+   arguments with VALUE attribute, the DECL is identical to nonoptional
+   arguments; hence, we return false here.  To check whether the variable is
+   present, use the DECL which is passed as hidden argument.  */
 
 bool
 gfc_omp_is_optional_argument (const_tree decl)
@@ -2173,7 +2187,8 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
 		      OMP_CLAUSE_DECL (node4) = decl;
 		      OMP_CLAUSE_SIZE (node4) = size_int (0);
 		      decl = build_fold_indirect_ref (decl);
-		      if (TREE_CODE (TREE_TYPE (orig_decl)) == REFERENCE_TYPE
+		      if ((TREE_CODE (TREE_TYPE (orig_decl)) == REFERENCE_TYPE
+			   || gfc_omp_is_optional_argument (orig_decl))
 			  && (GFC_DECL_GET_SCALAR_POINTER (orig_decl)
 			      || GFC_DECL_GET_SCALAR_ALLOCATABLE (orig_decl)))
 			{
@@ -2417,7 +2432,11 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
 		{
 		  tree decl = gfc_trans_omp_variable (n->sym, false);
 		  if (gfc_omp_privatize_by_reference (decl))
-		    decl = build_fold_indirect_ref (decl);
+		    {
+		      if (gfc_omp_is_allocatable_or_ptr (decl))
+			decl = build_fold_indirect_ref (decl);
+		      decl = build_fold_indirect_ref (decl);
+		    }
 		  else if (DECL_P (decl))
 		    TREE_ADDRESSABLE (decl) = 1;
 		  if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (decl)))
@@ -2439,7 +2458,12 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
 				       OMP_CLAUSE_SIZE (node), elemsz);
 		    }
 		  else
-		    OMP_CLAUSE_DECL (node) = decl;
+		    {
+		      OMP_CLAUSE_DECL (node) = decl;
+		      if (gfc_omp_is_allocatable_or_ptr (decl))
+			OMP_CLAUSE_SIZE (node)
+				= TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (decl)));
+		    }
 		}
 	      else
 		{
diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
index 405e88d..e96b22a 100644
--- a/gcc/fortran/trans.h
+++ b/gcc/fortran/trans.h
@@ -786,6 +786,7 @@ struct array_descr_info;
 bool gfc_get_array_descr_info (const_tree, struct array_descr_info *);
 
 /* In trans-openmp.c */
+bool gfc_omp_is_allocatable_or_ptr (const_tree);
 bool gfc_omp_is_optional_argument (const_tree);
 bool gfc_omp_privatize_by_reference (const_tree);
 enum omp_clause_default_kind gfc_omp_predetermined_sharing (tree);
diff --git a/gcc/langhooks-def.h b/gcc/langhooks-def.h
index 55d5fe0..c5dc83d 100644
--- a/gcc/langhooks-def.h
+++ b/gcc/langhooks-def.h
@@ -236,6 +236,7 @@ extern tree lhd_unit_size_without_reusable_padding (tree);
 #define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL lhd_warn_unused_global_decl
 #define LANG_HOOKS_POST_COMPILATION_PARSING_CLEANUPS NULL
 #define LANG_HOOKS_DECL_OK_FOR_SIBCALL	lhd_decl_ok_for_sibcall
+#define LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR hook_bool_const_tree_false
 #define LANG_HOOKS_OMP_IS_OPTIONAL_ARGUMENT hook_bool_const_tree_false
 #define LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE hook_bool_const_tree_false
 #define LANG_HOOKS_OMP_PREDETERMINED_SHARING lhd_omp_predetermined_sharing
@@ -262,6 +263,7 @@ extern tree lhd_unit_size_without_reusable_padding (tree);
   LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL, \
   LANG_HOOKS_POST_COMPILATION_PARSING_CLEANUPS, \
   LANG_HOOKS_DECL_OK_FOR_SIBCALL, \
+  LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR, \
   LANG_HOOKS_OMP_IS_OPTIONAL_ARGUMENT, \
   LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE, \
   LANG_HOOKS_OMP_PREDETERMINED_SHARING, \
diff --git a/gcc/langhooks.h b/gcc/langhooks.h
index 9d2714a..97e3186 100644
--- a/gcc/langhooks.h
+++ b/gcc/langhooks.h
@@ -222,7 +222,14 @@ struct lang_hooks_for_decls
   /* True if this decl may be called via a sibcall.  */
   bool (*ok_for_sibcall) (const_tree);
 
-  /* True if OpenMP should treat DECL as a Fortran optional argument.  */
+  /* True if OpenMP should regard this DECL as being a scalar which has Fortran's
+     allocatable or pointer attribute.  */
+  bool (*omp_is_allocatable_or_ptr) (const_tree);
+
+  /* True if OpenMP should treat DECL as a Fortran optional argument;  note: for
+     arguments with VALUE attribute, the DECL is identical to nonoptional
+     arguments; hence, we return false here.  To check whether the variable is
+     present, use the DECL which is passed as hidden argument.  */
   bool (*omp_is_optional_argument) (const_tree);
 
   /* True if OpenMP should privatize what this DECL points to rather
diff --git a/gcc/omp-general.c b/gcc/omp-general.c
index 5ef6e25..1a78a70 100644
--- a/gcc/omp-general.c
+++ b/gcc/omp-general.c
@@ -48,6 +48,14 @@ omp_find_clause (tree clauses, enum omp_clause_code kind)
   return NULL_TREE;
 }
 
+/* True if OpenMP should regard this DECL as being a scalar which has Fortran's
+   allocatable or pointer attribute.  */
+bool
+omp_is_allocatable_or_ptr (tree decl)
+{
+  return lang_hooks.decls.omp_is_allocatable_or_ptr (decl);
+}
+
 /* Return true if DECL is a Fortran optional argument.  */
 
 bool
diff --git a/gcc/omp-general.h b/gcc/omp-general.h
index bbaa7b1..7cd1d21 100644
--- a/gcc/omp-general.h
+++ b/gcc/omp-general.h
@@ -73,6 +73,7 @@ struct omp_for_data
 #define OACC_FN_ATTRIB "oacc function"
 
 extern tree omp_find_clause (tree clauses, enum omp_clause_code kind);
+extern bool omp_is_allocatable_or_ptr (tree decl);
 extern bool omp_is_optional_argument (tree decl);
 extern bool omp_is_reference (tree decl);
 extern void omp_adjust_for_condition (location_t loc, enum tree_code *cond_code,
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index ca7dfdb..279b6ef 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -1241,7 +1241,8 @@ scan_sharing_clauses (tree clauses, omp_context *ctx)
 	case OMP_CLAUSE_USE_DEVICE_ADDR:
 	  decl = OMP_CLAUSE_DECL (c);
 	  if ((OMP_CLAUSE_CODE (c) == OMP_CLAUSE_USE_DEVICE_ADDR
-	       && !omp_is_reference (decl))
+	       && !omp_is_reference (decl)
+	       && !omp_is_allocatable_or_ptr (decl))
 	      || TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE)
 	    install_var_field (decl, true, 11, ctx);
 	  else
@@ -11483,7 +11484,8 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
 	    DECL_HAS_VALUE_EXPR_P (new_var) = 1;
 	  }
 	else if ((OMP_CLAUSE_CODE (c) == OMP_CLAUSE_USE_DEVICE_ADDR
-		  && !omp_is_reference (var))
+		  && !omp_is_reference (var)
+		  && !omp_is_allocatable_or_ptr (var))
 		 || TREE_CODE (TREE_TYPE (var)) == ARRAY_TYPE)
 	  {
 	    tree new_var = lookup_decl (var, ctx);
@@ -11678,7 +11680,18 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
 		  }
 		else
 		  {
-		    var = build_fold_addr_expr (var);
+		    /* While MAP is handled explicitly by the FE,
+		       for 'target update', only the identified is passed.  */
+		    if ((OMP_CLAUSE_CODE (c) == OMP_CLAUSE_FROM
+			 || OMP_CLAUSE_CODE (c) == OMP_CLAUSE_TO)
+			&& (omp_is_allocatable_or_ptr (var)
+			    && omp_is_optional_argument (var)))
+		      var = build_fold_indirect_ref (var);
+		    else if ((OMP_CLAUSE_CODE (c) != OMP_CLAUSE_FROM
+			      && OMP_CLAUSE_CODE (c) != OMP_CLAUSE_TO)
+			     || (!omp_is_allocatable_or_ptr (var)
+				 && !omp_is_optional_argument (var)))
+		      var = build_fold_addr_expr (var);
 		    gimplify_assign (x, var, &ilist);
 		  }
 	      }
@@ -11865,16 +11878,22 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
 	      }
 	    type = TREE_TYPE (ovar);
 	    if ((OMP_CLAUSE_CODE (c) == OMP_CLAUSE_USE_DEVICE_ADDR
-		 && !omp_is_reference (ovar))
+		 && !omp_is_reference (ovar)
+		 && !omp_is_allocatable_or_ptr (ovar))
 		|| TREE_CODE (type) == ARRAY_TYPE)
 	      var = build_fold_addr_expr (var);
 	    else
 	      {
-		if (omp_is_reference (ovar) || omp_is_optional_argument (ovar))
+		if (omp_is_reference (ovar)
+		    || omp_is_optional_argument (ovar)
+		    || omp_is_allocatable_or_ptr (ovar))
 		  {
 		    type = TREE_TYPE (type);
 		    if (TREE_CODE (type) != ARRAY_TYPE
-			&& OMP_CLAUSE_CODE (c) != OMP_CLAUSE_USE_DEVICE_ADDR)
+			&& ((OMP_CLAUSE_CODE (c) != OMP_CLAUSE_USE_DEVICE_ADDR
+			    && !omp_is_allocatable_or_ptr (ovar))
+			   || (omp_is_reference (ovar)
+			       && omp_is_allocatable_or_ptr (ovar))))
 		      var = build_simple_mem_ref (var);
 		    var = fold_convert (TREE_TYPE (x), var);
 		  }
@@ -12045,7 +12064,8 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
 				     gimple_build_assign (new_var, x));
 	      }
 	    else if ((OMP_CLAUSE_CODE (c) == OMP_CLAUSE_USE_DEVICE_ADDR
-		      && !omp_is_reference (var))
+		      && !omp_is_reference (var)
+		      && !omp_is_allocatable_or_ptr (var))
 		     || TREE_CODE (TREE_TYPE (var)) == ARRAY_TYPE)
 	      {
 		tree new_var = lookup_decl (var, ctx);
@@ -12065,7 +12085,9 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
 		  {
 		    type = TREE_TYPE (type);
 		    if (TREE_CODE (type) != ARRAY_TYPE
-			&& OMP_CLAUSE_CODE (c) != OMP_CLAUSE_USE_DEVICE_ADDR)
+			&& (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_USE_DEVICE_ADDR
+			    || (omp_is_reference (var)
+				&& omp_is_allocatable_or_ptr (var))))
 		      {
 			tree v = create_tmp_var_raw (type, get_name (var));
 			gimple_add_tmp_var (v);
-- 
cgit v1.1


From 9d99596e3289766c392466eebb8b2f2d2f4f1bc1 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Fri, 11 Oct 2019 10:45:48 +0000
Subject: re PR tree-optimization/92066 (Many vectorization tests FAIL)

2019-10-11  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92066
	PR tree-optimization/92046
	* tree-vect-data-refs.c (vect_enhance_data_refs_alignment):
	Fix bogus cost model check.

From-SVN: r276876
---
 gcc/ChangeLog             | 7 +++++++
 gcc/tree-vect-data-refs.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cbc0b2f..e250c9d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-11  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92066
+	PR tree-optimization/92046
+	* tree-vect-data-refs.c (vect_enhance_data_refs_alignment):
+	Fix bogus cost model check.
+
 2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
 
 	* langhooks-def.h (LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR): Define.
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index e2baeb0..9a4c01d 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -2179,7 +2179,7 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo)
   do_versioning
     = (optimize_loop_nest_for_speed_p (loop)
        && !loop->inner /* FORNOW */
-       && flag_vect_cost_model > VECT_COST_MODEL_CHEAP);
+       && flag_vect_cost_model != VECT_COST_MODEL_CHEAP);
 
   if (do_versioning)
     {
-- 
cgit v1.1


From e5207f1a6528877713109dc59b8db6c62a6eca28 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Fri, 11 Oct 2019 13:53:40 +0200
Subject: ggc-page.c (release_pages): Output statistics when !quiet_flag.

	* ggc-page.c (release_pages): Output statistics when !quiet_flag.
	(ggc_collect): Dump later to not interfere with release_page dump.
	(ggc_trim): New function.
	* ggc-none.c (ggc_trim): New.
	* ggc.h (ggc_trim): Declare.

	* lto.c (lto_wpa_write_files): Call ggc_trim.

From-SVN: r276878
---
 gcc/ChangeLog     |  8 ++++++++
 gcc/ggc-none.c    |  5 +++++
 gcc/ggc-page.c    | 45 +++++++++++++++++++++++++++++++++++++++------
 gcc/ggc.h         |  3 +++
 gcc/lto/ChangeLog |  4 ++++
 gcc/lto/lto.c     |  1 +
 6 files changed, 60 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e250c9d..a73fe20 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ggc-page.c (release_pages): Output statistics when !quiet_flag.
+	(ggc_collect): Dump later to not interfere with release_page dump.
+	(ggc_trim): New function.
+	* ggc-none.c (ggc_trim): New.
+	* ggc.h (ggc_trim): Declare.
+
 2019-10-11  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92066
diff --git a/gcc/ggc-none.c b/gcc/ggc-none.c
index 6edec27..737429f 100644
--- a/gcc/ggc-none.c
+++ b/gcc/ggc-none.c
@@ -72,3 +72,8 @@ void
 ggc_grow (void)
 {
 }
+
+void
+ggc_trim (void)
+{
+}
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 220f20c..4560206 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -529,7 +529,6 @@ static void clear_page_group_in_use (page_group *, char *);
 #endif
 static struct page_entry * alloc_page (unsigned);
 static void free_page (struct page_entry *);
-static void release_pages (void);
 static void clear_marks (void);
 static void sweep_pages (void);
 static void ggc_recalculate_in_use_p (page_entry *);
@@ -1016,6 +1015,8 @@ free_page (page_entry *entry)
 static void
 release_pages (void)
 {
+  size_t n1 = 0;
+  size_t n2 = 0;
 #ifdef USING_MADVISE
   page_entry *p, *start_p;
   char *start;
@@ -1061,6 +1062,7 @@ release_pages (void)
           else
             G.free_pages = p;
           G.bytes_mapped -= mapped_len;
+	  n1 += len;
 	  continue;
         }
       prev = newprev;
@@ -1092,6 +1094,7 @@ release_pages (void)
       /* Don't count those pages as mapped to not touch the garbage collector
          unnecessarily. */
       G.bytes_mapped -= len;
+      n2 += len;
       while (start_p != p)
         {
           start_p->discarded = true;
@@ -1124,6 +1127,7 @@ release_pages (void)
 	}
 
       munmap (start, len);
+      n1 += len;
       G.bytes_mapped -= len;
     }
 
@@ -1152,10 +1156,20 @@ release_pages (void)
 	*gp = g->next;
 	G.bytes_mapped -= g->alloc_size;
 	free (g->allocation);
+	n1 += g->alloc_size;
       }
     else
       gp = &g->next;
 #endif
+  if (!quiet_flag && (n1 || n2))
+    {
+      fprintf (stderr, " {GC");
+      if (n1)
+	fprintf (stderr, " released %luk", (unsigned long)(n1 / 1024));
+      if (n2)
+	fprintf (stderr, " madv_dontneed %luk", (unsigned long)(n2 / 1024));
+      fprintf (stderr, "}");
+    }
 }
 
 /* This table provides a fast way to determine ceil(log_2(size)) for
@@ -2178,19 +2192,22 @@ ggc_collect (void)
     return;
 
   timevar_push (TV_GC);
-  if (!quiet_flag)
-    fprintf (stderr, " {GC %luk -> ", (unsigned long) G.allocated / 1024);
   if (GGC_DEBUG_LEVEL >= 2)
     fprintf (G.debug_file, "BEGIN COLLECTING\n");
 
   /* Zero the total allocated bytes.  This will be recalculated in the
      sweep phase.  */
+  size_t allocated = G.allocated;
   G.allocated = 0;
 
   /* Release the pages we freed the last time we collected, but didn't
      reuse in the interim.  */
   release_pages ();
 
+  /* Output this later so we do not interfere with release_pages.  */
+  if (!quiet_flag)
+    fprintf (stderr, " {GC %luk -> ", (unsigned long) allocated / 1024);
+
   /* Indicate that we've seen collections at this context depth.  */
   G.context_depth_collections = ((unsigned long)1 << (G.context_depth + 1)) - 1;
 
@@ -2221,9 +2238,25 @@ ggc_collect (void)
     fprintf (G.debug_file, "END COLLECTING\n");
 }
 
-/* Assume that all GGC memory is reachable and grow the limits for next collection.
-   With checking, trigger GGC so -Q compilation outputs how much of memory really is
-   reachable.  */
+/* Return free pages to the system.  */
+
+void
+ggc_trim ()
+{
+  timevar_push (TV_GC);
+  G.allocated = 0;
+  sweep_pages ();
+  release_pages ();
+  if (!quiet_flag)
+    fprintf (stderr, " {GC trimmed to %luk, %luk mapped}",
+	     (unsigned long) G.allocated / 1024,
+	     (unsigned long) G.bytes_mapped / 1024);
+  timevar_pop (TV_GC);
+}
+
+/* Assume that all GGC memory is reachable and grow the limits for next
+   collection.  With checking, trigger GGC so -Q compilation outputs how much
+   of memory really is reachable.  */
 
 void
 ggc_grow (void)
diff --git a/gcc/ggc.h b/gcc/ggc.h
index 60273f2..31606dc 100644
--- a/gcc/ggc.h
+++ b/gcc/ggc.h
@@ -243,6 +243,9 @@ extern const char *ggc_alloc_string (const char *contents, int length
    function is called, not during allocations.  */
 extern void ggc_collect	(void);
 
+/* Return unused memory pages to the system.  */
+extern void ggc_trim (void);
+
 /* Assume that all GGC memory is reachable and grow the limits for next collection. */
 extern void ggc_grow (void);
 
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 5fd02df..5ad79e8 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
 
+	* lto.c (lto_wpa_write_files): Call ggc_trim.
+
+2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
+
 	* lto.c (lto_wpa_write_files): Prepare all bodies for streaming.
 
 2019-10-10  Richard Biener  <rguenther@suse.de>
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index f7452c2..5aa1438 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -311,6 +311,7 @@ lto_wpa_write_files (void)
     if (gimple_has_body_p (node->decl))
       lto_prepare_function_for_streaming (node);
 
+  ggc_trim ();
   /* Generate a prefix for the LTRANS unit files.  */
   blen = strlen (ltrans_output_list);
   temp_filename = (char *) xmalloc (blen + sizeof ("2147483648.o"));
-- 
cgit v1.1


From 1284e2b104a81ad93daab5110cd844981e501086 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Fri, 11 Oct 2019 13:10:15 +0000
Subject: re PR tree-optimization/90883 (Generated code is worse if returned
 struct is unnamed)

2019-10-11  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/90883
	PR tree-optimization/91091
	* tree-ssa-sccvn.c (vn_reference_lookup_3): Use correct
	alias-sets both for recording VN table entries and continuing
	walking after translating through copies.  Handle same-sized
	reads from SSA names by returning the plain SSA name.
	(eliminate_dom_walker::eliminate_stmt): Properly handle
	non-size precision stores in redundant store elimination.

	* gcc.dg/torture/20191011-1.c: New testcase.
	* gcc.dg/tree-ssa/ssa-fre-82.c: Likewise.
	* gcc.dg/tree-ssa/ssa-fre-83.c: Likewise.
	* gcc.dg/tree-ssa/redundant-assign-zero-1.c: Disable FRE.
	* gcc.dg/tree-ssa/redundant-assign-zero-2.c: Likewise.

From-SVN: r276882
---
 gcc/ChangeLog                                      |  11 +++
 gcc/testsuite/ChangeLog                            |  10 ++
 gcc/testsuite/gcc.dg/torture/20191011-1.c          |  32 +++++++
 .../gcc.dg/tree-ssa/redundant-assign-zero-1.c      |   2 +-
 .../gcc.dg/tree-ssa/redundant-assign-zero-2.c      |   2 +-
 gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-82.c         |  25 +++++
 gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-83.c         |  32 +++++++
 gcc/tree-ssa-sccvn.c                               | 103 +++++++++++++++------
 8 files changed, 186 insertions(+), 31 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/20191011-1.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-82.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-83.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a73fe20..34a6db2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-11  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90883
+	PR tree-optimization/91091
+	* tree-ssa-sccvn.c (vn_reference_lookup_3): Use correct
+	alias-sets both for recording VN table entries and continuing
+	walking after translating through copies.  Handle same-sized
+	reads from SSA names by returning the plain SSA name.
+	(eliminate_dom_walker::eliminate_stmt): Properly handle
+	non-size precision stores in redundant store elimination.
+
 2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ggc-page.c (release_pages): Output statistics when !quiet_flag.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 07dc579..c18cb5f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-11  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/90883
+	PR tree-optimization/91091
+	* gcc.dg/torture/20191011-1.c: New testcase.
+	* gcc.dg/tree-ssa/ssa-fre-82.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-fre-83.c: Likewise.
+	* gcc.dg/tree-ssa/redundant-assign-zero-1.c: Disable FRE.
+	* gcc.dg/tree-ssa/redundant-assign-zero-2.c: Likewise.
+
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/specs/size_clause4.ads: New test.
diff --git a/gcc/testsuite/gcc.dg/torture/20191011-1.c b/gcc/testsuite/gcc.dg/torture/20191011-1.c
new file mode 100644
index 0000000..c00b27d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/20191011-1.c
@@ -0,0 +1,32 @@
+/* { dg-do run } */
+/* { dg-additional-options "-fgimple -fstrict-aliasing" } */
+
+#if __SIZEOF_INT__ != __SIZEOF_FLOAT__
+int main() { return 0; }
+#else
+struct X { int i; };
+float f;
+
+int __GIMPLE (ssa,startwith("fre")) __attribute__((noipa))
+foo (float *p)
+{
+  struct X x;
+  float tem;
+  int _2;
+
+  __BB(2):
+  f = 0.0f;
+  __MEM <float> (p_1(D)) = 1.0f;
+  x = __VIEW_CONVERT <struct X> (f);
+  _2 = x.i;
+  return _2;
+}
+
+int
+main()
+{
+  if (foo (&f) == 0)
+    __builtin_abort ();
+  return 0;
+}
+#endif
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-1.c b/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-1.c
index b8d01d1..eadf181 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-dse-details" } */
+/* { dg-options "-O2 -fno-tree-fre -fdump-tree-dse-details" } */
 
 void blah (char *);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-2.c b/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-2.c
index 8cefa6f..4a5b780 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/redundant-assign-zero-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-dse-details" } */
+/* { dg-options "-O2 -fno-tree-fre -fdump-tree-dse-details" } */
 
 #include <string.h>
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-82.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-82.c
new file mode 100644
index 0000000..e245488
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-82.c
@@ -0,0 +1,25 @@
+/* { dg-do run } */
+/* { dg-options "-O -fdump-tree-fre1-details" } */
+
+struct S { _Bool x; };
+
+void
+foo (struct S *s)
+{
+  __builtin_memset (s, 1, sizeof (struct S));
+  s->x = 1;
+}
+
+int
+main ()
+{
+  struct S s;
+  foo (&s);
+  char c;
+  __builtin_memcpy (&c, &s.x, 1);
+  if (c != 1)
+    __builtin_abort ();
+  return 0;
+}
+
+/* { dg-final { scan-tree-dump "Deleted redundant store" "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-83.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-83.c
new file mode 100644
index 0000000..cf6be22
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-83.c
@@ -0,0 +1,32 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fdump-tree-fre1-details" } */
+
+struct X
+{
+   int a : 1;
+   int b : 1;
+} x;
+
+void foo (int v)
+{
+  x.a = 1;
+  x.b = v;
+  x.a = 1;
+  x.b = v;
+}
+
+struct Y
+{
+   _Bool a;
+   _Bool b;
+} y;
+
+void bar (int v)
+{
+  y.a = 1;
+  y.b = v;
+  y.a = 1;
+  y.b = v;
+}
+
+/* { dg-final { scan-tree-dump-times "Deleted redundant store" 4 "fre1" } } */
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 44b8c67..364d0d0 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -1877,8 +1877,10 @@ vn_walk_cb_data::push_partial_def (const pd_data &pd, tree vuse,
       if (dump_file && (dump_flags & TDF_DETAILS))
 	fprintf (dump_file,
 		 "Successfully combined %u partial definitions\n", ndefs);
+      /* ???  If we track partial defs alias-set we could use that if it
+         is the same for all.  Use zero for now.  */
       return vn_reference_lookup_or_insert_for_pieces
-		(first_vuse, vr->set, vr->type, vr->operands, val);
+		(first_vuse, 0, vr->type, vr->operands, val);
     }
   else
     {
@@ -2331,9 +2333,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 	}
     }
 
-  /* If we are looking for redundant stores do not create new hashtable
-     entries from aliasing defs with made up alias-sets.  */
-  if (*disambiguate_only > TR_TRANSLATE || !data->tbaa_p)
+  if (*disambiguate_only > TR_TRANSLATE)
     return (void *)-1;
 
   /* If we cannot constrain the size of the reference we cannot
@@ -2449,7 +2449,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 		return (void *)-1;
 	    }
 	  return vn_reference_lookup_or_insert_for_pieces
-	           (vuse, vr->set, vr->type, vr->operands, val);
+	           (vuse, 0, vr->type, vr->operands, val);
 	}
       /* For now handle clearing memory with partial defs.  */
       else if (known_eq (ref->size, maxsize)
@@ -2499,7 +2499,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 	    {
 	      tree val = build_zero_cst (vr->type);
 	      return vn_reference_lookup_or_insert_for_pieces
-		  (vuse, vr->set, vr->type, vr->operands, val);
+		  (vuse, get_alias_set (lhs), vr->type, vr->operands, val);
 	    }
 	  else if (known_eq (ref->size, maxsize)
 		   && maxsize.is_constant (&maxsizei)
@@ -2614,7 +2614,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 
 		  if (val)
 		    return vn_reference_lookup_or_insert_for_pieces
-			(vuse, vr->set, vr->type, vr->operands, val);
+		      (vuse, get_alias_set (lhs), vr->type, vr->operands, val);
 		}
 	    }
 	  else if (ranges_known_overlap_p (offseti, maxsizei, offset2i, size2i))
@@ -2672,23 +2672,26 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 	     according to endianness.  */
 	  && (! INTEGRAL_TYPE_P (vr->type)
 	      || known_eq (ref->size, TYPE_PRECISION (vr->type)))
-	  && multiple_p (ref->size, BITS_PER_UNIT)
-	  && (! INTEGRAL_TYPE_P (TREE_TYPE (def_rhs))
-	      || type_has_mode_precision_p (TREE_TYPE (def_rhs))))
+	  && multiple_p (ref->size, BITS_PER_UNIT))
 	{
-	  gimple_match_op op (gimple_match_cond::UNCOND,
-			      BIT_FIELD_REF, vr->type,
-			      vn_valueize (def_rhs),
-			      bitsize_int (ref->size),
-			      bitsize_int (offset - offset2));
-	  tree val = vn_nary_build_or_lookup (&op);
-	  if (val
-	      && (TREE_CODE (val) != SSA_NAME
-		  || ! SSA_NAME_OCCURS_IN_ABNORMAL_PHI (val)))
+	  if (known_eq (ref->size, size2))
+	    return vn_reference_lookup_or_insert_for_pieces
+		(vuse, get_alias_set (lhs), vr->type, vr->operands,
+		 SSA_VAL (def_rhs));
+	  else if (! INTEGRAL_TYPE_P (TREE_TYPE (def_rhs))
+		   || type_has_mode_precision_p (TREE_TYPE (def_rhs)))
 	    {
-	      vn_reference_t res = vn_reference_lookup_or_insert_for_pieces
-		  (vuse, vr->set, vr->type, vr->operands, val);
-	      return res;
+	      gimple_match_op op (gimple_match_cond::UNCOND,
+				  BIT_FIELD_REF, vr->type,
+				  vn_valueize (def_rhs),
+				  bitsize_int (ref->size),
+				  bitsize_int (offset - offset2));
+	      tree val = vn_nary_build_or_lookup (&op);
+	      if (val
+		  && (TREE_CODE (val) != SSA_NAME
+		      || ! SSA_NAME_OCCURS_IN_ABNORMAL_PHI (val)))
+		return vn_reference_lookup_or_insert_for_pieces
+		    (vuse, get_alias_set (lhs), vr->type, vr->operands, val);
 	    }
 	}
     }
@@ -2770,7 +2773,8 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 	}
 
       /* Now re-write REF to be based on the rhs of the assignment.  */
-      copy_reference_ops_from_ref (gimple_assign_rhs1 (def_stmt), &rhs);
+      tree rhs1 = gimple_assign_rhs1 (def_stmt);
+      copy_reference_ops_from_ref (rhs1, &rhs);
 
       /* Apply an extra offset to the inner MEM_REF of the RHS.  */
       if (maybe_ne (extra_off, 0))
@@ -2806,7 +2810,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 	{
 	  if (data->partial_defs.is_empty ())
 	    return vn_reference_lookup_or_insert_for_pieces
-		(vuse, vr->set, vr->type, vr->operands, val);
+	      (vuse, get_alias_set (rhs1), vr->type, vr->operands, val);
 	  /* This is the only interesting case for partial-def handling
 	     coming from targets that like to gimplify init-ctors as
 	     aggregate copies from constant data like aarch64 for
@@ -2829,7 +2833,8 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
 	return (void *)-1;
 
       /* Adjust *ref from the new operands.  */
-      if (!ao_ref_init_from_vn_reference (&r, vr->set, vr->type, vr->operands))
+      if (!ao_ref_init_from_vn_reference (&r, get_alias_set (rhs1),
+					  vr->type, vr->operands))
 	return (void *)-1;
       /* This can happen with bitfields.  */
       if (maybe_ne (ref->size, r.size))
@@ -2990,10 +2995,10 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
       tree val = fully_constant_vn_reference_p (vr);
       if (val)
 	return vn_reference_lookup_or_insert_for_pieces
-		 (vuse, vr->set, vr->type, vr->operands, val);
+		 (vuse, 0, vr->type, vr->operands, val);
 
       /* Adjust *ref from the new operands.  */
-      if (!ao_ref_init_from_vn_reference (&r, vr->set, vr->type, vr->operands))
+      if (!ao_ref_init_from_vn_reference (&r, 0, vr->type, vr->operands))
 	return (void *)-1;
       /* This can happen with bitfields.  */
       if (maybe_ne (ref->size, r.size))
@@ -5539,8 +5544,48 @@ eliminate_dom_walker::eliminate_stmt (basic_block b, gimple_stmt_iterator *gsi)
       tree val;
       tree rhs = gimple_assign_rhs1 (stmt);
       vn_reference_t vnresult;
-      val = vn_reference_lookup (lhs, gimple_vuse (stmt), VN_WALKREWRITE,
-				 &vnresult, false);
+      /* ???  gcc.dg/torture/pr91445.c shows that we lookup a boolean
+         typed load of a byte known to be 0x11 as 1 so a store of
+	 a boolean 1 is detected as redundant.  Because of this we
+	 have to make sure to lookup with a ref where its size
+	 matches the precision.  */
+      tree lookup_lhs = lhs;
+      if (INTEGRAL_TYPE_P (TREE_TYPE (lhs))
+	  && (TREE_CODE (lhs) != COMPONENT_REF
+	      || !DECL_BIT_FIELD_TYPE (TREE_OPERAND (lhs, 1)))
+	  && !type_has_mode_precision_p (TREE_TYPE (lhs)))
+	{
+	  if (TREE_CODE (lhs) == COMPONENT_REF
+	      || TREE_CODE (lhs) == MEM_REF)
+	    {
+	      tree ltype = build_nonstandard_integer_type
+				(TREE_INT_CST_LOW (TYPE_SIZE (TREE_TYPE (lhs))),
+				 TYPE_UNSIGNED (TREE_TYPE (lhs)));
+	      if (TREE_CODE (lhs) == COMPONENT_REF)
+		{
+		  tree foff = component_ref_field_offset (lhs);
+		  tree f = TREE_OPERAND (lhs, 1);
+		  if (!poly_int_tree_p (foff))
+		    lookup_lhs = NULL_TREE;
+		  else
+		    lookup_lhs = build3 (BIT_FIELD_REF, ltype,
+					 TREE_OPERAND (lhs, 0),
+					 TYPE_SIZE (TREE_TYPE (lhs)),
+					 bit_from_pos
+					   (foff, DECL_FIELD_BIT_OFFSET (f)));
+		}
+	      else
+		lookup_lhs = build2 (MEM_REF, ltype,
+				     TREE_OPERAND (lhs, 0),
+				     TREE_OPERAND (lhs, 1));
+	    }
+	  else
+	    lookup_lhs = NULL_TREE;
+	}
+      val = NULL_TREE;
+      if (lookup_lhs)
+	val = vn_reference_lookup (lookup_lhs, gimple_vuse (stmt), VN_WALK,
+				   &vnresult, false);
       if (TREE_CODE (rhs) == SSA_NAME)
 	rhs = VN_INFO (rhs)->valnum;
       if (val
-- 
cgit v1.1


From 643d443665ec68270af4c950fed4cdc1adad5154 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Fri, 11 Oct 2019 13:41:13 +0000
Subject: Fortran] PR 92050 - fix ICE with -fcheck=all

        gcc/fortran/
        PR fortran/92050
        * trans-expr.c (gfc_conv_procedure_call): Handle code generated
        by -fcheck=all.

        gcc/testsuite/
        PR fortran/92050
        * gfortran.dg/pr92050.f90: New.

From-SVN: r276885
---
 gcc/fortran/ChangeLog                 |  6 ++++
 gcc/fortran/trans-expr.c              |  7 +++--
 gcc/testsuite/ChangeLog               |  5 ++++
 gcc/testsuite/gfortran.dg/pr92050.f90 | 53 +++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr92050.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 82bc450..5aeacc1 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
 
+	PR fortran/92050
+	* trans-expr.c (gfc_conv_procedure_call): Handle code generated
+	by -fcheck=all.
+
+2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
+
 	* f95-lang.c (LANG_HOOKS_OMP_IS_ALLOCATABLE_OR_PTR): Re-define to
 	gfc_omp_is_allocatable_or_ptr.
 	* trans-decl.c (create_function_arglist): Set GFC_DECL_OPTIONAL_ARGUMENT
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 965ab77..65238ff 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -7031,8 +7031,11 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
 	gfc_allocate_lang_decl (result);
       GFC_DECL_SAVED_DESCRIPTOR (result) = parmse.expr;
       gfc_free_expr (class_expr);
-      gcc_assert (parmse.pre.head == NULL_TREE
-		  && parmse.post.head == NULL_TREE);
+      /* -fcheck= can add diagnostic code, which has to be placed before
+	 the call. */
+      if (parmse.pre.head != NULL)
+	  gfc_add_expr_to_block (&se->pre, parmse.pre.head);
+      gcc_assert (parmse.post.head == NULL_TREE);
     }
 
   /* Follow the function call with the argument post block.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c18cb5f..488eba9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/92050
+	* gfortran.dg/pr92050.f90: New.
+
 2019-10-11  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/90883
diff --git a/gcc/testsuite/gfortran.dg/pr92050.f90 b/gcc/testsuite/gfortran.dg/pr92050.f90
new file mode 100644
index 0000000..6419387
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92050.f90
@@ -0,0 +1,53 @@
+! { dg-do run }
+! { dg-options "-fcheck=all" }
+! { dg-shouldfail "above upper bound" }
+!
+! PR fortran/92050
+!
+!
+module buggy
+  implicit none (type, external)
+
+  type :: par
+  contains
+    procedure, public :: fun => fun_par
+  end type par
+
+  type comp
+    class(par), allocatable :: p
+  end type comp
+
+  type foo
+    type(comp), allocatable :: m(:)
+  end type foo
+
+contains
+
+  function fun_par(this)
+    class(par) :: this
+    integer    :: fun_par(1)
+    fun_par = 42
+  end function fun_par
+
+  subroutine update_foo(this)
+    class(foo) :: this
+    write(*,*) this%m(1)%p%fun()
+  end subroutine update_foo
+
+  subroutine bad_update_foo(this)
+    class(foo) :: this
+    write(*,*) this%m(2)%p%fun()
+  end subroutine bad_update_foo
+end module buggy
+
+program main
+  use buggy
+  implicit none (type, external)
+  type(foo) :: x
+  allocate(x%m(1))
+  allocate(x%m(1)%p)
+  call update_foo(x)
+  call bad_update_foo(x)
+end program main
+
+! { dg-output "At line 39 of file .*pr92050.f90.*Fortran runtime error: Index '2' of dimension 1 of array 'this%m' above upper bound of 1" }
-- 
cgit v1.1


From bd01f4da3ecc88b25712e2d2a8f5c7ab3ed1b0e3 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 11 Oct 2019 14:17:32 +0000
Subject: tree-vect-loop.c (vect_analyze_loop_operations): Adjust call to
 vectorizable_live_operation.

2019-10-11  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * tree-vect-loop.c (vect_analyze_loop_operations): Adjust call to
        vectorizable_live_operation.
        (vectorizable_live_operation): Adjust parameters.
        * tree-vect-stmts.c (vect_init_vector,
        vect_gen_widened_results_half): Fix typo in function comment.
        (can_vectorize_live_stmts): Adjust function comment.
        Adjust parameters.  Adjust call to vectorizable_live_operation.
        (vect_analyze_stmt): Adjust call to can_vectorize_live_stmts.
        (vect_transform_stmt): Adjust function comment.  Adjust call to
        can_vectorize_live_stmts.
        * tree-vectorizer.h (vectorizable_live_operation): Adjust parameters.

From-SVN: r276886
---
 gcc/ChangeLog         | 14 ++++++++++++++
 gcc/tree-vect-loop.c  | 10 +++++-----
 gcc/tree-vect-stmts.c | 18 +++++++++---------
 gcc/tree-vectorizer.h |  3 +--
 4 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34a6db2..1a86675 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2019-10-11  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* tree-vect-loop.c (vect_analyze_loop_operations): Adjust call to
+	vectorizable_live_operation.
+	(vectorizable_live_operation): Adjust parameters.
+	* tree-vect-stmts.c (vect_init_vector,
+	vect_gen_widened_results_half): Fix typo in function comment.
+	(can_vectorize_live_stmts): Adjust function comment.
+	Adjust parameters.  Adjust call to vectorizable_live_operation.
+	(vect_analyze_stmt): Adjust call to can_vectorize_live_stmts.
+	(vect_transform_stmt): Adjust function comment.  Adjust call to
+	can_vectorize_live_stmts.
+	* tree-vectorizer.h (vectorizable_live_operation): Adjust parameters.
+
 2019-10-11  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/90883
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 1435210..cb95ea3 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -1566,7 +1566,7 @@ vect_analyze_loop_operations (loop_vec_info loop_vinfo)
 	      && STMT_VINFO_LIVE_P (stmt_info)
 	      && !PURE_SLP_STMT (stmt_info))
 	    ok = vectorizable_live_operation (stmt_info, NULL, NULL, NULL,
-					      -1, NULL, &cost_vec);
+					      -1, false, &cost_vec);
 
           if (!ok)
 	    return opt_result::failure_at (phi,
@@ -7628,9 +7628,9 @@ vectorizable_induction (stmt_vec_info stmt_info,
 
 bool
 vectorizable_live_operation (stmt_vec_info stmt_info,
-			     gimple_stmt_iterator *gsi ATTRIBUTE_UNUSED,
+			     gimple_stmt_iterator *gsi,
 			     slp_tree slp_node, slp_instance slp_node_instance,
-			     int slp_index, stmt_vec_info *vec_stmt,
+			     int slp_index, bool vec_stmt_p,
 			     stmt_vector_for_cost *)
 {
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
@@ -7652,7 +7652,7 @@ vectorizable_live_operation (stmt_vec_info stmt_info,
      validity so just trigger the transform here.  */
   if (STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info)))
     {
-      if (!vec_stmt)
+      if (!vec_stmt_p)
 	return true;
       if (slp_node)
 	{
@@ -7721,7 +7721,7 @@ vectorizable_live_operation (stmt_vec_info stmt_info,
 	}
     }
 
-  if (!vec_stmt)
+  if (!vec_stmt_p)
     {
       /* No transformation required.  */
       if (LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo))
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 9ebd3e3..e606945 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -1449,7 +1449,7 @@ vect_init_vector_1 (stmt_vec_info stmt_vinfo, gimple *new_stmt,
    Insert a new stmt (INIT_STMT) that initializes a new variable of type
    TYPE with the value VAL.  If TYPE is a vector type and VAL does not have
    vector type a vector with all elements equal to VAL is created first.
-   Place the initialization at BSI if it is not NULL.  Otherwise, place the
+   Place the initialization at GSI if it is not NULL.  Otherwise, place the
    initialization at the loop preheader.
    Return the DEF of INIT_STMT.
    It will be used in the vectorization of STMT_INFO.  */
@@ -4484,7 +4484,7 @@ vectorizable_simd_clone_call (stmt_vec_info stmt_info,
 
    Create a vector stmt whose code, type, number of arguments, and result
    variable are CODE, OP_TYPE, and VEC_DEST, and its arguments are
-   VEC_OPRND0 and VEC_OPRND1.  The new vector stmt is to be inserted at BSI.
+   VEC_OPRND0 and VEC_OPRND1.  The new vector stmt is to be inserted at GSI.
    In the case that CODE is a CALL_EXPR, this means that a call to DECL
    needs to be created (DECL is a function-decl of a target-builtin).
    STMT_INFO is the original scalar stmt that we are vectorizing.  */
@@ -10474,12 +10474,12 @@ vectorizable_comparison (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 /* If SLP_NODE is nonnull, return true if vectorizable_live_operation
    can handle all live statements in the node.  Otherwise return true
    if STMT_INFO is not live or if vectorizable_live_operation can handle it.
-   GSI and VEC_STMT are as for vectorizable_live_operation.  */
+   GSI and VEC_STMT_P are as for vectorizable_live_operation.  */
 
 static bool
 can_vectorize_live_stmts (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 			  slp_tree slp_node, slp_instance slp_node_instance,
-			  stmt_vec_info *vec_stmt,
+			  bool vec_stmt_p,
 			  stmt_vector_for_cost *cost_vec)
 {
   if (slp_node)
@@ -10491,14 +10491,14 @@ can_vectorize_live_stmts (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	  if (STMT_VINFO_LIVE_P (slp_stmt_info)
 	      && !vectorizable_live_operation (slp_stmt_info, gsi, slp_node,
 					       slp_node_instance, i,
-					       vec_stmt, cost_vec))
+					       vec_stmt_p, cost_vec))
 	    return false;
 	}
     }
   else if (STMT_VINFO_LIVE_P (stmt_info)
 	   && !vectorizable_live_operation (stmt_info, gsi, slp_node,
 					    slp_node_instance, -1,
-					    vec_stmt, cost_vec))
+					    vec_stmt_p, cost_vec))
     return false;
 
   return true;
@@ -10712,7 +10712,7 @@ vect_analyze_stmt (stmt_vec_info stmt_info, bool *need_to_vectorize,
       && STMT_VINFO_TYPE (stmt_info) != reduc_vec_info_type
       && STMT_VINFO_TYPE (stmt_info) != lc_phi_info_type
       && !can_vectorize_live_stmts (stmt_info, NULL, node, node_instance,
-				    NULL, cost_vec))
+				    false, cost_vec))
     return opt_result::failure_at (stmt_info->stmt,
 				   "not vectorized:"
 				   " live stmt not supported: %G",
@@ -10724,7 +10724,7 @@ vect_analyze_stmt (stmt_vec_info stmt_info, bool *need_to_vectorize,
 
 /* Function vect_transform_stmt.
 
-   Create a vectorized stmt to replace STMT_INFO, and insert it at BSI.  */
+   Create a vectorized stmt to replace STMT_INFO, and insert it at GSI.  */
 
 bool
 vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
@@ -10945,7 +10945,7 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   /* Handle stmts whose DEF is used outside the loop-nest that is
      being vectorized.  */
   done = can_vectorize_live_stmts (stmt_info, gsi, slp_node,
-				   slp_node_instance, &vec_stmt, NULL);
+				   slp_node_instance, true, NULL);
   gcc_assert (done);
 
   return false;
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 484de4f..291304f 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1653,8 +1653,7 @@ extern opt_loop_vec_info vect_analyze_loop_form (class loop *,
 						 vec_info_shared *);
 extern bool vectorizable_live_operation (stmt_vec_info, gimple_stmt_iterator *,
 					 slp_tree, slp_instance, int,
-					 stmt_vec_info *,
-					 stmt_vector_for_cost *);
+					 bool, stmt_vector_for_cost *);
 extern bool vectorizable_reduction (stmt_vec_info, slp_tree, slp_instance,
 				    stmt_vector_for_cost *);
 extern bool vectorizable_induction (stmt_vec_info, gimple_stmt_iterator *,
-- 
cgit v1.1


From 3635c2bf7c40a959ebd257d4724ebf487155a343 Mon Sep 17 00:00:00 2001
From: Wilco Dijkstra <wdijkstr@arm.com>
Date: Fri, 11 Oct 2019 14:23:28 +0000
Subject: [ARM] Tweak HONOR_REG_ALLOC_ORDER

Setting HONOR_REG_ALLOC_ORDER improves codesize with -Os, however it generates
slower and larger code with -O2 and higher.  So only set it when optimizing for
size.  On Cortex-A57 this improves SPECINT2006 by 0.15% and SPECFP2006 by 0.25%
while reducing codesize.

    gcc/
	* config/arm/arm.h (HONOR_REG_ALLOC_ORDER): Set when optimizing for
	size.

From-SVN: r276887
---
 gcc/ChangeLog        | 5 +++++
 gcc/config/arm/arm.h | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a86675..8118e14 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* config/arm/arm.h (HONOR_REG_ALLOC_ORDER): Set when optimizing for
+	size.
+
 2019-10-11  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 	* tree-vect-loop.c (vect_analyze_loop_operations): Adjust call to
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 8b67c9c..5fad1e5 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -1068,9 +1068,8 @@ extern int arm_regs_in_sequence[];
 /* Use different register alloc ordering for Thumb.  */
 #define ADJUST_REG_ALLOC_ORDER arm_order_regs_for_local_alloc ()
 
-/* Tell IRA to use the order we define rather than messing it up with its
-   own cost calculations.  */
-#define HONOR_REG_ALLOC_ORDER 1
+/* Tell IRA to use the order we define when optimizing for size.  */
+#define HONOR_REG_ALLOC_ORDER optimize_function_for_size_p (cfun)
 
 /* Interrupt functions can only use registers that have already been
    saved by the prologue, even if they would normally be
-- 
cgit v1.1


From 8b27c9052b8d191c98686e77d2fa610390c78f32 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Fri, 11 Oct 2019 14:44:13 +0000
Subject: Relax store_bit_field call in store_expr

store_bit_field already takes a poly_uint64 size, so we can relax the
INTVAL to rtx_to_poly_int64.  This is tested by the SVE ACLE patches.

2019-10-11  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* expr.c (store_expr): Use rtx_to_poly_int64 rather than
	INTVAL when calling store_bit_field.

From-SVN: r276888
---
 gcc/ChangeLog | 5 +++++
 gcc/expr.c    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8118e14..f346dd5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* expr.c (store_expr): Use rtx_to_poly_int64 rather than
+	INTVAL when calling store_bit_field.
+
 2019-10-11  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* config/arm/arm.h (HONOR_REG_ALLOC_ORDER): Set when optimizing for
diff --git a/gcc/expr.c b/gcc/expr.c
index 124144d..b54bf1d 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -5790,7 +5790,8 @@ store_expr (tree exp, rtx target, int call_param_p,
 		copy_blkmode_from_reg (target, temp, TREE_TYPE (exp));
 	      else
 		store_bit_field (target,
-				 INTVAL (expr_size (exp)) * BITS_PER_UNIT,
+				 rtx_to_poly_int64 (expr_size (exp))
+				 * BITS_PER_UNIT,
 				 0, 0, 0, GET_MODE (temp), temp, reverse);
 	    }
 	  else
-- 
cgit v1.1


From 6334c1f49fe3e3b81dfe90f25fdf89a3ddb557b8 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 11 Oct 2019 18:23:50 +0100
Subject: * fi.po: Update.

From-SVN: r276894
---
 gcc/po/ChangeLog |  4 ++++
 gcc/po/fi.po     | 64 +++++++++++++++++++++-----------------------------------
 2 files changed, 28 insertions(+), 40 deletions(-)

(limited to 'gcc')

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index b597c8d..6f8902e 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* fi.po: Update.
+
 2019-09-30  Joseph Myers  <joseph@codesourcery.com>
 
 	* es.po: Update.
diff --git a/gcc/po/fi.po b/gcc/po/fi.po
index c66de8a..b4b27c4 100644
--- a/gcc/po/fi.po
+++ b/gcc/po/fi.po
@@ -33,7 +33,7 @@ msgstr ""
 "Project-Id-Version: gcc 9.1.0\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
 "POT-Creation-Date: 2019-05-02 20:28+0000\n"
-"PO-Revision-Date: 2019-05-29 18:58+0300\n"
+"PO-Revision-Date: 2019-10-11 20:03+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -67,9 +67,9 @@ msgid "[cannot find %s]"
 msgstr "lähdetiedostoa %s ei löydy"
 
 #: collect2.c:1632
-#, fuzzy, c-format
+#, c-format
 msgid "collect2 version %s\n"
-msgstr "gcc-versio %s %s\n"
+msgstr "collect2-versio %s\n"
 
 #: collect2.c:1737
 #, c-format
@@ -118,9 +118,9 @@ msgid "const/copy propagation disabled"
 msgstr "const-/kopioinnin-eteneminen poistettu käytöstä"
 
 #: diagnostic.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "%s: all warnings being treated as errors"
-msgstr "Käsittele kaikki varoitukset virheinä"
+msgstr "%s: kaikki varoitukset käsitellään virheinä"
 
 #: diagnostic.c:150
 #, c-format
@@ -6142,9 +6142,8 @@ msgid "gfortran does not support -E without -cpp"
 msgstr "gfortran ei tue valitsinta -E ilman valitsinta -cpp"
 
 #: objc/lang-specs.h:30 objc/lang-specs.h:41
-#, fuzzy
 msgid "GNU Objective C no longer supports traditional compilation"
-msgstr "GCC ei enää tue valitsinta -traditional ilman valitsinta -E"
+msgstr "GNU Objective C ei enää tue perinteistä kääntämistä"
 
 #: objc/lang-specs.h:55
 msgid "objc-cpp-output is deprecated; please use objective-c-cpp-output instead"
@@ -6688,9 +6687,8 @@ msgid "Conform to the ISO Fortran 95 standard."
 msgstr "Noudata ISO Fortran 95 -standardia"
 
 #: fortran/lang.opt:827
-#, fuzzy
 msgid "Conform to nothing in particular."
-msgstr "Älä noudata mitään erityisesti"
+msgstr "Älä noudata mitään erityisesti."
 
 #: fortran/lang.opt:831
 msgid "Accept extensions to support legacy code."
@@ -6732,24 +6730,20 @@ msgid "-I <dir>\tAdd <dir> to the end of the main include path."
 msgstr "-isystem <hakemisto>\tLisää <hakemisto> järjestelmän include-polun alkuun"
 
 #: c-family/c.opt:217
-#, fuzzy
 msgid "Generate make dependencies."
-msgstr "Luo make-riippuvuudet"
+msgstr "Luo make-riippuvuudet."
 
 #: c-family/c.opt:221
-#, fuzzy
 msgid "Generate make dependencies and compile."
-msgstr "Luo make-riippuvuudet ja käännä"
+msgstr "Luo make-riippuvuudet ja käännä."
 
 #: c-family/c.opt:225
-#, fuzzy
 msgid "-MF <file>\tWrite dependency output to the given file."
-msgstr "Kirjoita riippuvuustuloste annettuun tiedostoon"
+msgstr "-MF <tiedosto>\tKirjoita riippuvuustuloste annettuun tiedostoon."
 
 #: c-family/c.opt:229
-#, fuzzy
 msgid "Treat missing header files as generated files."
-msgstr "Käsittele puuttuvia otsikkotiedostoja luotavina tiedostoina"
+msgstr "Käsittele puuttuvia otsikkotiedostoja luotavina tiedostoina."
 
 #: c-family/c.opt:233
 msgid "Like -M but ignore system header files."
@@ -6773,9 +6767,8 @@ msgid "-MT <target>\tAdd an unquoted target."
 msgstr ""
 
 #: c-family/c.opt:253
-#, fuzzy
 msgid "Do not generate #line directives."
-msgstr "Älä luo #line-direktiivejä"
+msgstr "Älä luo #line-direktiivejä."
 
 #: c-family/c.opt:257
 #, fuzzy
@@ -6817,11 +6810,9 @@ msgstr ""
 msgid "Enable most warning messages."
 msgstr "Subject: Fetchmailin varoitus liian suuresta viestistä"
 
-# vähän fuzzy
 #: c-family/c.opt:308
-#, fuzzy
 msgid "Warn on any use of alloca."
-msgstr "Varoita pragmain väärästä käytöstä."
+msgstr "Varoita kaikesta allocan käytöstä."
 
 #: c-family/c.opt:312
 #, fuzzy
@@ -6931,9 +6922,8 @@ msgstr "Varoita ”char”-tyypillä indeksoinnista."
 #: c-family/c.opt:1369 c-family/c.opt:1373 c-family/c.opt:1377
 #: c-family/c.opt:1381 c-family/c.opt:1385 c-family/c.opt:1389
 #: config/i386/i386.opt:967
-#, fuzzy
 msgid "Deprecated in GCC 9.  This switch has no effect."
-msgstr "Vanhentunut. Tämä valitsin ei vaikuta mihinkään."
+msgstr "Vanhentunut GCC 9:ssä. Tämä valitsin ei vaikuta mihinkään."
 
 #: c-family/c.opt:429
 msgid "Warn about variables that might be changed by \"longjmp\" or \"vfork\"."
@@ -6964,9 +6954,8 @@ msgid "Warn when all constructors and destructors are private."
 msgstr "Varoita kun kaikki muodostimet ja hajottimet ovat yksityisiä."
 
 #: c-family/c.opt:461
-#, fuzzy
 msgid "Warn about dangling else."
-msgstr "Varoita implisiittisistä funktioesittelyistä."
+msgstr "Varoita orvosta elsestä."
 
 #: c-family/c.opt:465
 msgid "Warn about __TIME__, __DATE__ and __TIMESTAMP__ usage."
@@ -7119,9 +7108,8 @@ msgid "Warn whenever type qualifiers are ignored."
 msgstr "Varoita tyyppimääreiden huomiotta jättämisestä."
 
 #: c-family/c.opt:622
-#, fuzzy
 msgid "Warn whenever attributes are ignored."
-msgstr "Varoita tyyppimääreiden huomiotta jättämisestä."
+msgstr "Varoita attribuuttien huomiotta jättämisestä."
 
 #: c-family/c.opt:626
 #, fuzzy
@@ -7196,9 +7184,8 @@ msgid "Warn when a string or character literal is followed by a ud-suffix which
 msgstr ""
 
 #: c-family/c.opt:701
-#, fuzzy
 msgid "Warn when a logical operator is suspiciously always evaluating to true or false."
-msgstr "Varoita vertailusta, joka on aina tosi tai aina epätosi."
+msgstr "Varoita, kun looginen operaattori on aina tosi tai aina epätosi."
 
 #: c-family/c.opt:705
 msgid "Warn when logical not is used on the left hand side operand of a comparison."
@@ -7429,9 +7416,8 @@ msgid "Warn about packed bit-fields whose offset changed in GCC 4.4."
 msgstr "Varoita pakatuista bittikentistä, joiden siirrososoite vaihtui GCC 4.4:ssä"
 
 #: c-family/c.opt:955
-#, fuzzy
 msgid "Warn about possibly missing parentheses."
-msgstr "Varoita mahdollisesti puuttuvista sulkeista"
+msgstr "Varoita mahdollisesti puuttuvista sulkeista."
 
 #: c-family/c.opt:963
 msgid "Warn about calling std::move on a local object in a return statement preventing copy elision."
@@ -7975,9 +7961,8 @@ msgid "Enable OpenMP's SIMD directives."
 msgstr "Luokittelematon lause IF-lauseessa kohdassa %C"
 
 #: c-family/c.opt:1681
-#, fuzzy
 msgid "Recognize C++ keywords like \"compl\" and \"xor\"."
-msgstr "Tunnista C++:n avainsanat kuten ”compl” ja ”xor”"
+msgstr "Tunnista C++:n avainsanat kuten ”compl” ja ”xor”."
 
 #: c-family/c.opt:1692
 msgid "Look for and use PCH files even when preprocessing."
@@ -8732,9 +8717,8 @@ msgid "Set the maximum amount for a single stack increment operation."
 msgstr ""
 
 #: config/mcore/mcore.opt:75
-#, fuzzy
 msgid "Always treat bitfields as int-sized."
-msgstr "Käsittele bittikenttiä aina int-kokoisina"
+msgstr "Käsittele bittikenttiä aina int-kokoisina."
 
 #: config/linux-android.opt:23
 msgid "Generate code for the Android platform."
@@ -19730,7 +19714,7 @@ msgstr "%qs-attribuuttia ei huomioida %qs:lle"
 #: cgraphunit.c:976 c/c-decl.c:11507
 #, fuzzy, gcc-internal-format
 msgid "%q+F used but never defined"
-msgstr "nimike %q+D määritelty mutta käytettämättä"
+msgstr "nimike %q+D määritelty mutta käyttämättä"
 
 #: cgraphunit.c:978 c/c-decl.c:11517
 #, fuzzy, gcc-internal-format
@@ -29294,7 +29278,7 @@ msgstr "%<X<=Y<=Z%> -tyylisillä vertailuilla on eri merkitys kuin matematiikass
 #: c-family/c-warn.c:2021
 #, gcc-internal-format
 msgid "label %q+D defined but not used"
-msgstr "nimike %q+D määritelty mutta käytettämättä"
+msgstr "nimike %q+D määritelty mutta käyttämättä"
 
 #: c-family/c-warn.c:2023
 #, gcc-internal-format
@@ -68642,7 +68626,7 @@ msgstr "(%qs:n alustuksen lähistöllä)"
 
 #, fuzzy
 #~ msgid "variable %q+D set but not used"
-#~ msgstr "nimike %q+D määritelty mutta käytettämättä"
+#~ msgstr "nimike %q+D määritelty mutta käyttämättä"
 
 #~ msgid "jump to label %q+D"
 #~ msgstr "hyppy nimiöön %q+D"
@@ -68659,7 +68643,7 @@ msgstr "(%qs:n alustuksen lähistöllä)"
 
 #, fuzzy
 #~ msgid "parameter %q+D set but not used"
-#~ msgstr "nimike %q+D määritelty mutta käytettämättä"
+#~ msgstr "nimike %q+D määritelty mutta käyttämättä"
 
 #~ msgid "%q+D declared here"
 #~ msgstr "%q+D esitelty täällä"
-- 
cgit v1.1


From fe2bc27cdb6d572da0163d77e787ba644b400753 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 11 Oct 2019 18:32:48 +0100
Subject: Support _Decimal* keywords for C2x.

ISO C2x adds decimal floating point as an optional standard feature.
This patch accordingly makes GCC accept the _Decimal* keywords in
strict C2x mode, using pedwarn_c11 to get a warning for
-Wc11-c2x-compat.  (Constants, where the pedwarn is in libcpp, will be
dealt with separately.)

The _Decimal* keywords are marked with D_EXT, meaning they are not
considered keywords at all in strict conformance modes.  This is
contrary to the normal practice for most implementation-namespace
keywords, which are accepted in all standards modes but with
appropriate pedwarns for older standards.  This patch removes D_EXT
from those keywords so they are accepted as keywords for all
standards, consequently removing the gcc.dg/dfp/keywords-ignored-c99.c
test that is no longer valid.

(A new D_C2X for keywords will still be needed if any new keywords get
added that aren't in the implementation namespace for older standards;
there are proposals for such keywords, albeit as predefined macros
that might not actually need new keywords in the compiler in all
cases.  If the DFP keywords end up as decimal32 etc., of course
appropriate compiler and testcase changes will be needed, and a
version of keywords-ignored-c99.c would make sense again with such
spellings.)

Bootstrapped with no regressions on x86_64-pc-linux-gnu.

gcc/c:
	* c-decl.c (declspecs_add_type): Use pedwarn_c11 for DFP types.

gcc/c-family:
	* c-common.c (c_common_reswords): Do not use D_EXT for _Decimal32,
	_Decimal64 and _Decimal128.

gcc/testsuite:
	* gcc.dg/dfp/c11-keywords-1.c, gcc.dg/dfp/c11-keywords-2.c,
	gcc.dg/dfp/c2x-keywords-1.c, gcc.dg/dfp/c2x-keywords-2.c: New
	tests.
	* gcc.dg/dfp/keywords-ignored-c99.c: Remove test.
	* gcc.dg/dfp/constants-c99.c, gcc.dg/dfp/keywords-c89.c,
	gcc.dg/dfp/keywords-c99.c: Use -pedantic-errors.

From-SVN: r276896
---
 gcc/c-family/ChangeLog                          |  5 +++++
 gcc/c-family/c-common.c                         |  6 +++---
 gcc/c/ChangeLog                                 |  4 ++++
 gcc/c/c-decl.c                                  |  5 +++--
 gcc/testsuite/ChangeLog                         |  9 +++++++++
 gcc/testsuite/gcc.dg/dfp/c11-keywords-1.c       |  7 +++++++
 gcc/testsuite/gcc.dg/dfp/c11-keywords-2.c       |  7 +++++++
 gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c       |  7 +++++++
 gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c       |  7 +++++++
 gcc/testsuite/gcc.dg/dfp/constants-c99.c        |  2 +-
 gcc/testsuite/gcc.dg/dfp/keywords-c89.c         |  4 ++--
 gcc/testsuite/gcc.dg/dfp/keywords-c99.c         |  4 ++--
 gcc/testsuite/gcc.dg/dfp/keywords-ignored-c99.c | 15 ---------------
 13 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c11-keywords-1.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c11-keywords-2.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
 delete mode 100644 gcc/testsuite/gcc.dg/dfp/keywords-ignored-c99.c

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a41e910..a0ce54b 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-common.c (c_common_reswords): Do not use D_EXT for _Decimal32,
+	_Decimal64 and _Decimal128.
+
 2019-10-10  Joseph Myers  <joseph@codesourcery.com>
 
 	* c-cppbuiltin.c (c_cpp_builtins): Do not define macros for DFP
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 7169813..909f52a 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -351,9 +351,9 @@ const struct c_common_resword c_common_reswords[] =
   { "_Float32x",        RID_FLOAT32X,  D_CONLY },
   { "_Float64x",        RID_FLOAT64X,  D_CONLY },
   { "_Float128x",       RID_FLOAT128X, D_CONLY },
-  { "_Decimal32",       RID_DFLOAT32,  D_CONLY | D_EXT },
-  { "_Decimal64",       RID_DFLOAT64,  D_CONLY | D_EXT },
-  { "_Decimal128",      RID_DFLOAT128, D_CONLY | D_EXT },
+  { "_Decimal32",       RID_DFLOAT32,  D_CONLY },
+  { "_Decimal64",       RID_DFLOAT64,  D_CONLY },
+  { "_Decimal128",      RID_DFLOAT128, D_CONLY },
   { "_Fract",           RID_FRACT,     D_CONLY | D_EXT },
   { "_Accum",           RID_ACCUM,     D_CONLY | D_EXT },
   { "_Sat",             RID_SAT,       D_CONLY | D_EXT },
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index fa1001c..894f5e7 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-decl.c (declspecs_add_type): Use pedwarn_c11 for DFP types.
+
 2019-10-10  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-parser.c (c_parser_omp_all_clauses): Add NESTED_P argument, if
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 132fa3e..f67033b 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -10959,8 +10959,9 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs,
 		error_at (loc,
 			  ("decimal floating-point not supported "
 			   "for this target"));
-	      pedwarn (loc, OPT_Wpedantic,
-		       "ISO C does not support decimal floating-point");
+	      pedwarn_c11 (loc, OPT_Wpedantic,
+			   "ISO C does not support decimal floating-point "
+			   "before C2X");
 	      return specs;
 	    case RID_FRACT:
 	    case RID_ACCUM:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 488eba9..2459275 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/dfp/c11-keywords-1.c, gcc.dg/dfp/c11-keywords-2.c,
+	gcc.dg/dfp/c2x-keywords-1.c, gcc.dg/dfp/c2x-keywords-2.c: New
+	tests.
+	* gcc.dg/dfp/keywords-ignored-c99.c: Remove test.
+	* gcc.dg/dfp/constants-c99.c, gcc.dg/dfp/keywords-c89.c,
+	gcc.dg/dfp/keywords-c99.c: Use -pedantic-errors.
+
 2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
 
 	PR fortran/92050
diff --git a/gcc/testsuite/gcc.dg/dfp/c11-keywords-1.c b/gcc/testsuite/gcc.dg/dfp/c11-keywords-1.c
new file mode 100644
index 0000000..5a5c862
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c11-keywords-1.c
@@ -0,0 +1,7 @@
+/* Test that _Decimal* keywords diagnosed in C11 mode: -pedantic.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c11 -pedantic" } */
+
+_Decimal32 d32; /* { dg-warning "ISO C does not support" } */
+_Decimal64 d64; /* { dg-warning "ISO C does not support" } */
+_Decimal128 d128; /* { dg-warning "ISO C does not support" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c11-keywords-2.c b/gcc/testsuite/gcc.dg/dfp/c11-keywords-2.c
new file mode 100644
index 0000000..7c7f3d9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c11-keywords-2.c
@@ -0,0 +1,7 @@
+/* Test that _Decimal* keywords diagnosed in C11 mode: -pedantic-errors.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c11 -pedantic-errors" } */
+
+_Decimal32 d32; /* { dg-error "ISO C does not support" } */
+_Decimal64 d64; /* { dg-error "ISO C does not support" } */
+_Decimal128 d128; /* { dg-error "ISO C does not support" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
new file mode 100644
index 0000000..a3a1da5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
@@ -0,0 +1,7 @@
+/* Test that _Decimal* keywords are accepted in C2X mode.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -pedantic-errors" } */
+
+_Decimal32 d32;
+_Decimal64 d64;
+_Decimal128 d128;
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
new file mode 100644
index 0000000..9655dd0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
@@ -0,0 +1,7 @@
+/* Test that _Decimal* keywords are accepted in C2X mode: compat warnings.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+
+_Decimal32 d32; /* { dg-warning "ISO C does not support" } */
+_Decimal64 d64; /* { dg-warning "ISO C does not support" } */
+_Decimal128 d128; /* { dg-warning "ISO C does not support" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/constants-c99.c b/gcc/testsuite/gcc.dg/dfp/constants-c99.c
index 6a48bf5..5a135c5 100644
--- a/gcc/testsuite/gcc.dg/dfp/constants-c99.c
+++ b/gcc/testsuite/gcc.dg/dfp/constants-c99.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c99 -Wno-overflow" } */
+/* { dg-options "-std=c99 -Wno-overflow -pedantic-errors" } */
 
 /* N1150 6: Constants.
    C99 6.4.4.2: Floating constants.  */
diff --git a/gcc/testsuite/gcc.dg/dfp/keywords-c89.c b/gcc/testsuite/gcc.dg/dfp/keywords-c89.c
index 8c96d60..a67c3d6 100644
--- a/gcc/testsuite/gcc.dg/dfp/keywords-c89.c
+++ b/gcc/testsuite/gcc.dg/dfp/keywords-c89.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c89" } */
+/* { dg-options "-std=c89 -pedantic-errors" } */
 
-/* Decimal float keywords are not recognized in C89 mode.  */
+/* Decimal float keywords are diagnosed in pedantic C89 mode.  */
 
 _Decimal32 x;		/* { dg-error "" } */
 _Decimal64 y;		/* { dg-error "" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/keywords-c99.c b/gcc/testsuite/gcc.dg/dfp/keywords-c99.c
index 8a62fb9..f51900e 100644
--- a/gcc/testsuite/gcc.dg/dfp/keywords-c99.c
+++ b/gcc/testsuite/gcc.dg/dfp/keywords-c99.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c99" } */
+/* { dg-options "-std=c99 -pedantic-errors" } */
 
-/* Decimal float keywords are not recognized in C99 mode.  */
+/* Decimal float keywords are diagnosed in pedantic C99 mode.  */
 
 _Decimal32 x;		/* { dg-error "" } */
 _Decimal64 y;		/* { dg-error "" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/keywords-ignored-c99.c b/gcc/testsuite/gcc.dg/dfp/keywords-ignored-c99.c
deleted file mode 100644
index a4258aa..0000000
--- a/gcc/testsuite/gcc.dg/dfp/keywords-ignored-c99.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-std=c99" } */
-
-/* Decimal float keywords are not reserved for c99.  */
-
-int _Decimal32 (void)
-{
-  return 0;
-}
-
-int foo (int i)
-{
-  int _Decimal64 = i * 2;
-  return _Decimal64;
-}
-- 
cgit v1.1


From c988c699fa09c91485afa24526f965e3fd4269d6 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Fri, 11 Oct 2019 17:41:29 +0000
Subject: re PR fortran/92019 (ICE in find_inquiry_ref, at expr.c:1790)

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/92019
	* array.c (match_subscript): BOZ cannot be an array subscript.


2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/92019
	* gfortran.dg/pr92019.f90: New test.

From-SVN: r276897
---
 gcc/fortran/ChangeLog                 |  5 +++++
 gcc/fortran/array.c                   | 21 ++++++++++++++++++++-
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/gfortran.dg/pr92019.f90 |  9 +++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr92019.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5aeacc1..47b2061 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/92019
+	* array.c (match_subscript): BOZ cannot be an array subscript.
+
 2019-10-11  Tobias Burnus  <tobias@codesourcery.com>
 
 	PR fortran/92050
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 3a504eb..cbeece4 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -66,6 +66,7 @@ match_subscript (gfc_array_ref *ar, int init, bool match_star)
   match m = MATCH_ERROR;
   bool star = false;
   int i;
+  bool saw_boz = false;
 
   i = ar->dimen + ar->codimen;
 
@@ -91,6 +92,12 @@ match_subscript (gfc_array_ref *ar, int init, bool match_star)
   else if (!star)
     m = gfc_match_expr (&ar->start[i]);
 
+  if (ar->start[i] && ar->start[i]->ts.type == BT_BOZ)
+    {
+      gfc_error ("Invalid BOZ literal constant used in subscript at %C");
+      saw_boz = true;
+    }
+
   if (m == MATCH_NO)
     gfc_error ("Expected array subscript at %C");
   if (m != MATCH_YES)
@@ -117,6 +124,12 @@ end_element:
   else
     m = gfc_match_expr (&ar->end[i]);
 
+  if (ar->end[i] && ar->end[i]->ts.type == BT_BOZ)
+    {
+      gfc_error ("Invalid BOZ literal constant used in subscript at %C");
+      saw_boz = true;
+    }
+
   if (m == MATCH_ERROR)
     return MATCH_ERROR;
 
@@ -132,6 +145,12 @@ end_element:
       m = init ? gfc_match_init_expr (&ar->stride[i])
 	       : gfc_match_expr (&ar->stride[i]);
 
+      if (ar->stride[i] && ar->stride[i]->ts.type == BT_BOZ)
+	{
+	  gfc_error ("Invalid BOZ literal constant used in subscript at %C");
+	  saw_boz = true;
+	}
+
       if (m == MATCH_NO)
 	gfc_error ("Expected array subscript stride at %C");
       if (m != MATCH_YES)
@@ -142,7 +161,7 @@ matched:
   if (star)
     ar->dimen_type[i] = DIMEN_STAR;
 
-  return MATCH_YES;
+  return (saw_boz ? MATCH_ERROR : MATCH_YES);
 }
 
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2459275..6c6a077 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/92019
+	* gfortran.dg/pr92019.f90: New test.
+
 2019-10-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/dfp/c11-keywords-1.c, gcc.dg/dfp/c11-keywords-2.c,
diff --git a/gcc/testsuite/gfortran.dg/pr92019.f90 b/gcc/testsuite/gfortran.dg/pr92019.f90
new file mode 100644
index 0000000..488774b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92019.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/92019
+program foo
+  integer :: a(4) = [1, 2, 3, 4]
+  print *, a(z'1')            ! { dg-error "Invalid BOZ literal constant" }
+  print *, a(1:z'3')          ! { dg-error "Invalid BOZ literal constant" }
+  print *, a(1:2:z'2')        ! { dg-error "Invalid BOZ literal constant" }
+  print *, a([z'2',z'1'])     ! { dg-error "cannot appear in an array constructor" }
+end program foo
-- 
cgit v1.1


From 405e87e8259b6e70bdf31544bb0e5d147e6f301a Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Fri, 11 Oct 2019 17:52:27 +0000
Subject: re PR fortran/92018 (ICE in gfc_conv_constant_to_tree, at
 fortran/trans-const.c:370)

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/92018
	* check.c (reset_boz): New function.
	(illegal_boz_arg, boz_args_check, gfc_check_complex, gfc_check_float,
	gfc_check_transfer): Use it.
	(gfc_check_dshift): Use reset_boz, and re-arrange the checking to
	help suppress possible run-on errors.
	(gfc_check_and): Restore checks for valid argument types.  Use
	reset_boz, and re-arrange the checking to help suppress possible
 	un-on errors.
	* resolve.c (resolve_function): Actual arguments cannot be BOZ in
	a function reference.

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/92018
	* gfortran.dg/gnu_logical_2.f90: Update dg-error regex.
	* gfortran.dg/pr81509_2.f90: Ditto.
	* gfortran.dg/pr92018.f90: New test.

From-SVN: r276898
---
 gcc/fortran/ChangeLog                       |  14 +++
 gcc/fortran/check.c                         | 134 +++++++++++++++++++++++-----
 gcc/fortran/resolve.c                       |  21 ++---
 gcc/testsuite/ChangeLog                     |   7 ++
 gcc/testsuite/gfortran.dg/gnu_logical_2.f90 |  12 +--
 gcc/testsuite/gfortran.dg/pr81509_2.f90     |   2 +-
 gcc/testsuite/gfortran.dg/pr92018.f90       |   8 ++
 7 files changed, 155 insertions(+), 43 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr92018.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 47b2061..b6d97cb 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,19 @@
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/92018
+	* check.c (reset_boz): New function.
+	(illegal_boz_arg, boz_args_check, gfc_check_complex, gfc_check_float,
+	gfc_check_transfer): Use it.
+	(gfc_check_dshift): Use reset_boz, and re-arrange the checking to
+	help suppress possible run-on errors.
+	(gfc_check_and): Restore checks for valid argument types.  Use
+	reset_boz, and re-arrange the checking to help suppress possible
+	run-on errors.
+	* resolve.c (resolve_function): Actual arguments cannot be BOZ in
+	a function reference.
+
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/92019
 	* array.c (match_subscript): BOZ cannot be an array subscript.
 
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 87a8196..f66ed93 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -34,6 +34,24 @@ along with GCC; see the file COPYING3.  If not see
 #include "constructor.h"
 #include "target-memory.h"
 
+
+/* Reset a BOZ to a zero value.  This is used to prevent run-on errors
+   from resolve.c(resolve_function).  */
+
+static void
+reset_boz (gfc_expr *x)
+{
+  /* Clear boz info.  */
+  x->boz.rdx = 0;
+  x->boz.len = 0;
+  free (x->boz.str);
+
+  x->ts.type = BT_INTEGER;
+  x->ts.kind = gfc_default_integer_kind;
+  mpz_init (x->value.integer);
+  mpz_set_ui (x->value.integer, 0);
+}
+
 /* A BOZ literal constant can appear in a limited number of contexts.
    gfc_invalid_boz() is a helper function to simplify error/warning
    generation.  gfortran accepts the nonstandard 'X' for 'Z', and gfortran
@@ -63,6 +81,7 @@ illegal_boz_arg (gfc_expr *x)
     {
       gfc_error ("BOZ literal constant at %L cannot be an actual argument "
 		 "to %qs", &x->where, gfc_current_intrinsic);
+      reset_boz (x);
       return true;
     }
 
@@ -79,6 +98,8 @@ boz_args_check(gfc_expr *i, gfc_expr *j)
       gfc_error ("Arguments of %qs at %L and %L cannot both be BOZ "
 		 "literal constants", gfc_current_intrinsic, &i->where,
 		 &j->where);
+      reset_boz (i);
+      reset_boz (j);
       return false;
 
     }
@@ -2399,7 +2420,10 @@ gfc_check_complex (gfc_expr *x, gfc_expr *y)
     {
       if (gfc_invalid_boz ("BOZ constant at %L cannot appear in the COMPLEX "
 			   "intrinsic subprogram", &x->where))
-	return false;
+	{
+	  reset_boz (x);
+	  return false;
+        }
       if (y->ts.type == BT_INTEGER && !gfc_boz2int (x, y->ts.kind))
 	return false;
       if (y->ts.type == BT_REAL && !gfc_boz2real (x, y->ts.kind))
@@ -2410,7 +2434,10 @@ gfc_check_complex (gfc_expr *x, gfc_expr *y)
     {
       if (gfc_invalid_boz ("BOZ constant at %L cannot appear in the COMPLEX "
 			   "intrinsic subprogram", &y->where))
-	return false;
+	{
+	  reset_boz (y);
+	  return false;
+	}
       if (x->ts.type == BT_INTEGER && !gfc_boz2int (y, x->ts.kind))
 	return false;
       if (x->ts.type == BT_REAL && !gfc_boz2real (y, x->ts.kind))
@@ -2674,20 +2701,32 @@ gfc_check_dshift (gfc_expr *i, gfc_expr *j, gfc_expr *shift)
   if (!boz_args_check (i, j))
     return false;
 
-  /* If i is BOZ and j is integer, convert i to type of j.  */
-  if (i->ts.type == BT_BOZ && j->ts.type == BT_INTEGER
-      && !gfc_boz2int (i, j->ts.kind))
-    return false;
-
-  /* If j is BOZ and i is integer, convert j to type of i.  */
-  if (j->ts.type == BT_BOZ && i->ts.type == BT_INTEGER
-      && !gfc_boz2int (j, i->ts.kind))
-    return false;
-
-  if (!type_check (i, 0, BT_INTEGER))
-    return false;
+  /* If i is BOZ and j is integer, convert i to type of j.  If j is not
+     an integer, clear the BOZ; otherwise, check that i is an integer.  */
+  if (i->ts.type == BT_BOZ)
+    {
+      if (j->ts.type != BT_INTEGER)
+        reset_boz (i);
+      else if (!gfc_boz2int (i, j->ts.kind))
+	return false;
+    }
+  else if (!type_check (i, 0, BT_INTEGER))
+    {
+      if (j->ts.type == BT_BOZ)
+	reset_boz (j);
+      return false;
+    }
 
-  if (!type_check (j, 1, BT_INTEGER))
+  /* If j is BOZ and i is integer, convert j to type of i.  If i is not
+     an integer, clear the BOZ; otherwise, check that i is an integer.  */
+  if (j->ts.type == BT_BOZ)
+    {
+      if (i->ts.type != BT_INTEGER)
+        reset_boz (j);
+      else if (!gfc_boz2int (j, i->ts.kind))
+	return false;
+    }
+  else if (!type_check (j, 1, BT_INTEGER))
     return false;
 
   if (!same_type_check (i, 0, j, 1))
@@ -2860,7 +2899,10 @@ gfc_check_float (gfc_expr *a)
     {
       if (gfc_invalid_boz ("BOZ literal constant at %L cannot appear in the "
 			   "FLOAT intrinsic subprogram", &a->where))
-	return false;
+	{
+	  reset_boz (a);
+	  return false;
+	}
       if (!gfc_boz2int (a, gfc_default_integer_kind))
 	return false;
     }
@@ -6126,7 +6168,11 @@ gfc_check_transfer (gfc_expr *source, gfc_expr *mold, gfc_expr *size)
   if (size != NULL)
     {
       if (!type_check (size, 2, BT_INTEGER))
-	return false;
+	{
+	  if (size->ts.type == BT_BOZ)
+	    reset_boz (size);
+	  return false;
+	}
 
       if (!scalar_check (size, 2))
 	return false;
@@ -7286,19 +7332,61 @@ gfc_check_system_sub (gfc_expr *cmd, gfc_expr *status)
 bool
 gfc_check_and (gfc_expr *i, gfc_expr *j)
 {
+  if (i->ts.type != BT_INTEGER
+      && i->ts.type != BT_LOGICAL
+      && i->ts.type != BT_BOZ)
+    {
+      gfc_error ("%qs argument of %qs intrinsic at %L must be INTEGER, "
+                 "LOGICAL, or a BOZ literal constant",
+		 gfc_current_intrinsic_arg[0]->name,
+                 gfc_current_intrinsic, &i->where);
+      return false;
+    }
+
+  if (j->ts.type != BT_INTEGER
+      && j->ts.type != BT_LOGICAL
+      && j->ts.type != BT_BOZ)
+    {
+      gfc_error ("%qs argument of %qs intrinsic at %L must be INTEGER, "
+                 "LOGICAL, or a BOZ literal constant",
+		 gfc_current_intrinsic_arg[1]->name,
+                 gfc_current_intrinsic, &j->where);
+      return false;
+    }
+
   /* i and j cannot both be BOZ literal constants.  */
   if (!boz_args_check (i, j))
     return false;
 
   /* If i is BOZ and j is integer, convert i to type of j.  */
-  if (i->ts.type == BT_BOZ && j->ts.type == BT_INTEGER
-      && !gfc_boz2int (i, j->ts.kind))
-    return false;
+  if (i->ts.type == BT_BOZ)
+    {
+      if (j->ts.type != BT_INTEGER)
+	{
+	  gfc_error ("%qs argument of %qs intrinsic at %L must be INTEGER",
+		     gfc_current_intrinsic_arg[1]->name,
+		     gfc_current_intrinsic, &j->where);
+	  reset_boz (i);
+	  return false;
+	}
+      if (!gfc_boz2int (i, j->ts.kind))
+	return false;
+    }
 
   /* If j is BOZ and i is integer, convert j to type of i.  */
-  if (j->ts.type == BT_BOZ && i->ts.type == BT_INTEGER
-      && !gfc_boz2int (j, i->ts.kind))
-    return false;
+  if (j->ts.type == BT_BOZ)
+    {
+      if (i->ts.type != BT_INTEGER)
+	{
+	  gfc_error ("%qs argument of %qs intrinsic at %L must be INTEGER",
+		     gfc_current_intrinsic_arg[0]->name,
+		     gfc_current_intrinsic, &j->where);
+	  reset_boz (j);
+	  return false;
+	}
+      if (!gfc_boz2int (j, i->ts.kind))
+	return false;
+    }
 
   if (!same_type_check (i, 0, j, 1, false))
     return false;
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 20ecafd..71539fe 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -3243,19 +3243,14 @@ resolve_function (gfc_expr *expr)
     return t;
 
   /* Walk the argument list looking for invalid BOZ.  */
-  if (expr->value.function.esym)
-    {
-      gfc_actual_arglist *a;
-
-      for (a = expr->value.function.actual; a; a = a->next)
-	if (a->expr && a->expr->ts.type == BT_BOZ)
-	  {
-	    gfc_error ("A BOZ literal constant at %L cannot appear as an "
-			"actual argument in a function reference",
-			&a->expr->where);
-	    return false;
-	  }
-    }
+  for (arg = expr->value.function.actual; arg; arg = arg->next)
+    if (arg->expr && arg->expr->ts.type == BT_BOZ)
+      {
+	gfc_error ("A BOZ literal constant at %L cannot appear as an "
+		   "actual argument in a function reference",
+		   &arg->expr->where);
+	return false;
+      }
 
   temp = need_full_assumed_size;
   need_full_assumed_size = 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6c6a077..0cf04a5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/92018
+	* gfortran.dg/gnu_logical_2.f90: Update dg-error regex.
+	* gfortran.dg/pr81509_2.f90: Ditto.
+	* gfortran.dg/pr92018.f90: New test.
+
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/92019
 	* gfortran.dg/pr92019.f90: New test.
 
diff --git a/gcc/testsuite/gfortran.dg/gnu_logical_2.f90 b/gcc/testsuite/gfortran.dg/gnu_logical_2.f90
index a7b31b4..0e24c72 100644
--- a/gcc/testsuite/gfortran.dg/gnu_logical_2.f90
+++ b/gcc/testsuite/gfortran.dg/gnu_logical_2.f90
@@ -7,22 +7,22 @@
 
   print *, and(i,i)
   print *, and(l,l)
-  print *, and(i,r) ! { dg-error "must be the same type" }
-  print *, and(c,l) ! { dg-error "must be the same type" }
+  print *, and(i,r) ! { dg-error "must be INTEGER, LOGICAL, or a BOZ" }
+  print *, and(c,l) ! { dg-error "must be INTEGER, LOGICAL, or a BOZ" }
   print *, and(i,l) ! { dg-error "must be the same type" }
   print *, and(l,i) ! { dg-error "must be the same type" }
 
   print *, or(i,i)
   print *, or(l,l)
-  print *, or(i,r) ! { dg-error "must be the same type" }
-  print *, or(c,l) ! { dg-error "must be the same type" }
+  print *, or(i,r) ! { dg-error "must be INTEGER, LOGICAL, or a BOZ" }
+  print *, or(c,l) ! { dg-error "must be INTEGER, LOGICAL, or a BOZ" }
   print *, or(i,l) ! { dg-error "must be the same type" }
   print *, or(l,i) ! { dg-error "must be the same type" }
 
   print *, xor(i,i)
   print *, xor(l,l)
-  print *, xor(i,r) ! { dg-error "must be the same type" }
-  print *, xor(c,l) ! { dg-error "must be the same type" }
+  print *, xor(i,r) ! { dg-error "must be INTEGER, LOGICAL, or a BOZ" }
+  print *, xor(c,l) ! { dg-error "must be INTEGER, LOGICAL, or a BOZ" }
   print *, xor(i,l) ! { dg-error "must be the same type" }
   print *, xor(l,i) ! { dg-error "must be the same type" }
 
diff --git a/gcc/testsuite/gfortran.dg/pr81509_2.f90 b/gcc/testsuite/gfortran.dg/pr81509_2.f90
index a0618cc..719feb5 100644
--- a/gcc/testsuite/gfortran.dg/pr81509_2.f90
+++ b/gcc/testsuite/gfortran.dg/pr81509_2.f90
@@ -13,6 +13,6 @@ k = ieor(z'ade',i)
 k = ior(i,z'1111')
 k = ior(i,k)                  ! { dg-error "different kind type parameters" }
 k = and(i,k)                  ! { dg-error "must be the same type" }
-k = and(a,z'1234')            ! { dg-error "must be the same type" }
+k = and(a,z'1234')            ! { dg-error "must be INTEGER" }
 end program foo
 
diff --git a/gcc/testsuite/gfortran.dg/pr92018.f90 b/gcc/testsuite/gfortran.dg/pr92018.f90
new file mode 100644
index 0000000..6c90d2f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92018.f90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR fortran/92018
+subroutine sub (f)
+   integer :: f
+   print *, f(b'11') ! { dg-error "cannot appear as an actual" }
+   print *, f(o'11') ! { dg-error "cannot appear as an actual" }
+   print *, f(z'11') ! { dg-error "cannot appear as an actual" }
+end
-- 
cgit v1.1


From 95040e7e207dc0a2024c2ed10b8b15de4b369ece Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Fri, 11 Oct 2019 17:59:09 +0000
Subject: re PR fortran/91715 (ICE in resolve_fntype, at
 fortran/resolve.c:16884)

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91715
	* decl.c (gfc_match_prefix): If matching a type-spec returns an error,
	it's an error so re-act correctly.

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91715
	* gfortran.dg/function_kinds_5.f90: Prune run-on error.
	* gfortran.dg/pr85543.f90: Ditto.
	* gfortran.dg/pr91715.f90: New test.

From-SVN: r276899
---
 gcc/fortran/ChangeLog                          |  6 ++++++
 gcc/fortran/decl.c                             | 16 ++++++++++------
 gcc/testsuite/ChangeLog                        |  7 +++++++
 gcc/testsuite/gfortran.dg/function_kinds_5.f90 |  1 +
 gcc/testsuite/gfortran.dg/pr85543.f90          |  1 +
 gcc/testsuite/gfortran.dg/pr91715.f90          |  5 +++++
 6 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr91715.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b6d97cb..7819bd4 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/91715
+	* decl.c (gfc_match_prefix): If matching a type-spec returns an error,
+	it's an error so re-act correctly.
+
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/92018
 	* check.c (reset_boz): New function.
 	(illegal_boz_arg, boz_args_check, gfc_check_complex, gfc_check_float,
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 9b604c8..9cda824 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -6202,13 +6202,17 @@ gfc_match_prefix (gfc_typespec *ts)
 	  found_prefix = true;
 	}
 
-      if (!seen_type && ts != NULL
-	  && gfc_match_decl_type_spec (ts, 0) == MATCH_YES
-	  && gfc_match_space () == MATCH_YES)
+      if (!seen_type && ts != NULL)
 	{
-
-	  seen_type = true;
-	  found_prefix = true;
+	  match m;
+	  m = gfc_match_decl_type_spec (ts, 0);
+	  if (m == MATCH_ERROR)
+	    goto error;
+	  if (m == MATCH_YES && gfc_match_space () == MATCH_YES)
+	    {
+	      seen_type = true;
+	      found_prefix = true;
+	    }
 	}
 
       if (gfc_match ("elemental% ") == MATCH_YES)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0cf04a5..b11a1bf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/91715
+	* gfortran.dg/function_kinds_5.f90: Prune run-on error.
+	* gfortran.dg/pr85543.f90: Ditto.
+	* gfortran.dg/pr91715.f90: New test.
+
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/92018
 	* gfortran.dg/gnu_logical_2.f90: Update dg-error regex.
 	* gfortran.dg/pr81509_2.f90: Ditto.
diff --git a/gcc/testsuite/gfortran.dg/function_kinds_5.f90 b/gcc/testsuite/gfortran.dg/function_kinds_5.f90
index e48484e..106431f 100644
--- a/gcc/testsuite/gfortran.dg/function_kinds_5.f90
+++ b/gcc/testsuite/gfortran.dg/function_kinds_5.f90
@@ -8,3 +8,4 @@
 real (bad_kind(0d0)) function foo () ! { dg-error "must be an intrinsic function" }
   foo = real (kind (foo))
 end function
+! { dg-prune-output "Bad kind expression for function" }
diff --git a/gcc/testsuite/gfortran.dg/pr85543.f90 b/gcc/testsuite/gfortran.dg/pr85543.f90
index d3f8327..b0faa8d 100644
--- a/gcc/testsuite/gfortran.dg/pr85543.f90
+++ b/gcc/testsuite/gfortran.dg/pr85543.f90
@@ -6,3 +6,4 @@ contains
    real(z()) function f()  ! { dg-error "in initialization expression at" }
    end
 end
+! { dg-prune-output "Bad kind expression for function" }
diff --git a/gcc/testsuite/gfortran.dg/pr91715.f90 b/gcc/testsuite/gfortran.dg/pr91715.f90
new file mode 100644
index 0000000..a3d9b8d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr91715.f90
@@ -0,0 +1,5 @@
+! { dg-do compile }
+! PR fortran/91715
+! Code contributed Gerhard Steinmetz
+character(1function f()  ! { dg-error "Syntax error in CHARACTER" }
+end
-- 
cgit v1.1


From e8c78b3a0c7be7020b77f9a8ef04e970b391f1aa Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Fri, 11 Oct 2019 18:05:35 +0000
Subject: re PR fortran/91649 (ICE in gfc_resolve_findloc, at
 fortran/iresolve.c:1827)

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91649
	check.c (gfc_check_findloc): Additional checking for valid arguments

2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91649
	* gfortran.dg/pr91649.f90: New test.

From-SVN: r276900
---
 gcc/fortran/ChangeLog                 |  5 +++++
 gcc/fortran/check.c                   | 31 ++++++++++++++++++++-----------
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/gfortran.dg/pr91649.f90 | 23 +++++++++++++++++++++++
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr91649.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7819bd4..82164d7 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/91649
+	check.c (gfc_check_findloc): Additional checking for valid arguments
+
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/91715
 	* decl.c (gfc_match_prefix): If matching a type-spec returns an error,
 	it's an error so re-act correctly.
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index f66ed93..d2a4949 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -3921,26 +3921,27 @@ bool
 gfc_check_findloc (gfc_actual_arglist *ap)
 {
   gfc_expr *a, *v, *m, *d, *k, *b;
+  bool a1, v1;
 
   a = ap->expr;
   if (!intrinsic_type_check (a, 0) || !array_check (a, 0))
     return false;
 
   v = ap->next->expr;
-  if (!scalar_check (v,1))
+  if (!intrinsic_type_check (v, 1) || !scalar_check (v,1))
     return false;
 
-  /* Check if the type is compatible.  */
+  /* Check if the type are both logical.  */
+  a1 = a->ts.type == BT_LOGICAL;
+  v1 = v->ts.type == BT_LOGICAL;
+  if ((a1 && !v1) || (!a1 && v1))
+    goto incompat;
 
-  if ((a->ts.type == BT_LOGICAL && v->ts.type != BT_LOGICAL)
-      || (a->ts.type != BT_LOGICAL && v->ts.type == BT_LOGICAL))
-    {
-      gfc_error ("Argument %qs of %qs intrinsic at %L must be in type "
-		 "conformance to argument %qs at %L",
-		 gfc_current_intrinsic_arg[0]->name,
-		 gfc_current_intrinsic, &a->where,
-		 gfc_current_intrinsic_arg[1]->name, &v->where);
-    }
+  /* Check if the type are both character.  */
+  a1 = a->ts.type == BT_CHARACTER;
+  v1 = v->ts.type == BT_CHARACTER;
+  if ((a1 && !v1) || (!a1 && v1))
+    goto incompat;
 	 
   d = ap->next->next->expr;
   m = ap->next->next->next->expr;
@@ -3988,6 +3989,14 @@ gfc_check_findloc (gfc_actual_arglist *ap)
     return false;
 
   return true;
+
+incompat:
+  gfc_error ("Argument %qs of %qs intrinsic at %L must be in type "
+	     "conformance to argument %qs at %L",
+	     gfc_current_intrinsic_arg[0]->name,
+	     gfc_current_intrinsic, &a->where,
+	     gfc_current_intrinsic_arg[1]->name, &v->where);
+  return false;
 }
 
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b11a1bf..cdc7179 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/91649
+	* gfortran.dg/pr91649.f90: New test.
+
+2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/91715
 	* gfortran.dg/function_kinds_5.f90: Prune run-on error.
 	* gfortran.dg/pr85543.f90: Ditto.
diff --git a/gcc/testsuite/gfortran.dg/pr91649.f90 b/gcc/testsuite/gfortran.dg/pr91649.f90
new file mode 100644
index 0000000..0e6acb9
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr91649.f90
@@ -0,0 +1,23 @@
+! { dg-do compile }
+! PR fortran/91649
+! Code originally contributed by Gerhard Steinmetz
+subroutine p
+   logical :: back = .true.
+   integer :: x(1) = findloc([1, 2, 1], '1', back=back) ! { dg-error "must be in type conformance" }
+   print *, x
+end
+
+subroutine q
+   type t
+   end type
+   logical :: back = .false.
+   integer :: x(1) = findloc([1, 2, 1], t(), back=back) ! { dg-error "must be of intrinsic type" }
+   print *, x
+end
+
+subroutine s
+   character(4) :: c = '1234'
+   integer :: x(1) = findloc([1, 2, 1], c, back=.true.) ! { dg-error "must be in type conformance" }
+   print *, x
+end
+
-- 
cgit v1.1


From c6b6fde0bccc82d1a66e36b3a31177b5188cd52e Mon Sep 17 00:00:00 2001
From: Jim Wilson <jimw@sifive.com>
Date: Fri, 11 Oct 2019 18:41:35 +0000
Subject: Extend subst to simplify CONST_INT inside SIGN_EXTEND.

This addresses PR 91860 which has four testcases triggering internal errors.
The problem here is that in combine when handling debug insns, we are trying
to substitute
(sign_extend:DI (const_int 8160 [0x1fe0]))
as the value for
(reg:DI 78 [ _9 ])
in the debug insn
(debug_insn 29 28 30 2 (var_location:QI d (subreg:QI (reg:DI 78 [ _9 ]) 0)) "tmp4.c":11:5 -1
     (nil))
This eventually triggers an abort because 8160 is not a sign-extended
QImode value.

In subst there is already code check for a CONST_INT inside a ZERO_EXTEND and
simplify it.  This needs to be extended to also handle a SIGN_EXTEND the same
way.

	gcc/
	PR rtl-optimization/91860
	* combine.c (subst): If new_rtx is a constant, also check for
	SIGN_EXTEND when deciding whether to call simplify_unary_operation.

	gcc/testsuite/
	PR rtl-optimization/91860
	* gcc.dg/pr91860-1.c: New testcase.
	* gcc.dg/pr91860-2.c: New testcase.
	* gcc.dg/pr91860-3.c: New testcase.
	* gcc.dg/pr91860-4.c: New testcase.

From-SVN: r276901
---
 gcc/ChangeLog                    |  6 ++++++
 gcc/combine.c                    |  1 +
 gcc/testsuite/ChangeLog          |  8 ++++++++
 gcc/testsuite/gcc.dg/pr91860-1.c | 18 ++++++++++++++++++
 gcc/testsuite/gcc.dg/pr91860-2.c | 13 +++++++++++++
 gcc/testsuite/gcc.dg/pr91860-3.c | 15 +++++++++++++++
 gcc/testsuite/gcc.dg/pr91860-4.c | 24 ++++++++++++++++++++++++
 7 files changed, 85 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/pr91860-1.c
 create mode 100644 gcc/testsuite/gcc.dg/pr91860-2.c
 create mode 100644 gcc/testsuite/gcc.dg/pr91860-3.c
 create mode 100644 gcc/testsuite/gcc.dg/pr91860-4.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f346dd5..12613f7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-11  Jim Wilson  <jimw@sifive.com>
+
+	PR rtl-optimization/91860
+	* combine.c (subst): If new_rtx is a constant, also check for
+	SIGN_EXTEND when deciding whether to call simplify_unary_operation.
+
 2019-10-11  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* expr.c (store_expr): Use rtx_to_poly_int64 rather than
diff --git a/gcc/combine.c b/gcc/combine.c
index d295a81..92e4e5e 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -5680,6 +5680,7 @@ subst (rtx x, rtx from, rtx to, int in_dest, int in_cond, int unique_copy)
 		}
 	      else if (CONST_SCALAR_INT_P (new_rtx)
 		       && (GET_CODE (x) == ZERO_EXTEND
+			   || GET_CODE (x) == SIGN_EXTEND
 			   || GET_CODE (x) == FLOAT
 			   || GET_CODE (x) == UNSIGNED_FLOAT))
 		{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cdc7179..cc1a57b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-11  Jim Wilson  <jimw@sifive.com>
+
+	PR rtl-optimization/91860
+	* gcc.dg/pr91860-1.c: New testcase.
+	* gcc.dg/pr91860-2.c: New testcase.
+	* gcc.dg/pr91860-3.c: New testcase.
+	* gcc.dg/pr91860-4.c: New testcase.
+
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/91649
diff --git a/gcc/testsuite/gcc.dg/pr91860-1.c b/gcc/testsuite/gcc.dg/pr91860-1.c
new file mode 100644
index 0000000..e715040
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr91860-1.c
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-Og -fipa-cp -g --param=max-combine-insns=3" } */
+
+char a;
+int b;
+
+static void
+bar (short d)
+{
+  d <<= __builtin_sub_overflow (0, d, &a);
+  b = __builtin_bswap16 (~d);
+}
+
+void
+foo (void)
+{
+  bar (21043);
+}
diff --git a/gcc/testsuite/gcc.dg/pr91860-2.c b/gcc/testsuite/gcc.dg/pr91860-2.c
new file mode 100644
index 0000000..7b44e64
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr91860-2.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-Og -fexpensive-optimizations -fno-tree-fre -g --param=max-combine-insns=4" } */
+
+unsigned a, b, c;
+void
+foo (void)
+{
+  unsigned short e;
+  __builtin_mul_overflow (0, b, &a);
+  __builtin_sub_overflow (59347, 9, &e);
+  e <<= a & 5;
+  c = e;
+}
diff --git a/gcc/testsuite/gcc.dg/pr91860-3.c b/gcc/testsuite/gcc.dg/pr91860-3.c
new file mode 100644
index 0000000..2b488cc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr91860-3.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-Og -g2 --param=max-combine-insns=3" } */
+
+int a, b;
+
+void
+foo (void)
+{
+  unsigned short d = 46067;
+  int e = e;
+  d <<= __builtin_mul_overflow (~0, e, &a);
+  d |= -68719476735;
+  b = d;
+}
+
diff --git a/gcc/testsuite/gcc.dg/pr91860-4.c b/gcc/testsuite/gcc.dg/pr91860-4.c
new file mode 100644
index 0000000..36f2bd5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr91860-4.c
@@ -0,0 +1,24 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target int128 } */
+/* { dg-options "-O2 -g" } */
+
+typedef unsigned char u8;
+typedef unsigned int u32;
+typedef unsigned __int128 u128;
+
+u32 b, c;
+
+static inline
+u128 bar (u8 d, u128 e)
+{
+  __builtin_memset (11 + (char *) &e, b, 1);
+  d <<= e & 7;
+  d = d | d > 0;
+  return d + e;
+}
+
+void
+foo (void)
+{
+  c = bar (~0, 5);
+}
-- 
cgit v1.1


From e0365bd388bac7641e1767222b9ddc683dbf057a Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Fri, 11 Oct 2019 14:55:14 -0400
Subject: Preserve the location of explicitly defaulted functions.

	* decl2.c (mark_used): Don't clobber DECL_SOURCE_LOCATION on
	explicitly defaulted functions.
	* method.c (synthesize_method): Likewise.

From-SVN: r276902
---
 gcc/cp/ChangeLog | 6 ++++++
 gcc/cp/decl2.c   | 3 ++-
 gcc/cp/method.c  | 7 ++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 95f6831..a925f7e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-11  Jason Merrill  <jason@redhat.com>
+
+	* decl2.c (mark_used): Don't clobber DECL_SOURCE_LOCATION on
+	explicitly defaulted functions.
+	* method.c (synthesize_method): Likewise.
+
 2019-10-11  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/91987
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index ee198cd..6d5e973 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -5588,7 +5588,8 @@ mark_used (tree decl, tsubst_flags_t complain)
       /* Remember the current location for a function we will end up
 	 synthesizing.  Then we can inform the user where it was
 	 required in the case of error.  */
-      DECL_SOURCE_LOCATION (decl) = input_location;
+      if (DECL_ARTIFICIAL (decl))
+	DECL_SOURCE_LOCATION (decl) = input_location;
 
       /* Synthesizing an implicitly defined member function will result in
 	 garbage collection.  We must treat this situation as if we were
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 01bf534..73a0114 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -892,7 +892,7 @@ synthesize_method (tree fndecl)
 
   /* Reset the source location, we might have been previously
      deferred, and thus have saved where we were first needed.  */
-  if (!DECL_INHERITED_CTOR (fndecl))
+  if (DECL_ARTIFICIAL (fndecl) && !DECL_INHERITED_CTOR (fndecl))
     DECL_SOURCE_LOCATION (fndecl)
       = DECL_SOURCE_LOCATION (TYPE_NAME (DECL_CONTEXT (fndecl)));
 
@@ -953,8 +953,9 @@ synthesize_method (tree fndecl)
   pop_deferring_access_checks ();
 
   if (error_count != errorcount || warning_count != warningcount + werrorcount)
-    inform (input_location, "synthesized method %qD first required here",
-	    fndecl);
+    if (DECL_ARTIFICIAL (fndecl))
+      inform (input_location, "synthesized method %qD first required here",
+	      fndecl);
 }
 
 /* Build a reference to type TYPE with cv-quals QUALS, which is an
-- 
cgit v1.1


From 436103a09831b2924d3262c13a17da530f90da92 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 11 Oct 2019 19:18:13 +0000
Subject: typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and
 LROTATE_EXPR.

2019-10-10  Paolo Carlini  <paolo.carlini@oracle.com>

	* typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and
	LROTATE_EXPR.
	* constexpr.c (cxx_eval_constant_expression): Likewise.
	(potential_constant_expression_1): Likewise.
	* cp-gimplify.c (cp_fold): Likewise.
	* pt.c (tsubst_copy): Likewise.

From-SVN: r276903
---
 gcc/cp/ChangeLog   |  8 ++++++++
 gcc/cp/constexpr.c |  4 ----
 gcc/cp/pt.c        |  4 ----
 gcc/cp/typeck.c    | 29 -----------------------------
 4 files changed, 8 insertions(+), 37 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a925f7e..49fb50d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and
+	LROTATE_EXPR.
+	* constexpr.c (cxx_eval_constant_expression): Likewise.
+	(potential_constant_expression_1): Likewise.
+	* pt.c (tsubst_copy): Likewise.
+
 2019-10-11  Jason Merrill  <jason@redhat.com>
 
 	* decl2.c (mark_used): Don't clobber DECL_SOURCE_LOCATION on
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index ea50234..46d41ec 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -5115,8 +5115,6 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
     case MAX_EXPR:
     case LSHIFT_EXPR:
     case RSHIFT_EXPR:
-    case LROTATE_EXPR:
-    case RROTATE_EXPR:
     case BIT_IOR_EXPR:
     case BIT_XOR_EXPR:
     case BIT_AND_EXPR:
@@ -7103,8 +7101,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
     case MAX_EXPR:
     case LSHIFT_EXPR:
     case RSHIFT_EXPR:
-    case LROTATE_EXPR:
-    case RROTATE_EXPR:
     case BIT_IOR_EXPR:
     case BIT_XOR_EXPR:
     case BIT_AND_EXPR:
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8446443..7fecc03 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16308,8 +16308,6 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
     case TRUTH_OR_EXPR:
     case RSHIFT_EXPR:
     case LSHIFT_EXPR:
-    case RROTATE_EXPR:
-    case LROTATE_EXPR:
     case EQ_EXPR:
     case NE_EXPR:
     case MAX_EXPR:
@@ -18913,8 +18911,6 @@ tsubst_copy_and_build (tree t,
     case TRUTH_OR_EXPR:
     case RSHIFT_EXPR:
     case LSHIFT_EXPR:
-    case RROTATE_EXPR:
-    case LROTATE_EXPR:
     case EQ_EXPR:
     case NE_EXPR:
     case MAX_EXPR:
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 74ff885..141d86f 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4899,35 +4899,6 @@ cp_build_binary_op (const op_location_t &location,
 	}
       break;
 
-    case RROTATE_EXPR:
-    case LROTATE_EXPR:
-      if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
-	{
-	  result_type = type0;
-	  if (TREE_CODE (op1) == INTEGER_CST)
-	    {
-	      if (tree_int_cst_lt (op1, integer_zero_node))
-		{
-		  if (complain & tf_warning)
-		    warning (0, (code == LROTATE_EXPR)
-			          ? G_("left rotate count is negative")
-   			          : G_("right rotate count is negative"));
-		}
-	      else if (compare_tree_int (op1, TYPE_PRECISION (type0)) >= 0)
-		{
-		  if (complain & tf_warning)
-		    warning (0, (code == LROTATE_EXPR) 
-                                  ? G_("left rotate count >= width of type")
-                                  : G_("right rotate count >= width of type"));
-		}
-	    }
-	  /* Convert the shift-count to an integer, regardless of
-	     size of value being shifted.  */
-	  if (TYPE_MAIN_VARIANT (TREE_TYPE (op1)) != integer_type_node)
-	    op1 = cp_convert (integer_type_node, op1, complain);
-	}
-      break;
-
     case EQ_EXPR:
     case NE_EXPR:
       if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE)
-- 
cgit v1.1


From c6c3f55699d316da38496de1328f6e09a46deed8 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Fri, 11 Oct 2019 20:44:02 +0000
Subject: PR c++/92049 - extra error with -fchecking=2.

The concepts merge brought this bit

@@ -26326,9 +26559,9 @@ build_non_dependent_expr (tree expr)
     unexpected recursive instantiations.  */
       && !parsing_nsdmi ()
       /* Don't do this during concept expansion either and for
-         the same reason.  */
-      && !expanding_concept ())
-    fold_non_dependent_expr (expr, tf_none);
+    the same reason.  */
+      && !parsing_constraint_expression_p ())
+    fold_non_dependent_expr (expr);

   STRIP_ANY_LOCATION_WRAPPER (expr);

(which I'm not finding in the ChangeLog).  Dropping tf_none means that
fold_non_dependent_expr will use tf_warning_or_error by default, and in
this test that causes an error:

  template<bool> struct cond;

  template<int> struct S {
    void f(int i) {
      cond<__builtin_constant_p(i)>();
    }
  };

  S<1> s;

where it complains that cond<false> is incomplete.  Which it is, but we're
not actually instantiating the function f, so issuing an error seems
overzealous (though not wrong), and it breaks a bunch of tests.  This patch
brings that tf_none back.  We will still complain if we do instantiate f.

	* pt.c (build_non_dependent_expr): Call fold_non_dependent_expr
	with tf_none.

	* g++.dg/template/builtin2.C: New test.

From-SVN: r276906
---
 gcc/cp/ChangeLog                         | 6 ++++++
 gcc/cp/pt.c                              | 2 +-
 gcc/testsuite/ChangeLog                  | 5 +++++
 gcc/testsuite/g++.dg/template/builtin2.C | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/builtin2.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 49fb50d..02a330d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-11  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/92049 - extra error with -fchecking=2.
+	* pt.c (build_non_dependent_expr): Call fold_non_dependent_expr
+	with tf_none.
+
 2019-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* typeck.c (cp_build_binary_op): Do not handle RROTATE_EXPR and
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7fecc03..773eb43 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -27059,7 +27059,7 @@ build_non_dependent_expr (tree expr)
       /* Don't do this during concept processing either and for
          the same reason.  */
       && !processing_constraint_expression_p ())
-    fold_non_dependent_expr (expr);
+    fold_non_dependent_expr (expr, tf_none);
 
   STRIP_ANY_LOCATION_WRAPPER (expr);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc1a57b..bbcea40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/92049 - extra error with -fchecking=2.
+	* g++.dg/template/builtin2.C: New test.
+
 2019-10-11  Jim Wilson  <jimw@sifive.com>
 
 	PR rtl-optimization/91860
diff --git a/gcc/testsuite/g++.dg/template/builtin2.C b/gcc/testsuite/g++.dg/template/builtin2.C
new file mode 100644
index 0000000..4e9089a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/builtin2.C
@@ -0,0 +1,5 @@
+// PR c++/92049 - extra error with -fchecking=2.
+// { dg-do compile { target c++11 } }
+// { dg-additional-options "-fchecking=2" }
+
+#include "builtin1.C"
-- 
cgit v1.1


From 53f3c1a103d3939c1bf72361830280fa621d528a Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Fri, 11 Oct 2019 20:53:26 +0000
Subject: PR c++/92070 - bogus error with -fchecking=2.

	* g++.dg/expr/cond17.C: New test.

From-SVN: r276907
---
 gcc/testsuite/ChangeLog            |  5 +++++
 gcc/testsuite/g++.dg/expr/cond17.C | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/expr/cond17.C

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bbcea40..dadb442 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-11  Marek Polacek  <polacek@redhat.com>
 
+	PR c++/92070 - bogus error with -fchecking=2.
+	* g++.dg/expr/cond17.C: New test.
+
+2019-10-11  Marek Polacek  <polacek@redhat.com>
+
 	PR c++/92049 - extra error with -fchecking=2.
 	* g++.dg/template/builtin2.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/expr/cond17.C b/gcc/testsuite/g++.dg/expr/cond17.C
new file mode 100644
index 0000000..1999c37
--- /dev/null
+++ b/gcc/testsuite/g++.dg/expr/cond17.C
@@ -0,0 +1,11 @@
+// PR c++/92070 - bogus error with -fchecking=2.
+// { dg-additional-options "-fchecking=2" }
+
+struct a;
+struct b {
+  static a c();
+};
+struct a : b {};
+template <class> struct d {
+  void e() { 0 ? b() : b::c(); }
+};
-- 
cgit v1.1


From 175a85b29718141d73230ed19efcfcf963a0d0b6 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 11 Oct 2019 23:22:52 +0100
Subject: Support decimal floating-point constants in C2x.

ISO C2x adds decimal floating point as an optional standard feature.
This patch accordingly makes GCC accept DFP constants (DF, DD, DL, df,
dd, dl suffixes) in strict C2X mode, with a pedwarn-if-pedantic for
older standards and a warning with -Wc11-c2x-compat even in C2x mode
(which in turn requires -Wc11-c2x-compat to be newly passed through to
libcpp).

Bootstrapped with no regressions on x86_64-pc-linux-gnu.

gcc/c-family:
	* c.opt (Wc11-c2x-compat): Add CPP(cpp_warn_c11_c2x_compat)
	CppReason(CPP_W_C11_C2X_COMPAT).

gcc/testsuite:
	* gcc.dg/dfp/c11-constants-1.c, gcc.dg/dfp/c11-constants-2.c,
	gcc.dg/dfp/c2x-constants-1.c, gcc.dg/dfp/c2x-constants-2.c: New
	tests.
	* gcc.dg/dfp/constants-pedantic.c: Use -std=gnu17 explicitly.
	Update expected diagnostics.

libcpp:
	* include/cpplib.h (struct cpp_options): Add dfp_constants and
	cpp_warn_c11_c2x_compat.
	(enum cpp_warning_reason): Add CPP_W_C11_C2X_COMPAT.
	* init.c (struct lang_flags): Add dfp_constants.
	(lang_defaults): Set dfp_constants to 1 for GNUC2X and STDC2X and
	0 for other languages.
	(cpp_set_lang): Set dfp_constants from language.
	(cpp_create_reader): Set cpp_warn_c11_c2x_compat to -1.
	* expr.c (interpret_float_suffix): Mention DFP constants as C2X in
	comment.
	(cpp_classify_number): Do not diagnose DFP constants for languages
	setting dfp_constants, unless cpp_warn_c11_c2x_compat.

From-SVN: r276908
---
 gcc/c-family/ChangeLog                        |  5 +++++
 gcc/c-family/c.opt                            |  2 +-
 gcc/testsuite/ChangeLog                       |  8 ++++++++
 gcc/testsuite/gcc.dg/dfp/c11-constants-1.c    | 13 +++++++++++++
 gcc/testsuite/gcc.dg/dfp/c11-constants-2.c    | 13 +++++++++++++
 gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c    | 13 +++++++++++++
 gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c    | 13 +++++++++++++
 gcc/testsuite/gcc.dg/dfp/constants-pedantic.c | 14 +++++++-------
 8 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c11-constants-1.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c11-constants-2.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
 create mode 100644 gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a0ce54b..fea97bb 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-11  Joseph Myers  <joseph@codesourcery.com>
 
+	* c.opt (Wc11-c2x-compat): Add CPP(cpp_warn_c11_c2x_compat)
+	CppReason(CPP_W_C11_C2X_COMPAT).
+
+2019-10-11  Joseph Myers  <joseph@codesourcery.com>
+
 	* c-common.c (c_common_reswords): Do not use D_EXT for _Decimal32,
 	_Decimal64 and _Decimal128.
 
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index a1360ba..495eb16 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -367,7 +367,7 @@ C ObjC C++ ObjC++ CPP(warn_builtin_macro_redefined) CppReason(CPP_W_BUILTIN_MACR
 Warn when a built-in preprocessor macro is undefined or redefined.
 
 Wc11-c2x-compat
-C ObjC Var(warn_c11_c2x_compat) Init(-1) Warning
+C ObjC CPP(cpp_warn_c11_c2x_compat) CppReason(CPP_W_C11_C2X_COMPAT) Var(warn_c11_c2x_compat) Init(-1) Warning
 Warn about features not present in ISO C11, but present in ISO C2X.
 
 Wc90-c99-compat
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dadb442..9b31f35 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/dfp/c11-constants-1.c, gcc.dg/dfp/c11-constants-2.c,
+	gcc.dg/dfp/c2x-constants-1.c, gcc.dg/dfp/c2x-constants-2.c: New
+	tests.
+	* gcc.dg/dfp/constants-pedantic.c: Use -std=gnu17 explicitly.
+	Update expected diagnostics.
+
 2019-10-11  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/92070 - bogus error with -fchecking=2.
diff --git a/gcc/testsuite/gcc.dg/dfp/c11-constants-1.c b/gcc/testsuite/gcc.dg/dfp/c11-constants-1.c
new file mode 100644
index 0000000..472ed25
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c11-constants-1.c
@@ -0,0 +1,13 @@
+/* Test that DFP constants are diagnosed in C11 mode: -pedantic.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c11 -pedantic" } */
+
+int a = (int) 1.1DF; /* { dg-warning "C2X feature" } */
+int b = (int) 2.df; /* { dg-warning "C2X feature" } */
+int c = (int) .33DD; /* { dg-warning "C2X feature" } */
+int d = (int) 2e1dd; /* { dg-warning "C2X feature" } */
+int e = (int) .3e2DL; /* { dg-warning "C2X feature" } */
+int f = (int) 4.5e3dl; /* { dg-warning "C2X feature" } */
+int g = (int) 5.e0DF; /* { dg-warning "C2X feature" } */
+int h = (int) 1e+2df; /* { dg-warning "C2X feature" } */
+int i = (int) 1000e-3DL; /* { dg-warning "C2X feature" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c11-constants-2.c b/gcc/testsuite/gcc.dg/dfp/c11-constants-2.c
new file mode 100644
index 0000000..79b20a2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c11-constants-2.c
@@ -0,0 +1,13 @@
+/* Test that DFP constants are diagnosed in C11 mode: -pedantic-errors.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c11 -pedantic-errors" } */
+
+int a = (int) 1.1DF; /* { dg-error "C2X feature" } */
+int b = (int) 2.df; /* { dg-error "C2X feature" } */
+int c = (int) .33DD; /* { dg-error "C2X feature" } */
+int d = (int) 2e1dd; /* { dg-error "C2X feature" } */
+int e = (int) .3e2DL; /* { dg-error "C2X feature" } */
+int f = (int) 4.5e3dl; /* { dg-error "C2X feature" } */
+int g = (int) 5.e0DF; /* { dg-error "C2X feature" } */
+int h = (int) 1e+2df; /* { dg-error "C2X feature" } */
+int i = (int) 1000e-3DL; /* { dg-error "C2X feature" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
new file mode 100644
index 0000000..3375506
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
@@ -0,0 +1,13 @@
+/* Test that DFP constants are accepted in C2X mode.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -pedantic-errors" } */
+
+int a = (int) 1.1DF;
+int b = (int) 2.df;
+int c = (int) .33DD;
+int d = (int) 2e1dd;
+int e = (int) .3e2DL;
+int f = (int) 4.5e3dl;
+int g = (int) 5.e0DF;
+int h = (int) 1e+2df;
+int i = (int) 1000e-3DL;
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
new file mode 100644
index 0000000..eed35f2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
@@ -0,0 +1,13 @@
+/* Test that DFP constants are accepted in C2X mode: compat warnings.  */
+/* { dg-do compile } */
+/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+
+int a = (int) 1.1DF; /* { dg-warning "C2X feature" } */
+int b = (int) 2.df; /* { dg-warning "C2X feature" } */
+int c = (int) .33DD; /* { dg-warning "C2X feature" } */
+int d = (int) 2e1dd; /* { dg-warning "C2X feature" } */
+int e = (int) .3e2DL; /* { dg-warning "C2X feature" } */
+int f = (int) 4.5e3dl; /* { dg-warning "C2X feature" } */
+int g = (int) 5.e0DF; /* { dg-warning "C2X feature" } */
+int h = (int) 1e+2df; /* { dg-warning "C2X feature" } */
+int i = (int) 1000e-3DL; /* { dg-warning "C2X feature" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/constants-pedantic.c b/gcc/testsuite/gcc.dg/dfp/constants-pedantic.c
index be81b0f..1d85fed 100644
--- a/gcc/testsuite/gcc.dg/dfp/constants-pedantic.c
+++ b/gcc/testsuite/gcc.dg/dfp/constants-pedantic.c
@@ -1,14 +1,14 @@
 /* { dg-do compile } */
-/* { dg-options "-pedantic" } */
+/* { dg-options "-std=gnu17 -pedantic" } */
 
 /* N1150 6: Constants.
    C99 6.4.4.2: Floating constants.  */
 
 #include "dfp-dbg.h"
 
-_Decimal32 a = 1.1df;		/* { dg-warning "GCC extension|ISO C" } */
-_Decimal32 b = -.003DF;		/* { dg-warning "GCC extension|ISO C" } */
-_Decimal64 c = 11e-1dl;		/* { dg-warning "GCC extension|ISO C" } */
-_Decimal64 d = -.3DL;		/* { dg-warning "GCC extension|ISO C" } */
-_Decimal128 e = 000.3e0dl;	/* { dg-warning "GCC extension|ISO C" } */
-_Decimal128 f = 3000300030003e0DL;  /* { dg-warning "GCC extension|ISO C" } */
+_Decimal32 a = 1.1df;		/* { dg-warning "C2X feature|ISO C" } */
+_Decimal32 b = -.003DF;		/* { dg-warning "C2X feature|ISO C" } */
+_Decimal64 c = 11e-1dl;		/* { dg-warning "C2X feature|ISO C" } */
+_Decimal64 d = -.3DL;		/* { dg-warning "C2X feature|ISO C" } */
+_Decimal128 e = 000.3e0dl;	/* { dg-warning "C2X feature|ISO C" } */
+_Decimal128 f = 3000300030003e0DL;  /* { dg-warning "C2X feature|ISO C" } */
-- 
cgit v1.1


From 36cefd37da8b7819b10664f6c740e6a839b3ea08 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Sat, 12 Oct 2019 00:16:16 +0000
Subject: Daily bump.

From-SVN: r276912
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index e21f9c0..662cb44 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191011
+20191012
-- 
cgit v1.1


From 47370f050940a2e140e89fc0d46e808fab206f04 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 12 Oct 2019 01:06:43 +0000
Subject: compiler: mangle dots in pkgpath

    We need to mangle dots to avoid problems with -fgo-pkgpath=a.0.
    That will confuse the name mangling, which assumes that names
    entering the mangling cannot contain arbitrary dot characters.
    We don't need to mangle other characters; go_encode_id will handle them.

    Fixes golang/go#33871

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/200838

From-SVN: r276913
---
 gcc/go/gofrontend/MERGE           |  2 +-
 gcc/go/gofrontend/go-encode-id.cc | 13 +++++++++++++
 gcc/go/gofrontend/go-encode-id.h  |  8 ++++++++
 gcc/go/gofrontend/gogo.cc         |  5 +++--
 4 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 1508eb1..1c90e55 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ddfb845fad1f2e8b84383f262ed5ea5be7b3e35a
+f174fdad69cad42309984dfa108d80f2ae8a9f78
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/go-encode-id.cc b/gcc/go/gofrontend/go-encode-id.cc
index 7c7aa13..550da97 100644
--- a/gcc/go/gofrontend/go-encode-id.cc
+++ b/gcc/go/gofrontend/go-encode-id.cc
@@ -253,3 +253,16 @@ go_mangle_struct_tag(const std::string& tag)
     }
   return ret;
 }
+
+// Encode a package path.
+
+std::string
+go_mangle_pkgpath(const std::string& pkgpath)
+{
+  std::string s = pkgpath;
+  for (size_t i = s.find('.');
+       i != std::string::npos;
+       i = s.find('.', i + 1))
+    s.replace(i, 1, ".x2e"); // 0x2e is the ASCII encoding for '.'
+  return s;
+}
diff --git a/gcc/go/gofrontend/go-encode-id.h b/gcc/go/gofrontend/go-encode-id.h
index 70126ba..2d09b0c 100644
--- a/gcc/go/gofrontend/go-encode-id.h
+++ b/gcc/go/gofrontend/go-encode-id.h
@@ -34,4 +34,12 @@ go_selectively_encode_id(const std::string &id);
 extern std::string
 go_mangle_struct_tag(const std::string& tag);
 
+// Encode a package path.  A package path can contain any arbitrary
+// character, including '.'.  go_encode_id expects that any '.' will
+// be inserted by name mangling in a controlled manner.  So first
+// translate any '.' using the same .x encoding as used by
+// go_mangle_struct_tag.
+extern std::string
+go_mangle_pkgpath(const std::string& pkgpath);
+
 #endif // !defined(GO_ENCODE_ID_H)
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index a79cfc3..1ee49dc 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -298,7 +298,7 @@ void
 Gogo::set_pkgpath(const std::string& arg)
 {
   go_assert(!this->pkgpath_set_);
-  this->pkgpath_ = arg;
+  this->pkgpath_ = go_mangle_pkgpath(arg);
   this->pkgpath_set_ = true;
   this->pkgpath_from_option_ = true;
 }
@@ -396,7 +396,8 @@ Gogo::set_package_name(const std::string& package_name,
 	{
 	  if (!this->prefix_from_option_)
 	    this->prefix_ = "go";
-	  this->pkgpath_ = this->prefix_ + '.' + package_name;
+	  this->pkgpath_ = (go_mangle_pkgpath(this->prefix_) + '.'
+			    + package_name);
 	  this->pkgpath_symbol_ = (Gogo::pkgpath_for_symbol(this->prefix_) + '.'
 				   + Gogo::pkgpath_for_symbol(package_name));
 	}
-- 
cgit v1.1


From 20de9568b49e663be848a35ce0bb08f63f14b5b2 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 12 Oct 2019 10:27:36 +0200
Subject: c-common.h (c_omp_mark_declare_variant, [...]): Declare.

c-family/
	* c-common.h (c_omp_mark_declare_variant,
	c_omp_context_selector_matches): Declare.
	* c-omp.c: Include attribs.h, gimplify.h, cgraph.h, symbol-summary.h
	and hsa-common.h.
	(c_omp_get_context_selector): Support second argument NULL.
	(c_omp_mark_declare_variant, c_omp_context_selector_matches): New
	functions.
	* c-attribs.c (c_common_attribute_table): Remove "omp declare variant"
	attribute, add "omp declare variant base" and
	"omp declare variant variant" attributes.
c/
	* c-parser.c (c_parser_omp_context_selector): Improve error recovery.
	For simd properties, put them directly into TREE_VALUE.
	(c_finish_omp_declare_variant): Call c_omp_mark_declare_variant.
	If c_omp_context_selector_matches is 0, don't add attribute, otherwise
	add "omp declare variant base" attribute rather than
	"omp declare variant".
cp/
	* parser.c (cp_parser_omp_context_selector): Improve error recovery.
	For simd properties, put them directly into TREE_VALUE.
	(cp_finish_omp_declare_variant): Add "omp declare variant base"
	attribute rather than "omp declare variant".
testsuite/
	* c-c++-common/gomp/declare-variant-2.c: Adjust for error recovery
	improvements.  Add new tests.
	* c-c++-common/gomp/declare-variant-4.c: New test.
	* c-c++-common/gomp/declare-variant-5.c: New test.
	* c-c++-common/gomp/declare-variant-6.c: New test.
	* c-c++-common/gomp/declare-variant-7.c: New test.

From-SVN: r276914
---
 gcc/c-family/ChangeLog                             |  13 +
 gcc/c-family/c-attribs.c                           |   6 +-
 gcc/c-family/c-common.h                            |   2 +
 gcc/c-family/c-omp.c                               | 333 ++++++++++++++++++++-
 gcc/c/ChangeLog                                    |   9 +
 gcc/c/c-parser.c                                   |  24 +-
 gcc/cp/ChangeLog                                   |   7 +
 gcc/cp/parser.c                                    |  13 +-
 gcc/testsuite/ChangeLog                            |   9 +
 .../c-c++-common/gomp/declare-variant-2.c          |  33 +-
 .../c-c++-common/gomp/declare-variant-4.c          |  22 ++
 .../c-c++-common/gomp/declare-variant-5.c          |  36 +++
 .../c-c++-common/gomp/declare-variant-6.c          |  35 +++
 .../c-c++-common/gomp/declare-variant-7.c          |  33 ++
 14 files changed, 554 insertions(+), 21 deletions(-)
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-4.c
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-5.c
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-6.c
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-7.c

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index fea97bb..2b63689 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-common.h (c_omp_mark_declare_variant,
+	c_omp_context_selector_matches): Declare.
+	* c-omp.c: Include attribs.h, gimplify.h, cgraph.h, symbol-summary.h
+	and hsa-common.h.
+	(c_omp_get_context_selector): Support second argument NULL.
+	(c_omp_mark_declare_variant, c_omp_context_selector_matches): New
+	functions.
+	* c-attribs.c (c_common_attribute_table): Remove "omp declare variant"
+	attribute, add "omp declare variant base" and
+	"omp declare variant variant" attributes.
+
 2019-10-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* c.opt (Wc11-c2x-compat): Add CPP(cpp_warn_c11_c2x_compat)
diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c
index 917d483..ea273f8 100644
--- a/gcc/c-family/c-attribs.c
+++ b/gcc/c-family/c-attribs.c
@@ -444,7 +444,9 @@ const struct attribute_spec c_common_attribute_table[] =
 			      handle_returns_nonnull_attribute, NULL },
   { "omp declare simd",       0, -1, true,  false, false, false,
 			      handle_omp_declare_simd_attribute, NULL },
-  { "omp declare variant",    0, -1, true,  false, false, false,
+  { "omp declare variant base", 0, -1, true,  false, false, false,
+			      handle_omp_declare_variant_attribute, NULL },
+  { "omp declare variant variant", 0, -1, true,  false, false, false,
 			      handle_omp_declare_variant_attribute, NULL },
   { "simd",		      0, 1, true,  false, false, false,
 			      handle_simd_attribute, NULL },
@@ -3068,7 +3070,7 @@ handle_omp_declare_simd_attribute (tree *, tree, tree, int, bool *)
   return NULL_TREE;
 }
 
-/* Handle an "omp declare variant" attribute; arguments as in
+/* Handle an "omp declare variant {base,variant}" attribute; arguments as in
    struct attribute_spec.handler.  */
 
 static tree
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index eabe689..db7f26e 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1191,6 +1191,8 @@ extern bool c_omp_predefined_variable (tree);
 extern enum omp_clause_default_kind c_omp_predetermined_sharing (tree);
 extern tree c_omp_check_context_selector (location_t, tree);
 extern tree c_omp_get_context_selector (tree, const char *, const char *);
+extern void c_omp_mark_declare_variant (location_t, tree, tree);
+extern int c_omp_context_selector_matches (tree);
 
 /* Return next tree in the chain for chain_next walking of tree nodes.  */
 static inline tree
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 5426256..3398188 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -32,6 +32,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "omp-general.h"
 #include "gomp-constants.h"
 #include "memmodel.h"
+#include "attribs.h"
+#include "gimplify.h"
+#include "cgraph.h"
+#include "symbol-summary.h"
+#include "hsa-common.h"
 
 
 /* Complete a #pragma oacc wait construct.  LOC is the location of
@@ -2236,17 +2241,335 @@ c_omp_check_context_selector (location_t loc, tree ctx)
 }
 
 /* From context selector CTX, return trait-selector with name SEL in
-   trait-selector-set with name SET if any, or NULL_TREE if not found.  */
+   trait-selector-set with name SET if any, or NULL_TREE if not found.
+   If SEL is NULL, return the list of trait-selectors in SET.  */
 
 tree
 c_omp_get_context_selector (tree ctx, const char *set, const char *sel)
 {
   tree setid = get_identifier (set);
-  tree selid = get_identifier (sel);
+  tree selid = sel ? get_identifier (sel) : NULL_TREE;
   for (tree t1 = ctx; t1; t1 = TREE_CHAIN (t1))
     if (TREE_PURPOSE (t1) == setid)
-      for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
-	if (TREE_PURPOSE (t2) == selid)
-	  return t2;
+      {
+	if (sel == NULL)
+	  return TREE_VALUE (t1);
+	for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
+	  if (TREE_PURPOSE (t2) == selid)
+	    return t2;
+      }
   return NULL_TREE;
 }
+
+/* Register VARIANT as variant of some base function marked with
+   #pragma omp declare variant.  CONSTRUCT is corresponding construct
+   selector set.  */
+
+void
+c_omp_mark_declare_variant (location_t loc, tree variant, tree construct)
+{
+  tree attr = lookup_attribute ("omp declare variant variant",
+				DECL_ATTRIBUTES (variant));
+  if (attr == NULL_TREE)
+    {
+      attr = tree_cons (get_identifier ("omp declare variant variant"),
+			unshare_expr (construct),
+			DECL_ATTRIBUTES (variant));
+      DECL_ATTRIBUTES (variant) = attr;
+      return;
+    }
+  tree t1 = TREE_VALUE (attr);
+  tree t2 = construct;
+  tree simd = get_identifier ("simd");
+  while (t1 && t2)
+    {
+      if (TREE_PURPOSE (t1) != TREE_PURPOSE (t2))
+	break;
+      if (TREE_PURPOSE (t1) == simd)
+	{
+	  if ((TREE_VALUE (t1) == NULL_TREE)
+	      != (TREE_VALUE (t2) == NULL_TREE))
+	    break;
+	  if (TREE_VALUE (t1))
+	    {
+	      struct declare_variant_simd_data {
+		bool inbranch, notinbranch;
+		tree simdlen;
+		auto_vec<tree,16> data_sharing;
+		auto_vec<tree,16> aligned;
+		declare_variant_simd_data ()
+		  : inbranch(false), notinbranch(false), simdlen(NULL_TREE) {}
+	      } data[2];
+	      unsigned int i;
+	      for (i = 0; i < 2; i++)
+		for (tree c = TREE_VALUE (i ? t2 : t1);
+		     c; c = OMP_CLAUSE_CHAIN (c))
+		  {
+		    vec<tree> *v;
+		    switch (OMP_CLAUSE_CODE (c))
+		      {
+		      case OMP_CLAUSE_INBRANCH:
+			data[i].inbranch = true;
+			continue;
+		      case OMP_CLAUSE_NOTINBRANCH:
+			data[i].notinbranch = true;
+			continue;
+		      case OMP_CLAUSE_SIMDLEN:
+			data[i].simdlen = OMP_CLAUSE_SIMDLEN_EXPR (c);
+			continue;
+		      case OMP_CLAUSE_UNIFORM:
+		      case OMP_CLAUSE_LINEAR:
+			v = &data[i].data_sharing;
+			break;
+		      case OMP_CLAUSE_ALIGNED:
+			v = &data[i].aligned;
+			break;
+		      default:
+			gcc_unreachable ();
+		      }
+		    unsigned HOST_WIDE_INT argno
+		      = tree_to_uhwi (OMP_CLAUSE_DECL (c));
+		    if (argno >= v->length ())
+		      v->safe_grow_cleared (argno + 1);
+		    (*v)[argno] = c;
+		  }
+	      if (data[0].inbranch != data[1].inbranch
+		  || data[0].notinbranch != data[1].notinbranch
+		  || !simple_cst_equal (data[0].simdlen,
+					data[1].simdlen)
+		  || (data[0].data_sharing.length ()
+		      != data[1].data_sharing.length ())
+		  || (data[0].aligned.length ()
+		      != data[1].aligned.length ()))
+		break;
+	      tree c1, c2;
+	      FOR_EACH_VEC_ELT (data[0].data_sharing, i, c1)
+		{
+		  c2 = data[1].data_sharing[i];
+		  if ((c1 == NULL_TREE) != (c2 == NULL_TREE))
+		    break;
+		  if (c1 == NULL_TREE)
+		    continue;
+		  if (OMP_CLAUSE_CODE (c1) != OMP_CLAUSE_CODE (c2))
+		    break;
+		  if (OMP_CLAUSE_CODE (c1) != OMP_CLAUSE_LINEAR)
+		    continue;
+		  if (OMP_CLAUSE_LINEAR_VARIABLE_STRIDE (c1)
+		      != OMP_CLAUSE_LINEAR_VARIABLE_STRIDE (c2))
+		    break;
+		  if (OMP_CLAUSE_LINEAR_KIND (c1)
+		      != OMP_CLAUSE_LINEAR_KIND (c2))
+		    break;
+		  if (!simple_cst_equal (OMP_CLAUSE_LINEAR_STEP (c1),
+					 OMP_CLAUSE_LINEAR_STEP (c2)))
+		    break;
+		}
+	      if (i < data[0].data_sharing.length ())
+		break;
+	      FOR_EACH_VEC_ELT (data[0].aligned, i, c1)
+		{
+		  c2 = data[1].aligned[i];
+		  if ((c1 == NULL_TREE) != (c2 == NULL_TREE))
+		    break;
+		  if (c1 == NULL_TREE)
+		    continue;
+		  if (!simple_cst_equal (OMP_CLAUSE_ALIGNED_ALIGNMENT (c1),
+					 OMP_CLAUSE_ALIGNED_ALIGNMENT (c2)))
+		    break;
+		}
+	      if (i < data[0].aligned.length ())
+		break;
+	    }
+	}
+      t1 = TREE_CHAIN (t1);
+      t2 = TREE_CHAIN (t2);
+    }
+  if (t1 || t2)
+    error_at (loc, "%qD used as a variant with incompatible %<constructor%> "
+		   "selector sets", variant);
+}
+
+/* Return 1 if context selector matches the current OpenMP context, 0
+   if it does not and -1 if it is unknown and need to be determined later.
+   Some properties can be checked right away during parsing (this routine),
+   others need to wait until the whole TU is parsed, others need to wait until
+   IPA, others until vectorization.  */
+
+int
+c_omp_context_selector_matches (tree ctx)
+{
+  int ret = 1;
+  for (tree t1 = ctx; t1; t1 = TREE_CHAIN (t1))
+    {
+      char set = IDENTIFIER_POINTER (TREE_PURPOSE (t1))[0];
+      if (set == 'c')
+	{
+	  /* For now, ignore the construct set.  While something can be
+	     determined already during parsing, we don't know until end of TU
+	     whether additional constructs aren't added through declare variant
+	     unless "omp declare variant variant" attribute exists already
+	     (so in most of the cases), and we'd need to maintain set of
+	     surrounding OpenMP constructs, which is better handled during
+	     gimplification.  */
+	  ret = -1;
+	  continue;
+	}
+      for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
+	{
+	  const char *sel = IDENTIFIER_POINTER (TREE_PURPOSE (t2));
+	  switch (*sel)
+	    {
+	    case 'v':
+	      if (set == 'i' && !strcmp (sel, "vendor"))
+		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
+		  {
+		    const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		    if (!strcmp (prop, " score") || !strcmp (prop, "gnu"))
+		      continue;
+		    return 0;
+		  }
+	      break;
+	    case 'e':
+	      if (set == 'i' && !strcmp (sel, "extension"))
+		/* We don't support any extensions right now.  */
+		return 0;
+	      break;
+	    case 'a':
+	      if (set == 'i' && !strcmp (sel, "atomic_default_mem_order"))
+		{
+		  enum omp_memory_order omo
+		    = ((enum omp_memory_order)
+		       (omp_requires_mask
+			& OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER));
+		  if (omo == OMP_MEMORY_ORDER_UNSPECIFIED)
+		    {
+		      /* We don't know yet, until end of TU.  */
+		      ret = -1;
+		      break;
+		    }
+		  tree t3 = TREE_VALUE (t2);
+		  const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		  if (!strcmp (prop, " score"))
+		    {
+		      t3 = TREE_CHAIN (t3);
+		      prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		    }
+		  if (!strcmp (prop, "relaxed")
+		      && omo != OMP_MEMORY_ORDER_RELAXED)
+		    return 0;
+		  else if (!strcmp (prop, "seq_cst")
+			   && omo != OMP_MEMORY_ORDER_SEQ_CST)
+		    return 0;
+		  else if (!strcmp (prop, "acq_rel")
+			   && omo != OMP_MEMORY_ORDER_ACQ_REL)
+		    return 0;
+		}
+	      if (set == 'd' && !strcmp (sel, "arch"))
+		/* For now, need a target hook.  */
+		ret = -1;
+	      break;
+	    case 'u':
+	      if (set == 'i' && !strcmp (sel, "unified_address"))
+		{
+		  if ((omp_requires_mask & OMP_REQUIRES_UNIFIED_ADDRESS) == 0)
+		    ret = -1;
+		  break;
+		}
+	      if (set == 'i' && !strcmp (sel, "unified_shared_memory"))
+		{
+		  if ((omp_requires_mask
+		       & OMP_REQUIRES_UNIFIED_SHARED_MEMORY) == 0)
+		    ret = -1;
+		  break;
+		}
+	      break;
+	    case 'd':
+	      if (set == 'i' && !strcmp (sel, "dynamic_allocators"))
+		{
+		  if ((omp_requires_mask
+		       & OMP_REQUIRES_DYNAMIC_ALLOCATORS) == 0)
+		    ret = -1;
+		  break;
+		}
+	      break;
+	    case 'r':
+	      if (set == 'i' && !strcmp (sel, "reverse_offload"))
+		{
+		  if ((omp_requires_mask & OMP_REQUIRES_REVERSE_OFFLOAD) == 0)
+		    ret = -1;
+		  break;
+		}
+	      break;
+	    case 'k':
+	      if (set == 'd' && !strcmp (sel, "kind"))
+		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
+		  {
+		    const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		    if (!strcmp (prop, "any"))
+		      continue;
+		    if (!strcmp (prop, "fpga"))
+		      return 0;	/* Right now GCC doesn't support any fpgas.  */
+		    if (!strcmp (prop, "host"))
+		      {
+			if (ENABLE_OFFLOADING || hsa_gen_requested_p ())
+			  ret = -1;
+			continue;
+		      }
+		    if (!strcmp (prop, "nohost"))
+		      {
+			if (ENABLE_OFFLOADING || hsa_gen_requested_p ())
+			  ret = -1;
+			else
+			  return 0;
+			continue;
+		      }
+		    if (!strcmp (prop, "cpu") || !strcmp (prop, "gpu"))
+		      {
+			bool maybe_gpu = false;
+			if (hsa_gen_requested_p ())
+			  maybe_gpu = true;
+			else if (ENABLE_OFFLOADING)
+			  for (const char *c = getenv ("OFFLOAD_TARGET_NAMES");
+			       c; )
+			    {
+			      if (!strncmp (c, "nvptx", strlen ("nvptx"))
+				  || !strncmp (c, "amdgcn", strlen ("amdgcn")))
+				{
+				  maybe_gpu = true;
+				  break;
+				}
+			      else if ((c = strchr (c, ',')))
+				c++;
+			    }
+			if (!maybe_gpu)
+			  {
+			    if (prop[0] == 'g')
+			      return 0;
+			  }
+			else
+			  ret = -1;
+			continue;
+		      }
+		    /* Any other kind doesn't match.  */
+		    return 0;
+		  }
+	      break;
+	    case 'i':
+	      if (set == 'd' && !strcmp (sel, "isa"))
+		/* For now, need a target hook.  */
+		ret = -1;
+	      break;
+	    case 'c':
+	      if (set == 'u' && !strcmp (sel, "condition"))
+		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
+		  if (TREE_PURPOSE (t3) == NULL_TREE
+		      && integer_zerop (TREE_VALUE (t3)))
+		    return 0;
+	      break;
+	    default:
+	      break;
+	    }
+	}
+    }
+  return ret;
+}
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 894f5e7..5fb386c 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-parser.c (c_parser_omp_context_selector): Improve error recovery.
+	For simd properties, put them directly into TREE_VALUE.
+	(c_finish_omp_declare_variant): Call c_omp_mark_declare_variant.
+	If c_omp_context_selector_matches is 0, don't add attribute, otherwise
+	add "omp declare variant base" attribute rather than
+	"omp declare variant".
+
 2019-10-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* c-decl.c (declspecs_add_type): Use pedwarn_c11 for DFP types.
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 2daaee8..9d0b2b6 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -19219,6 +19219,8 @@ c_parser_omp_context_selector (c_parser *parser, tree set, tree parms)
 		      else
 			properties = tree_cons (NULL_TREE, t, properties);
 		    }
+		  else
+		    return error_mark_node;
 
 		  if (c_parser_next_token_is (parser, CPP_COMMA))
 		    c_parser_consume_token (parser);
@@ -19263,6 +19265,8 @@ c_parser_omp_context_selector (c_parser *parser, tree set, tree parms)
 		  else
 		    properties = tree_cons (NULL_TREE, t, properties);
 		}
+	      else
+		return error_mark_node;
 	      break;
 	    case CTX_PROPERTY_SIMD:
 	      if (parms == NULL_TREE)
@@ -19280,7 +19284,7 @@ c_parser_omp_context_selector (c_parser *parser, tree set, tree parms)
 							 == error_mark_node
 							 ? NULL_TREE : parms,
 							 c);
-	      properties = tree_cons (NULL_TREE, c, properties);
+	      properties = c;
 	      break;
 	    default:
 	      gcc_unreachable ();
@@ -19389,7 +19393,7 @@ c_parser_omp_context_selector_specification (c_parser *parser, tree parms)
 }
 
 /* Finalize #pragma omp declare variant after FNDECL has been parsed, and put
-   that into "omp declare variant" attribute.  */
+   that into "omp declare variant base" attribute.  */
 
 static void
 c_finish_omp_declare_variant (c_parser *parser, tree fndecl, tree parms)
@@ -19473,10 +19477,16 @@ c_finish_omp_declare_variant (c_parser *parser, tree fndecl, tree parms)
       if (variant != error_mark_node)
 	{
 	  C_DECL_USED (variant) = 1;
-	  tree attr = tree_cons (get_identifier ("omp declare variant"),
-				 build_tree_list (variant, ctx),
-				 DECL_ATTRIBUTES (fndecl));
-	  DECL_ATTRIBUTES (fndecl) = attr;
+	  tree construct = c_omp_get_context_selector (ctx, "construct", NULL);
+	  c_omp_mark_declare_variant (match_loc, variant, construct);
+	  if (c_omp_context_selector_matches (ctx))
+	    {
+	      tree attr
+		= tree_cons (get_identifier ("omp declare variant base"),
+			     build_tree_list (variant, ctx),
+			     DECL_ATTRIBUTES (fndecl));
+	      DECL_ATTRIBUTES (fndecl) = attr;
+	    }
 	}
     }
 
@@ -19486,7 +19496,7 @@ c_finish_omp_declare_variant (c_parser *parser, tree fndecl, tree parms)
 
 /* Finalize #pragma omp declare simd or #pragma omp declare variant
    clauses after FNDECL has been parsed, and put that into "omp declare simd"
-   or "omp declare variant" attribute.  */
+   or "omp declare variant base" attribute.  */
 
 static void
 c_finish_omp_declare_simd (c_parser *parser, tree fndecl, tree parms,
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 02a330d..dcae490 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* parser.c (cp_parser_omp_context_selector): Improve error recovery.
+	For simd properties, put them directly into TREE_VALUE.
+	(cp_finish_omp_declare_variant): Add "omp declare variant base"
+	attribute rather than "omp declare variant".
+
 2019-10-11  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/92049 - extra error with -fchecking=2.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 3ee8da7..9bf690a 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -40488,6 +40488,8 @@ cp_parser_omp_context_selector (cp_parser *parser, tree set, bool has_parms_p)
 		      else
 			properties = tree_cons (NULL_TREE, t, properties);
 		    }
+		  else
+		    return error_mark_node;
 
 		  if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
 		    cp_lexer_consume_token (parser->lexer);
@@ -40532,6 +40534,8 @@ cp_parser_omp_context_selector (cp_parser *parser, tree set, bool has_parms_p)
 		  else
 		    properties = tree_cons (NULL_TREE, t, properties);
 		}
+	      else
+		return error_mark_node;
 	      break;
 	    case CTX_PROPERTY_SIMD:
 	      if (!has_parms_p)
@@ -40541,11 +40545,10 @@ cp_parser_omp_context_selector (cp_parser *parser, tree set, bool has_parms_p)
 			    "%<metadirective%>");
 		  return error_mark_node;
 		}
-	      tree c;
-	      c = cp_parser_omp_all_clauses (parser,
+	      properties
+		= cp_parser_omp_all_clauses (parser,
 					     OMP_DECLARE_SIMD_CLAUSE_MASK,
 					     "simd", NULL, true, true);
-	      properties = tree_cons (NULL_TREE, c, properties);
 	      break;
 	    default:
 	      gcc_unreachable ();
@@ -40662,7 +40665,7 @@ cp_parser_omp_context_selector_specification (cp_parser *parser,
 }
 
 /* Finalize #pragma omp declare variant after a fndecl has been parsed, and put
-   that into "omp declare variant" attribute.  */
+   that into "omp declare variant base" attribute.  */
 
 static tree
 cp_finish_omp_declare_variant (cp_parser *parser, cp_token *pragma_tok,
@@ -40717,7 +40720,7 @@ cp_finish_omp_declare_variant (cp_parser *parser, cp_token *pragma_tok,
   ctx = c_omp_check_context_selector (match_loc, ctx);
   if (ctx != error_mark_node && variant != error_mark_node)
     {
-      attrs = tree_cons (get_identifier ("omp declare variant"),
+      attrs = tree_cons (get_identifier ("omp declare variant base"),
 			 build_tree_list (variant, ctx), attrs);
       if (processing_template_decl)
 	ATTR_IS_DEPENDENT (attrs) = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9b31f35..14b5da6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/declare-variant-2.c: Adjust for error recovery
+	improvements.  Add new tests.
+	* c-c++-common/gomp/declare-variant-4.c: New test.
+	* c-c++-common/gomp/declare-variant-5.c: New test.
+	* c-c++-common/gomp/declare-variant-6.c: New test.
+	* c-c++-common/gomp/declare-variant-7.c: New test.
+
 2019-10-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/dfp/c11-constants-1.c, gcc.dg/dfp/c11-constants-2.c,
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c
index bc12398..f058f57 100644
--- a/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-2.c
@@ -1,3 +1,4 @@
+void f0 (void);
 void f1 (void);
 #pragma omp declare variant	/* { dg-error "expected '\\(' before end of line" } */
 void f2 (void);
@@ -34,7 +35,7 @@ void f17 (void);
 #pragma omp declare variant (f1) match(user={condition})	/* { dg-error "expected '\\(' before '\\\}' token" } */
 void f18 (void);
 #pragma omp declare variant (f1) match(user={condition(})	/* { dg-error "expected \[^\n\r]*expression before '\\\}' token" } */
-void f19 (void);						/* { dg-error "expected '\\)' before '\\\}' token" "" { target c++ } .-1 } */
+void f19 (void);
 #pragma omp declare variant (f1) match(user={condition()})	/* { dg-error "expected \[^\n\r]*expression before '\\)' token" } */
 void f20 (void);
 #pragma omp declare variant (f1) match(user={condition(f1)})	/* { dg-error "property must be constant integer expression" "" { target { c || c++11 } } } */
@@ -50,7 +51,7 @@ void f25 (void);						/* { dg-error "expected '\\\}' before end of line" "" { ta
 								/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-2 } */
 #pragma omp declare variant (f1) match(construct={parallel(1)})	/* { dg-error "selector 'parallel' does not accept any properties" } */
 void f26 (void);							/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
-#pragma omp declare variant (f1) match(construct={simd(12)})	/* { dg-error "expected \[^\n\r]* clause before" } */
+#pragma omp declare variant (f0) match(construct={simd(12)})	/* { dg-error "expected \[^\n\r]* clause before" } */
 void f27 (void);						/* { dg-error "'\\)' before numeric constant" "" { target c++ } .-1 } */
 #pragma omp declare variant (f1) match(construct={parallel},construct={for})	/* { dg-error "selector set 'construct' specified more than once" } */
 void f28 (void);
@@ -120,3 +121,31 @@ void f58 (void);						/* { dg-error "expected '\\\}' before '\\(' token" "" { ta
 void f59 (void);						/* { dg-error "expected '\\\}' before '\\(' token" "" { target c } .-1 } */
 #pragma omp declare variant (f1) match(construct={parallel},foobar={bar})	/* { dg-error "expected 'construct', 'device', 'implementation' or 'user' before 'foobar'" } */
 void f60 (void);
+#pragma omp declare variant (f1) match(construct={parallel,parallel})	/* { dg-error "selector 'parallel' specified more than once in set 'construct'" } */
+void f61 (void);
+#pragma omp declare variant (f1) match(construct={target,parallel,for,simd,parallel})	/* { dg-error "selector 'parallel' specified more than once in set 'construct'" } */
+void f62 (void);
+#pragma omp declare variant (f1) match(construct={target,teams,teams})	/* { dg-error "selector 'teams' specified more than once in set 'construct'" } */
+void f63 (void);
+#pragma omp declare variant (f1) match(construct={single})	/* { dg-error "selector 'single' not allowed for context selector set 'construct'" } */
+void f64 (void);
+#pragma omp declare variant (f1) match(construct={taskgroup})	/* { dg-error "selector 'taskgroup' not allowed for context selector set 'construct'" } */
+void f65 (void);
+#pragma omp declare variant (f1) match(construct={do})	/* { dg-error "selector 'do' not allowed for context selector set 'construct'" } */
+void f66 (void);
+#pragma omp declare variant (f1) match(construct={threadprivate})	/* { dg-error "selector 'threadprivate' not allowed for context selector set 'construct'" } */
+void f67 (void);
+#pragma omp declare variant (f1) match(construct={critical})	/* { dg-error "selector 'critical' not allowed for context selector set 'construct'" } */
+void f68 (void);
+#pragma omp declare variant (f1) match(construct={task})	/* { dg-error "selector 'task' not allowed for context selector set 'construct'" } */
+void f69 (void);
+#pragma omp declare variant (f1) match(construct={taskloop})	/* { dg-error "selector 'taskloop' not allowed for context selector set 'construct'" } */
+void f70 (void);
+#pragma omp declare variant (f1) match(construct={sections})	/* { dg-error "selector 'sections' not allowed for context selector set 'construct'" } */
+void f71 (void);
+#pragma omp declare variant (f1) match(construct={section})	/* { dg-error "selector 'section' not allowed for context selector set 'construct'" } */
+void f72 (void);
+#pragma omp declare variant (f1) match(construct={workshare})	/* { dg-error "selector 'workshare' not allowed for context selector set 'construct'" } */
+void f73 (void);
+#pragma omp declare variant (f1) match(construct={requires})	/* { dg-error "selector 'requires' not allowed for context selector set 'construct'" } */
+void f74 (void);
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-4.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-4.c
new file mode 100644
index 0000000..add3730
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-4.c
@@ -0,0 +1,22 @@
+double f1 (int, long, float);
+double f2 (int, long, float);
+double f3 (int, long, float);
+double f4 (int, long, float);
+double f5 (int, long, float);
+
+#pragma omp declare variant (f1) match (user={condition(1)})
+#pragma omp declare variant (f2) match (user={condition(score(1):1)})
+#pragma omp declare variant (f3) match (user={condition(score(3):1)})
+#pragma omp declare variant (f4) match (user={condition(score(2):1)})
+#pragma omp declare variant (f5) match (implementation={vendor(gnu)})
+double
+f6 (int x, long y, float z)
+{
+  return z + x + y;
+}
+
+double
+test (int x)
+{
+  return f6 (x, x, 3.5f);
+}
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-5.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-5.c
new file mode 100644
index 0000000..6ebf094
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-5.c
@@ -0,0 +1,36 @@
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-additional-options "-mavx2" } */
+
+typedef float __v4sf __attribute__((vector_size (16)));
+typedef int __v4si __attribute__((vector_size (16)));
+typedef float __v8sf __attribute__((vector_size (32)));
+typedef int __v8si __attribute__((vector_size (32)));
+__v4si f1 (__v4sf, __v4sf, float *);
+__v8si f2 (__v8sf, __v8sf, float *);
+__v4si f3 (__v4si, int, __v4si);
+
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(simdlen(4),notinbranch,uniform(z),aligned(z:4 * sizeof (*z)))})
+#pragma omp declare variant (f2) match (construct={for,simd(uniform(z),simdlen(8),notinbranch)})
+int f4 (float x, float y, float *z);
+
+#pragma omp declare variant (f3) match (construct={simd(simdlen(4),inbranch,linear(y:1))})
+int f5 (int x, int y);
+
+void
+test (int *x, float *y, float *z, float *w)
+{
+  #pragma omp parallel
+  #pragma omp for simd aligned (w:4 * sizeof (float))
+  for (int i = 0; i < 1024; i++)
+    x[i] = f4 (y[i], z[i], w);
+  #pragma omp parallel for simd aligned (w:4 * sizeof (float)) simdlen(4)
+  for (int i = 1024; i < 2048; i++)
+    x[i] = f4 (y[i], z[i], w);
+  #pragma omp simd aligned (w:4 * sizeof (float))
+  for (int i = 2048; i < 4096; i++)
+    x[i] = f4 (y[i], z[i], w);
+  #pragma omp simd
+  for (int i = 4096; i < 8192; i++)
+    if (x[i] > 10)
+      x[i] = f5 (x[i], i);
+}
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-6.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-6.c
new file mode 100644
index 0000000..67c5a00
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-6.c
@@ -0,0 +1,35 @@
+double f1 (int, long, float);
+double f2 (int, long, float);
+#pragma omp declare variant (f1) match (user={condition(0)},construct={parallel})
+double f3 (int, long, float);
+#pragma omp declare variant (f1) match (construct={parallel},user={condition(score(1):1)})
+double f4 (int, long, float);
+double f5 (int, long, float);
+#pragma omp declare variant (f5) match (user={condition(0)})
+double f6 (int, long, float);
+#pragma omp declare variant (f5) match (construct={parallel},user={condition(score(1):1)})	/* { dg-error "'f5' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+double f7 (int, long, float);
+double f8 (int, long, float);
+#pragma omp declare variant (f8) match (user={condition(0)},construct={for})
+double f9 (int, long, float);
+#pragma omp declare variant (f8) match (user={condition(1)})					/* { dg-error "'f8' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+double f10 (int, long, float);
+double f11 (int, long, float);
+#pragma omp declare variant (f11) match (construct={target,teams,parallel,for})
+double f12 (int, long, float);
+#pragma omp declare variant (f11) match (user={condition(score(1):1)},construct={target,teams,parallel,for})
+double f13 (int, long, float);
+#pragma omp declare variant (f11) match (implementation={vendor(gnu)},construct={target,teams,parallel})	/* { dg-error "'f11' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+double f14 (int, long, float);
+#pragma omp declare variant (f11) match (device={kind(any)},construct={teams,parallel})		/* { dg-error "'f11' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+double f15 (int, long, float);
+double f16 (int, long, float);
+#pragma omp declare variant (f16) match (construct={teams,parallel})
+double f17 (int, long, float);
+#pragma omp declare variant (f16) match(construct={teams,parallel,for})				/* { dg-error "'f16' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+double f18 (int, long, float);
+double f19 (int, long, float);
+#pragma omp declare variant (f19) match (construct={parallel})
+double f20 (int, long, float);
+#pragma omp declare variant (f19) match (construct={for},implementation={vendor(gnu,llvm)})	/* { dg-error "'f19' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+double f21 (int, long, float);
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c
new file mode 100644
index 0000000..f818cd5
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c
@@ -0,0 +1,33 @@
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-additional-options "-mavx2" } */
+
+typedef float __v4sf __attribute__((vector_size (16)));
+typedef int __v4si __attribute__((vector_size (16)));
+typedef float __v8sf __attribute__((vector_size (32)));
+typedef int __v8si __attribute__((vector_size (32)));
+__v4si f1 (__v4sf, __v4sf, float *);
+__v8si f2 (__v8sf, __v8sf, float *);
+__v4si f3 (__v4si, int, __v4si);
+
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(simdlen(4),notinbranch,uniform(z),aligned(z:4 * sizeof (*z)))})
+int f4 (float x, float y, float *z);
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(uniform(w),simdlen(8*2-12),aligned(w:4*sizeof (float)),notinbranch)})
+int f5 (float u, float v, float *w);
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(linear(w),notinbranch,simdlen(4),aligned(w:4*sizeof (float)))})	/* { dg-error "'f1' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+int f6 (float u, float v, float *w);
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(uniform(w),notinbranch,simdlen(4),aligned(w:2*sizeof (float)))})	/* { dg-error "'f1' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+int f7 (float u, float v, float *w);
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(uniform(w),notinbranch,simdlen(4),aligned(w))})			/* { dg-error "'f1' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+int f8 (float u, float v, float *w);
+#pragma omp declare variant (f2) match (construct={for,simd(uniform(z),simdlen(8),notinbranch)})
+int f9 (float x, float y, float *z);
+#pragma omp declare variant (f2) match (construct={for,simd(notinbranch,simdlen(2+2+4),uniform (q))})
+int f10 (float x, float y, float *q);
+#pragma omp declare variant (f2) match (construct={for,simd(linear(z:2),simdlen(8),notinbranch)})	/* { dg-error "'f2' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+int f11 (float x, float y, float *z);
+#pragma omp declare variant (f3) match (construct={simd(simdlen(4),inbranch,linear(y:1))})
+int f12 (int x, int y);
+#pragma omp declare variant (f3) match (construct={simd(inbranch,simdlen(5-1),linear(q:4-3))})
+int f13 (int x, int q);
+#pragma omp declare variant (f3) match (construct={simd(inbranch,simdlen(4),linear(q:2))})		/* { dg-error "'f3' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
+int f14 (int x, int q);
-- 
cgit v1.1


From 853ce7c073eedfba1adfb63530a8bd2baa767137 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 12 Oct 2019 14:21:45 +0200
Subject: re PR middle-end/92063 (ICE in operation_could_trap_p, at
 tree-eh.c:2528 when compiling Python's Python/_warnings.c)

	PR middle-end/92063
	* tree-eh.c (operation_could_trap_helper_p) <case COND_EXPR>
	<case VEC_COND_EXPR>: Return false with *handled = false.
	(tree_could_trap_p): For {,VEC_}COND_EXPR return false instead of
	recursing on the first operand.
	* fold-const.c (simple_operand_p_2): Use generic_expr_could_trap_p
	instead of tree_could_trap_p.
	* tree-ssa-sccvn.c (vn_nary_may_trap): Formatting fixes.

	* gcc.c-torture/compile/pr92063.c: New test.

From-SVN: r276915
---
 gcc/ChangeLog                                 | 11 +++++++++++
 gcc/fold-const.c                              |  3 +--
 gcc/testsuite/ChangeLog                       |  3 +++
 gcc/testsuite/gcc.c-torture/compile/pr92063.c |  7 +++++++
 gcc/tree-eh.c                                 | 15 +++++++++++++--
 gcc/tree-ssa-sccvn.c                          | 11 ++++-------
 6 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr92063.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12613f7..800b8ce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/92063
+	* tree-eh.c (operation_could_trap_helper_p) <case COND_EXPR>
+	<case VEC_COND_EXPR>: Return false with *handled = false.
+	(tree_could_trap_p): For {,VEC_}COND_EXPR return false instead of
+	recursing on the first operand.
+	* fold-const.c (simple_operand_p_2): Use generic_expr_could_trap_p
+	instead of tree_could_trap_p.
+	* tree-ssa-sccvn.c (vn_nary_may_trap): Formatting fixes.
+
 2019-10-11  Jim Wilson  <jimw@sifive.com>
 
 	PR rtl-optimization/91860
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index a99dafe..58b967e 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -4447,8 +4447,7 @@ simple_operand_p_2 (tree exp)
 {
   enum tree_code code;
 
-  if (TREE_SIDE_EFFECTS (exp)
-      || tree_could_trap_p (exp))
+  if (TREE_SIDE_EFFECTS (exp) || generic_expr_could_trap_p (exp))
     return false;
 
   while (CONVERT_EXPR_P (exp))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 14b5da6..2f46d4d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/92063
+	* gcc.c-torture/compile/pr92063.c: New test.
+
 	* c-c++-common/gomp/declare-variant-2.c: Adjust for error recovery
 	improvements.  Add new tests.
 	* c-c++-common/gomp/declare-variant-4.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr92063.c b/gcc/testsuite/gcc.c-torture/compile/pr92063.c
new file mode 100644
index 0000000..bb704ab
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr92063.c
@@ -0,0 +1,7 @@
+/* PR middle-end/92063 */
+
+int
+foo (int a, int b, int *c, short *d)
+{
+  return (c[0] ? b : 0) == 'y' && ((a ? d[0] : c[0]) ? b : 0) == 'c';
+}
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 7a02873..54502e6 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -2499,6 +2499,14 @@ operation_could_trap_helper_p (enum tree_code op,
       /* Constructing an object cannot trap.  */
       return false;
 
+    case COND_EXPR:
+    case VEC_COND_EXPR:
+      /* Whether *COND_EXPR can trap depends on whether the
+	 first argument can trap, so signal it as not handled.
+	 Whether lhs is floating or not doesn't matter.  */
+      *handled = false;
+      return false;
+
     default:
       /* Any floating arithmetic may trap.  */
       if (fp_operation && flag_trapping_math)
@@ -2614,9 +2622,12 @@ tree_could_trap_p (tree expr)
   if (!expr)
     return false;
 
-  /* For COND_EXPR and VEC_COND_EXPR only the condition may trap.  */
+  /* In COND_EXPR and VEC_COND_EXPR only the condition may trap, but
+     they won't appear as operands in GIMPLE form, so this is just for the
+     GENERIC uses where it needs to recurse on the operands and so
+     *COND_EXPR itself doesn't trap.  */
   if (TREE_CODE (expr) == COND_EXPR || TREE_CODE (expr) == VEC_COND_EXPR)
-    expr = TREE_OPERAND (expr, 0);
+    return false;
 
   code = TREE_CODE (expr);
   t = TREE_TYPE (expr);
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 364d0d0..57331ab 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -5105,18 +5105,15 @@ vn_nary_may_trap (vn_nary_op_t nary)
 	  honor_nans = flag_trapping_math && !flag_finite_math_only;
 	  honor_snans = flag_signaling_nans != 0;
 	}
-      else if (INTEGRAL_TYPE_P (type)
-	       && TYPE_OVERFLOW_TRAPS (type))
+      else if (INTEGRAL_TYPE_P (type) && TYPE_OVERFLOW_TRAPS (type))
 	honor_trapv = true;
     }
   if (nary->length >= 2)
     rhs2 = nary->op[1];
   ret = operation_could_trap_helper_p (nary->opcode, fp_operation,
-				       honor_trapv,
-				       honor_nans, honor_snans, rhs2,
-				       &handled);
-  if (handled
-      && ret)
+				       honor_trapv, honor_nans, honor_snans,
+				       rhs2, &handled);
+  if (handled && ret)
     return true;
 
   for (i = 0; i < nary->length; ++i)
-- 
cgit v1.1


From 9aa357c75358a51f038e50f7c8d9207b58c157e0 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sat, 12 Oct 2019 14:47:34 +0000
Subject: re PR ada/91995 (gnat miscompilation and bootstrap failure on
 m68k-linux)

	PR ada/91995
	* sem_ch8.adb (Chain_Use_Clause): Remove second argument in calls
	to Defining_Entity.
	* sem_elab.adb (Find_Unit_Entity): Likewise.  Deal with N_Subunit
	here in lieu of in Defining_Entity.
	* sem_util.ads (Defining_Entity): Remove 2nd and 3th parameters.
	* sem_util.adb (Defining_Entity): Remove 2nd and 3th parameters,
	and adjust accordingly.  Deal with N_Compilation_Unit.

From-SVN: r276916
---
 gcc/ada/ChangeLog    | 11 +++++++++++
 gcc/ada/sem_ch8.adb  |  6 ++----
 gcc/ada/sem_elab.adb | 16 +++++++++++++---
 gcc/ada/sem_util.adb | 43 +++++++++----------------------------------
 gcc/ada/sem_util.ads | 21 +--------------------
 5 files changed, 36 insertions(+), 61 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index adbfa70..e66f111 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR ada/91995
+	* sem_ch8.adb (Chain_Use_Clause): Remove second argument in calls
+	to Defining_Entity.
+	* sem_elab.adb (Find_Unit_Entity): Likewise.  Deal with N_Subunit
+	here in lieu of in Defining_Entity.
+	* sem_util.ads (Defining_Entity): Remove 2nd and 3th parameters.
+	* sem_util.adb (Defining_Entity): Remove 2nd and 3th parameters,
+	and adjust accordingly.  Deal with N_Compilation_Unit.
+
 2019-10-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/decl.c (elaborate_reference_1): Specifically deal with
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index 5d03f835..38cbf1c 100644
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -4290,16 +4290,14 @@ package body Sem_Ch8 is
 
       --  Common case for compilation unit
 
-      elsif Defining_Entity (N               => Parent (N),
-                             Empty_On_Errors => True) = Current_Scope
-      then
+      elsif Defining_Entity (Parent (N)) = Current_Scope then
          null;
 
       else
          --  If declaration appears in some other scope, it must be in some
          --  parent unit when compiling a child.
 
-         Pack := Defining_Entity (Parent (N), Empty_On_Errors => True);
+         Pack := Defining_Entity (Parent (N));
 
          if not In_Open_Scopes (Pack) then
             null;
diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb
index 2dbf54d..0c71f59 100644
--- a/gcc/ada/sem_elab.adb
+++ b/gcc/ada/sem_elab.adb
@@ -9103,13 +9103,23 @@ package body Sem_Elab is
                                    N_Procedure_Instantiation)
         and then Nkind (Context) = N_Compilation_Unit
       then
-         return
-           Related_Instance (Defining_Entity (N, Concurrent_Subunit => True));
+         return Related_Instance (Defining_Entity (N));
+
+      --  The unit denotes a concurrent body acting as a subunit. Such bodies
+      --  are generally rewritten into null statements. The proper entity is
+      --  that of the "original node".
+
+      elsif Nkind (N) = N_Subunit
+        and then Nkind (Proper_Body (N)) = N_Null_Statement
+        and then Nkind_In (Original_Node (Proper_Body (N)), N_Protected_Body,
+                                                            N_Task_Body)
+      then
+         return Defining_Entity (Original_Node (Proper_Body (N)));
 
       --  Otherwise the proper entity is the defining entity
 
       else
-         return Defining_Entity (N, Concurrent_Subunit => True);
+         return Defining_Entity (N);
       end if;
    end Find_Unit_Entity;
 
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 9ca80aa..4de41d3e 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -5867,11 +5867,7 @@ package body Sem_Util is
    -- Defining_Entity --
    ---------------------
 
-   function Defining_Entity
-     (N                  : Node_Id;
-      Empty_On_Errors    : Boolean := False;
-      Concurrent_Subunit : Boolean := False) return Entity_Id
-   is
+   function Defining_Entity (N : Node_Id) return Entity_Id is
    begin
       case Nkind (N) is
          when N_Abstract_Subprogram_Declaration
@@ -5922,24 +5918,11 @@ package body Sem_Util is
          =>
             return Defining_Identifier (N);
 
-         when N_Subunit =>
-            declare
-               Bod      : constant Node_Id := Proper_Body (N);
-               Orig_Bod : constant Node_Id := Original_Node (Bod);
-
-            begin
-               --  Retrieve the entity of the original protected or task body
-               --  if requested by the caller.
+         when N_Compilation_Unit =>
+            return Defining_Entity (Unit (N));
 
-               if Concurrent_Subunit
-                 and then Nkind (Bod) = N_Null_Statement
-                 and then Nkind_In (Orig_Bod, N_Protected_Body, N_Task_Body)
-               then
-                  return Defining_Entity (Orig_Bod);
-               else
-                  return Defining_Entity (Bod);
-               end if;
-            end;
+         when N_Subunit =>
+            return Defining_Entity (Proper_Body (N));
 
          when N_Function_Instantiation
             | N_Function_Specification
@@ -5965,14 +5948,10 @@ package body Sem_Util is
                --  can continue semantic analysis.
 
                elsif Nam = Error then
-                  if Empty_On_Errors then
-                     return Empty;
-                  else
-                     Err := Make_Temporary (Sloc (N), 'T');
-                     Set_Defining_Unit_Name (N, Err);
+                  Err := Make_Temporary (Sloc (N), 'T');
+                  Set_Defining_Unit_Name (N, Err);
 
-                     return Err;
-                  end if;
+                  return Err;
 
                --  If not an entity, get defining identifier
 
@@ -5987,11 +5966,7 @@ package body Sem_Util is
             return Entity (Identifier (N));
 
          when others =>
-            if Empty_On_Errors then
-               return Empty;
-            else
-               raise Program_Error;
-            end if;
+            raise Program_Error;
       end case;
    end Defining_Entity;
 
diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads
index 7df8140..dc5e57b 100644
--- a/gcc/ada/sem_util.ads
+++ b/gcc/ada/sem_util.ads
@@ -554,10 +554,7 @@ package Sem_Util is
    --  in the case of a descendant of a generic formal type (returns Int'Last
    --  instead of 0).
 
-   function Defining_Entity
-     (N                  : Node_Id;
-      Empty_On_Errors    : Boolean := False;
-      Concurrent_Subunit : Boolean := False) return Entity_Id;
+   function Defining_Entity (N : Node_Id) return Entity_Id;
    --  Given a declaration N, returns the associated defining entity. If the
    --  declaration has a specification, the entity is obtained from the
    --  specification. If the declaration has a defining unit name, then the
@@ -568,22 +565,6 @@ package Sem_Util is
    --  local entities declared during loop expansion. These entities need
    --  debugging information, generated through Qualify_Entity_Names, and
    --  the loop declaration must be placed in the table Name_Qualify_Units.
-   --
-   --  Set flag Empty_On_Error to change the behavior of this routine as
-   --  follows:
-   --
-   --    * True  - A declaration that lacks a defining entity returns Empty.
-   --      A node that does not allow for a defining entity returns Empty.
-   --
-   --    * False - A declaration that lacks a defining entity is given a new
-   --      internally generated entity which is subsequently returned. A node
-   --      that does not allow for a defining entity raises Program_Error.
-   --
-   --  The former semantics is appropriate for the back end; the latter
-   --  semantics is appropriate for the front end.
-   --
-   --  Set flag Concurrent_Subunit to handle rewritings of concurrent bodies
-   --  which act as subunits. Such bodies are generally rewritten as null.
 
    function Denotes_Discriminant
      (N                : Node_Id;
-- 
cgit v1.1


From b6941da896f23c8a30c93469b237350615f52721 Mon Sep 17 00:00:00 2001
From: John David Anglin <danglin@gcc.gnu.org>
Date: Sat, 12 Oct 2019 18:31:42 +0000
Subject: pa.c (pa_option_override): Remove trailing comma from warning.

	* gcc/config/pa/pa.c (pa_option_override): Remove trailing comma
	from warning.

From-SVN: r276920
---
 gcc/ChangeLog      | 5 +++++
 gcc/config/pa/pa.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 800b8ce..bce36a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-12  John David Anglin  <danglin@gcc.gnu.org>
+
+	* gcc/config/pa/pa.c (pa_option_override): Remove trailing comma
+	from warning.
+
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/92063
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 4f48c41..a11362b 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -535,7 +535,7 @@ pa_option_override (void)
 
   if (! TARGET_GAS && write_symbols != NO_DEBUG)
     {
-      warning (0, "%<-g%> is only supported when using GAS on this processor,");
+      warning (0, "%<-g%> is only supported when using GAS on this processor");
       warning (0, "%<-g%> option disabled");
       write_symbols = NO_DEBUG;
     }
-- 
cgit v1.1


From 9189d7321c6e4e4f23ed42eae4ef0c2bb1749100 Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@gcc.gnu.org>
Date: Sat, 12 Oct 2019 19:05:38 +0000
Subject: The inline keyword is supported in all new C standards

The documentation used to indicate that the inline keyword was only
supported by c99 and c11, whereas in fact it is supported by c99 and all
newer standards.

gcc/ChangeLog

2019-10-12  Palmer Dabbelt  <palmer@sifive.com>

        * doc/extend.texi (Alternate Keywords): Change "-std=c11" to "a
        later standard."

From-SVN: r276921
---
 gcc/doc/extend.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 7e37c5c..9df4cc2 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -10754,7 +10754,7 @@ a general-purpose header file that should be usable by all programs,
 including ISO C programs.  The keywords @code{asm}, @code{typeof} and
 @code{inline} are not available in programs compiled with
 @option{-ansi} or @option{-std} (although @code{inline} can be used in a
-program compiled with @option{-std=c99} or @option{-std=c11}).  The
+program compiled with @option{-std=c99} or a later standard).  The
 ISO C99 keyword
 @code{restrict} is only available when @option{-std=gnu99} (which will
 eventually be the default) or @option{-std=c99} (or the equivalent
-- 
cgit v1.1


From f8d234a38d9a58ac78fca3c543a41f845d93e1ae Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@gcc.gnu.org>
Date: Sat, 12 Oct 2019 19:07:16 +0000
Subject: Fix the ChangeLog for my previous commit

Fixes: 66ce32bb2a8 ("Fix the ChangeLog for my previous commit")

From-SVN: r276922
---
 gcc/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bce36a3..6320850 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-12  Palmer Dabbelt  <palmer@sifive.com>
+
+	* doc/extend.texi (Alternate Keywords): Change "-std=c11" to "a
+	later standard."
+
 2019-10-12  John David Anglin  <danglin@gcc.gnu.org>
 
 	* gcc/config/pa/pa.c (pa_option_override): Remove trailing comma
-- 
cgit v1.1


From 8103659e35edffe864ad49ac4be3a40dae0785a0 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iains@gcc.gnu.org>
Date: Sat, 12 Oct 2019 19:20:43 +0000
Subject: [Darwin] Suppress emitting empty ctor/dtor sections.

Older versions of GCC emit empty .constructor/.destructor sections
whenever building for C++. In fact, these sections are only used for
kernel mode code - so don't emit them unless that's what we're
building.

gcc/ChangeLog:

2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (darwin_file_end): Only emit empty CTOR/DTOR
	sections when building kernel extension code.

From-SVN: r276923
---
 gcc/config/darwin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 539ef75..ddce9f8 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -2931,8 +2931,9 @@ darwin_file_end (void)
      }
 
   machopic_finish (asm_out_file);
-  if (lang_GNU_CXX ())
+  if (flag_apple_kext)
     {
+      /* These sections are only used for kernel code.  */
       switch_to_section (darwin_sections[constructor_section]);
       switch_to_section (darwin_sections[destructor_section]);
       ASM_OUTPUT_ALIGN (asm_out_file, 1);
-- 
cgit v1.1


From a0f08eceae9af418c25c7cca7cb5fa67f0ff5037 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iains@gcc.gnu.org>
Date: Sat, 12 Oct 2019 19:24:48 +0000
Subject: [Darwin, machopic 5/n] Make machopic_finish() static.

It's only called from darwin.c.

gcc/ChangeLog:

2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin-protos.h (machopic_finish): Delete.
	* config/darwin.c (machopic_finish): Make static.

From-SVN: r276924
---
 gcc/config/darwin-protos.h | 2 --
 gcc/config/darwin.c        | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/config/darwin-protos.h b/gcc/config/darwin-protos.h
index e5614b6..afeca81 100644
--- a/gcc/config/darwin-protos.h
+++ b/gcc/config/darwin-protos.h
@@ -53,8 +53,6 @@ extern void darwin_set_default_type_attributes (tree);
 
 #endif /* TREE_CODE */
 
-extern void machopic_finish (FILE *);
-
 extern int machopic_reloc_rw_mask (void);
 extern section *machopic_select_section (tree, int, unsigned HOST_WIDE_INT);
 
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index ddce9f8..8efb14e 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1188,7 +1188,7 @@ machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
   return 1;
 }
 
-void
+static void
 machopic_finish (FILE *asm_out_file)
 {
   if (machopic_indirections)
-- 
cgit v1.1


From c89d7d19a2aa333684e5bf744ae3b813c6054d63 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sat, 12 Oct 2019 19:41:50 +0000
Subject: [Darwin, machopic 6/n] Fix for 67183

When we're using the LLVM-based assembler (the default on modern Darwin)
the ordering of stubs and non-lazy symbol pointers is important.

Interleaving the output (current GCC behaviour) leads to crashes which
prevents us from building code with symbol stubs.

To resolve this, we order the output of stubs and symbol indirections:

 1. Any indirections in the data section
 2. Symbol stubs.
 3. Non-lazy symbol pointers.

At present, we still emit LTO sections after these.

gcc/ChangeLog:

2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>

	PR target/67183
	* config/darwin.c (machopic_indirection): New field to flag
	non-lazy-symbol-pointers in the data section.
	(machopic_indirection_name): Compute if an indirection should
	appear in the data section.
	(machopic_output_data_section_indirection): New callback split
	from machopic_output_indirection.
	(machopic_output_stub_indirection): Likewise.
	(machopic_output_indirection): Retain the code for non-lazy
	symbol pointers in their regular section.
	(machopic_finish): Use the new callbacks to order the indirection
	output.

From-SVN: r276926
---
 gcc/ChangeLog       |  25 ++++++
 gcc/config/darwin.c | 234 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 166 insertions(+), 93 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6320850..161b580 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,28 @@
+2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/67183
+	* config/darwin.c (machopic_indirection): New field to flag
+	non-lazy-symbol-pointers in the data section.
+	(machopic_indirection_name): Compute if an indirection should
+	appear in the data section.
+	(machopic_output_data_section_indirection): New callback split
+	from machopic_output_indirection.
+	(machopic_output_stub_indirection): Likewise.
+	(machopic_output_indirection): Retain the code for non-lazy
+	symbol pointers in their regular section.
+	(machopic_finish): Use the new callbacks to order the indirection
+	output.
+
+2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin-protos.h (machopic_finish): Delete.
+	* config/darwin.c (machopic_finish): Make static.
+
+2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (darwin_file_end): Only emit empty CTOR/DTOR
+	sections when building kernel extension code.
+
 2019-10-12  Palmer Dabbelt  <palmer@sifive.com>
 
 	* doc/extend.texi (Alternate Keywords): Change "-std=c11" to "a
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 8efb14e..f6543fc 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -454,6 +454,13 @@ typedef struct GTY ((for_user)) machopic_indirection
   bool stub_p;
   /* True iff this stub or pointer has been referenced.  */
   bool used;
+  /* True iff a non-lazy symbol pointer should be emitted into the .data
+     section, rather than the non-lazy symbol pointers section.  The cases
+     for which this occurred seem to have been unintentional, and later
+     toolchains emit all of the indirections to the 'usual' section.  We
+     are keeping this in case it is necessary to preserve compatibility with
+     older toolchains.  */
+  bool nlsp_in_data_section;
 } machopic_indirection;
 
 struct indirection_hasher : ggc_ptr_hash<machopic_indirection>
@@ -590,6 +597,18 @@ machopic_indirection_name (rtx sym_ref, bool stub_p)
       p->ptr_name = xstrdup (buffer);
       p->stub_p = stub_p;
       p->used = false;
+      /* Here we are undoing a number of causes that placed some indirections
+	 (apparently erroneously) into the .data section.  Specifically, some
+	 symbols that are ABI mandated indirections and some hidden symbols
+	 were being placed there - which cause difficulties with later
+	 versions of ld64.
+      */
+      p->nlsp_in_data_section =
+	   ! MACHO_SYMBOL_MUST_INDIRECT_P (sym_ref)
+	&& ! MACHO_SYMBOL_HIDDEN_VIS_P (sym_ref)
+	&& (machopic_symbol_defined_p (sym_ref)
+	    || SYMBOL_REF_LOCAL_P (sym_ref))
+	&& ! indirect_data (sym_ref);
       *slot = p;
     }
 
@@ -1069,121 +1088,140 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg)
   return pic_ref;
 }
 
-/* Output the stub or non-lazy pointer in *SLOT, if it has been used.
-   DATA is the FILE* for assembly output.  Called from
-   htab_traverse.  */
+/* Callbacks to output the stub or non-lazy pointers.
+   Each works on the item in *SLOT,if it has been used.
+   DATA is the FILE* for assembly output.
+   Called from htab_traverses, invoked from machopic_finish().  */
 
 int
-machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
+machopic_output_data_section_indirection (machopic_indirection **slot,
+					  FILE *asm_out_file)
 {
   machopic_indirection *p = *slot;
-  rtx symbol;
-  const char *sym_name;
-  const char *ptr_name;
 
-  if (!p->used)
+  if (!p->used || !p->nlsp_in_data_section)
     return 1;
 
-  symbol = p->symbol;
-  sym_name = XSTR (symbol, 0);
-  ptr_name = p->ptr_name;
+  rtx symbol = p->symbol;
+  /* The original symbol name.  */
+  const char *sym_name = XSTR (symbol, 0);
+  /* The name of the indirection symbol.  */
+  const char *ptr_name = p->ptr_name;
 
-  if (p->stub_p)
-    {
-      char *sym;
-      char *stub;
-      tree id;
+  switch_to_section (data_section);
+  assemble_align (GET_MODE_ALIGNMENT (Pmode));
+  assemble_label (asm_out_file, ptr_name);
+  assemble_integer (gen_rtx_SYMBOL_REF (Pmode, sym_name),
+		    GET_MODE_SIZE (Pmode),
+		    GET_MODE_ALIGNMENT (Pmode), 1);
 
-      id = maybe_get_identifier (sym_name);
-      if (id)
-	{
-	  tree id_orig = id;
+  return 1;
+}
 
-	  while (IDENTIFIER_TRANSPARENT_ALIAS (id))
-	    id = TREE_CHAIN (id);
-	  if (id != id_orig)
-	    sym_name = IDENTIFIER_POINTER (id);
-	}
+int
+machopic_output_stub_indirection (machopic_indirection **slot,
+				  FILE *asm_out_file)
+{
+  machopic_indirection *p = *slot;
 
-      sym = XALLOCAVEC (char, strlen (sym_name) + 2);
-      if (sym_name[0] == '*' || sym_name[0] == '&')
-	strcpy (sym, sym_name + 1);
-      else if (sym_name[0] == '-' || sym_name[0] == '+')
-	strcpy (sym, sym_name);
-      else
-	sprintf (sym, "%s%s", user_label_prefix, sym_name);
+  if (!p->used || !p->stub_p)
+    return 1;
 
-      stub = XALLOCAVEC (char, strlen (ptr_name) + 2);
-      if (ptr_name[0] == '*' || ptr_name[0] == '&')
-	strcpy (stub, ptr_name + 1);
-      else
-	sprintf (stub, "%s%s", user_label_prefix, ptr_name);
+  rtx symbol = p->symbol;
+  /* The original symbol name.  */
+  const char *sym_name = XSTR (symbol, 0);
+  /* The name of the stub symbol.  */
+  const char *ptr_name = p->ptr_name;
 
-      machopic_output_stub (asm_out_file, sym, stub);
-    }
-  else if (! indirect_data (symbol)
-	   && ! MACHO_SYMBOL_MUST_INDIRECT_P (symbol)
-	   && ! MACHO_SYMBOL_HIDDEN_VIS_P (symbol)
-	   && (machopic_symbol_defined_p (symbol)
-	       || SYMBOL_REF_LOCAL_P (symbol)))
+  tree id = maybe_get_identifier (sym_name);
+  if (id)
     {
-      switch_to_section (data_section);
-      assemble_align (GET_MODE_ALIGNMENT (Pmode));
-      assemble_label (asm_out_file, ptr_name);
-      assemble_integer (gen_rtx_SYMBOL_REF (Pmode, sym_name),
-			GET_MODE_SIZE (Pmode),
-			GET_MODE_ALIGNMENT (Pmode), 1);
+      tree id_orig = id;
+
+      while (IDENTIFIER_TRANSPARENT_ALIAS (id))
+	id = TREE_CHAIN (id);
+      if (id != id_orig)
+	sym_name = IDENTIFIER_POINTER (id);
     }
+
+  char *sym = XALLOCAVEC (char, strlen (sym_name) + 2);
+  if (sym_name[0] == '*' || sym_name[0] == '&')
+    strcpy (sym, sym_name + 1);
+  else if (sym_name[0] == '-' || sym_name[0] == '+')
+    strcpy (sym, sym_name);
   else
-    {
-      rtx init = const0_rtx;
+    sprintf (sym, "%s%s", user_label_prefix, sym_name);
+
+  char *stub = XALLOCAVEC (char, strlen (ptr_name) + 2);
+  if (ptr_name[0] == '*' || ptr_name[0] == '&')
+    strcpy (stub, ptr_name + 1);
+  else
+    sprintf (stub, "%s%s", user_label_prefix, ptr_name);
+
+  machopic_output_stub (asm_out_file, sym, stub);
+
+  return 1;
+}
+
+int
+machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
+{
+  machopic_indirection *p = *slot;
+
+  if (!p->used || p->stub_p || p->nlsp_in_data_section)
+    return 1;
+
+  rtx symbol = p->symbol;
+  /* The original symbol name.  */
+  const char *sym_name = XSTR (symbol, 0);
+  /* The nonlazy-stub symbol name.  */
+  const char *ptr_name = p->ptr_name;
 
-      switch_to_section (darwin_sections[machopic_nl_symbol_ptr_section]);
+  switch_to_section (darwin_sections[machopic_nl_symbol_ptr_section]);
 
-      /* Mach-O symbols are passed around in code through indirect
-	 references and the original symbol_ref hasn't passed through
-	 the generic handling and reference-catching in
-	 output_operand, so we need to manually mark weak references
-	 as such.  */
-      if (SYMBOL_REF_WEAK (symbol))
+  /* Mach-O symbols are passed around in code through indirect references and
+     the original symbol_ref hasn't passed through the generic handling and
+     reference-catching in output_operand, so we need to manually mark weak
+     references as such.  */
+
+  if (SYMBOL_REF_WEAK (symbol))
+    {
+      tree decl = SYMBOL_REF_DECL (symbol);
+      gcc_checking_assert (DECL_P (decl));
+
+      if (decl != NULL_TREE
+	  && DECL_EXTERNAL (decl) && TREE_PUBLIC (decl)
+	  /* Handle only actual external-only definitions, not
+	     e.g. extern inline code or variables for which
+	     storage has been allocated.  */
+	  && !TREE_STATIC (decl))
 	{
-	  tree decl = SYMBOL_REF_DECL (symbol);
-	  gcc_assert (DECL_P (decl));
-
-	  if (decl != NULL_TREE
-	      && DECL_EXTERNAL (decl) && TREE_PUBLIC (decl)
-	      /* Handle only actual external-only definitions, not
-		 e.g. extern inline code or variables for which
-		 storage has been allocated.  */
-	      && !TREE_STATIC (decl))
-	    {
-	      fputs ("\t.weak_reference ", asm_out_file);
-	      assemble_name (asm_out_file, sym_name);
-	      fputc ('\n', asm_out_file);
-	    }
+	  fputs ("\t.weak_reference ", asm_out_file);
+	  assemble_name (asm_out_file, sym_name);
+	  fputc ('\n', asm_out_file);
 	}
+    }
 
-      assemble_name (asm_out_file, ptr_name);
-      fprintf (asm_out_file, ":\n");
+  assemble_name (asm_out_file, ptr_name);
+  fprintf (asm_out_file, ":\n");
 
-      fprintf (asm_out_file, "\t.indirect_symbol ");
-      assemble_name (asm_out_file, sym_name);
-      fprintf (asm_out_file, "\n");
+  fprintf (asm_out_file, "\t.indirect_symbol ");
+  assemble_name (asm_out_file, sym_name);
+  fprintf (asm_out_file, "\n");
 
-      /* Variables that are marked with MACHO_SYMBOL_FLAG_STATIC need to
-	 have their symbol name instead of 0 in the second entry of
-	 the non-lazy symbol pointer data structure when they are
-	 defined.  This allows the runtime to rebind newer instances
-	 of the translation unit with the original instance of the
-	 symbol.  */
+  /* Variables that are marked with MACHO_SYMBOL_FLAG_STATIC need to
+     have their symbol name instead of 0 in the second entry of
+     the non-lazy symbol pointer data structure when they are
+     defined.  This allows the runtime to rebind newer instances
+     of the translation unit with the original instance of the
+     symbol.  */
 
-      if (MACHO_SYMBOL_STATIC_P (symbol)
-	  && machopic_symbol_defined_p (symbol))
-	init = gen_rtx_SYMBOL_REF (Pmode, sym_name);
+  rtx init = const0_rtx;
+  if (MACHO_SYMBOL_STATIC_P (symbol) && machopic_symbol_defined_p (symbol))
+    init = gen_rtx_SYMBOL_REF (Pmode, sym_name);
 
-      assemble_integer (init, GET_MODE_SIZE (Pmode),
-			GET_MODE_ALIGNMENT (Pmode), 1);
-    }
+  assemble_integer (init, GET_MODE_SIZE (Pmode),
+		    GET_MODE_ALIGNMENT (Pmode), 1);
 
   return 1;
 }
@@ -1191,9 +1229,19 @@ machopic_output_indirection (machopic_indirection **slot, FILE *asm_out_file)
 static void
 machopic_finish (FILE *asm_out_file)
 {
-  if (machopic_indirections)
-    machopic_indirections
-      ->traverse_noresize<FILE *, machopic_output_indirection> (asm_out_file);
+  if (!machopic_indirections)
+    return;
+
+  /* First output an symbol indirections that have been placed into .data
+     (we don't expect these now).  */
+  machopic_indirections->traverse_noresize
+    <FILE *, machopic_output_data_section_indirection> (asm_out_file);
+
+  machopic_indirections->traverse_noresize
+    <FILE *, machopic_output_stub_indirection> (asm_out_file);
+
+  machopic_indirections->traverse_noresize
+    <FILE *, machopic_output_indirection> (asm_out_file);
 }
 
 int
-- 
cgit v1.1


From 70238876c799943407ff6717b7fd9d98b8cb9080 Mon Sep 17 00:00:00 2001
From: John David Anglin <danglin@gcc.gnu.org>
Date: Sat, 12 Oct 2019 20:37:37 +0000
Subject: pa.c (pa_output_call): Load descriptor address to register %r22.

	* config/pa/pa.c (pa_output_call): Load descriptor address to register
	%r22.  Load function address before global pointer.
	(pa_attr_length_indirect_call): Adjust length of inline versions of
	$$dyncall.
	(pa_output_indirect_call): Remove fast inline version of $$dyncall
	before normal cases.  Update inline $$dyncall sequences to preserve
	function descriptor address in register %r22.
	(TRAMPOLINE_CODE_SIZE): Adjust.
	(pa_asm_trampoline_template): Revise 32-bit trampoline.  Don't assume
	register %r22 contains trampoline address.
	(pa_trampoline_init): Adjust offsets.
	(pa_trampoline_adjust_address): Likewise.
	* config/pa/pa.h (TRAMPOLINE_SIZE): Adjust 32-bit size.

From-SVN: r276928
---
 gcc/ChangeLog      |  16 ++++++
 gcc/config/pa/pa.c | 163 ++++++++++++++++++++++++++++-------------------------
 gcc/config/pa/pa.h |   2 +-
 3 files changed, 103 insertions(+), 78 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 161b580..3cd90c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-12  John David Anglin  <danglin@gcc.gnu.org>
+
+	* config/pa/pa.c (pa_output_call): Load descriptor address to register
+	%r22.  Load function address before global pointer.
+	(pa_attr_length_indirect_call): Adjust length of inline versions of
+	$$dyncall.
+	(pa_output_indirect_call): Remove fast inline version of $$dyncall
+	before normal cases.  Update inline $$dyncall sequences to preserve
+	function descriptor address in register %r22.
+	(TRAMPOLINE_CODE_SIZE): Adjust.
+	(pa_asm_trampoline_template): Revise 32-bit trampoline.  Don't assume
+	register %r22 contains trampoline address.
+	(pa_trampoline_init): Adjust offsets.
+	(pa_trampoline_adjust_address): Likewise.
+	* config/pa/pa.h (TRAMPOLINE_SIZE): Adjust 32-bit size.
+
 2019-10-12  Iain Sandoe  <iain@sandoe.co.uk>
 
 	PR target/67183
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index a11362b..d8aff71 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -8027,20 +8027,22 @@ pa_output_call (rtx_insn *insn, rtx call_dest, int sibcall)
 		    {
 		      output_asm_insn ("addil LT'%0,%%r19", xoperands);
 		      output_asm_insn ("ldw RT'%0(%%r1),%%r1", xoperands);
-		      output_asm_insn ("ldw 0(%%r1),%%r1", xoperands);
+		      output_asm_insn ("ldw 0(%%r1),%%r22", xoperands);
 		    }
 		  else
 		    {
 		      output_asm_insn ("addil LR'%0-$global$,%%r27",
 				       xoperands);
-		      output_asm_insn ("ldw RR'%0-$global$(%%r1),%%r1",
+		      output_asm_insn ("ldw RR'%0-$global$(%%r1),%%r22",
 				       xoperands);
 		    }
 
-		  output_asm_insn ("bb,>=,n %%r1,30,.+16", xoperands);
-		  output_asm_insn ("depi 0,31,2,%%r1", xoperands);
-		  output_asm_insn ("ldw 4(%%sr0,%%r1),%%r19", xoperands);
-		  output_asm_insn ("ldw 0(%%sr0,%%r1),%%r1", xoperands);
+		  output_asm_insn ("bb,>=,n %%r22,30,.+16", xoperands);
+		  output_asm_insn ("depi 0,31,2,%%r22", xoperands);
+		  /* Should this be an ordered load to ensure the target
+	             address is loaded before the global pointer?  */
+		  output_asm_insn ("ldw 0(%%r22),%%r1", xoperands);
+		  output_asm_insn ("ldw 4(%%r22),%%r19", xoperands);
 
 		  if (!sibcall && !TARGET_PA_20)
 		    {
@@ -8133,10 +8135,6 @@ pa_attr_length_indirect_call (rtx_insn *insn)
   if (TARGET_PORTABLE_RUNTIME)
     return 16;
 
-  /* Inline version of $$dyncall.  */
-  if ((TARGET_NO_SPACE_REGS || TARGET_PA_20) && !optimize_size)
-    return 20;
-
   if (!TARGET_LONG_CALLS
       && ((TARGET_PA_20 && !TARGET_SOM && distance < 7600000)
 	  || distance < MAX_PCREL17F_OFFSET))
@@ -8146,12 +8144,15 @@ pa_attr_length_indirect_call (rtx_insn *insn)
   if (!flag_pic)
     return 12;
 
-  /* Inline version of $$dyncall.  */
-  if (TARGET_NO_SPACE_REGS || TARGET_PA_20)
-    return 20;
-
+  /* Inline versions of $$dyncall.  */
   if (!optimize_size)
-    return 36;
+    {
+      if (TARGET_NO_SPACE_REGS)
+	return 28;
+
+      if (TARGET_PA_20)
+	return 32;
+    }
 
   /* Long PIC pc-relative call.  */
   return 20;
@@ -8189,22 +8190,6 @@ pa_output_indirect_call (rtx_insn *insn, rtx call_dest)
       return "blr %%r0,%%r2\n\tbv,n %%r0(%%r31)";
     }
 
-  /* Maybe emit a fast inline version of $$dyncall.  */
-  if ((TARGET_NO_SPACE_REGS || TARGET_PA_20) && !optimize_size)
-    {
-      output_asm_insn ("bb,>=,n %%r22,30,.+12\n\t"
-		       "ldw 2(%%r22),%%r19\n\t"
-		       "ldw -2(%%r22),%%r22", xoperands);
-      pa_output_arg_descriptor (insn);
-      if (TARGET_NO_SPACE_REGS)
-	{
-	  if (TARGET_PA_20)
-	    return "bve,l,n (%%r22),%%r2\n\tnop";
-	  return "ble 0(%%sr4,%%r22)\n\tcopy %%r31,%%r2";
-	}
-      return "bve,l (%%r22),%%r2\n\tstw %%r2,-24(%%sp)";
-    }
-
   /* Now the normal case -- we can reach $$dyncall directly or
      we're sure that we can get there via a long-branch stub. 
 
@@ -8233,35 +8218,40 @@ pa_output_indirect_call (rtx_insn *insn, rtx call_dest)
       return "ble R'$$dyncall(%%sr4,%%r2)\n\tcopy %%r31,%%r2";
     }
 
-  /* Maybe emit a fast inline version of $$dyncall.  The long PIC
-     pc-relative call sequence is five instructions.  The inline PA 2.0
-     version of $$dyncall is also five instructions.  The PA 1.X versions
-     are longer but still an overall win.  */
-  if (TARGET_NO_SPACE_REGS || TARGET_PA_20 || !optimize_size)
+  /* The long PIC pc-relative call sequence is five instructions.  So,
+     let's use an inline version of $$dyncall when the calling sequence
+     has a roughly similar number of instructions and we are not optimizing
+     for size.  We need two instructions to load the return pointer plus
+     the $$dyncall implementation.  */
+  if (!optimize_size)
     {
-      output_asm_insn ("bb,>=,n %%r22,30,.+12\n\t"
-		       "ldw 2(%%r22),%%r19\n\t"
-		       "ldw -2(%%r22),%%r22", xoperands);
       if (TARGET_NO_SPACE_REGS)
 	{
 	  pa_output_arg_descriptor (insn);
-	  if (TARGET_PA_20)
-	    return "bve,l,n (%%r22),%%r2\n\tnop";
-	  return "ble 0(%%sr4,%%r22)\n\tcopy %%r31,%%r2";
+	  output_asm_insn ("bl .+8,%rp\b\t"
+			   "ldo 20(%r2),%r2\n\t"
+			   "extru,<> %r22,30,1,%r0\n\t"
+			   "bv,n %%r0(%r22)\n\t"
+			   "ldw -2(%%r22),%%r21\n\t"
+			   "bv %%r0(%r21)\n\t"
+			   "ldw 2(%%r22),%%r19", xoperands);
+	  return "";
 	}
       if (TARGET_PA_20)
 	{
 	  pa_output_arg_descriptor (insn);
-	  return "bve,l (%%r22),%%r2\n\tstw %%r2,-24(%%sp)";
+	  output_asm_insn ("bl .+8,%%r2\b\t"
+			   "ldo 24(%%r2),%%r2\n\t"
+			   "stw %%r2,-24(%%sp)\n\t"
+			   "extru,<> %r22,30,1,%r0\n\t"
+			   "bve,n (%%r22)\n\t"
+			   "ldw -2(%%r22),%%r21\n\t"
+			   "bve (%%r21)\n\t"
+			   "ldw 2(%%r22),%%r19", xoperands);
+	  return "";
 	}
-      output_asm_insn ("bl .+8,%%r2\n\t"
-		       "ldo 16(%%r2),%%r2\n\t"
-		       "ldsid (%%r22),%%r1\n\t"
-		       "mtsp %%r1,%%sr0", xoperands);
-      pa_output_arg_descriptor (insn);
-      return "be 0(%%sr0,%%r22)\n\tstw %%r2,-24(%%sp)";
     }
- 
+
   /* We need a long PIC call to $$dyncall.  */
   xoperands[0] = gen_rtx_SYMBOL_REF (Pmode, "$$dyncall");
   xoperands[1] = gen_rtx_REG (Pmode, 2);
@@ -10025,7 +10015,7 @@ pa_modes_tieable_p (machine_mode mode1, machine_mode mode2)
 
 /* Length in units of the trampoline instruction code.  */
 
-#define TRAMPOLINE_CODE_SIZE (TARGET_64BIT ? 24 : (TARGET_PA_20 ? 32 : 40))
+#define TRAMPOLINE_CODE_SIZE (TARGET_64BIT ? 24 : (TARGET_PA_20 ? 36 : 48))
 
 
 /* Output assembler code for a block containing the constant parts
@@ -10046,27 +10036,46 @@ pa_asm_trampoline_template (FILE *f)
 {
   if (!TARGET_64BIT)
     {
-      fputs ("\tldw	36(%r22),%r21\n", f);
-      fputs ("\tbb,>=,n	%r21,30,.+16\n", f);
-      if (ASSEMBLER_DIALECT == 0)
-	fputs ("\tdepi	0,31,2,%r21\n", f);
-      else
-	fputs ("\tdepwi	0,31,2,%r21\n", f);
-      fputs ("\tldw	4(%r21),%r19\n", f);
-      fputs ("\tldw	0(%r21),%r21\n", f);
       if (TARGET_PA_20)
 	{
-	  fputs ("\tbve	(%r21)\n", f);
-	  fputs ("\tldw	40(%r22),%r29\n", f);
+	  fputs ("\tmfia	%r20\n", f);
+	  fputs ("\tldw		48(%r20),%r22\n", f);
+	  fputs ("\tcopy	%r22,%r21\n", f);
+	  fputs ("\tbb,>=,n	%r22,30,.+16\n", f);
+	  fputs ("\tdepwi	0,31,2,%r22\n", f);
+	  fputs ("\tldw		0(%r22),%r21\n", f);
+	  fputs ("\tldw		4(%r22),%r19\n", f);
+	  fputs ("\tbve		(%r21)\n", f);
+	  fputs ("\tldw		52(%r1),%r29\n", f);
+	  fputs ("\t.word	0\n", f);
 	  fputs ("\t.word	0\n", f);
 	  fputs ("\t.word	0\n", f);
 	}
       else
 	{
+	  if (ASSEMBLER_DIALECT == 0)
+	    {
+	      fputs ("\tbl	.+8,%r20\n", f);
+	      fputs ("\tdepi	0,31,2,%r20\n", f);
+	    }
+	  else
+	    {
+	      fputs ("\tb,l	.+8,%r20\n", f);
+	      fputs ("\tdepwi	0,31,2,%r20\n", f);
+	    }
+	  fputs ("\tldw		40(%r20),%r22\n", f);
+	  fputs ("\tcopy	%r22,%r21\n", f);
+	  fputs ("\tbb,>=,n	%r22,30,.+16\n", f);
+	  if (ASSEMBLER_DIALECT == 0)
+	    fputs ("\tdepi	0,31,2,%r22\n", f);
+	  else
+	    fputs ("\tdepwi	0,31,2,%r22\n", f);
+	  fputs ("\tldw		0(%r22),%r21\n", f);
+	  fputs ("\tldw		4(%r22),%r19\n", f);
 	  fputs ("\tldsid	(%r21),%r1\n", f);
 	  fputs ("\tmtsp	%r1,%sr0\n", f);
-	  fputs ("\tbe	0(%sr0,%r21)\n", f);
-	  fputs ("\tldw	40(%r22),%r29\n", f);
+	  fputs ("\tbe		0(%sr0,%r21)\n", f);
+	  fputs ("\tldw		44(%r20),%r29\n", f);
 	}
       fputs ("\t.word	0\n", f);
       fputs ("\t.word	0\n", f);
@@ -10080,11 +10089,11 @@ pa_asm_trampoline_template (FILE *f)
       fputs ("\t.dword 0\n", f);
       fputs ("\t.dword 0\n", f);
       fputs ("\tmfia	%r31\n", f);
-      fputs ("\tldd	24(%r31),%r1\n", f);
-      fputs ("\tldd	24(%r1),%r27\n", f);
-      fputs ("\tldd	16(%r1),%r1\n", f);
-      fputs ("\tbve	(%r1)\n", f);
+      fputs ("\tldd	24(%r31),%r27\n", f);
       fputs ("\tldd	32(%r31),%r31\n", f);
+      fputs ("\tldd	16(%r27),%r1\n", f);
+      fputs ("\tbve	(%r1)\n", f);
+      fputs ("\tldd	24(%r27),%r27\n", f);
       fputs ("\t.dword 0  ; fptr\n", f);
       fputs ("\t.dword 0  ; static link\n", f);
     }
@@ -10094,10 +10103,10 @@ pa_asm_trampoline_template (FILE *f)
    FNADDR is an RTX for the address of the function's pure code.
    CXT is an RTX for the static chain value for the function.
 
-   Move the function address to the trampoline template at offset 36.
-   Move the static chain value to trampoline template at offset 40.
-   Move the trampoline address to trampoline template at offset 44.
-   Move r19 to trampoline template at offset 48.  The latter two
+   Move the function address to the trampoline template at offset 48.
+   Move the static chain value to trampoline template at offset 52.
+   Move the trampoline address to trampoline template at offset 56.
+   Move r19 to trampoline template at offset 60.  The latter two
    words create a plabel for the indirect call to the trampoline.
 
    A similar sequence is used for the 64-bit port but the plabel is
@@ -10123,15 +10132,15 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value)
 
   if (!TARGET_64BIT)
     {
-      tmp = adjust_address (m_tramp, Pmode, 36);
+      tmp = adjust_address (m_tramp, Pmode, 48);
       emit_move_insn (tmp, fnaddr);
-      tmp = adjust_address (m_tramp, Pmode, 40);
+      tmp = adjust_address (m_tramp, Pmode, 52);
       emit_move_insn (tmp, chain_value);
 
       /* Create a fat pointer for the trampoline.  */
-      tmp = adjust_address (m_tramp, Pmode, 44);
+      tmp = adjust_address (m_tramp, Pmode, 56);
       emit_move_insn (tmp, r_tramp);
-      tmp = adjust_address (m_tramp, Pmode, 48);
+      tmp = adjust_address (m_tramp, Pmode, 60);
       emit_move_insn (tmp, gen_rtx_REG (Pmode, 19));
 
       /* fdc and fic only use registers for the address to flush,
@@ -10190,13 +10199,13 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value)
 
 /* Perform any machine-specific adjustment in the address of the trampoline.
    ADDR contains the address that was passed to pa_trampoline_init.
-   Adjust the trampoline address to point to the plabel at offset 44.  */
+   Adjust the trampoline address to point to the plabel at offset 56.  */
 
 static rtx
 pa_trampoline_adjust_address (rtx addr)
 {
   if (!TARGET_64BIT)
-    addr = memory_address (Pmode, plus_constant (Pmode, addr, 46));
+    addr = memory_address (Pmode, plus_constant (Pmode, addr, 58));
   return addr;
 }
 
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 1a43e5c..4d6c425 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -688,7 +688,7 @@ extern int may_call_alloca;
 
 /* Length in units of the trampoline for entering a nested function.  */
 
-#define TRAMPOLINE_SIZE (TARGET_64BIT ? 72 : 52)
+#define TRAMPOLINE_SIZE (TARGET_64BIT ? 72 : 64)
 
 /* Alignment required by the trampoline.  */
 
-- 
cgit v1.1


From cb6055a89f71bbd2d0858bb24ce2af473804e3a8 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Sun, 13 Oct 2019 00:16:44 +0000
Subject: Daily bump.

From-SVN: r276933
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 662cb44..b22adfb 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191012
+20191013
-- 
cgit v1.1


From af0d0f50722e17f9c7c23149866143e1c54d3ec3 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Sun, 13 Oct 2019 09:34:31 +0200
Subject: lto-streamer-out.c (collect_block_tree_leafs): Renumber statements so
 non-virutal are before virutals.

	* lto-streamer-out.c (collect_block_tree_leafs): Renumber statements
	so non-virutal are before virutals.
	(output_function): Avoid body modifications.

From-SVN: r276934
---
 gcc/ChangeLog          |  6 ++++
 gcc/lto-streamer-out.c | 85 +++++++++++++++++++++++++-------------------------
 2 files changed, 49 insertions(+), 42 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3cd90c7..4df0e0d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
+
+	* lto-streamer-out.c (collect_block_tree_leafs): Renumber statements
+	so non-virutal are before virutals.
+	(output_function): Avoid body modifications.
+
 2019-10-12  John David Anglin  <danglin@gcc.gnu.org>
 
 	* config/pa/pa.c (pa_output_call): Load descriptor address to register
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index c494c73..285c010 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -2066,14 +2066,54 @@ collect_block_tree_leafs (tree root, vec<tree> &leafs)
 void
 lto_prepare_function_for_streaming (struct cgraph_node *node)
 {
-  if (number_of_loops (DECL_STRUCT_FUNCTION (node->decl)))
+  struct function *fn = DECL_STRUCT_FUNCTION (node->decl);
+  basic_block bb;
+
+  if (number_of_loops (fn))
     {
-      push_cfun (DECL_STRUCT_FUNCTION (node->decl));
+      push_cfun (fn);
       loop_optimizer_init (AVOID_CFG_MODIFICATIONS);
       loop_optimizer_finalize ();
       pop_cfun ();
     }
-  renumber_gimple_stmt_uids (DECL_STRUCT_FUNCTION (node->decl));
+  /* We will renumber the statements.  The code that does this uses
+     the same ordering that we use for serializing them so we can use
+     the same code on the other end and not have to write out the
+     statement numbers.  We do not assign UIDs to PHIs here because
+     virtual PHIs get re-computed on-the-fly which would make numbers
+     inconsistent.  */
+  set_gimple_stmt_max_uid (fn, 0);
+  FOR_ALL_BB_FN (bb, fn)
+    {
+      for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
+	   gsi_next (&gsi))
+	{
+	  gphi *stmt = gsi.phi ();
+
+	  /* Virtual PHIs are not going to be streamed.  */
+	  if (!virtual_operand_p (gimple_phi_result (stmt)))
+	    gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
+	}
+      for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi);
+	   gsi_next (&gsi))
+	{
+	  gimple *stmt = gsi_stmt (gsi);
+	  gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
+	}
+    }
+  /* To avoid keeping duplicate gimple IDs in the statements, renumber
+     virtual phis now.  */
+  FOR_ALL_BB_FN (bb, fn)
+    {
+      for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
+	   gsi_next (&gsi))
+	{
+	  gphi *stmt = gsi.phi ();
+	  if (virtual_operand_p (gimple_phi_result (stmt)))
+	    gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
+	}
+    }
+
 }
 
 /* Output the body of function NODE->DECL.  */
@@ -2144,45 +2184,6 @@ output_function (struct cgraph_node *node)
       /* Output any exception handling regions.  */
       output_eh_regions (ob, fn);
 
-
-      /* We will renumber the statements.  The code that does this uses
-	 the same ordering that we use for serializing them so we can use
-	 the same code on the other end and not have to write out the
-	 statement numbers.  We do not assign UIDs to PHIs here because
-	 virtual PHIs get re-computed on-the-fly which would make numbers
-	 inconsistent.  */
-      set_gimple_stmt_max_uid (fn, 0);
-      FOR_ALL_BB_FN (bb, fn)
-	{
-	  for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
-	       gsi_next (&gsi))
-	    {
-	      gphi *stmt = gsi.phi ();
-
-	      /* Virtual PHIs are not going to be streamed.  */
-	      if (!virtual_operand_p (gimple_phi_result (stmt)))
-	        gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
-	    }
-	  for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi);
-	       gsi_next (&gsi))
-	    {
-	      gimple *stmt = gsi_stmt (gsi);
-	      gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
-	    }
-	}
-      /* To avoid keeping duplicate gimple IDs in the statements, renumber
-	 virtual phis now.  */
-      FOR_ALL_BB_FN (bb, fn)
-	{
-	  for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
-	       gsi_next (&gsi))
-	    {
-	      gphi *stmt = gsi.phi ();
-	      if (virtual_operand_p (gimple_phi_result (stmt)))
-	        gimple_set_uid (stmt, inc_gimple_stmt_max_uid (fn));
-	    }
-	}
-
       /* Output the code for the function.  */
       FOR_ALL_BB_FN (bb, fn)
 	output_bb (ob, bb, fn);
-- 
cgit v1.1


From f8cf94cd21b4b29e53eb779d2da50dc317690cb9 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Sun, 13 Oct 2019 10:34:10 +0200
Subject: * lto.c (lto_wpa_write_files): Do not update bodies of clones.

From-SVN: r276935
---
 gcc/lto/ChangeLog | 4 ++++
 gcc/lto/lto.c     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 5ad79e8..2ef4a87 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
+
+	* lto.c (lto_wpa_write_files): Do not update bodies of clones.
+
 2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto.c (lto_wpa_write_files): Call ggc_trim.
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 5aa1438..4f404ec 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -308,7 +308,7 @@ lto_wpa_write_files (void)
   /* Do body modifications needed for streaming before we fork out
      worker processes.  */
   FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (node)
-    if (gimple_has_body_p (node->decl))
+    if (!node->clone_of && gimple_has_body_p (node->decl))
       lto_prepare_function_for_streaming (node);
 
   ggc_trim ();
-- 
cgit v1.1


From 7cc4770980e20f6f480152277d2a64c226fdee2a Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Sun, 13 Oct 2019 13:25:57 +0200
Subject: lto-common.c (read_cgraph_and_symbols): Grow ggc memory use after
 summary streaming.

	* lto-common.c (read_cgraph_and_symbols): Grow ggc memory use after
	summary streaming.

From-SVN: r276936
---
 gcc/lto/ChangeLog    | 5 +++++
 gcc/lto/lto-common.c | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 2ef4a87..bb4e57e 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
 
+	* lto-common.c (read_cgraph_and_symbols): Grow ggc memory use after
+	summary streaming.
+
+2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
+
 	* lto.c (lto_wpa_write_files): Do not update bodies of clones.
 
 2019-10-11  Jan Hubicka  <hubicka@ucw.cz>
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index e5c15f2..967f228 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -2781,7 +2781,6 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   /* At this stage we know that majority of GGC memory is reachable.
      Growing the limits prevents unnecesary invocation of GGC.  */
   ggc_grow ();
-  ggc_collect ();
 
   /* Set the hooks so that all of the ipa passes can read in their data.  */
   lto_set_in_hooks (all_file_decl_data, get_section_data, free_section_data);
@@ -2852,7 +2851,11 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   if (tree_with_vars)
     ggc_free (tree_with_vars);
   tree_with_vars = NULL;
-  ggc_collect ();
+  /* During WPA we want to prevent ggc collecting by default.  Grow limits
+     until after the IPA summaries are streamed in.  Basically all IPA memory
+     is explcitly managed by ggc_free and ggc collect is not useful.
+     Exception are the merged declarations.  */
+  ggc_grow ();
 
   timevar_pop (TV_IPA_LTO_DECL_MERGE);
   /* Each pass will set the appropriate timer.  */
@@ -2866,6 +2869,8 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
   else
     ipa_read_summaries ();
 
+  ggc_grow ();
+
   for (i = 0; all_file_decl_data[i]; i++)
     {
       gcc_assert (all_file_decl_data[i]->symtab_node_encoder);
-- 
cgit v1.1


From 855c21cb9af3e00ac10533f0525b038cf77eaa49 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Sun, 13 Oct 2019 11:42:15 +0000
Subject: Remove dg-add-options c99_runtime

	gcc:
	* doc/sourcebuild.texi (Test Directives, Add Options): Remove
	c99_runtime.

	gcc/testsuite:
	* lib/target-supports.exp (add_options_for_c99_runtime): Remove.
	(check_effective_target_c99_runtime): Remove call to
	add_options_for_c99_runtime.

	* gcc.dg/builtins-18.c: Remove dg-add-options c99_runtime.
	* gcc.dg/builtins-20.c: Likewise.
	* gcc.dg/builtins-53.c: Likewise.
	* gcc.dg/builtins-55.c: Likewise.
	* gcc.dg/builtins-67.c: Likewise.
	* gcc.dg/c99-tgmath-1.c: Likewise.
	* gcc.dg/c99-tgmath-2.c: Likewise.
	* gcc.dg/c99-tgmath-3.c: Likewise.
	* gcc.dg/c99-tgmath-4.c: Likewise.
	* gcc.dg/ipa/inline-8.c: Likewise.
	* gcc.dg/ipa/ipa-icf-5.c: Likewise.
	* gcc.dg/ipa/ipa-icf-7.c: Likewise.
	* gcc.dg/nextafter-2.c: Likewise.
	* gcc.dg/pr42427.c: Likewise.
	* gcc.dg/pr78965.c: Likewise.
	* gcc.dg/single-precision-constant.c: Likewise.
	* gcc.dg/torture/builtin-convert-1.c: Likewise.
	* gcc.dg/torture/builtin-convert-2.c: Likewise.
	* gcc.dg/torture/builtin-convert-3.c: Likewise.
	* gcc.dg/torture/builtin-convert-4.c: Likewise.
	* gcc.dg/torture/builtin-fp-int-inexact.c: Likewise.
	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: Likewise.
	* gcc.dg/torture/builtin-integral-1.c: Likewise.
	* gcc.dg/torture/builtin-power-1.c: Likewise.
	* gcc.dg/tree-ssa/copy-sign-1.c: Likewise.
	* gcc.dg/tree-ssa/minmax-2.c: Likewise.
	* gcc.dg/tree-ssa/mult-abs-2.c: Likewise.
	* gcc.target/i386/387-builtin-fp-int-inexact.c: Likewise.
	* gcc.target/i386/387-rint-inline-1.c: Likewise.
	* gcc.target/i386/387-rint-inline-2.c: Likewise.
	* gcc.target/i386/conversion.c: Likewise.
	* gcc.target/i386/pr47312.c: Likewise.
	* gcc.target/i386/sse2-builtin-fp-int-inexact.c: Likewise.
	* gcc.target/i386/sse2-rint-inline-1.c: Likewise.
	* gcc.target/i386/sse2-rint-inline-2.c: Likewise.
	* gcc.target/i386/sse4_1-builtin-fp-int-inexact.c: Likewise.
	* gcc.target/i386/sse4_1-rint-inline.c: Likewise.

From-SVN: r276937
---
 gcc/ChangeLog                                      |  5 +++
 gcc/doc/sourcebuild.texi                           |  3 --
 gcc/testsuite/ChangeLog                            | 44 ++++++++++++++++++++++
 gcc/testsuite/gcc.dg/builtins-18.c                 |  1 -
 gcc/testsuite/gcc.dg/builtins-20.c                 |  1 -
 gcc/testsuite/gcc.dg/builtins-53.c                 |  1 -
 gcc/testsuite/gcc.dg/builtins-55.c                 |  1 -
 gcc/testsuite/gcc.dg/builtins-67.c                 |  1 -
 gcc/testsuite/gcc.dg/c99-tgmath-1.c                |  1 -
 gcc/testsuite/gcc.dg/c99-tgmath-2.c                |  1 -
 gcc/testsuite/gcc.dg/c99-tgmath-3.c                |  1 -
 gcc/testsuite/gcc.dg/c99-tgmath-4.c                |  1 -
 gcc/testsuite/gcc.dg/ipa/inline-8.c                |  1 -
 gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c               |  1 -
 gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c               |  1 -
 gcc/testsuite/gcc.dg/nextafter-2.c                 |  1 -
 gcc/testsuite/gcc.dg/pr42427.c                     |  1 -
 gcc/testsuite/gcc.dg/pr78965.c                     |  1 -
 gcc/testsuite/gcc.dg/single-precision-constant.c   |  1 -
 gcc/testsuite/gcc.dg/torture/builtin-convert-1.c   |  1 -
 gcc/testsuite/gcc.dg/torture/builtin-convert-2.c   |  1 -
 gcc/testsuite/gcc.dg/torture/builtin-convert-3.c   |  1 -
 gcc/testsuite/gcc.dg/torture/builtin-convert-4.c   |  1 -
 .../gcc.dg/torture/builtin-fp-int-inexact-c2x.c    |  1 -
 .../gcc.dg/torture/builtin-fp-int-inexact.c        |  1 -
 gcc/testsuite/gcc.dg/torture/builtin-integral-1.c  |  1 -
 gcc/testsuite/gcc.dg/torture/builtin-power-1.c     |  1 -
 gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c        |  1 -
 gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c           |  1 -
 gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c         |  1 -
 .../gcc.target/i386/387-builtin-fp-int-inexact.c   |  1 -
 gcc/testsuite/gcc.target/i386/387-rint-inline-1.c  |  1 -
 gcc/testsuite/gcc.target/i386/387-rint-inline-2.c  |  1 -
 gcc/testsuite/gcc.target/i386/conversion.c         |  1 -
 gcc/testsuite/gcc.target/i386/pr47312.c            |  1 -
 .../gcc.target/i386/sse2-builtin-fp-int-inexact.c  |  1 -
 gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c |  1 -
 gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c |  1 -
 .../i386/sse4_1-builtin-fp-int-inexact.c           |  1 -
 gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c |  1 -
 gcc/testsuite/lib/target-supports.exp              | 15 +-------
 41 files changed, 50 insertions(+), 54 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4df0e0d..44753c8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* doc/sourcebuild.texi (Test Directives, Add Options): Remove
+	c99_runtime.
+
 2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto-streamer-out.c (collect_block_tree_leafs): Renumber statements
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 5696792..42a10cf 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -2528,9 +2528,6 @@ instructions, if this is supported by the target; see the
 Add the target-specific flags needed to enable functions to bind
 locally when using pic/PIC passes in the testsuite.
 
-@item c99_runtime
-Add the target-specific flags needed to access the C99 runtime.
-
 @item float@var{n}
 Add the target-specific flags needed to use the @code{_Float@var{n}} type.
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2f46d4d..3117a07 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,47 @@
+2019-10-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* lib/target-supports.exp (add_options_for_c99_runtime): Remove.
+	(check_effective_target_c99_runtime): Remove call to
+	add_options_for_c99_runtime.
+
+	* gcc.dg/builtins-18.c: Remove dg-add-options c99_runtime.
+	* gcc.dg/builtins-20.c: Likewise.
+	* gcc.dg/builtins-53.c: Likewise.
+	* gcc.dg/builtins-55.c: Likewise.
+	* gcc.dg/builtins-67.c: Likewise.
+	* gcc.dg/c99-tgmath-1.c: Likewise.
+	* gcc.dg/c99-tgmath-2.c: Likewise.
+	* gcc.dg/c99-tgmath-3.c: Likewise.
+	* gcc.dg/c99-tgmath-4.c: Likewise.
+	* gcc.dg/ipa/inline-8.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-5.c: Likewise.
+	* gcc.dg/ipa/ipa-icf-7.c: Likewise.
+	* gcc.dg/nextafter-2.c: Likewise.
+	* gcc.dg/pr42427.c: Likewise.
+	* gcc.dg/pr78965.c: Likewise.
+	* gcc.dg/single-precision-constant.c: Likewise.
+	* gcc.dg/torture/builtin-convert-1.c: Likewise.
+	* gcc.dg/torture/builtin-convert-2.c: Likewise.
+	* gcc.dg/torture/builtin-convert-3.c: Likewise.
+	* gcc.dg/torture/builtin-convert-4.c: Likewise.
+	* gcc.dg/torture/builtin-fp-int-inexact.c: Likewise.
+	* gcc.dg/torture/builtin-fp-int-inexact-c2x.c: Likewise.
+	* gcc.dg/torture/builtin-integral-1.c: Likewise.
+	* gcc.dg/torture/builtin-power-1.c: Likewise.
+	* gcc.dg/tree-ssa/copy-sign-1.c: Likewise.
+	* gcc.dg/tree-ssa/minmax-2.c: Likewise.
+	* gcc.dg/tree-ssa/mult-abs-2.c: Likewise.
+	* gcc.target/i386/387-builtin-fp-int-inexact.c: Likewise.
+	* gcc.target/i386/387-rint-inline-1.c: Likewise.
+	* gcc.target/i386/387-rint-inline-2.c: Likewise.
+	* gcc.target/i386/conversion.c: Likewise.
+	* gcc.target/i386/pr47312.c: Likewise.
+	* gcc.target/i386/sse2-builtin-fp-int-inexact.c: Likewise.
+	* gcc.target/i386/sse2-rint-inline-1.c: Likewise.
+	* gcc.target/i386/sse2-rint-inline-2.c: Likewise.
+	* gcc.target/i386/sse4_1-builtin-fp-int-inexact.c: Likewise.
+	* gcc.target/i386/sse4_1-rint-inline.c: Likewise.
+
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/92063
diff --git a/gcc/testsuite/gcc.dg/builtins-18.c b/gcc/testsuite/gcc.dg/builtins-18.c
index 9afaca2..4501cc1 100644
--- a/gcc/testsuite/gcc.dg/builtins-18.c
+++ b/gcc/testsuite/gcc.dg/builtins-18.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-20.c b/gcc/testsuite/gcc.dg/builtins-20.c
index 2b63428..8f864f6 100644
--- a/gcc/testsuite/gcc.dg/builtins-20.c
+++ b/gcc/testsuite/gcc.dg/builtins-20.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-53.c b/gcc/testsuite/gcc.dg/builtins-53.c
index 9a50bf5..e01908c 100644
--- a/gcc/testsuite/gcc.dg/builtins-53.c
+++ b/gcc/testsuite/gcc.dg/builtins-53.c
@@ -10,7 +10,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-55.c b/gcc/testsuite/gcc.dg/builtins-55.c
index 0db7976..76786fb 100644
--- a/gcc/testsuite/gcc.dg/builtins-55.c
+++ b/gcc/testsuite/gcc.dg/builtins-55.c
@@ -1,6 +1,5 @@
 /* { dg-do link } */
 /* { dg-options "-O2 -ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/builtins-67.c b/gcc/testsuite/gcc.dg/builtins-67.c
index 0992fe1..36b7886 100644
--- a/gcc/testsuite/gcc.dg/builtins-67.c
+++ b/gcc/testsuite/gcc.dg/builtins-67.c
@@ -2,7 +2,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math -lm" }  */
-/* { dg-add-options c99_runtime } */
 /* Bionic doesn't have rintl */
 /* { dg-require-effective-target non_bionic } */
 
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-1.c b/gcc/testsuite/gcc.dg/c99-tgmath-1.c
index cfa02a9..cfcba83 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-1.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-1.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do preprocess { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that tgmath defines the macros it's supposed to. */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-2.c b/gcc/testsuite/gcc.dg/c99-tgmath-2.c
index 1a1153c..7b0cfa4 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-2.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-2.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that invoking type-generic sin on a float invokes sinf. */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-3.c b/gcc/testsuite/gcc.dg/c99-tgmath-3.c
index a595cf6..8ed8b30 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-3.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-3.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that invoking type-generic exp on a complex invokes cexp. */
diff --git a/gcc/testsuite/gcc.dg/c99-tgmath-4.c b/gcc/testsuite/gcc.dg/c99-tgmath-4.c
index c05a1c5..f66bcdf 100644
--- a/gcc/testsuite/gcc.dg/c99-tgmath-4.c
+++ b/gcc/testsuite/gcc.dg/c99-tgmath-4.c
@@ -2,7 +2,6 @@
 /* Origin: Matt Austern <austern@apple.com>
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-std=iso9899:1999" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target tgmath_h } */
 
 /* Test that invoking type-generic pow on complex float invokes cpowf. */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-8.c b/gcc/testsuite/gcc.dg/ipa/inline-8.c
index df4a64d..388283c 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-8.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-8.c
@@ -3,7 +3,6 @@
 /* { dg-do run } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2"  } */
-/* { dg-add-options c99_runtime } */
 #include <math.h>
 extern int isnanf (float);
 /* Can't be inlined because isnanf will be optimized out.  */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
index 40d7174..1125bbd 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
@@ -1,6 +1,5 @@
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-O2 -fdump-ipa-icf-optimized"  } */
-/* { dg-add-options c99_runtime } */
 
 #include <complex.h>
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
index 87a6d26..d498b10 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
@@ -1,6 +1,5 @@
 /* { dg-do compile { target c99_runtime } } */
 /* { dg-options "-O2 -fdump-ipa-icf-optimized"  } */
-/* { dg-add-options c99_runtime } */
 
 #include <complex.h>
 
diff --git a/gcc/testsuite/gcc.dg/nextafter-2.c b/gcc/testsuite/gcc.dg/nextafter-2.c
index 0bde721..e51ae94 100644
--- a/gcc/testsuite/gcc.dg/nextafter-2.c
+++ b/gcc/testsuite/gcc.dg/nextafter-2.c
@@ -3,7 +3,6 @@
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2 -fno-builtin" } */
 /* { dg-add-options ieee } */
-/* { dg-add-options c99_runtime } */
 
 #include <stdlib.h>
 
diff --git a/gcc/testsuite/gcc.dg/pr42427.c b/gcc/testsuite/gcc.dg/pr42427.c
index cb290fe..b5a51cc 100644
--- a/gcc/testsuite/gcc.dg/pr42427.c
+++ b/gcc/testsuite/gcc.dg/pr42427.c
@@ -1,6 +1,5 @@
 /* { dg-do assemble { target c99_runtime } } */
 /* { dg-options "-O2 -fexceptions -fnon-call-exceptions -fpeel-loops" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target exceptions } */
 
diff --git a/gcc/testsuite/gcc.dg/pr78965.c b/gcc/testsuite/gcc.dg/pr78965.c
index 9ae1ad4..43da70b 100644
--- a/gcc/testsuite/gcc.dg/pr78965.c
+++ b/gcc/testsuite/gcc.dg/pr78965.c
@@ -1,7 +1,6 @@
 /* PR tree-optimization/78965 */
 /* { dg-do run { target c99_runtime } } */
 /* { dg-options "-O2" } */
-/* { dg-add-options c99_runtime } */
 
 int
 main ()
diff --git a/gcc/testsuite/gcc.dg/single-precision-constant.c b/gcc/testsuite/gcc.dg/single-precision-constant.c
index ffd893d..f1a9dc8 100644
--- a/gcc/testsuite/gcc.dg/single-precision-constant.c
+++ b/gcc/testsuite/gcc.dg/single-precision-constant.c
@@ -4,7 +4,6 @@
 
 /* { dg-do run } */
 /* { dg-options "-fsingle-precision-constant" } */
-/* { dg-add-options c99_runtime } */
 
 #include <math.h>
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
index eecd2b3..31aadff 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-1.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target c99_runtime } */
 
 #include "../builtins-config.h"
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c
index 167ecdd..3850986 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-2.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "../builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c
index 2034b41..520871f 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-3.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 
 #include "../builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
index acf89ce..f201f15 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
@@ -7,7 +7,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-ftrapping-math -fdump-tree-original" } */
-/* { dg-add-options c99_runtime } */
 
 #include "../builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
index 039cb53..739a78c 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
@@ -1,7 +1,6 @@
 /* Test C2X enables -fno-fp-int-builtin-inexact.  */
 /* { dg-do run } */
 /* { dg-options "-std=c2x" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include "builtin-fp-int-inexact.c"
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c
index 80458fa6..b192d38 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact.  */
 /* { dg-do run } */
 /* { dg-options "-fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c b/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c
index 74d4ab0..f6ac248 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-integral-1.c
@@ -10,7 +10,6 @@
    that various math functions are marked const/pure and can be
    folded.  */
 /* { dg-options "-ffinite-math-only -fno-math-errno" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-skip-if "" { *-*-* } { "-O0" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-power-1.c b/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
index 9e7c25a..e422b0c 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-power-1.c
@@ -7,7 +7,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-skip-if "PR44214" { *-*-* } { "-O0" } { "" } } */
 
 #include "../builtins-config.h"
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c b/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c
index de3e7b2..c36112a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-1.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2 -ffast-math -fdump-tree-gimple" } */
-/* { dg-add-options c99_runtime } */
 float f(float x)
 {
   return (x > 0.f ? -1.f : 1.f);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c
index 87ff94c..8990c18 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-2.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O -fstrict-overflow -fdump-tree-optimized" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target c99_runtime } */
 
 static int max(int a,int b){return (a<b)?b:a;}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c b/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c
index d74ba2f..a41f1ba 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O2 -ffast-math -fdump-tree-gimple" } */
-/* { dg-add-options c99_runtime } */
 
 float f(float x)
 {
diff --git a/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c b/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c
index 752b487..89983c3 100644
--- a/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.target/i386/387-builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact for 387.  */
 /* { dg-do run } */
 /* { dg-options "-O2 -mfancy-math-387 -mfpmath=387 -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include "../../gcc.dg/torture/builtin-fp-int-inexact.c"
diff --git a/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c b/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c
index 522edff..06906d6 100644
--- a/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c
+++ b/gcc/testsuite/gcc.target/i386/387-rint-inline-1.c
@@ -2,7 +2,6 @@
    should be expanded when spurious "inexact" allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mfancy-math-387 -mfpmath=387 -ffp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 
 #define TEST(FN, TYPE)				\
   do						\
diff --git a/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c b/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c
index be765a7..4cb8219 100644
--- a/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c
+++ b/gcc/testsuite/gcc.target/i386/387-rint-inline-2.c
@@ -2,7 +2,6 @@
    should be expanded even when spurious "inexact" not allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mfancy-math-387 -mfpmath=387 -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 
 #define TEST(FN, TYPE)				\
   do						\
diff --git a/gcc/testsuite/gcc.target/i386/conversion.c b/gcc/testsuite/gcc.target/i386/conversion.c
index c1718f0..bc71211 100644
--- a/gcc/testsuite/gcc.target/i386/conversion.c
+++ b/gcc/testsuite/gcc.target/i386/conversion.c
@@ -2,7 +2,6 @@
 
 /* { dg-do link } */
 /* { dg-options "-ffast-math" }  */
-/* { dg-add-options c99_runtime } */
 
 #include "../../gcc.dg/builtins-config.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/pr47312.c b/gcc/testsuite/gcc.target/i386/pr47312.c
index 03769a1..ec4b51c 100644
--- a/gcc/testsuite/gcc.target/i386/pr47312.c
+++ b/gcc/testsuite/gcc.target/i386/pr47312.c
@@ -4,7 +4,6 @@
 /* { dg-require-effective-target xop } */
 /* { dg-require-effective-target c99_runtime } */
 /* { dg-options "-O -flto -mno-sse3 -mxop" } */
-/* { dg-add-options c99_runtime } */
 
 extern double fma (double, double, double);
 extern float fmaf (float, float, float);
diff --git a/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c b/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c
index 1001597..2226e6a 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact for SSE 2.  */
 /* { dg-do run } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 /* { dg-require-effective-target sse2 } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c
index 06baed2..23c9797 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-1.c
@@ -2,7 +2,6 @@
    should be expanded when spurious "inexact" allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse -ffp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target sse2 } */
 
 #define TEST(FN, TYPE)				\
diff --git a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c
index 3ebf7a7..2896825 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-rint-inline-2.c
@@ -2,7 +2,6 @@
    should be expanded even when spurious "inexact" not allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target sse2 } */
 
 #define TEST(FN, TYPE)				\
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c b/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c
index 4c9244d..c1c8a19 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-builtin-fp-int-inexact.c
@@ -1,7 +1,6 @@
 /* Test -fno-fp-int-builtin-inexact for SSE 4.1.  */
 /* { dg-do run } */
 /* { dg-options "-O2 -msse4.1 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target fenv_exceptions } */
 /* { dg-require-effective-target sse4 } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c b/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c
index 6d60da3..995c14c 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-rint-inline.c
@@ -2,7 +2,6 @@
    when spurious "inexact" not allowed.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -msse4.1 -mfpmath=sse -fno-fp-int-builtin-inexact" } */
-/* { dg-add-options c99_runtime } */
 /* { dg-require-effective-target sse4 } */
 
 #define TEST(FN, TYPE)				\
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index f8a235d..6f224fa 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -7478,18 +7478,6 @@ proc check_effective_target_fd_truncate { } {
     return [check_runtime chsize $prog]
 }
 
-# Add to FLAGS all the target-specific flags needed to access the c99 runtime.
-
-proc add_options_for_c99_runtime { flags } {
-    if { [istarget *-*-solaris2*] } {
-	return "$flags -std=c99"
-    }
-    if { [istarget powerpc-*-darwin*] } {
-	return "$flags -mmacosx-version-min=10.3"
-    }
-    return $flags
-}
-
 # Add to FLAGS all the target-specific flags needed to enable
 # full IEEE compliance mode.
 
@@ -7571,8 +7559,7 @@ proc check_effective_target_c99_runtime { } {
 	    #error !HAVE_C99_RUNTIME
 	    #endif
 	}
-	check_no_compiler_messages_nocache c99_runtime assembly \
-	    $contents [add_options_for_c99_runtime ""]
+	check_no_compiler_messages_nocache c99_runtime assembly $contents
     }]
 }
 
-- 
cgit v1.1


From 19400cb96ce8fde3268d0b476d4d3c1efe3d3728 Mon Sep 17 00:00:00 2001
From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Sun, 13 Oct 2019 13:42:30 +0000
Subject: re PR fortran/92017 (ICE in gfc_expr_attr, at fortran/primary.c:2674)

2019-10-13  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/92017
	* expr.c (simplify_parameter_variable): Set the character length
	of the result expression from the original expression if
	necessary.

2019-10-13  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/92017
	* gfortran.dg/minmaxloc_14.f90: New test.

From-SVN: r276938
---
 gcc/fortran/ChangeLog                      |  7 +++++++
 gcc/fortran/expr.c                         |  3 +++
 gcc/testsuite/ChangeLog                    |  5 +++++
 gcc/testsuite/gfortran.dg/minmaxloc_14.f90 | 12 ++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 gcc/testsuite/gfortran.dg/minmaxloc_14.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 82164d7..52f30dd 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/92017
+	* expr.c (simplify_parameter_variable): Set the character length
+	of the result expression from the original expression if
+	necessary.
+
 2019-10-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/91649
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 9f638fe..c508890 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2066,6 +2066,9 @@ simplify_parameter_variable (gfc_expr *p, int type)
 
   e->rank = p->rank;
 
+  if (e->ts.type == BT_CHARACTER && e->ts.u.cl == NULL)
+    e->ts.u.cl = gfc_new_charlen (gfc_current_ns, p->ts.u.cl);
+
   /* Do not copy subobject refs for constant.  */
   if (e->expr_type != EXPR_CONSTANT && p->ref != NULL)
     e->ref = gfc_copy_ref (p->ref);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3117a07..b914cb8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/92017
+	* gfortran.dg/minmaxloc_14.f90: New test.
+
 2019-10-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* lib/target-supports.exp (add_options_for_c99_runtime): Remove.
diff --git a/gcc/testsuite/gfortran.dg/minmaxloc_14.f90 b/gcc/testsuite/gfortran.dg/minmaxloc_14.f90
new file mode 100644
index 0000000..d24d03f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/minmaxloc_14.f90
@@ -0,0 +1,12 @@
+! { dg-do compile }
+! PR 92017 - this used to cause an ICE due do a missing charlen.
+! Original test case by Gerhard Steinmetz.
+
+program p
+  character(3), parameter :: a(4) = 'abc'
+  integer, parameter :: b(1) = minloc(a)
+  integer, parameter :: c = minloc(a, dim=1)
+  integer, parameter :: bb(1) = maxloc(a)
+  integer, parameter :: c2 = maxloc(a,dim=1)
+end program p
+ 
-- 
cgit v1.1


From ad671098740b0dc798a89bc55833088f3948038b Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Sun, 13 Oct 2019 14:46:45 +0000
Subject: [PATCH] teach gengtype about 'mutable'

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00942.html

In constifying some more of line-map I discovered gengtype didn't know mutable. Added thusly.
	* gengtype-lex.l (CXX_KEYWORD): Add 'mutable'.

From-SVN: r276939
---
 gcc/ChangeLog      | 4 ++++
 gcc/gengtype-lex.l | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 44753c8..752eda4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-13  Nathan Sidwell  <nathan@acm.org>
+
+	* gengtype-lex.l (CXX_KEYWORD): Add 'mutable'.
+
 2019-10-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* doc/sourcebuild.texi (Test Directives, Add Options): Remove
diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index 1188691..5752749 100644
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -58,7 +58,7 @@ ITYPE	{IWORD}({WS}{IWORD})*
     /* Include '::' in identifiers to capture C++ scope qualifiers.  */
 ID	{CID}({HWS}::{HWS}{CID})*
 EOID	[^[:alnum:]_]
-CXX_KEYWORD inline|public:|private:|protected:|template|operator|friend|static
+CXX_KEYWORD inline|public:|private:|protected:|template|operator|friend|static|mutable
 
 %x in_struct in_struct_comment in_comment
 %option warn noyywrap nounput nodefault perf-report
-- 
cgit v1.1


From 5284fba56ec3392a61b2fe066027253868274156 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Sun, 13 Oct 2019 16:51:33 +0000
Subject: re PR fortran/90297 (gcc/fortran/resolve.c: 2 * possibly redundant
 code ?)

2019-10-13  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/90297
	* resolve.c (resolve_typebound_function): Remove code with no
	functional effect.

From-SVN: r276940
---
 gcc/fortran/ChangeLog |  6 ++++++
 gcc/fortran/resolve.c | 15 ---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 52f30dd..e215763 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-13  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90297
+	* resolve.c (resolve_typebound_function): Remove code with no
+	functional effect.
+
 2019-10-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/92017
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 71539fe..10da8f9 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -6548,21 +6548,6 @@ resolve_typebound_function (gfc_expr* e)
   overridable = !e->value.compcall.tbp->non_overridable;
   if (expr && expr->ts.type == BT_CLASS && e->value.compcall.name)
     {
-      /* If the base_object is not a variable, the corresponding actual
-	 argument expression must be stored in e->base_expression so
-	 that the corresponding tree temporary can be used as the base
-	 object in gfc_conv_procedure_call.  */
-      if (expr->expr_type != EXPR_VARIABLE)
-	{
-	  gfc_actual_arglist *args;
-
-	  for (args= e->value.function.actual; args; args = args->next)
-	    {
-	      if (expr == args->expr)
-		expr = args->expr;
-	    }
-	}
-
       /* Since the typebound operators are generic, we have to ensure
 	 that any delays in resolution are corrected and that the vtab
 	 is present.  */
-- 
cgit v1.1


From 51a6a4044c9eed53d86b3f79ca5c3c7b87ade39d Mon Sep 17 00:00:00 2001
From: Damian Rouson <damian@sourceryinstitute.org>
Date: Sun, 13 Oct 2019 17:16:40 +0000
Subject: re PR fortran/91513 (Non-standard terminology in error message for
 pointer component assignment in pure procedure)

2019-10-13  Damian Rouson  <damain@sourceryinstitue.org>

	PR fortran/91513
	* resolve.c (resolve_ordinary_assign): Improved error message.

2019-10-13  Damian Rouson  <damain@sourceryinstitue.org>

	PR fortran/91513
	* gfortran.dg/impure_assignment_2.f90: Update dg-error regex.

From-SVN: r276941
---
 gcc/fortran/ChangeLog                             | 5 +++++
 gcc/fortran/resolve.c                             | 9 ++++++---
 gcc/testsuite/ChangeLog                           | 5 +++++
 gcc/testsuite/gfortran.dg/impure_assignment_2.f90 | 2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e215763..2892011 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-13  Damian Rouson  <damain@sourceryinstitue.org>
+
+	PR fortran/91513
+	* resolve.c (resolve_ordinary_assign): Improved error message.
+
 2019-10-13  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/90297
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 10da8f9..93f2d0a 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -10769,9 +10769,12 @@ resolve_ordinary_assign (gfc_code *code, gfc_namespace *ns)
 			"component in a PURE procedure",
 			&rhs->where);
 	  else
-	    gfc_error ("The impure variable at %L is assigned to "
-			"a derived type variable with a POINTER "
-			"component in a PURE procedure (12.6)",
+	  /* F2008, C1283 (4).  */
+	    gfc_error ("In a pure subprogram an INTENT(IN) dummy argument "
+			"shall not be used as the expr at %L of an intrinsic "
+			"assignment statement in which the variable is of a "
+			"derived type if the derived type has a pointer "
+			"component at any level of component selection.",
 			&rhs->where);
 	  return rval;
 	}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b914cb8..eca8cc6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-13  Damian Rouson  <damain@sourceryinstitue.org>
+
+	PR fortran/91513
+	* gfortran.dg/impure_assignment_2.f90: Update dg-error regex.
+
 2019-10-13  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/92017
diff --git a/gcc/testsuite/gfortran.dg/impure_assignment_2.f90 b/gcc/testsuite/gfortran.dg/impure_assignment_2.f90
index 38d841d..1c1da4b 100644
--- a/gcc/testsuite/gfortran.dg/impure_assignment_2.f90
+++ b/gcc/testsuite/gfortran.dg/impure_assignment_2.f90
@@ -40,7 +40,7 @@ CONTAINS
   PURE FUNCTION give_next3(node)
      TYPE(node_type), intent(in) :: node
      TYPE(node_type) :: give_next
-     give_next = node ! { dg-error "impure variable" }
+     give_next = node ! { dg-error "pure subprogram" }
   END FUNCTION
 END MODULE pr20863
 
-- 
cgit v1.1


From 67f192f7687d0cce6cf81e188745a48c71b4b019 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sun, 13 Oct 2019 18:30:25 +0000
Subject: [Darwin, machopic 7/n] Remove code that should be dead.

This code fragment was imported from the Apple branch (it was never
applied to mainline).  It is stated to fix up a problem sometimes
created by reload (before that had been extended to have greater
flexibility in assigning the pic registers).  In any event, reload
is no longer in use for the port.

gcc/ChangeLog:

2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_indirect_data_reference): Remove
	redundant code.

From-SVN: r276942
---
 gcc/ChangeLog       |  5 +++++
 gcc/config/darwin.c | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 752eda4..c72f4d8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (machopic_indirect_data_reference): Remove
+	redundant code.
+
 2019-10-13  Nathan Sidwell  <nathan@acm.org>
 
 	* gengtype-lex.l (CXX_KEYWORD): Add 'mutable'.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index f6543fc..eefffee 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -760,21 +760,6 @@ machopic_indirect_data_reference (rtx orig, rtx reg)
   else if (GET_CODE (orig) == PLUS)
     {
       rtx base, result;
-      /* When the target is i386, this code prevents crashes due to the
-	compiler's ignorance on how to move the PIC base register to
-	other registers.  (The reload phase sometimes introduces such
-	insns.)  */
-      if (GET_CODE (XEXP (orig, 0)) == REG
-	   && REGNO (XEXP (orig, 0)) == PIC_OFFSET_TABLE_REGNUM
-	   /* Prevent the same register from being erroneously used
-	      as both the base and index registers.  */
-	   && (DARWIN_X86 && (GET_CODE (XEXP (orig, 1)) == CONST))
-	   && reg)
-	{
-	  emit_move_insn (reg, XEXP (orig, 0));
-	  XEXP (ptr_ref, 0) = reg;
-	  return ptr_ref;
-	}
 
       /* Legitimize both operands of the PLUS.  */
       base = machopic_indirect_data_reference (XEXP (orig, 0), reg);
-- 
cgit v1.1


From f922d945244558904be6868dc036c31fd05750dd Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sun, 13 Oct 2019 18:58:50 +0000
Subject: [Darwin, machopic 8/n] Back out part of PR71767 fix.

We applied a conservative, but fairly large, hammer to fix PR71767.
However, ideally, we want minimise the number of symbols visible to
ld64 and to match the cases emitted by clang (since that's what ld64
is expecting).  Now we've improved the handling of indirections, we
can make the indirection symbols local when they are in the regular
non-lazy symbol pointers section.  We will continue to make any
indirections in the data section visible (since right now we have no
way to track if a given symbol follows a weak global).
This change makes no difference to handling of labels for constants
(to be revised in a future patch).

There's a mechanical change to a number of tests (allowing 'l' or 'L'
as the indirection symbol prefix).

gcc/ChangeLog:

2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (machopic_indirection_name): Rework the
	function to emit linker-visible symbols only for indirections
	in the data section.  Clean up the code and update comments.

gcc/testsuite/ChangeLog:

2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>

	* gcc.target/i386/indirect-thunk-1.c: Allow 'l' or 'L' in
	indirection label prefix, for Darwin.
	* gcc.target/i386/indirect-thunk-2.c: Likewise.
	* gcc.target/i386/indirect-thunk-3.c: Likewise.
	* gcc.target/i386/indirect-thunk-4.c: Likewise.
	* gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
	* gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
	* gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
	* gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
	* gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
	* gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
	* gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
	* gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
	* gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
	* gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
	* gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
	* gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
	* gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
	* gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
	* gcc.target/i386/pr32219-2.c: Likewise.
	* gcc.target/i386/pr32219-3.c: Likewise.
	* gcc.target/i386/pr32219-4.c: Likewise.
	* gcc.target/i386/pr32219-7.c: Likewise.
	* gcc.target/i386/pr32219-8.c: Likewise.
	* gcc.target/i386/ret-thunk-14.c: Likewise.
	* gcc.target/i386/ret-thunk-15.c: Likewise.
	* gcc.target/i386/ret-thunk-9.c: Likewise.

From-SVN: r276943
---
 gcc/ChangeLog                                      |   6 ++
 gcc/config/darwin.c                                | 108 ++++++++-------------
 gcc/testsuite/ChangeLog                            |  30 ++++++
 gcc/testsuite/gcc.target/i386/indirect-thunk-1.c   |   2 +-
 gcc/testsuite/gcc.target/i386/indirect-thunk-2.c   |   2 +-
 gcc/testsuite/gcc.target/i386/indirect-thunk-3.c   |   2 +-
 gcc/testsuite/gcc.target/i386/indirect-thunk-4.c   |   2 +-
 .../gcc.target/i386/indirect-thunk-attr-1.c        |   2 +-
 .../gcc.target/i386/indirect-thunk-attr-2.c        |   2 +-
 .../gcc.target/i386/indirect-thunk-attr-3.c        |   2 +-
 .../gcc.target/i386/indirect-thunk-attr-4.c        |   2 +-
 .../gcc.target/i386/indirect-thunk-attr-5.c        |   2 +-
 .../gcc.target/i386/indirect-thunk-attr-6.c        |   2 +-
 .../gcc.target/i386/indirect-thunk-extern-1.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-extern-2.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-extern-3.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-extern-4.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-inline-1.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-inline-2.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-inline-3.c      |   2 +-
 .../gcc.target/i386/indirect-thunk-inline-4.c      |   2 +-
 gcc/testsuite/gcc.target/i386/pr32219-2.c          |   2 +-
 gcc/testsuite/gcc.target/i386/pr32219-3.c          |   2 +-
 gcc/testsuite/gcc.target/i386/pr32219-4.c          |   2 +-
 gcc/testsuite/gcc.target/i386/pr32219-7.c          |   2 +-
 gcc/testsuite/gcc.target/i386/pr32219-8.c          |   2 +-
 gcc/testsuite/gcc.target/i386/ret-thunk-14.c       |   2 +-
 gcc/testsuite/gcc.target/i386/ret-thunk-15.c       |   2 +-
 gcc/testsuite/gcc.target/i386/ret-thunk-9.c        |   2 +-
 29 files changed, 105 insertions(+), 91 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c72f4d8..61c8a0f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>
 
+	* config/darwin.c (machopic_indirection_name): Rework the
+	function to emit linker-visible symbols only for indirections
+	in the data section.  Clean up the code and update comments.
+
+2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>
+
 	* config/darwin.c (machopic_indirect_data_reference): Remove
 	redundant code.
 
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index eefffee..8635fc2 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -495,7 +495,7 @@ indirection_hasher::equal (machopic_indirection *s, const char *k)
 /* Return the name of the non-lazy pointer (if STUB_P is false) or
    stub (if STUB_B is true) corresponding to the given name.
 
-  If we have a situation like:
+  PR71767 - If we have a situation like:
 
 global_weak_symbol:
   ....
@@ -504,36 +504,22 @@ Lnon_weak_local:
 
   ld64 will be unable to split this into two atoms (because the "L" makes
   the second symbol 'invisible').  This means that legitimate direct accesses
-  to the second symbol will appear to be non-allowed direct accesses to an
-  atom of type weak, global which are not allowed.
+  to the second symbol will appear to be direct accesses to an atom of type
+  weak, global which are not allowed.
 
-  To avoid this, we make the indirections have a leading 'l' (lower-case L)
-  which has a special meaning: linker can see this and use it to determine
-  atoms, but it is not placed into the final symbol table.
-
-  The implementation here is somewhat heavy-handed in that it will also mark
-  indirections to the __IMPORT,__pointers section the same way which is
-  really unnecessary, since ld64 _can_ split those into atoms as they are
-  fixed size.  FIXME: determine if this is a penalty worth extra code to
-  fix.
+  To avoid this, we make any data-section indirections have a leading 'l'
+  (lower-case L) which has a special meaning: linker can see this and use
+  it to determine  atoms, but it is not placed into the final symbol table.
 
+  Symbols in the non-lazy symbol pointers section (or stubs) do not have this
+  problem because ld64 already knows the size of each entry.
 */
 
 const char *
 machopic_indirection_name (rtx sym_ref, bool stub_p)
 {
-  char *buffer;
   const char *name = XSTR (sym_ref, 0);
-  size_t namelen = strlen (name);
-  machopic_indirection *p;
-  bool needs_quotes;
-  const char *suffix;
-  char L_or_l = 'L';
-  const char *prefix = user_label_prefix;
-  const char *quote = "";
-  tree id;
-
-  id = maybe_get_identifier (name);
+  tree id = maybe_get_identifier (name);
   if (id)
     {
       tree id_orig = id;
@@ -541,43 +527,47 @@ machopic_indirection_name (rtx sym_ref, bool stub_p)
       while (IDENTIFIER_TRANSPARENT_ALIAS (id))
 	id = TREE_CHAIN (id);
       if (id != id_orig)
-	{
-	  name = IDENTIFIER_POINTER (id);
-	  namelen = strlen (name);
-	}
+	name = IDENTIFIER_POINTER (id);
     }
 
+  const char *prefix = user_label_prefix;
+  /* If we are emitting the label 'verbatim' then omit the U_L_P and count
+     the name without the leading '*'.  */
   if (name[0] == '*')
     {
       prefix = "";
       ++name;
-      --namelen;
     }
 
-  needs_quotes = name_needs_quotes (name);
-  if (needs_quotes)
-    {
-      quote = "\"";
-    }
-
-  if (stub_p)
-    suffix = STUB_SUFFIX;
-  else
-    {
-      suffix = NON_LAZY_POINTER_SUFFIX;
-      /* Let the linker see this.  */
-      L_or_l = 'l';
-    }
-
-  buffer = XALLOCAVEC (char, 2  /* strlen ("&L") or ("&l") */
-		   + strlen (prefix)
-		   + namelen
-		   + strlen (suffix)
-		   + 2 * strlen (quote)
-		   + 1 /* '\0' */);
+  /* Here we are undoing a number of causes that placed some indirections
+     (apparently erroneously) into the .data section.  Specifically, some
+     symbols that are ABI mandated indirections and some hidden symbols
+     were being placed there - which cause difficulties with later
+     versions of ld64.  Iff (after these checks) some symbol still gets an
+     indirection in the data section, we want to adjust the indirection
+     name to be linker visible to deal with PR71767 (notes above).  */
+  bool nlsp_in_data_section =
+       ! MACHO_SYMBOL_MUST_INDIRECT_P (sym_ref)
+    && ! MACHO_SYMBOL_HIDDEN_VIS_P (sym_ref)
+    && (machopic_symbol_defined_p (sym_ref) || SYMBOL_REF_LOCAL_P (sym_ref))
+    && ! indirect_data (sym_ref);
+
+  const char *suffix = stub_p ? STUB_SUFFIX : NON_LAZY_POINTER_SUFFIX;
+  /* If the indirection is in the data section, let the linker see it.  */
+  char L_or_l = (!stub_p && nlsp_in_data_section) ? 'l' : 'L';
+  /* We have mangled symbols with spaces and punctuation which typically
+     need surrounding in quotes for the assembler to consume them.  */
+  const char *quote = name_needs_quotes (name) ? "\"" : "";
+  char *buffer = XALLOCAVEC (char, 2  /* strlen ("&L") or ("&l") */
+			     + strlen (prefix)
+			     + strlen (name)
+			     + strlen (suffix)
+			     + 2 * strlen (quote)
+			     + 1 /* '\0' */);
 
   /* Construct the name of the non-lazy pointer or stub.  */
-  sprintf (buffer, "&%s%c%s%s%s%s", quote, L_or_l, prefix, name, suffix, quote);
+  sprintf (buffer, "&%s%c%s%s%s%s", quote, L_or_l, prefix, name,
+	   suffix, quote);
 
   if (!machopic_indirections)
     machopic_indirections = hash_table<indirection_hasher>::create_ggc (37);
@@ -586,10 +576,9 @@ machopic_indirection_name (rtx sym_ref, bool stub_p)
     = machopic_indirections->find_slot_with_hash (buffer,
 						  htab_hash_string (buffer),
 						  INSERT);
+  machopic_indirection *p;
   if (*slot)
-    {
-      p = *slot;
-    }
+    p = *slot;
   else
     {
       p = ggc_alloc<machopic_indirection> ();
@@ -597,18 +586,7 @@ machopic_indirection_name (rtx sym_ref, bool stub_p)
       p->ptr_name = xstrdup (buffer);
       p->stub_p = stub_p;
       p->used = false;
-      /* Here we are undoing a number of causes that placed some indirections
-	 (apparently erroneously) into the .data section.  Specifically, some
-	 symbols that are ABI mandated indirections and some hidden symbols
-	 were being placed there - which cause difficulties with later
-	 versions of ld64.
-      */
-      p->nlsp_in_data_section =
-	   ! MACHO_SYMBOL_MUST_INDIRECT_P (sym_ref)
-	&& ! MACHO_SYMBOL_HIDDEN_VIS_P (sym_ref)
-	&& (machopic_symbol_defined_p (sym_ref)
-	    || SYMBOL_REF_LOCAL_P (sym_ref))
-	&& ! indirect_data (sym_ref);
+      p->nlsp_in_data_section = nlsp_in_data_section;
       *slot = p;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eca8cc6..c14075b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,33 @@
+2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.target/i386/indirect-thunk-1.c: Allow 'l' or 'L' in
+	indirection label prefix, for Darwin.
+	* gcc.target/i386/indirect-thunk-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
+	* gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
+	* gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
+	* gcc.target/i386/pr32219-2.c: Likewise.
+	* gcc.target/i386/pr32219-3.c: Likewise.
+	* gcc.target/i386/pr32219-4.c: Likewise.
+	* gcc.target/i386/pr32219-7.c: Likewise.
+	* gcc.target/i386/pr32219-8.c: Likewise.
+	* gcc.target/i386/ret-thunk-14.c: Likewise.
+	* gcc.target/i386/ret-thunk-15.c: Likewise.
+	* gcc.target/i386/ret-thunk-9.c: Likewise.
+
 2019-10-13  Damian Rouson  <damain@sourceryinstitue.org>
 
 	PR fortran/91513
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
index 052d24d..e2914a8 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
index 2cfbd72..d2b7c74 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
index 59bb086..129fb21 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
index 59640fa..01996fb 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
index 8620bf1..1493e18 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
@@ -17,7 +17,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
index 42e8341..3ddd498 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
index 6a9c513..43d5f95 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
@@ -17,7 +17,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
index 85ec57b..bf62636 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
@@ -16,7 +16,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
index db1d8fb..27ba829 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
@@ -17,7 +17,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
 /* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
index 24fc43b..bdf15d3 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
@@ -16,7 +16,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
 /* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
index 3dc02f8..c30c331 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
 /* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
index c4adae2..7edd731 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
 /* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
index b800b40..8e39179 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
 /* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
index f68902d..6033d13 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
@@ -15,6 +15,6 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
index 7301490..ef3577d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
index ef1ba02..f26a5fb 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
index 58de8f0..3b8a1ee 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler-times {\tpause} 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
index 3be3ce0..40d3180 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
 
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
 /* { dg-final { scan-assembler-times {\tpause} 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr32219-2.c b/gcc/testsuite/gcc.target/i386/pr32219-2.c
index cb587db..b6212f7 100644
--- a/gcc/testsuite/gcc.target/i386/pr32219-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr32219-2.c
@@ -20,5 +20,5 @@ foo ()
 /* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %" { target { ia32 && { ! *-*-darwin* } } } } } */
 
 /* Darwin m32 defaults to PIC but common symbols need to be indirected.  */
-/* { dg-final { scan-assembler {movl[ \t]l_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t][Ll]_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr32219-3.c b/gcc/testsuite/gcc.target/i386/pr32219-3.c
index f9cfca7..a1b0df2 100644
--- a/gcc/testsuite/gcc.target/i386/pr32219-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr32219-3.c
@@ -24,4 +24,4 @@ foo ()
 
 /* For Darwin, we need PIC to allow PIE, but also we must indirect weak symbols so that
    they can be indirected.  Again, dyld knows how to deal with this. */
-/* { dg-final { scan-assembler {movl[ \t]l_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t][Ll]_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr32219-4.c b/gcc/testsuite/gcc.target/i386/pr32219-4.c
index 0ac0674..31d0710 100644
--- a/gcc/testsuite/gcc.target/i386/pr32219-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr32219-4.c
@@ -21,4 +21,4 @@ foo ()
 /* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %" { target { ia32 && { ! *-*-darwin* } } } } } */
 
 /* Darwin m32 equivalent (indirect and PIC).  */
-/* { dg-final { scan-assembler {movl[ \t]l_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t][Ll]_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr32219-7.c b/gcc/testsuite/gcc.target/i386/pr32219-7.c
index 469e9e3..20fef8d 100644
--- a/gcc/testsuite/gcc.target/i386/pr32219-7.c
+++ b/gcc/testsuite/gcc.target/i386/pr32219-7.c
@@ -23,4 +23,4 @@ foo ()
 /* { dg-final { scan-assembler-not "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %eax" { target { ia32 && { ! *-*-darwin* } } } } } */
 
 /* Darwin m32 equivalent (indirect and PIC).  */
-/* { dg-final { scan-assembler {movl[ \t]l_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t][Ll]_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr32219-8.c b/gcc/testsuite/gcc.target/i386/pr32219-8.c
index 75eb287..767928f 100644
--- a/gcc/testsuite/gcc.target/i386/pr32219-8.c
+++ b/gcc/testsuite/gcc.target/i386/pr32219-8.c
@@ -21,4 +21,4 @@ foo ()
 /* { dg-final { scan-assembler "movl\[ \t\]xxx@GOT\\(%\[^,\]*\\), %" { target { ia32 && { ! *-*-darwin* } } } } } */
 
 /* Darwin m32 default to PIC but needs indirection for the weak symbol.  */
-/* { dg-final { scan-assembler {movl[ \t]l_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t][Ll]_xxx\$non_lazy_ptr-L1\$pb\(%eax\),[ \t]%eax} { target { ia32 && *-*-darwin* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-14.c b/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
index 3eaddee..881f541 100644
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-14.c
@@ -19,6 +19,6 @@ foo (void)
 /* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*bar" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_bar} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_bar\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_bar\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-15.c b/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
index 2793f72..5687440 100644
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-15.c
@@ -19,6 +19,6 @@ foo (void)
 /* { dg-final { scan-assembler-times {\tlfence} 1 } } */
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*bar" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_bar} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_bar\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_bar\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
 /* { dg-final { scan-assembler-not "pushq\[ \t\]%rax" } } */
diff --git a/gcc/testsuite/gcc.target/i386/ret-thunk-9.c b/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
index 63af674..3d44970 100644
--- a/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
+++ b/gcc/testsuite/gcc.target/i386/ret-thunk-9.c
@@ -17,7 +17,7 @@ foo (void)
 /* { dg-final { scan-assembler "_?__x86_return_thunk:" } } */
 /* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*bar" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler {movq[ \t]*_bar} { target { lp64 && *-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[ \t]*l_bar\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*[Ll]_bar\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } } } } */
 /* { dg-final { scan-assembler-times {\tpause} 2 } } */
 /* { dg-final { scan-assembler-times {\tlfence} 2 } } */
 /* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } } */
-- 
cgit v1.1


From 13378504f4795aefa391ffd57edb74528649276f Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Mon, 14 Oct 2019 00:16:16 +0000
Subject: Daily bump.

From-SVN: r276947
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index b22adfb..d6c8807 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191013
+20191014
-- 
cgit v1.1


From 103197a183446a81d97a6ef975cc7095a64c8c4b Mon Sep 17 00:00:00 2001
From: Xiong Hu Luo <luoxhu@linux.ibm.com>
Date: Mon, 14 Oct 2019 02:04:04 +0000
Subject: Fix dump message issue

'}' is missed at the end.

gcc/ChangeLog:

2019-10-14  Xiong Hu Luo  <luoxhu@linux.ibm.com>

	* tree-sra.c (dump_access): Add missing braces.

From-SVN: r276948
---
 gcc/ChangeLog  | 4 ++++
 gcc/tree-sra.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61c8a0f..053ef6c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-14  Xiong Hu Luo  <luoxhu@linux.ibm.com>
+
+	* tree-sra.c (dump_access): Add missing braces.
+
 2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c (machopic_indirection_name): Rework the
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index c462ca4..3f10423 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -392,7 +392,7 @@ dump_access (FILE *f, struct access *access, bool grp)
 	     "grp_hint = %d, grp_covered = %d, "
 	     "grp_unscalarizable_region = %d, grp_unscalarized_data = %d, "
 	     "grp_same_access_path = %d, grp_partial_lhs = %d, "
-	     "grp_to_be_replaced = %d, grp_to_be_debug_replaced = %d\n",
+	     "grp_to_be_replaced = %d, grp_to_be_debug_replaced = %d}\n",
 	     access->grp_read, access->grp_write, access->grp_assignment_read,
 	     access->grp_assignment_write, access->grp_scalar_read,
 	     access->grp_scalar_write, access->grp_total_scalarization,
@@ -402,7 +402,7 @@ dump_access (FILE *f, struct access *access, bool grp)
 	     access->grp_to_be_replaced, access->grp_to_be_debug_replaced);
   else
     fprintf (f, ", write = %d, grp_total_scalarization = %d, "
-	     "grp_partial_lhs = %d\n",
+	     "grp_partial_lhs = %d}\n",
 	     access->write, access->grp_total_scalarization,
 	     access->grp_partial_lhs);
 }
-- 
cgit v1.1


From dede82f21ba8b569ad0f5538a0c00216ea71d2b4 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@redhat.com>
Date: Mon, 14 Oct 2019 06:43:03 +0000
Subject: Normalize unsigned ~[0,0] into [1,MAX].

From-SVN: r276949
---
 gcc/ChangeLog                         |  7 +++++++
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/gcc.dg/tree-ssa/evrp4.c |  2 +-
 gcc/tree-vrp.c                        |  8 ++++----
 gcc/tree-vrp.h                        | 27 +++++++++++++++++----------
 5 files changed, 34 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 053ef6c..cf359bf5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-14  Aldy Hernandez  <aldyh@redhat.com>
+
+	* tree-vrp.c (value_range_base::set): Normalize unsigned ~[0,0]
+	into [1,MAX].
+	* tree-vrp.h (value_range_base::nonzero_p): Adjust for unsigned
+	non-zero being represented as [1,MAX].
+
 2019-10-14  Xiong Hu Luo  <luoxhu@linux.ibm.com>
 
 	* tree-sra.c (dump_access): Add missing braces.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c14075b..fbc3d27 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Aldy Hernandez  <aldyh@redhat.com>
+
+	* gcc.dg/tree-ssa/evrp4.c: Adjust for unsigned non-zero being
+	[1,MAX].
+
 2019-10-13  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* gcc.target/i386/indirect-thunk-1.c: Allow 'l' or 'L' in
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
index ebb87ed..ba2f6b9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
@@ -17,4 +17,4 @@ int bar (struct st *s)
   foo (&s->a);
 }
 
-/* { dg-final { scan-tree-dump "\~\\\[0B, 0B\\\]" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[1B, -1B\\\]" "evrp" } } */
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index d69cfb1..cffa050 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -800,13 +800,13 @@ value_range_base::set (enum value_range_kind kind, tree min, tree max)
 	  kind = VR_RANGE;
 	}
       else if (is_min
-	       /* As a special exception preserve non-null ranges.  */
-	       && !(TYPE_UNSIGNED (TREE_TYPE (min))
-		    && integer_zerop (max)))
+	       /* Allow non-zero pointers to be normalized to [1,MAX].  */
+	       || (POINTER_TYPE_P (TREE_TYPE (min))
+		   && integer_zerop (min)))
         {
 	  tree one = build_int_cst (TREE_TYPE (max), 1);
 	  min = int_const_binop (PLUS_EXPR, max, one);
-	  max = vrp_val_max (TREE_TYPE (max));
+	  max = vrp_val_max (TREE_TYPE (max), true);
 	  kind = VR_RANGE;
         }
       else if (is_max)
diff --git a/gcc/tree-vrp.h b/gcc/tree-vrp.h
index a3f9e90..4bfdfeb 100644
--- a/gcc/tree-vrp.h
+++ b/gcc/tree-vrp.h
@@ -245,16 +245,6 @@ value_range_base::zero_p () const
 	  && integer_zerop (m_max));
 }
 
-/* Return TRUE if range is nonzero.  */
-
-inline bool
-value_range_base::nonzero_p () const
-{
-  return (m_kind == VR_ANTI_RANGE
-	  && integer_zerop (m_min)
-	  && integer_zerop (m_max));
-}
-
 extern void dump_value_range (FILE *, const value_range *);
 extern void dump_value_range (FILE *, const value_range_base *);
 
@@ -322,6 +312,23 @@ extern tree get_single_symbol (tree, bool *, tree *);
 extern void maybe_set_nonzero_bits (edge, tree);
 extern value_range_kind determine_value_range (tree, wide_int *, wide_int *);
 
+/* Return TRUE if range is nonzero.  */
+
+inline bool
+value_range_base::nonzero_p () const
+{
+  if (m_kind == VR_ANTI_RANGE
+      && !TYPE_UNSIGNED (type ())
+      && integer_zerop (m_min)
+      && integer_zerop (m_max))
+    return true;
+
+  return (m_kind == VR_RANGE
+	  && TYPE_UNSIGNED (type ())
+	  && integer_onep (m_min)
+	  && vrp_val_is_max (m_max, true));
+}
+
 /* Return TRUE if *VR includes the value zero.  */
 
 inline bool
-- 
cgit v1.1


From b9424661f58de6c0aa9dc4c855c1fd913cc06282 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 14 Oct 2019 08:52:46 +0200
Subject: c-parser.c (c_parser_omp_all_clauses): Change bool NESTED_P argument
 into int NESTED...

c/
	* c-parser.c (c_parser_omp_all_clauses): Change bool NESTED_P argument
	into int NESTED, if it is 2, diagnose missing commas in between
	clauses.
	(c_parser_omp_context_selector): Pass 2 as last argument to
	c_parser_omp_all_clauses.
cp/
	* parser.c (cp_parser_omp_all_clauses): Change bool NESTED_P argument
	into int NESTED, if it is 2, diagnose missing commas in between
	clauses.
	(cp_parser_omp_context_selector): Pass 2 as last argument to
	cp_parser_omp_all_clauses.
testsuite/
	* c-c++-common/gomp/declare-variant-7.c: Add tests for clauses not
	separated by commas in simd selector trait properties.

From-SVN: r276950
---
 gcc/c/ChangeLog                                    |  8 ++++++++
 gcc/c/c-parser.c                                   | 24 ++++++++++++++--------
 gcc/cp/ChangeLog                                   |  8 ++++++++
 gcc/cp/parser.c                                    | 24 ++++++++++++++--------
 gcc/testsuite/ChangeLog                            |  5 +++++
 .../c-c++-common/gomp/declare-variant-7.c          |  6 +++++-
 6 files changed, 58 insertions(+), 17 deletions(-)

(limited to 'gcc')

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 5fb386c..c76baf0 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-parser.c (c_parser_omp_all_clauses): Change bool NESTED_P argument
+	into int NESTED, if it is 2, diagnose missing commas in between
+	clauses.
+	(c_parser_omp_context_selector): Pass 2 as last argument to
+	c_parser_omp_all_clauses.
+
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-parser.c (c_parser_omp_context_selector): Improve error recovery.
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 9d0b2b6..15095dd 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -15215,13 +15215,14 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask,
 /* Parse all OpenMP clauses.  The set clauses allowed by the directive
    is a bitmask in MASK.  Return the list of clauses found.
    FINISH_P set if c_finish_omp_clauses should be called.
-   NESTED_P set if clauses should be terminated by closing paren instead
-   of end of pragma.  */
+   NESTED non-zero if clauses should be terminated by closing paren instead
+   of end of pragma.  If it is 2, additionally commas are required in between
+   the clauses.  */
 
 static tree
 c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask,
 			  const char *where, bool finish_p = true,
-			  bool nested_p = false)
+			  int nested = 0)
 {
   tree clauses = NULL;
   bool first = true;
@@ -15233,11 +15234,18 @@ c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask,
       const char *c_name;
       tree prev = clauses;
 
-      if (nested_p && c_parser_next_token_is (parser, CPP_CLOSE_PAREN))
+      if (nested && c_parser_next_token_is (parser, CPP_CLOSE_PAREN))
 	break;
 
-      if (!first && c_parser_next_token_is (parser, CPP_COMMA))
-	c_parser_consume_token (parser);
+      if (!first)
+	{
+	  if (c_parser_next_token_is (parser, CPP_COMMA))
+	    c_parser_consume_token (parser);
+	  else if (nested == 2)
+	    error_at (c_parser_peek_token (parser)->location,
+		      "clauses in %<simd%> trait should be separated "
+		      "by %<,%>");
+	}
 
       here = c_parser_peek_token (parser)->location;
       c_kind = c_parser_omp_clause_name (parser);
@@ -15520,7 +15528,7 @@ c_parser_omp_all_clauses (c_parser *parser, omp_clause_mask mask,
     }
 
  saw_error:
-  if (!nested_p)
+  if (!nested)
     c_parser_skip_to_pragma_eol (parser);
 
   if (finish_p)
@@ -19279,7 +19287,7 @@ c_parser_omp_context_selector (c_parser *parser, tree set, tree parms)
 	      tree c;
 	      c = c_parser_omp_all_clauses (parser,
 					    OMP_DECLARE_SIMD_CLAUSE_MASK,
-					    "simd", true, true);
+					    "simd", true, 2);
 	      c = c_omp_declare_simd_clauses_to_numbers (parms
 							 == error_mark_node
 							 ? NULL_TREE : parms,
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dcae490..af08497 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* parser.c (cp_parser_omp_all_clauses): Change bool NESTED_P argument
+	into int NESTED, if it is 2, diagnose missing commas in between
+	clauses.
+	(cp_parser_omp_context_selector): Pass 2 as last argument to
+	cp_parser_omp_all_clauses.
+
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
 	* parser.c (cp_parser_omp_context_selector): Improve error recovery.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 9bf690a..53db8af 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -36078,13 +36078,14 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask,
 /* Parse all OpenMP clauses.  The set clauses allowed by the directive
    is a bitmask in MASK.  Return the list of clauses found.
    FINISH_P set if finish_omp_clauses should be called.
-   NESTED_P set if clauses should be terminated by closing paren instead
-   of end of pragma.  */
+   NESTED non-zero if clauses should be terminated by closing paren instead
+   of end of pragma.  If it is 2, additionally commas are required in between
+   the clauses.  */
 
 static tree
 cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
 			   const char *where, cp_token *pragma_tok,
-			   bool finish_p = true, bool nested_p = false)
+			   bool finish_p = true, int nested = 0)
 {
   tree clauses = NULL;
   bool first = true;
@@ -36099,11 +36100,18 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
       const char *c_name;
       tree prev = clauses;
 
-      if (nested_p && cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_PAREN))
+      if (nested && cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_PAREN))
 	break;
 
-      if (!first && cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
-	cp_lexer_consume_token (parser->lexer);
+      if (!first)
+	{
+	  if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA))
+	    cp_lexer_consume_token (parser->lexer);
+	  else if (nested == 2)
+	    error_at (cp_lexer_peek_token (parser->lexer)->location,
+		      "clauses in %<simd%> trait should be separated "
+                      "by %<,%>");
+	}
 
       token = cp_lexer_peek_token (parser->lexer);
       c_kind = cp_parser_omp_clause_name (parser);
@@ -36421,7 +36429,7 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
 	}
     }
  saw_error:
-  if (!nested_p)
+  if (!nested)
     cp_parser_skip_to_pragma_eol (parser, pragma_tok);
   if (finish_p)
     {
@@ -40548,7 +40556,7 @@ cp_parser_omp_context_selector (cp_parser *parser, tree set, bool has_parms_p)
 	      properties
 		= cp_parser_omp_all_clauses (parser,
 					     OMP_DECLARE_SIMD_CLAUSE_MASK,
-					     "simd", NULL, true, true);
+					     "simd", NULL, true, 2);
 	      break;
 	    default:
 	      gcc_unreachable ();
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fbc3d27..5db77a7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/declare-variant-7.c: Add tests for clauses not
+	separated by commas in simd selector trait properties.
+
 2019-10-14  Aldy Hernandez  <aldyh@redhat.com>
 
 	* gcc.dg/tree-ssa/evrp4.c: Adjust for unsigned non-zero being
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c
index f818cd5..1df6338 100644
--- a/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-7.c
@@ -27,7 +27,11 @@ int f10 (float x, float y, float *q);
 int f11 (float x, float y, float *z);
 #pragma omp declare variant (f3) match (construct={simd(simdlen(4),inbranch,linear(y:1))})
 int f12 (int x, int y);
-#pragma omp declare variant (f3) match (construct={simd(inbranch,simdlen(5-1),linear(q:4-3))})
+#pragma omp declare variant (f3) match (construct={simd(inbranch, simdlen (5-1), linear (q:4-3))})
 int f13 (int x, int q);
 #pragma omp declare variant (f3) match (construct={simd(inbranch,simdlen(4),linear(q:2))})		/* { dg-error "'f3' used as a variant with incompatible 'constructor' selector sets" "" { target c } } */
 int f14 (int x, int q);
+#pragma omp declare variant (f3) match (construct={simd(inbranch simdlen (4) linear (q:1))})		/* { dg-error "clauses in 'simd' trait should be separated by ','" } */
+int f15 (int x, int q);
+#pragma omp declare variant (f3) match (construct={simd(inbranch, simdlen (5-1) linear (q:4-3))})	/* { dg-error "clauses in 'simd' trait should be separated by ','" } */
+int f16 (int x, int q);
-- 
cgit v1.1


From 56898e437a538c7edc0724a3650f5cb81c9d5721 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 14 Oct 2019 08:05:52 +0000
Subject: [C] Avoid exposing internal details in aka types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current aka diagnostics can sometimes leak internal details that
seem more likely to be distracting than useful.  E.g. on aarch64:

  void f (va_list *va) { *va = 1; }

gives:

  incompatible types when assigning to type ‘va_list’ {aka ‘__va_list’} from type ‘int’

where __va_list isn't something the user is expected to know about.
A similar thing happens for C++ on the arm_neon.h-based:

  float x;
  int8x8_t y = x;

which gives:

  cannot convert ‘float’ to ‘int8x8_t’ {aka ‘__Int8x8_t’} in initialization

This is accurate -- and __Int8x8_t is defined by the AArch64 PCS --
but it's not going to be meaningful to most users.

This patch stops the aka code looking through typedefs if all of
the following are true:

(1) the typedef is built into the compiler or comes from a system header

(2) the target of the typedef is anonymous or has a name in the
    implementation namespace

(3) the target type is a tag type or vector type, which have in common that:
    (a) we print their type names if they have one
    (b) what we print for anonymous types isn't all that useful
        ("struct <anonymous>" etc. for tag types, pseudo-C "__vector(N) T"
        for vector types)

The patch does this by recursively looking for the aka type, like the
C++ frontend already does.  This in turn makes "aka" work for distinct type
copies like __Int8x8_t on aarch64, fixing the ??? in aarch64/diag_aka_1.c.

2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>

gcc/c-family/
	* c-common.h (user_facing_original_type_p): Declare.
	* c-common.c: Include c-spellcheck.h.
	(user_facing_original_type_p): New function.

gcc/c/
	* c-objc-common.c (useful_aka_type_p): Replace with...
	(get_aka_type): ...this new function.  Given the original type,
	decide which aka type to print (if any).  Only look through typedefs
	if user_facing_original_type_p.
	(print_type): Update accordingly.

gcc/testsuite/
	* gcc.dg/diag-aka-5.h: New test.
	* gcc.dg/diag-aka-5a.c: Likewise.
	* gcc.dg/diag-aka-5b.c: Likewise.
	* gcc.target/aarch64/diag_aka_1.c (f): Expect an aka to be printed
	for myvec.

From-SVN: r276951
---
 gcc/c-family/ChangeLog                        |   6 ++
 gcc/c-family/c-common.c                       |  47 +++++++++
 gcc/c-family/c-common.h                       |   1 +
 gcc/c/ChangeLog                               |   8 ++
 gcc/c/c-objc-common.c                         | 130 +++++++++++++++++--------
 gcc/testsuite/ChangeLog                       |   8 ++
 gcc/testsuite/gcc.dg/diag-aka-5.h             |  22 +++++
 gcc/testsuite/gcc.dg/diag-aka-5a.c            | 135 ++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/diag-aka-5b.c            | 134 +++++++++++++++++++++++++
 gcc/testsuite/gcc.target/aarch64/diag_aka_1.c |   5 +-
 10 files changed, 454 insertions(+), 42 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/diag-aka-5.h
 create mode 100644 gcc/testsuite/gcc.dg/diag-aka-5a.c
 create mode 100644 gcc/testsuite/gcc.dg/diag-aka-5b.c

(limited to 'gcc')

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 2b63689..cb3b9cf 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* c-common.h (user_facing_original_type_p): Declare.
+	* c-common.c: Include c-spellcheck.h.
+	(user_facing_original_type_p): New function.
+
 2019-10-12  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-common.h (c_omp_mark_declare_variant,
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 909f52a..483d874 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimplify.h"
 #include "substring-locations.h"
 #include "spellcheck.h"
+#include "c-spellcheck.h"
 #include "selftest.h"
 
 cpp_reader *parse_in;		/* Declared in c-pragma.h.  */
@@ -7713,6 +7714,52 @@ set_underlying_type (tree x)
     }
 }
 
+/* Return true if it is worth exposing the DECL_ORIGINAL_TYPE of TYPE to
+   the user in diagnostics, false if it would be better to use TYPE itself.
+   TYPE is known to satisfy typedef_variant_p.  */
+
+bool
+user_facing_original_type_p (const_tree type)
+{
+  gcc_assert (typedef_variant_p (type));
+  tree decl = TYPE_NAME (type);
+
+  /* Look through any typedef in "user" code.  */
+  if (!DECL_IN_SYSTEM_HEADER (decl) && !DECL_IS_BUILTIN (decl))
+    return true;
+
+  /* If the original type is also named and is in the user namespace,
+     assume it too is a user-facing type.  */
+  tree orig_type = DECL_ORIGINAL_TYPE (decl);
+  if (tree orig_id = TYPE_IDENTIFIER (orig_type))
+    if (!name_reserved_for_implementation_p (IDENTIFIER_POINTER (orig_id)))
+      return true;
+
+  switch (TREE_CODE (orig_type))
+    {
+    /* Don't look through to an anonymous vector type, since the syntax
+       we use for them in diagnostics isn't real C or C++ syntax.
+       And if ORIG_TYPE is named but in the implementation namespace,
+       TYPE is likely to be more meaningful to the user.  */
+    case VECTOR_TYPE:
+      return false;
+
+    /* Don't expose anonymous tag types that are presumably meant to be
+       known by their typedef name.  Also don't expose tags that are in
+       the implementation namespace, such as:
+
+         typedef struct __foo foo;  */
+    case RECORD_TYPE:
+    case UNION_TYPE:
+    case ENUMERAL_TYPE:
+      return false;
+
+    /* Look through to anything else.  */
+    default:
+      return true;
+    }
+}
+
 /* Record the types used by the current global variable declaration
    being parsed, so that we can decide later to emit their debug info.
    Those types are in types_used_by_cur_var_decl, and we are going to
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index db7f26e..3bc021b 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1063,6 +1063,7 @@ extern tree builtin_type_for_size (int, bool);
 extern void c_common_mark_addressable_vec (tree);
 
 extern void set_underlying_type (tree);
+extern bool user_facing_original_type_p (const_tree);
 extern void record_types_used_by_current_var_decl (tree);
 extern vec<tree, va_gc> *make_tree_vector (void);
 extern void release_tree_vector (vec<tree, va_gc> *);
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index c76baf0..23310ce 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* c-objc-common.c (useful_aka_type_p): Replace with...
+	(get_aka_type): ...this new function.  Given the original type,
+	decide which aka type to print (if any).  Only look through typedefs
+	if user_facing_original_type_p.
+	(print_type): Update accordingly.
+
 2019-10-14  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-parser.c (c_parser_omp_all_clauses): Change bool NESTED_P argument
diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index e1f3b2e..10d72c5 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -28,6 +28,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "c-objc-common.h"
 #include "gcc-rich-location.h"
+#include "stringpool.h"
+#include "attribs.h"
 
 static bool c_tree_printer (pretty_printer *, text_info *, const char *,
 			    int, bool, bool, bool, bool *, const char **);
@@ -62,71 +64,120 @@ c_objc_common_init (void)
   return c_common_init ();
 }
 
-/* Return true if it's worth saying that TYPE1 is also known as TYPE2.  */
+/* Decide whether it's worth saying that TYPE is also known as some other
+   type.  Return the other type if so, otherwise return TYPE.  */
 
-static bool
-useful_aka_type_p (tree type1, tree type2)
+static tree
+get_aka_type (tree type)
 {
-  if (type1 == type2)
-    return false;
-
-  if (type1 == error_mark_node || type2 == error_mark_node)
-    return false;
-
-  if (TREE_CODE (type1) != TREE_CODE (type2))
-    return true;
+  if (type == error_mark_node)
+    return type;
 
-  if (typedef_variant_p (type1))
+  tree result;
+  if (typedef_variant_p (type))
     {
       /* Saying that "foo" is also known as "struct foo" or
 	 "struct <anonymous>" is unlikely to be useful, since users of
 	 structure-like types would already know that they're structures.
 	 The same applies to unions and enums; in general, printing the
 	 tag is only useful if it has a different name.  */
-      tree_code code = TREE_CODE (type2);
-      tree id2 = TYPE_IDENTIFIER (type2);
+      tree orig_type = DECL_ORIGINAL_TYPE (TYPE_NAME (type));
+      tree_code code = TREE_CODE (orig_type);
+      tree orig_id = TYPE_IDENTIFIER (orig_type);
       if ((code == RECORD_TYPE || code == UNION_TYPE || code == ENUMERAL_TYPE)
-	  && (!id2 || TYPE_IDENTIFIER (type1) == id2))
-	return false;
+	  && (!orig_id || TYPE_IDENTIFIER (type) == orig_id))
+	return type;
 
-      return true;
+      if (!user_facing_original_type_p (type))
+	return type;
+
+      result = get_aka_type (orig_type);
     }
   else
     {
-      switch (TREE_CODE (type1))
+      tree canonical = TYPE_CANONICAL (type);
+      if (canonical && TREE_CODE (type) != TREE_CODE (canonical))
+	return canonical;
+
+      /* Recursive calls might choose a middle ground between TYPE
+	 (which has no typedefs stripped) and CANONICAL (which has
+	 all typedefs stripped).  So try to reuse TYPE or CANONICAL if
+	 convenient, but be prepared to create a new type if necessary.  */
+      switch (TREE_CODE (type))
 	{
 	case POINTER_TYPE:
 	case REFERENCE_TYPE:
-	  return useful_aka_type_p (TREE_TYPE (type1), TREE_TYPE (type2));
+	  {
+	    tree target_type = get_aka_type (TREE_TYPE (type));
+
+	    if (target_type == TREE_TYPE (type))
+	      return type;
+
+	    if (canonical && target_type == TREE_TYPE (canonical))
+	      return canonical;
+
+	    result = (TREE_CODE (type) == POINTER_TYPE
+		      ? build_pointer_type (target_type)
+		      : build_reference_type (target_type));
+	    break;
+	  }
 
 	case ARRAY_TYPE:
-	  return (useful_aka_type_p (TYPE_DOMAIN (type1), TYPE_DOMAIN (type2))
-		  || useful_aka_type_p (TREE_TYPE (type1), TREE_TYPE (type2)));
+	  {
+	    tree element_type = get_aka_type (TREE_TYPE (type));
+	    tree index_type = (TYPE_DOMAIN (type)
+			       ? get_aka_type (TYPE_DOMAIN (type))
+			       : NULL_TREE);
+
+	    if (element_type == TREE_TYPE (type)
+		&& index_type == TYPE_DOMAIN (type))
+	      return type;
+
+	    if (canonical
+		&& element_type == TREE_TYPE (canonical)
+		&& index_type == TYPE_DOMAIN (canonical))
+	      return canonical;
+
+	    result = build_array_type (element_type, index_type,
+				       TYPE_TYPELESS_STORAGE (type));
+	    break;
+	  }
 
 	case FUNCTION_TYPE:
 	  {
-	    tree args1 = TYPE_ARG_TYPES (type1);
-	    tree args2 = TYPE_ARG_TYPES (type2);
-	    while (args1 != args2)
+	    tree return_type = get_aka_type (TREE_TYPE (type));
+
+	    tree args = TYPE_ARG_TYPES (type);
+	    if (args == error_mark_node)
+	      return type;
+
+	    auto_vec<tree, 32> arg_types;
+	    bool type_ok_p = true;
+	    while (args && args != void_list_node)
 	      {
-		/* Although this shouldn't happen, it seems to wrong to assert
-		   for it in a diagnostic routine.  */
-		if (!args1 || args1 == void_type_node)
-		  return true;
-		if (!args2 || args2 == void_type_node)
-		  return true;
-		if (useful_aka_type_p (TREE_VALUE (args1), TREE_VALUE (args2)))
-		  return true;
-		args1 = TREE_CHAIN (args1);
-		args2 = TREE_CHAIN (args2);
+		tree arg_type = get_aka_type (TREE_VALUE (args));
+		arg_types.safe_push (arg_type);
+		type_ok_p &= (arg_type == TREE_VALUE (args));
+		args = TREE_CHAIN (args);
 	      }
-	    return useful_aka_type_p (TREE_TYPE (type1), TREE_TYPE (type2));
+
+	    if (type_ok_p && return_type == TREE_TYPE (type))
+	      return type;
+
+	    unsigned int i;
+	    tree arg_type;
+	    FOR_EACH_VEC_ELT_REVERSE (arg_types, i, arg_type)
+	      args = tree_cons (NULL_TREE, arg_type, args);
+	    result = build_function_type (return_type, args);
+	    break;
 	  }
 
 	default:
-	  return true;
+	  return canonical ? canonical : type;
 	}
     }
+  return build_type_attribute_qual_variant (result, TYPE_ATTRIBUTES (type),
+					    TYPE_QUALS (type));
 }
 
 /* Print T to CPP.  */
@@ -150,11 +201,12 @@ print_type (c_pretty_printer *cpp, tree t, bool *quoted)
      stripped version.  But sometimes the stripped version looks
      exactly the same, so we don't want it after all.  To avoid
      printing it in that case, we play ugly obstack games.  */
-  if (TYPE_CANONICAL (t) && useful_aka_type_p (t, TYPE_CANONICAL (t)))
+  tree aka_type = get_aka_type (t);
+  if (aka_type != t)
     {
       c_pretty_printer cpp2;
       /* Print the stripped version into a temporary printer.  */
-      cpp2.type_id (TYPE_CANONICAL (t));
+      cpp2.type_id (aka_type);
       struct obstack *ob2 = cpp2.buffer->obstack;
       /* Get the stripped version from the temporary printer.  */
       const char *aka = (char *) obstack_base (ob2);
@@ -174,7 +226,7 @@ print_type (c_pretty_printer *cpp, tree t, bool *quoted)
       pp_c_whitespace (cpp);
       if (*quoted)
 	pp_begin_quote (cpp, pp_show_color (cpp));
-      cpp->type_id (TYPE_CANONICAL (t));
+      cpp->type_id (aka_type);
       if (*quoted)
 	pp_end_quote (cpp, pp_show_color (cpp));
       pp_right_brace (cpp);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5db77a7..7385c33 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/diag-aka-5.h: New test.
+	* gcc.dg/diag-aka-5a.c: Likewise.
+	* gcc.dg/diag-aka-5b.c: Likewise.
+	* gcc.target/aarch64/diag_aka_1.c (f): Expect an aka to be printed
+	for myvec.
+
 2019-10-14  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-c++-common/gomp/declare-variant-7.c: Add tests for clauses not
diff --git a/gcc/testsuite/gcc.dg/diag-aka-5.h b/gcc/testsuite/gcc.dg/diag-aka-5.h
new file mode 100644
index 0000000..0c7404d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/diag-aka-5.h
@@ -0,0 +1,22 @@
+#ifdef IS_SYSTEM_HEADER
+#pragma GCC system_header
+#endif
+
+typedef enum __internal_enum { A, B } user_enum;
+typedef user_enum *user_enum_ptr;
+
+typedef struct __internal_struct { int i; } user_struct;
+typedef user_struct user_struct_copy;
+typedef user_struct *user_struct_ptr;
+
+typedef union __internal_union { int i; } user_union;
+typedef user_union user_union_copy;
+typedef user_union *user_union_ptr;
+
+typedef unsigned int user_vector __attribute__((__vector_size__(16)));
+typedef user_vector user_vector_copy;
+typedef user_vector *user_vector_ptr;
+
+typedef int user_int;
+typedef user_int user_int_copy;
+typedef user_int *user_int_ptr;
diff --git a/gcc/testsuite/gcc.dg/diag-aka-5a.c b/gcc/testsuite/gcc.dg/diag-aka-5a.c
new file mode 100644
index 0000000..8768a79
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/diag-aka-5a.c
@@ -0,0 +1,135 @@
+#define IS_SYSTEM_HEADER
+#include "diag-aka-5.h"
+
+typedef user_enum user_enum_copy;
+
+struct s { int i; };
+
+user_enum ue1;
+user_enum_copy ue2;
+user_enum_ptr ue_ptr1;
+user_enum *ue_ptr2;
+const user_enum *const_ue_ptr1;
+const user_enum_copy *const_ue_ptr2;
+volatile user_enum *volatile_ue_ptr1;
+volatile user_enum_copy *volatile_ue_ptr2;
+__extension__ _Atomic user_enum *atomic_ue_ptr1;
+__extension__ _Atomic user_enum_copy *atomic_ue_ptr2;
+user_enum (*ue_array_ptr1)[10];
+user_enum_copy (*ue_array_ptr2)[10];
+user_enum (*ue_fn_ptr1) (void);
+void (*ue_fn_ptr2) (user_enum);
+void (*ue_fn_ptr3) (user_enum, ...);
+user_enum_copy (*ue_fn_ptr4) (void);
+void (*ue_fn_ptr5) (user_enum_copy);
+void (*ue_fn_ptr6) (user_enum_copy, ...);
+user_enum (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr1) (void);
+user_enum_copy (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr2) (void);
+
+user_struct us1;
+user_struct_copy us2;
+user_struct_ptr us_ptr1;
+user_struct *us_ptr2;
+const user_struct *const_us_ptr1;
+const user_struct_copy *const_us_ptr2;
+
+user_union uu1;
+user_union_copy uu2;
+user_union_ptr uu_ptr1;
+user_union *uu_ptr2;
+const user_union *const_uu_ptr1;
+const user_union_copy *const_uu_ptr2;
+
+user_vector uv1;
+user_vector_copy uv2;
+user_vector_ptr uv_ptr1;
+user_vector *uv_ptr2;
+const user_vector *const_uv_ptr1;
+const user_vector_copy *const_uv_ptr2;
+
+user_int ui1;
+user_int_copy ui2;
+user_int_ptr ui_ptr1;
+user_int *ui_ptr2;
+const user_int *const_ui_ptr1;
+const user_int_copy *const_ui_ptr2;
+volatile user_int *volatile_ui_ptr1;
+volatile user_int_copy *volatile_ui_ptr2;
+__extension__ _Atomic user_int *atomic_ui_ptr1;
+__extension__ _Atomic user_int_copy *atomic_ui_ptr2;
+user_int (*ui_array_ptr1)[10];
+user_int_copy (*ui_array_ptr2)[10];
+user_int (*ui_fn_ptr1) (void);
+void (*ui_fn_ptr2) (user_int);
+void (*ui_fn_ptr3) (user_int, ...);
+user_int_copy (*ui_fn_ptr4) (void);
+void (*ui_fn_ptr5) (user_int_copy);
+void (*ui_fn_ptr6) (user_int_copy, ...);
+user_int (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr1) (void);
+user_int_copy (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr2) (void);
+
+void f (struct s s)
+{
+  ue1 = s; /* { dg-error {assigning to type 'user_enum' from type 'struct s'} } */
+  ue2 = s; /* { dg-error {assigning to type 'user_enum_copy' {aka 'user_enum'} from type 'struct s'} } */
+  ue_ptr1 = &s; /* { dg-error {assignment to 'user_enum_ptr' {aka 'user_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  ue_ptr2 = &s; /* { dg-error {assignment to 'user_enum \*' from incompatible pointer type 'struct s \*'} } */
+  const_ue_ptr1 = &s; /* { dg-error {assignment to 'const user_enum \*' from incompatible pointer type 'struct s \*'} } */
+  const_ue_ptr2 = &s; /* { dg-error {assignment to 'const user_enum_copy \*' {aka 'const user_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ue_ptr1 = &s; /* { dg-error {assignment to 'volatile user_enum \*' from incompatible pointer type 'struct s \*'} } */
+  volatile_ue_ptr2 = &s; /* { dg-error {assignment to 'volatile user_enum_copy \*' {aka 'volatile user_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ue_ptr1 = &s; /* { dg-error {assignment to '_Atomic user_enum \*' from incompatible pointer type 'struct s \*'} } */
+  atomic_ue_ptr2 = &s; /* { dg-error {assignment to '_Atomic user_enum_copy \*' {aka '_Atomic user_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  ue_array_ptr1 = &s; /* { dg-error {assignment to 'user_enum \(\*\)\[10\]' from incompatible pointer type 'struct s \*'} } */
+  ue_array_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy \(\*\)\[10\]' {aka 'user_enum \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum \(\*\)\(void\)' from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr2 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum\)' from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr3 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum, \.\.\.\)' from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr4 = &s; /* { dg-error {assignment to 'user_enum_copy \(\*\)\(void\)' {aka 'user_enum \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr5 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(user_enum\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum_copy, \.\.\.\)' {aka 'void \(\*\)\(user_enum, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' from incompatible pointer type 'struct s \*'} } */
+  unsafe_ue_fn_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'user_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+
+  us1 = s; /* { dg-error {assigning to type 'user_struct' from type 'struct s'} } */
+  us2 = s; /* { dg-error {assigning to type 'user_struct_copy' {aka 'user_struct'} from type 'struct s'} } */
+  us_ptr1 = &s; /* { dg-error {assignment to 'user_struct_ptr' {aka 'user_struct \*'} from incompatible pointer type 'struct s \*'} } */
+  us_ptr2 = &s; /* { dg-error {assignment to 'user_struct \*' from incompatible pointer type 'struct s \*'} } */
+  const_us_ptr1 = &s; /* { dg-error {assignment to 'const user_struct \*' from incompatible pointer type 'struct s \*'} } */
+  const_us_ptr2 = &s; /* { dg-error {assignment to 'const user_struct_copy \*' {aka 'const user_struct \*'} from incompatible pointer type 'struct s \*'} } */
+
+  uu1 = s; /* { dg-error {assigning to type 'user_union' from type 'struct s'} } */
+  uu2 = s; /* { dg-error {assigning to type 'user_union_copy' {aka 'user_union'} from type 'struct s'} } */
+  uu_ptr1 = &s; /* { dg-error {assignment to 'user_union_ptr' {aka 'user_union \*'} from incompatible pointer type 'struct s \*'} } */
+  uu_ptr2 = &s; /* { dg-error {assignment to 'user_union \*' from incompatible pointer type 'struct s \*'} } */
+  const_uu_ptr1 = &s; /* { dg-error {assignment to 'const user_union \*' from incompatible pointer type 'struct s \*'} } */
+  const_uu_ptr2 = &s; /* { dg-error {assignment to 'const user_union_copy \*' {aka 'const user_union \*'} from incompatible pointer type 'struct s \*'} } */
+
+  uv1 = s; /* { dg-error {assigning to type 'user_vector' from type 'struct s'} } */
+  uv2 = s; /* { dg-error {assigning to type 'user_vector_copy' {aka 'user_vector'} from type 'struct s'} } */
+  uv_ptr1 = &s; /* { dg-error {assignment to 'user_vector_ptr' {aka 'user_vector \*'} from incompatible pointer type 'struct s \*'} } */
+  uv_ptr2 = &s; /* { dg-error {assignment to 'user_vector \*' from incompatible pointer type 'struct s \*'} } */
+  const_uv_ptr1 = &s; /* { dg-error {assignment to 'const user_vector \*' from incompatible pointer type 'struct s \*'} } */
+  const_uv_ptr2 = &s; /* { dg-error {assignment to 'const user_vector_copy \*' {aka 'const user_vector \*'} from incompatible pointer type 'struct s \*'} } */
+
+  ui1 = s; /* { dg-error {assigning to type 'user_int' {aka 'int'} from type 'struct s'} } */
+  ui2 = s; /* { dg-error {assigning to type 'user_int_copy' {aka 'int'} from type 'struct s'} } */
+  ui_ptr1 = &s; /* { dg-error {assignment to 'user_int_ptr' {aka 'int \*'} from incompatible pointer type 'struct s \*'} } */
+  ui_ptr2 = &s; /* { dg-error {assignment to 'user_int \*' {aka 'int \*'} from incompatible pointer type 'struct s \*'} } */
+  const_ui_ptr1 = &s; /* { dg-error {assignment to 'const user_int \*' {aka 'const int \*'} from incompatible pointer type 'struct s \*'} } */
+  const_ui_ptr2 = &s; /* { dg-error {assignment to 'const user_int_copy \*' {aka 'const int \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ui_ptr1 = &s; /* { dg-error {assignment to 'volatile user_int \*' {aka 'volatile int \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ui_ptr2 = &s; /* { dg-error {assignment to 'volatile user_int_copy \*' {aka 'volatile int \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ui_ptr1 = &s; /* { dg-error {assignment to '_Atomic user_int \*' {aka '_Atomic int \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ui_ptr2 = &s; /* { dg-error {assignment to '_Atomic user_int_copy \*' {aka '_Atomic int \*'} from incompatible pointer type 'struct s \*'} } */
+  ui_array_ptr1 = &s; /* { dg-error {assignment to 'user_int \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ui_array_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int \(\*\)\(void\)' {aka 'int \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr2 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int\)' {aka 'void \(\*\)\(int\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr3 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr4 = &s; /* { dg-error {assignment to 'user_int_copy \(\*\)\(void\)' {aka 'int \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr5 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int_copy, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ui_fn_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+}
diff --git a/gcc/testsuite/gcc.dg/diag-aka-5b.c b/gcc/testsuite/gcc.dg/diag-aka-5b.c
new file mode 100644
index 0000000..e0ec7c8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/diag-aka-5b.c
@@ -0,0 +1,134 @@
+#include "diag-aka-5.h"
+
+typedef user_enum user_enum_copy;
+
+struct s { int i; };
+
+user_enum ue1;
+user_enum_copy ue2;
+user_enum_ptr ue_ptr1;
+user_enum *ue_ptr2;
+const user_enum *const_ue_ptr1;
+const user_enum_copy *const_ue_ptr2;
+volatile user_enum *volatile_ue_ptr1;
+volatile user_enum_copy *volatile_ue_ptr2;
+__extension__ _Atomic user_enum *atomic_ue_ptr1;
+__extension__ _Atomic user_enum_copy *atomic_ue_ptr2;
+user_enum (*ue_array_ptr1)[10];
+user_enum_copy (*ue_array_ptr2)[10];
+user_enum (*ue_fn_ptr1) (void);
+void (*ue_fn_ptr2) (user_enum);
+void (*ue_fn_ptr3) (user_enum, ...);
+user_enum_copy (*ue_fn_ptr4) (void);
+void (*ue_fn_ptr5) (user_enum_copy);
+void (*ue_fn_ptr6) (user_enum_copy, ...);
+user_enum (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr1) (void);
+user_enum_copy (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr2) (void);
+
+user_struct us1;
+user_struct_copy us2;
+user_struct_ptr us_ptr1;
+user_struct *us_ptr2;
+const user_struct *const_us_ptr1;
+const user_struct_copy *const_us_ptr2;
+
+user_union uu1;
+user_union_copy uu2;
+user_union_ptr uu_ptr1;
+user_union *uu_ptr2;
+const user_union *const_uu_ptr1;
+const user_union_copy *const_uu_ptr2;
+
+user_vector uv1;
+user_vector_copy uv2;
+user_vector_ptr uv_ptr1;
+user_vector *uv_ptr2;
+const user_vector *const_uv_ptr1;
+const user_vector_copy *const_uv_ptr2;
+
+user_int ui1;
+user_int_copy ui2;
+user_int_ptr ui_ptr1;
+user_int *ui_ptr2;
+const user_int *const_ui_ptr1;
+const user_int_copy *const_ui_ptr2;
+volatile user_int *volatile_ui_ptr1;
+volatile user_int_copy *volatile_ui_ptr2;
+__extension__ _Atomic user_int *atomic_ui_ptr1;
+__extension__ _Atomic user_int_copy *atomic_ui_ptr2;
+user_int (*ui_array_ptr1)[10];
+user_int_copy (*ui_array_ptr2)[10];
+user_int (*ui_fn_ptr1) (void);
+void (*ui_fn_ptr2) (user_int);
+void (*ui_fn_ptr3) (user_int, ...);
+user_int_copy (*ui_fn_ptr4) (void);
+void (*ui_fn_ptr5) (user_int_copy);
+void (*ui_fn_ptr6) (user_int_copy, ...);
+user_int (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr1) (void);
+user_int_copy (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr2) (void);
+
+void f (struct s s)
+{
+  ue1 = s; /* { dg-error {assigning to type 'user_enum' {aka 'enum __internal_enum'} from type 'struct s'} } */
+  ue2 = s; /* { dg-error {assigning to type 'user_enum_copy' {aka 'enum __internal_enum'} from type 'struct s'} } */
+  ue_ptr1 = &s; /* { dg-error {assignment to 'user_enum_ptr' {aka 'enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  ue_ptr2 = &s; /* { dg-error {assignment to 'user_enum \*' {aka 'enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  const_ue_ptr1 = &s; /* { dg-error {assignment to 'const user_enum \*' {aka 'const enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  const_ue_ptr2 = &s; /* { dg-error {assignment to 'const user_enum_copy \*' {aka 'const enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ue_ptr1 = &s; /* { dg-error {assignment to 'volatile user_enum \*' {aka 'volatile enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ue_ptr2 = &s; /* { dg-error {assignment to 'volatile user_enum_copy \*' {aka 'volatile enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ue_ptr1 = &s; /* { dg-error {assignment to '_Atomic user_enum \*' {aka '_Atomic enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ue_ptr2 = &s; /* { dg-error {assignment to '_Atomic user_enum_copy \*' {aka '_Atomic enum __internal_enum \*'} from incompatible pointer type 'struct s \*'} } */
+  ue_array_ptr1 = &s; /* { dg-error {assignment to 'user_enum \(\*\)\[10\]' {aka 'enum __internal_enum \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ue_array_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy \(\*\)\[10\]' {aka 'enum __internal_enum \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum \(\*\)\(void\)' {aka 'enum __internal_enum \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr2 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum\)' {aka 'void \(\*\)\(enum __internal_enum\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr3 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum, \.\.\.\)' {aka 'void \(\*\)\(enum __internal_enum, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr4 = &s; /* { dg-error {assignment to 'user_enum_copy \(\*\)\(void\)' {aka 'enum __internal_enum \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr5 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(enum __internal_enum\)'} from incompatible pointer type 'struct s \*'} } */
+  ue_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_enum_copy, \.\.\.\)' {aka 'void \(\*\)\(enum __internal_enum, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ue_fn_ptr1 = &s; /* { dg-error {assignment to 'user_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'enum __internal_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ue_fn_ptr2 = &s; /* { dg-error {assignment to 'user_enum_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'enum __internal_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+
+  us1 = s; /* { dg-error {assigning to type 'user_struct' {aka 'struct __internal_struct'} from type 'struct s'} } */
+  us2 = s; /* { dg-error {assigning to type 'user_struct_copy' {aka 'struct __internal_struct'} from type 'struct s'} } */
+  us_ptr1 = &s; /* { dg-error {assignment to 'user_struct_ptr' {aka 'struct __internal_struct \*'} from incompatible pointer type 'struct s \*'} } */
+  us_ptr2 = &s; /* { dg-error {assignment to 'user_struct \*' {aka 'struct __internal_struct \*'} from incompatible pointer type 'struct s \*'} } */
+  const_us_ptr1 = &s; /* { dg-error {assignment to 'const user_struct \*' {aka 'const struct __internal_struct \*'} from incompatible pointer type 'struct s \*'} } */
+  const_us_ptr2 = &s; /* { dg-error {assignment to 'const user_struct_copy \*' {aka 'const struct __internal_struct \*'} from incompatible pointer type 'struct s \*'} } */
+
+  uu1 = s; /* { dg-error {assigning to type 'user_union' {aka 'union __internal_union'} from type 'struct s'} } */
+  uu2 = s; /* { dg-error {assigning to type 'user_union_copy' {aka 'union __internal_union'} from type 'struct s'} } */
+  uu_ptr1 = &s; /* { dg-error {assignment to 'user_union_ptr' {aka 'union __internal_union \*'} from incompatible pointer type 'struct s \*'} } */
+  uu_ptr2 = &s; /* { dg-error {assignment to 'user_union \*' {aka 'union __internal_union \*'} from incompatible pointer type 'struct s \*'} } */
+  const_uu_ptr1 = &s; /* { dg-error {assignment to 'const user_union \*' {aka 'const union __internal_union \*'} from incompatible pointer type 'struct s \*'} } */
+  const_uu_ptr2 = &s; /* { dg-error {assignment to 'const user_union_copy \*' {aka 'const union __internal_union \*'} from incompatible pointer type 'struct s \*'} } */
+
+  uv1 = s; /* { dg-error {assigning to type 'user_vector' {aka '__vector\([48]\) unsigned int'} from type 'struct s'} } */
+  uv2 = s; /* { dg-error {assigning to type 'user_vector_copy' {aka '__vector\([48]\) unsigned int'} from type 'struct s'} } */
+  uv_ptr1 = &s; /* { dg-error {assignment to 'user_vector_ptr' {aka '__vector\([48]\) unsigned int \*'} from incompatible pointer type 'struct s \*'} } */
+  uv_ptr2 = &s; /* { dg-error {assignment to 'user_vector \*' {aka '__vector\([48]\) unsigned int \*'} from incompatible pointer type 'struct s \*'} } */
+  const_uv_ptr1 = &s; /* { dg-error {assignment to 'const user_vector \*' {aka 'const __vector\([48]\) unsigned int \*'} from incompatible pointer type 'struct s \*'} } */
+  const_uv_ptr2 = &s; /* { dg-error {assignment to 'const user_vector_copy \*' {aka 'const __vector\([48]\) unsigned int \*'} from incompatible pointer type 'struct s \*'} } */
+
+  ui1 = s; /* { dg-error {assigning to type 'user_int' {aka 'int'} from type 'struct s'} } */
+  ui2 = s; /* { dg-error {assigning to type 'user_int_copy' {aka 'int'} from type 'struct s'} } */
+  ui_ptr1 = &s; /* { dg-error {assignment to 'user_int_ptr' {aka 'int \*'} from incompatible pointer type 'struct s \*'} } */
+  ui_ptr2 = &s; /* { dg-error {assignment to 'user_int \*' {aka 'int \*'} from incompatible pointer type 'struct s \*'} } */
+  const_ui_ptr1 = &s; /* { dg-error {assignment to 'const user_int \*' {aka 'const int \*'} from incompatible pointer type 'struct s \*'} } */
+  const_ui_ptr2 = &s; /* { dg-error {assignment to 'const user_int_copy \*' {aka 'const int \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ui_ptr1 = &s; /* { dg-error {assignment to 'volatile user_int \*' {aka 'volatile int \*'} from incompatible pointer type 'struct s \*'} } */
+  volatile_ui_ptr2 = &s; /* { dg-error {assignment to 'volatile user_int_copy \*' {aka 'volatile int \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ui_ptr1 = &s; /* { dg-error {assignment to '_Atomic user_int \*' {aka '_Atomic int \*'} from incompatible pointer type 'struct s \*'} } */
+  atomic_ui_ptr2 = &s; /* { dg-error {assignment to '_Atomic user_int_copy \*' {aka '_Atomic int \*'} from incompatible pointer type 'struct s \*'} } */
+  ui_array_ptr1 = &s; /* { dg-error {assignment to 'user_int \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ui_array_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int \(\*\)\(void\)' {aka 'int \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr2 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int\)' {aka 'void \(\*\)\(int\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr3 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr4 = &s; /* { dg-error {assignment to 'user_int_copy \(\*\)\(void\)' {aka 'int \(\*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr5 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} from incompatible pointer type 'struct s \*'} } */
+  ui_fn_ptr6 = &s; /* { dg-error {assignment to 'void \(\*\)\(user_int_copy, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ui_fn_ptr1 = &s; /* { dg-error {assignment to 'user_int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+  unsafe_ui_fn_ptr2 = &s; /* { dg-error {assignment to 'user_int_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(void\)'} from incompatible pointer type 'struct s \*'} } */
+}
diff --git a/gcc/testsuite/gcc.target/aarch64/diag_aka_1.c b/gcc/testsuite/gcc.target/aarch64/diag_aka_1.c
index 59e24f4..98dffea 100644
--- a/gcc/testsuite/gcc.target/aarch64/diag_aka_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/diag_aka_1.c
@@ -8,7 +8,6 @@ void f (float x)
   __Int8x8_t *ptr1 = &x; /* { dg-error {initialization of '__Int8x8_t \*' from incompatible pointer type 'float \*'} } */
   int8x8_t y2 = x; /* { dg-error {incompatible types when initializing type 'int8x8_t' using type 'float'} } */
   int8x8_t *ptr2 = &x; /* { dg-error {initialization of 'int8x8_t \*' from incompatible pointer type 'float \*'} } */
-  /* ??? For these it would be better to print an aka for 'int16x4_t'.  */
-  myvec y3 = x; /* { dg-error {incompatible types when initializing type 'myvec' using type 'float'} } */
-  myvec *ptr3 = &x; /* { dg-error {initialization of 'myvec \*' from incompatible pointer type 'float \*'} } */
+  myvec y3 = x; /* { dg-error {incompatible types when initializing type 'myvec' {aka 'int16x4_t'} using type 'float'} } */
+  myvec *ptr3 = &x; /* { dg-error {initialization of 'myvec \*' {aka 'int16x4_t \*'} from incompatible pointer type 'float \*'} } */
 }
-- 
cgit v1.1


From 63d25773e166e2e3babe626a5800e70939844754 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 14 Oct 2019 08:06:06 +0000
Subject: Add expr_callee_abi

This turned out to be useful for the SVE PCS support, and is a natural
tree-level analogue of insn_callee_abi.

2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* function-abi.h (expr_callee_abi): Declare.
	* function-abi.cc (expr_callee_abi): New function.

From-SVN: r276952
---
 gcc/ChangeLog       |  5 +++++
 gcc/function-abi.cc | 29 +++++++++++++++++++++++++++++
 gcc/function-abi.h  |  1 +
 3 files changed, 35 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf359bf5..e755803 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* function-abi.h (expr_callee_abi): Declare.
+	* function-abi.cc (expr_callee_abi): New function.
+
 2019-10-14  Aldy Hernandez  <aldyh@redhat.com>
 
 	* tree-vrp.c (value_range_base::set): Normalize unsigned ~[0,0]
diff --git a/gcc/function-abi.cc b/gcc/function-abi.cc
index eee789a..b4a1839 100644
--- a/gcc/function-abi.cc
+++ b/gcc/function-abi.cc
@@ -229,3 +229,32 @@ insn_callee_abi (const rtx_insn *insn)
 
   return default_function_abi;
 }
+
+/* Return the ABI of the function called by CALL_EXPR EXP.  Return the
+   default ABI for erroneous calls.  */
+
+function_abi
+expr_callee_abi (const_tree exp)
+{
+  gcc_assert (TREE_CODE (exp) == CALL_EXPR);
+
+  if (tree fndecl = get_callee_fndecl (exp))
+    return fndecl_abi (fndecl);
+
+  tree callee = CALL_EXPR_FN (exp);
+  if (callee == error_mark_node)
+    return default_function_abi;
+
+  tree type = TREE_TYPE (callee);
+  if (type == error_mark_node)
+    return default_function_abi;
+
+  if (POINTER_TYPE_P (type))
+    {
+      type = TREE_TYPE (type);
+      if (type == error_mark_node)
+	return default_function_abi;
+    }
+
+  return fntype_abi (type);
+}
diff --git a/gcc/function-abi.h b/gcc/function-abi.h
index 9bb4d17..96a49df 100644
--- a/gcc/function-abi.h
+++ b/gcc/function-abi.h
@@ -315,5 +315,6 @@ call_clobbered_in_region_p (unsigned int abis, const_hard_reg_set mask,
 extern const predefined_function_abi &fntype_abi (const_tree);
 extern function_abi fndecl_abi (const_tree);
 extern function_abi insn_callee_abi (const rtx_insn *);
+extern function_abi expr_callee_abi (const_tree);
 
 #endif
-- 
cgit v1.1


From 3c917358901af9a778d4ba851fa724f4923480bf Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Mon, 14 Oct 2019 08:14:23 +0000
Subject: =?UTF-8?q?[Fortran]=20PR=2092072=20=E2=80=93=20fix=20%C=20corner?=
 =?UTF-8?q?=20case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

        PR fortran/92072
        * error.c (error_print, gfc_format_decoder): Fix %C column-
        offset handling.

From-SVN: r276953
---
 gcc/fortran/ChangeLog | 9 ++++++++-
 gcc/fortran/error.c   | 7 ++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2892011..ad30ff2 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-14  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/92072
+	* error.c (error_print, gfc_format_decoder): Fix %C column-
+	offset handling.
+
 2019-10-13  Damian Rouson  <damain@sourceryinstitue.org>
 
 	PR fortran/91513
@@ -110,7 +116,8 @@
 
 2019-10-04  Tobias Burnus  <tobias@codesourcery.com>
 
-	* error (error_print, gfc_format_decoder): Fix off-by one issue with %C.
+	* error.c (error_print, gfc_format_decoder): Fix off-by one issue
+	with %C.
 
 2019-10-03  Steven G. Kargl  <kargl@gcc.gnu.org>
 
diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index 1019f17..7962c93 100644
--- a/gcc/fortran/error.c
+++ b/gcc/fortran/error.c
@@ -1,3 +1,4 @@
+#pragma GCC optimize("O0")
 /* Handle errors.
    Copyright (C) 2000-2019 Free Software Foundation, Inc.
    Contributed by Andy Vaught & Niels Kristian Bech Jensen
@@ -619,7 +620,7 @@ error_print (const char *type, const char *format0, va_list argp)
 		l2 = loc;
 		arg[pos].u.stringval = "(2)";
 		/* Point %C first offending character not the last good one. */
-		if (arg[pos].type == TYPE_CURRENTLOC)
+		if (arg[pos].type == TYPE_CURRENTLOC && *l2->nextc != '\0')
 		  l2->nextc++;
 	      }
 	    else
@@ -628,7 +629,7 @@ error_print (const char *type, const char *format0, va_list argp)
 		have_l1 = 1;
 		arg[pos].u.stringval = "(1)";
 		/* Point %C first offending character not the last good one. */
-		if (arg[pos].type == TYPE_CURRENTLOC)
+		if (arg[pos].type == TYPE_CURRENTLOC && *l1->nextc != '\0')
 		  l1->nextc++;
 	      }
 	    break;
@@ -969,7 +970,7 @@ gfc_format_decoder (pretty_printer *pp, text_info *text, const char *spec,
 	  loc = va_arg (*text->args_ptr, locus *);
 	gcc_assert (loc->nextc - loc->lb->line >= 0);
 	unsigned int offset = loc->nextc - loc->lb->line;
-	if (*spec == 'C')
+	if (*spec == 'C' && *loc->nextc != '\0')
 	  /* Point %C first offending character not the last good one. */
 	  offset++;
 	/* If location[0] != UNKNOWN_LOCATION means that we already
-- 
cgit v1.1


From f1cb5c0aadc245d902e040f4b35a06e1fc8d2d50 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 14 Oct 2019 10:28:05 +0200
Subject: re PR c++/92084 (ICE: tree check: expected tree that contains 'decl
 minimal' structure, have 'compound_expr' in gimplify_scan_omp_clauses, at
 gimplify.c:9039)

	PR c++/92084
	* semantics.c (handle_omp_array_sections_1): Temporarily disable
	-fstrong-eval-order also for in_reduction and task_reduction clauses.

	* g++.dg/gomp/pr92084.C: New test.

From-SVN: r276954
---
 gcc/cp/ChangeLog                    |  4 ++++
 gcc/cp/semantics.c                  |  4 +++-
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/g++.dg/gomp/pr92084.C | 11 +++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/gomp/pr92084.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index af08497..187935d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-14  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/92084
+	* semantics.c (handle_omp_array_sections_1): Temporarily disable
+	-fstrong-eval-order also for in_reduction and task_reduction clauses.
+
 	* parser.c (cp_parser_omp_all_clauses): Change bool NESTED_P argument
 	into int NESTED, if it is 2, diagnose missing commas in between
 	clauses.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index f93bb93..59def31 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5068,7 +5068,9 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types,
      saying how many times the side-effects are evaluated is unspecified,
      makes int *a, *b; ... reduction(+:a[a = b, 3:10]) really unspecified.  */
   warning_sentinel s (flag_strong_eval_order,
-		      OMP_CLAUSE_CODE (c) == OMP_CLAUSE_REDUCTION);
+		      OMP_CLAUSE_CODE (c) == OMP_CLAUSE_REDUCTION
+		      || OMP_CLAUSE_CODE (c) == OMP_CLAUSE_IN_REDUCTION
+		      || OMP_CLAUSE_CODE (c) == OMP_CLAUSE_TASK_REDUCTION);
   ret = grok_array_decl (OMP_CLAUSE_LOCATION (c), ret, low_bound, false);
   return ret;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7385c33..093bd17 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/92084
+	* g++.dg/gomp/pr92084.C: New test.
+
 2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* gcc.dg/diag-aka-5.h: New test.
diff --git a/gcc/testsuite/g++.dg/gomp/pr92084.C b/gcc/testsuite/g++.dg/gomp/pr92084.C
new file mode 100644
index 0000000..da3079b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr92084.C
@@ -0,0 +1,11 @@
+// PR c++/92084
+
+void bar (int *, int);
+int baz (int);
+
+void
+foo (int *x, int y)
+{
+#pragma omp taskgroup task_reduction (*: x[baz (y)])
+  bar (x, baz (y));
+}
-- 
cgit v1.1


From e67b6ba62aa896f9b6a42625d754ca3adf58b42b Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Mon, 14 Oct 2019 08:28:11 +0000
Subject: Fix previous commit

        * error.c: Remove debug pragma added in previous commit.

From-SVN: r276955
---
 gcc/fortran/ChangeLog | 4 ++++
 gcc/fortran/error.c   | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ad30ff2..1f119a8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-14  Tobias Burnus  <tobias@codesourcery.com>
 
+	* error.c: Remove debug pragma added in previous commit.
+
+2019-10-14  Tobias Burnus  <tobias@codesourcery.com>
+
 	PR fortran/92072
 	* error.c (error_print, gfc_format_decoder): Fix %C column-
 	offset handling.
diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index 7962c93..b20aa86 100644
--- a/gcc/fortran/error.c
+++ b/gcc/fortran/error.c
@@ -1,4 +1,3 @@
-#pragma GCC optimize("O0")
 /* Handle errors.
    Copyright (C) 2000-2019 Free Software Foundation, Inc.
    Contributed by Andy Vaught & Niels Kristian Bech Jensen
-- 
cgit v1.1


From 312f3fa49dd446fc42b3783102a7f956aa0856e7 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 14 Oct 2019 11:29:33 +0000
Subject: decl.c (check_tag_decl): Use DECL_SOURCE_LOCATION.

/cp
2019-10-14  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (check_tag_decl): Use DECL_SOURCE_LOCATION.

/testsuite
2019-10-14  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/constexpr-union5.C: Test location(s) too.
	* g++.dg/diagnostic/bitfld2.C: Likewise.
	* g++.dg/ext/anon-struct1.C: Likewise.
	* g++.dg/ext/anon-struct6.C: Likewise.
	* g++.dg/ext/flexary19.C: Likewise.
	* g++.dg/ext/flexary9.C: Likewise.
	* g++.dg/template/error17.C: Likewise.

From-SVN: r276958
---
 gcc/cp/ChangeLog                              |  4 +++
 gcc/cp/decl.c                                 |  6 ++--
 gcc/testsuite/ChangeLog                       | 10 ++++++
 gcc/testsuite/g++.dg/cpp0x/constexpr-union5.C |  8 ++---
 gcc/testsuite/g++.dg/diagnostic/bitfld2.C     |  2 +-
 gcc/testsuite/g++.dg/ext/anon-struct1.C       |  4 +--
 gcc/testsuite/g++.dg/ext/anon-struct6.C       |  4 +--
 gcc/testsuite/g++.dg/ext/flexary19.C          | 24 +++++++--------
 gcc/testsuite/g++.dg/ext/flexary9.C           | 44 +++++++++++++--------------
 gcc/testsuite/g++.dg/template/error17.C       |  2 +-
 10 files changed, 61 insertions(+), 47 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 187935d..2864107 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* decl.c (check_tag_decl): Use DECL_SOURCE_LOCATION.
+
 2019-10-14  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/92084
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6f4c589..a9ff427 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4990,9 +4990,9 @@ check_tag_decl (cp_decl_specifier_seq *declspecs,
       /* Anonymous unions are objects, so they can have specifiers.  */;
       SET_ANON_AGGR_TYPE_P (declared_type);
 
-      if (TREE_CODE (declared_type) != UNION_TYPE
-	  && !in_system_header_at (input_location))
-	pedwarn (input_location, OPT_Wpedantic, "ISO C++ prohibits anonymous structs");
+      if (TREE_CODE (declared_type) != UNION_TYPE)
+	pedwarn (DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (declared_type)),
+		 OPT_Wpedantic, "ISO C++ prohibits anonymous structs");
     }
 
   else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 093bd17..13988f8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/constexpr-union5.C: Test location(s) too.
+	* g++.dg/diagnostic/bitfld2.C: Likewise.
+	* g++.dg/ext/anon-struct1.C: Likewise.
+	* g++.dg/ext/anon-struct6.C: Likewise.
+	* g++.dg/ext/flexary19.C: Likewise.
+	* g++.dg/ext/flexary9.C: Likewise.
+	* g++.dg/template/error17.C: Likewise.
+
 2019-10-14  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/92084
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-union5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-union5.C
index 5779666..53182e6 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-union5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-union5.C
@@ -23,16 +23,16 @@ SA((a.i == 42));
 
 struct B
 {
-  struct {
+  struct {		        // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
     int h;
-    struct {
+    struct {			// { dg-warning "12:ISO C\\+\\+ prohibits anonymous struct" }
       union {
 	unsigned char i;
 	int j;
       };
       int k;
-    };				// { dg-warning "anonymous struct" }
-  };				// { dg-warning "anonymous struct" }
+    };
+  };
   int l;
 
   constexpr B(): h(1), i(2), k(3), l(4) {}
diff --git a/gcc/testsuite/g++.dg/diagnostic/bitfld2.C b/gcc/testsuite/g++.dg/diagnostic/bitfld2.C
index 46d5ee2..88e7ebf 100644
--- a/gcc/testsuite/g++.dg/diagnostic/bitfld2.C
+++ b/gcc/testsuite/g++.dg/diagnostic/bitfld2.C
@@ -6,4 +6,4 @@ template<int> struct A
   struct {} : 2;   // { dg-error "expected ';' after struct" "expected" }
 };
 // { dg-error "ISO C.. forbids declaration" "declaration" { target *-*-* } 6 }
-// { dg-error "ISO C.. prohibits anonymous" "anonymous" { target *-*-* } 6 }
+// { dg-error "10:ISO C.. prohibits anonymous" "anonymous" { target *-*-* } 6 }
diff --git a/gcc/testsuite/g++.dg/ext/anon-struct1.C b/gcc/testsuite/g++.dg/ext/anon-struct1.C
index 0a682db..ceeb8e1 100644
--- a/gcc/testsuite/g++.dg/ext/anon-struct1.C
+++ b/gcc/testsuite/g++.dg/ext/anon-struct1.C
@@ -19,7 +19,7 @@ char testD[sizeof(C::D) == sizeof(A) ? 1 : -1];
 
 /* GNU extension.  */
 struct E {
-  struct { char z; };		/* { dg-error "prohibits anonymous structs" } */
+  struct { char z; };		/* { dg-error "10:ISO C\\+\\+ prohibits anonymous structs" } */
   char e;
 };
 
@@ -45,6 +45,6 @@ char testH[sizeof(H) == 2 * sizeof(A) ? 1 : -1];
 
 /* Make sure __extension__ gets turned back off.  */
 struct I {
-  struct { char z; };		/* { dg-error "prohibits anonymous structs" } */
+  struct { char z; };		/* { dg-error "10:ISO C\\+\\+ prohibits anonymous structs" } */
   char i;
 };
diff --git a/gcc/testsuite/g++.dg/ext/anon-struct6.C b/gcc/testsuite/g++.dg/ext/anon-struct6.C
index 360f250..fad508a 100644
--- a/gcc/testsuite/g++.dg/ext/anon-struct6.C
+++ b/gcc/testsuite/g++.dg/ext/anon-struct6.C
@@ -3,8 +3,8 @@
 struct A
 {
   struct
-  {
+  { // { dg-error "3:ISO C\\+\\+ prohibits anonymous structs" }
     struct { static int i; }; // { dg-error "prohibits anonymous structs|non-static data members|unnamed class" }
     void foo() { i; } // { dg-error "public non-static data" }
-  }; // { dg-error "prohibits anonymous structs" }
+  };
 };
diff --git a/gcc/testsuite/g++.dg/ext/flexary19.C b/gcc/testsuite/g++.dg/ext/flexary19.C
index 5eaf11b..abfbc43 100644
--- a/gcc/testsuite/g++.dg/ext/flexary19.C
+++ b/gcc/testsuite/g++.dg/ext/flexary19.C
@@ -146,13 +146,13 @@ struct S16
 {
   int i;
 
-  struct {          // { dg-warning "invalid use" }
+  struct {          // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct|invalid use" }
     // A flexible array as a sole member of an anonymous struct is
     // rejected with an error in C mode but emits just a pedantic
     // warning in C++.  Other than excessive pedantry there is no
     // reason to reject it.
     int a[];
-  };                // { dg-warning "anonymous struct" }
+  };
 };
 
 struct S17
@@ -177,9 +177,9 @@ struct S19
 {
   int i;
 
-  struct {          // { dg-warning "invalid use" }
+  struct {          // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct|invalid use" }
     int j, a[];     // { dg-message "declared here" }
-  };                // { dg-warning "anonymous struct" }
+  };
 };
 
 struct S20
@@ -198,10 +198,10 @@ struct S21
   static int i;
   typedef int A[];
 
-  struct {          // { dg-warning "invalid use" }
+  struct {          // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct|invalid use" }
     int j;
     A a;            // { dg-message "declared here" }
-  };                // { dg-warning "anonymous struct" }
+  };
 };
 
 struct S22
@@ -215,11 +215,11 @@ struct S22
 
 struct S23
 {
-  struct {
+  struct {          // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
     static int i;   // { dg-error "static data member" }
 
     int a[];        // { dg-error "in an otherwise empty" }
-  };                // { dg-warning "anonymous struct" }
+  };
 };
 
 struct S24
@@ -296,11 +296,11 @@ union A
 
 union B
 {
-  struct {
-    struct {        // { dg-warning "invalid use" }
+  struct {          // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
+    struct {        // { dg-warning "12:ISO C\\+\\+ prohibits anonymous struct|invalid use" }
       int i, a[];   // { dg-message "declared here" }
-    };              // { dg-warning "anonymous struct" }
-  };                // { dg-warning "anonymous struct" }
+    };
+  };
   int j;
 };
 
diff --git a/gcc/testsuite/g++.dg/ext/flexary9.C b/gcc/testsuite/g++.dg/ext/flexary9.C
index 5ebcdf5..b31e84b 100644
--- a/gcc/testsuite/g++.dg/ext/flexary9.C
+++ b/gcc/testsuite/g++.dg/ext/flexary9.C
@@ -282,64 +282,64 @@ struct S_S_S_x {
 
 struct Anon1 {
   int n;
-  struct {                  // { dg-warning "invalid use \[^\n\r\]* with a zero-size array" }
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct|invalid use \[^\n\r\]* with a zero-size array" }
     int good[0];            // { dg-warning "forbids zero-size array" }
-  };                        // { dg-warning "anonymous struct" }
+  };
 };
 
 ASSERT_AT_END (Anon1, good);
 
 struct Anon2 {
-  struct {                  // { dg-warning "invalid use" }
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct|invalid use" }
     int n;
-    struct {
+    struct {                // { dg-warning "12:ISO C\\+\\+ prohibits anonymous struct" }
       int good[0];          // { dg-warning "zero-size array" }
-    };                      // { dg-warning "anonymous struct" }
-  };                        // { dg-warning "anonymous struct" }
+    };
+  };
 };
 
 ASSERT_AT_END (Anon2, good);
 
 struct Anon3 {
-  struct {                  // { dg-warning "invalid use" }
-    struct {
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct|invalid use" }
+    struct {                // { dg-warning "12:ISO C\\+\\+ prohibits anonymous struct" }
       int n;
       int good[0];          // { dg-warning "zero-size array" }
-    };                      // { dg-warning "anonymous struct" }
-  };                        // { dg-warning "anonymous struct" }
+    };
+  };
 };
 
 ASSERT_AT_END (Anon3, good);
 
 struct Anon4 {
-  struct {
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
     int in_empty_struct[0]; // { dg-warning "zero-size array|in an otherwise empty" }
-  };                        // { dg-warning "anonymous struct" }
+  };
 };
 
 struct Anon5 {
-  struct {
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
     int not_at_end[0];      // { dg-warning "zero-size array|not at end" }
-  };                        // { dg-warning "anonymous struct" }
+  };
   int n;
 };
 
 struct Anon6 {
-  struct {
-    struct {
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
+    struct {                // { dg-warning "12:ISO C\\+\\+ prohibits anonymous struct" }
       int not_at_end[0];    // { dg-warning "zero-size array|not at end" }
-    };                      // { dg-warning "anonymous struct" }
+    };
     int n;
-  };                        // { dg-warning "anonymous struct" }
+  };
 };
 
 
 struct Anon7 {
-  struct {
-    struct {
+  struct {                  // { dg-warning "10:ISO C\\+\\+ prohibits anonymous struct" }
+    struct {                // { dg-warning "12:ISO C\\+\\+ prohibits anonymous struct" }
       int not_at_end[0];    // { dg-warning "zero-size array|not at end" }
-    };                      // { dg-warning "anonymous struct" }
-  };                        // { dg-warning "anonymous struct" }
+    };
+  };
   int n;
 };
 
diff --git a/gcc/testsuite/g++.dg/template/error17.C b/gcc/testsuite/g++.dg/template/error17.C
index 5b3281a..7803a1e 100644
--- a/gcc/testsuite/g++.dg/template/error17.C
+++ b/gcc/testsuite/g++.dg/template/error17.C
@@ -4,6 +4,6 @@ template <typename T>
 void
 foo()
 {
-  union { struct { }; }; // { dg-error "prohibits anonymous struct" "anon" }
+  union { struct { }; }; // { dg-error "18:ISO C\\+\\+ prohibits anonymous struct" }
   // { dg-error "18:anonymous struct not inside" "not inside" { target *-*-* } .-1 }
 }
-- 
cgit v1.1


From 7bd8bec53f0e43c7a7852c54650746e65324514b Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 14 Oct 2019 11:47:15 +0000
Subject: re PR tree-optimization/92069 (ice in vect_analyze_scalar_cycles_1,
 at tree-vect-loop.c:560)

2019-10-14  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92069
	* tree-vect-loop.c (vect_analyze_scalar_cycles_1): For nested
	cycles do not set vect_nested_cycle on the latch definition.

	* gcc.dg/torture/pr92069.c: New testcase.

From-SVN: r276959
---
 gcc/ChangeLog                          |  6 ++++++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gcc.dg/torture/pr92069.c | 19 +++++++++++++++++++
 gcc/tree-vect-loop.c                   |  1 -
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/pr92069.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e755803..c2cbd42 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-14  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92069
+	* tree-vect-loop.c (vect_analyze_scalar_cycles_1): For nested
+	cycles do not set vect_nested_cycle on the latch definition.
+
 2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* function-abi.h (expr_callee_abi): Declare.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 13988f8..281da7f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92069
+	* gcc.dg/torture/pr92069.c: New testcase.
+
 2019-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.dg/cpp0x/constexpr-union5.C: Test location(s) too.
diff --git a/gcc/testsuite/gcc.dg/torture/pr92069.c b/gcc/testsuite/gcc.dg/torture/pr92069.c
new file mode 100644
index 0000000..806ff5f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr92069.c
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-ftree-vectorize" } */
+
+unsigned int a, c, d;
+double b;
+void e()
+{
+  for (; d; d++)
+    {
+      double f;
+      a = 2;
+      for (; a; a++)
+	{
+	  c = b;
+	  b = f;
+	  f = c;
+	}
+    }
+}
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index cb95ea3..de018ac 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -584,7 +584,6 @@ vect_analyze_scalar_cycles_1 (loop_vec_info loop_vinfo, class loop *loop)
 				     "Detected vectorizable nested cycle.\n");
 
                   STMT_VINFO_DEF_TYPE (stmt_vinfo) = vect_nested_cycle;
-		  STMT_VINFO_DEF_TYPE (reduc_stmt_info) = vect_nested_cycle;
                 }
               else
                 {
-- 
cgit v1.1


From c7207339a7dbce5b68f872064e624dcf1639ba46 Mon Sep 17 00:00:00 2001
From: Wilco Dijkstra <wdijkstr@arm.com>
Date: Mon, 14 Oct 2019 12:21:14 +0000
Subject: [ARM] Switch to default sched pressure algorithm

Currently the Arm backend selects the alternative sched pressure algorithm.
The issue is that this doesn't take register pressure into account, and so
it causes significant additional spilling on Arm where there are only 14
allocatable registers.  Building SPEC2006 showed significant codesize gains
with the default pressure algorithm, so switch back to that.  PR77308 shows
~800 fewer instructions.

SPECINT2006 is ~0.6% faster on Cortex-A57 together with the other DImode
patches. Overall SPEC codesize is 1.1% smaller.

    gcc/
	* config/arm/arm.c (arm_option_override): Don't override sched
	pressure algorithm.

From-SVN: r276960
---
 gcc/ChangeLog        | 5 +++++
 gcc/config/arm/arm.c | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2cbd42..f07a0e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* config/arm/arm.c (arm_option_override): Don't override sched
+	pressure algorithm.
+
 2019-10-14  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92069
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 39e1a1e..394b1dd 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -3555,11 +3555,6 @@ arm_option_override (void)
 			   global_options.x_param_values,
 			   global_options_set.x_param_values);
 
-  /* Use the alternative scheduling-pressure algorithm by default.  */
-  maybe_set_param_value (PARAM_SCHED_PRESSURE_ALGORITHM, SCHED_PRESSURE_MODEL,
-			 global_options.x_param_values,
-			 global_options_set.x_param_values);
-
   /* Look through ready list and all of queue for instructions
      relevant for L2 auto-prefetcher.  */
   int param_sched_autopref_queue_depth;
-- 
cgit v1.1


From ea9782106cd2cfbb53237024dcc984a26acb7130 Mon Sep 17 00:00:00 2001
From: Wilco Dijkstra <wdijkstr@arm.com>
Date: Mon, 14 Oct 2019 12:25:00 +0000
Subject: [ARM] Enable arm_legitimize_address for Thumb-2

Currently arm_legitimize_address doesn't handle Thumb-2 at all, resulting in
inefficient code.  Since Thumb-2 supports similar address offsets use the Arm
legitimization code for Thumb-2 to get significant codesize and performance
gains.  SPECINT2006 shows 0.4% gain on Cortex-A57, while SPECFP improves 0.2%.

    gcc/
	* config/arm/arm.c (arm_legitimize_address): Remove Thumb-2 bailout.

From-SVN: r276961
---
 gcc/ChangeLog        | 4 ++++
 gcc/config/arm/arm.c | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f07a0e6..176c0d2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-14  Wilco Dijkstra  <wdijkstr@arm.com>
 
+	* config/arm/arm.c (arm_legitimize_address): Remove Thumb-2 bailout.
+
+2019-10-14  Wilco Dijkstra  <wdijkstr@arm.com>
+
 	* config/arm/arm.c (arm_option_override): Don't override sched
 	pressure algorithm.
 
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 394b1dd..ba33047 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -8934,13 +8934,8 @@ arm_legitimize_address (rtx x, rtx orig_x, machine_mode mode)
 	return x;
     }
 
-  if (!TARGET_ARM)
-    {
-      /* TODO: legitimize_address for Thumb2.  */
-      if (TARGET_THUMB2)
-        return x;
-      return thumb_legitimize_address (x, orig_x, mode);
-    }
+  if (TARGET_THUMB1)
+    return thumb_legitimize_address (x, orig_x, mode);
 
   if (GET_CODE (x) == PLUS)
     {
-- 
cgit v1.1


From d2317d50ae2402e5335f2ed807a166359565566b Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 14 Oct 2019 14:01:15 +0000
Subject: internal/cpu: define kdsaQuery for s390

    Patch from Andreas Krebbel.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/201037

From-SVN: r276962
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 1c90e55..360c76b 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-f174fdad69cad42309984dfa108d80f2ae8a9f78
+ed1bd343130ab4907750156d3c04a0cef428bf68
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1


From fc2d730302da5cdf340a5100882337a807097f47 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 14 Oct 2019 14:03:35 +0000
Subject: re PR middle-end/92046 (Command line options (that are per-functions)
 are affecting --params which are global.)

2019-10-14  Richard Biener  <rguenther@suse.de>

	PR middle-end/92046
	* dse.c (scan_insn): Use param max_active_local_stores.
	(dse_step1): Get PARAM_MAX_DSE_ACTIVE_LOCAL_STORES and adjust
	based on optimization level.
	* loop-invariant.c (move_loop_invariants): Adjust
	LOOP_INVARIANT_MAX_BBS_IN_LOOP based on optimization level.
	* opts.c (default_options_optimization): Do not adjust
	PARAM_MAX_DSE_ACTIVE_LOCAL_STORES and
	LOOP_INVARIANT_MAX_BBS_IN_LOOP here.

From-SVN: r276963
---
 gcc/ChangeLog        | 12 ++++++++++++
 gcc/dse.c            | 16 ++++++++++------
 gcc/loop-invariant.c | 10 +++++++---
 gcc/opts.c           | 15 ---------------
 4 files changed, 29 insertions(+), 24 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 176c0d2..5db9057 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-14  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/92046
+	* dse.c (scan_insn): Use param max_active_local_stores.
+	(dse_step1): Get PARAM_MAX_DSE_ACTIVE_LOCAL_STORES and adjust
+	based on optimization level.
+	* loop-invariant.c (move_loop_invariants): Adjust
+	LOOP_INVARIANT_MAX_BBS_IN_LOOP based on optimization level.
+	* opts.c (default_options_optimization): Do not adjust
+	PARAM_MAX_DSE_ACTIVE_LOCAL_STORES and
+	LOOP_INVARIANT_MAX_BBS_IN_LOOP here.
+
 2019-10-14  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* config/arm/arm.c (arm_legitimize_address): Remove Thumb-2 bailout.
diff --git a/gcc/dse.c b/gcc/dse.c
index c03b922..5d8c6f9 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -2401,7 +2401,7 @@ copy_fixed_regs (const_bitmap in)
    non-register target.  */
 
 static void
-scan_insn (bb_info_t bb_info, rtx_insn *insn)
+scan_insn (bb_info_t bb_info, rtx_insn *insn, int max_active_local_stores)
 {
   rtx body;
   insn_info_type *insn_info = insn_info_type_pool.allocate ();
@@ -2523,8 +2523,7 @@ scan_insn (bb_info_t bb_info, rtx_insn *insn)
 		    fprintf (dump_file, "handling memset as BLKmode store\n");
 		  if (mems_found == 1)
 		    {
-		      if (active_local_stores_len++
-			  >= PARAM_VALUE (PARAM_MAX_DSE_ACTIVE_LOCAL_STORES))
+		      if (active_local_stores_len++ >= max_active_local_stores)
 			{
 			  active_local_stores_len = 1;
 			  active_local_stores = NULL;
@@ -2584,8 +2583,7 @@ scan_insn (bb_info_t bb_info, rtx_insn *insn)
      it as cannot delete.  This simplifies the processing later.  */
   if (mems_found == 1)
     {
-      if (active_local_stores_len++
-	  >= PARAM_VALUE (PARAM_MAX_DSE_ACTIVE_LOCAL_STORES))
+      if (active_local_stores_len++ >= max_active_local_stores)
 	{
 	  active_local_stores_len = 1;
 	  active_local_stores = NULL;
@@ -2657,6 +2655,12 @@ dse_step1 (void)
   bitmap_set_bit (all_blocks, ENTRY_BLOCK);
   bitmap_set_bit (all_blocks, EXIT_BLOCK);
 
+  /* For -O1 reduce the maximum number of active local stores for RTL DSE
+     since this can consume huge amounts of memory (PR89115).  */
+  int max_active_local_stores = PARAM_VALUE (PARAM_MAX_DSE_ACTIVE_LOCAL_STORES);
+  if (optimize < 2)
+    max_active_local_stores /= 10;
+
   FOR_ALL_BB_FN (bb, cfun)
     {
       insn_info_t ptr;
@@ -2684,7 +2688,7 @@ dse_step1 (void)
 	  FOR_BB_INSNS (bb, insn)
 	    {
 	      if (INSN_P (insn))
-		scan_insn (bb_info, insn);
+		scan_insn (bb_info, insn, max_active_local_stores);
 	      cselib_process_insn (insn);
 	      if (INSN_P (insn))
 		df_simulate_one_insn_forwards (bb, insn, regs_live);
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index d54cca4..ef46c8a 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -2276,9 +2276,13 @@ move_loop_invariants (void)
   FOR_EACH_LOOP (loop, LI_FROM_INNERMOST)
     {
       curr_loop = loop;
-      /* move_single_loop_invariants for very large loops
-	 is time consuming and might need a lot of memory.  */
-      if (loop->num_nodes <= (unsigned) LOOP_INVARIANT_MAX_BBS_IN_LOOP)
+      /* move_single_loop_invariants for very large loops is time consuming
+	 and might need a lot of memory.  For -O1 only do loop invariant
+	 motion for very small loops.  */
+      unsigned max_bbs = LOOP_INVARIANT_MAX_BBS_IN_LOOP;
+      if (optimize < 2)
+	max_bbs /= 10;
+      if (loop->num_nodes <= max_bbs)
 	move_single_loop_invariants (loop);
     }
 
diff --git a/gcc/opts.c b/gcc/opts.c
index 32869ca..ff95853 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -671,21 +671,6 @@ default_options_optimization (struct gcc_options *opts,
      opt2 ? 100 : default_param_value (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE),
      opts->x_param_values, opts_set->x_param_values);
 
-  /* For -O1 only do loop invariant motion for very small loops.  */
-  maybe_set_param_value
-    (PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP,
-     opt2 ? default_param_value (PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP)
-     : default_param_value (PARAM_LOOP_INVARIANT_MAX_BBS_IN_LOOP) / 10,
-     opts->x_param_values, opts_set->x_param_values);
-
-  /* For -O1 reduce the maximum number of active local stores for RTL DSE
-     since this can consume huge amounts of memory (PR89115).  */
-  maybe_set_param_value
-    (PARAM_MAX_DSE_ACTIVE_LOCAL_STORES,
-     opt2 ? default_param_value (PARAM_MAX_DSE_ACTIVE_LOCAL_STORES)
-     : default_param_value (PARAM_MAX_DSE_ACTIVE_LOCAL_STORES) / 10,
-     opts->x_param_values, opts_set->x_param_values);
-
   /* At -Ofast, allow store motion to introduce potential race conditions.  */
   maybe_set_param_value
     (PARAM_ALLOW_STORE_DATA_RACES,
-- 
cgit v1.1


From 2dccdbcff61201656cf1b37cd690ad6c3f7db8ad Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 14 Oct 2019 14:10:16 +0000
Subject: runtime: correct facilities names in s390 CPU support

    Patch from Andreas Krebbel.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/201038

From-SVN: r276964
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 360c76b..651f7473 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ed1bd343130ab4907750156d3c04a0cef428bf68
+f71238c0112311e4525a1f4b76d2f80be87d2e62
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1


From 10aabe339a9eec4e81fbc56cacad7b532b33d20c Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Mon, 14 Oct 2019 19:18:34 +0000
Subject: [Darwin, machopic 9/n] Minor code clean-ups.

Improve some comments, replace some asserts that have been in the code
base for years with checking-asserts.

gcc/ChangeLog:

2019-10-14  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c: Use unsigned ints for the picbase label
	counters, initialise the vars explicitly.
	(update_pic_label_number_if_needed): Move a variable declaration
	to where it's needed.
	(machopic_output_function_base_name): Use a more strict checking
	assert, and and unsigned int for the picbase label counter.
	(machopic_get_function_picbase): Likewise.

From-SVN: r276967
---
 gcc/ChangeLog       | 10 ++++++++++
 gcc/config/darwin.c | 32 +++++++++++++++++---------------
 2 files changed, 27 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5db9057..adc3550 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-14  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c: Use unsigned ints for the picbase label
+	counters, initialise the vars explicitly.
+	(update_pic_label_number_if_needed): Move a variable declaration
+	to where it's needed.
+	(machopic_output_function_base_name): Use a more strict checking
+	assert, and and unsigned int for the picbase label counter.
+	(machopic_get_function_picbase): Likewise.
+
 2019-10-14  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/92046
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 8635fc2..1d386e0 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -375,20 +375,22 @@ machopic_gen_offset (rtx orig)
     }
 }
 
-static GTY(()) const char * function_base_func_name;
-static GTY(()) int current_pic_label_num;
-static GTY(()) int emitted_pic_label_num;
-
+static GTY(()) const char * function_base_func_name = NULL;
+static GTY(()) unsigned current_pic_label_num = 0;
+static GTY(()) unsigned emitted_pic_label_num = 0;
+
+/* We need to keep one picbase label per function, but (when we emit code
+   to reload the picbase for setjump receiver) we might need to check for
+   a second use.  So, only update the picbase label counter when we see a
+   new function.  When there's no function decl, we assume that the call is
+   from the x86 stub generation code.  */
 static void
 update_pic_label_number_if_needed (void)
 {
-  const char *current_name;
-
-  /* When we are generating _get_pc thunks within stubs, there is no current
-     function.  */
   if (current_function_decl)
     {
-      current_name =
+
+      const char *current_name =
 	IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl));
       if (function_base_func_name != current_name)
 	{
@@ -406,11 +408,11 @@ update_pic_label_number_if_needed (void)
 void
 machopic_output_function_base_name (FILE *file)
 {
-  /* If dynamic-no-pic is on, we should not get here.  */
-  gcc_assert (!MACHO_DYNAMIC_NO_PIC_P);
+  /* We should only get here for -fPIC.  */
+  gcc_checking_assert (MACHOPIC_PURE);
 
   update_pic_label_number_if_needed ();
-  fprintf (file, "L%d$pb", current_pic_label_num);
+  fprintf (file, "L%u$pb", current_pic_label_num);
 }
 
 char curr_picbasename[32];
@@ -418,11 +420,11 @@ char curr_picbasename[32];
 const char *
 machopic_get_function_picbase (void)
 {
-  /* If dynamic-no-pic is on, we should not get here.  */
-  gcc_assert (!MACHO_DYNAMIC_NO_PIC_P);
+  /* We should only get here for -fPIC.  */
+  gcc_checking_assert (MACHOPIC_PURE);
 
   update_pic_label_number_if_needed ();
-  snprintf (curr_picbasename, 32, "L%d$pb", current_pic_label_num);
+  snprintf (curr_picbasename, 32, "L%u$pb", current_pic_label_num);
   return (const char *) curr_picbasename;
 }
 
-- 
cgit v1.1


From ac308262f344153d472b16c85cc1c3036ce43308 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 14 Oct 2019 16:13:49 -0400
Subject: PR c++/91930 - ICE with constrained inherited default ctor.

The testcase was crashing because lazily_declare_fn was failing to add a
defaulted constructor, because the implicit declaration was less constrained
than the inherited default constructor.  But when we have an inherited
constructor, we shouldn't be trying to declare a default constructor in the
first place, because it counts as "a user-declared constructor".  With that
fixed I needed to adjust a couple of inherited constructor testcases that
previously had been diagnosing the default constructor as deleted rather
than not declared.

	* name-lookup.c (do_class_using_decl): Set TYPE_HAS_USER_CONSTRUCTOR
	for inherited constructor.

From-SVN: r276968
---
 gcc/cp/ChangeLog                                    |  6 ++++++
 gcc/cp/name-lookup.c                                |  1 +
 gcc/testsuite/g++.dg/cpp0x/inh-ctor5.C              |  4 ++--
 gcc/testsuite/g++.dg/cpp1z/inh-ctor22.C             |  4 ++--
 gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor6.C | 12 ++++++++++++
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor6.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2864107..7245b3e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-14  Jason Merrill  <jason@redhat.com>
+
+	PR c++/91930 - ICE with constrained inherited default ctor.
+	* name-lookup.c (do_class_using_decl): Set TYPE_HAS_USER_CONSTRUCTOR
+	for inherited constructor.
+
 2019-10-14  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* decl.c (check_tag_decl): Use DECL_SOURCE_LOCATION.
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 57ab129..9352ce5 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -4613,6 +4613,7 @@ do_class_using_decl (tree scope, tree name)
       maybe_warn_cpp0x (CPP0X_INHERITING_CTORS);
       name = ctor_identifier;
       CLASSTYPE_NON_AGGREGATE (current_class_type) = true;
+      TYPE_HAS_USER_CONSTRUCTOR (current_class_type) = true;
     }
 
   /* Cannot introduce a constructor name.  */
diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor5.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor5.C
index d0038c1..673b638 100644
--- a/gcc/testsuite/g++.dg/cpp0x/inh-ctor5.C
+++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor5.C
@@ -6,13 +6,13 @@ struct B1 {
 struct B2 {
   B2(double) { }
 };
-struct D1 : B1 {    // { dg-error "no match" }
+struct D1 : B1 {
   using B1::B1;	    // implicitly declares D1(int)
   int x;
 };
 void test() {
   D1 d(6);	    // OK: d.x is not initialized
-  D1 e;		    // { dg-error "deleted" } D1 has no default constructor
+  D1 e;		    // { dg-error "no match" } D1 has no default constructor
 }
 struct D2 : B2 {
   using B2::B2;	    // { dg-error "B1::B1" }
diff --git a/gcc/testsuite/g++.dg/cpp1z/inh-ctor22.C b/gcc/testsuite/g++.dg/cpp1z/inh-ctor22.C
index 02ec58a..98336a1 100644
--- a/gcc/testsuite/g++.dg/cpp1z/inh-ctor22.C
+++ b/gcc/testsuite/g++.dg/cpp1z/inh-ctor22.C
@@ -12,7 +12,7 @@ struct B2 {
 
 int get();
 
-struct D1 : B1 {		// { dg-message "B1::B1" }
+struct D1 : B1 {
   using B1::B1;  // inherits B1(int, ...)
   int x;
   int y = get();
@@ -22,7 +22,7 @@ void test() {
   D1 d(2, 3, 4); // OK: B1 is initialized by calling B1(2, 3, 4),
   // then d.x is default-initialized (no initialization is performed),
   // then d.y is initialized by calling get()
-  D1 e;          // { dg-error "" } D1 has a deleted default constructor
+  D1 e;          // { dg-error "" } D1 has no default constructor
 }
 
 struct D2 : B2 {
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor6.C b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor6.C
new file mode 100644
index 0000000..c92d6ac
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts-inherit-ctor6.C
@@ -0,0 +1,12 @@
+// PR c++/91930
+// { dg-do compile { target c++2a } }
+
+template <typename T> struct basic_mixin {
+  basic_mixin() requires true;
+};
+
+struct mixin : basic_mixin<int> {
+  using basic_mixin<int>::basic_mixin;
+};
+
+mixin m;
-- 
cgit v1.1


From 4236e880ee7902f789f8b99e21faea33ecb8a6dd Mon Sep 17 00:00:00 2001
From: Mihailo Stojanovic <mistojanovic@wavecomp.com>
Date: Mon, 14 Oct 2019 21:07:56 +0000
Subject: mips.c (mips_cannot_force_const_mem): Reject vector constants.

	* config/mips/mips.c (mips_cannot_force_const_mem): Reject
	vector constants.

	* gcc.target/mips/constant-spill.c: New test.

From-SVN: r276969
---
 gcc/ChangeLog                                  |  5 +++++
 gcc/config/mips/mips.c                         |  3 ++-
 gcc/testsuite/ChangeLog                        |  4 ++++
 gcc/testsuite/gcc.target/mips/constant-spill.c | 31 ++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.target/mips/constant-spill.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index adc3550..516e9c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-14  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
+
+	* config/mips/mips.c (mips_cannot_force_const_mem): Reject
+	vector constants.
+
 2019-10-14  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c: Use unsigned ints for the picbase label
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index e7c2212..7f6a0db 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -2409,7 +2409,8 @@ mips_cannot_force_const_mem (machine_mode mode, rtx x)
      references, reload will consider forcing C into memory and using
      one of the instruction's memory alternatives.  Returning false
      here will force it to use an input reload instead.  */
-  if (CONST_INT_P (x) && mips_legitimate_constant_p (mode, x))
+  if ((CONST_INT_P (x) || GET_CODE (x) == CONST_VECTOR)
+      && mips_legitimate_constant_p (mode, x))
     return true;
 
   split_const (x, &base, &offset);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 281da7f..08d4a79 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-14  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
+
+	* gcc.target/mips/constant-spill.c: New test.
+
 2019-10-14  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92069
diff --git a/gcc/testsuite/gcc.target/mips/constant-spill.c b/gcc/testsuite/gcc.target/mips/constant-spill.c
new file mode 100644
index 0000000..1494705
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/constant-spill.c
@@ -0,0 +1,31 @@
+/* { dg-do compile } */
+/* { dg-options "-mfp64 -mhard-float -mmsa" } */
+/* { dg-skip-if "code quality test" { *-*-* } { "-Os" "-O0" "-O1" "-O2" } { "" } } */
+
+void foo (void);
+
+void bar (void)
+{
+  int x[4];
+  int y[4];
+  int i;
+
+  while (1)
+    {
+      foo ();
+
+      for (i = 0; i < 4; i++)
+        {
+          x[i] = 0;
+          y[i] = 0;
+        }
+
+      asm volatile (""
+                    :
+                    :"m"(x), "m"(y)
+                    :"memory");
+    }
+}
+
+/* { dg-final { scan-assembler-not "ld.w" } } */
+/* { dg-final { scan-assembler-times "st.w" 2 } } */
-- 
cgit v1.1


From 128ec9d5505429297231540d48ea2b2ac2a3f89b Mon Sep 17 00:00:00 2001
From: Joel Hutton <Joel.Hutton@arm.com>
Date: Mon, 14 Oct 2019 21:09:45 +0000
Subject: * doc/tree-ssa.texi: Update renamed macro name.

From-SVN: r276970
---
 gcc/ChangeLog         | 4 ++++
 gcc/doc/tree-ssa.texi | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 516e9c1..b58f60c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-14 Joel Hutton  <Joel.Hutton@arm.com>
+
+	* doc/tree-ssa.texi: Update renamed macro name.
+
 2019-10-14  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
 
 	* config/mips/mips.c (mips_cannot_force_const_mem): Reject
diff --git a/gcc/doc/tree-ssa.texi b/gcc/doc/tree-ssa.texi
index 9714c5a..a7da6f9 100644
--- a/gcc/doc/tree-ssa.texi
+++ b/gcc/doc/tree-ssa.texi
@@ -385,14 +385,14 @@ optimization can manipulate the stmt when all the uses have been
 processed.  This is a little slower than the FAST version since it adds a
 placeholder element and must sort through the list a bit for each statement.
 This placeholder element must be also be removed if the loop is
-terminated early.  The macro @code{BREAK_FROM_IMM_USE_SAFE} is provided
+terminated early.  The macro @code{BREAK_FROM_IMM_USE_STMT} is provided
 to do this :
 
 @smallexample
   FOR_EACH_IMM_USE_STMT (stmt, iterator, ssa_var)
     @{
       if (stmt == last_stmt)
-        BREAK_FROM_SAFE_IMM_USE (iter);
+        BREAK_FROM_IMM_USE_STMT (iter);
 
       FOR_EACH_IMM_USE_ON_STMT (imm_use_p, iterator)
         SET_USE (imm_use_p, ssa_var_2);
-- 
cgit v1.1


From b08e9f111b80e10b5ae50bcba4e3693475dbf95a Mon Sep 17 00:00:00 2001
From: Maya Rashish <coypu@sdf.org>
Date: Mon, 14 Oct 2019 21:14:16 +0000
Subject: * gcc.c-torture/compile/pr85401: New test.

From-SVN: r276971
---
 gcc/testsuite/ChangeLog                       |  4 ++++
 gcc/testsuite/gcc.c-torture/compile/pr85401.c | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr85401.c

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 08d4a79..494c67f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-14  Maya Rashish  <coypu@sdf.org>
+
+	* gcc.c-torture/compile/pr85401: New test.
+
 2019-10-14  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
 
 	* gcc.target/mips/constant-spill.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr85401.c b/gcc/testsuite/gcc.c-torture/compile/pr85401.c
new file mode 100644
index 0000000..fa8fa19
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr85401.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int h (void);
+int i (int);
+
+struct a b;
+struct a
+{
+  unsigned c:4;
+} d ()
+{
+  int e, f = b.c << 2, g = h ();
+  for (; g;)
+    ;
+  if (e == 0)
+    if (f)
+      i (f);
+  return b;
+}
-- 
cgit v1.1


From 4a4fc7feda04b57e3bf767ba29836868f2f984d7 Mon Sep 17 00:00:00 2001
From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Mon, 14 Oct 2019 21:37:34 +0000
Subject: re PR fortran/92004 (Rejection of different ranks for dummy array
 argument where actual argument is an element)

2019-10-14  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/92004
	* array.c (expand_constructor): Set from_constructor on
	expression.
	* gfortran.h (gfc_symbol): Add maybe_array.
	(gfc_expr): Add from_constructor.
	* interface.c (maybe_dummy_array_arg): New function.
	(compare_parameter): If the formal argument is generated from a
	call, check the conditions where an array element could be
	passed to an array.  Adjust error message for assumed-shape
	or pointer array.  Use correct language for assumed shaped arrays.
	(gfc_get_formal_from_actual_arglist): Set maybe_array on the
	symbol if the actual argument is an array element fulfilling
	the conditions of 15.5.2.4.

2019-10-14  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/92004
	* gfortran.dg/argument_checking_24.f90: New test.
	* gfortran.dg/abstract_type_6.f90: Add error message.
	* gfortran.dg/argument_checking_11.f90: Correct wording
	in error message.
	* gfortran.dg/argumeent_checking_13.f90: Likewise.
	* gfortran.dg/interface_40.f90: Add error message.

From-SVN: r276972
---
 gcc/fortran/ChangeLog                              |  16 ++++
 gcc/fortran/array.c                                |   1 +
 gcc/fortran/gfortran.h                             |   7 ++
 gcc/fortran/interface.c                            | 100 +++++++++++++++++++--
 gcc/testsuite/ChangeLog                            |  10 +++
 gcc/testsuite/gfortran.dg/abstract_type_6.f03      |   2 +-
 gcc/testsuite/gfortran.dg/argument_checking_11.f90 |   8 +-
 gcc/testsuite/gfortran.dg/argument_checking_13.f90 |   6 +-
 gcc/testsuite/gfortran.dg/argument_checking_24.f90 |  63 +++++++++++++
 gcc/testsuite/gfortran.dg/interface_40.f90         |   2 +-
 10 files changed, 201 insertions(+), 14 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/argument_checking_24.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1f119a8..7e05e910 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/92004
+	* array.c (expand_constructor): Set from_constructor on
+	expression.
+	* gfortran.h (gfc_symbol): Add maybe_array.
+	(gfc_expr): Add from_constructor.
+	* interface.c (maybe_dummy_array_arg): New function.
+	(compare_parameter): If the formal argument is generated from a
+	call, check the conditions where an array element could be
+	passed to an array.  Adjust error message for assumed-shape
+	or pointer array.  Use correct language for assumed shaped arrays.
+	(gfc_get_formal_from_actual_arglist): Set maybe_array on the
+	symbol if the actual argument is an array element fulfilling
+	the conditions of 15.5.2.4.
+
 2019-10-14  Tobias Burnus  <tobias@codesourcery.com>
 
 	* error.c: Remove debug pragma added in previous commit.
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index cbeece4..427110b 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -1782,6 +1782,7 @@ expand_constructor (gfc_constructor_base base)
 	  gfc_free_expr (e);
 	  return false;
 	}
+      e->from_constructor = 1;
       current_expand.offset = &c->offset;
       current_expand.repeat = &c->repeat;
       current_expand.component = c->n.component;
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index d84d1fa..920acda 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -1614,6 +1614,9 @@ typedef struct gfc_symbol
   /* Set if a previous error or warning has occurred and no other
      should be reported.  */
   unsigned error:1;
+  /* Set if the dummy argument of a procedure could be an array despite
+     being called with a scalar actual argument. */
+  unsigned maybe_array:1;
 
   int refs;
   struct gfc_namespace *ns;	/* namespace containing this symbol */
@@ -2194,6 +2197,10 @@ typedef struct gfc_expr
   /* Set this if no warning should be given somewhere in a lower level.  */
 
   unsigned int do_not_warn : 1;
+
+  /* Set this if the expression came from expanding an array constructor.  */
+  unsigned int from_constructor : 1;
+
   /* If an expression comes from a Hollerith constant or compile-time
      evaluation of a transfer statement, it may have a prescribed target-
      memory representation, and these cannot always be backformed from
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 3313e72..919c95a 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -2229,6 +2229,67 @@ argument_rank_mismatch (const char *name, locus *where,
 }
 
 
+/* Under certain conditions, a scalar actual argument can be passed
+   to an array dummy argument - see F2018, 15.5.2.4, paragraph 14.
+   This function returns true for these conditions so that an error
+   or warning for this can be suppressed later.  Always return false
+   for expressions with rank > 0.  */
+
+bool
+maybe_dummy_array_arg (gfc_expr *e)
+{
+  gfc_symbol *s;
+  gfc_ref *ref;
+  bool array_pointer = false;
+  bool assumed_shape = false;
+  bool scalar_ref = true;
+
+  if (e->rank > 0)
+    return false;
+
+  if (e->ts.type == BT_CHARACTER && e->ts.kind == 1)
+    return true;
+
+  /* If this comes from a constructor, it has been an array element
+     originally.  */
+
+  if (e->expr_type == EXPR_CONSTANT)
+    return e->from_constructor;
+
+  if (e->expr_type != EXPR_VARIABLE)
+    return false;
+
+  s = e->symtree->n.sym;
+
+  if (s->attr.dimension)
+    {
+      scalar_ref = false;
+      array_pointer = s->attr.pointer;
+    }
+
+  if (s->as && s->as->type == AS_ASSUMED_SHAPE)
+    assumed_shape = true;
+
+  for (ref=e->ref; ref; ref=ref->next)
+    {
+      if (ref->type == REF_COMPONENT)
+	{
+	  symbol_attribute *attr;
+	  attr = &ref->u.c.component->attr;
+	  if (attr->dimension)
+	    {
+	      array_pointer = attr->pointer;
+	      assumed_shape = false;
+	      scalar_ref = false;
+	    }
+	  else
+	    scalar_ref = true;
+	}
+    }
+
+  return !(scalar_ref || array_pointer || assumed_shape);
+}
+
 /* Given a symbol of a formal argument list and an expression, see if
    the two are compatible as arguments.  Returns true if
    compatible, false if not compatible.  */
@@ -2544,7 +2605,9 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
       || (actual->rank == 0 && formal->attr.dimension
 	  && gfc_is_coindexed (actual)))
     {
-      if (where)
+      if (where 
+	  && (!formal->attr.artificial || (!formal->maybe_array
+					   && !maybe_dummy_array_arg (actual))))
 	{
 	  locus *where_formal;
 	  if (formal->attr.artificial)
@@ -2594,9 +2657,17 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
       && (is_pointer || ref->u.ar.as->type == AS_ASSUMED_SHAPE))
     {
       if (where)
-	gfc_error ("Element of assumed-shaped or pointer "
-		   "array passed to array dummy argument %qs at %L",
-		   formal->name, &actual->where);
+	{
+	  if (formal->attr.artificial)
+	    gfc_error ("Element of assumed-shape or pointer array "
+		       "as actual argument at %L can not correspond to "
+		       "actual argument at %L ",
+		       &actual->where, &formal->declared_at);
+	  else
+	    gfc_error ("Element of assumed-shape or pointer "
+		       "array passed to array dummy argument %qs at %L",
+		       formal->name, &actual->where);
+	}
       return false;
     }
 
@@ -2625,7 +2696,9 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
 
   if (ref == NULL && actual->expr_type != EXPR_NULL)
     {
-      if (where)
+      if (where 
+	  && (!formal->attr.artificial || (!formal->maybe_array
+					   && !maybe_dummy_array_arg (actual))))
 	{
 	  locus *where_formal;
 	  if (formal->attr.artificial)
@@ -3717,6 +3790,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where)
 {
   gfc_actual_arglist *a;
   gfc_formal_arglist *dummy_args;
+  bool implicit = false;
 
   /* Warn about calls with an implicit interface.  Special case
      for calling a ISO_C_BINDING because c_loc and c_funloc
@@ -3724,6 +3798,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where)
      explicitly declared at all if requested.  */
   if (sym->attr.if_source == IFSRC_UNKNOWN && !sym->attr.is_iso_c)
     {
+      implicit = true;
       if (sym->ns->has_implicit_none_export && sym->attr.proc == PROC_UNKNOWN)
 	{
 	  const char *guessed
@@ -3778,6 +3853,19 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where)
 	  if (a->expr && a->expr->error)
 	    return false;
 
+	  /* F2018, 15.4.2.2 Explicit interface is required for a
+	     polymorphic dummy argument, so there is no way to
+	     legally have a class appear in an argument with an
+	     implicit interface.  */
+
+	  if (implicit && a->expr && a->expr->ts.type == BT_CLASS)
+	    {
+	      gfc_error ("Explicit interface required for polymorphic "
+			 "argument at %L",&a->expr->where);
+	      a->expr->error = 1;
+	      break;
+	    }
+
 	  /* Skip g77 keyword extensions like %VAL, %REF, %LOC.  */
 	  if (a->name != NULL && a->name[0] != '%')
 	    {
@@ -5228,6 +5316,8 @@ gfc_get_formal_from_actual_arglist (gfc_symbol *sym,
 		  s->as->upper[0] = NULL;
 		  s->as->type = AS_ASSUMED_SIZE;
 		}
+	      else
+		s->maybe_array = maybe_dummy_array_arg (a->expr);
 	    }
 	  s->attr.dummy = 1;
 	  s->declared_at = a->expr->where;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 494c67f..0f4eb9f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/92004
+	* gfortran.dg/argument_checking_24.f90: New test.
+	* gfortran.dg/abstract_type_6.f90: Add error message.
+	* gfortran.dg/argument_checking_11.f90: Correct wording
+	in error message.
+	* gfortran.dg/argumeent_checking_13.f90: Likewise.
+	* gfortran.dg/interface_40.f90: Add error message.
+
 2019-10-14  Maya Rashish  <coypu@sdf.org>
 
 	* gcc.c-torture/compile/pr85401: New test.
diff --git a/gcc/testsuite/gfortran.dg/abstract_type_6.f03 b/gcc/testsuite/gfortran.dg/abstract_type_6.f03
index 9dd0a37..ebef02e 100644
--- a/gcc/testsuite/gfortran.dg/abstract_type_6.f03
+++ b/gcc/testsuite/gfortran.dg/abstract_type_6.f03
@@ -46,7 +46,7 @@ END SUBROUTINE bottom_b
 
 SUBROUTINE bottom_c(obj)
    CLASS(Bottom) :: obj
-   CALL top_c(obj)
+   CALL top_c(obj) ! { dg-error "Explicit interface required" }
    ! other stuff
 END SUBROUTINE bottom_c 
 end module
diff --git a/gcc/testsuite/gfortran.dg/argument_checking_11.f90 b/gcc/testsuite/gfortran.dg/argument_checking_11.f90
index 7c70c37..43364a6 100644
--- a/gcc/testsuite/gfortran.dg/argument_checking_11.f90
+++ b/gcc/testsuite/gfortran.dg/argument_checking_11.f90
@@ -29,8 +29,8 @@ SUBROUTINE test1(a,b,c,d,e)
  call as_size( (c) ) ! { dg-error "The upper bound in the last dimension must appear in the reference to the assumed size array" }
  call as_size( (d) )
  call as_size( (e) ) ! { dg-error "Rank mismatch" }
- call as_size(a(1)) ! { dg-error "Element of assumed-shaped" }
- call as_size(b(1)) ! { dg-error "Element of assumed-shaped" }
+ call as_size(a(1)) ! { dg-error "Element of assumed-shape" }
+ call as_size(b(1)) ! { dg-error "Element of assumed-shape" }
  call as_size(c(1))
  call as_size(d(1))
  call as_size( (a(1)) ) ! { dg-error "Rank mismatch" }
@@ -89,8 +89,8 @@ SUBROUTINE test1(a,b,c,d,e)
  call as_expl( (c) ) ! { dg-error "The upper bound in the last dimension must appear in the reference to the assumed size array" }
  call as_expl( (d) )
  call as_expl( (e) ) ! { dg-error "Rank mismatch" }
- call as_expl(a(1)) ! { dg-error "Element of assumed-shaped" }
- call as_expl(b(1)) ! { dg-error "Element of assumed-shaped" }
+ call as_expl(a(1)) ! { dg-error "Element of assumed-shape" }
+ call as_expl(b(1)) ! { dg-error "Element of assumed-shape" }
  call as_expl(c(1))
  call as_expl(d(1))
  call as_expl( (a(1)) ) ! { dg-error "Rank mismatch" }
diff --git a/gcc/testsuite/gfortran.dg/argument_checking_13.f90 b/gcc/testsuite/gfortran.dg/argument_checking_13.f90
index 26e9497..1b7f0c6 100644
--- a/gcc/testsuite/gfortran.dg/argument_checking_13.f90
+++ b/gcc/testsuite/gfortran.dg/argument_checking_13.f90
@@ -26,9 +26,9 @@ real, pointer :: pointer_dummy(:,:,:)
 real, allocatable :: deferred(:,:,:)
 real, pointer     :: ptr(:,:,:)
 call rlv1(deferred(1,1,1))         ! valid since contiguous
-call rlv1(ptr(1,1,1))              ! { dg-error "Element of assumed-shaped or pointer array" }
-call rlv1(assumed_sh_dummy(1,1,1)) ! { dg-error "Element of assumed-shaped or pointer array" }
-call rlv1(pointer_dummy(1,1,1))    ! { dg-error "Element of assumed-shaped or pointer array" }
+call rlv1(ptr(1,1,1))              ! { dg-error "Element of assumed-shape or pointer array" }
+call rlv1(assumed_sh_dummy(1,1,1)) ! { dg-error "Element of assumed-shape or pointer array" }
+call rlv1(pointer_dummy(1,1,1))    ! { dg-error "Element of assumed-shape or pointer array" }
 end
 
 subroutine test2(assumed_sh_dummy, pointer_dummy)
diff --git a/gcc/testsuite/gfortran.dg/argument_checking_24.f90 b/gcc/testsuite/gfortran.dg/argument_checking_24.f90
new file mode 100644
index 0000000..a5f3abe
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/argument_checking_24.f90
@@ -0,0 +1,63 @@
+! { dg-do compile }
+! PR 92004 - checks in the absence of an explicit interface between
+! array elements and arrays
+module x
+  implicit none
+  type t
+     real :: x
+  end type t
+  type tt
+     real :: x(2)
+  end type tt
+  type pointer_t
+     real, pointer :: x(:)
+  end type pointer_t
+  type alloc_t
+     real, dimension(:), allocatable :: x
+  end type alloc_t
+contains
+  subroutine foo(a)
+    real, dimension(:) :: a
+    real, dimension(2), parameter :: b = [1.0, 2.0]
+    real, dimension(10) :: x
+    type (t), dimension(1) :: vv
+    type (pointer_t) :: pointer_v
+    real, dimension(:), pointer :: p
+    call invalid_1(a(1))  ! { dg-error "Rank mismatch" }
+    call invalid_1(a) ! { dg-error "Rank mismatch" }
+    call invalid_2(a) ! { dg-error "Element of assumed-shape or pointer" }
+    call invalid_2(a(1))  ! { dg-error "Element of assumed-shape or pointer" }
+    call invalid_3(b) ! { dg-error "Rank mismatch" }
+    call invalid_3(1.0) ! { dg-error "Rank mismatch" }
+    call invalid_4 (vv(1)%x) ! { dg-error "Rank mismatch" }
+    call invalid_4 (b) ! { dg-error "Rank mismatch" }w
+    call invalid_5 (b) ! { dg-error "Rank mismatch" }
+    call invalid_5 (vv(1)%x) ! { dg-error "Rank mismatch" }
+    call invalid_6 (x) ! { dg-error "can not correspond to actual argument" }
+    call invalid_6 (pointer_v%x(1)) ! { dg-error "can not correspond to actual argument" }
+    call invalid_7 (pointer_v%x(1)) ! { dg-error "Rank mismatch" }
+    call invalid_7 (x) ! { dg-error "Rank mismatch" }
+    call invalid_8 (p(1)) ! { dg-error "Rank mismatch" }
+    call invalid_8 (x) ! { dg-error "Rank mismatch" }
+    call invalid_9 (x) ! { dg-error "can not correspond to actual argument" }
+    call invalid_9 (p(1)) ! { dg-error "can not correspond to actual argument" }
+  end subroutine foo
+
+  subroutine bar(a, alloc)
+    real, dimension(*) :: a
+    real, dimension(2), parameter :: b = [1.0, 2.0]
+    type (alloc_t), pointer :: alloc
+    type (tt) :: tt_var
+    ! None of the ones below should issue an error.
+    call valid_1 (a)
+    call valid_1 (a(1))
+    call valid_2 (a(1))
+    call valid_2 (a)
+    call valid_3 (b)
+    call valid_3 (b(1))
+    call valid_4 (tt_var%x)
+    call valid_4 (tt_var%x(1))
+    call valid_5 (alloc%x(1))
+    call valid_5 (a)
+  end subroutine bar
+end module x
diff --git a/gcc/testsuite/gfortran.dg/interface_40.f90 b/gcc/testsuite/gfortran.dg/interface_40.f90
index 085c6b3..68a10c8 100644
--- a/gcc/testsuite/gfortran.dg/interface_40.f90
+++ b/gcc/testsuite/gfortran.dg/interface_40.f90
@@ -3,6 +3,6 @@
 ! Code contributed by Gerhard Steinmetz
 program p
    class(*) :: x  ! { dg-error " must be dummy, allocatable or pointer" }
-   print *, f(x)
+   print *, f(x) ! { dg-error "Explicit interface required" }
 end
 
-- 
cgit v1.1


From 0a0582d75efb699d9adacc7a89831e90c4bd6c1d Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 14 Oct 2019 23:12:33 +0000
Subject: compiler: revise exportdata fix for processing constant types

    This patch is an addendum to the fix for issue 34577, which was not
    sufficiently general. During export data processing, when looking at
    the types of constants mentioned in inlinable function bodies, include
    both locally defined constants and constant imported from other
    packages.

    Testcase for this bug is in CL 201017.

    Fixes golang/go#34852.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/201018

From-SVN: r276976
---
 gcc/go/gofrontend/MERGE     | 2 +-
 gcc/go/gofrontend/export.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 651f7473..c9efcba 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-f71238c0112311e4525a1f4b76d2f80be87d2e62
+1e2d98b27701744cf0ec57b19d7fc8f594184b9a
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/export.cc b/gcc/go/gofrontend/export.cc
index 5aaa207..b27d2fa 100644
--- a/gcc/go/gofrontend/export.cc
+++ b/gcc/go/gofrontend/export.cc
@@ -250,7 +250,7 @@ Collect_export_references::expression(Expression** pexpr)
     }
 
   const Named_object* nco = expr->named_constant();
-  if (nco != 0 && nco->package() == NULL)
+  if (nco != 0)
     {
       const Named_constant *nc = nco->const_value();
       Type::traverse(nc->type(), this);
-- 
cgit v1.1


From 490d1b4a834897e927d58d1a8fba93c2a33172df Mon Sep 17 00:00:00 2001
From: Kugan Vivekanandarajah <kuganv@linaro.org>
Date: Mon, 14 Oct 2019 23:33:17 +0000
Subject: vfp.md (fma<SDF:mode>4): Enable DF only when TARGET_VFP_DOUBLE.

gcc/ChangeLog:

2019-10-15  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>

	* config/arm/vfp.md (fma<SDF:mode>4): Enable DF only when
	TARGET_VFP_DOUBLE.
	(*fmsub<SDF:mode>4): Likewise.
	*fnmsub<SDF:mode>4): Likewise.
	(*fnmadd<SDF:mode>4): Likewise.

From-SVN: r276977
---
 gcc/ChangeLog         | 8 ++++++++
 gcc/config/arm/vfp.md | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b58f60c..9957d2c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-15  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
+
+	* config/arm/vfp.md (fma<SDF:mode>4): Enable DF only when
+	TARGET_VFP_DOUBLE.
+	(*fmsub<SDF:mode>4): Likewise.
+	*fnmsub<SDF:mode>4): Likewise.
+	(*fnmadd<SDF:mode>4): Likewise.
+
 2019-10-14 Joel Hutton  <Joel.Hutton@arm.com>
 
 	* doc/tree-ssa.texi: Update renamed macro name.
diff --git a/gcc/config/arm/vfp.md b/gcc/config/arm/vfp.md
index 661919e..1979aa6 100644
--- a/gcc/config/arm/vfp.md
+++ b/gcc/config/arm/vfp.md
@@ -1321,7 +1321,7 @@
         (fma:SDF (match_operand:SDF 1 "register_operand" "<F_constraint>")
 		 (match_operand:SDF 2 "register_operand" "<F_constraint>")
 		 (match_operand:SDF 3 "register_operand" "0")))]
-  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA"
+  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA <vfp_double_cond>"
   "vfma%?.<V_if_elem>\\t%<V_reg>0, %<V_reg>1, %<V_reg>2"
   [(set_attr "predicable" "yes")
    (set_attr "type" "ffma<vfp_type>")]
@@ -1357,7 +1357,7 @@
 					     "<F_constraint>"))
 		 (match_operand:SDF 2 "register_operand" "<F_constraint>")
 		 (match_operand:SDF 3 "register_operand" "0")))]
-  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA"
+  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA <vfp_double_cond>"
   "vfms%?.<V_if_elem>\\t%<V_reg>0, %<V_reg>1, %<V_reg>2"
   [(set_attr "predicable" "yes")
    (set_attr "type" "ffma<vfp_type>")]
@@ -1379,7 +1379,7 @@
 	(fma:SDF (match_operand:SDF 1 "register_operand" "<F_constraint>")
 		 (match_operand:SDF 2 "register_operand" "<F_constraint>")
 		 (neg:SDF (match_operand:SDF 3 "register_operand" "0"))))]
-  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA"
+  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA <vfp_double_cond>"
   "vfnms%?.<V_if_elem>\\t%<V_reg>0, %<V_reg>1, %<V_reg>2"
   [(set_attr "predicable" "yes")
    (set_attr "type" "ffma<vfp_type>")]
@@ -1402,7 +1402,7 @@
 					       "<F_constraint>"))
 		 (match_operand:SDF 2 "register_operand" "<F_constraint>")
 		 (neg:SDF (match_operand:SDF 3 "register_operand" "0"))))]
-  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA"
+  "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_FMA <vfp_double_cond>"
   "vfnma%?.<V_if_elem>\\t%<V_reg>0, %<V_reg>1, %<V_reg>2"
   [(set_attr "predicable" "yes")
    (set_attr "type" "ffma<vfp_type>")]
-- 
cgit v1.1


From 783bfe5ee838afc44f8f2125be624788ebe0723b Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 15 Oct 2019 01:12:49 +0100
Subject: Rename attribute-related functions and productions in C parser.

The C2x attribute syntax, [[ ]], appears in different places in the
syntax from GNU __attribute__, and, where they can appear in the same
place in the syntax, they do not always appertain to the same entity.
(For example, in "int func(void) ATTRS;", GNU attributes appertain to
the declaration but C2x attributes appertain to the function type.)

Thus, the C parser needs to handle the two kinds of attributes
separately, with each place in the syntax accepting whatever kinds of
attributes are appropriate there and applying them to the relevant
entities.  This patch prepares for this by renaming parser functions
relating to attributes to make clear they are specifically about GNU
attributes and renaming syntax productions likewise to avoid confusing
with the C2x attributes syntax productions.

Where comments refer to attributes, this has only be changed where it
is clear that in the context they are referring specifically to the
gnu-attributes syntax.  There may be other places that also end up
changing to refer to gnu-attributes as part of the C2x attributes
implementation, if more detailed examination of those places shows
they are also specific to gnu-attributes.  (I do not expect code
dealing with semantics of attributes outside of the parser to need to
change; as for C++, it will be possible to use existing attributes
inside [[]] with the gnu:: form of the attribute name.)

Bootstrapped with no regressions on x86_64-pc-linux-gnu.

	* c-parser.c (c_parser_attribute_any_word): Rename to
	c_parser_gnu_attribute_any_word.  All callers changed.
	(c_parser_attribute): Rename to c_parser_gnu_attribute.  All
	callers changed.
	(c_parser_attributes): Rename to c_parser_gnu_attributes.  All
	callers changed.
	(c_parser_declaration_or_fndef, c_parser_declspecs)
	(c_parser_enum_specifier, c_parser_struct_or_union_specifier)
	(c_parser_struct_declaration, c_parser_declarator)
	(c_parser_gnu_attribute, c_parser_compound_statement)
	(c_parser_label, c_parser_statement, c_parser_objc_method_decl)
	(c_parser_transaction_attributes): Add "gnu-" prefix to names of
	attribute-related syntax productions.

From-SVN: r276978
---
 gcc/c/ChangeLog  |  16 ++++++
 gcc/c/c-parser.c | 156 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 95 insertions(+), 77 deletions(-)

(limited to 'gcc')

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 23310ce..0cf32f6 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-parser.c (c_parser_attribute_any_word): Rename to
+	c_parser_gnu_attribute_any_word.  All callers changed.
+	(c_parser_attribute): Rename to c_parser_gnu_attribute.  All
+	callers changed.
+	(c_parser_attributes): Rename to c_parser_gnu_attributes.  All
+	callers changed.
+	(c_parser_declaration_or_fndef, c_parser_declspecs)
+	(c_parser_enum_specifier, c_parser_struct_or_union_specifier)
+	(c_parser_struct_declaration, c_parser_declarator)
+	(c_parser_gnu_attribute, c_parser_compound_statement)
+	(c_parser_label, c_parser_statement, c_parser_objc_method_decl)
+	(c_parser_transaction_attributes): Add "gnu-" prefix to names of
+	attribute-related syntax productions.
+
 2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* c-objc-common.c (useful_aka_type_p): Replace with...
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 15095dd..7618a46 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -1400,7 +1400,7 @@ static struct c_arg_info *c_parser_parms_list_declarator (c_parser *, tree,
 							  tree);
 static struct c_parm *c_parser_parameter_declaration (c_parser *, tree);
 static tree c_parser_simple_asm_expr (c_parser *);
-static tree c_parser_attributes (c_parser *);
+static tree c_parser_gnu_attributes (c_parser *);
 static struct c_expr c_parser_initializer (c_parser *);
 static struct c_expr c_parser_braced_init (c_parser *, tree, bool,
 					   struct obstack *);
@@ -1714,8 +1714,8 @@ add_debug_begin_stmt (location_t loc)
      init-declarator-list , init-declarator
 
    init-declarator:
-     declarator simple-asm-expr[opt] attributes[opt]
-     declarator simple-asm-expr[opt] attributes[opt] = initializer
+     declarator simple-asm-expr[opt] gnu-attributes[opt]
+     declarator simple-asm-expr[opt] gnu-attributes[opt] = initializer
 
    GNU extensions:
 
@@ -1726,11 +1726,11 @@ add_debug_begin_stmt (location_t loc)
    attribute ;
 
    Objective-C:
-     attributes objc-class-definition
-     attributes objc-category-definition
-     attributes objc-protocol-definition
+     gnu-attributes objc-class-definition
+     gnu-attributes objc-category-definition
+     gnu-attributes objc-protocol-definition
 
-   The simple-asm-expr and attributes are GNU extensions.
+   The simple-asm-expr and gnu-attributes are GNU extensions.
 
    This function does not handle __extension__; that is handled in its
    callers.  ??? Following the old parser, __extension__ may start
@@ -2043,7 +2043,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
 	    asm_name = c_parser_simple_asm_expr (parser);
 	  if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
 	    {
-	      postfix_attrs = c_parser_attributes (parser);
+	      postfix_attrs = c_parser_gnu_attributes (parser);
 	      if (c_parser_next_token_is (parser, CPP_OPEN_BRACE))
 		{
 		  /* This means there is an attribute specifier after
@@ -2244,7 +2244,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
 		}
 	      c_parser_consume_token (parser);
 	      if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-		all_prefix_attrs = chainon (c_parser_attributes (parser),
+		all_prefix_attrs = chainon (c_parser_gnu_attributes (parser),
 					    prefix_attrs);
 	      else
 		all_prefix_attrs = prefix_attrs;
@@ -2544,7 +2544,7 @@ c_parser_static_assert_declaration_no_semi (c_parser *parser)
    6.7, C11 6.7), adding them to SPECS (which may already include some).
    Storage class specifiers are accepted iff SCSPEC_OK; type
    specifiers are accepted iff TYPESPEC_OK; alignment specifiers are
-   accepted iff ALIGNSPEC_OK; attributes are accepted at the start
+   accepted iff ALIGNSPEC_OK; gnu-attributes are accepted at the start
    iff START_ATTR_OK; __auto_type is accepted iff AUTO_TYPE_OK.
 
    declaration-specifiers:
@@ -2613,7 +2613,7 @@ c_parser_static_assert_declaration_no_semi (c_parser *parser)
    GNU extensions:
 
    declaration-specifiers:
-     attributes declaration-specifiers[opt]
+     gnu-attributes declaration-specifiers[opt]
 
    type-qualifier:
      address-space
@@ -2906,7 +2906,7 @@ c_parser_declspecs (c_parser *parser, struct c_declspecs *specs,
 	case RID_ATTRIBUTE:
 	  if (!attrs_ok)
 	    goto out;
-	  attrs = c_parser_attributes (parser);
+	  attrs = c_parser_gnu_attributes (parser);
 	  declspecs_add_attrs (loc, specs, attrs);
 	  break;
 	case RID_ALIGNAS:
@@ -2939,12 +2939,14 @@ c_parser_declspecs (c_parser *parser, struct c_declspecs *specs,
 /* Parse an enum specifier (C90 6.5.2.2, C99 6.7.2.2, C11 6.7.2.2).
 
    enum-specifier:
-     enum attributes[opt] identifier[opt] { enumerator-list } attributes[opt]
-     enum attributes[opt] identifier[opt] { enumerator-list , } attributes[opt]
-     enum attributes[opt] identifier
+     enum gnu-attributes[opt] identifier[opt] { enumerator-list }
+       gnu-attributes[opt]
+     enum gnu-attributes[opt] identifier[opt] { enumerator-list , }
+       gnu-attributes[opt]
+     enum gnu-attributes[opt] identifier
 
    The form with trailing comma is new in C99.  The forms with
-   attributes are GNU extensions.  In GNU C, we accept any expression
+   gnu-attributes are GNU extensions.  In GNU C, we accept any expression
    without commas in the syntax (assignment expressions, not just
    conditional expressions); assignment expressions will be diagnosed
    as non-constant.
@@ -2960,8 +2962,8 @@ c_parser_declspecs (c_parser *parser, struct c_declspecs *specs,
    GNU Extensions:
 
    enumerator:
-     enumeration-constant attributes[opt]
-     enumeration-constant attributes[opt] = constant-expression
+     enumeration-constant gnu-attributes[opt]
+     enumeration-constant gnu-attributes[opt] = constant-expression
 
 */
 
@@ -2975,7 +2977,7 @@ c_parser_enum_specifier (c_parser *parser)
   location_t ident_loc = UNKNOWN_LOCATION;  /* Quiet warning.  */
   gcc_assert (c_parser_next_token_is_keyword (parser, RID_ENUM));
   c_parser_consume_token (parser);
-  attrs = c_parser_attributes (parser);
+  attrs = c_parser_gnu_attributes (parser);
   enum_loc = c_parser_peek_token (parser)->location;
   /* Set the location in case we create a decl now.  */
   c_parser_set_source_position_from_token (c_parser_peek_token (parser));
@@ -3031,7 +3033,7 @@ c_parser_enum_specifier (c_parser *parser)
 	  decl_loc = value_loc = token->location;
 	  c_parser_consume_token (parser);
 	  /* Parse any specified attributes.  */
-	  tree enum_attrs = c_parser_attributes (parser);
+	  tree enum_attrs = c_parser_gnu_attributes (parser);
 	  if (c_parser_next_token_is (parser, CPP_EQ))
 	    {
 	      c_parser_consume_token (parser);
@@ -3069,7 +3071,7 @@ c_parser_enum_specifier (c_parser *parser)
 	      break;
 	    }
 	}
-      postfix_attrs = c_parser_attributes (parser);
+      postfix_attrs = c_parser_gnu_attributes (parser);
       ret.spec = finish_enum (type, nreverse (values),
 			      chainon (attrs, postfix_attrs));
       ret.kind = ctsk_tagdef;
@@ -3102,9 +3104,9 @@ c_parser_enum_specifier (c_parser *parser)
 /* Parse a struct or union specifier (C90 6.5.2.1, C99 6.7.2.1, C11 6.7.2.1).
 
    struct-or-union-specifier:
-     struct-or-union attributes[opt] identifier[opt]
-       { struct-contents } attributes[opt]
-     struct-or-union attributes[opt] identifier
+     struct-or-union gnu-attributes[opt] identifier[opt]
+       { struct-contents } gnu-attributes[opt]
+     struct-or-union gnu-attributes[opt] identifier
 
    struct-contents:
      struct-declaration-list
@@ -3160,7 +3162,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
     }
   struct_loc = c_parser_peek_token (parser)->location;
   c_parser_consume_token (parser);
-  attrs = c_parser_attributes (parser);
+  attrs = c_parser_gnu_attributes (parser);
 
   /* Set the location in case we create a decl now.  */
   c_parser_set_source_position_from_token (c_parser_peek_token (parser));
@@ -3276,7 +3278,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
 	         recovered already.  Go on with the next field. */
 	    }
 	}
-      postfix_attrs = c_parser_attributes (parser);
+      postfix_attrs = c_parser_gnu_attributes (parser);
       ret.spec = finish_struct (struct_loc, type, nreverse (contents),
 				chainon (attrs, postfix_attrs), struct_info);
       ret.kind = ctsk_tagdef;
@@ -3309,15 +3311,15 @@ c_parser_struct_or_union_specifier (c_parser *parser)
      type-specifier specifier-qualifier-list[opt]
      type-qualifier specifier-qualifier-list[opt]
      alignment-specifier specifier-qualifier-list[opt]
-     attributes specifier-qualifier-list[opt]
+     gnu-attributes specifier-qualifier-list[opt]
 
    struct-declarator-list:
      struct-declarator
-     struct-declarator-list , attributes[opt] struct-declarator
+     struct-declarator-list , gnu-attributes[opt] struct-declarator
 
    struct-declarator:
-     declarator attributes[opt]
-     declarator[opt] : constant-expression attributes[opt]
+     declarator gnu-attributes[opt]
+     declarator[opt] : constant-expression gnu-attributes[opt]
 
    GNU extensions:
 
@@ -3326,7 +3328,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
      specifier-qualifier-list
 
    Unlike the ISO C syntax, semicolons are handled elsewhere.  The use
-   of attributes where shown is a GNU extension.  In GNU C, we accept
+   of gnu-attributes where shown is a GNU extension.  In GNU C, we accept
    any expression without commas in the syntax (assignment
    expressions, not just conditional expressions); assignment
    expressions will be diagnosed as non-constant.  */
@@ -3446,7 +3448,7 @@ c_parser_struct_declaration (c_parser *parser)
 	      width = c_parser_expr_no_commas (parser, NULL).value;
 	    }
 	  if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-	    postfix_attrs = c_parser_attributes (parser);
+	    postfix_attrs = c_parser_gnu_attributes (parser);
 	  d = grokfield (c_parser_peek_token (parser)->location,
 			 declarator, specs, width, &all_prefix_attrs);
 	  decl_attributes (&d, chainon (postfix_attrs,
@@ -3454,7 +3456,7 @@ c_parser_struct_declaration (c_parser *parser)
 	  DECL_CHAIN (d) = decls;
 	  decls = d;
 	  if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-	    all_prefix_attrs = chainon (c_parser_attributes (parser),
+	    all_prefix_attrs = chainon (c_parser_gnu_attributes (parser),
 					prefix_attrs);
 	  else
 	    all_prefix_attrs = prefix_attrs;
@@ -3600,7 +3602,7 @@ c_parser_alignas_specifier (c_parser * parser)
 
    direct-declarator:
      identifier
-     ( attributes[opt] declarator )
+     ( gnu-attributes[opt] declarator )
      direct-declarator array-declarator
      direct-declarator ( parameter-type-list )
      direct-declarator ( identifier-list[opt] )
@@ -3611,9 +3613,9 @@ c_parser_alignas_specifier (c_parser * parser)
 
    type-qualifier-list:
      type-qualifier
-     attributes
+     gnu-attributes
      type-qualifier-list type-qualifier
-     type-qualifier-list attributes
+     type-qualifier-list gnu-attributes
 
    array-declarator:
      [ type-qualifier-list[opt] assignment-expression[opt] ]
@@ -3630,8 +3632,8 @@ c_parser_alignas_specifier (c_parser * parser)
      parameter-list , parameter-declaration
 
    parameter-declaration:
-     declaration-specifiers declarator attributes[opt]
-     declaration-specifiers abstract-declarator[opt] attributes[opt]
+     declaration-specifiers declarator gnu-attributes[opt]
+     declaration-specifiers abstract-declarator[opt] gnu-attributes[opt]
 
    identifier-list:
      identifier
@@ -3642,7 +3644,7 @@ c_parser_alignas_specifier (c_parser * parser)
      pointer[opt] direct-abstract-declarator
 
    direct-abstract-declarator:
-     ( attributes[opt] abstract-declarator )
+     ( gnu-attributes[opt] abstract-declarator )
      direct-abstract-declarator[opt] array-declarator
      direct-abstract-declarator[opt] ( parameter-type-list[opt] )
 
@@ -3660,7 +3662,7 @@ c_parser_alignas_specifier (c_parser * parser)
      parameter-list ;
      parameter-forward-declarations parameter-list ;
 
-   The uses of attributes shown above are GNU extensions.
+   The uses of gnu-attributes shown above are GNU extensions.
 
    Some forms of array declarator are not included in C99 in the
    syntax for abstract declarators; these are disallowed elsewhere.
@@ -3705,7 +3707,7 @@ c_parser_direct_declarator (c_parser *parser, bool type_seen_p, c_dtr_syn kind,
      parenthesized declarator.  In an abstract declarator or parameter
      declarator, they could start a parenthesized declarator or a
      parameter list.  To tell which, the open parenthesis and any
-     following attributes must be read.  If a declaration specifier
+     following gnu-attributes must be read.  If a declaration specifier
      follows, then it is a parameter list; if the specifier is a
      typedef name, there might be an ambiguity about redeclaring it,
      which is resolved in the direction of treating it as a typedef
@@ -3720,12 +3722,12 @@ c_parser_direct_declarator (c_parser *parser, bool type_seen_p, c_dtr_syn kind,
      parentheses.  The proper resolution of this ambiguity needs
      documenting.  At present we follow an accident of the old
      parser's implementation, whereby the first parameter must have
-     some declaration specifiers other than just attributes.  Thus as
+     some declaration specifiers other than just gnu-attributes.  Thus as
      a parameter declaration it is treated as a parenthesized
      parameter named x, and as an abstract declarator it is
      rejected.
 
-     ??? Also following the old parser, attributes inside an empty
+     ??? Also following the old parser, gnu-attributes inside an empty
      parameter list are ignored, making it a list not yielding a
      prototype, rather than giving an error or making it have one
      parameter with implicit type int.
@@ -3764,7 +3766,7 @@ c_parser_direct_declarator (c_parser *parser, bool type_seen_p, c_dtr_syn kind,
       tree attrs;
       struct c_declarator *inner;
       c_parser_consume_token (parser);
-      attrs = c_parser_attributes (parser);
+      attrs = c_parser_gnu_attributes (parser);
       if (kind != C_DTR_NORMAL
 	  && (c_parser_next_token_starts_declspecs (parser)
 	      || c_parser_next_token_is (parser, CPP_CLOSE_PAREN)))
@@ -3903,7 +3905,7 @@ c_parser_direct_declarator_inner (c_parser *parser, bool id_present,
       tree attrs;
       struct c_arg_info *args;
       c_parser_consume_token (parser);
-      attrs = c_parser_attributes (parser);
+      attrs = c_parser_gnu_attributes (parser);
       args = c_parser_parms_declarator (parser, id_present, attrs);
       if (args == NULL)
 	return NULL;
@@ -4051,7 +4053,7 @@ c_parser_parms_list_declarator (c_parser *parser, tree attrs, tree expr)
 	  tree new_attrs;
 	  c_parser_consume_token (parser);
 	  mark_forward_parm_decls ();
-	  new_attrs = c_parser_attributes (parser);
+	  new_attrs = c_parser_gnu_attributes (parser);
 	  return c_parser_parms_list_declarator (parser, new_attrs, expr);
 	}
       if (c_parser_next_token_is (parser, CPP_CLOSE_PAREN))
@@ -4162,7 +4164,7 @@ c_parser_parameter_declaration (c_parser *parser, tree attrs)
       return NULL;
     }
   if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-    postfix_attrs = c_parser_attributes (parser);
+    postfix_attrs = c_parser_gnu_attributes (parser);
 
   /* Generate a location for the parameter, ranging from the start of the
      initial token to the end of the final token.
@@ -4264,7 +4266,7 @@ c_parser_simple_asm_expr (c_parser *parser)
 }
 
 static tree
-c_parser_attribute_any_word (c_parser *parser)
+c_parser_gnu_attribute_any_word (c_parser *parser)
 {
   tree attr_name = NULL_TREE;
 
@@ -4329,20 +4331,20 @@ c_parser_attribute_any_word (c_parser *parser)
   return attr_name;
 }
 
-/* Parse (possibly empty) attributes.  This is a GNU extension.
+/* Parse (possibly empty) gnu-attributes.  This is a GNU extension.
 
-   attributes:
+   gnu-attributes:
      empty
-     attributes attribute
+     gnu-attributes gnu-attribute
 
-   attribute:
-     __attribute__ ( ( attribute-list ) )
+   gnu-attribute:
+     __attribute__ ( ( gnu-attribute-list ) )
 
-   attribute-list:
-     attrib
-     attribute_list , attrib
+   gnu-attribute-list:
+     gnu-attrib
+     gnu-attribute_list , gnu-attrib
 
-   attrib:
+   gnu-attrib:
      empty
      any-word
      any-word ( identifier )
@@ -4361,8 +4363,8 @@ c_parser_attribute_any_word (c_parser *parser)
    commas with no attributes in between.  */
 
 static tree
-c_parser_attribute (c_parser *parser, tree attrs,
-		    bool expect_comma = false, bool empty_ok = true)
+c_parser_gnu_attribute (c_parser *parser, tree attrs,
+			bool expect_comma = false, bool empty_ok = true)
 {
   bool comma_first = c_parser_next_token_is (parser, CPP_COMMA);
   if (!comma_first
@@ -4377,7 +4379,7 @@ c_parser_attribute (c_parser *parser, tree attrs,
 	return attrs;
     }
 
-  tree attr_name = c_parser_attribute_any_word (parser);
+  tree attr_name = c_parser_gnu_attribute_any_word (parser);
   if (attr_name == NULL_TREE)
     return NULL_TREE;
 
@@ -4476,7 +4478,7 @@ c_parser_attribute (c_parser *parser, tree attrs,
 }
 
 static tree
-c_parser_attributes (c_parser *parser)
+c_parser_gnu_attributes (c_parser *parser)
 {
   tree attrs = NULL_TREE;
   while (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
@@ -4503,7 +4505,7 @@ c_parser_attributes (c_parser *parser)
       for (bool expect_comma = false; ; expect_comma = true)
 	{
 	  /* Parse a single attribute.  */
-	  tree attr = c_parser_attribute (parser, attrs, expect_comma);
+	  tree attr = c_parser_gnu_attribute (parser, attrs, expect_comma);
 	  if (attr == error_mark_node)
 	    return attrs;
 	  if (!attr)
@@ -4974,8 +4976,8 @@ c_parser_initval (c_parser *parser, struct c_expr *after,
    GNU syntax also permits (not shown above) labels at the end of
    compound statements, which yield an error.  We don't allow labels
    on declarations; this might seem like a natural extension, but
-   there would be a conflict between attributes on the label and
-   prefix attributes on the declaration.  ??? The syntax follows the
+   there would be a conflict between gnu-attributes on the label and
+   prefix gnu-attributes on the declaration.  ??? The syntax follows the
    old parser in requiring something after label declarations.
    Although they are erroneous if the labels declared aren't defined,
    is it useful for the syntax to be this way?
@@ -5209,7 +5211,7 @@ c_parser_all_labels (c_parser *parser)
 /* Parse a label (C90 6.6.1, C99 6.8.1, C11 6.8.1).
 
    label:
-     identifier : attributes[opt]
+     identifier : gnu-attributes[opt]
      case constant-expression :
      default :
 
@@ -5218,7 +5220,7 @@ c_parser_all_labels (c_parser *parser)
    label:
      case constant-expression ... constant-expression :
 
-   The use of attributes on labels is a GNU extension.  The syntax in
+   The use of gnu-attributes on labels is a GNU extension.  The syntax in
    GNU C accepts any expressions without commas, non-constant
    expressions being rejected later.  */
 
@@ -5268,7 +5270,7 @@ c_parser_label (c_parser *parser)
       c_parser_consume_token (parser);
       gcc_assert (c_parser_next_token_is (parser, CPP_COLON));
       c_parser_consume_token (parser);
-      attrs = c_parser_attributes (parser);
+      attrs = c_parser_gnu_attributes (parser);
       tlab = define_label (loc2, name);
       if (tlab)
 	{
@@ -5287,7 +5289,7 @@ c_parser_label (c_parser *parser)
       if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
 	{
 	  location_t loc = c_parser_peek_token (parser)->location;
-	  tree attrs = c_parser_attributes (parser);
+	  tree attrs = c_parser_gnu_attributes (parser);
 	  if (attribute_fallthrough_p (attrs))
 	    {
 	      if (c_parser_next_token_is (parser, CPP_SEMICOLON))
@@ -5359,7 +5361,7 @@ c_parser_label (c_parser *parser)
      goto * expression ;
 
    expression-statement:
-     attributes ;
+     gnu-attributes ;
 
    Objective-C:
 
@@ -5601,7 +5603,7 @@ c_parser_statement_after_labels (c_parser *parser, bool *if_p,
 	case RID_ATTRIBUTE:
 	  {
 	    /* Allow '__attribute__((fallthrough));'.  */
-	    tree attrs = c_parser_attributes (parser);
+	    tree attrs = c_parser_gnu_attributes (parser);
 	    if (attribute_fallthrough_p (attrs))
 	      {
 		if (c_parser_next_token_is (parser, CPP_SEMICOLON))
@@ -7703,7 +7705,7 @@ c_parser_has_attribute_expression (c_parser *parser)
   location_t atloc = c_parser_peek_token (parser)->location;
   /* Parse a single attribute.  Require no leading comma and do not
      allow empty attributes.  */
-  tree attr = c_parser_attribute (parser, NULL_TREE, false, false);
+  tree attr = c_parser_gnu_attribute (parser, NULL_TREE, false, false);
 
   parser->lex_untranslated_string = false;
 
@@ -10495,7 +10497,7 @@ c_parser_objc_maybe_method_attributes (c_parser* parser, tree* attributes)
     }
 
   if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-    *attributes = c_parser_attributes (parser);
+    *attributes = c_parser_gnu_attributes (parser);
 
   /* If there were no attributes here, just report any earlier error.  */
   if (*attributes == NULL_TREE || bad)
@@ -10520,7 +10522,7 @@ c_parser_objc_maybe_method_attributes (c_parser* parser, tree* attributes)
      objc-selector
      ( objc-type-name ) objc-keyword-selector objc-optparmlist
      objc-keyword-selector objc-optparmlist
-     attributes
+     gnu-attributes
 
    objc-keyword-selector:
      objc-keyword-decl
@@ -10585,7 +10587,7 @@ c_parser_objc_method_decl (c_parser *parser, bool is_class_method,
 	    }
 	  /* New ObjC allows attributes on method parameters.  */
 	  if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-	    param_attr = c_parser_attributes (parser);
+	    param_attr = c_parser_gnu_attributes (parser);
 	  if (c_parser_next_token_is_not (parser, CPP_NAME))
 	    {
 	      c_parser_error (parser, "expected identifier");
@@ -20559,7 +20561,7 @@ c_parser_omp_threadprivate (c_parser *parser)
 /* Parse a transaction attribute (GCC Extension).
 
    transaction-attribute:
-     attributes
+     gnu-attributes
      [ [ any-word ] ]
 
    The transactional memory language description is written for C++,
@@ -20572,7 +20574,7 @@ c_parser_transaction_attributes (c_parser *parser)
   tree attr_name, attr = NULL;
 
   if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
-    return c_parser_attributes (parser);
+    return c_parser_gnu_attributes (parser);
 
   if (!c_parser_next_token_is (parser, CPP_OPEN_SQUARE))
     return NULL_TREE;
@@ -20580,7 +20582,7 @@ c_parser_transaction_attributes (c_parser *parser)
   if (!c_parser_require (parser, CPP_OPEN_SQUARE, "expected %<[%>"))
     goto error1;
 
-  attr_name = c_parser_attribute_any_word (parser);
+  attr_name = c_parser_gnu_attribute_any_word (parser);
   if (attr_name)
     {
       c_parser_consume_token (parser);
-- 
cgit v1.1


From 23605fec7a620884de1d134cdbb86b866d9514d1 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Tue, 15 Oct 2019 00:16:17 +0000
Subject: Daily bump.

From-SVN: r276982
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index d6c8807..d62a900 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191014
+20191015
-- 
cgit v1.1


From 51992f15a7d9adce1016f8c31d37409e50d5797f Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Tue, 15 Oct 2019 00:28:47 +0000
Subject: re PR fortran/89943 (Submodule functions are not allowed to have C
 binding)

2019-10-14  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/89943
	decl.c (gfc_match_function_decl): Ignore duplicate BIND(C) for function
	declaration in submodule.  Implement at check for F2018 C1550.
	(gfc_match_entry): Use temporary for locus, which allows removal of
	one gfc_error_now().
	(gfc_match_subroutine): Ignore duplicate BIND(C) for subroutine
	declaration in submodule.  Implement at check for F2018 C1550.

2019-10-14  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/89943
	* gfortran.dg/pr89943_1.f90: New test.
	* gfortran.dg/pr89943_2.f90: Ditto.
	* gfortran.dg/pr89943_3.f90: Ditto.
	* gfortran.dg/pr89943_4.f90: Ditto.

From-SVN: r276983
---
 gcc/fortran/ChangeLog                   | 10 ++++
 gcc/fortran/decl.c                      | 86 ++++++++++++++++++++++++---------
 gcc/testsuite/ChangeLog                 |  8 +++
 gcc/testsuite/gfortran.dg/pr89943_1.f90 | 31 ++++++++++++
 gcc/testsuite/gfortran.dg/pr89943_2.f90 | 33 +++++++++++++
 gcc/testsuite/gfortran.dg/pr89943_3.f90 | 28 +++++++++++
 gcc/testsuite/gfortran.dg/pr89943_4.f90 | 29 +++++++++++
 7 files changed, 203 insertions(+), 22 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr89943_1.f90
 create mode 100644 gcc/testsuite/gfortran.dg/pr89943_2.f90
 create mode 100644 gcc/testsuite/gfortran.dg/pr89943_3.f90
 create mode 100644 gcc/testsuite/gfortran.dg/pr89943_4.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7e05e910..5e3c78e1 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-14  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/89943
+	decl.c (gfc_match_function_decl): Ignore duplicate BIND(C) for function
+	declaration in submodule.  Implement at check for F2018 C1550.
+	(gfc_match_entry): Use temporary for locus, which allows removal of
+	one gfc_error_now().
+	(gfc_match_subroutine): Ignore duplicate BIND(C) for subroutine
+	declaration in submodule.  Implement at check for F2018 C1550.
+
 2019-10-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/92004
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 9cda824..59e0eac 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -7263,13 +7263,16 @@ gfc_match_function_decl (void)
   if (sym->attr.is_bind_c == 1)
     {
       sym->attr.is_bind_c = 0;
-      if (sym->old_symbol != NULL)
-        gfc_error_now ("BIND(C) attribute at %L can only be used for "
-                       "variables or common blocks",
-                       &(sym->old_symbol->declared_at));
-      else
-        gfc_error_now ("BIND(C) attribute at %L can only be used for "
-                       "variables or common blocks", &gfc_current_locus);
+
+      if (gfc_state_stack->previous
+	  && gfc_state_stack->previous->state != COMP_SUBMODULE)
+	{
+	  locus loc;
+	  loc = sym->old_symbol != NULL
+	    ? sym->old_symbol->declared_at : gfc_current_locus;
+	  gfc_error_now ("BIND(C) attribute at %L can only be used for "
+			 "variables or common blocks", &loc);
+	}
     }
 
   if (found_match != MATCH_YES)
@@ -7283,6 +7286,24 @@ gfc_match_function_decl (void)
 	found_match = suffix_match;
     }
 
+  /* F2018 C1550 (R1526) If MODULE appears in the prefix of a module
+     subprogram and a binding label is specified, it shall be the
+     same as the binding label specified in the corresponding module
+     procedure interface body.  */
+    if (sym->attr.is_bind_c && sym->attr.module_procedure && sym->old_symbol
+  	&& strcmp (sym->name, sym->old_symbol->name) == 0
+	&& strcmp (sym->binding_label, sym->old_symbol->binding_label) != 0)
+      {
+	  const char *null = "NULL", *s1, *s2;
+	  s1 = sym->binding_label;
+	  if (!s1) s1 = null;
+	  s2 = sym->old_symbol->binding_label;
+	  if (!s2) s2 = null;
+          gfc_error ("Mismatch in BIND(C) names (%qs/%qs) at %C", s1, s2);
+	  sym->refs++;	/* Needed to avoid an ICE in gfc_release_symbol */
+	  return MATCH_ERROR;
+      }
+
   if(found_match != MATCH_YES)
     m = MATCH_ERROR;
   else
@@ -7521,15 +7542,15 @@ gfc_match_entry (void)
      not allowed for procedures.  */
   if (entry->attr.is_bind_c == 1)
     {
+      locus loc;
+
       entry->attr.is_bind_c = 0;
-      if (entry->old_symbol != NULL)
-        gfc_error_now ("BIND(C) attribute at %L can only be used for "
-                       "variables or common blocks",
-                       &(entry->old_symbol->declared_at));
-      else
-        gfc_error_now ("BIND(C) attribute at %L can only be used for "
-                       "variables or common blocks", &gfc_current_locus);
-    }
+
+      loc = entry->old_symbol != NULL
+	? entry->old_symbol->declared_at : gfc_current_locus; 
+      gfc_error_now ("BIND(C) attribute at %L can only be used for "
+		     "variables or common blocks", &loc);
+     }
 
   /* Check what next non-whitespace character is so we can tell if there
      is the required parens if we have a BIND(C).  */
@@ -7729,13 +7750,16 @@ gfc_match_subroutine (void)
   if (sym->attr.is_bind_c == 1)
     {
       sym->attr.is_bind_c = 0;
-      if (sym->old_symbol != NULL)
-        gfc_error_now ("BIND(C) attribute at %L can only be used for "
-                       "variables or common blocks",
-                       &(sym->old_symbol->declared_at));
-      else
-        gfc_error_now ("BIND(C) attribute at %L can only be used for "
-                       "variables or common blocks", &gfc_current_locus);
+
+      if (gfc_state_stack->previous
+	  && gfc_state_stack->previous->state != COMP_SUBMODULE)
+	{
+	  locus loc;
+	  loc = sym->old_symbol != NULL
+	    ? sym->old_symbol->declared_at : gfc_current_locus;
+	  gfc_error_now ("BIND(C) attribute at %L can only be used for "
+			 "variables or common blocks", &loc);
+	}
     }
 
   /* C binding names are not allowed for internal procedures.  */
@@ -7777,6 +7801,24 @@ gfc_match_subroutine (void)
           return MATCH_ERROR;
         }
 
+      /* F2018 C1550 (R1526) If MODULE appears in the prefix of a module
+	 subprogram and a binding label is specified, it shall be the
+	 same as the binding label specified in the corresponding module
+	 procedure interface body.  */
+      if (sym->attr.module_procedure && sym->old_symbol
+  	  && strcmp (sym->name, sym->old_symbol->name) == 0
+	  && strcmp (sym->binding_label, sym->old_symbol->binding_label) != 0)
+	{
+	  const char *null = "NULL", *s1, *s2;
+	  s1 = sym->binding_label;
+	  if (!s1) s1 = null;
+	  s2 = sym->old_symbol->binding_label;
+	  if (!s2) s2 = null;
+          gfc_error ("Mismatch in BIND(C) names (%qs/%qs) at %C", s1, s2);
+	  sym->refs++;	/* Needed to avoid an ICE in gfc_release_symbol */
+	  return MATCH_ERROR;
+	}
+
       /* Scan the dummy arguments for an alternate return.  */
       for (arg = sym->formal; arg; arg = arg->next)
 	if (!arg->sym)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0f4eb9f..0285490 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-14  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/89943
+	* gfortran.dg/pr89943_1.f90: New test.
+	* gfortran.dg/pr89943_2.f90: Ditto.
+	* gfortran.dg/pr89943_3.f90: Ditto.
+	* gfortran.dg/pr89943_4.f90: Ditto.
+
 2019-10-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/92004
diff --git a/gcc/testsuite/gfortran.dg/pr89943_1.f90 b/gcc/testsuite/gfortran.dg/pr89943_1.f90
new file mode 100644
index 0000000..3aa9c36
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr89943_1.f90
@@ -0,0 +1,31 @@
+! { dg-do compile }
+! PR fortran/89943
+! Code contributed by Alberto Luaces  <aluaces at udc dot se>
+module Foo_mod
+
+   implicit none
+
+   interface
+      module subroutine runFoo4C(ndim) bind(C, name="runFoo")
+         use, intrinsic :: iso_c_binding
+         implicit none
+         integer(c_int32_t) , intent(in) :: ndim
+      end subroutine runFoo4C
+   end interface
+
+   contains
+
+end module Foo_mod
+
+submodule(Foo_mod) Foo_smod
+
+   contains
+
+      module subroutine runFoo4C(ndim) bind(C, name="runFoo")
+         use, intrinsic :: iso_c_binding
+         implicit none
+         integer(c_int32_t) , intent(in) :: ndim
+      end subroutine runFoo4C
+
+end submodule Foo_smod
+
diff --git a/gcc/testsuite/gfortran.dg/pr89943_2.f90 b/gcc/testsuite/gfortran.dg/pr89943_2.f90
new file mode 100644
index 0000000..ac69ec3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr89943_2.f90
@@ -0,0 +1,33 @@
+! { dg-do compile }
+! PR fortran/89943
+! Code contributed by Alberto Luaces  <aluaces at udc dot se>
+module Foo_mod
+
+   implicit none
+
+   interface
+      module function runFoo4C(ndim) bind(C, name="runFoo")
+         use, intrinsic :: iso_c_binding
+         implicit none
+         integer runFoo4c
+         integer(c_int32_t) , intent(in) :: ndim
+      end function runFoo4C
+   end interface
+
+   contains
+
+end module Foo_mod
+
+submodule(Foo_mod) Foo_smod
+
+   contains
+
+      module function runFoo4C(ndim) bind(C, name="runFoo")
+         use, intrinsic :: iso_c_binding
+         implicit none
+         integer runFoo4c
+         integer(c_int32_t) , intent(in) :: ndim
+      end function runFoo4C
+
+end submodule Foo_smod
+
diff --git a/gcc/testsuite/gfortran.dg/pr89943_3.f90 b/gcc/testsuite/gfortran.dg/pr89943_3.f90
new file mode 100644
index 0000000..38b723e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr89943_3.f90
@@ -0,0 +1,28 @@
+! { dg-do compile }
+module Foo_mod
+
+   implicit none
+
+   interface
+      module subroutine runFoo4C(ndim) bind(C, name="runFoo")
+         use, intrinsic :: iso_c_binding
+         implicit none
+         integer(c_int32_t) , intent(in) :: ndim
+      end subroutine runFoo4C
+   end interface
+
+   contains
+
+end module Foo_mod
+
+submodule(Foo_mod) Foo_smod
+
+   contains
+
+      module subroutine runFoo4C(ndim) bind(C, name="runFu")   ! { dg-error "Mismatch in BIND" }
+         use, intrinsic :: iso_c_binding                 ! { dg-error "Unexpected USE statement" }
+         implicit none                                   ! { dg-error "Unexpected IMPLICIT NONE statement" }
+         integer(c_int32_t) , intent(in) :: ndim         ! { dg-error "Unexpected data declaration" }
+      end subroutine runFoo4C                            ! { dg-error " Expecting END SUBMODULE" }
+
+end submodule Foo_smod
diff --git a/gcc/testsuite/gfortran.dg/pr89943_4.f90 b/gcc/testsuite/gfortran.dg/pr89943_4.f90
new file mode 100644
index 0000000..8eba2ed
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr89943_4.f90
@@ -0,0 +1,29 @@
+! { dg-do compile }
+module Foo_mod
+
+   implicit none
+
+   interface
+      module function runFoo4C(ndim) bind(C, name="runFoo")
+         use, intrinsic :: iso_c_binding
+         implicit none
+         integer runFoo4c
+         integer(c_int32_t) , intent(in) :: ndim
+      end function runFoo4C
+   end interface
+
+   contains
+
+end module Foo_mod
+
+submodule(Foo_mod) Foo_smod
+
+   contains
+
+      module function runFoo4C(ndim) bind(C, name="runFu")  ! { dg-error "Mismatch in BIND" }
+         use, intrinsic :: iso_c_binding     ! { dg-error "Unexpected USE statement in" }
+         implicit none                       ! { dg-error "Unexpected IMPLICIT NONE statement" }
+         integer(c_int32_t) , intent(in) :: ndim   ! { dg-error "Unexpected data declaration" }
+      end function runFoo4C                  ! { dg-error "Expecting END SUBMODULE" }
+
+end submodule Foo_smod
-- 
cgit v1.1


From 3c8e341b996546607fa1f39a0fd9a9d7c2c38214 Mon Sep 17 00:00:00 2001
From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
Date: Tue, 15 Oct 2019 07:19:41 +0000
Subject: re PR tree-optimization/92085 (ICE: tree check: expected class
 'type', have 'exceptional' (error_mark) in useless_type_conversion_p, at
 gimple-expr.c:86)

2019-10-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>

	PR tree-optimization/92085
	* tree-if-conv.c (ifcvt_local_dce): Call gsi_next in else clause,
	instead of calling it unconditionally after
	delete_dead_or_redundant_assignment and fix indentation.

testsuite/
	* gcc.dg/tree-ssa/pr92085-1.c: New test.
	* gcc.dg/tree-ssa/pr92085-2.c: Likewise.

From-SVN: r276984
---
 gcc/ChangeLog                             |  7 +++++++
 gcc/testsuite/ChangeLog                   |  6 ++++++
 gcc/testsuite/gcc.dg/tree-ssa/pr92085-1.c | 20 ++++++++++++++++++++
 gcc/testsuite/gcc.dg/tree-ssa/pr92085-2.c | 29 +++++++++++++++++++++++++++++
 gcc/tree-if-conv.c                        |  9 +++++----
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr92085-1.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr92085-2.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9957d2c..91809ca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR tree-optimization/92085
+	* tree-if-conv.c (ifcvt_local_dce): Call gsi_next in else clause,
+	instead of calling it unconditionally after
+	delete_dead_or_redundant_assignment and fix indentation.
+
 2019-10-15  Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
 
 	* config/arm/vfp.md (fma<SDF:mode>4): Enable DF only when
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0285490..ae16907 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR tree-optimization/92085
+	* gcc.dg/tree-ssa/pr92085-1.c: New test.
+	* gcc.dg/tree-ssa/pr92085-2.c: Likewise.
+
 2019-10-14  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/89943
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr92085-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr92085-1.c
new file mode 100644
index 0000000..c18f820
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr92085-1.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fexceptions -fnon-call-exceptions -ftree-loop-vectorize -fno-tree-sink --param dse-max-alias-queries-per-store=2 -w" } */
+
+void
+di (int y9, int qw)
+{
+  if ((int) &y9 != 0)
+    {
+      int py;
+      int **fq = &py;
+
+      while (qw < 1)
+        {
+          if ((0 < (**fq ? **fq : (**fq = 1))) / (**fq = y9))
+            ;
+
+          ++qw;
+        }
+    }
+}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr92085-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr92085-2.c
new file mode 100644
index 0000000..f62585c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr92085-2.c
@@ -0,0 +1,29 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -ftree-loop-vectorize -fno-tree-dce -fno-tree-sink -w" } */
+
+int a8;
+
+void
+c1 (int oz, int dk, int ub)
+{
+  int *hd = 0;
+  long int *th = &dk;
+
+  while (ub < 1)
+    {
+      oz || dk;
+      ++ub;
+    }
+
+  while (oz < 2)
+    {
+      long int *lq = &oz;
+
+      (*hd < (*lq = *th)) < oz;
+
+      if (oz == 0)
+        *th = a8 = oz;
+
+      *lq = 0;
+    }
+}
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index af49813..3c296ec 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -2973,10 +2973,11 @@ ifcvt_local_dce (class loop *loop)
 	  ao_ref write;
 	  ao_ref_init (&write, lhs);
 
-          if (dse_classify_store (&write, stmt, false, NULL, NULL, latch_vdef)
-              == DSE_STORE_DEAD)
-            delete_dead_or_redundant_assignment (&gsi, "dead");
-	  gsi_next (&gsi);
+	  if (dse_classify_store (&write, stmt, false, NULL, NULL, latch_vdef)
+	      == DSE_STORE_DEAD)
+	    delete_dead_or_redundant_assignment (&gsi, "dead");
+	  else
+	    gsi_next (&gsi);
 	  continue;
 	}
 
-- 
cgit v1.1


From e622a32db78300821fc1327637ec6413febc2c66 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 15 Oct 2019 07:28:26 +0000
Subject: re PR middle-end/92046 (Command line options (that are per-functions)
 are affecting --params which are global.)

2019-10-15  Richard Biener  <rguenther@suse.de>

	PR middle-end/92046
	* common.opt (fallow-store-data-races): New.
	* params.def (PARAM_ALLOW_STORE_DATA_RACES): Remove.
	* params.h (ALLOW_STORE_DATA_RACES): Likewise.
	* doc/invoke.texi (fallow-store-data-races): Document.
	(--param allow-store-data-races): Remove docs.
	* opts.c (default_options_table): Enable -fallow-store-data-races
	at -Ofast.
	(default_options_optimization): Do not enable --param
	allow-store-data-races at -Ofast.
	* tree-if-conv.c (ifcvt_memrefs_wont_trap): Use flag_store_data_races
	instead of PARAM_ALLOW_STORE_DATA_RACES.
	* tree-ssa-loop-im.c (execute_sm): Likewise.

	* c-c++-common/cxxbitfields-3.c: Adjust.
	* c-c++-common/cxxbitfields-6.c: Likewise.
	* c-c++-common/simulate-thread/bitfields-1.c: Likewise.
	* c-c++-common/simulate-thread/bitfields-2.c: Likewise.
	* c-c++-common/simulate-thread/bitfields-3.c: Likewise.
	* c-c++-common/simulate-thread/bitfields-4.c: Likewise.
	* g++.dg/simulate-thread/bitfields-2.C: Likewise.
	* g++.dg/simulate-thread/bitfields.C: Likewise.
	* gcc.dg/lto/pr52097_0.c: Likewise.
	* gcc.dg/simulate-thread/speculative-store-2.c: Likewise.
	* gcc.dg/simulate-thread/speculative-store-3.c: Likewise.
	* gcc.dg/simulate-thread/speculative-store-4.c: Likewise.
	* gcc.dg/simulate-thread/speculative-store.c: Likewise.
	* gcc.dg/tree-ssa/20050314-1.c: Likewise.

From-SVN: r276985
---
 gcc/ChangeLog                                          | 16 ++++++++++++++++
 gcc/common.opt                                         |  4 ++++
 gcc/doc/invoke.texi                                    | 17 ++++++++++-------
 gcc/opts.c                                             |  8 +-------
 gcc/params.def                                         |  6 ------
 gcc/params.h                                           |  2 --
 gcc/testsuite/ChangeLog                                | 18 ++++++++++++++++++
 gcc/testsuite/c-c++-common/cxxbitfields-3.c            |  2 +-
 gcc/testsuite/c-c++-common/cxxbitfields-6.c            |  2 +-
 .../c-c++-common/simulate-thread/bitfields-1.c         |  2 +-
 .../c-c++-common/simulate-thread/bitfields-2.c         |  2 +-
 .../c-c++-common/simulate-thread/bitfields-3.c         |  2 +-
 .../c-c++-common/simulate-thread/bitfields-4.c         |  2 +-
 gcc/testsuite/g++.dg/simulate-thread/bitfields-2.C     |  2 +-
 gcc/testsuite/g++.dg/simulate-thread/bitfields.C       |  2 +-
 gcc/testsuite/gcc.dg/lto/pr52097_0.c                   |  2 +-
 .../gcc.dg/simulate-thread/speculative-store-2.c       |  2 +-
 .../gcc.dg/simulate-thread/speculative-store-3.c       |  2 +-
 .../gcc.dg/simulate-thread/speculative-store-4.c       |  2 +-
 .../gcc.dg/simulate-thread/speculative-store.c         |  4 ++--
 gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c             |  2 +-
 gcc/tree-if-conv.c                                     |  4 ++--
 gcc/tree-ssa-loop-im.c                                 |  2 +-
 23 files changed, 67 insertions(+), 40 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91809ca..299bcb1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/92046
+	* common.opt (fallow-store-data-races): New.
+	* params.def (PARAM_ALLOW_STORE_DATA_RACES): Remove.
+	* params.h (ALLOW_STORE_DATA_RACES): Likewise.
+	* doc/invoke.texi (fallow-store-data-races): Document.
+	(--param allow-store-data-races): Remove docs.
+	* opts.c (default_options_table): Enable -fallow-store-data-races
+	at -Ofast.
+	(default_options_optimization): Do not enable --param
+	allow-store-data-races at -Ofast.
+	* tree-if-conv.c (ifcvt_memrefs_wont_trap): Use flag_store_data_races
+	instead of PARAM_ALLOW_STORE_DATA_RACES.
+	* tree-ssa-loop-im.c (execute_sm): Likewise.
+
 2019-10-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	PR tree-optimization/92085
diff --git a/gcc/common.opt b/gcc/common.opt
index 124e8cf..859c0f9 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -993,6 +993,10 @@ Align the start of loops.
 falign-loops=
 Common RejectNegative Joined Var(str_align_loops) Optimization
 
+fallow-store-data-races
+Common Report Var(flag_store_data_races) Optimization
+Allow the compiler to introduce new data races on stores.
+
 fargument-alias
 Common Ignore
 Does nothing. Preserved for backward compatibility.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 085e8b0..4776926 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -406,6 +406,7 @@ Objective-C and Objective-C++ Dialects}.
 -falign-jumps[=@var{n}[:@var{m}:[@var{n2}[:@var{m2}]]]] @gol
 -falign-labels[=@var{n}[:@var{m}:[@var{n2}[:@var{m2}]]]] @gol
 -falign-loops[=@var{n}[:@var{m}:[@var{n2}[:@var{m2}]]]] @gol
+-fallow-store-data-races @gol
 -fassociative-math  -fauto-profile  -fauto-profile[=@var{path}] @gol
 -fauto-inc-dec  -fbranch-probabilities @gol
 -fcaller-saves @gol
@@ -8463,9 +8464,9 @@ designed to reduce code size.
 Disregard strict standards compliance.  @option{-Ofast} enables all
 @option{-O3} optimizations.  It also enables optimizations that are not
 valid for all standard-compliant programs.
-It turns on @option{-ffast-math} and the Fortran-specific
-@option{-fstack-arrays}, unless @option{-fmax-stack-var-size} is
-specified, and @option{-fno-protect-parens}.
+It turns on @option{-ffast-math}, @option{-fallow-store-data-races}
+and the Fortran-specific @option{-fstack-arrays}, unless
+@option{-fmax-stack-var-size} is specified, and @option{-fno-protect-parens}.
 
 @item -Og
 @opindex Og
@@ -10227,6 +10228,12 @@ The maximum allowed @var{n} option value is 65536.
 
 Enabled at levels @option{-O2}, @option{-O3}.
 
+@item -fallow-store-data-races
+@opindex fallow-store-data-races
+Allow the compiler to introduce new data races on stores.
+
+Enabled at level @option{-Ofast}.
+
 @item -funit-at-a-time
 @opindex funit-at-a-time
 This option is left for compatibility reasons. @option{-funit-at-a-time}
@@ -12060,10 +12067,6 @@ The maximum number of conditional store pairs that can be sunk.  Set to 0
 if either vectorization (@option{-ftree-vectorize}) or if-conversion
 (@option{-ftree-loop-if-convert}) is disabled.
 
-@item allow-store-data-races
-Allow optimizers to introduce new data races on stores.
-Set to 1 to allow, otherwise to 0.
-
 @item case-values-threshold
 The smallest number of different values for which it is best to use a
 jump-table instead of a tree of conditional branches.  If the value is
diff --git a/gcc/opts.c b/gcc/opts.c
index ff95853..10b9f10 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -564,6 +564,7 @@ static const struct default_options default_options_table[] =
 
     /* -Ofast adds optimizations to -O3.  */
     { OPT_LEVELS_FAST, OPT_ffast_math, NULL, 1 },
+    { OPT_LEVELS_FAST, OPT_fallow_store_data_races, NULL, 1 },
 
     { OPT_LEVELS_NONE, 0, NULL, 0 }
   };
@@ -671,13 +672,6 @@ default_options_optimization (struct gcc_options *opts,
      opt2 ? 100 : default_param_value (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE),
      opts->x_param_values, opts_set->x_param_values);
 
-  /* At -Ofast, allow store motion to introduce potential race conditions.  */
-  maybe_set_param_value
-    (PARAM_ALLOW_STORE_DATA_RACES,
-     opts->x_optimize_fast ? 1
-     : default_param_value (PARAM_ALLOW_STORE_DATA_RACES),
-     opts->x_param_values, opts_set->x_param_values);
-
   if (opts->x_optimize_size)
     /* We want to crossjump as much as possible.  */
     maybe_set_param_value (PARAM_MIN_CROSSJUMP_INSNS, 1,
diff --git a/gcc/params.def b/gcc/params.def
index 4cb48d9..e4b70ba 100644
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -1225,12 +1225,6 @@ DEFPARAM (PARAM_JUMP_TABLE_MAX_GROWTH_RATIO_FOR_SPEED,
 	  "optimizing for speed.",
 	  800, 0, 0)
 
-/* Data race flags for C++0x memory model compliance.  */
-DEFPARAM (PARAM_ALLOW_STORE_DATA_RACES,
-	  "allow-store-data-races",
-	  "Allow new data races on stores to be introduced.",
-	  0, 0, 1)
-
 /* Reassociation width to be used by tree reassoc optimization.  */
 DEFPARAM (PARAM_TREE_REASSOC_WIDTH,
 	  "tree-reassoc-width",
diff --git a/gcc/params.h b/gcc/params.h
index 26f1236..1aaef6d 100644
--- a/gcc/params.h
+++ b/gcc/params.h
@@ -228,8 +228,6 @@ extern void init_param_values (int *params);
   PARAM_VALUE (PARAM_MAX_STORES_TO_SINK)
 #define ALLOW_LOAD_DATA_RACES \
   PARAM_VALUE (PARAM_ALLOW_LOAD_DATA_RACES)
-#define ALLOW_STORE_DATA_RACES \
-  PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES)
 #define ALLOW_PACKED_LOAD_DATA_RACES \
   PARAM_VALUE (PARAM_ALLOW_PACKED_LOAD_DATA_RACES)
 #define ALLOW_PACKED_STORE_DATA_RACES \
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ae16907..8ff7871 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/92046
+	* c-c++-common/cxxbitfields-3.c: Adjust.
+	* c-c++-common/cxxbitfields-6.c: Likewise.
+	* c-c++-common/simulate-thread/bitfields-1.c: Likewise.
+	* c-c++-common/simulate-thread/bitfields-2.c: Likewise.
+	* c-c++-common/simulate-thread/bitfields-3.c: Likewise.
+	* c-c++-common/simulate-thread/bitfields-4.c: Likewise.
+	* g++.dg/simulate-thread/bitfields-2.C: Likewise.
+	* g++.dg/simulate-thread/bitfields.C: Likewise.
+	* gcc.dg/lto/pr52097_0.c: Likewise.
+	* gcc.dg/simulate-thread/speculative-store-2.c: Likewise.
+	* gcc.dg/simulate-thread/speculative-store-3.c: Likewise.
+	* gcc.dg/simulate-thread/speculative-store-4.c: Likewise.
+	* gcc.dg/simulate-thread/speculative-store.c: Likewise.
+	* gcc.dg/tree-ssa/20050314-1.c: Likewise.
+
 2019-10-15  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	PR tree-optimization/92085
diff --git a/gcc/testsuite/c-c++-common/cxxbitfields-3.c b/gcc/testsuite/c-c++-common/cxxbitfields-3.c
index fc423ea..706bf86 100644
--- a/gcc/testsuite/c-c++-common/cxxbitfields-3.c
+++ b/gcc/testsuite/c-c++-common/cxxbitfields-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2 --param allow-store-data-races=0" } */
+/* { dg-options "-O2 -fno-allow-store-data-races" } */
 
 /* Make sure we don't narrow down to a QI or HI to store into VAR.J,
    but instead use an SI.  */
diff --git a/gcc/testsuite/c-c++-common/cxxbitfields-6.c b/gcc/testsuite/c-c++-common/cxxbitfields-6.c
index bdd6294..273117c 100644
--- a/gcc/testsuite/c-c++-common/cxxbitfields-6.c
+++ b/gcc/testsuite/c-c++-common/cxxbitfields-6.c
@@ -1,6 +1,6 @@
 /* PR middle-end/50141 */
 /* { dg-do compile } */
-/* { dg-options "-O2 --param allow-store-data-races=0" } */
+/* { dg-options "-O2 -fno-allow-store-data-races" } */
 
 struct S
 {
diff --git a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-1.c b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-1.c
index 9ca3a67..89d4d08 100644
--- a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-1.c
+++ b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-1.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-2.c b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-2.c
index 0b29ffb..54f76b6 100644
--- a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-2.c
+++ b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-2.c
@@ -1,5 +1,5 @@
 /* { dg-do link { target { ! int16 } } } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-3.c b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-3.c
index 78f4d75..5d2feed 100644
--- a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-3.c
+++ b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-3.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-4.c b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-4.c
index cd6badf..84aad5e 100644
--- a/gcc/testsuite/c-c++-common/simulate-thread/bitfields-4.c
+++ b/gcc/testsuite/c-c++-common/simulate-thread/bitfields-4.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/g++.dg/simulate-thread/bitfields-2.C b/gcc/testsuite/g++.dg/simulate-thread/bitfields-2.C
index be5d1ea..e5a5ad5 100644
--- a/gcc/testsuite/g++.dg/simulate-thread/bitfields-2.C
+++ b/gcc/testsuite/g++.dg/simulate-thread/bitfields-2.C
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 /* Test that setting <var.a> does not touch either <var.b> or <var.c>.
diff --git a/gcc/testsuite/g++.dg/simulate-thread/bitfields.C b/gcc/testsuite/g++.dg/simulate-thread/bitfields.C
index b829587..9d1d062 100644
--- a/gcc/testsuite/g++.dg/simulate-thread/bitfields.C
+++ b/gcc/testsuite/g++.dg/simulate-thread/bitfields.C
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 /* Test that setting <var.a> does not touch either <var.b> or <var.c>.
diff --git a/gcc/testsuite/gcc.dg/lto/pr52097_0.c b/gcc/testsuite/gcc.dg/lto/pr52097_0.c
index 1b3fda3..701a951 100644
--- a/gcc/testsuite/gcc.dg/lto/pr52097_0.c
+++ b/gcc/testsuite/gcc.dg/lto/pr52097_0.c
@@ -1,5 +1,5 @@
 /* { dg-lto-do link } */
-/* { dg-lto-options { { -O -flto -fexceptions -fnon-call-exceptions --param allow-store-data-races=0 } } } */
+/* { dg-lto-options { { -O -flto -fexceptions -fnon-call-exceptions -fno-allow-store-data-races } } } */
 /* { dg-require-effective-target exceptions } */
 
 typedef struct { unsigned int e0 : 16; } s1;
diff --git a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-2.c b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-2.c
index d4d28f5..e3e9118 100644
--- a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-2.c
+++ b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-2.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0 -O2" } */
+/* { dg-options "-fno-allow-store-data-races -O2" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-3.c b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-3.c
index 203c026..69f6683 100644
--- a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-3.c
+++ b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-3.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0 -O2" } */
+/* { dg-options "-fno-allow-store-data-races -O2" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-4.c b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-4.c
index 59f81b7..b378446 100644
--- a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-4.c
+++ b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store-4.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store.c b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store.c
index ff9d71e..7afaabb 100644
--- a/gcc/testsuite/gcc.dg/simulate-thread/speculative-store.c
+++ b/gcc/testsuite/gcc.dg/simulate-thread/speculative-store.c
@@ -1,12 +1,12 @@
 /* { dg-do link } */
-/* { dg-options "--param allow-store-data-races=0" } */
+/* { dg-options "-fno-allow-store-data-races" } */
 /* { dg-final { simulate-thread } } */
 
 #include <stdio.h>
 #include "simulate-thread.h"
 
 /* This file tests that speculative store movement out of a loop doesn't 
-   happen.  This is disallowed when --param allow-store-data-races is 0.  */
+   happen.  This is disallowed when -fno-allow-store-data-races.  */
 
 int global = 100;
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
index fd9895b..ffeffb4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -fdump-tree-lim2-details --param allow-store-data-races=1" } */
+/* { dg-options "-O1 -fdump-tree-lim2-details -fallow-store-data-races" } */
 
 float a[100];
 
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 3c296ec..df9046a 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -914,10 +914,10 @@ ifcvt_memrefs_wont_trap (gimple *stmt, vec<data_reference_p> drs)
          to unconditionally.  */
       if (base_master_dr
 	  && DR_BASE_W_UNCONDITIONALLY (*base_master_dr))
-	return PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES);
+	return flag_store_data_races;
       /* or the base is known to be not readonly.  */
       else if (base_object_writable (DR_REF (a)))
-	return PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES);
+	return flag_store_data_races;
     }
 
   return false;
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index c247d74..7866418 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -2100,7 +2100,7 @@ execute_sm (class loop *loop, vec<edge> exits, im_mem_ref *ref)
   for_each_index (&ref->mem.ref, force_move_till, &fmt_data);
 
   if (bb_in_transaction (loop_preheader_edge (loop)->src)
-      || (! PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES)
+      || (! flag_store_data_races
 	  && ! ref_always_accessed_p (loop, ref, true)))
     multi_threaded_model_p = true;
 
-- 
cgit v1.1


From a7c4d6d1c29b62d97014d30848ee542e309dbe9c Mon Sep 17 00:00:00 2001
From: Hongtao Liu <liuhongt@gcc.gnu.org>
Date: Tue, 15 Oct 2019 07:44:15 +0000
Subject: Add missing mask[z]_roundscale_[round]_s[d,s] intrinsics

gcc/
	* config/i386/avx512fintrin.h (_mm_mask_roundscale_ss,
	_mm_maskz_roundscale_ss, _mm_maskz_roundscale_round_ss,
	_mm_maskz_roundscale_round_ss, _mm_mask_roundscale_sd,
	_mm_maskz_roundscale_sd, _mm_mask_roundscale_round_sd,
	_mm_maskz_roundscale_round_sd): New intrinsics.
	(_mm_roundscale_ss, _mm_roundscale_round_ss): Use
	__builtin_ia32_rndscales?_mask_round builtins instead of
	__builtin_ia32_rndscales?_round.
	* config/i386/i386-builtin.def (__builtin_ia32_rndscaless_round,
	__builtin_ia32_rndscalesd_round): Remove.
	(__builtin_ia32_rndscaless_mask_round,
	__builtin_ia32_rndscalesd_mask_round): New intrinsics.
	* config/i386/sse.md
	(avx512f_rndscale<mode><round_saeonly_name>): Renamed to ...
	(avx512f_rndscale<mode><mask_scalar_name><round_saeonly_scalar_name>):
	 ... this, adjust and add subst atrributes to make it maskable.

gcc/testsuite/
	* gcc.target/i386/avx512f-vrndscaless-1.c: Add scan-assembler-times
	directives for newly expected instructions.
	* gcc.target/i386/avx512f-vrndscalesd-1.c: Likewise.
	* gcc.target/i386/avx512f-vrndscaless-2.c
	(avx512f_test): Add tests for new intrinsics.
	* gcc.target/i386/avx512f-vrndscalesd-2.c: Likewise.
	* gcc.target/i386/avx-1.c (__builtin_ia32_rndscalefss_round,
	__builtin_ia32_rndscalefsd_round): Remove.
	(__builtin_ia32_rndscalefss_mask_round,
	__builtin_ia32_rndscalefsd_mask_round): Define.
	* gcc.target/i386/sse-13.c: Ditto.
	* gcc.target/i386/sse-23.c: Ditto.

From-SVN: r276986
---
 gcc/ChangeLog                                      |  20 ++
 gcc/config/i386/avx512fintrin.h                    | 258 +++++++++++++++++++--
 gcc/config/i386/i386-builtin.def                   |   4 +-
 gcc/config/i386/sse.md                             |   9 +-
 gcc/testsuite/ChangeLog                            |  16 ++
 gcc/testsuite/gcc.target/i386/avx-1.c              |   4 +-
 .../gcc.target/i386/avx512f-vrndscalesd-1.c        |  12 +-
 .../gcc.target/i386/avx512f-vrndscalesd-2.c        |  42 +++-
 .../gcc.target/i386/avx512f-vrndscaless-1.c        |  12 +-
 .../gcc.target/i386/avx512f-vrndscaless-2.c        |  41 +++-
 gcc/testsuite/gcc.target/i386/sse-13.c             |   4 +-
 gcc/testsuite/gcc.target/i386/sse-23.c             |   4 +-
 12 files changed, 384 insertions(+), 42 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 299bcb1..40726e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,23 @@
+2019-10-15  Hongyu Wang  <hongtao.wang@intel.com>
+
+	PR target/92035
+	* config/i386/avx512fintrin.h (_mm_mask_roundscale_ss,
+	_mm_maskz_roundscale_ss, _mm_maskz_roundscale_round_ss,
+	_mm_maskz_roundscale_round_ss, _mm_mask_roundscale_sd,
+	_mm_maskz_roundscale_sd, _mm_mask_roundscale_round_sd,
+	_mm_maskz_roundscale_round_sd): New intrinsics.
+	(_mm_roundscale_ss, _mm_roundscale_round_ss): Use
+	__builtin_ia32_rndscales?_mask_round builtins instead of
+	__builtin_ia32_rndscales?_round.
+	* config/i386/i386-builtin.def (__builtin_ia32_rndscaless_round,
+	__builtin_ia32_rndscalesd_round): Remove.
+	(__builtin_ia32_rndscaless_mask_round,
+	__builtin_ia32_rndscalesd_mask_round): New intrinsics.
+	* config/i386/sse.md
+	(avx512f_rndscale<mode><round_saeonly_name>): Renamed to ...
+	(avx512f_rndscale<mode><mask_scalar_name><round_saeonly_scalar_name>):
+	 ... this, adjust and add subst atrributes to make it maskable.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/92046
diff --git a/gcc/config/i386/avx512fintrin.h b/gcc/config/i386/avx512fintrin.h
index c2ca4e1..1d08f01 100644
--- a/gcc/config/i386/avx512fintrin.h
+++ b/gcc/config/i386/avx512fintrin.h
@@ -9169,10 +9169,43 @@ _mm512_maskz_roundscale_round_pd (__mmask8 __A, __m512d __B,
 
 extern __inline __m128
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm_roundscale_round_ss (__m128 __A, __m128 __B, const int __imm, const int __R)
+_mm_roundscale_round_ss (__m128 __A, __m128 __B, const int __imm,
+			 const int __R)
+{
+  return (__m128)
+    __builtin_ia32_rndscaless_mask_round ((__v4sf) __A,
+					  (__v4sf) __B, __imm,
+					  (__v4sf)
+					  _mm_setzero_ps (),
+					  (__mmask8) -1,
+					  __R);
+}
+
+extern __inline __m128
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_mask_roundscale_round_ss (__m128 __A, __mmask8 __B, __m128 __C,
+			      __m128 __D, const int __imm, const int __R)
 {
-  return (__m128) __builtin_ia32_rndscaless_round ((__v4sf) __A,
-						   (__v4sf) __B, __imm, __R);
+  return (__m128)
+    __builtin_ia32_rndscaless_mask_round ((__v4sf) __C,
+					  (__v4sf) __D, __imm,
+					  (__v4sf) __A,
+					  (__mmask8) __B,
+					  __R);
+}
+
+extern __inline __m128
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_maskz_roundscale_round_ss (__mmask8 __A, __m128 __B, __m128 __C,
+			       const int __imm, const int __R)
+{
+  return (__m128)
+    __builtin_ia32_rndscaless_mask_round ((__v4sf) __B,
+					  (__v4sf) __C, __imm,
+					  (__v4sf)
+					  _mm_setzero_ps (),
+					  (__mmask8) __A,
+					  __R);
 }
 
 extern __inline __m128d
@@ -9180,8 +9213,40 @@ __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 _mm_roundscale_round_sd (__m128d __A, __m128d __B, const int __imm,
 			 const int __R)
 {
-  return (__m128d) __builtin_ia32_rndscalesd_round ((__v2df) __A,
-						    (__v2df) __B, __imm, __R);
+  return (__m128d)
+    __builtin_ia32_rndscalesd_mask_round ((__v2df) __A,
+					  (__v2df) __B, __imm,
+					  (__v2df)
+					  _mm_setzero_pd (),
+					  (__mmask8) -1,
+					  __R);
+}
+
+extern __inline __m128d
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_mask_roundscale_round_sd (__m128d __A, __mmask8 __B, __m128d __C,
+			      __m128d __D, const int __imm, const int __R)
+{
+  return (__m128d)
+    __builtin_ia32_rndscalesd_mask_round ((__v2df) __C,
+					  (__v2df) __D, __imm,
+					  (__v2df) __A,
+					  (__mmask8) __B,
+					  __R);
+}
+
+extern __inline __m128d
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_maskz_roundscale_round_sd (__mmask8 __A, __m128d __B, __m128d __C,
+			       const int __imm, const int __R)
+{
+  return (__m128d)
+    __builtin_ia32_rndscalesd_mask_round ((__v2df) __B,
+					  (__v2df) __C, __imm,
+					  (__v2df)
+					  _mm_setzero_pd (),
+					  (__mmask8) __A,
+					  __R);
 }
 
 #else
@@ -9211,12 +9276,54 @@ _mm_roundscale_round_sd (__m128d __A, __m128d __B, const int __imm,
 					     (int)(C),			\
 					     (__v8df)_mm512_setzero_pd(),\
 					     (__mmask8)(A), R))
-#define _mm_roundscale_round_ss(A, B, C, R)					\
-  ((__m128) __builtin_ia32_rndscaless_round ((__v4sf)(__m128)(A),	\
-    (__v4sf)(__m128)(B), (int)(C), R))
-#define _mm_roundscale_round_sd(A, B, C, R)					\
-  ((__m128d) __builtin_ia32_rndscalesd_round ((__v2df)(__m128d)(A),	\
-    (__v2df)(__m128d)(B), (int)(C), R))
+#define _mm_roundscale_round_ss(A, B, I, R)				\
+  ((__m128)								\
+   __builtin_ia32_rndscaless_mask_round ((__v4sf) (__m128) (A),		\
+					 (__v4sf) (__m128) (B),		\
+					 (int) (I),			\
+					 (__v4sf) _mm_setzero_ps (),	\
+					 (__mmask8) (-1),		\
+					 (int) (R)))
+#define _mm_mask_roundscale_round_ss(A, U, B, C, I, R)		\
+  ((__m128)							\
+   __builtin_ia32_rndscaless_mask_round ((__v4sf) (__m128) (B),	\
+					 (__v4sf) (__m128) (C),	\
+					 (int) (I),		\
+					 (__v4sf) (__m128) (A),	\
+					 (__mmask8) (U),	\
+					 (int) (R)))
+#define _mm_maskz_roundscale_round_ss(U, A, B, I, R)			\
+  ((__m128)								\
+   __builtin_ia32_rndscaless_mask_round ((__v4sf) (__m128) (A),		\
+					 (__v4sf) (__m128) (B),		\
+					 (int) (I),			\
+					 (__v4sf) _mm_setzero_ps (),	\
+					 (__mmask8) (U),		\
+					 (int) (R)))
+#define _mm_roundscale_round_sd(A, B, I, R)				\
+  ((__m128d)								\
+   __builtin_ia32_rndscalesd_mask_round ((__v2df) (__m128d) (A),	\
+					 (__v2df) (__m128d) (B),	\
+					 (int) (I),			\
+					 (__v2df) _mm_setzero_pd (),	\
+					 (__mmask8) (-1),		\
+					 (int) (R)))
+#define _mm_mask_roundscale_round_sd(A, U, B, C, I, R)			\
+  ((__m128d)								\
+   __builtin_ia32_rndscalesd_mask_round ((__v2df) (__m128d) (B),	\
+					 (__v2df) (__m128d) (C),	\
+					 (int) (I),			\
+					 (__v2df) (__m128d) (A),	\
+					 (__mmask8) (U),		\
+					 (int) (R)))
+#define _mm_maskz_roundscale_round_sd(U, A, B, I, R)			\
+  ((__m128d)								\
+   __builtin_ia32_rndscalesd_mask_round ((__v2df) (__m128d) (A),	\
+					 (__v2df) (__m128d) (B),	\
+					 (int) (I),			\
+					 (__v2df) _mm_setzero_pd (),	\
+					 (__mmask8) (U),		\
+					 (int) (R)))
 #endif
 
 extern __inline __m512
@@ -14812,18 +14919,81 @@ extern __inline __m128
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 _mm_roundscale_ss (__m128 __A, __m128 __B, const int __imm)
 {
-  return (__m128) __builtin_ia32_rndscaless_round ((__v4sf) __A,
-						   (__v4sf) __B, __imm,
-						   _MM_FROUND_CUR_DIRECTION);
+  return (__m128)
+    __builtin_ia32_rndscaless_mask_round ((__v4sf) __A,
+					  (__v4sf) __B, __imm,
+					  (__v4sf)
+					  _mm_setzero_ps (),
+					  (__mmask8) -1,
+					  _MM_FROUND_CUR_DIRECTION);
+}
+
+
+extern __inline __m128
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_mask_roundscale_ss (__m128 __A, __mmask8 __B, __m128 __C, __m128 __D,
+			const int __imm)
+{
+  return (__m128)
+    __builtin_ia32_rndscaless_mask_round ((__v4sf) __C,
+					  (__v4sf) __D, __imm,
+					  (__v4sf) __A,
+					  (__mmask8) __B,
+					  _MM_FROUND_CUR_DIRECTION);
+}
+
+extern __inline __m128
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_maskz_roundscale_ss (__mmask8 __A, __m128 __B, __m128 __C,
+			 const int __imm)
+{
+  return (__m128)
+    __builtin_ia32_rndscaless_mask_round ((__v4sf) __B,
+					  (__v4sf) __C, __imm,
+					  (__v4sf)
+					  _mm_setzero_ps (),
+					  (__mmask8) __A,
+					  _MM_FROUND_CUR_DIRECTION);
 }
 
 extern __inline __m128d
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 _mm_roundscale_sd (__m128d __A, __m128d __B, const int __imm)
 {
-  return (__m128d) __builtin_ia32_rndscalesd_round ((__v2df) __A,
-						    (__v2df) __B, __imm,
-						   _MM_FROUND_CUR_DIRECTION);
+  return (__m128d)
+    __builtin_ia32_rndscalesd_mask_round ((__v2df) __A,
+					  (__v2df) __B, __imm,
+					  (__v2df)
+					  _mm_setzero_pd (),
+					  (__mmask8) -1,
+					  _MM_FROUND_CUR_DIRECTION);
+}
+
+extern __inline __m128d
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_mask_roundscale_sd (__m128d __A, __mmask8 __B, __m128d __C, __m128d __D,
+			const int __imm)
+{
+  return (__m128d)
+    __builtin_ia32_rndscalesd_mask_round ((__v2df) __C,
+					  (__v2df) __D, __imm,
+					  (__v2df) __A,
+					  (__mmask8) __B,
+					  _MM_FROUND_CUR_DIRECTION);
+}
+
+extern __inline __m128d
+__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
+_mm_maskz_roundscale_sd (__mmask8 __A, __m128d __B, __m128d __C,
+			 const int __imm)
+{
+  return (__m128d)
+    __builtin_ia32_rndscalesd_mask_round ((__v2df) __B,
+					  (__v2df) __C, __imm,
+					  (__v2df)
+					  _mm_setzero_pd (),
+					  (__mmask8) __A,
+					  _MM_FROUND_CUR_DIRECTION);
 }
 
 #else
@@ -14853,12 +15023,54 @@ _mm_roundscale_sd (__m128d __A, __m128d __B, const int __imm)
 					     (int)(C),			\
 					     (__v8df)_mm512_setzero_pd(),\
 					     (__mmask8)(A), _MM_FROUND_CUR_DIRECTION))
-#define _mm_roundscale_ss(A, B, C)					\
-  ((__m128) __builtin_ia32_rndscaless_round ((__v4sf)(__m128)(A),	\
-  (__v4sf)(__m128)(B), (int)(C), _MM_FROUND_CUR_DIRECTION))
-#define _mm_roundscale_sd(A, B, C)					\
-  ((__m128d) __builtin_ia32_rndscalesd_round ((__v2df)(__m128d)(A),	\
-    (__v2df)(__m128d)(B), (int)(C), _MM_FROUND_CUR_DIRECTION))
+#define _mm_roundscale_ss(A, B, I)					\
+  ((__m128)								\
+   __builtin_ia32_rndscaless_mask_round ((__v4sf) (__m128) (A),		\
+					 (__v4sf) (__m128) (B),		\
+					 (int) (I),			\
+					 (__v4sf) _mm_setzero_ps (),	\
+					 (__mmask8) (-1),		\
+					 _MM_FROUND_CUR_DIRECTION))
+#define _mm_mask_roundscale_ss(A, U, B, C, I)				\
+  ((__m128)								\
+   __builtin_ia32_rndscaless_mask_round ((__v4sf) (__m128) (B),		\
+					 (__v4sf) (__m128) (C),		\
+					 (int) (I),			\
+					 (__v4sf) (__m128) (A),		\
+					 (__mmask8) (U),		\
+					 _MM_FROUND_CUR_DIRECTION))
+#define _mm_maskz_roundscale_ss(U, A, B, I)				\
+  ((__m128)								\
+   __builtin_ia32_rndscaless_mask_round ((__v4sf) (__m128) (A),		\
+					 (__v4sf) (__m128) (B),		\
+					 (int) (I),			\
+					 (__v4sf) _mm_setzero_ps (),	\
+					 (__mmask8) (U),		\
+					 _MM_FROUND_CUR_DIRECTION))
+#define _mm_roundscale_sd(A, B, I)					\
+  ((__m128d)								\
+   __builtin_ia32_rndscalesd_mask_round ((__v2df) (__m128d) (A),	\
+					 (__v2df) (__m128d) (B),	\
+					 (int) (I),			\
+					 (__v2df) _mm_setzero_pd (),	\
+					 (__mmask8) (-1),		\
+					 _MM_FROUND_CUR_DIRECTION))
+#define _mm_mask_roundscale_sd(A, U, B, C, I)				\
+  ((__m128d)								\
+   __builtin_ia32_rndscalesd_mask_round ((__v2df) (__m128d) (B),	\
+					 (__v2df) (__m128d) (C),	\
+					 (int) (I),			\
+					 (__v2df) (__m128d) (A),	\
+					 (__mmask8) (U),		\
+					 _MM_FROUND_CUR_DIRECTION))
+#define _mm_maskz_roundscale_sd(U, A, B, I)				\
+  ((__m128d)								\
+   __builtin_ia32_rndscalesd_mask_round ((__v2df) (__m128d) (A),	\
+					 (__v2df) (__m128d) (B),	\
+					 (int) (I),			\
+					 (__v2df) _mm_setzero_pd (),	\
+					 (__mmask8) (U),		\
+					 _MM_FROUND_CUR_DIRECTION))
 #endif
 
 #ifdef __OPTIMIZE__
diff --git a/gcc/config/i386/i386-builtin.def b/gcc/config/i386/i386-builtin.def
index 6ac820e..1102833 100644
--- a/gcc/config/i386/i386-builtin.def
+++ b/gcc/config/i386/i386-builtin.def
@@ -2828,8 +2828,8 @@ BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_sse_vmmulv4sf3_round, "__builtin_ia3
 BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_sse_vmmulv4sf3_mask_round, "__builtin_ia32_mulss_mask_round", IX86_BUILTIN_MULSS_MASK_ROUND, UNKNOWN, (int) V4SF_FTYPE_V4SF_V4SF_V4SF_UQI_INT)
 BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_rndscalev8df_mask_round, "__builtin_ia32_rndscalepd_mask", IX86_BUILTIN_RNDSCALEPD, UNKNOWN, (int) V8DF_FTYPE_V8DF_INT_V8DF_QI_INT)
 BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_rndscalev16sf_mask_round, "__builtin_ia32_rndscaleps_mask", IX86_BUILTIN_RNDSCALEPS, UNKNOWN, (int) V16SF_FTYPE_V16SF_INT_V16SF_HI_INT)
-BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_rndscalev2df_round, "__builtin_ia32_rndscalesd_round", IX86_BUILTIN_RNDSCALESD, UNKNOWN, (int) V2DF_FTYPE_V2DF_V2DF_INT_INT)
-BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_rndscalev4sf_round, "__builtin_ia32_rndscaless_round", IX86_BUILTIN_RNDSCALESS, UNKNOWN, (int) V4SF_FTYPE_V4SF_V4SF_INT_INT)
+BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_rndscalev2df_mask_round, "__builtin_ia32_rndscalesd_mask_round", IX86_BUILTIN_RNDSCALESD, UNKNOWN, (int) V2DF_FTYPE_V2DF_V2DF_INT_V2DF_UQI_INT)
+BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_rndscalev4sf_mask_round, "__builtin_ia32_rndscaless_mask_round", IX86_BUILTIN_RNDSCALESS, UNKNOWN, (int) V4SF_FTYPE_V4SF_V4SF_INT_V4SF_UQI_INT)
 BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_scalefv8df_mask_round, "__builtin_ia32_scalefpd512_mask", IX86_BUILTIN_SCALEFPD512, UNKNOWN, (int) V8DF_FTYPE_V8DF_V8DF_V8DF_UQI_INT)
 BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_scalefv16sf_mask_round, "__builtin_ia32_scalefps512_mask", IX86_BUILTIN_SCALEFPS512, UNKNOWN, (int) V16SF_FTYPE_V16SF_V16SF_V16SF_HI_INT)
 BDESC (OPTION_MASK_ISA_AVX512F, 0, CODE_FOR_avx512f_vmscalefv2df_mask_round, "__builtin_ia32_scalefsd_mask_round", IX86_BUILTIN_SCALEFSD, UNKNOWN, (int) V2DF_FTYPE_V2DF_V2DF_V2DF_UQI_INT)
diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index 07922a1..f474eed 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -9694,18 +9694,17 @@
    (set_attr "prefix" "evex")
    (set_attr "mode" "<MODE>")])
 
-(define_insn "avx512f_rndscale<mode><round_saeonly_name>"
+(define_insn "avx512f_rndscale<mode><mask_scalar_name><round_saeonly_scalar_name>"
   [(set (match_operand:VF_128 0 "register_operand" "=v")
 	(vec_merge:VF_128
 	  (unspec:VF_128
-	    [(match_operand:VF_128 1 "register_operand" "v")
-	     (match_operand:VF_128 2 "<round_saeonly_nimm_predicate>" "<round_saeonly_constraint>")
+	    [(match_operand:VF_128 2 "<round_saeonly_scalar_nimm_predicate>" "<round_saeonly_scalar_constraint>")
 	     (match_operand:SI 3 "const_0_to_255_operand")]
 	    UNSPEC_ROUND)
-	  (match_dup 1)
+	  (match_operand:VF_128 1 "register_operand" "v")
 	  (const_int 1)))]
   "TARGET_AVX512F"
-  "vrndscale<ssescalarmodesuffix>\t{%3, <round_saeonly_op4>%2, %1, %0|%0, %1, %<iptr>2<round_saeonly_op4>, %3}"
+  "vrndscale<ssescalarmodesuffix>\t{%3, <round_saeonly_scalar_mask_op4>%2, %1, %0<mask_scalar_operand4>|%0<mask_scalar_operand4>, %1, %<iptr>2<round_saeonly_scalar_mask_op4>, %3}"
   [(set_attr "length_immediate" "1")
    (set_attr "prefix" "evex")
    (set_attr "mode" "<MODE>")])
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ff7871..34854d2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-15  Hongyu Wang  <hongyu.wang@intel.com>
+
+	PR target/92035
+	* gcc.target/i386/avx512f-vrndscaless-1.c: Add scan-assembler-times
+	directives for newly expected instructions.
+	* gcc.target/i386/avx512f-vrndscalesd-1.c: Likewise.
+	* gcc.target/i386/avx512f-vrndscaless-2.c
+	(avx512f_test): Add tests for new intrinsics.
+	* gcc.target/i386/avx512f-vrndscalesd-2.c: Likewise.
+	* gcc.target/i386/avx-1.c (__builtin_ia32_rndscalefss_round,
+	__builtin_ia32_rndscalefsd_round): Remove.
+	(__builtin_ia32_rndscalefss_mask_round,
+	__builtin_ia32_rndscalefsd_mask_round): Define.
+	* gcc.target/i386/sse-13.c: Ditto.
+	* gcc.target/i386/sse-23.c: Ditto.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/92046
diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c b/gcc/testsuite/gcc.target/i386/avx-1.c
index 741b3c4..3600a7a 100644
--- a/gcc/testsuite/gcc.target/i386/avx-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-1.c
@@ -283,8 +283,8 @@
 #define __builtin_ia32_pternlogq512_maskz(A, B, C, F, E) __builtin_ia32_pternlogq512_maskz(A, B, C, 1, E)
 #define __builtin_ia32_rndscalepd_mask(A, F, C, D, E) __builtin_ia32_rndscalepd_mask(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleps_mask(A, F, C, D, E) __builtin_ia32_rndscaleps_mask(A, 1, C, D, 8)
-#define __builtin_ia32_rndscalesd_round(A, B, C, D) __builtin_ia32_rndscalesd_round(A, B, 1, 4)
-#define __builtin_ia32_rndscaless_round(A, B, C, D) __builtin_ia32_rndscaless_round(A, B, 1, 4)
+#define __builtin_ia32_rndscalesd_mask_round(A, B, C, D, E, F) __builtin_ia32_rndscalesd_mask_round(A, B, 1, D, E, 4)
+#define __builtin_ia32_rndscaless_mask_round(A, B, C, D, E, F) __builtin_ia32_rndscaless_mask_round(A, B, 1, D, E, 4)
 #define __builtin_ia32_scalefpd512_mask(A, B, C, D, E) __builtin_ia32_scalefpd512_mask(A, B, C, D, 8)
 #define __builtin_ia32_scalefps512_mask(A, B, C, D, E) __builtin_ia32_scalefps512_mask(A, B, C, D, 8)
 #define __builtin_ia32_scalefsd_mask_round(A, B, C, D, E) __builtin_ia32_scalefsd_mask_round(A, B, C, D, 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-1.c
index 255b384..f95d470 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-1.c
@@ -1,14 +1,24 @@
 /* { dg-do compile } */
 /* { dg-options "-mavx512f -O2" } */
-/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\\S*,\[ \\t\]+\{sae\}\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\[^\n\]*\{sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\[^\n\]*\{sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscalesd\[ \\t\]+\[^\n\]*\{sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */
 
 #include <immintrin.h>
 
 volatile __m128d x1, x2;
+volatile __mmask8 m;
 
 void extern
 avx512f_test (void)
 {
   x1 = _mm_roundscale_sd (x1, x2, 0x42);
   x1 = _mm_roundscale_round_sd (x1, x2, 0x42, _MM_FROUND_NO_EXC);
+  x1 = _mm_mask_roundscale_sd (x1, m, x1, x2, 0x42);
+  x1 = _mm_mask_roundscale_round_sd (x1, m, x1, x2, 0x42, _MM_FROUND_NO_EXC);
+  x1 = _mm_maskz_roundscale_sd (m, x1, x2, 0x42);
+  x1 = _mm_maskz_roundscale_round_sd (m, x1, x2, 0x42, _MM_FROUND_NO_EXC);
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c
index b96aa46..83b940d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c
@@ -6,6 +6,7 @@
 
 #include <math.h>
 #include "avx512f-check.h"
+#include "avx512f-mask-type.h"
 
 static void
 compute_rndscalesd (double *s1, double *s2, double *r, int imm)
@@ -33,17 +34,54 @@ compute_rndscalesd (double *s1, double *s2, double *r, int imm)
 static void
 avx512f_test (void)
 {
-  int imm = _MM_FROUND_FLOOR | (7 << 4);
-  union128d s1, s2, res1;
+  int i, imm;
+  union128d s1, s2, res1, res2, res3, res4, res5, res6;
   double res_ref[SIZE];
+  
+  MASK_TYPE mask = MASK_VALUE;
+
+  imm = _MM_FROUND_FLOOR | (7 << 4);
 
   s1.x = _mm_set_pd (4.05084, -1.23162);
   s2.x = _mm_set_pd (-3.53222, 7.33527);
 
+  for(i = 0; i < SIZE; i++)
+    {
+      res2.a[i] = DEFAULT_VALUE;
+      res5.a[i] = DEFAULT_VALUE;
+    }
+
   res1.x = _mm_roundscale_sd (s1.x, s2.x, imm);
+  res2.x = _mm_mask_roundscale_sd (res2.x, mask, s1.x, s2.x, imm);
+  res3.x = _mm_maskz_roundscale_sd (mask, s1.x, s2.x, imm);
+  res4.x = _mm_roundscale_round_sd (s1.x, s2.x, imm, _MM_FROUND_NO_EXC);
+  res5.x = _mm_mask_roundscale_round_sd (res5.x, mask, s1.x, s2.x, imm, _MM_FROUND_NO_EXC);
+  res6.x = _mm_maskz_roundscale_round_sd (mask, s1.x, s2.x, imm, _MM_FROUND_NO_EXC);
 
   compute_rndscalesd (s1.a, s2.a, res_ref, imm);
 
   if (check_union128d (res1, res_ref))
     abort ();
+
+  MASK_MERGE (d) (res_ref, mask, 1);
+  if (check_union128d (res2, res_ref))
+    abort ();
+  
+  MASK_ZERO (d) (res_ref, mask, 1);
+  if (check_union128d (res3, res_ref))
+    abort ();
+
+  compute_rndscalesd (s1.a, s2.a, res_ref, imm);
+
+  if (check_union128d (res4, res_ref))
+    abort ();
+
+  MASK_MERGE (d) (res_ref, mask, 1);
+  if (check_union128d (res5, res_ref))
+    abort ();
+  
+  MASK_ZERO (d) (res_ref, mask, 1);
+  if (check_union128d (res6, res_ref))
+    abort ();
+
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-1.c
index dbd6e21..19e3a97 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-1.c
@@ -1,14 +1,24 @@
 /* { dg-do compile } */
 /* { dg-options "-mavx512f -O2" } */
-/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\\S*,\[ \\t\]+\{sae\}\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\[^\n\]*\{sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\[^\n\]*\{sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */
+/* { dg-final { scan-assembler-times "vrndscaless\[ \\t\]+\[^\n\]*\{sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */
 
 #include <immintrin.h>
 
 volatile __m128 x1, x2;
+volatile __mmask8 m;
 
 void extern
 avx512f_test (void)
 {
   x1 = _mm_roundscale_ss (x1, x2, 0x42);
   x1 = _mm_roundscale_round_ss (x1, x2, 0x42, _MM_FROUND_NO_EXC);
+  x1 = _mm_mask_roundscale_ss (x1, m, x1, x2, 0x42);
+  x1 = _mm_mask_roundscale_round_ss (x1, m, x1, x2, 0x42, _MM_FROUND_NO_EXC);
+  x1 = _mm_maskz_roundscale_ss (m, x1, x2, 0x42);
+  x1 = _mm_maskz_roundscale_round_ss (m, x1, x2, 0x42, _MM_FROUND_NO_EXC);
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c
index 42dd645..6906880 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c
@@ -6,6 +6,7 @@
 
 #include <math.h>
 #include "avx512f-check.h"
+#include "avx512f-mask-type.h"
 
 static void
 compute_rndscaless (float *s1, float *s2, float *r, int imm)
@@ -35,17 +36,53 @@ compute_rndscaless (float *s1, float *s2, float *r, int imm)
 static void
 avx512f_test (void)
 {
-  int imm = _MM_FROUND_FLOOR | (7 << 4);
-  union128 s1, s2, res1;
+  int i, imm;
+  union128 s1, s2, res1, res2, res3, res4, res5, res6;
   float res_ref[SIZE];
+  
+  MASK_TYPE mask = MASK_VALUE;
 
+  imm = _MM_FROUND_FLOOR | (7 << 4);
+  
   s1.x = _mm_set_ps (4.05084, -1.23162, 2.00231, -6.22103);
   s2.x = _mm_set_ps (-4.19319, -3.53222, 7.33527, 5.57655);
+ 
+  for(i = 0; i < SIZE; i++)
+    {
+      res2.a[i] = DEFAULT_VALUE;
+      res5.a[i] = DEFAULT_VALUE;
+    }
 
   res1.x = _mm_roundscale_ss (s1.x, s2.x, imm);
+  res2.x = _mm_mask_roundscale_ss (res2.x, mask, s1.x, s2.x, imm);
+  res3.x = _mm_maskz_roundscale_ss (mask, s1.x, s2.x, imm);
+  res4.x = _mm_roundscale_round_ss (s1.x, s2.x, imm, _MM_FROUND_NO_EXC);
+  res5.x = _mm_mask_roundscale_round_ss (res5.x, mask, s1.x, s2.x, imm, _MM_FROUND_NO_EXC);
+  res6.x = _mm_maskz_roundscale_round_ss (mask, s1.x, s2.x, imm, _MM_FROUND_NO_EXC);
 
   compute_rndscaless (s1.a, s2.a, res_ref, imm);
 
   if (check_union128 (res1, res_ref))
     abort ();
+
+  MASK_MERGE () (res_ref, mask, 1);
+  if (check_union128 (res2, res_ref))
+    abort ();
+  
+  MASK_ZERO () (res_ref, mask, 1);
+  if (check_union128 (res3, res_ref))
+    abort ();
+
+  compute_rndscaless (s1.a, s2.a, res_ref, imm);
+
+  if (check_union128 (res4, res_ref))
+    abort ();
+
+  MASK_MERGE () (res_ref, mask, 1);
+  if (check_union128 (res5, res_ref))
+    abort ();
+  
+  MASK_ZERO () (res_ref, mask, 1);
+  if (check_union128 (res6, res_ref))
+    abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/sse-13.c b/gcc/testsuite/gcc.target/i386/sse-13.c
index 39b2d31..45c1c28 100644
--- a/gcc/testsuite/gcc.target/i386/sse-13.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
@@ -300,8 +300,8 @@
 #define __builtin_ia32_pternlogq512_maskz(A, B, C, F, E) __builtin_ia32_pternlogq512_maskz(A, B, C, 1, E)
 #define __builtin_ia32_rndscalepd_mask(A, F, C, D, E) __builtin_ia32_rndscalepd_mask(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleps_mask(A, F, C, D, E) __builtin_ia32_rndscaleps_mask(A, 1, C, D, 8)
-#define __builtin_ia32_rndscalesd_round(A, B, C, D) __builtin_ia32_rndscalesd_round(A, B, 1, 4)
-#define __builtin_ia32_rndscaless_round(A, B, C, D) __builtin_ia32_rndscaless_round(A, B, 1, 4)
+#define __builtin_ia32_rndscalesd_mask_round(A, B, C, D, E, F) __builtin_ia32_rndscalesd_mask_round(A, B, 1, D, E, 4)
+#define __builtin_ia32_rndscaless_mask_round(A, B, C, D, E, F) __builtin_ia32_rndscaless_mask_round(A, B, 1, D, E, 4)
 #define __builtin_ia32_scalefpd512_mask(A, B, C, D, E) __builtin_ia32_scalefpd512_mask(A, B, C, D, 8)
 #define __builtin_ia32_scalefps512_mask(A, B, C, D, E) __builtin_ia32_scalefps512_mask(A, B, C, D, 8)
 #define __builtin_ia32_scalefsd_mask_round(A, B, C, D, E) __builtin_ia32_scalefsd_mask_round(A, B, C, D, 8)
diff --git a/gcc/testsuite/gcc.target/i386/sse-23.c b/gcc/testsuite/gcc.target/i386/sse-23.c
index 7ea665d..e98c769 100644
--- a/gcc/testsuite/gcc.target/i386/sse-23.c
+++ b/gcc/testsuite/gcc.target/i386/sse-23.c
@@ -302,8 +302,8 @@
 #define __builtin_ia32_pternlogq512_maskz(A, B, C, F, E) __builtin_ia32_pternlogq512_maskz(A, B, C, 1, E)
 #define __builtin_ia32_rndscalepd_mask(A, F, C, D, E) __builtin_ia32_rndscalepd_mask(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleps_mask(A, F, C, D, E) __builtin_ia32_rndscaleps_mask(A, 1, C, D, 8)
-#define __builtin_ia32_rndscalesd_round(A, B, C, D) __builtin_ia32_rndscalesd_round(A, B, 1, 4)
-#define __builtin_ia32_rndscaless_round(A, B, C, D) __builtin_ia32_rndscaless_round(A, B, 1, 4)
+#define __builtin_ia32_rndscalesd_mask_round(A, B, C, D, E, F) __builtin_ia32_rndscalesd_mask_round(A, B, 1, D, E, 4)
+#define __builtin_ia32_rndscaless_mask_round(A, B, C, D, E, F) __builtin_ia32_rndscaless_mask_round(A, B, 1, D, E, 4)
 #define __builtin_ia32_scalefpd512_mask(A, B, C, D, E) __builtin_ia32_scalefpd512_mask(A, B, C, D, 8)
 #define __builtin_ia32_scalefps512_mask(A, B, C, D, E) __builtin_ia32_scalefps512_mask(A, B, C, D, 8)
 #define __builtin_ia32_scalefsd_mask_round(A, B, C, D, E) __builtin_ia32_scalefsd_mask_round(A, B, C, D, 8)
-- 
cgit v1.1


From c30587c0200f52f8845a5aea21bd7bef6cbe0bf4 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 15 Oct 2019 10:09:10 +0000
Subject: re PR fortran/92094 (ice in vect_transform_stmt at
 tree-vect-stmts.c:10921)

2019-10-15  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92094
	* tree-vect-loop.c (vectorizable_reduction): For nested cycles
	do not adjust the reduction definition def type.
	* tree-vect-stmts.c (vect_transform_stmt): Verify the scalar stmt
	defines the latch argument of the PHI.

	* gfortran.dg/pr92094.f90: New testcase.

From-SVN: r276987
---
 gcc/ChangeLog                         |  8 ++++++++
 gcc/testsuite/ChangeLog               |  5 +++++
 gcc/testsuite/gfortran.dg/pr92094.f90 | 28 ++++++++++++++++++++++++++++
 gcc/tree-vect-loop.c                  | 17 +++--------------
 gcc/tree-vect-stmts.c                 |  9 ++++++---
 5 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr92094.f90

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40726e9..6e16ee8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92094
+	* tree-vect-loop.c (vectorizable_reduction): For nested cycles
+	do not adjust the reduction definition def type.
+	* tree-vect-stmts.c (vect_transform_stmt): Verify the scalar stmt
+	defines the latch argument of the PHI.
+
 2019-10-15  Hongyu Wang  <hongtao.wang@intel.com>
 
 	PR target/92035
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 34854d2..7fbb8dd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92094
+	* gfortran.dg/pr92094.f90: New testcase.
+
 2019-10-15  Hongyu Wang  <hongyu.wang@intel.com>
 
 	PR target/92035
diff --git a/gcc/testsuite/gfortran.dg/pr92094.f90 b/gcc/testsuite/gfortran.dg/pr92094.f90
new file mode 100644
index 0000000..6793391
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92094.f90
@@ -0,0 +1,28 @@
+! { dg-do compile }
+! { dg-options "-O3" }
+      subroutine hesfcn(n, x, h, ldh)
+      integer n,ldh
+      double precision x(n), h(ldh)
+
+      integer i,j,k,kj
+      double precision th,u1,u2,v2
+ 
+      kj = 0
+      do 770 j = 1, n
+         kj = kj - j
+         do 760 k = 1, j
+            kj = kj + 1
+            v2 = 2 * x(k) - 1
+            u1 = 0
+            u2 = 2
+            do 750 i = 1, n
+               h(kj) = h(kj) + u2
+               th = 4 * v2 + u2 - u1
+               u1 = u2
+               u2 = th
+               th = v2 - 1
+  750       continue
+  760    continue
+  770 continue
+
+      end
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index de018ac..4552510 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -5742,20 +5742,9 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_nested_cycle)
     {
       if (is_a <gphi *> (stmt_info->stmt))
-	{
-	  /* Analysis for double-reduction is done on the outer
-	     loop PHI, nested cycles have no further restrictions.  */
-	  STMT_VINFO_TYPE (stmt_info) = cycle_phi_info_type;
-	  /* For nested cycles we want to let regular vectorizable_*
-	     routines handle code-generation.  */
-	  if (STMT_VINFO_DEF_TYPE (reduc_info) != vect_double_reduction_def)
-	    {
-	      stmt_info = STMT_VINFO_REDUC_DEF (stmt_info);
-	      STMT_VINFO_DEF_TYPE (stmt_info) = vect_internal_def;
-	      STMT_VINFO_DEF_TYPE (vect_stmt_to_vectorize (stmt_info))
-		= vect_internal_def;
-	    }
-	}
+	/* Analysis for double-reduction is done on the outer
+	   loop PHI, nested cycles have no further restrictions.  */
+	STMT_VINFO_TYPE (stmt_info) = cycle_phi_info_type;
       else
 	STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type;
       return true;
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index e606945..ff9863f 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -10906,13 +10906,16 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       && STMT_VINFO_REDUC_TYPE (reduc_info) != EXTRACT_LAST_REDUCTION)
     {
       gphi *phi;
+      edge e;
       if (!slp_node
 	  && (phi = dyn_cast <gphi *>
 		      (STMT_VINFO_REDUC_DEF (orig_stmt_info)->stmt))
 	  && dominated_by_p (CDI_DOMINATORS,
-			     gimple_bb (orig_stmt_info->stmt), gimple_bb (phi)))
+			     gimple_bb (orig_stmt_info->stmt), gimple_bb (phi))
+	  && (e = loop_latch_edge (gimple_bb (phi)->loop_father))
+	  && (PHI_ARG_DEF_FROM_EDGE (phi, e)
+	      == gimple_get_lhs (orig_stmt_info->stmt)))
 	{
-	  edge e = loop_latch_edge (gimple_bb (phi)->loop_father);
 	  stmt_vec_info phi_info
 	    = STMT_VINFO_VEC_STMT (STMT_VINFO_REDUC_DEF (orig_stmt_info));
 	  stmt_vec_info vec_stmt = STMT_VINFO_VEC_STMT (stmt_info);
@@ -10932,7 +10935,7 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	{
 	  slp_tree phi_node = slp_node_instance->reduc_phis;
 	  gphi *phi = as_a <gphi *> (SLP_TREE_SCALAR_STMTS (phi_node)[0]->stmt);
-	  edge e = loop_latch_edge (gimple_bb (phi)->loop_father);
+	  e = loop_latch_edge (gimple_bb (phi)->loop_father);
 	  gcc_assert (SLP_TREE_VEC_STMTS (phi_node).length ()
 		      == SLP_TREE_VEC_STMTS (slp_node).length ());
 	  for (unsigned i = 0; i < SLP_TREE_VEC_STMTS (phi_node).length (); ++i)
-- 
cgit v1.1


From 14f020d16d55787f1ddbb8185247ea8dd65dfd9a Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@adacore.com>
Date: Tue, 15 Oct 2019 10:12:15 +0000
Subject: Makefile.rtl (a-except.o): Put -O1 earlier so that it can be
 overriden if needed by other variables.

	* Makefile.rtl (a-except.o): Put -O1 earlier so that it can be
	overriden if needed by other variables.

From-SVN: r276988
---
 gcc/ada/ChangeLog    | 5 +++++
 gcc/ada/Makefile.rtl | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e66f111..e0d4e65 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Arnaud Charlet  <charlet@adacore.com>
+
+	* Makefile.rtl (a-except.o): Put -O1 earlier so that it can be
+	overriden if needed by other variables.
+
 2019-10-12  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR ada/91995
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index e5aa6b8..c286701 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -2733,8 +2733,8 @@ s-tasdeb.o  : s-tasdeb.adb s-tasdeb.ads
 # use -O1 otherwise gdb isn't able to get a full backtrace on mips targets.
 
 a-except.o  : a-except.adb a-except.ads
-	$(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) \
-	  $(NO_INLINE_ADAFLAGS) $(NO_REORDER_ADAFLAGS) -O1 $(ADA_INCLUDES) \
+	$(ADAC) -c $(ALL_ADAFLAGS) -O1 $(FORCE_DEBUG_ADAFLAGS) \
+	  $(NO_INLINE_ADAFLAGS) $(NO_REORDER_ADAFLAGS) $(ADA_INCLUDES) \
 	  $< $(OUTPUT_OPTION)
 
 # Compile s-excdeb.o without optimization and with debug info to let the
-- 
cgit v1.1


From 0d552c1b67132b349ec77f725ceb1568d72c6134 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Tue, 15 Oct 2019 10:22:35 +0000
Subject: [PATCH] S/390: Run %a0:DI splitters only after reload

gcc/ChangeLog:

2019-10-15  Ilya Leoshkevich  <iii@linux.ibm.com>

	* config/s390/s390.md: Run %a0:DI splitters only after reload.

gcc/testsuite/ChangeLog:

2019-10-15  Ilya Leoshkevich  <iii@linux.ibm.com>

	* gcc.target/s390/load-thread-pointer-once.c: New test.

From-SVN: r276989
---
 gcc/ChangeLog                                            |  4 ++++
 gcc/config/s390/s390.md                                  | 13 ++++++++++---
 gcc/testsuite/ChangeLog                                  |  4 ++++
 gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c | 12 ++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e16ee8..23213c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-15  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* config/s390/s390.md: Run %a0:DI splitters only after reload.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92094
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 4f7bde6..1e6439d 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -1860,10 +1860,17 @@
                               *,*,yes")
 ])
 
+; Splitters for loading/storing TLS pointers from/to %a0:DI.
+; Do this only during split2, which runs after reload. At the point when split1
+; runs, some of %a0:DI occurrences might be nested inside other rtxes and thus
+; not matched. As a result, only some occurrences will be split, which will
+; prevent CSE. At the point when split2 runs, reload will have ensured that no
+; nested references exist.
+
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
         (match_operand:DI 1 "register_operand" ""))]
-  "TARGET_ZARCH && ACCESS_REG_P (operands[1])"
+  "TARGET_ZARCH && ACCESS_REG_P (operands[1]) && reload_completed"
   [(set (match_dup 2) (match_dup 3))
    (set (match_dup 0) (ashift:DI (match_dup 0) (const_int 32)))
    (set (strict_low_part (match_dup 2)) (match_dup 4))]
@@ -1873,7 +1880,7 @@
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
         (match_operand:DI 1 "register_operand" ""))]
-  "TARGET_ZARCH && ACCESS_REG_P (operands[0])
+  "TARGET_ZARCH && ACCESS_REG_P (operands[0]) && reload_completed
    && dead_or_set_p (insn, operands[1])"
   [(set (match_dup 3) (match_dup 2))
    (set (match_dup 1) (lshiftrt:DI (match_dup 1) (const_int 32)))
@@ -1884,7 +1891,7 @@
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
         (match_operand:DI 1 "register_operand" ""))]
-  "TARGET_ZARCH && ACCESS_REG_P (operands[0])
+  "TARGET_ZARCH && ACCESS_REG_P (operands[0]) && reload_completed
    && !dead_or_set_p (insn, operands[1])"
   [(set (match_dup 3) (match_dup 2))
    (set (match_dup 1) (rotate:DI (match_dup 1) (const_int 32)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7fbb8dd..d70012a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-15  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* gcc.target/s390/load-thread-pointer-once.c: New test.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92094
diff --git a/gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c b/gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c
new file mode 100644
index 0000000..21a5bfa
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+__thread void *foo;
+
+void *bar()
+{
+  return (foo = __builtin_thread_pointer());
+}
+
+/* { dg-final { scan-assembler-times {\n\tear\t} 2 { target { lp64 } } } } */
+/* { dg-final { scan-assembler-times {\n\tear\t} 1 { target { ! lp64 } } } } */
-- 
cgit v1.1


From 0186d373b63c998f0a1c911bdf76c7675f7708de Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Tue, 15 Oct 2019 10:29:53 +0000
Subject: Fix unchecked use of tree_to_uhwi in tree-ssa-strlen.c

r273783 introduced an unchecked use of tree_to_uhwi.  This is
tested by the SVE ACLE patches, but could potentially trigger
in non-SVE cases too.

2019-10-15  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-ssa-strlen.c (count_nonzero_bytes): Check tree_fits_uhwi_p
	before using tree_to_uhwi.

From-SVN: r276990
---
 gcc/ChangeLog         | 5 +++++
 gcc/tree-ssa-strlen.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23213c7..bf3dbe5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-ssa-strlen.c (count_nonzero_bytes): Check tree_fits_uhwi_p
+	before using tree_to_uhwi.
+
 2019-10-15  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* config/s390/s390.md: Run %a0:DI splitters only after reload.
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index ef2717d..5b90ad3 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -4026,10 +4026,10 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 
       /* The size of the MEM_REF access determines the number of bytes.  */
       tree type = TREE_TYPE (exp);
-      if (tree typesize = TYPE_SIZE_UNIT (type))
-	nbytes = tree_to_uhwi (typesize);
-      else
+      tree typesize = TYPE_SIZE_UNIT (type);
+      if (!typesize || !tree_fits_uhwi_p (typesize))
 	return false;
+      nbytes = tree_to_uhwi (typesize);
 
       /* Handle MEM_REF = SSA_NAME types of assignments.  */
       return count_nonzero_bytes (arg, offset, nbytes, lenrange, nulterm,
-- 
cgit v1.1


From 1c2e7cd91aaa0fa022c8f17f4d5db214439ef178 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 15 Oct 2019 10:47:48 +0000
Subject: re PR target/92048 (armeb regression after r276645)

2019-10-15  Richard Biener  <rguenther@suse.de>

	PR testsuite/92048
	* gcc.dg/vect/fast-math-vect-pr29925.c: Avoid unrolling of
	inner loop.

From-SVN: r276991
---
 gcc/testsuite/ChangeLog                            | 6 ++++++
 gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c | 1 +
 2 files changed, 7 insertions(+)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d70012a..56c5e48 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	PR testsuite/92048
+	* gcc.dg/vect/fast-math-vect-pr29925.c: Avoid unrolling of
+	inner loop.
+
 2019-10-15  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* gcc.target/s390/load-thread-pointer-once.c: New test.
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c
index 2871369..9c58a48 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c
@@ -13,6 +13,7 @@ void interp_pitch(float *exc, float *interp, int pitch, int len)
    for (i=0;i<len;i++)
    {
       float tmp = 0;
+#pragma GCC unroll 0
       for (k=0;k<7;k++)
       {
          tmp += exc[i-pitch+k+maxj-6];
-- 
cgit v1.1


From 386c40778648fecf4807566d5254dec191d35dab Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 15 Oct 2019 11:20:06 +0000
Subject: [C++ PATCH] build_clone cleanup

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01069.html
build_clone is recursive when applied to a template, but I found the control flow confusing. this makes it clearer and moves some decls to their initializers.

	* class.c (build_clone): Refactor to clarify recursiveness.

From-SVN: r276992
---
 gcc/cp/ChangeLog |  4 ++++
 gcc/cp/class.c   | 27 ++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7245b3e..a2fc072 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-15  Nathan Sidwell  <nathan@acm.org>
+
+	* class.c (build_clone): Refactor to clarify recursiveness.
+
 2019-10-14  Jason Merrill  <jason@redhat.com>
 
 	PR c++/91930 - ICE with constrained inherited default ctor.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b6afdc4..b9266b3 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4581,16 +4581,15 @@ check_methods (tree t)
 static tree
 build_clone (tree fn, tree name)
 {
-  tree parms;
-  tree clone;
-
   /* Copy the function.  */
-  clone = copy_decl (fn);
+  tree clone = copy_decl (fn);
   /* Reset the function name.  */
   DECL_NAME (clone) = name;
   /* Remember where this function came from.  */
   DECL_ABSTRACT_ORIGIN (clone) = fn;
-  /* Make it easy to find the CLONE given the FN.  */
+
+  /* Make it easy to find the CLONE given the FN.  Note the
+     template_result of a template will be chained this way too.  */
   DECL_CHAIN (clone) = DECL_CHAIN (fn);
   DECL_CHAIN (fn) = clone;
 
@@ -4599,19 +4598,18 @@ build_clone (tree fn, tree name)
     {
       tree result = build_clone (DECL_TEMPLATE_RESULT (clone), name);
       DECL_TEMPLATE_RESULT (clone) = result;
+
       DECL_TEMPLATE_INFO (result) = copy_node (DECL_TEMPLATE_INFO (result));
       DECL_TI_TEMPLATE (result) = clone;
+
       TREE_TYPE (clone) = TREE_TYPE (result);
       return clone;
     }
-  else
-    {
-      /* Clone constraints.  */
-      if (flag_concepts)
-        if (tree ci = get_constraints (fn))
-          set_constraints (clone, copy_node (ci));
-    }
 
+  if (flag_concepts)
+    /* Clone constraints.  */
+    if (tree ci = get_constraints (fn))
+      set_constraints (clone, copy_node (ci));
 
   SET_DECL_ASSEMBLER_NAME (clone, NULL_TREE);
   DECL_CLONED_FUNCTION (clone) = fn;
@@ -4623,8 +4621,7 @@ build_clone (tree fn, tree name)
   if (name == base_dtor_identifier)
     {
       DECL_VIRTUAL_P (clone) = 0;
-      if (TREE_CODE (clone) != TEMPLATE_DECL)
-	DECL_VINDEX (clone) = NULL_TREE;
+      DECL_VINDEX (clone) = NULL_TREE;
     }
 
   bool ctor_omit_inherited_parms_p = ctor_omit_inherited_parms (clone);
@@ -4689,7 +4686,7 @@ build_clone (tree fn, tree name)
   if (ctor_omit_inherited_parms_p)
     DECL_CHAIN (DECL_CHAIN (DECL_ARGUMENTS (clone))) = NULL_TREE;
 
-  for (parms = DECL_ARGUMENTS (clone); parms; parms = DECL_CHAIN (parms))
+  for (tree parms = DECL_ARGUMENTS (clone); parms; parms = DECL_CHAIN (parms))
     {
       DECL_CONTEXT (parms) = clone;
       cxx_dup_lang_specific_decl (parms);
-- 
cgit v1.1


From d8955dc0f4583317c4d6a65d17c92c538f46a60c Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 15 Oct 2019 11:47:27 +0000
Subject: re PR debug/91929 (missing inline subroutine information in build
 using sin/cos)

2019-10-15  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/91929
	* tree-ssa-pre.c (pre_expr_d::loc): New member.
	(get_or_alloc_expr_for_name): Initialize it.
	(get_or_alloc_expr_for_constant): Likewise.
	(phi_translate_1): Copy it.
	(create_expression_by_pieces): Use the original location
	of the expression for the inserted stmt.
	(compute_avail): Record the location of the stmt for the
	expressions created.

From-SVN: r276993
---
 gcc/ChangeLog      | 12 ++++++++++++
 gcc/tree-ssa-pre.c | 25 +++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf3dbe5..09723d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/91929
+	* tree-ssa-pre.c (pre_expr_d::loc): New member.
+	(get_or_alloc_expr_for_name): Initialize it.
+	(get_or_alloc_expr_for_constant): Likewise.
+	(phi_translate_1): Copy it.
+	(create_expression_by_pieces): Use the original location
+	of the expression for the inserted stmt.
+	(compute_avail): Record the location of the stmt for the
+	expressions created.
+
 2019-10-15  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-ssa-strlen.c (count_nonzero_bytes): Check tree_fits_uhwi_p
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index c618601..0f8f424 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -257,6 +257,7 @@ typedef struct pre_expr_d : nofree_ptr_hash <pre_expr_d>
 {
   enum pre_expr_kind kind;
   unsigned int id;
+  location_t loc;
   pre_expr_union u;
 
   /* hash_table support.  */
@@ -421,6 +422,7 @@ get_or_alloc_expr_for_name (tree name)
 
   result = pre_expr_pool.allocate ();
   result->kind = NAME;
+  result->loc = UNKNOWN_LOCATION;
   PRE_EXPR_NAME (result) = name;
   alloc_expression_id (result);
   return result;
@@ -1077,6 +1079,7 @@ get_or_alloc_expr_for_constant (tree constant)
 
   newexpr = pre_expr_pool.allocate ();
   newexpr->kind = CONSTANT;
+  newexpr->loc = UNKNOWN_LOCATION;
   PRE_EXPR_CONSTANT (newexpr) = constant;
   alloc_expression_id (newexpr);
   value_id = get_or_alloc_constant_value_id (constant);
@@ -1334,6 +1337,7 @@ phi_translate_1 (bitmap_set_t dest,
 {
   basic_block pred = e->src;
   basic_block phiblock = e->dest;
+  location_t expr_loc = expr->loc;
   switch (expr->kind)
     {
     case NARY:
@@ -1436,6 +1440,7 @@ phi_translate_1 (bitmap_set_t dest,
 	    expr = pre_expr_pool.allocate ();
 	    expr->kind = NARY;
 	    expr->id = 0;
+	    expr->loc = expr_loc;
 	    if (nary && !nary->predicated_values)
 	      {
 		PRE_EXPR_NARY (expr) = nary;
@@ -1587,6 +1592,7 @@ phi_translate_1 (bitmap_set_t dest,
 	    expr = pre_expr_pool.allocate ();
 	    expr->kind = REFERENCE;
 	    expr->id = 0;
+	    expr->loc = expr_loc;
 
 	    if (newref)
 	      new_val_id = newref->value_id;
@@ -2789,6 +2795,7 @@ create_expression_by_pieces (basic_block block, pre_expr expr,
 	      args.quick_push (arg);
 	    }
 	  gcall *call = gimple_build_call_vec (fn, args);
+	  gimple_set_location (call, expr->loc);
 	  gimple_call_set_fntype (call, currop->type);
 	  if (sc)
 	    gimple_call_set_chain (call, sc);
@@ -2822,6 +2829,7 @@ create_expression_by_pieces (basic_block block, pre_expr expr,
 	    return NULL_TREE;
 	  name = make_temp_ssa_name (exprtype, NULL, "pretmp");
 	  newstmt = gimple_build_assign (name, folded);
+	  gimple_set_location (newstmt, expr->loc);
 	  gimple_seq_add_stmt_without_update (&forced_stmts, newstmt);
 	  gimple_set_vuse (newstmt, BB_LIVE_VOP_ON_EXIT (block));
 	  folded = name;
@@ -2860,6 +2868,7 @@ create_expression_by_pieces (basic_block block, pre_expr expr,
 	    folded = build_constructor (nary->type, elts);
 	    name = make_temp_ssa_name (exprtype, NULL, "pretmp");
 	    newstmt = gimple_build_assign (name, folded);
+	    gimple_set_location (newstmt, expr->loc);
 	    gimple_seq_add_stmt_without_update (&forced_stmts, newstmt);
 	    folded = name;
 	  }
@@ -2868,16 +2877,17 @@ create_expression_by_pieces (basic_block block, pre_expr expr,
 	    switch (nary->length)
 	      {
 	      case 1:
-		folded = gimple_build (&forced_stmts, nary->opcode, nary->type,
-				       genop[0]);
+		folded = gimple_build (&forced_stmts, expr->loc,
+				       nary->opcode, nary->type, genop[0]);
 		break;
 	      case 2:
-		folded = gimple_build (&forced_stmts, nary->opcode, nary->type,
-				       genop[0], genop[1]);
+		folded = gimple_build (&forced_stmts, expr->loc, nary->opcode,
+				       nary->type, genop[0], genop[1]);
 		break;
 	      case 3:
-		folded = gimple_build (&forced_stmts, nary->opcode, nary->type,
-				       genop[0], genop[1], genop[2]);
+		folded = gimple_build (&forced_stmts, expr->loc, nary->opcode,
+				       nary->type, genop[0], genop[1],
+				       genop[2]);
 		break;
 	      default:
 		gcc_unreachable ();
@@ -3856,6 +3866,7 @@ compute_avail (void)
 		    result = pre_expr_pool.allocate ();
 		    result->kind = REFERENCE;
 		    result->id = 0;
+		    result->loc = gimple_location (stmt);
 		    PRE_EXPR_REFERENCE (result) = ref;
 
 		    get_or_alloc_expression_id (result);
@@ -3896,6 +3907,7 @@ compute_avail (void)
 		      result = pre_expr_pool.allocate ();
 		      result->kind = NARY;
 		      result->id = 0;
+		      result->loc = gimple_location (stmt);
 		      PRE_EXPR_NARY (result) = nary;
 		      break;
 		    }
@@ -4013,6 +4025,7 @@ compute_avail (void)
 		      result = pre_expr_pool.allocate ();
 		      result->kind = REFERENCE;
 		      result->id = 0;
+		      result->loc = gimple_location (stmt);
 		      PRE_EXPR_REFERENCE (result) = ref;
 		      break;
 		    }
-- 
cgit v1.1


From 28987d8be6f77e88eedaff727176c7bc1030baac Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Tue, 15 Oct 2019 12:14:55 +0000
Subject: constraints.md: Allow post_inc operand for "Ya" constraint.

2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/constraints.md: Allow post_inc operand for "Ya"
	constraint.
	* config/msp430/msp430.c (msp430_legitimate_address_p): Handle
	POST_INC.
	(msp430_subreg): Likewise.
	(msp430_split_addsi): Likewise.
	(msp430_print_operand_addr): Likewise.
	* config/msp430/msp430.h (HAVE_POST_INCREMENT): Define.
	(USE_STORE_POST_INCREMENT): Define.
	* config/msp430/msp430.md: Use the msp430_general_dst_operand or
	msp430_general_dst_nonv_operand predicates for the lvalues of insns.
	* config/msp430/predicates.md (msp430_nonpostinc_operand): New.
	(msp430_general_dst_operand): New.
	(msp430_general_dst_nonv_operand): New.
	(msp430_nonsubreg_operand): Remove.
	(msp430_nonsubreg_dst_operand): New.
	(msp430_nonsubreg_or_imm_operand): Allow reg or mem operands in place
	of defunct msp430_nonsubreg_operand.
	(msp430_nonsubregnonpostinc_or_imm_operand): New.

From-SVN: r276995
---
 gcc/ChangeLog                    |  22 +++++
 gcc/config/msp430/constraints.md |   1 +
 gcc/config/msp430/msp430.c       |  32 ++++++-
 gcc/config/msp430/msp430.h       |  12 +++
 gcc/config/msp430/msp430.md      | 191 ++++++++++++++++++++-------------------
 gcc/config/msp430/predicates.md  |  46 +++++++++-
 6 files changed, 205 insertions(+), 99 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09723d9..767dc02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* config/msp430/constraints.md: Allow post_inc operand for "Ya"
+	constraint.
+	* config/msp430/msp430.c (msp430_legitimate_address_p): Handle
+	POST_INC.
+	(msp430_subreg): Likewise.
+	(msp430_split_addsi): Likewise.
+	(msp430_print_operand_addr): Likewise.
+	* config/msp430/msp430.h (HAVE_POST_INCREMENT): Define.
+	(USE_STORE_POST_INCREMENT): Define.
+	* config/msp430/msp430.md: Use the msp430_general_dst_operand or
+	msp430_general_dst_nonv_operand predicates for the lvalues of insns.
+	* config/msp430/predicates.md (msp430_nonpostinc_operand): New.
+	(msp430_general_dst_operand): New.
+	(msp430_general_dst_nonv_operand): New.
+	(msp430_nonsubreg_operand): Remove.
+	(msp430_nonsubreg_dst_operand): New.
+	(msp430_nonsubreg_or_imm_operand): Allow reg or mem operands in place
+	of defunct msp430_nonsubreg_operand.
+	(msp430_nonsubregnonpostinc_or_imm_operand): New.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/91929
diff --git a/gcc/config/msp430/constraints.md b/gcc/config/msp430/constraints.md
index 4422b2b..d01bcf9 100644
--- a/gcc/config/msp430/constraints.md
+++ b/gcc/config/msp430/constraints.md
@@ -60,6 +60,7 @@
 		 (match_code "reg" "00")
 		 (match_test ("CONST_INT_P (XEXP (XEXP (op, 0), 1))")))
 	    (match_test "CONSTANT_P (XEXP (op, 0))")
+	    (match_code "post_inc" "0")
 	    )))
 
 (define_constraint "Yl"
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index ae763fa..3102939 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -942,12 +942,17 @@ msp430_legitimate_address_p (machine_mode mode ATTRIBUTE_UNUSED,
       return false;
 
     case PLUS:
+    case POST_INC:
       if (REG_P (XEXP (x, 0)))
 	{
 	  if (GET_MODE (x) != GET_MODE (XEXP (x, 0)))
 	    return false;
 	  if (!reg_ok_for_addr (XEXP (x, 0), strict))
 	    return false;
+	  if (GET_CODE (x) == POST_INC)
+	    /* At this point, if the original rtx was a post_inc, we don't have
+	       anything further to check.  */
+	    return true;
 	  switch (GET_CODE (XEXP (x, 1)))
 	    {
 	    case CONST:
@@ -2810,6 +2815,7 @@ rtx
 msp430_subreg (machine_mode mode, rtx r, machine_mode omode, int byte)
 {
   rtx rv;
+  gcc_assert (mode == HImode);
 
   if (GET_CODE (r) == SUBREG
       && SUBREG_BYTE (r) == 0)
@@ -2826,7 +2832,15 @@ msp430_subreg (machine_mode mode, rtx r, machine_mode omode, int byte)
 	rv = simplify_gen_subreg (mode, ireg, imode, byte);
     }
   else if (GET_CODE (r) == MEM)
-    rv = adjust_address (r, mode, byte);
+    {
+      /* When byte == 2, we can be certain that we were already called with an
+	 identical rtx with byte == 0.  So we don't need to do anything to
+	 get a 2 byte offset of a (mem (post_inc)) rtx, since the address has
+	 already been offset by the post_inc itself.  */
+      if (GET_CODE (XEXP (r, 0)) == POST_INC && byte == 2)
+	byte = 0;
+      rv = adjust_address (r, mode, byte);
+    }
   else if (GET_CODE (r) == SYMBOL_REF
 	   && (byte == 0 || byte == 2)
 	   && mode == HImode)
@@ -2861,6 +2875,18 @@ msp430_split_addsi (rtx *operands)
 
   if (GET_CODE (operands[5]) == CONST_INT)
     operands[9] = GEN_INT (INTVAL (operands[5]) & 0xffff);
+  /* Handle post_inc, for example:
+     (set (reg:SI)
+	  (plus:SI (reg:SI)
+		   (mem:SI (post_inc:PSI (reg:PSI))))).  */
+  else if (MEM_P (operands[5]) && GET_CODE (XEXP (operands[5], 0)) == POST_INC)
+    {
+      /* Strip out the post_inc from (mem (post_inc (reg))).  */
+      operands[9] = XEXP (XEXP (operands[5], 0), 0);
+      operands[9] = gen_rtx_MEM (HImode, operands[9]);
+      /* Then zero extend as normal.  */
+      operands[9] = gen_rtx_ZERO_EXTEND (SImode, operands[9]);
+    }
   else
     operands[9] = gen_rtx_ZERO_EXTEND (SImode, operands[5]);
   return 0;
@@ -3205,6 +3231,10 @@ msp430_print_operand_addr (FILE * file, machine_mode /*mode*/, rtx addr)
       fprintf (file, "@");
       break;
 
+    case POST_INC:
+      fprintf (file, "@%s+", reg_names[REGNO (XEXP (addr, 0))]);
+      return;
+
     case CONST:
     case CONST_INT:
     case SYMBOL_REF:
diff --git a/gcc/config/msp430/msp430.h b/gcc/config/msp430/msp430.h
index f885de2..73afe2e 100644
--- a/gcc/config/msp430/msp430.h
+++ b/gcc/config/msp430/msp430.h
@@ -478,6 +478,18 @@ typedef struct
 
 #define ACCUMULATE_OUTGOING_ARGS 1
 
+#define HAVE_POST_INCREMENT 1
+
+/* This (unsurprisingly) improves code size in the vast majority of cases, we
+   want to prevent any instructions using a "store post increment" from being
+   generated.  These will have to later be reloaded since msp430 does not
+   support post inc for the destination operand.  */
+#define USE_STORE_POST_INCREMENT(MODE)  0
+
+/* Many other targets set USE_LOAD_POST_INCREMENT to 0.  For msp430-elf
+   the benefit of disabling it is not clear.  When looking at code size, on
+   average, there is a slight advantage to leaving it enabled.  */
+
 #undef  ASM_DECLARE_FUNCTION_NAME
 #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \
   msp430_start_function ((FILE), (NAME), (DECL))
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index ebd9c85..a533efa 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -183,14 +183,14 @@
 )
 
 (define_insn "movqi_topbyte"
-  [(set (match_operand:QI 0 "msp430_nonimmediate_operand" "=r")
+  [(set (match_operand:QI 0 "msp430_general_dst_operand" "=r")
 	(subreg:QI (match_operand:PSI 1 "msp430_general_operand" "r") 2))]
   "msp430x"
   "PUSHM.A\t#1,%1 { POPM.W\t#1,%0 { POPM.W\t#1,%0"
 )
 
 (define_insn "movqi"
-  [(set (match_operand:QI 0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+  [(set (match_operand:QI 0 "msp430_general_dst_operand" "=rYsYx,rm")
 	(match_operand:QI 1 "msp430_general_operand" "riYsYx,rmi"))]
   ""
   "@
@@ -199,7 +199,7 @@
 )
 
 (define_insn "movhi"
-  [(set (match_operand:HI 0 "msp430_nonimmediate_operand" "=r,rYsYx,rm")
+  [(set (match_operand:HI 0 "msp430_general_dst_operand" "=r,rYsYx,rm")
 	(match_operand:HI 1 "msp430_general_operand" "N,riYsYx,rmi"))]
   ""
   "@
@@ -209,41 +209,41 @@
 )
 
 (define_expand "movsi"
-  [(set (match_operand:SI 0 "nonimmediate_operand")
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand")
 	(match_operand:SI 1 "general_operand"))]
   ""
   ""
   )
 
 (define_insn_and_split "movsi_s"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=rm")
 	(subreg:SI (match_operand:PSI 1 "msp430_symbol_operand" "i") 0))]
   ""
   ""
   "reload_completed"
-  [(set (match_operand:HI 2 "nonimmediate_operand")
+  [(set (match_operand:HI 2 "msp430_general_dst_nonv_operand")
 	(match_operand:HI 4 "general_operand"))
-   (set (match_operand:HI 3 "nonimmediate_operand")
+   (set (match_operand:HI 3 "msp430_general_dst_nonv_operand")
 	(match_operand:HI 5 "general_operand"))]
   "msp430_split_movsi (operands);"
   )
 
 (define_insn_and_split "movsi_x"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=rm")
 	(match_operand:SI 1 "general_operand" "rmi"))]
   ""
   "#"
   "reload_completed"
-  [(set (match_operand:HI 2 "nonimmediate_operand")
+  [(set (match_operand:HI 2 "msp430_general_dst_nonv_operand")
 	(match_operand:HI 4 "general_operand"))
-   (set (match_operand:HI 3 "nonimmediate_operand")
+   (set (match_operand:HI 3 "msp430_general_dst_nonv_operand")
 	(match_operand:HI 5 "general_operand"))]
   "msp430_split_movsi (operands);"
 )
 
 ;; FIXME: Some MOVX.A cases can be done with MOVA, this is only a few of them.
 (define_insn "movpsi"
-  [(set (match_operand:PSI 0 "msp430_nonimmediate_operand" "=r,r,r,Ya,rm")
+  [(set (match_operand:PSI 0 "msp430_general_dst_operand" "=r,r,r,Ya,rm")
 	(match_operand:PSI 1 "msp430_general_operand" "N,O,riYa,r,rmi"))]
   ""
   "@
@@ -279,8 +279,8 @@
 ;; Math
 
 (define_insn "addpsi3"
-  [(set (match_operand:PSI	     0 "msp430_nonimmediate_operand" "=r,rm")
-	(plus:PSI (match_operand:PSI 1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:PSI	     0 "msp430_general_dst_operand" "=r,rm")
+	(plus:PSI (match_operand:PSI 1 "msp430_general_operand" "%0,0")
 		  (match_operand:PSI 2 "msp430_general_operand"      "rLs,rmi")))]
   ""
   "@
@@ -289,8 +289,8 @@
 )
 
 (define_insn "addqi3"
-  [(set (match_operand:QI	   0 "msp430_nonimmediate_operand" "=rYsYx,rm")
-	(plus:QI (match_operand:QI 1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:QI	   0 "msp430_general_dst_operand" "=rYsYx,rm")
+	(plus:QI (match_operand:QI 1 "msp430_general_operand" "%0,0")
 		 (match_operand:QI 2 "msp430_general_operand"      "riYsYx,rmi")))]
   ""
   "@
@@ -299,8 +299,8 @@
 )
 
 (define_insn "addhi3"
-  [(set (match_operand:HI	    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
-	(plus:HI (match_operand:HI  1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:HI	    0 "msp430_general_dst_operand" "=rYsYx,rm")
+	(plus:HI (match_operand:HI  1 "msp430_general_operand" "%0,0")
 		  (match_operand:HI 2 "msp430_general_operand"      "riYsYx,rmi")))]
   ""
   "@
@@ -321,8 +321,8 @@
 )
 
 (define_insn "addsi3"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=&rYsYx,rm")
-	(plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=&rYsYx,rm")
+	(plus:SI (match_operand:SI 1 "general_operand" "%0,0")
 		 (match_operand:SI 2 "general_operand" "rYsYxi,mi")))]
   ""
   "@
@@ -357,13 +357,16 @@
 ; increased register pressure.  Or possibly reload does not handle ADD patterns
 ; that are not single_set() very well.
 
+; match_operand 3 is likely to be the same as op2 most of the time - except
+; when op2 is a post_inc and we have stripped the post_inc from match_operand 3
+
 (define_insn "addhi3_cy"
-  [(set (match_operand:HI	   0 "msp430_nonimmediate_operand" "=rYsYx,rm")
-	(plus:HI (match_operand:HI 1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:HI	   0 "msp430_general_dst_operand" "=rYsYx,rm")
+	(plus:HI (match_operand:HI 1 "msp430_general_operand" "%0,0")
 		 (match_operand:HI 2 "msp430_nonimmediate_operand" "rYsYxi,rm")))
    (set (reg:BI CARRY)
 	(truncate:BI (lshiftrt:SI (plus:SI (zero_extend:SI (match_dup 1))
-					   (zero_extend:SI (match_dup 2)))
+					   (zero_extend:SI (match_operand:HI 3 "msp430_nonimmediate_operand" "rYsYxi,rm")))
 				  (const_int 16))))
    ]
   ""
@@ -373,8 +376,8 @@
   )
 
 (define_insn "addhi3_cy_i"
-  [(set (match_operand:HI          0 "nonimmediate_operand" "=r,rm")
-	(plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
+  [(set (match_operand:HI	   0 "msp430_general_dst_nonv_operand" "=r,rm")
+	(plus:HI (match_operand:HI 1 "general_operand" "%0,0")
 		 (match_operand:HI 2 "immediate_operand"     "i,i")))
    (set (reg:BI CARRY)
 	(truncate:BI (lshiftrt:SI (plus:SI (zero_extend:SI (match_dup 1))
@@ -389,8 +392,8 @@
 
 ; Version of addhi that adds the carry, for SImode adds.
 (define_insn "addchi4_cy"
-  [(set (match_operand:HI		    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
-	(plus:HI (plus:HI (match_operand:HI 1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:HI		    0 "msp430_general_dst_operand" "=rYsYx,rm")
+	(plus:HI (plus:HI (match_operand:HI 1 "msp430_general_operand" "%0,0")
 			  (match_operand:HI 2 "msp430_general_operand"      "riYsYx,rmi"))
 		 (zero_extend:HI (reg:BI CARRY))))
    ]
@@ -403,13 +406,15 @@
 ; Split an SImode add into two HImode adds, keeping track of the carry
 ; so that gcc knows when it can and can't optimize away the two
 ; halves.
+; We use the ugly predicate "msp430_nonsubregnonpostinc_or_imm_operand" to
+; enforce the position of a post_inc into op2 if present
 (define_split
-  [(set (match_operand:SI          0 "msp430_nonsubreg_operand")
-	(plus:SI (match_operand:SI 1 "msp430_nonsubreg_operand")
+  [(set (match_operand:SI	   0 "msp430_nonsubreg_dst_operand")
+	(plus:SI (match_operand:SI 1 "msp430_nonsubregnonpostinc_or_imm_operand")
 		 (match_operand:SI 2 "msp430_nonsubreg_or_imm_operand")))
    ]
   ""
-  [(parallel [(set (match_operand:HI 3 "nonimmediate_operand" "=&rm")
+  [(parallel [(set (match_operand:HI 3 "msp430_general_dst_nonv_operand" "=&rm")
 		   (plus:HI (match_dup 4)
 			    (match_dup 5)))
 	      (set (reg:BI CARRY)
@@ -417,7 +422,7 @@
 						      (match_dup 9))
 					     (const_int 16))))
 	      ])
-   (set (match_operand:HI 6 "nonimmediate_operand" "=&rm")
+   (set (match_operand:HI 6 "msp430_general_dst_nonv_operand" "=&rm")
 	(plus:HI (plus:HI (match_dup 7)
 			  (match_dup 8))
 		 (zero_extend:HI (reg:BI CARRY))))
@@ -431,9 +436,9 @@
 
 ;; Alternatives 2 and 3 are to handle cases generated by reload.
 (define_insn "subpsi3"
-  [(set (match_operand:PSI            0 "nonimmediate_operand" "=r,   rm, &?r, ?&r")
-	(minus:PSI (match_operand:PSI 1 "general_operand"       "0,   0,   !r,  !i")
-		   (match_operand:PSI 2 "general_operand"       "rLs, rmi, rmi,  r")))]
+  [(set (match_operand:PSI	      0 "msp430_general_dst_nonv_operand"	"=r,   rm, &?r, ?&r")
+	(minus:PSI (match_operand:PSI 1 "general_operand"			"0,   0,   !r,  !i")
+		   (match_operand:PSI 2 "general_operand"			"rLs, rmi, rmi,  r")))]
   ""
   "@
   SUBA\t%2, %0
@@ -444,7 +449,7 @@
 
 ;; Alternatives 2 and 3 are to handle cases generated by reload.
 (define_insn "subqi3"
-  [(set (match_operand:QI           0 "nonimmediate_operand" "=rYsYx,  rm,  &?r, ?&r")
+  [(set (match_operand:QI	    0 "msp430_general_dst_nonv_operand" "=rYsYx,  rm,  &?r, ?&r")
 	(minus:QI (match_operand:QI 1 "general_operand"       "0,    0,    !r,  !i")
 		  (match_operand:QI 2 "general_operand"      " riYsYx, rmi, rmi,   r")))]
   ""
@@ -457,7 +462,7 @@
 
 ;; Alternatives 2 and 3 are to handle cases generated by reload.
 (define_insn "subhi3"
-  [(set (match_operand:HI           0 "nonimmediate_operand" "=rYsYx,  rm,  &?r, ?&r")
+  [(set (match_operand:HI	    0 "msp430_general_dst_nonv_operand" "=rYsYx,  rm,  &?r, ?&r")
 	(minus:HI (match_operand:HI 1 "general_operand"       "0,    0,    !r,  !i")
 		  (match_operand:HI 2 "general_operand"      " riYsYx, rmi, rmi,   r")))]
   ""
@@ -469,8 +474,8 @@
 )
 
 (define_insn "subsi3"
-  [(set (match_operand:SI           0 "nonimmediate_operand" "=&rYsYx,m")
-	(minus:SI (match_operand:SI 1 "nonimmediate_operand"   "0,0")
+  [(set (match_operand:SI	    0 "msp430_general_dst_nonv_operand" "=&rYsYx,m")
+	(minus:SI (match_operand:SI 1 "general_operand"   "0,0")
 		  (match_operand:SI 2 "general_operand"        "riYsYx,mi")))]
   ""
   "@
@@ -479,7 +484,7 @@
 )
 
 (define_insn "*bic<mode>_cg"
-  [(set (match_operand:QHI 0 "msp430_nonimmediate_operand" "=rYs,m")
+  [(set (match_operand:QHI 0 "msp430_general_dst_operand" "=rYs,m")
 	(and:QHI (match_operand:QHI 1 "msp430_general_operand" "0,0")
 		 (match_operand 2 "msp430_inv_constgen_operator" "n,n")))]
   ""
@@ -489,9 +494,9 @@
 )
 
 (define_insn "bic<mode>3"
-  [(set (match_operand:QHI		     0 "msp430_nonimmediate_operand" "=rYsYx,rm")
+  [(set (match_operand:QHI		     0 "msp430_general_dst_operand" "=rYsYx,rm")
 	(and:QHI (not:QHI (match_operand:QHI 1 "msp430_general_operand"       "rYsYx,rmn"))
-		 (match_operand:QHI	     2 "msp430_nonimmediate_operand"  "0,0")))]
+		 (match_operand:QHI	     2 "msp430_general_operand"  "0,0")))]
   ""
   "@
    BIC%x0%b0\t%1, %0
@@ -499,8 +504,8 @@
 )
 
 (define_insn "and<mode>3"
-  [(set (match_operand:QHI 0 "msp430_nonimmediate_operand" "=r,rYsYx,rm")
-	(and:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "%0,0,0")
+  [(set (match_operand:QHI 0 "msp430_general_dst_operand" "=r,rYsYx,rm")
+	(and:QHI (match_operand:QHI 1 "msp430_general_operand" "%0,0,0")
 		 (match_operand:QHI 2 "msp430_general_operand" "N,riYsYx,rmi")))]
   ""
   "@
@@ -510,8 +515,8 @@
 )
 
 (define_insn "ior<mode>3"
-  [(set (match_operand:QHI	    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
-	(ior:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:QHI	    0 "msp430_general_dst_operand" "=rYsYx,rm")
+	(ior:QHI (match_operand:QHI 1 "msp430_general_operand" "%0,0")
 		 (match_operand:QHI 2 "msp430_general_operand" "riYsYx,rmi")))]
   ""
   "@
@@ -520,8 +525,8 @@
 )
 
 (define_insn "xor<mode>3"
-  [(set (match_operand:QHI	    0 "msp430_nonimmediate_operand" "=rYsYx,rm")
-	(xor:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "%0,0")
+  [(set (match_operand:QHI	    0 "msp430_general_dst_operand" "=rYsYx,rm")
+	(xor:QHI (match_operand:QHI 1 "msp430_general_operand" "%0,0")
 		 (match_operand:QHI 2 "msp430_general_operand" "riYsYx,rmi")))]
   ""
   "@
@@ -531,8 +536,8 @@
 
 ;; Macro : XOR #~0, %0
 (define_insn "one_cmpl<mode>2"
-  [(set (match_operand:QHI	    0 "msp430_nonimmediate_operand" "=rYs,m")
-	(not:QHI (match_operand:QHI 1 "msp430_nonimmediate_operand" "0,0")))]
+  [(set (match_operand:QHI	    0 "msp430_general_dst_operand" "=rYs,m")
+	(not:QHI (match_operand:QHI 1 "msp430_general_operand" "0,0")))]
   ""
   "@
    INV%x0%b0\t%0
@@ -540,8 +545,8 @@
 )
 
 (define_insn "extendqihi2"
-  [(set (match_operand:HI		  0 "msp430_nonimmediate_operand" "=rYs,m")
-	(sign_extend:HI (match_operand:QI 1 "msp430_nonimmediate_operand" "0,0")))]
+  [(set (match_operand:HI		  0 "msp430_general_dst_operand" "=rYs,m")
+	(sign_extend:HI (match_operand:QI 1 "msp430_general_operand" "0,0")))]
   ""
   "@
    SXT%X0\t%0
@@ -549,8 +554,8 @@
 )
 
 (define_insn "zero_extendqihi2"
-  [(set (match_operand:HI		  0 "msp430_nonimmediate_operand" "=rYs,r,r,m")
-	(zero_extend:HI (match_operand:QI 1 "msp430_nonimmediate_operand" "0,rYs,m,0")))]
+  [(set (match_operand:HI		  0 "msp430_general_dst_operand" "=rYs,r,r,m")
+	(zero_extend:HI (match_operand:QI 1 "msp430_general_operand" "0,rYs,m,0")))]
   ""
   "@
    AND\t#0xff, %0
@@ -571,8 +576,8 @@
 )
 
 (define_insn "zero_extendhipsi2"
-  [(set (match_operand:PSI		   0 "msp430_nonimmediate_operand" "=r,m")
-	(zero_extend:PSI (match_operand:HI 1 "msp430_nonimmediate_operand" "rm,r")))]
+  [(set (match_operand:PSI		   0 "msp430_general_dst_operand" "=r,m")
+	(zero_extend:PSI (match_operand:HI 1 "msp430_general_operand" "rm,r")))]
   ""
   "@
   MOVX\t%1, %0
@@ -580,22 +585,22 @@
 )
 
 (define_insn "truncpsihi2"
-  [(set (match_operand:HI		0 "msp430_nonimmediate_operand" "=rm")
+  [(set (match_operand:HI		0 "msp430_general_dst_operand" "=rm")
 	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
   ""
   "MOVX\t%1, %0"
 )
 
 (define_insn "extendhisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
 	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
   ""
   { return msp430x_extendhisi (operands); }
 )
 
 (define_insn "extendhipsi2"
-  [(set (match_operand:PSI 0 "nonimmediate_operand" "=r")
-	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0")) 0))]
+  [(set (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r")
+	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "general_operand" "0")) 0))]
   "msp430x"
   "RLAM.A #4, %0 { RRAM.A #4, %0"
 )
@@ -606,15 +611,15 @@
 ;; paths.
 
 (define_insn "zero_extendqisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
 	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
   ""
   "MOV%X1.B\t%1,%L0 { CLR\t%H0"
 )
 
 (define_insn "zero_extendhisi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
-	(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r")))]
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=rm,r")
+	(zero_extend:SI (match_operand:HI 1 "general_operand" "0,r")))]
   ""
   "@
   MOV%X0.W\t#0,%H0
@@ -622,8 +627,8 @@
 )
 
 (define_insn "zero_extendhisipsi2"
-  [(set (match_operand:PSI 0 "nonimmediate_operand" "=r,r")
-	(subreg:PSI (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r")) 0))]
+  [(set (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r,r")
+	(subreg:PSI (zero_extend:SI (match_operand:HI 1 "general_operand" "0,r")) 0))]
   "msp430x"
   "@
    AND.W\t#-1,%0
@@ -631,16 +636,16 @@
 )
 
 (define_insn "extend_and_shift1_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
+  [(set (subreg:SI (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "general_operand" "0"))
 		   (const_int 1)))]
   "msp430x"
   "RLAM.A #4, %0 { RRAM.A #3, %0"
 )
 
 (define_insn "extend_and_shift2_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "nonimmediate_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0"))
+  [(set (subreg:SI (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "general_operand" "0"))
 		   (const_int 2)))]
   "msp430x"
   "RLAM.A #4, %0 { RRAM.A #2, %0"
@@ -739,7 +744,7 @@
 ;; signed A << C
 
 (define_expand "ashlhi3"
-  [(set (match_operand:HI            0 "nonimmediate_operand")
+  [(set (match_operand:HI	     0 "msp430_general_dst_nonv_operand")
 	(ashift:HI (match_operand:HI 1 "general_operand")
 		   (match_operand:HI 2 "general_operand")))]
   ""
@@ -766,7 +771,7 @@
 )
 
 (define_insn "slli_1"
-  [(set (match_operand:HI            0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:HI	     0 "msp430_general_dst_nonv_operand" "=rm")
 	(ashift:HI (match_operand:HI 1 "general_operand"       "0")
 		   (const_int 1)))]
   ""
@@ -786,7 +791,7 @@
 )
 
 (define_insn "slll_1"
-  [(set (match_operand:SI            0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI	     0 "msp430_general_dst_nonv_operand" "=rm")
 	(ashift:SI (match_operand:SI 1 "general_operand"       "0")
 		   (const_int 1)))]
   ""
@@ -794,7 +799,7 @@
 )
 
 (define_insn "slll_2"
-  [(set (match_operand:SI            0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI	     0 "msp430_general_dst_nonv_operand" "=rm")
 	(ashift:SI (match_operand:SI 1 "general_operand"       "0")
 		   (const_int 2)))]
   ""
@@ -802,7 +807,7 @@
 )
 
 (define_expand "ashlsi3"
-  [(set (match_operand:SI            0 "nonimmediate_operand")
+  [(set (match_operand:SI	     0 "msp430_general_dst_nonv_operand")
 	(ashift:SI (match_operand:SI 1 "general_operand")
 		   (match_operand:SI 2 "general_operand")))]
   ""
@@ -811,7 +816,7 @@
 )
 
 (define_expand "ashldi3"
-  [(set (match_operand:DI	     0 "nonimmediate_operand")
+  [(set (match_operand:DI	     0 "msp430_general_dst_nonv_operand")
 	(ashift:DI (match_operand:DI 1 "general_operand")
 		   (match_operand:DI 2 "general_operand")))]
   ""
@@ -827,7 +832,7 @@
 ;; signed A >> C
 
 (define_expand "ashrhi3"
-  [(set (match_operand:HI              0 "nonimmediate_operand")
+  [(set (match_operand:HI	       0 "msp430_general_dst_nonv_operand")
 	(ashiftrt:HI (match_operand:HI 1 "general_operand")
 		     (match_operand:HI 2 "general_operand")))]
   ""
@@ -851,7 +856,7 @@
 )
 
 (define_insn "srai_1"
-  [(set (match_operand:HI	       0 "msp430_nonimmediate_operand" "=rm")
+  [(set (match_operand:HI	       0 "msp430_general_dst_operand" "=rm")
 	(ashiftrt:HI (match_operand:HI 1 "msp430_general_operand"      "0")
 		     (const_int 1)))]
   ""
@@ -887,7 +892,7 @@
 )
 
 (define_insn "sral_1"
-  [(set (match_operand:SI              0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI	       0 "msp430_general_dst_nonv_operand" "=rm")
 	(ashiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 1)))]
   ""
@@ -895,7 +900,7 @@
 )
 
 (define_insn "sral_2"
-  [(set (match_operand:SI              0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI	       0 "msp430_general_dst_nonv_operand" "=rm")
 	(ashiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 2)))]
   ""
@@ -903,7 +908,7 @@
 )
 
 (define_expand "ashrsi3"
-  [(set (match_operand:SI              0 "nonimmediate_operand")
+  [(set (match_operand:SI	       0 "msp430_general_dst_nonv_operand")
 	(ashiftrt:SI (match_operand:SI 1 "general_operand")
 		     (match_operand:SI 2 "general_operand")))]
   ""
@@ -912,7 +917,7 @@
 )
 
 (define_expand "ashrdi3"
-  [(set (match_operand:DI	     0 "nonimmediate_operand")
+  [(set (match_operand:DI	     0 "msp430_general_dst_nonv_operand")
 	(ashift:DI (match_operand:DI 1 "general_operand")
 		   (match_operand:DI 2 "general_operand")))]
   ""
@@ -928,7 +933,7 @@
 ;; unsigned A >> C
 
 (define_expand "lshrhi3"
-  [(set (match_operand:HI              0 "nonimmediate_operand")
+  [(set (match_operand:HI	       0 "msp430_general_dst_nonv_operand")
 	(lshiftrt:HI (match_operand:HI 1 "general_operand")
 		     (match_operand:HI 2 "general_operand")))]
   ""
@@ -952,7 +957,7 @@
 )
 
 (define_insn "srli_1"
-  [(set (match_operand:HI              0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:HI	       0 "msp430_general_dst_nonv_operand" "=rm")
 	(lshiftrt:HI (match_operand:HI 1 "general_operand"       "0")
 		     (const_int 1)))]
   ""
@@ -978,7 +983,7 @@
 )
 
 (define_insn "srll_1"
-  [(set (match_operand:SI              0 "nonimmediate_operand" "=rm")
+  [(set (match_operand:SI	       0 "msp430_general_dst_nonv_operand" "=rm")
 	(lshiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 1)))]
   ""
@@ -986,7 +991,7 @@
 )
 
 (define_insn "srll_2x"
-  [(set (match_operand:SI              0 "nonimmediate_operand" "=r")
+  [(set (match_operand:SI	       0 "msp430_general_dst_nonv_operand" "=r")
 	(lshiftrt:SI (match_operand:SI 1 "general_operand"       "0")
 		     (const_int 2)))]
   "msp430x"
@@ -994,7 +999,7 @@
 )
 
 (define_expand "lshrsi3"
-  [(set (match_operand:SI              0 "nonimmediate_operand")
+  [(set (match_operand:SI	       0 "msp430_general_dst_nonv_operand")
 	(lshiftrt:SI (match_operand:SI 1 "general_operand")
 		     (match_operand:SI 2 "general_operand")))]
   ""
@@ -1003,7 +1008,7 @@
 )
 
 (define_expand "lshrdi3"
-  [(set (match_operand:DI	     0 "nonimmediate_operand")
+  [(set (match_operand:DI	     0 "msp430_general_dst_nonv_operand")
 	(ashift:DI (match_operand:DI 1 "general_operand")
 		   (match_operand:DI 2 "general_operand")))]
   ""
@@ -1274,7 +1279,7 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (ne (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+	      (ne (and:QHI (match_operand:QHI 0 "msp430_general_dst_operand" "rYsYx,rm")
 			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (label_ref (match_operand 2 "" ""))
@@ -1289,7 +1294,7 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (eq (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+	      (eq (and:QHI (match_operand:QHI 0 "msp430_general_dst_operand" "rYsYx,rm")
 			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (label_ref (match_operand 2 "" ""))
@@ -1304,7 +1309,7 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (eq (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+	      (eq (and:QHI (match_operand:QHI 0 "msp430_general_dst_operand" "rYsYx,rm")
 			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (pc)
@@ -1319,7 +1324,7 @@
 
 (define_insn "*bitbranch<mode>4"
   [(set (pc) (if_then_else
-	      (ne (and:QHI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYsYx,rm")
+	      (ne (and:QHI (match_operand:QHI 0 "msp430_general_dst_operand" "rYsYx,rm")
 			   (match_operand:QHI 1 "msp430_general_operand" "rYsYxi,rmi"))
 		  (const_int 0))
               (pc)
@@ -1337,7 +1342,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (ne (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rYs,rm")
+	      (ne (zero_extract:HI (match_operand:QHI 0 "msp430_general_dst_operand" "rYs,rm")
 				    (const_int 1)
 				    (match_operand 1 "msp430_bitpos" "i,i"))
 		  (const_int 0))
@@ -1353,7 +1358,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (eq (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rm")
+	      (eq (zero_extract:HI (match_operand:QHI 0 "msp430_general_dst_operand" "rm")
 				   (const_int 1)
 				   (match_operand 1 "msp430_bitpos" "i"))
 		  (const_int 0))
@@ -1367,7 +1372,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (eq (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rm")
+	      (eq (zero_extract:HI (match_operand:QHI 0 "msp430_general_dst_operand" "rm")
 				   (const_int 1)
 				   (match_operand 1 "msp430_bitpos" "i"))
 		  (const_int 0))
@@ -1381,7 +1386,7 @@
 
 (define_insn "*bitbranch<mode>4_z"
   [(set (pc) (if_then_else
-	      (ne (zero_extract:HI (match_operand:QHI 0 "msp430_nonimmediate_operand" "rm")
+	      (ne (zero_extract:HI (match_operand:QHI 0 "msp430_general_dst_operand" "rm")
 				   (const_int 1)
 				   (match_operand 1 "msp430_bitpos" "i"))
 		  (const_int 0))
diff --git a/gcc/config/msp430/predicates.md b/gcc/config/msp430/predicates.md
index 751548c..d8cdaba 100644
--- a/gcc/config/msp430/predicates.md
+++ b/gcc/config/msp430/predicates.md
@@ -23,21 +23,50 @@
        (match_test ("memory_address_addr_space_p (GET_MODE (op), XEXP (op, 0), MEM_ADDR_SPACE (op))")))
 )
 
+; TRUE if neither op nor op0 are a post_inc.  We cannot use post_inc for the
+; dst operand so this must be used for any predicates which might allow a mem.
+; Since we check both op and op0, this will be FALSE for both "(post_inc)" and
+; "(mem (post_inc))"
+(define_predicate "msp430_nonpostinc_operand"
+  (not (ior (match_code "post_inc")
+	    (and (ior (match_operand 0 "msp430_volatile_memory_operand")
+		      (match_code "mem"))
+		 (match_code "post_inc" "0")))))
+
 ; TRUE for any valid general operand.  We do this because
 ; general_operand refuses to match volatile memory refs.
-
 (define_predicate "msp430_general_operand"
   (ior (match_operand 0 "general_operand")
        (match_operand 0 "msp430_volatile_memory_operand"))
 )
 
 ; Likewise for nonimmediate_operand.
-
 (define_predicate "msp430_nonimmediate_operand"
   (ior (match_operand 0 "nonimmediate_operand")
        (match_operand 0 "msp430_volatile_memory_operand"))
 )
 
+; Similar to msp430_nonimmediate_operand but disallow post_inc operands
+(define_predicate "msp430_general_dst_operand"
+  (and (match_operand 0 "msp430_nonpostinc_operand")
+       (match_operand 0 "msp430_nonimmediate_operand")))
+
+; Similar to msp430_general_dst_operand but disallow volatile memory references
+; Note that msp430_nonpostinc_operand will allow a volatile mem but nonimmediate
+; will not, so overall this predicate will behave as expected.
+; The heuristic for deciding if we can allow volatile memory appears to be:
+;   "If the number of references to the variable in the source code matches
+;    the number of references to the variable in the assembly template, we can
+;    safely allow a volatile memory reference".
+;      - paraphrasing DJ Delorie here:
+;	 https://gcc.gnu.org/ml/gcc-patches/2014-05/msg00870.html
+; When applied to instruction patterns, this means that we can only allow
+; volatile memory when the output assembler template contains only one
+; instruction which references that volatile address.
+(define_predicate "msp430_general_dst_nonv_operand"
+  (and (match_operand 0 "msp430_nonpostinc_operand")
+       (match_operand 0 "nonimmediate_operand")))
+
 (define_predicate "ubyte_operand"
   (and (match_code "const_int")
        (match_test "IN_RANGE (INTVAL (op), 0, 255)")))
@@ -70,13 +99,20 @@
 		     || INTVAL (op) == ~8
 		     || INTVAL (op) == ~(-1) "))))
 
-(define_predicate "msp430_nonsubreg_operand"
-  (match_code "reg,mem"))
+; See above note on post_inc
+(define_predicate "msp430_nonsubreg_dst_operand"
+  (and (match_operand 0 "msp430_nonpostinc_operand")
+       (match_code "reg,mem")))
 
 (define_predicate "msp430_nonsubreg_or_imm_operand"
-  (ior (match_operand 0 "msp430_nonsubreg_operand")
+  (ior (match_code "reg,mem")
        (match_operand 0 "immediate_operand")))
 
+(define_predicate "msp430_nonsubregnonpostinc_or_imm_operand"
+  (and (match_operand 0 "msp430_nonpostinc_operand")
+       (ior (match_code "reg,mem")
+	    (match_operand 0 "immediate_operand"))))
+
 ; TRUE for constants which are bit positions for zero_extract
 (define_predicate "msp430_bitpos"
   (and (match_code "const_int")
-- 
cgit v1.1


From 582b4055ca4dc4260ab1092c6b39b3e792362c23 Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Tue, 15 Oct 2019 12:19:51 +0000
Subject: msp430.md: Group zero_extend* insns together.

2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430.md: Group zero_extend* insns together.

From-SVN: r276996
---
 gcc/ChangeLog               |   4 ++
 gcc/config/msp430/msp430.md | 117 ++++++++++++++++++++++----------------------
 2 files changed, 63 insertions(+), 58 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 767dc02..ff2c70f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
+	* config/msp430/msp430.md: Group zero_extend* insns together.
+
+2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
 	* config/msp430/constraints.md: Allow post_inc operand for "Ya"
 	constraint.
 	* config/msp430/msp430.c (msp430_legitimate_address_p): Handle
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index a533efa..2e8e832 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -564,15 +564,11 @@
    AND%X0\t#0xff, %0"
 )
 
-;; Eliminate extraneous zero-extends mysteriously created by gcc.
-(define_peephole2
-  [(set (match_operand:HI 0 "register_operand")
-	(zero_extend:HI (match_operand:QI 1 "general_operand")))
-   (set (match_operand:HI 2 "register_operand")
-	(zero_extend:HI (match_operand:QI 3 "register_operand")))]
-  "REGNO (operands[0]) == REGNO (operands[2]) && REGNO (operands[2]) == REGNO (operands[3])"
-  [(set (match_dup 0)
-	(zero_extend:HI (match_dup 1)))]
+(define_insn "zero_extendqisi2"
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
+	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
+  ""
+  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
 )
 
 (define_insn "zero_extendhipsi2"
@@ -584,39 +580,6 @@
   MOVX.A\t%1, %0"
 )
 
-(define_insn "truncpsihi2"
-  [(set (match_operand:HI		0 "msp430_general_dst_operand" "=rm")
-	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
-  ""
-  "MOVX\t%1, %0"
-)
-
-(define_insn "extendhisi2"
-  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
-	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
-  ""
-  { return msp430x_extendhisi (operands); }
-)
-
-(define_insn "extendhipsi2"
-  [(set (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r")
-	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "general_operand" "0")) 0))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #4, %0"
-)
-
-;; Look for cases where integer/pointer conversions are suboptimal due
-;; to missing patterns, despite us not having opcodes for these
-;; patterns.  Doing these manually allows for alternate optimization
-;; paths.
-
-(define_insn "zero_extendqisi2"
-  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
-	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
-  ""
-  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
-)
-
 (define_insn "zero_extendhisi2"
   [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=rm,r")
 	(zero_extend:SI (match_operand:HI 1 "general_operand" "0,r")))]
@@ -635,22 +598,6 @@
    MOV.W\t%1,%0"
 )
 
-(define_insn "extend_and_shift1_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "general_operand" "0"))
-		   (const_int 1)))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #3, %0"
-)
-
-(define_insn "extend_and_shift2_hipsi2"
-  [(set (subreg:SI (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r") 0)
-	(ashift:SI (sign_extend:SI (match_operand:HI 1 "general_operand" "0"))
-		   (const_int 2)))]
-  "msp430x"
-  "RLAM.A #4, %0 { RRAM.A #2, %0"
-)
-
 ; Nasty - we are sign-extending a 20-bit PSI value in one register into
 ; two adjacent 16-bit registers to make an SI value.  There is no MSP430X
 ; instruction that will do this, so we push the 20-bit value onto the stack
@@ -685,6 +632,60 @@
   "
 )
 
+
+;; Eliminate extraneous zero-extends mysteriously created by gcc.
+(define_peephole2
+  [(set (match_operand:HI 0 "register_operand")
+	(zero_extend:HI (match_operand:QI 1 "general_operand")))
+   (set (match_operand:HI 2 "register_operand")
+	(zero_extend:HI (match_operand:QI 3 "register_operand")))]
+  "REGNO (operands[0]) == REGNO (operands[2]) && REGNO (operands[2]) == REGNO (operands[3])"
+  [(set (match_dup 0)
+	(zero_extend:HI (match_dup 1)))]
+)
+
+(define_insn "truncpsihi2"
+  [(set (match_operand:HI		0 "msp430_general_dst_operand" "=rm")
+	(truncate:HI (match_operand:PSI 1 "register_operand"      "r")))]
+  ""
+  "MOVX\t%1, %0"
+)
+
+(define_insn "extendhisi2"
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
+	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r")))]
+  ""
+  { return msp430x_extendhisi (operands); }
+)
+
+(define_insn "extendhipsi2"
+  [(set (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r")
+	(subreg:PSI (sign_extend:SI (match_operand:HI 1 "general_operand" "0")) 0))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #4, %0"
+)
+
+;; Look for cases where integer/pointer conversions are suboptimal due
+;; to missing patterns, despite us not having opcodes for these
+;; patterns.  Doing these manually allows for alternate optimization
+;; paths.
+
+(define_insn "extend_and_shift1_hipsi2"
+  [(set (subreg:SI (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "general_operand" "0"))
+		   (const_int 1)))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #3, %0"
+)
+
+(define_insn "extend_and_shift2_hipsi2"
+  [(set (subreg:SI (match_operand:PSI 0 "msp430_general_dst_nonv_operand" "=r") 0)
+	(ashift:SI (sign_extend:SI (match_operand:HI 1 "general_operand" "0"))
+		   (const_int 2)))]
+  "msp430x"
+  "RLAM.A #4, %0 { RRAM.A #2, %0"
+)
+
 ;; We also need to be able to sign-extend pointer types (eg ptrdiff_t).
 ;; Since (we assume) pushing a 20-bit value onto the stack zero-extends
 ;; it, we use a different method here.
-- 
cgit v1.1


From a0a9a3fc22d4d4a38c1d6a31669c926734308745 Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Tue, 15 Oct 2019 12:24:53 +0000
Subject: msp430.md (zero_extendqipsi2): New.

2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430.md (zero_extendqipsi2): New.
	(zero_extendqisi2): Optimize case where src register and base dst
	register are the same.
	(zero_extendhipsi2): Don't use 430X insn for rYs->r case.
	(zero_extendpsisi2): Optimize r->m case.
	Add unnamed insn patterns to catch insns combine searches for when
	optimizing pointer manipulation.

From-SVN: r276997
---
 gcc/ChangeLog               |  10 ++++
 gcc/config/msp430/msp430.md | 126 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 118 insertions(+), 18 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff2c70f..ba6121f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
+	* config/msp430/msp430.md (zero_extendqipsi2): New.
+	(zero_extendqisi2): Optimize case where src register and base dst
+	register are the same.
+	(zero_extendhipsi2): Don't use 430X insn for rYs->r case.
+	(zero_extendpsisi2): Optimize r->m case.
+	Add unnamed insn patterns to catch insns combine searches for when
+	optimizing pointer manipulation.
+
+2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
 	* config/msp430/msp430.md: Group zero_extend* insns together.
 
 2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index 2e8e832..da4abe9 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -553,6 +553,16 @@
    SXT%X0\t%0"
 )
 
+;; ------------------------
+;; ZERO EXTEND INSTRUCTIONS
+;; Byte-writes to registers clear bits 19:8
+;;   * Byte-writes to memory do not affect bits 15:8
+;; Word-writes to registers clear bits 19:16
+;; PSImode writes to memory clear bits 15:4 of the second memory word
+;; We define all possible insns since that results in better code than if
+;; they are inferred.
+;; ------------------------
+
 (define_insn "zero_extendqihi2"
   [(set (match_operand:HI		  0 "msp430_general_dst_operand" "=rYs,r,r,m")
 	(zero_extend:HI (match_operand:QI 1 "msp430_general_operand" "0,rYs,m,0")))]
@@ -564,19 +574,31 @@
    AND%X0\t#0xff, %0"
 )
 
+(define_insn "zero_extendqipsi2"
+  [(set (match_operand:PSI		   0 "register_operand" "=r,r")
+	(zero_extend:PSI (match_operand:QI 1 "general_operand" "rYs,m")))]
+  "msp430x"
+  "@
+   MOV.B\t%1, %0
+   MOV%X1.B\t%1, %0"
+)
+
 (define_insn "zero_extendqisi2"
-  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r")
-	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "rm")))]
+  [(set (match_operand:SI 0 "msp430_general_dst_nonv_operand" "=r,r")
+	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "0,rm")))]
   ""
-  "MOV%X1.B\t%1,%L0 { CLR\t%H0"
+  "@
+  CLR\t%H0
+  MOV%X1.B\t%1,%L0 { CLR\t%H0"
 )
 
 (define_insn "zero_extendhipsi2"
-  [(set (match_operand:PSI		   0 "msp430_general_dst_operand" "=r,m")
-	(zero_extend:PSI (match_operand:HI 1 "msp430_general_operand" "rm,r")))]
-  ""
+  [(set (match_operand:PSI		   0 "msp430_general_dst_operand" "=r,r,m")
+	(zero_extend:PSI (match_operand:HI 1 "msp430_general_operand"     "rYs,m,r")))]
+  "msp430x"
   "@
-  MOVX\t%1, %0
+  MOV.W\t%1, %0
+  MOV%X1\t%1, %0
   MOVX.A\t%1, %0"
 )
 
@@ -616,22 +638,90 @@
 ; the pair is unused and so it can clobber it.  Try compiling 20050826-2.c
 ; at -O2 to see this.
 
+; FIXME we can use MOVA for r->m if m is &abs20 or z16(rdst)
 (define_insn "zero_extendpsisi2"
-  [(set (match_operand:SI                  0 "register_operand" "+r")
-	(zero_extend:SI (match_operand:PSI 1 "register_operand" "r")))]
+  [(set (match_operand:SI		   0 "register_operand" "+r,m")
+	(zero_extend:SI (match_operand:PSI 1 "register_operand" "r,r")))]
   ""
-  "*
-    if (REGNO (operands[1]) == SP_REGNO)
-      /* If the source register is the stack pointer, the value
-         stored in the stack slot will be the value *after* the
-	 stack pointer has been decremented.  So allow for that
-	 here.  */
-      return \"PUSHM.A\t#1, %1 { ADDX.W\t#4, @r1 { POPX.W\t%L0 { POPX.W\t%H0 ; get stack pointer into %L0:%H0\";
-    else
+  "@
+  * if (REGNO (operands[1]) == SP_REGNO) \
+      /* If the source register is the stack pointer, the value \
+	 stored in the stack slot will be the value *after* the \
+	 stack pointer has been decremented.  So allow for that \
+	 here.  */ \
+      return \"PUSHM.A\t#1, %1 { ADDX.W\t#4, @r1 { POPX.W\t%L0 { POPX.W\t%H0 ; get stack pointer into %L0:%H0\"; \
+    else \
       return \"PUSHM.A\t#1, %1 { POPX.W\t%L0 { POPX.W\t%H0 ; move pointer in %1 into reg-pair %L0:%H0\";
-  "
+  MOVX.A %1, %0"
+)
+
+;; Below are unnamed insn patterns to catch pointer manipulation insns
+;; generated by combine.
+;; We get large code size bloat when a PSImode pointer is stored in
+;; memory, so we try to avoid that where possible and keep point manipulation
+;; between registers.
+; FIXME many of these should be unnnecessary once combine deals with
+; (sign_extend (zero_extend)) or (sign_extend (subreg)) BZ 91865.
+
+;; This is just another way of writing movqipsi/zero_extendqipsi
+(define_insn ""
+  [(set (match_operand:PSI 0 "register_operand" "=r")
+	(sign_extend:PSI (subreg:HI (match_operand:QI 1 "general_operand" "rm") 0)))]
+  "msp430x"
+  "MOV%X1.B\t%1, %0"
 )
 
+(define_insn ""
+  [(set (match_operand:PSI				   0 "register_operand" "=r,r")
+	(sign_extend:PSI (zero_extend:HI (match_operand:QI 1 "general_operand" "rYs,m"))))]
+  "msp430x"
+  "@
+   MOV.B\t%1, %0
+   MOV%X1.B\t%1, %0"
+)
+
+(define_insn ""
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(ashift:SI (zero_extend:SI (match_operand:QI 1 "general_operand" "rm"))
+		   (match_operand:HI 2 "immediate_operand" "M")))]
+  "msp430x"
+  "MOV%X1.B %1, %L0 { RLAM.W %2, %L0 { CLR %H0"
+)
+
+;; We are taking a char and shifting it and putting the result in 2 registers.
+;; the high register will always be for 0 shift counts < 8.
+(define_insn ""
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(ashift:SI (zero_extend:SI (subreg:HI (match_operand:QI 1 "general_operand" "rm") 0))
+		   (match_operand:HI 2 "immediate_operand" "M")))]
+  "msp430x"
+  "MOV%X1.B %1, %L0 { RLAM.W %2, %L0 { CLR %H0"
+)
+
+;; Same as above but with a NOP sign_extend round the subreg
+(define_insn ""
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(ashift:SI (zero_extend:SI (sign_extend:PSI (subreg:HI (match_operand:QI 1 "general_operand" "rm") 0)))
+		   (match_operand:HI 2 "immediate_operand" "M")))]
+  "msp430x"
+  "MOV%X1.B %1, %L0 { RLAM.W %2, %L0 { CLR %H0"
+)
+
+(define_insn ""
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(zero_extend:SI (sign_extend:PSI (subreg:HI (match_operand:QI 1 "general_operand" "rm") 0))))]
+  "msp430x"
+  "MOV%X1.B %1, %L0 { CLR %H0"
+)
+
+(define_insn ""
+  [(set (match_operand:PSI 0 "register_operand" "=r")
+	(ashift:PSI (sign_extend:PSI (subreg:HI (match_operand:QI 1 "general_operand" "rm") 0))
+		    (match_operand:HI 2 "immediate_operand" "M")))]
+  "msp430x"
+  "MOV%X1.B %1, %0 { RLAM.W %2, %0"
+)
+;; END msp430 pointer manipulation combine insn patterns
 
 ;; Eliminate extraneous zero-extends mysteriously created by gcc.
 (define_peephole2
-- 
cgit v1.1


From c1d781707eb611d65aa4e1275f246debba557a3d Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 15 Oct 2019 12:27:21 +0000
Subject: [C++ PATCH] clone_function_decl breakup

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01083.html
This patch, from the modules branch, breaks out function cloning from the
method vector updating. We have a new function, build_clones,
which does the building, returning a count of the number of clones
(2 or 3). clone_function_decl separately adds them to the method
vector, if they should be added. I suppose this could have used
FOR_EVERY_CLONE, but I went with the counting scheme.

	* class.c (build_clones): Break out of clone_function_decl.  Just
	build the clones.
	(clone_function_decl): Call build_clones, then maybe add them to
	the method vector.

From-SVN: r276998
---
 gcc/cp/ChangeLog |  5 +++++
 gcc/cp/class.c   | 63 +++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 42 insertions(+), 26 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a2fc072..ecaf312 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-15  Nathan Sidwell  <nathan@acm.org>
 
+	* class.c (build_clones): Break out of clone_function_decl.  Just
+	build the clones.
+	(clone_function_decl): Call build_clones, then maybe add them to
+	the method vector.
+
 	* class.c (build_clone): Refactor to clarify recursiveness.
 
 2019-10-14  Jason Merrill  <jason@redhat.com>
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b9266b3..a66c25b 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4699,30 +4699,21 @@ build_clone (tree fn, tree name)
   return clone;
 }
 
-/* Produce declarations for all appropriate clones of FN.  If
-   UPDATE_METHODS is true, the clones are added to the
-   CLASSTYPE_MEMBER_VEC.  */
+/* Build the clones of FN, return the number of clones built.  These
+   will be inserted onto DECL_CHAIN of FN.  */
 
-void
-clone_function_decl (tree fn, bool update_methods)
+unsigned
+build_clones (tree fn)
 {
-  tree clone;
-
-  /* Avoid inappropriate cloning.  */
-  if (DECL_CHAIN (fn)
-      && DECL_CLONED_FUNCTION_P (DECL_CHAIN (fn)))
-    return;
+  unsigned count = 0;
 
   if (DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (fn))
     {
       /* For each constructor, we need two variants: an in-charge version
 	 and a not-in-charge version.  */
-      clone = build_clone (fn, complete_ctor_identifier);
-      if (update_methods)
-	add_method (DECL_CONTEXT (clone), clone, false);
-      clone = build_clone (fn, base_ctor_identifier);
-      if (update_methods)
-	add_method (DECL_CONTEXT (clone), clone, false);
+      build_clone (fn, complete_ctor_identifier);
+      build_clone (fn, base_ctor_identifier);
+      count += 2;
     }
   else
     {
@@ -4739,20 +4730,40 @@ clone_function_decl (tree fn, bool update_methods)
 	 destructor.  */
       if (DECL_VIRTUAL_P (fn))
 	{
-	  clone = build_clone (fn, deleting_dtor_identifier);
-	  if (update_methods)
-	    add_method (DECL_CONTEXT (clone), clone, false);
+	  build_clone (fn, deleting_dtor_identifier);
+	  count++;
 	}
-      clone = build_clone (fn, complete_dtor_identifier);
-      if (update_methods)
-	add_method (DECL_CONTEXT (clone), clone, false);
-      clone = build_clone (fn, base_dtor_identifier);
-      if (update_methods)
-	add_method (DECL_CONTEXT (clone), clone, false);
+      build_clone (fn, complete_dtor_identifier);
+      build_clone (fn, base_dtor_identifier);
+      count += 2;
     }
 
+  return count;
+}
+
+/* Produce declarations for all appropriate clones of FN.  If
+   UPDATE_METHODS is true, the clones are added to the
+   CLASSTYPE_MEMBER_VEC.  */
+
+void
+clone_function_decl (tree fn, bool update_methods)
+{
+  /* Avoid inappropriate cloning.  */
+  if (DECL_CHAIN (fn)
+      && DECL_CLONED_FUNCTION_P (DECL_CHAIN (fn)))
+    return;
+
+  unsigned count = build_clones (fn);
+
   /* Note that this is an abstract function that is never emitted.  */
   DECL_ABSTRACT_P (fn) = true;
+
+  if (update_methods)
+    for (tree clone = fn; count--;)
+      {
+	clone = DECL_CHAIN (clone);
+	add_method (DECL_CONTEXT (clone), clone, false);
+      }
 }
 
 /* DECL is an in charge constructor, which is being defined. This will
-- 
cgit v1.1


From 855b85b4e705df7f0bf893b00f4e8c10a2c6bcec Mon Sep 17 00:00:00 2001
From: Bill Schmidt <wschmidt@linux.ibm.com>
Date: Tue, 15 Oct 2019 12:44:25 +0000
Subject: re PR testsuite/92093 (New test case gcc.target/powerpc/pr91275.c
 from r276410 fails on BE)

2019-10-15  Bill Schmidt  <wschmidt@linux.ibm.com>

	PR target/92093
	* gcc.target/powerpc/pr91275.c: Fix type and endian issues.

From-SVN: r276999
---
 gcc/testsuite/ChangeLog                    | 5 +++++
 gcc/testsuite/gcc.target/powerpc/pr91275.c | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56c5e48..d18f5b4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Bill Schmidt  <wschmidt@linux.ibm.com>
+
+	PR target/92093
+	* gcc.target/powerpc/pr91275.c: Fix type and endian issues.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	PR testsuite/92048
diff --git a/gcc/testsuite/gcc.target/powerpc/pr91275.c b/gcc/testsuite/gcc.target/powerpc/pr91275.c
index b23d75b..cd46115 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr91275.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr91275.c
@@ -10,12 +10,17 @@ int main() {
   const unsigned long long r0l = 0x8e7dfceac070e3a0;
   vector unsigned long long r0 = (vector unsigned long long) {r0l, 0}, v;
   const vector unsigned long long pd
-    = (vector unsigned long) {0xc2LLU << 56, 0};
+    = (vector unsigned long long) {0xc2LLU << 56, 0};
 
   v = __builtin_crypto_vpmsumd ((vector unsigned long long) {r0[0], 0}, pd);
 
+#if __LITTLE_ENDIAN__
   if (v[0] != 0x4000000000000000 || v[1] != 0x65bd7ab605a4a8ff)
     __builtin_abort ();
+#else
+  if (v[1] != 0x4000000000000000 || v[0] != 0x65bd7ab605a4a8ff)
+    __builtin_abort ();
+#endif
 
   return 0;
 }
-- 
cgit v1.1


From 2a0cb1644c8431660f24f25aa82118f86d7f9627 Mon Sep 17 00:00:00 2001
From: James Norris <jnorris@codesourcery.com>
Date: Tue, 15 Oct 2019 14:13:01 +0000
Subject: [Fortran] OpenMP+OpenACC: Remove bogus contigous-pointer check

        gcc/fortran
        PR fortran/65438
        * openmp.c (check_array_not_assumed): Remove pointer check.


Co-Authored-By: Tobias Burnus <tobias@codesourcery.com>

From-SVN: r277000
---
 gcc/fortran/ChangeLog | 6 ++++++
 gcc/fortran/openmp.c  | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5e3c78e1..1dbc890 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-15  James Norris  <jnorris@codesourcery.com>
+	    Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/65438
+	* openmp.c (check_array_not_assumed): Remove pointer check.
+
 2019-10-14  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/89943
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index cd28384..5c91fcd 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -3861,10 +3861,6 @@ check_array_not_assumed (gfc_symbol *sym, locus loc, const char *name)
   if (sym->as && sym->as->type == AS_ASSUMED_RANK)
     gfc_error ("Assumed rank array %qs in %s clause at %L",
 	       sym->name, name, &loc);
-  if (sym->as && sym->as->type == AS_DEFERRED && sym->attr.pointer
-      && !sym->attr.contiguous)
-    gfc_error ("Noncontiguous deferred shape array %qs in %s clause at %L",
-	       sym->name, name, &loc);
 }
 
 static void
-- 
cgit v1.1


From 7e601a1d3ef4bf1467bc85d01f641bdbbf3e7fd8 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 15 Oct 2019 18:30:15 +0000
Subject: lto-streamer-out.c (lto_variably_modified_type_p): New.

2019-10-15  Richard Biener  <rguenther@suse.de>

	* lto-streamer-out.c (lto_variably_modified_type_p): New.
	(tree_is_indexable): Use it.
	* tree-streamer-out.c (pack_ts_type_common_value_fields):
	Stream variably_modified_type_p as TYPE_LANG_FLAG_0.
	* tree-streamer-in.c (unpack_ts_type_common_value_fields): Likewise.

From-SVN: r277005
---
 gcc/ChangeLog           |  8 ++++++++
 gcc/lto-streamer-out.c  | 17 ++++++++++++++---
 gcc/tree-streamer-in.c  |  1 +
 gcc/tree-streamer-out.c |  6 ++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba6121f..023b8f2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-15  Richard Biener  <rguenther@suse.de>
+
+	* lto-streamer-out.c (lto_variably_modified_type_p): New.
+	(tree_is_indexable): Use it.
+	* tree-streamer-out.c (pack_ts_type_common_value_fields):
+	Stream variably_modified_type_p as TYPE_LANG_FLAG_0.
+	* tree-streamer-in.c (unpack_ts_type_common_value_fields): Likewise.
+
 2019-10-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* config/msp430/msp430.md (zero_extendqipsi2): New.
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 285c010..87c9e92 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -120,6 +120,17 @@ output_type_ref (struct output_block *ob, tree node)
   lto_output_type_ref_index (ob->decl_state, ob->main_stream, node);
 }
 
+/* Wrapper around variably_modified_type_p avoiding type modification
+   during WPA streaming.  */
+
+static bool
+lto_variably_modified_type_p (tree type)
+{
+  return (in_lto_p
+	  ? TYPE_LANG_FLAG_0 (TYPE_MAIN_VARIANT (type))
+	  : variably_modified_type_p (type, NULL_TREE));
+}
+
 
 /* Return true if tree node T is written to various tables.  For these
    nodes, we sometimes want to write their phyiscal representation
@@ -134,7 +145,7 @@ tree_is_indexable (tree t)
      definition.  */
   if ((TREE_CODE (t) == PARM_DECL || TREE_CODE (t) == RESULT_DECL)
       && DECL_CONTEXT (t))
-    return variably_modified_type_p (TREE_TYPE (DECL_CONTEXT (t)), NULL_TREE);
+    return lto_variably_modified_type_p (TREE_TYPE (DECL_CONTEXT (t)));
   /* IMPORTED_DECL is put into BLOCK and thus it never can be shared.
      We should no longer need to stream it.  */
   else if (TREE_CODE (t) == IMPORTED_DECL)
@@ -154,10 +165,10 @@ tree_is_indexable (tree t)
      them we have to localize their members as well.
      ???  In theory that includes non-FIELD_DECLs as well.  */
   else if (TYPE_P (t)
-	   && variably_modified_type_p (t, NULL_TREE))
+	   && lto_variably_modified_type_p (t))
     return false;
   else if (TREE_CODE (t) == FIELD_DECL
-	   && variably_modified_type_p (DECL_CONTEXT (t), NULL_TREE))
+	   && lto_variably_modified_type_p (DECL_CONTEXT (t)))
     return false;
   else
     return (TYPE_P (t) || DECL_P (t) || TREE_CODE (t) == SSA_NAME);
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 5152d10..d971a74 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -378,6 +378,7 @@ unpack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
   TYPE_RESTRICT (expr) = (unsigned) bp_unpack_value (bp, 1);
   TYPE_USER_ALIGN (expr) = (unsigned) bp_unpack_value (bp, 1);
   TYPE_READONLY (expr) = (unsigned) bp_unpack_value (bp, 1);
+  TYPE_LANG_FLAG_0 (expr) = (unsigned) bp_unpack_value (bp, 1);
   if (RECORD_OR_UNION_TYPE_P (expr))
     {
       TYPE_TRANSPARENT_AGGR (expr) = (unsigned) bp_unpack_value (bp, 1);
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index aadc56c..f2e4ca2 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -326,6 +326,12 @@ pack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
   bp_pack_value (bp, TYPE_RESTRICT (expr), 1);
   bp_pack_value (bp, TYPE_USER_ALIGN (expr), 1);
   bp_pack_value (bp, TYPE_READONLY (expr), 1);
+  unsigned vla_p;
+  if (in_lto_p)
+    vla_p = TYPE_LANG_FLAG_0 (TYPE_MAIN_VARIANT (expr));
+  else
+    vla_p = variably_modified_type_p (expr, NULL_TREE);
+  bp_pack_value (bp, vla_p, 1);
   /* We used to stream TYPE_ALIAS_SET == 0 information to let frontends mark
      types that are opaque for TBAA.  This however did not work as intended,
      because TYPE_ALIAS_SET == 0 was regularly lost in type merging.  */
-- 
cgit v1.1


From 863950d280dd0bc02edce2e88484735cea5bd1c7 Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Tue, 15 Oct 2019 19:16:51 +0000
Subject: PR testsuite/92016 - Excess errors in Wstringop-overflow-17.c

gcc/testsuite/ChangeLog:
	* gcc.dg/Wstringop-overflow-17.c: Expect an additional warning.

From-SVN: r277008
---
 gcc/testsuite/ChangeLog                      | 5 +++++
 gcc/testsuite/gcc.dg/Wstringop-overflow-17.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d18f5b4..730e396 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Martin Sebor  <msebor@redhat.com>
+
+	PR testsuite/92016
+	* gcc.dg/Wstringop-overflow-17.c: Expect an additional warning.
+
 2019-10-15  Bill Schmidt  <wschmidt@linux.ibm.com>
 
 	PR target/92093
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c
index de22c98..fdacea3 100644
--- a/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-17.c
@@ -1,12 +1,11 @@
 /* Test to verify that -Wstringop-overflow mentions the referenced object
-   i.
    { dg-do compile }
    { dg-options "-O2 -Wall" } */
 
 static void copy_n (char *d, const char *s, int n)
 {
   while (n--)
-    *d++ = *s++;
+    *d++ = *s++;    // { dg-warning "writing 1 byte into a region of size 0" }
   *d = 0;           // { dg-warning "writing 1 byte into a region of size 0" }
 }
 
-- 
cgit v1.1


From 6eee515142568bf25e0d99882bdf3cf5f49e97ec Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Tue, 15 Oct 2019 20:15:38 +0000
Subject: [Darwin] Update darwin_binds_local_p.

The use of default_binds_local_p had got out of sync with the varasm
changes, this restores the call to be direct.  In practice, we add some
further tests to determine local binding - but this callback is used for
the initial assessments made by default_encode_section_info().

gcc/ChangeLog:

2019-10-15  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c (darwin_binds_local_p): Update to call
	default_binds_local_p_3 () directly. amend comments.

From-SVN: r277009
---
 gcc/ChangeLog       |  5 +++++
 gcc/config/darwin.c | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 023b8f2..6a9c2e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/darwin.c (darwin_binds_local_p): Update to call
+	default_binds_local_p_3 () directly. amend comments.
+
 2019-10-15  Richard Biener  <rguenther@suse.de>
 
 	* lto-streamer-out.c (lto_variably_modified_type_p): New.
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 1d386e0..d34b003 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -3049,8 +3049,14 @@ darwin_file_end (void)
 bool
 darwin_binds_local_p (const_tree decl)
 {
-  return default_binds_local_p_1 (decl,
-				  TARGET_KEXTABI && DARWIN_VTABLE_P (decl));
+  /* We use the "shlib" input to indicate that a symbol should be
+     considered overridable; only relevant for vtables in kernel modules
+     on earlier system versions, and with a TODO to complete.  */
+  bool force_overridable = TARGET_KEXTABI && DARWIN_VTABLE_P (decl);
+  return default_binds_local_p_3 (decl, force_overridable /* shlib */,
+				  false /* weak dominate */,
+				  false /* extern_protected_data */,
+				  false /* common_local_p */);
 }
 
 /* The Darwin's implementation of TARGET_ASM_OUTPUT_ANCHOR.  Define the
-- 
cgit v1.1


From a1f37c3f62acf98aa2a44b1f5b3e6d574ef52670 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Tue, 15 Oct 2019 20:28:02 +0000
Subject: [Darwin] Clarify fix and continue support (NFC).

This updates the description of the support for fix and continue
debugging.

gcc/ChangeLog:

2019-10-15  Iain Sandoe  <iain@sandoe.co.uk>

	* config/darwin.c: Update description of fix and continue.

From-SVN: r277010
---
 gcc/ChangeLog       |  4 ++++
 gcc/config/darwin.c | 30 ++++++++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6a9c2e0..2320abc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-15  Iain Sandoe  <iain@sandoe.co.uk>
 
+	* config/darwin.c: Update description of fix and continue.
+
+2019-10-15  Iain Sandoe  <iain@sandoe.co.uk>
+
 	* config/darwin.c (darwin_binds_local_p): Update to call
 	default_binds_local_p_3 () directly. amend comments.
 
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index d34b003..c0fafed 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -49,18 +49,24 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "optabs.h"
 
-/* Darwin supports a feature called fix-and-continue, which is used
-   for rapid turn around debugging.  When code is compiled with the
-   -mfix-and-continue flag, two changes are made to the generated code
-   that allow the system to do things that it would normally not be
-   able to do easily.  These changes allow gdb to load in
-   recompilation of a translation unit that has been changed into a
-   running program and replace existing functions and methods of that
-   translation unit with versions of those functions and methods
-   from the newly compiled translation unit.  The new functions access
-   the existing static symbols from the old translation unit, if the
-   symbol existed in the unit to be replaced, and from the new
-   translation unit, otherwise.
+/* Fix and Continue.
+
+   NOTES:
+   1) this facility requires suitable support from a modified version
+   of GDB, which is not provided on any system after MacOS 10.7/Darwin11.
+   2) There is no support for this in any X86 version of the FSF compiler.
+
+   Fix and continue was used on some earlier MacOS systems for rapid turn
+   around debugging.  When code is compiled with the -mfix-and-continue
+   flag, two changes are made to the generated code that allow the system
+   to do things that it would normally not be able to do easily.  These
+   changes allow gdb to load in recompilation of a translation unit that
+   has been changed into a running program and replace existing functions
+   and methods of that translation unit with versions of those functions
+   and methods from the newly compiled translation unit.  The new functions
+   access the existing static symbols from the old translation unit, if the
+   symbol existed in the unit to be replaced, and from the new translation
+   unit, otherwise.
 
    The changes are to insert 5 nops at the beginning of all functions
    and to use indirection to get at static symbols.  The 5 nops
-- 
cgit v1.1


From 70a42a8559e8a73d8aef09c1d938833ffc811aaa Mon Sep 17 00:00:00 2001
From: Andrew Pinski <apinski@marvell.com>
Date: Tue, 15 Oct 2019 21:06:55 +0000
Subject: 20191015-1.c: New test.

2019-10-15  Andrew Pinski  <apinski@marvell.com>

        * gcc.c-torture/compile/20191015-1.c: New test.
        * gcc.c-torture/compile/20191015-2.c: New test.

From-SVN: r277011
---
 gcc/testsuite/ChangeLog                          |  5 +++++
 gcc/testsuite/gcc.c-torture/compile/20191015-1.c | 17 +++++++++++++++++
 gcc/testsuite/gcc.c-torture/compile/20191015-2.c | 17 +++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/20191015-1.c
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/20191015-2.c

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 730e396..6dc4f00 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-15  Andrew Pinski  <apinski@marvell.com>
+
+	* gcc.c-torture/compile/20191015-1.c: New test.
+	* gcc.c-torture/compile/20191015-2.c: New test.
+
 2019-10-15  Martin Sebor  <msebor@redhat.com>
 
 	PR testsuite/92016
diff --git a/gcc/testsuite/gcc.c-torture/compile/20191015-1.c b/gcc/testsuite/gcc.c-torture/compile/20191015-1.c
new file mode 100644
index 0000000..4f2755d
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20191015-1.c
@@ -0,0 +1,17 @@
+typedef unsigned uint32_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef struct {
+ uint32_t mbxOwner:1;
+ uint32_t mbxHc:1;
+ uint32_t mbxReserved:6;
+ uint32_t mbxCommand : 8;
+ uint32_t mbxStatus : 16;
+} MAILBOX_t;
+uint32_t f(void) {
+       uint32_t mbox;
+ mbox = 0;
+ ((MAILBOX_t *)&mbox)->mbxCommand = 0x24;
+ ((MAILBOX_t *)&mbox)->mbxOwner = 1;
+return mbox;
+}
diff --git a/gcc/testsuite/gcc.c-torture/compile/20191015-2.c b/gcc/testsuite/gcc.c-torture/compile/20191015-2.c
new file mode 100644
index 0000000..13a2ee7
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20191015-2.c
@@ -0,0 +1,17 @@
+typedef unsigned uint32_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef struct {
+ uint8_t mbxOwner:1;
+ uint8_t mbxHc:1;
+ uint8_t mbxReserved:6;
+ uint8_t mbxCommand : 8;
+ uint16_t mbxStatus : 16;
+} MAILBOX_t;
+uint32_t f(void) {
+       uint32_t mbox;
+ mbox = 0;
+ ((MAILBOX_t *)&mbox)->mbxCommand = 0x24;
+ ((MAILBOX_t *)&mbox)->mbxOwner = 1;
+return mbox;
+}
-- 
cgit v1.1


From f93701433432f27896183f57b82e9d2b22998c0f Mon Sep 17 00:00:00 2001
From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Wed, 16 Oct 2019 01:47:47 +0200
Subject: genattrtab: Parenthesize expressions correctly (PR92107)

As PR92107 shows, genattrtab doesn't parenthesize expressions correctly
(or at all, even).  This fixes it.


	PR rtl-optimization/92107
	* genattrtab.c (write_attr_value) <do_operator>: Parenthesize the
	expression written.

From-SVN: r277023
---
 gcc/ChangeLog    | 6 ++++++
 gcc/genattrtab.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2320abc..175ecd9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-15  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR rtl-optimization/92107
+	* genattrtab.c (write_attr_value) <do_operator>: Parenthesize the
+	expression written.
+
 2019-10-15  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/darwin.c: Update description of fix and continue.
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index cdf0b5c..2fd8593 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -4425,11 +4425,11 @@ write_attr_value (FILE *outf, class attr_desc *attr, rtx value)
       goto do_operator;
 
     do_operator:
+      fprintf (outf, "(");
       write_attr_value (outf, attr, XEXP (value, 0));
-      fputc (' ', outf);
-      fputc (op,  outf);
-      fputc (' ', outf);
+      fprintf (outf, " %c ", op);
       write_attr_value (outf, attr, XEXP (value, 1));
+      fprintf (outf, ")");
       break;
 
     case IF_THEN_ELSE:
-- 
cgit v1.1


From 6c1ee906055d90805e4512d9fe4099d56cb062bd Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Wed, 16 Oct 2019 00:16:15 +0000
Subject: Daily bump.

From-SVN: r277033
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index d62a900..e6b876a 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191015
+20191016
-- 
cgit v1.1


From 4307a485c39fd1c317d6cead2707a903052c4753 Mon Sep 17 00:00:00 2001
From: Feng Xue <fxue@os.amperecomputing.com>
Date: Wed, 16 Oct 2019 07:27:50 +0000
Subject: Generalized IPA predicate on parameter reference

2019-10-16  Feng Xue  <fxue@os.amperecomputing.com>

        PR ipa/91088
        * doc/invoke.texi (ipa-max-param-expr-ops): Document new option.
        * params.def (PARAM_IPA_MAX_PARAM_EXPR_OPS): New.
        * ipa-predicat.h (struct expr_eval_op): New struct.
        (expr_eval_ops): New typedef.
        (struct condition): Add type and param_ops fields, remove size field.
        (add_condition): Replace size parameter with type parameter, add
        param_ops parameter.
        * ipa-predicat.c (expr_eval_ops_equal_p): New function.
        (predicate::add_clause): Add comparisons on type and param_ops.
        (dump_condition): Add debug dump for param_ops.
        (remap_after_inlining): Adjust call arguments to add_condition.
        (add_condition): Replace size parameter with type parameter, add
        param_ops parameter. Unshare constant value used in conditions.
        * ipa-fnsummary.c (evaluate_conditions_for_known_args): Fold
        parameter expressions using param_ops.
        (decompose_param_expr):  New function.
        (set_cond_stmt_execution_predicate): Use call to decompose_param_expr
        to replace call to unmodified_parm_or_parm_agg_item.
        (set_switch_stmt_execution_predicate): Likewise.
        (will_be_nonconstant_expr_predicate): Likewise. Replace usage of size
        with type.
        (inline_read_section): Read param_ops from summary stream.
        (ipa_fn_summary_write): Write param_ops to summary stream.

2019-10-16  Feng Xue  <fxue@os.amperecomputing.com>

        PR ipa/91088
        * gcc.dg/ipa/pr91088.c: New test.
        * gcc.dg/ipa/pr91089.c: Add sub-test for range analysis.
        * g++.dg/tree-ssa/ivopts-3.C: Force a function to be noinline.

From-SVN: r277054
---
 gcc/ChangeLog                            |  27 +++
 gcc/doc/invoke.texi                      |   7 +
 gcc/ipa-fnsummary.c                      | 296 ++++++++++++++++++++++++++-----
 gcc/ipa-predicate.c                      | 153 ++++++++++++++--
 gcc/ipa-predicate.h                      |  36 +++-
 gcc/params.def                           |   6 +
 gcc/testsuite/ChangeLog                  |   7 +
 gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C |   2 +-
 gcc/testsuite/gcc.dg/ipa/pr91088.c       | 120 +++++++++++++
 gcc/testsuite/gcc.dg/ipa/pr91089.c       |  16 +-
 10 files changed, 589 insertions(+), 81 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/ipa/pr91088.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 175ecd9..2862958 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2019-10-16  Feng Xue  <fxue@os.amperecomputing.com>
+
+	PR ipa/91088
+	* doc/invoke.texi (ipa-max-param-expr-ops): Document new option.
+	* params.def (PARAM_IPA_MAX_PARAM_EXPR_OPS): New.
+	* ipa-predicat.h (struct expr_eval_op): New struct.
+	(expr_eval_ops): New typedef.
+	(struct condition): Add type and param_ops fields, remove size field.
+	(add_condition): Replace size parameter with type parameter, add
+	param_ops parameter.
+	* ipa-predicat.c (expr_eval_ops_equal_p): New function.
+	(predicate::add_clause): Add comparisons on type and param_ops.
+	(dump_condition): Add debug dump for param_ops.
+	(remap_after_inlining): Adjust call arguments to add_condition.
+	(add_condition): Replace size parameter with type parameter, add
+	param_ops parameter. Unshare constant value used in conditions.
+	* ipa-fnsummary.c (evaluate_conditions_for_known_args): Fold
+	parameter expressions using param_ops.
+	(decompose_param_expr):  New function.
+	(set_cond_stmt_execution_predicate): Use call to decompose_param_expr
+	to replace call to unmodified_parm_or_parm_agg_item.
+	(set_switch_stmt_execution_predicate): Likewise.
+	(will_be_nonconstant_expr_predicate): Likewise. Replace usage of size
+	with type.
+	(inline_read_section): Read param_ops from summary stream.
+	(ipa_fn_summary_write): Write param_ops to summary stream.
+
 2019-10-15  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	PR rtl-optimization/92107
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 4776926..1407d01 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -12034,6 +12034,13 @@ For switch exceeding this limit, IPA-CP will not construct cloning cost
 predicate, which is used to estimate cloning benefit, for default case
 of the switch statement.
 
+@item ipa-max-param-expr-ops
+IPA-CP will analyze conditional statement that references some function
+parameter to estimate benefit for cloning upon certain constant value.
+But if number of operations in a parameter expression exceeds
+@option{ipa-max-param-expr-ops}, the expression is treated as complicated
+one, and is not handled by IPA analysis.
+
 @item lto-partitions
 Specify desired number of partitions produced during WHOPR compilation.
 The number of partitions should exceed the number of CPUs used for compilation.
diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index a438679..40a9e0f 100644
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -331,6 +331,8 @@ evaluate_conditions_for_known_args (struct cgraph_node *node,
     {
       tree val;
       tree res;
+      int j;
+      struct expr_eval_op *op;
 
       /* We allow call stmt to have fewer arguments than the callee function
          (especially for K&R style programs).  So bound check here (we assume
@@ -382,7 +384,7 @@ evaluate_conditions_for_known_args (struct cgraph_node *node,
 	  continue;
 	}
 
-      if (maybe_ne (tree_to_poly_int64 (TYPE_SIZE (TREE_TYPE (val))), c->size))
+      if (TYPE_SIZE (c->type) != TYPE_SIZE (TREE_TYPE (val)))
 	{
 	  clause |= 1 << (i + predicate::first_dynamic_condition);
 	  nonspec_clause |= 1 << (i + predicate::first_dynamic_condition);
@@ -394,7 +396,30 @@ evaluate_conditions_for_known_args (struct cgraph_node *node,
 	  continue;
 	}
 
-      val = fold_unary (VIEW_CONVERT_EXPR, TREE_TYPE (c->val), val);
+      val = fold_unary (VIEW_CONVERT_EXPR, c->type, val);
+      for (j = 0; vec_safe_iterate (c->param_ops, j, &op); j++)
+	{
+	  if (!val)
+	    break;
+	  if (!op->val[0])
+	    val = fold_unary (op->code, op->type, val);
+	  else if (!op->val[1])
+	    val = fold_binary (op->code, op->type,
+			       op->index ? op->val[0] : val,
+			       op->index ? val : op->val[0]);
+	  else if (op->index == 0)
+	    val = fold_ternary (op->code, op->type,
+				val, op->val[0], op->val[1]);
+	  else if (op->index == 1)
+	    val = fold_ternary (op->code, op->type,
+				op->val[0], val, op->val[1]);
+	  else if (op->index == 2)
+	    val = fold_ternary (op->code, op->type,
+				op->val[0], op->val[1], val);
+	  else
+	    val = NULL_TREE;
+	}
+
       res = val
 	? fold_binary_to_constant (c->code, boolean_type_node, val, c->val)
 	: NULL;
@@ -1155,6 +1180,127 @@ eliminated_by_inlining_prob (ipa_func_body_info *fbi, gimple *stmt)
     }
 }
 
+/* Analyze EXPR if it represents a series of simple operations performed on
+   a function parameter and return true if so.  FBI, STMT, EXPR, INDEX_P and
+   AGGPOS have the same meaning like in unmodified_parm_or_parm_agg_item.
+   Type of the parameter or load from an aggregate via the parameter is
+   stored in *TYPE_P.  Operations on the parameter are recorded to
+   PARAM_OPS_P if it is not NULL.  */
+
+static bool
+decompose_param_expr (struct ipa_func_body_info *fbi,
+		      gimple *stmt, tree expr,
+		      int *index_p, tree *type_p,
+		      struct agg_position_info *aggpos,
+		      expr_eval_ops *param_ops_p = NULL)
+{
+  int op_limit = PARAM_VALUE (PARAM_IPA_MAX_PARAM_EXPR_OPS);
+  int op_count = 0;
+
+  if (param_ops_p)
+    *param_ops_p = NULL;
+
+  while (true)
+    {
+      expr_eval_op eval_op;
+      unsigned rhs_count;
+      unsigned cst_count = 0;
+
+      if (unmodified_parm_or_parm_agg_item (fbi, stmt, expr, index_p, NULL,
+					    aggpos))
+	{
+	  tree type = TREE_TYPE (expr);
+
+	  if (aggpos->agg_contents)
+	    {
+	      /* Stop if containing bit-field.  */
+	      if (TREE_CODE (expr) == BIT_FIELD_REF
+		  || contains_bitfld_component_ref_p (expr))
+		break;
+	    }
+
+	  *type_p = type;
+	  return true;
+	}
+
+      if (TREE_CODE (expr) != SSA_NAME || SSA_NAME_IS_DEFAULT_DEF (expr))
+	break;
+
+      if (!is_gimple_assign (stmt = SSA_NAME_DEF_STMT (expr)))
+	break;
+
+      switch (gimple_assign_rhs_class (stmt))
+	{
+	case GIMPLE_SINGLE_RHS:
+	  expr = gimple_assign_rhs1 (stmt);
+	  continue;
+
+	case GIMPLE_UNARY_RHS:
+	  rhs_count = 1;
+	  break;
+
+	case GIMPLE_BINARY_RHS:
+	  rhs_count = 2;
+	  break;
+
+	case GIMPLE_TERNARY_RHS:
+	  rhs_count = 3;
+	  break;
+
+	default:
+	  goto fail;
+	}
+
+      /* Stop if expression is too complex.  */
+      if (op_count++ == op_limit)
+	break;
+
+      if (param_ops_p)
+	{
+	  eval_op.code = gimple_assign_rhs_code (stmt);
+	  eval_op.type = TREE_TYPE (gimple_assign_lhs (stmt));
+	  eval_op.val[0] = NULL_TREE;
+	  eval_op.val[1] = NULL_TREE;
+	}
+
+      expr = NULL_TREE;
+      for (unsigned i = 0; i < rhs_count; i++)
+	{
+	  tree op = gimple_op (stmt, i + 1);
+
+	  gcc_assert (op && !TYPE_P (op));
+	  if (is_gimple_ip_invariant (op))
+	    {
+	      if (++cst_count == rhs_count)
+		goto fail;
+
+	      eval_op.val[cst_count - 1] = op;
+	    }
+	  else if (!expr)
+	    {
+	      /* Found a non-constant operand, and record its index in rhs
+		 operands.  */
+	      eval_op.index = i;
+	      expr = op;
+	    }
+	  else
+	    {
+	      /* Found more than one non-constant operands.  */
+	      goto fail;
+	    }
+	}
+
+      if (param_ops_p)
+	vec_safe_insert (*param_ops_p, 0, eval_op);
+    }
+
+  /* Failed to decompose, free resource and return.  */
+fail:
+  if (param_ops_p)
+    vec_free (*param_ops_p);
+
+  return false;
+}
 
 /* If BB ends by a conditional we can turn into predicates, attach corresponding
    predicates to the CFG edges.   */
@@ -1165,15 +1311,15 @@ set_cond_stmt_execution_predicate (struct ipa_func_body_info *fbi,
 				   basic_block bb)
 {
   gimple *last;
-  tree op;
+  tree op, op2;
   int index;
-  poly_int64 size;
   struct agg_position_info aggpos;
   enum tree_code code, inverted_code;
   edge e;
   edge_iterator ei;
   gimple *set_stmt;
-  tree op2;
+  tree param_type;
+  expr_eval_ops param_ops;
 
   last = last_stmt (bb);
   if (!last || gimple_code (last) != GIMPLE_COND)
@@ -1181,10 +1327,9 @@ set_cond_stmt_execution_predicate (struct ipa_func_body_info *fbi,
   if (!is_gimple_ip_invariant (gimple_cond_rhs (last)))
     return;
   op = gimple_cond_lhs (last);
-  /* TODO: handle conditionals like
-     var = op0 < 4;
-     if (var != 0).  */
-  if (unmodified_parm_or_parm_agg_item (fbi, last, op, &index, &size, &aggpos))
+
+  if (decompose_param_expr (fbi, last, op, &index, &param_type, &aggpos,
+			    &param_ops))
     {
       code = gimple_cond_code (last);
       inverted_code = invert_tree_comparison (code, HONOR_NANS (op));
@@ -1205,13 +1350,13 @@ set_cond_stmt_execution_predicate (struct ipa_func_body_info *fbi,
 	      && !dominated_by_p (CDI_POST_DOMINATORS, bb, e->dest))
 	    {
 	      predicate p
-		= add_condition (summary, index, size, &aggpos, this_code,
-				 unshare_expr_without_location
-				 (gimple_cond_rhs (last)));
+		= add_condition (summary, index, param_type, &aggpos,
+				 this_code, gimple_cond_rhs (last), param_ops);
 	      e->aux = edge_predicate_pool.allocate ();
 	      *(predicate *) e->aux = p;
 	    }
 	}
+      vec_free (param_ops);
     }
 
   if (TREE_CODE (op) != SSA_NAME)
@@ -1234,12 +1379,11 @@ set_cond_stmt_execution_predicate (struct ipa_func_body_info *fbi,
       || gimple_call_num_args (set_stmt) != 1)
     return;
   op2 = gimple_call_arg (set_stmt, 0);
-  if (!unmodified_parm_or_parm_agg_item (fbi, set_stmt, op2, &index, &size,
-					 &aggpos))
+  if (!decompose_param_expr (fbi, set_stmt, op2, &index, &param_type, &aggpos))
     return;
   FOR_EACH_EDGE (e, ei, bb->succs) if (e->flags & EDGE_FALSE_VALUE)
     {
-      predicate p = add_condition (summary, index, size, &aggpos,
+      predicate p = add_condition (summary, index, param_type, &aggpos,
 				   predicate::is_not_constant, NULL_TREE);
       e->aux = edge_predicate_pool.allocate ();
       *(predicate *) e->aux = p;
@@ -1258,19 +1402,21 @@ set_switch_stmt_execution_predicate (struct ipa_func_body_info *fbi,
   gimple *lastg;
   tree op;
   int index;
-  poly_int64 size;
   struct agg_position_info aggpos;
   edge e;
   edge_iterator ei;
   size_t n;
   size_t case_idx;
+  tree param_type;
+  expr_eval_ops param_ops;
 
   lastg = last_stmt (bb);
   if (!lastg || gimple_code (lastg) != GIMPLE_SWITCH)
     return;
   gswitch *last = as_a <gswitch *> (lastg);
   op = gimple_switch_index (last);
-  if (!unmodified_parm_or_parm_agg_item (fbi, last, op, &index, &size, &aggpos))
+  if (!decompose_param_expr (fbi, last, op, &index, &param_type, &aggpos,
+			     &param_ops))
     return;
 
   auto_vec<std::pair<tree, tree> > ranges;
@@ -1302,6 +1448,8 @@ set_switch_stmt_execution_predicate (struct ipa_func_body_info *fbi,
       tree max = CASE_HIGH (cl);
       predicate p;
 
+      e = gimple_switch_edge (cfun, last, case_idx);
+
       /* The case value might not have same type as switch expression,
 	 extend the value based on the expression type.  */
       if (TREE_TYPE (min) != type)
@@ -1318,18 +1466,17 @@ set_switch_stmt_execution_predicate (struct ipa_func_body_info *fbi,
       if (dominated_by_p (CDI_POST_DOMINATORS, bb, e->dest))
 	p = true;
       else if (min == max)
-	p = add_condition (summary, index, size, &aggpos, EQ_EXPR,
-			   unshare_expr_without_location (min));
+	p = add_condition (summary, index, param_type, &aggpos, EQ_EXPR,
+			   min, param_ops);
       else
 	{
 	  predicate p1, p2;
-	  p1 = add_condition (summary, index, size, &aggpos, GE_EXPR,
-			      unshare_expr_without_location (min));
-	  p2 = add_condition (summary, index, size, &aggpos, LE_EXPR,
-			      unshare_expr_without_location (max));
+	  p1 = add_condition (summary, index, param_type, &aggpos, GE_EXPR,
+			      min, param_ops);
+	  p2 = add_condition (summary, index, param_type, &aggpos, LE_EXPR,
+			      max, param_ops);
 	  p = p1 & p2;
 	}
-      e = gimple_switch_edge (cfun, last, case_idx);
       *(class predicate *) e->aux
 	= p.or_with (summary->conds, *(class predicate *) e->aux);
 
@@ -1378,6 +1525,7 @@ set_switch_stmt_execution_predicate (struct ipa_func_body_info *fbi,
   if (bound_count > bound_limit)
     {
       *(class predicate *) e->aux = true;
+      vec_free (param_ops);
       return;
     }
 
@@ -1407,16 +1555,16 @@ set_switch_stmt_execution_predicate (struct ipa_func_body_info *fbi,
       tree max = ranges[i].second;
 
       if (min == max)
-	p_seg &= add_condition (summary, index, size, &aggpos, NE_EXPR,
-				unshare_expr_without_location (min));
+	p_seg &= add_condition (summary, index, param_type, &aggpos, NE_EXPR,
+				min, param_ops);
       else
 	{
 	  /* Do not create sub-predicate for range that is beyond low bound
 	     of switch index.  */
 	  if (wi::lt_p (vr_wmin, wi::to_wide (min), TYPE_SIGN (type)))
 	    {
-	      p_seg &= add_condition (summary, index, size, &aggpos, LT_EXPR,
-				      unshare_expr_without_location (min));
+	      p_seg &= add_condition (summary, index, param_type, &aggpos,
+				      LT_EXPR, min, param_ops);
 	      p_all = p_all.or_with (summary->conds, p_seg);
 	    }
 
@@ -1428,14 +1576,16 @@ set_switch_stmt_execution_predicate (struct ipa_func_body_info *fbi,
 	      break;
 	    }
 
-	  p_seg = add_condition (summary, index, size, &aggpos, GT_EXPR,
-				 unshare_expr_without_location (max));
+	  p_seg = add_condition (summary, index, param_type, &aggpos, GT_EXPR,
+				 max, param_ops);
 	}
     }
 
   p_all = p_all.or_with (summary->conds, p_seg);
   *(class predicate *) e->aux
     = p_all.or_with (summary->conds, *(class predicate *) e->aux);
+
+  vec_free (param_ops);
 }
 
 
@@ -1552,15 +1702,14 @@ will_be_nonconstant_expr_predicate (ipa_func_body_info *fbi,
 {
   tree parm;
   int index;
-  poly_int64 size;
 
   while (UNARY_CLASS_P (expr))
     expr = TREE_OPERAND (expr, 0);
 
-  parm = unmodified_parm (fbi, NULL, expr, &size);
+  parm = unmodified_parm (fbi, NULL, expr, NULL);
   if (parm && (index = ipa_get_param_decl_index (fbi->info, parm)) >= 0)
-    return add_condition (summary, index, size, NULL, predicate::changed,
-			  NULL_TREE);
+    return add_condition (summary, index, TREE_TYPE (parm), NULL,
+			  predicate::changed, NULL_TREE);
   if (is_gimple_min_invariant (expr))
     return false;
   if (TREE_CODE (expr) == SSA_NAME)
@@ -1624,10 +1773,10 @@ will_be_nonconstant_predicate (struct ipa_func_body_info *fbi,
   predicate p = true;
   ssa_op_iter iter;
   tree use;
+  tree param_type = NULL_TREE;
   predicate op_non_const;
   bool is_load;
   int base_index;
-  poly_int64 size;
   struct agg_position_info aggpos;
 
   /* What statments might be optimized away
@@ -1648,11 +1797,9 @@ will_be_nonconstant_predicate (struct ipa_func_body_info *fbi,
   /* Loads can be optimized when the value is known.  */
   if (is_load)
     {
-      tree op;
-      gcc_assert (gimple_assign_single_p (stmt));
-      op = gimple_assign_rhs1 (stmt);
-      if (!unmodified_parm_or_parm_agg_item (fbi, stmt, op, &base_index, &size,
-					     &aggpos))
+      tree op = gimple_assign_rhs1 (stmt);
+      if (!decompose_param_expr (fbi, stmt, op, &base_index, &param_type,
+				 &aggpos))
 	return p;
     }
   else
@@ -1677,21 +1824,20 @@ will_be_nonconstant_predicate (struct ipa_func_body_info *fbi,
 
   if (is_load)
     op_non_const =
-      add_condition (summary, base_index, size, &aggpos, predicate::changed,
-		     NULL);
+      add_condition (summary, base_index, param_type, &aggpos,
+		     predicate::changed, NULL_TREE);
   else
     op_non_const = false;
   FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, SSA_OP_USE)
     {
-      poly_int64 size;
-      tree parm = unmodified_parm (fbi, stmt, use, &size);
+      tree parm = unmodified_parm (fbi, stmt, use, NULL);
       int index;
 
       if (parm && (index = ipa_get_param_decl_index (fbi->info, parm)) >= 0)
 	{
 	  if (index != base_index)
-	    p = add_condition (summary, index, size, NULL, predicate::changed,
-			       NULL_TREE);
+	    p = add_condition (summary, index, TREE_TYPE (parm), NULL,
+			       predicate::changed, NULL_TREE);
 	  else
 	    continue;
 	}
@@ -1823,7 +1969,7 @@ param_change_prob (ipa_func_body_info *fbi, gimple *stmt, int i)
 	return REG_BR_PROB_BASE;
       if (dump_file)
 	{
-	  fprintf (dump_file, "     Analyzing param change probablity of ");
+	  fprintf (dump_file, "     Analyzing param change probability of ");
           print_generic_expr (dump_file, op, TDF_SLIM);
 	  fprintf (dump_file, "\n");
 	}
@@ -3452,15 +3598,49 @@ inline_read_section (struct lto_file_decl_data *file_data, const char *data,
       for (j = 0; j < count2; j++)
 	{
 	  struct condition c;
+	  unsigned int k, count3;
 	  c.operand_num = streamer_read_uhwi (&ib);
-	  c.size = streamer_read_poly_uint64 (&ib);
 	  c.code = (enum tree_code) streamer_read_uhwi (&ib);
+	  c.type = stream_read_tree (&ib, data_in);
 	  c.val = stream_read_tree (&ib, data_in);
 	  bp = streamer_read_bitpack (&ib);
 	  c.agg_contents = bp_unpack_value (&bp, 1);
 	  c.by_ref = bp_unpack_value (&bp, 1);
 	  if (c.agg_contents)
 	    c.offset = streamer_read_uhwi (&ib);
+	  c.param_ops = NULL;
+	  count3 = streamer_read_uhwi (&ib);
+	  for (k = 0; k < count3; k++)
+	    {
+	      struct expr_eval_op op;
+	      enum gimple_rhs_class rhs_class;
+	      op.code = (enum tree_code) streamer_read_uhwi (&ib);
+	      op.type = stream_read_tree (&ib, data_in);
+	      switch (rhs_class = get_gimple_rhs_class (op.code))
+		{
+		case GIMPLE_UNARY_RHS:
+		  op.index = 0;
+		  op.val[0] = NULL_TREE;
+		  op.val[1] = NULL_TREE;
+		  break;
+
+		case GIMPLE_BINARY_RHS:
+		case GIMPLE_TERNARY_RHS:
+		  bp = streamer_read_bitpack (&ib);
+		  op.index = bp_unpack_value (&bp, 2);
+		  op.val[0] = stream_read_tree (&ib, data_in);
+		  if (rhs_class == GIMPLE_BINARY_RHS)
+		    op.val[1] = NULL_TREE;
+		  else
+		    op.val[1] = stream_read_tree (&ib, data_in);
+		  break;
+
+		default:
+		  fatal_error (UNKNOWN_LOCATION,
+			       "invalid fnsummary in LTO stream");
+		}
+	      vec_safe_push (c.param_ops, op);
+	    }
 	  if (info)
 	    vec_safe_push (info->conds, c);
 	}
@@ -3606,9 +3786,12 @@ ipa_fn_summary_write (void)
 	  streamer_write_uhwi (ob, vec_safe_length (info->conds));
 	  for (i = 0; vec_safe_iterate (info->conds, i, &c); i++)
 	    {
+	      int j;
+	      struct expr_eval_op *op;
+
 	      streamer_write_uhwi (ob, c->operand_num);
-	      streamer_write_poly_uint64 (ob, c->size);
 	      streamer_write_uhwi (ob, c->code);
+	      stream_write_tree (ob, c->type, true);
 	      stream_write_tree (ob, c->val, true);
 	      bp = bitpack_create (ob->main_stream);
 	      bp_pack_value (&bp, c->agg_contents, 1);
@@ -3616,6 +3799,21 @@ ipa_fn_summary_write (void)
 	      streamer_write_bitpack (&bp);
 	      if (c->agg_contents)
 		streamer_write_uhwi (ob, c->offset);
+	      streamer_write_uhwi (ob, vec_safe_length (c->param_ops));
+	      for (j = 0; vec_safe_iterate (c->param_ops, j, &op); j++)
+		{
+		  streamer_write_uhwi (ob, op->code);
+		  stream_write_tree (ob, op->type, true);
+		  if (op->val[0])
+		    {
+		      bp = bitpack_create (ob->main_stream);
+		      bp_pack_value (&bp, op->index, 2);
+		      streamer_write_bitpack (&bp);
+		      stream_write_tree (ob, op->val[0], true);
+		      if (op->val[1])
+			stream_write_tree (ob, op->val[1], true);
+		    }
+		}
 	    }
 	  streamer_write_uhwi (ob, vec_safe_length (info->size_time_table));
 	  for (i = 0; vec_safe_iterate (info->size_time_table, i, &e); i++)
diff --git a/gcc/ipa-predicate.c b/gcc/ipa-predicate.c
index 8a9851a..b5e3cf4 100644
--- a/gcc/ipa-predicate.c
+++ b/gcc/ipa-predicate.c
@@ -33,9 +33,36 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "tree-pretty-print.h"
 #include "gimple.h"
+#include "gimplify.h"
 #include "data-streamer.h"
 
 
+/* Check whether two set of operations have same effects.  */
+static bool
+expr_eval_ops_equal_p (expr_eval_ops ops1, expr_eval_ops ops2)
+{
+  if (ops1)
+    {
+      if (!ops2 || ops1->length () != ops2->length ())
+	return false;
+
+      for (unsigned i = 0; i < ops1->length (); i++)
+	{
+	  expr_eval_op &op1 = (*ops1)[i];
+	  expr_eval_op &op2 = (*ops2)[i];
+
+	  if (op1.code != op2.code
+	      || op1.index != op2.index
+	      || !vrp_operand_equal_p (op1.val[0], op2.val[0])
+	      || !vrp_operand_equal_p (op1.val[1], op2.val[1])
+	      || !types_compatible_p (op1.type, op2.type))
+	    return false;
+	}
+      return true;
+    }
+  return !ops2;
+}
+
 /* Add clause CLAUSE into the predicate P.
    When CONDITIONS is NULL do not perform checking whether NEW_CLAUSE
    is obviously true.  This is useful only when NEW_CLAUSE is known to be
@@ -110,14 +137,16 @@ predicate::add_clause (conditions conditions, clause_t new_clause)
 	for (c2 = c1 + 1; c2 < num_conditions; c2++)
 	  if (new_clause & (1 << c2))
 	    {
-	      condition *cc1 =
-		&(*conditions)[c1 - predicate::first_dynamic_condition];
 	      condition *cc2 =
 		&(*conditions)[c2 - predicate::first_dynamic_condition];
 	      if (cc1->operand_num == cc2->operand_num
-		  && cc1->val == cc2->val
+		  && vrp_operand_equal_p (cc1->val, cc2->val)
 		  && cc2->code != is_not_constant
-		  && cc2->code != predicate::changed
+		  && cc2->code != changed
+		  && expr_eval_ops_equal_p (cc1->param_ops, cc2->param_ops)
+		  && cc2->agg_contents == cc1->agg_contents
+		  && cc2->by_ref == cc1->by_ref
+		  && types_compatible_p (cc2->type, cc1->type)
 		  && cc1->code == invert_tree_comparison (cc2->code,
 							  HONOR_NANS (cc1->val)))
 		return;
@@ -300,6 +329,83 @@ dump_condition (FILE *f, conditions conditions, int cond)
       if (c->agg_contents)
 	fprintf (f, "[%soffset: " HOST_WIDE_INT_PRINT_DEC "]",
 		 c->by_ref ? "ref " : "", c->offset);
+
+      for (unsigned i = 0; i < vec_safe_length (c->param_ops); i++)
+	{
+	  expr_eval_op &op = (*(c->param_ops))[i];
+	  const char *op_name = op_symbol_code (op.code);
+
+	  if (op_name == op_symbol_code (ERROR_MARK))
+	    op_name = get_tree_code_name (op.code);
+
+	  fprintf (f, ",(");
+
+	  if (!op.val[0])
+	    {
+	      switch (op.code)
+		{
+		case FLOAT_EXPR:
+		case FIX_TRUNC_EXPR:
+		case FIXED_CONVERT_EXPR:
+		case VIEW_CONVERT_EXPR:
+		CASE_CONVERT:
+		  if (op.code == VIEW_CONVERT_EXPR)
+		    fprintf (f, "VCE");
+		  fprintf (f, "(");
+		  print_generic_expr (f, op.type);
+		  fprintf (f, ")" );
+		  break;
+
+		default:
+		  fprintf (f, "%s", op_name);
+		}
+	      fprintf (f, " #");
+	    }
+	  else if (!op.val[1])
+	    {
+	      if (op.index)
+		{
+		  print_generic_expr (f, op.val[0]);
+		  fprintf (f, " %s #", op_name);
+		}
+	      else
+		{
+		  fprintf (f, "# %s ", op_name);
+		  print_generic_expr (f, op.val[0]);
+		}
+	    }
+	  else
+	    {
+	      fprintf (f, "%s ", op_name);
+	      switch (op.index)
+		{
+		case 0:
+		  fprintf (f, "#, ");
+		  print_generic_expr (f, op.val[0]);
+		  fprintf (f, ", ");
+		  print_generic_expr (f, op.val[1]);
+		  break;
+
+		case 1:
+		  print_generic_expr (f, op.val[0]);
+		  fprintf (f, ", #, ");
+		  print_generic_expr (f, op.val[1]);
+		  break;
+
+		case 2:
+		  print_generic_expr (f, op.val[0]);
+		  fprintf (f, ", ");
+		  print_generic_expr (f, op.val[1]);
+		  fprintf (f, ", #");
+		  break;
+
+		default:
+		  fprintf (f, "*, *, *");
+		}
+	    }
+	  fprintf (f, ")");
+	}
+
       if (c->code == predicate::is_not_constant)
 	{
 	  fprintf (f, " not constant");
@@ -462,8 +568,8 @@ predicate::remap_after_inlining (class ipa_fn_summary *info,
 		    ap.by_ref = c->by_ref;
 		    cond_predicate = add_condition (info,
 						    operand_map[c->operand_num],
-						    c->size, &ap, c->code,
-						    c->val);
+						    c->type, &ap, c->code,
+						    c->val, c->param_ops);
 		  }
 	      }
 	    /* Fixed conditions remains same, construct single
@@ -516,21 +622,23 @@ predicate::stream_out (struct output_block *ob)
 }
 
 
-/* Add condition to condition list SUMMARY. OPERAND_NUM, SIZE, CODE and VAL
-   correspond to fields of condition structure.  AGGPOS describes whether the
-   used operand is loaded from an aggregate and where in the aggregate it is.
-   It can be NULL, which means this not a load from an aggregate.  */
+/* Add condition to condition list SUMMARY.  OPERAND_NUM, TYPE, CODE, VAL and
+   PARAM_OPS correspond to fields of condition structure.  AGGPOS describes
+   whether the used operand is loaded from an aggregate and where in the
+   aggregate it is.  It can be NULL, which means this not a load from an
+   aggregate.  */
 
 predicate
 add_condition (class ipa_fn_summary *summary, int operand_num,
-	       poly_int64 size, struct agg_position_info *aggpos,
-	       enum tree_code code, tree val)
+	       tree type, struct agg_position_info *aggpos,
+	       enum tree_code code, tree val, expr_eval_ops param_ops)
 {
-  int i;
+  int i, j;
   struct condition *c;
   struct condition new_cond;
   HOST_WIDE_INT offset;
   bool agg_contents, by_ref;
+  expr_eval_op *op;
 
   if (aggpos)
     {
@@ -549,10 +657,11 @@ add_condition (class ipa_fn_summary *summary, int operand_num,
   for (i = 0; vec_safe_iterate (summary->conds, i, &c); i++)
     {
       if (c->operand_num == operand_num
-	  && known_eq (c->size, size)
 	  && c->code == code
-	  && c->val == val
+	  && types_compatible_p (c->type, type)
+	  && vrp_operand_equal_p (c->val, val)
 	  && c->agg_contents == agg_contents
+	  && expr_eval_ops_equal_p (c->param_ops, param_ops)
 	  && (!agg_contents || (c->offset == offset && c->by_ref == by_ref)))
 	return predicate::predicate_testing_cond (i);
     }
@@ -562,11 +671,21 @@ add_condition (class ipa_fn_summary *summary, int operand_num,
 
   new_cond.operand_num = operand_num;
   new_cond.code = code;
-  new_cond.val = val;
+  new_cond.type = unshare_expr_without_location (type);
+  new_cond.val = val ? unshare_expr_without_location (val) : val;
   new_cond.agg_contents = agg_contents;
   new_cond.by_ref = by_ref;
   new_cond.offset = offset;
-  new_cond.size = size;
+  new_cond.param_ops = vec_safe_copy (param_ops);
+
+  for (j = 0; vec_safe_iterate (new_cond.param_ops, j, &op); j++)
+    {
+      if (op->val[0])
+	op->val[0] = unshare_expr_without_location (op->val[0]);
+      if (op->val[1])
+	op->val[1] = unshare_expr_without_location (op->val[1]);
+    }
+
   vec_safe_push (summary->conds, new_cond);
 
   return predicate::predicate_testing_cond (i);
diff --git a/gcc/ipa-predicate.h b/gcc/ipa-predicate.h
index 237306d..4121218 100644
--- a/gcc/ipa-predicate.h
+++ b/gcc/ipa-predicate.h
@@ -22,16 +22,36 @@ along with GCC; see the file COPYING3.  If not see
    inlined into (i.e. known constant values of function parameters.
 
    Conditions that are interesting for function body are collected into CONDS
-   vector.  They are of simple for  function_param OP VAL, where VAL is
-   IPA invariant.  The conditions are then referred by predicates.  */
+   vector.  They are of simple as kind of a mathematical transformation on
+   function parameter, T(function_param), in which the parameter occurs only
+   once, and other operands are IPA invariant.  The conditions are then
+   referred by predicates.  */
+
+
+/* A simplified representation of tree node, for unary, binary and ternary
+   operation.  Computations on parameter are decomposed to a series of this
+   kind of structure.  */
+struct GTY(()) expr_eval_op
+{
+  /* Result type of expression.  */
+  tree type;
+  /* Constant operands in expression, there are at most two.  */
+  tree val[2];
+  /* Index of parameter operand in expression.  */
+  unsigned index : 2;
+  /* Operation code of expression.  */
+  ENUM_BITFIELD(tree_code) code : 16;
+};
+
+typedef vec<expr_eval_op, va_gc> *expr_eval_ops;
 
 struct GTY(()) condition
 {
   /* If agg_contents is set, this is the offset from which the used data was
      loaded.  */
   HOST_WIDE_INT offset;
-  /* Size of the access reading the data (or the PARM_DECL SSA_NAME).  */
-  poly_int64 size;
+  /* Type of the access reading the data (or the PARM_DECL SSA_NAME).  */
+  tree type;
   tree val;
   int operand_num;
   ENUM_BITFIELD(tree_code) code : 16;
@@ -41,6 +61,9 @@ struct GTY(()) condition
   /* If agg_contents is set, this differentiates between loads from data
      passed by reference and by value.  */
   unsigned by_ref : 1;
+  /* A set of sequential operations on the parameter, which can be seen as
+     a mathmatical function on the parameter.  */
+  expr_eval_ops param_ops;
 };
 
 /* Information kept about parameter of call site.  */
@@ -228,5 +251,6 @@ private:
 
 void dump_condition (FILE *f, conditions conditions, int cond);
 predicate add_condition (class ipa_fn_summary *summary, int operand_num,
-			 poly_int64 size, struct agg_position_info *aggpos,
-			 enum tree_code code, tree val);
+			 tree type, struct agg_position_info *aggpos,
+			 enum tree_code code, tree val,
+			 expr_eval_ops param_ops = NULL);
diff --git a/gcc/params.def b/gcc/params.def
index e4b70ba..322c37f 100644
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -1165,6 +1165,12 @@ DEFPARAM (PARAM_IPA_MAX_SWITCH_PREDICATE_BOUNDS,
 	  "statement used during IPA functoin summary generation.",
 	  5, 0, 0)
 
+DEFPARAM (PARAM_IPA_MAX_PARAM_EXPR_OPS,
+	  "ipa-max-param-expr-ops",
+	  "Maximum number of operations in a parameter expression that can "
+	  "be handled by IPA analysis.",
+	  10, 0, 0)
+
 /* WHOPR partitioning configuration.  */
 
 DEFPARAM (PARAM_LTO_PARTITIONS,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6dc4f00..b2b92de 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-16  Feng Xue  <fxue@os.amperecomputing.com>
+
+	PR ipa/91088
+	* gcc.dg/ipa/pr91088.c: New test.
+	* gcc.dg/ipa/pr91089.c: Add sub-test for range analysis.
+	* g++.dg/tree-ssa/ivopts-3.C: Force a function to be noinline.
+
 2019-10-15  Andrew Pinski  <apinski@marvell.com>
 
 	* gcc.c-torture/compile/20191015-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C b/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C
index 6760a5b..b0da5e6 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/ivopts-3.C
@@ -25,7 +25,7 @@ protected:
   double stuff;
 
 public:
-  explicit MinimalVector ( int length ) {
+  __attribute__((noinline)) explicit MinimalVector ( int length ) {
     _pData = new double[length];
     for (int i = 0; i < length; ++i) _pData[i] = 0.;
   }
diff --git a/gcc/testsuite/gcc.dg/ipa/pr91088.c b/gcc/testsuite/gcc.dg/ipa/pr91088.c
new file mode 100644
index 0000000..a81c59f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr91088.c
@@ -0,0 +1,120 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-ipa-cp-details -fno-inline" } */
+
+int foo();
+
+#define large_code \
+do { \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+  foo (); \
+} while (1)
+
+
+struct A
+{
+  char  f1;
+  short f2 : 5;
+  int   f3;
+};
+
+int callee1 (struct A a)
+{
+  if ((a.f2 + 7) & 17)
+    foo ();
+
+  if ((1300 / (short)a.f3) == 19)
+    large_code;
+
+  return 1;
+}
+
+int callee2 (short *p)
+{
+  if ((*p ^ 1)  <  8)
+    large_code;      
+
+  return 2;
+}
+
+int callee3 (int v)
+{
+  if ((27 % ((1 - (char) v) * 3)) < 6)
+    {
+      large_code;
+      return v + 2;
+    }
+  else
+    return v + 1;
+}
+
+int caller ()
+{
+  struct A a;
+  short b;
+
+  a.f2 = -7;
+  a.f3 = 68;
+  if (callee1 (a))
+    foo ();
+
+  a.f2 = 3;
+  a.f3 = 10;
+  if (callee1 (a))
+    foo ();
+
+  b = 9;
+  if (callee2 (&b))
+    foo ();
+
+  b = 2;
+  if (callee2 (&b))
+    foo ();
+
+  return callee3 (-5) +
+	 callee3 (0); 
+}
+
+/* { dg-final { scan-ipa-dump-times "Creating a specialized node of callee1" 1 "cp" } } */
+/* { dg-final { scan-ipa-dump-times "Creating a specialized node of callee2" 1 "cp" } } */
+/* { dg-final { scan-ipa-dump-times "Creating a specialized node of callee3" 1 "cp" } } */
+/* { dg-final { scan-ipa-dump "op0\\\[offset: 32],\\(\\(short int\\) #\\),\\(\\(int\\) #\\),\\(1300 / #\\) == 19" "cp" } } */
+/* { dg-final { scan-ipa-dump "op0\\\[ref offset: 0],\\(# \\^ 1\\) <" "cp" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(\\(char\\) #\\),\\(\\(int\\) #\\),\\(1 - #\\),\\(# \\* 3\\),\\(27 % #\\) <" "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pr91089.c b/gcc/testsuite/gcc.dg/ipa/pr91089.c
index 7509c62..a54cbdf 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr91089.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr91089.c
@@ -7,7 +7,7 @@ int data;
 
 int callee (int i)
 {
-  switch (i)
+  switch (i % 128)
     {
       case -126:  return i + 13;
       case -127:  return i + 5;
@@ -45,7 +45,7 @@ int fn2 ();
 
 int callee_complex_predicate (int i)
 {
-  switch (i )
+  switch (i)
     {
       case 0:
 	fn ();
@@ -100,10 +100,10 @@ int caller ()
 }
  
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of callee" 7 "cp" } } */
-/* { dg-final { scan-ipa-dump "op0 < -127" "fnsummary" } } */
-/* { dg-final { scan-ipa-dump "op0 > -126" "fnsummary" } } */
-/* { dg-final { scan-ipa-dump "op0 != -8"  "fnsummary" } } */
-/* { dg-final { scan-ipa-dump "op0 != 0"   "fnsummary" } } */
-/* { dg-final { scan-ipa-dump "op0 < 5"    "fnsummary" } } */
-/* { dg-final { scan-ipa-dump "op0 > 7"    "fnsummary" } } */
+/* { dg-final { scan-ipa-dump-not "op0,\\(# % 128\\) < -127" "fnsummary" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(# % 128\\) > -126" "fnsummary" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(# % 128\\) != -8"  "fnsummary" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(# % 128\\) != 0"   "fnsummary" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(# % 128\\) < 5"    "fnsummary" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(# % 128\\) > 7"    "fnsummary" } } */
 /* { dg-final { scan-ipa-dump "loop depth: 1 .+ time:\[ \]*\[0-9\]+ predicate: \\(op0 == 1000\\)\[\r\n]+" "fnsummary" } } */
-- 
cgit v1.1


From 96eb7d7a642085f651e9940f0ee75568d7c4441d Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 16 Oct 2019 09:50:44 +0000
Subject: Deal with incoming POLY_INT_CST ranges (PR92033)

This patch makes value_range_base::set convert POLY_INT_CST bounds
into the worst-case INTEGER_CST bounds.  The main case in which this
gives useful ranges is a lower bound of A + B * X becoming A when B >= 0.
E.g.:

  [32 + 16X, 100] -> [32, 100]
  [32 + 16X, 32 + 16X] -> [32, MAX]

But the same thing can be useful for the upper bound with negative
X coefficients.

2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	PR middle-end/92033
	* poly-int.h (constant_lower_bound_with_limit): New function.
	(constant_upper_bound_with_limit): Likewise.
	* doc/poly-int.texi: Document them.
	* tree-vrp.c (value_range_base::set): Convert POLY_INT_CST bounds
	into the worst-case INTEGER_CST bounds.

From-SVN: r277056
---
 gcc/ChangeLog         |  9 +++++++++
 gcc/doc/poly-int.texi | 12 ++++++++++++
 gcc/poly-int.h        | 23 +++++++++++++++++++++++
 gcc/tree-vrp.c        | 18 ++++++++++++++++++
 4 files changed, 62 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2862958..072eb8c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR middle-end/92033
+	* poly-int.h (constant_lower_bound_with_limit): New function.
+	(constant_upper_bound_with_limit): Likewise.
+	* doc/poly-int.texi: Document them.
+	* tree-vrp.c (value_range_base::set): Convert POLY_INT_CST bounds
+	into the worst-case INTEGER_CST bounds.
+
 2019-10-16  Feng Xue  <fxue@os.amperecomputing.com>
 
 	PR ipa/91088
diff --git a/gcc/doc/poly-int.texi b/gcc/doc/poly-int.texi
index 1023e82..d60bb02 100644
--- a/gcc/doc/poly-int.texi
+++ b/gcc/doc/poly-int.texi
@@ -803,6 +803,18 @@ the assertion is known to hold.
 @item constant_lower_bound (@var{a})
 Assert that @var{a} is nonnegative and return the smallest value it can have.
 
+@item constant_lower_bound_with_limit (@var{a}, @var{b})
+Return the least value @var{a} can have, given that the context in
+which @var{a} appears guarantees that the answer is no less than @var{b}.
+In other words, the caller is asserting that @var{a} is greater than or
+equal to @var{b} even if @samp{known_ge (@var{a}, @var{b})} doesn't hold.
+
+@item constant_upper_bound_with_limit (@var{a}, @var{b})
+Return the greatest value @var{a} can have, given that the context in
+which @var{a} appears guarantees that the answer is no greater than @var{b}.
+In other words, the caller is asserting that @var{a} is less than or equal
+to @var{b} even if @samp{known_le (@var{a}, @var{b})} doesn't hold.
+
 @item lower_bound (@var{a}, @var{b})
 Return a value that is always less than or equal to both @var{a} and @var{b}.
 It will be the greatest such value for some indeterminate values
diff --git a/gcc/poly-int.h b/gcc/poly-int.h
index 0ccdf68..67759ad 100644
--- a/gcc/poly-int.h
+++ b/gcc/poly-int.h
@@ -1528,6 +1528,29 @@ constant_lower_bound (const poly_int_pod<N, Ca> &a)
   return a.coeffs[0];
 }
 
+/* Return the constant lower bound of A, given that it is no less than B.  */
+
+template<unsigned int N, typename Ca, typename Cb>
+inline POLY_CONST_COEFF (Ca, Cb)
+constant_lower_bound_with_limit (const poly_int_pod<N, Ca> &a, const Cb &b)
+{
+  if (known_ge (a, b))
+    return a.coeffs[0];
+  return b;
+}
+
+/* Return the constant upper bound of A, given that it is no greater
+   than B.  */
+
+template<unsigned int N, typename Ca, typename Cb>
+inline POLY_CONST_COEFF (Ca, Cb)
+constant_upper_bound_with_limit (const poly_int_pod<N, Ca> &a, const Cb &b)
+{
+  if (known_le (a, b))
+    return a.coeffs[0];
+  return b;
+}
+
 /* Return a value that is known to be no greater than A and B.  This
    will be the greatest lower bound for some indeterminate values but
    not necessarily for all.  */
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index cffa050..21910b3 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -727,6 +727,24 @@ value_range_base::set (enum value_range_kind kind, tree min, tree max)
       return;
     }
 
+  /* Convert POLY_INT_CST bounds into worst-case INTEGER_CST bounds.  */
+  if (POLY_INT_CST_P (min))
+    {
+      tree type_min = vrp_val_min (TREE_TYPE (min), true);
+      widest_int lb
+	= constant_lower_bound_with_limit (wi::to_poly_widest (min),
+					   wi::to_widest (type_min));
+      min = wide_int_to_tree (TREE_TYPE (min), lb);
+    }
+  if (POLY_INT_CST_P (max))
+    {
+      tree type_max = vrp_val_max (TREE_TYPE (max), true);
+      widest_int ub
+	= constant_upper_bound_with_limit (wi::to_poly_widest (max),
+					   wi::to_widest (type_max));
+      max = wide_int_to_tree (TREE_TYPE (max), ub);
+    }
+
   /* Nothing to canonicalize for symbolic ranges.  */
   if (TREE_CODE (min) != INTEGER_CST
       || TREE_CODE (max) != INTEGER_CST)
-- 
cgit v1.1


From bf78ed91a445d188e4368adc30dd5c32d973ed6e Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 16 Oct 2019 10:05:21 +0000
Subject: re PR tree-optimization/92119 (ICE: SIGSEGV in contains_struct_check
 (tree.h:3380) with -Os -fno-tree-dce -fno-tree-dse -ftree-slp-vectorize)

2019-10-16  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92119
	* tree-vect-patterns.c (vect_recog_rotate_pattern): Guard
	against missing bswap lhs.

From-SVN: r277057
---
 gcc/ChangeLog            | 6 ++++++
 gcc/tree-vect-patterns.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 072eb8c..37f42cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92119
+	* tree-vect-patterns.c (vect_recog_rotate_pattern): Guard
+	against missing bswap lhs.
+
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
 	PR middle-end/92033
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index f9c7408..385482f 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -2199,7 +2199,8 @@ vect_recog_rotate_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       lhs = gimple_call_lhs (last_stmt);
       oprnd0 = gimple_call_arg (last_stmt, 0);
       type = TREE_TYPE (oprnd0);
-      if (TYPE_PRECISION (TREE_TYPE (lhs)) != 16
+      if (!lhs
+	  || TYPE_PRECISION (TREE_TYPE (lhs)) != 16
 	  || TYPE_PRECISION (type) <= 16
 	  || TREE_CODE (oprnd0) != SSA_NAME
 	  || BITS_PER_UNIT != 8
-- 
cgit v1.1


From ab43763e519ed8efbbfdac801d008c338fbcb187 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 16 Oct 2019 10:44:31 +0000
Subject: [AArch64] Use frame reference in aarch64_layout_frame

Using the full path "cfun->machine->frame" in aarch64_layout_frame
led to awkward formatting in some follow-on patches, so it seemed
worth using a local reference instead.

2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/aarch64.c (aarch64_layout_frame): Use a local
	"frame" reference instead of always referring directly to
	"cfun->machine->frame".

From-SVN: r277059
---
 gcc/ChangeLog                |   6 +++
 gcc/config/aarch64/aarch64.c | 112 ++++++++++++++++++++-----------------------
 2 files changed, 58 insertions(+), 60 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37f42cf..dbdf07c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* config/aarch64/aarch64.c (aarch64_layout_frame): Use a local
+	"frame" reference instead of always referring directly to
+	"cfun->machine->frame".
+
 2019-10-16  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92119
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 7ee31a6..6d151cb 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -5321,8 +5321,9 @@ aarch64_layout_frame (void)
   HOST_WIDE_INT offset = 0;
   int regno, last_fp_reg = INVALID_REGNUM;
   bool simd_function = (crtl->abi->id () == ARM_PCS_SIMD);
+  aarch64_frame &frame = cfun->machine->frame;
 
-  cfun->machine->frame.emit_frame_chain = aarch64_needs_frame_chain ();
+  frame.emit_frame_chain = aarch64_needs_frame_chain ();
 
   /* Adjust the outgoing arguments size if required.  Keep it in sync with what
      the mid-end is doing.  */
@@ -5331,21 +5332,20 @@ aarch64_layout_frame (void)
 #define SLOT_NOT_REQUIRED (-2)
 #define SLOT_REQUIRED     (-1)
 
-  cfun->machine->frame.wb_candidate1 = INVALID_REGNUM;
-  cfun->machine->frame.wb_candidate2 = INVALID_REGNUM;
+  frame.wb_candidate1 = INVALID_REGNUM;
+  frame.wb_candidate2 = INVALID_REGNUM;
 
   /* First mark all the registers that really need to be saved...  */
   for (regno = R0_REGNUM; regno <= R30_REGNUM; regno++)
-    cfun->machine->frame.reg_offset[regno] = SLOT_NOT_REQUIRED;
+    frame.reg_offset[regno] = SLOT_NOT_REQUIRED;
 
   for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++)
-    cfun->machine->frame.reg_offset[regno] = SLOT_NOT_REQUIRED;
+    frame.reg_offset[regno] = SLOT_NOT_REQUIRED;
 
   /* ... that includes the eh data registers (if needed)...  */
   if (crtl->calls_eh_return)
     for (regno = 0; EH_RETURN_DATA_REGNO (regno) != INVALID_REGNUM; regno++)
-      cfun->machine->frame.reg_offset[EH_RETURN_DATA_REGNO (regno)]
-	= SLOT_REQUIRED;
+      frame.reg_offset[EH_RETURN_DATA_REGNO (regno)] = SLOT_REQUIRED;
 
   /* ... and any callee saved register that dataflow says is live.  */
   for (regno = R0_REGNUM; regno <= R30_REGNUM; regno++)
@@ -5353,41 +5353,40 @@ aarch64_layout_frame (void)
 	&& !fixed_regs[regno]
 	&& (regno == R30_REGNUM
 	    || !crtl->abi->clobbers_full_reg_p (regno)))
-      cfun->machine->frame.reg_offset[regno] = SLOT_REQUIRED;
+      frame.reg_offset[regno] = SLOT_REQUIRED;
 
   for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++)
     if (df_regs_ever_live_p (regno)
 	&& !fixed_regs[regno]
 	&& !crtl->abi->clobbers_full_reg_p (regno))
       {
-	cfun->machine->frame.reg_offset[regno] = SLOT_REQUIRED;
+	frame.reg_offset[regno] = SLOT_REQUIRED;
 	last_fp_reg = regno;
       }
 
-  if (cfun->machine->frame.emit_frame_chain)
+  if (frame.emit_frame_chain)
     {
       /* FP and LR are placed in the linkage record.  */
-      cfun->machine->frame.reg_offset[R29_REGNUM] = 0;
-      cfun->machine->frame.wb_candidate1 = R29_REGNUM;
-      cfun->machine->frame.reg_offset[R30_REGNUM] = UNITS_PER_WORD;
-      cfun->machine->frame.wb_candidate2 = R30_REGNUM;
+      frame.reg_offset[R29_REGNUM] = 0;
+      frame.wb_candidate1 = R29_REGNUM;
+      frame.reg_offset[R30_REGNUM] = UNITS_PER_WORD;
+      frame.wb_candidate2 = R30_REGNUM;
       offset = 2 * UNITS_PER_WORD;
     }
 
   /* With stack-clash, LR must be saved in non-leaf functions.  */
   gcc_assert (crtl->is_leaf
-	      || (cfun->machine->frame.reg_offset[R30_REGNUM]
-		  != SLOT_NOT_REQUIRED));
+	      || frame.reg_offset[R30_REGNUM] != SLOT_NOT_REQUIRED);
 
   /* Now assign stack slots for them.  */
   for (regno = R0_REGNUM; regno <= R30_REGNUM; regno++)
-    if (cfun->machine->frame.reg_offset[regno] == SLOT_REQUIRED)
+    if (frame.reg_offset[regno] == SLOT_REQUIRED)
       {
-	cfun->machine->frame.reg_offset[regno] = offset;
-	if (cfun->machine->frame.wb_candidate1 == INVALID_REGNUM)
-	  cfun->machine->frame.wb_candidate1 = regno;
-	else if (cfun->machine->frame.wb_candidate2 == INVALID_REGNUM)
-	  cfun->machine->frame.wb_candidate2 = regno;
+	frame.reg_offset[regno] = offset;
+	if (frame.wb_candidate1 == INVALID_REGNUM)
+	  frame.wb_candidate1 = regno;
+	else if (frame.wb_candidate2 == INVALID_REGNUM)
+	  frame.wb_candidate2 = regno;
 	offset += UNITS_PER_WORD;
       }
 
@@ -5396,7 +5395,7 @@ aarch64_layout_frame (void)
   bool has_align_gap = offset != max_int_offset;
 
   for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++)
-    if (cfun->machine->frame.reg_offset[regno] == SLOT_REQUIRED)
+    if (frame.reg_offset[regno] == SLOT_REQUIRED)
       {
 	/* If there is an alignment gap between integer and fp callee-saves,
 	   allocate the last fp register to it if possible.  */
@@ -5405,27 +5404,27 @@ aarch64_layout_frame (void)
 	    && !simd_function
 	    && (offset & 8) == 0)
 	  {
-	    cfun->machine->frame.reg_offset[regno] = max_int_offset;
+	    frame.reg_offset[regno] = max_int_offset;
 	    break;
 	  }
 
-	cfun->machine->frame.reg_offset[regno] = offset;
-	if (cfun->machine->frame.wb_candidate1 == INVALID_REGNUM)
-	  cfun->machine->frame.wb_candidate1 = regno;
-	else if (cfun->machine->frame.wb_candidate2 == INVALID_REGNUM
-		 && cfun->machine->frame.wb_candidate1 >= V0_REGNUM)
-	  cfun->machine->frame.wb_candidate2 = regno;
+	frame.reg_offset[regno] = offset;
+	if (frame.wb_candidate1 == INVALID_REGNUM)
+	  frame.wb_candidate1 = regno;
+	else if (frame.wb_candidate2 == INVALID_REGNUM
+		 && frame.wb_candidate1 >= V0_REGNUM)
+	  frame.wb_candidate2 = regno;
 	offset += simd_function ? UNITS_PER_VREG : UNITS_PER_WORD;
       }
 
   offset = ROUND_UP (offset, STACK_BOUNDARY / BITS_PER_UNIT);
 
-  cfun->machine->frame.saved_regs_size = offset;
+  frame.saved_regs_size = offset;
 
   HOST_WIDE_INT varargs_and_saved_regs_size
-    = offset + cfun->machine->frame.saved_varargs_size;
+    = offset + frame.saved_varargs_size;
 
-  cfun->machine->frame.hard_fp_offset
+  frame.hard_fp_offset
     = aligned_upper_bound (varargs_and_saved_regs_size
 			   + get_frame_size (),
 			   STACK_BOUNDARY / BITS_PER_UNIT);
@@ -5433,57 +5432,51 @@ aarch64_layout_frame (void)
   /* Both these values are already aligned.  */
   gcc_assert (multiple_p (crtl->outgoing_args_size,
 			  STACK_BOUNDARY / BITS_PER_UNIT));
-  cfun->machine->frame.frame_size
-    = (cfun->machine->frame.hard_fp_offset
-       + crtl->outgoing_args_size);
+  frame.frame_size = frame.hard_fp_offset + crtl->outgoing_args_size;
 
-  cfun->machine->frame.locals_offset = cfun->machine->frame.saved_varargs_size;
+  frame.locals_offset = frame.saved_varargs_size;
 
-  cfun->machine->frame.initial_adjust = 0;
-  cfun->machine->frame.final_adjust = 0;
-  cfun->machine->frame.callee_adjust = 0;
-  cfun->machine->frame.callee_offset = 0;
+  frame.initial_adjust = 0;
+  frame.final_adjust = 0;
+  frame.callee_adjust = 0;
+  frame.callee_offset = 0;
 
   HOST_WIDE_INT max_push_offset = 0;
-  if (cfun->machine->frame.wb_candidate2 != INVALID_REGNUM)
+  if (frame.wb_candidate2 != INVALID_REGNUM)
     max_push_offset = 512;
-  else if (cfun->machine->frame.wb_candidate1 != INVALID_REGNUM)
+  else if (frame.wb_candidate1 != INVALID_REGNUM)
     max_push_offset = 256;
 
   HOST_WIDE_INT const_size, const_fp_offset;
-  if (cfun->machine->frame.frame_size.is_constant (&const_size)
+  if (frame.frame_size.is_constant (&const_size)
       && const_size < max_push_offset
       && known_eq (crtl->outgoing_args_size, 0))
     {
       /* Simple, small frame with no outgoing arguments:
 	 stp reg1, reg2, [sp, -frame_size]!
 	 stp reg3, reg4, [sp, 16]  */
-      cfun->machine->frame.callee_adjust = const_size;
+      frame.callee_adjust = const_size;
     }
-  else if (known_lt (crtl->outgoing_args_size
-		     + cfun->machine->frame.saved_regs_size, 512)
+  else if (known_lt (crtl->outgoing_args_size + frame.saved_regs_size, 512)
 	   && !(cfun->calls_alloca
-		&& known_lt (cfun->machine->frame.hard_fp_offset,
-			     max_push_offset)))
+		&& known_lt (frame.hard_fp_offset, max_push_offset)))
     {
       /* Frame with small outgoing arguments:
 	 sub sp, sp, frame_size
 	 stp reg1, reg2, [sp, outgoing_args_size]
 	 stp reg3, reg4, [sp, outgoing_args_size + 16]  */
-      cfun->machine->frame.initial_adjust = cfun->machine->frame.frame_size;
-      cfun->machine->frame.callee_offset
-	= cfun->machine->frame.frame_size - cfun->machine->frame.hard_fp_offset;
+      frame.initial_adjust = frame.frame_size;
+      frame.callee_offset = frame.frame_size - frame.hard_fp_offset;
     }
-  else if (cfun->machine->frame.hard_fp_offset.is_constant (&const_fp_offset)
+  else if (frame.hard_fp_offset.is_constant (&const_fp_offset)
 	   && const_fp_offset < max_push_offset)
     {
       /* Frame with large outgoing arguments but a small local area:
 	 stp reg1, reg2, [sp, -hard_fp_offset]!
 	 stp reg3, reg4, [sp, 16]
 	 sub sp, sp, outgoing_args_size  */
-      cfun->machine->frame.callee_adjust = const_fp_offset;
-      cfun->machine->frame.final_adjust
-	= cfun->machine->frame.frame_size - cfun->machine->frame.callee_adjust;
+      frame.callee_adjust = const_fp_offset;
+      frame.final_adjust = frame.frame_size - frame.callee_adjust;
     }
   else
     {
@@ -5493,12 +5486,11 @@ aarch64_layout_frame (void)
 	 add x29, sp, 0
 	 stp reg3, reg4, [sp, 16]
 	 sub sp, sp, outgoing_args_size  */
-      cfun->machine->frame.initial_adjust = cfun->machine->frame.hard_fp_offset;
-      cfun->machine->frame.final_adjust
-	= cfun->machine->frame.frame_size - cfun->machine->frame.initial_adjust;
+      frame.initial_adjust = frame.hard_fp_offset;
+      frame.final_adjust = frame.frame_size - frame.initial_adjust;
     }
 
-  cfun->machine->frame.laid_out = true;
+  frame.laid_out = true;
 }
 
 /* Return true if the register REGNO is saved on entry to
-- 
cgit v1.1


From 8e66b377a93e3fc371d0836768740d68ef8fffc5 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 16 Oct 2019 10:48:00 +0000
Subject: [AArch64] Add an assert to aarch64_layout_frame

This patch adds an assert that all the individual *_adjust allocations
add up to the full frame size.  With that safety net, it seemed slightly
clearer to use crtl->outgoing_args_size as the final adjustment where
appropriate, to match what's used in the comments.

This is a bit overkill on its own, but I need to add more cases for SVE.

2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/aarch64.c (aarch64_layout_frame): Assert
	that all the adjustments add up to the full frame size.
	Use crtl->outgoing_args_size directly as the final adjustment
	where appropriate.

From-SVN: r277060
---
 gcc/ChangeLog                | 7 +++++++
 gcc/config/aarch64/aarch64.c | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbdf07c..4733dc4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* config/aarch64/aarch64.c (aarch64_layout_frame): Assert
+	that all the adjustments add up to the full frame size.
+	Use crtl->outgoing_args_size directly as the final adjustment
+	where appropriate.
+
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* config/aarch64/aarch64.c (aarch64_layout_frame): Use a local
 	"frame" reference instead of always referring directly to
 	"cfun->machine->frame".
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 6d151cb..03a9f3f 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -5476,7 +5476,7 @@ aarch64_layout_frame (void)
 	 stp reg3, reg4, [sp, 16]
 	 sub sp, sp, outgoing_args_size  */
       frame.callee_adjust = const_fp_offset;
-      frame.final_adjust = frame.frame_size - frame.callee_adjust;
+      frame.final_adjust = crtl->outgoing_args_size;
     }
   else
     {
@@ -5487,9 +5487,14 @@ aarch64_layout_frame (void)
 	 stp reg3, reg4, [sp, 16]
 	 sub sp, sp, outgoing_args_size  */
       frame.initial_adjust = frame.hard_fp_offset;
-      frame.final_adjust = frame.frame_size - frame.initial_adjust;
+      frame.final_adjust = crtl->outgoing_args_size;
     }
 
+  /* Make sure the individual adjustments add up to the full frame size.  */
+  gcc_assert (known_eq (frame.initial_adjust
+			+ frame.callee_adjust
+			+ frame.final_adjust, frame.frame_size));
+
   frame.laid_out = true;
 }
 
-- 
cgit v1.1


From 9b17a646d90ad0cc30daf8432aa60ad0d751d914 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 16 Oct 2019 10:50:53 +0000
Subject: [AArch64] Improve poly_int handling in aarch64_layout_frame

I'd used known_lt when converting these conditions to poly_int,
but on reflection that was a bad choice.  The code isn't just
doing a range check; it specifically needs constants that will
fit in a certain encoding.

2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/aarch64.c (aarch64_layout_frame): Use is_constant
	rather than known_lt when choosing frame layouts.

From-SVN: r277061
---
 gcc/ChangeLog                |  5 +++++
 gcc/config/aarch64/aarch64.c | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4733dc4..c54f216 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* config/aarch64/aarch64.c (aarch64_layout_frame): Use is_constant
+	rather than known_lt when choosing frame layouts.
+
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* config/aarch64/aarch64.c (aarch64_layout_frame): Assert
 	that all the adjustments add up to the full frame size.
 	Use crtl->outgoing_args_size directly as the final adjustment
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 03a9f3f..0537e7f 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -5447,7 +5447,7 @@ aarch64_layout_frame (void)
   else if (frame.wb_candidate1 != INVALID_REGNUM)
     max_push_offset = 256;
 
-  HOST_WIDE_INT const_size, const_fp_offset;
+  HOST_WIDE_INT const_size, const_outgoing_args_size, const_fp_offset;
   if (frame.frame_size.is_constant (&const_size)
       && const_size < max_push_offset
       && known_eq (crtl->outgoing_args_size, 0))
@@ -5457,16 +5457,18 @@ aarch64_layout_frame (void)
 	 stp reg3, reg4, [sp, 16]  */
       frame.callee_adjust = const_size;
     }
-  else if (known_lt (crtl->outgoing_args_size + frame.saved_regs_size, 512)
+  else if (crtl->outgoing_args_size.is_constant (&const_outgoing_args_size)
+	   && const_outgoing_args_size + frame.saved_regs_size < 512
 	   && !(cfun->calls_alloca
-		&& known_lt (frame.hard_fp_offset, max_push_offset)))
+		&& frame.hard_fp_offset.is_constant (&const_fp_offset)
+		&& const_fp_offset < max_push_offset))
     {
       /* Frame with small outgoing arguments:
 	 sub sp, sp, frame_size
 	 stp reg1, reg2, [sp, outgoing_args_size]
 	 stp reg3, reg4, [sp, outgoing_args_size + 16]  */
       frame.initial_adjust = frame.frame_size;
-      frame.callee_offset = frame.frame_size - frame.hard_fp_offset;
+      frame.callee_offset = const_outgoing_args_size;
     }
   else if (frame.hard_fp_offset.is_constant (&const_fp_offset)
 	   && const_fp_offset < max_push_offset)
-- 
cgit v1.1


From 550a338052c374cb1f6c07ffd883c4046565fdd4 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 16 Oct 2019 10:53:40 +0000
Subject: [AArch64] Add partial SVE vector modes

This patch adds extra vector modes that represent a half, quarter or
eighth of what an SVE vector can hold.  This is useful for describing
the memory vector involved in an extending load or truncating store.
It might also be useful in future for representing "unpacked" SVE
registers, i.e. registers that contain values in the low bits of a
wider containing element.

The new modes could have the same width as an Advanced SIMD mode for
certain -msve-vector-bits=N options, so we need to ensure that they
come later in the mode list and that Advanced SIMD modes always "win".

2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* genmodes.c (mode_data::order): New field.
	(blank_mode): Update accordingly.
	(VECTOR_MODES_WITH_PREFIX): Add an order parameter.
	(make_vector_modes): Likewise.
	(VECTOR_MODES): Update use accordingly.
	(cmp_modes): Sort by the new order field ahead of sorting by size.
	* config/aarch64/aarch64-modes.def (VNx2QI, VN2xHI, VNx2SI)
	(VNx4QI, VNx4HI, VNx8QI): New partial vector modes.
	* config/aarch64/aarch64.c (VEC_PARTIAL): New flag value.
	(aarch64_classify_vector_mode): Handle the new partial modes.
	(aarch64_vl_bytes): New function.
	(aarch64_hard_regno_nregs): Use it instead of BYTES_PER_SVE_VECTOR
	when counting the number of registers in an SVE mode.
	(aarch64_class_max_nregs): Likewise.
	(aarch64_hard_regno_mode_ok): Don't allow partial vectors
	in registers yet.
	(aarch64_classify_address): Treat partial vectors analogously
	to full vectors.
	(aarch64_print_address_internal): Consolidate the printing of
	MUL VL addresses, using aarch64_vl_bytes as the number of
	bytes represented by "VL".
	(aarch64_vector_mode_supported_p): Reject partial vector modes.

From-SVN: r277062
---
 gcc/ChangeLog                        | 25 ++++++++++
 gcc/config/aarch64/aarch64-modes.def | 38 ++++++++++++++-
 gcc/config/aarch64/aarch64.c         | 92 ++++++++++++++++++++++++++----------
 gcc/genmodes.c                       | 22 ++++++---
 4 files changed, 144 insertions(+), 33 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c54f216..56ad96d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,30 @@
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* genmodes.c (mode_data::order): New field.
+	(blank_mode): Update accordingly.
+	(VECTOR_MODES_WITH_PREFIX): Add an order parameter.
+	(make_vector_modes): Likewise.
+	(VECTOR_MODES): Update use accordingly.
+	(cmp_modes): Sort by the new order field ahead of sorting by size.
+	* config/aarch64/aarch64-modes.def (VNx2QI, VN2xHI, VNx2SI)
+	(VNx4QI, VNx4HI, VNx8QI): New partial vector modes.
+	* config/aarch64/aarch64.c (VEC_PARTIAL): New flag value.
+	(aarch64_classify_vector_mode): Handle the new partial modes.
+	(aarch64_vl_bytes): New function.
+	(aarch64_hard_regno_nregs): Use it instead of BYTES_PER_SVE_VECTOR
+	when counting the number of registers in an SVE mode.
+	(aarch64_class_max_nregs): Likewise.
+	(aarch64_hard_regno_mode_ok): Don't allow partial vectors
+	in registers yet.
+	(aarch64_classify_address): Treat partial vectors analogously
+	to full vectors.
+	(aarch64_print_address_internal): Consolidate the printing of
+	MUL VL addresses, using aarch64_vl_bytes as the number of
+	bytes represented by "VL".
+	(aarch64_vector_mode_supported_p): Reject partial vector modes.
+
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* config/aarch64/aarch64.c (aarch64_layout_frame): Use is_constant
 	rather than known_lt when choosing frame layouts.
 
diff --git a/gcc/config/aarch64/aarch64-modes.def b/gcc/config/aarch64/aarch64-modes.def
index e034ffc..a9b1bce 100644
--- a/gcc/config/aarch64/aarch64-modes.def
+++ b/gcc/config/aarch64/aarch64-modes.def
@@ -82,8 +82,8 @@ INT_MODE (XI, 64);
    strictly necessary to set the alignment here, since the default would
    be clamped to BIGGEST_ALIGNMENT anyhow, but it seems clearer.  */
 #define SVE_MODES(NVECS, VB, VH, VS, VD) \
-  VECTOR_MODES_WITH_PREFIX (VNx, INT, 16 * NVECS); \
-  VECTOR_MODES_WITH_PREFIX (VNx, FLOAT, 16 * NVECS); \
+  VECTOR_MODES_WITH_PREFIX (VNx, INT, 16 * NVECS, 0); \
+  VECTOR_MODES_WITH_PREFIX (VNx, FLOAT, 16 * NVECS, 0); \
   \
   ADJUST_NUNITS (VB##QI, aarch64_sve_vg * NVECS * 8); \
   ADJUST_NUNITS (VH##HI, aarch64_sve_vg * NVECS * 4); \
@@ -108,6 +108,40 @@ SVE_MODES (2, VNx32, VNx16, VNx8, VNx4)
 SVE_MODES (3, VNx48, VNx24, VNx12, VNx6)
 SVE_MODES (4, VNx64, VNx32, VNx16, VNx8)
 
+/* Partial SVE vectors:
+
+      VNx2QI VNx4QI VNx8QI
+      VNx2HI VNx4HI
+      VNx2SI
+
+   In memory they occupy contiguous locations, in the same way as fixed-length
+   vectors.  E.g. VNx8QImode is half the size of VNx16QImode.
+
+   Passing 1 as the final argument ensures that the modes come after all
+   other modes in the GET_MODE_WIDER chain, so that we never pick them
+   in preference to a full vector mode.  */
+VECTOR_MODES_WITH_PREFIX (VNx, INT, 2, 1);
+VECTOR_MODES_WITH_PREFIX (VNx, INT, 4, 1);
+VECTOR_MODES_WITH_PREFIX (VNx, INT, 8, 1);
+
+ADJUST_NUNITS (VNx2QI, aarch64_sve_vg);
+ADJUST_NUNITS (VNx2HI, aarch64_sve_vg);
+ADJUST_NUNITS (VNx2SI, aarch64_sve_vg);
+
+ADJUST_NUNITS (VNx4QI, aarch64_sve_vg * 2);
+ADJUST_NUNITS (VNx4HI, aarch64_sve_vg * 2);
+
+ADJUST_NUNITS (VNx8QI, aarch64_sve_vg * 4);
+
+ADJUST_ALIGNMENT (VNx2QI, 1);
+ADJUST_ALIGNMENT (VNx4QI, 1);
+ADJUST_ALIGNMENT (VNx8QI, 1);
+
+ADJUST_ALIGNMENT (VNx2HI, 2);
+ADJUST_ALIGNMENT (VNx4HI, 2);
+
+ADJUST_ALIGNMENT (VNx2SI, 4);
+
 /* Quad float: 128-bit floating mode for long doubles.  */
 FLOAT_MODE (TF, 16, ieee_quad_format);
 
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 0537e7f..1f0e74a 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -1538,6 +1538,9 @@ const unsigned int VEC_SVE_PRED = 4;
 /* Can be used in combination with VEC_ADVSIMD or VEC_SVE_DATA to indicate
    a structure of 2, 3 or 4 vectors.  */
 const unsigned int VEC_STRUCT   = 8;
+/* Can be used in combination with VEC_SVE_DATA to indicate that the
+   vector has fewer significant bytes than a full SVE vector.  */
+const unsigned int VEC_PARTIAL  = 16;
 /* Useful combinations of the above.  */
 const unsigned int VEC_ANY_SVE  = VEC_SVE_DATA | VEC_SVE_PRED;
 const unsigned int VEC_ANY_DATA = VEC_ADVSIMD | VEC_SVE_DATA;
@@ -1558,7 +1561,17 @@ aarch64_classify_vector_mode (machine_mode mode)
      of -msve-vector-bits.  */
   switch (mode)
     {
-    /* Single SVE vectors.  */
+    /* Partial SVE QI vectors.  */
+    case E_VNx2QImode:
+    case E_VNx4QImode:
+    case E_VNx8QImode:
+    /* Partial SVE HI vectors.  */
+    case E_VNx2HImode:
+    case E_VNx4HImode:
+    /* Partial SVE SI vector.  */
+    case E_VNx2SImode:
+      return TARGET_SVE ? VEC_SVE_DATA | VEC_PARTIAL : 0;
+
     case E_VNx16QImode:
     case E_VNx8HImode:
     case E_VNx4SImode:
@@ -1641,6 +1654,24 @@ aarch64_sve_data_mode_p (machine_mode mode)
   return aarch64_classify_vector_mode (mode) & VEC_SVE_DATA;
 }
 
+/* Return the number of defined bytes in one constituent vector of
+   SVE mode MODE, which has vector flags VEC_FLAGS.  */
+static poly_int64
+aarch64_vl_bytes (machine_mode mode, unsigned int vec_flags)
+{
+  if (vec_flags & VEC_PARTIAL)
+    /* A single partial vector.  */
+    return GET_MODE_SIZE (mode);
+
+  if (vec_flags & VEC_SVE_DATA)
+    /* A single vector or a tuple.  */
+    return BYTES_PER_SVE_VECTOR;
+
+  /* A single predicate.  */
+  gcc_assert (vec_flags & VEC_SVE_PRED);
+  return BYTES_PER_SVE_PRED;
+}
+
 /* Implement target hook TARGET_ARRAY_MODE.  */
 static opt_machine_mode
 aarch64_array_mode (machine_mode mode, unsigned HOST_WIDE_INT nelems)
@@ -1769,10 +1800,13 @@ aarch64_hard_regno_nregs (unsigned regno, machine_mode mode)
     case FP_REGS:
     case FP_LO_REGS:
     case FP_LO8_REGS:
-      if (aarch64_sve_data_mode_p (mode))
-	return exact_div (GET_MODE_SIZE (mode),
-			  BYTES_PER_SVE_VECTOR).to_constant ();
-      return CEIL (lowest_size, UNITS_PER_VREG);
+      {
+	unsigned int vec_flags = aarch64_classify_vector_mode (mode);
+	if (vec_flags & VEC_SVE_DATA)
+	  return exact_div (GET_MODE_SIZE (mode),
+			    aarch64_vl_bytes (mode, vec_flags)).to_constant ();
+	return CEIL (lowest_size, UNITS_PER_VREG);
+      }
     case PR_REGS:
     case PR_LO_REGS:
     case PR_HI_REGS:
@@ -1796,6 +1830,11 @@ aarch64_hard_regno_mode_ok (unsigned regno, machine_mode mode)
     return mode == DImode;
 
   unsigned int vec_flags = aarch64_classify_vector_mode (mode);
+  /* At the moment, partial vector modes are only useful for memory
+     references, but that could change in future.  */
+  if (vec_flags & VEC_PARTIAL)
+    return false;
+
   if (vec_flags & VEC_SVE_PRED)
     return PR_REGNUM_P (regno);
 
@@ -7441,9 +7480,15 @@ aarch64_classify_address (struct aarch64_address_info *info,
 
   HOST_WIDE_INT const_size;
 
+  /* Whether a vector mode is partial doesn't affect address legitimacy.
+     Partial vectors like VNx8QImode allow the same indexed addressing
+     mode and MUL VL addressing mode as full vectors like VNx16QImode;
+     in both cases, MUL VL counts multiples of GET_MODE_SIZE.  */
+  unsigned int vec_flags = aarch64_classify_vector_mode (mode);
+  vec_flags &= ~VEC_PARTIAL;
+
   /* On BE, we use load/store pair for all large int mode load/stores.
      TI/TFmode may also use a load/store pair.  */
-  unsigned int vec_flags = aarch64_classify_vector_mode (mode);
   bool advsimd_struct_p = (vec_flags == (VEC_ADVSIMD | VEC_STRUCT));
   bool load_store_pair_p = (type == ADDR_QUERY_LDP_STP
 			    || type == ADDR_QUERY_LDP_STP_N
@@ -8948,7 +8993,7 @@ aarch64_print_address_internal (FILE *f, machine_mode mode, rtx x,
 				aarch64_addr_query_type type)
 {
   struct aarch64_address_info addr;
-  unsigned int size;
+  unsigned int size, vec_flags;
 
   /* Check all addresses are Pmode - including ILP32.  */
   if (GET_MODE (x) != Pmode
@@ -8964,26 +9009,24 @@ aarch64_print_address_internal (FILE *f, machine_mode mode, rtx x,
       {
       case ADDRESS_REG_IMM:
 	if (known_eq (addr.const_offset, 0))
-	  asm_fprintf (f, "[%s]", reg_names [REGNO (addr.base)]);
-	else if (aarch64_sve_data_mode_p (mode))
 	  {
-	    HOST_WIDE_INT vnum
-	      = exact_div (addr.const_offset,
-			   BYTES_PER_SVE_VECTOR).to_constant ();
-	    asm_fprintf (f, "[%s, #%wd, mul vl]",
-			 reg_names[REGNO (addr.base)], vnum);
+	    asm_fprintf (f, "[%s]", reg_names[REGNO (addr.base)]);
+	    return true;
 	  }
-	else if (aarch64_sve_pred_mode_p (mode))
+
+	vec_flags = aarch64_classify_vector_mode (mode);
+	if (vec_flags & VEC_ANY_SVE)
 	  {
 	    HOST_WIDE_INT vnum
 	      = exact_div (addr.const_offset,
-			   BYTES_PER_SVE_PRED).to_constant ();
+			   aarch64_vl_bytes (mode, vec_flags)).to_constant ();
 	    asm_fprintf (f, "[%s, #%wd, mul vl]",
 			 reg_names[REGNO (addr.base)], vnum);
+	    return true;
 	  }
-	else
-	  asm_fprintf (f, "[%s, %wd]", reg_names [REGNO (addr.base)],
-		       INTVAL (addr.offset));
+
+	asm_fprintf (f, "[%s, %wd]", reg_names[REGNO (addr.base)],
+		     INTVAL (addr.offset));
 	return true;
 
       case ADDRESS_REG_REG:
@@ -9395,7 +9438,7 @@ aarch64_class_max_nregs (reg_class_t regclass, machine_mode mode)
      can hold MODE, but at the moment we need to handle all modes.
      Just ignore any runtime parts for registers that can't store them.  */
   HOST_WIDE_INT lowest_size = constant_lower_bound (GET_MODE_SIZE (mode));
-  unsigned int nregs;
+  unsigned int nregs, vec_flags;
   switch (regclass)
     {
     case TAILCALL_ADDR_REGS:
@@ -9406,11 +9449,12 @@ aarch64_class_max_nregs (reg_class_t regclass, machine_mode mode)
     case FP_REGS:
     case FP_LO_REGS:
     case FP_LO8_REGS:
-      if (aarch64_sve_data_mode_p (mode)
+      vec_flags = aarch64_classify_vector_mode (mode);
+      if ((vec_flags & VEC_SVE_DATA)
 	  && constant_multiple_p (GET_MODE_SIZE (mode),
-				  BYTES_PER_SVE_VECTOR, &nregs))
+				  aarch64_vl_bytes (mode, vec_flags), &nregs))
 	return nregs;
-      return (aarch64_vector_data_mode_p (mode)
+      return (vec_flags & VEC_ADVSIMD
 	      ? CEIL (lowest_size, UNITS_PER_VREG)
 	      : CEIL (lowest_size, UNITS_PER_WORD));
     case STACK_REG:
@@ -15057,7 +15101,7 @@ static bool
 aarch64_vector_mode_supported_p (machine_mode mode)
 {
   unsigned int vec_flags = aarch64_classify_vector_mode (mode);
-  return vec_flags != 0 && (vec_flags & VEC_STRUCT) == 0;
+  return vec_flags != 0 && (vec_flags & (VEC_STRUCT | VEC_PARTIAL)) == 0;
 }
 
 /* Return the full-width SVE vector mode for element mode MODE, if one
diff --git a/gcc/genmodes.c b/gcc/genmodes.c
index f33eefa..95522d6 100644
--- a/gcc/genmodes.c
+++ b/gcc/genmodes.c
@@ -53,6 +53,7 @@ struct mode_data
 
   const char *name;		/* printable mode name -- SI, not SImode */
   enum mode_class cl;		/* this mode class */
+  unsigned int order;		/* top-level sorting order */
   unsigned int precision;	/* size in bits, equiv to TYPE_PRECISION */
   unsigned int bytesize;	/* storage size in addressable units */
   unsigned int ncomponents;	/* number of subunits */
@@ -85,7 +86,7 @@ static struct mode_data *void_mode;
 
 static const struct mode_data blank_mode = {
   0, "<unknown>", MAX_MODE_CLASS,
-  -1U, -1U, -1U, -1U,
+  0, -1U, -1U, -1U, -1U,
   0, 0, 0, 0, 0, 0,
   "<unknown>", 0, 0, 0, 0, false, false, 0
 };
@@ -484,14 +485,15 @@ make_complex_modes (enum mode_class cl,
     }
 }
 
-/* For all modes in class CL, construct vector modes of width
-   WIDTH, having as many components as necessary.  */
-#define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W) \
-  make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, __LINE__)
-#define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W)
+/* For all modes in class CL, construct vector modes of width WIDTH,
+   having as many components as necessary.  ORDER is the sorting order
+   of the mode, with smaller numbers indicating a higher priority.  */
+#define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \
+  make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, __LINE__)
+#define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0)
 static void ATTRIBUTE_UNUSED
 make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
-		   const char *file, unsigned int line)
+		   unsigned int order, const char *file, unsigned int line)
 {
   struct mode_data *m;
   struct mode_data *v;
@@ -530,6 +532,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
 	}
 
       v = new_mode (vclass, xstrdup (buf), file, line);
+      v->order = order;
       v->component = m;
       v->ncomponents = ncomponents;
     }
@@ -832,6 +835,11 @@ cmp_modes (const void *a, const void *b)
   const struct mode_data *const m = *(const struct mode_data *const*)a;
   const struct mode_data *const n = *(const struct mode_data *const*)b;
 
+  if (m->order > n->order)
+    return 1;
+  else if (m->order < n->order)
+    return -1;
+
   if (m->bytesize > n->bytesize)
     return 1;
   else if (m->bytesize < n->bytesize)
-- 
cgit v1.1


From 50425706ad8808bba6c062fd5ed1fe88676821d4 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 16 Oct 2019 10:58:55 +0000
Subject: Assert for POINTER_TYPE_P in expr_callee_abi

2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* function-abi.cc (expr_callee_abi): Assert for POINTER_TYPE_P.

From-SVN: r277063
---
 gcc/ChangeLog       |  4 ++++
 gcc/function-abi.cc | 10 ++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 56ad96d..1a03ac2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* function-abi.cc (expr_callee_abi): Assert for POINTER_TYPE_P.
+
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* genmodes.c (mode_data::order): New field.
 	(blank_mode): Update accordingly.
 	(VECTOR_MODES_WITH_PREFIX): Add an order parameter.
diff --git a/gcc/function-abi.cc b/gcc/function-abi.cc
index b4a1839..2c23b49 100644
--- a/gcc/function-abi.cc
+++ b/gcc/function-abi.cc
@@ -249,12 +249,6 @@ expr_callee_abi (const_tree exp)
   if (type == error_mark_node)
     return default_function_abi;
 
-  if (POINTER_TYPE_P (type))
-    {
-      type = TREE_TYPE (type);
-      if (type == error_mark_node)
-	return default_function_abi;
-    }
-
-  return fntype_abi (type);
+  gcc_assert (POINTER_TYPE_P (type));
+  return fntype_abi (TREE_TYPE (type));
 }
-- 
cgit v1.1


From 1624d351f14049bfe08bc2c86c63a9cccfb43ab8 Mon Sep 17 00:00:00 2001
From: Peter Bergner <bergner@linux.ibm.com>
Date: Wed, 16 Oct 2019 13:35:41 +0000
Subject: In PR70010, a function is marked with target(no-vsx) to disable VSX
 code generation.

In PR70010, a function is marked with target(no-vsx) to disable VSX code
generation.  To avoid VSX code generation, this function should not be
inlined into VSX function.  To fix the bug, in the current logic when
checking whether the caller's ISA flags supports the callee's ISA flags, we
just need to add a test that enforces that the caller's ISA flags match
exactly the callee's flags, for those flags that were explicitly set in the
callee.  If caller without target attribute then using options from command
line.

gcc/
2019-10-16  Peter Bergner <bergner@linux.ibm.com>
	    Jiufu Guo  <guojiufu@linux.ibm.com>

	PR target/70010
	* config/rs6000/rs6000.c (rs6000_can_inline_p): Prohibit inlining if
	the callee explicitly disables some isa_flags the caller is using.

gcc.testsuite/
2019-10-16  Peter Bergner <bergner@linux.ibm.com>
	    Jiufu Guo  <guojiufu@linux.ibm.com>

	PR target/70010
	* gcc.target/powerpc/pr70010.c: New test.
	* gcc.target/powerpc/pr70010-1.c: New test.
	* gcc.target/powerpc/pr70010-2.c: New test.
	* gcc.target/powerpc/pr70010-3.c: New test.
	* gcc.target/powerpc/pr70010-4.c: New test.

Co-Authored-By: Jiufu Guo <guojiufu@linux.ibm.com>

From-SVN: r277065
---
 gcc/ChangeLog                                |  7 +++++++
 gcc/config/rs6000/rs6000.c                   | 30 +++++++++++++++++-----------
 gcc/testsuite/ChangeLog                      | 10 ++++++++++
 gcc/testsuite/gcc.target/powerpc/pr70010-1.c | 17 ++++++++++++++++
 gcc/testsuite/gcc.target/powerpc/pr70010-2.c | 17 ++++++++++++++++
 gcc/testsuite/gcc.target/powerpc/pr70010-3.c | 17 ++++++++++++++++
 gcc/testsuite/gcc.target/powerpc/pr70010-4.c | 17 ++++++++++++++++
 gcc/testsuite/gcc.target/powerpc/pr70010.c   | 19 ++++++++++++++++++
 8 files changed, 122 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/powerpc/pr70010-1.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/pr70010-2.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/pr70010-3.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/pr70010-4.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/pr70010.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a03ac2..da7bf1f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-16  Peter Bergner <bergner@linux.ibm.com>
+	    Jiufu Guo  <guojiufu@linux.ibm.com>
+
+	PR target/70010
+	* config/rs6000/rs6000.c (rs6000_can_inline_p): Prohibit inlining if
+	the callee explicitly disables some isa_flags the caller is using.
+
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* function-abi.cc (expr_callee_abi): Assert for POINTER_TYPE_P.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index d1434a9..a129137d 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -23964,25 +23964,31 @@ rs6000_can_inline_p (tree caller, tree callee)
   tree caller_tree = DECL_FUNCTION_SPECIFIC_TARGET (caller);
   tree callee_tree = DECL_FUNCTION_SPECIFIC_TARGET (callee);
 
-  /* If callee has no option attributes, then it is ok to inline.  */
+  /* If the callee has no option attributes, then it is ok to inline.  */
   if (!callee_tree)
     ret = true;
 
-  /* If caller has no option attributes, but callee does then it is not ok to
-     inline.  */
-  else if (!caller_tree)
-    ret = false;
-
   else
     {
-      struct cl_target_option *caller_opts = TREE_TARGET_OPTION (caller_tree);
+      HOST_WIDE_INT caller_isa;
       struct cl_target_option *callee_opts = TREE_TARGET_OPTION (callee_tree);
+      HOST_WIDE_INT callee_isa = callee_opts->x_rs6000_isa_flags;
+      HOST_WIDE_INT explicit_isa = callee_opts->x_rs6000_isa_flags_explicit;
 
-      /* Callee's options should a subset of the caller's, i.e. a vsx function
-	 can inline an altivec function but a non-vsx function can't inline a
-	 vsx function.  */
-      if ((caller_opts->x_rs6000_isa_flags & callee_opts->x_rs6000_isa_flags)
-	  == callee_opts->x_rs6000_isa_flags)
+      /* If the caller has option attributes, then use them.
+	 Otherwise, use the command line options.  */
+      if (caller_tree)
+	caller_isa = TREE_TARGET_OPTION (caller_tree)->x_rs6000_isa_flags;
+      else
+	caller_isa = rs6000_isa_flags;
+
+      /* The callee's options must be a subset of the caller's options, i.e.
+	 a vsx function may inline an altivec function, but a no-vsx function
+	 must not inline a vsx function.  However, for those options that the
+	 callee has explicitly enabled or disabled, then we must enforce that
+	 the callee's and caller's options match exactly; see PR70010.  */
+      if (((caller_isa & callee_isa) == callee_isa)
+	  && (caller_isa & explicit_isa) == (callee_isa & explicit_isa))
 	ret = true;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b2b92de..93ca734 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-16  Peter Bergner <bergner@linux.ibm.com>
+	    Jiufu Guo  <guojiufu@linux.ibm.com>
+
+	PR target/70010
+	* gcc.target/powerpc/pr70010.c: New test.
+	* gcc.target/powerpc/pr70010-1.c: New test.
+	* gcc.target/powerpc/pr70010-2.c: New test.
+	* gcc.target/powerpc/pr70010-3.c: New test.
+	* gcc.target/powerpc/pr70010-4.c: New test.
+
 2019-10-16  Feng Xue  <fxue@os.amperecomputing.com>
 
 	PR ipa/91088
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-1.c b/gcc/testsuite/gcc.target/powerpc/pr70010-1.c
new file mode 100644
index 0000000..78870db
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-1.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -flto -mvsx" } */
+
+vector int c, a, b;
+
+static inline void __attribute__ ((__always_inline__, target ("no-vsx")))
+foo () /* { dg-error "inlining failed in call to .* target specific option mismatch" } */
+{
+  c = a + b;
+}
+
+int
+main ()
+{
+  foo (); /* { dg-message "called from here" } */
+  c = a + b;
+}
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-2.c b/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
new file mode 100644
index 0000000..4c09b21
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -flto -mno-vsx" } */
+
+vector int c, a, b;
+
+static inline void __attribute__ ((__always_inline__, target ("no-vsx")))
+foo ()
+{
+  c = a + b;
+}
+
+int
+main ()
+{
+  foo ();
+  c = a + b;
+}
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-3.c b/gcc/testsuite/gcc.target/powerpc/pr70010-3.c
new file mode 100644
index 0000000..bca3187
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-3.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mno-vsx" } */
+
+vector int c, a, b;
+
+static inline void __attribute__ ((__always_inline__, target ("no-vsx")))
+foo ()
+{
+  c = a + b;
+}
+
+int
+main ()
+{
+  foo ();
+  c = a + b;
+}
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-4.c b/gcc/testsuite/gcc.target/powerpc/pr70010-4.c
new file mode 100644
index 0000000..c575cff
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-4.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mvsx" } */
+
+vector int c, a, b;
+
+static inline void __attribute__ ((__always_inline__, target ("no-vsx")))
+foo () /* { dg-error "inlining failed in call to .* target specific option mismatch" } */
+{
+  c = a + b;
+}
+
+int
+main ()
+{
+  foo (); /* { dg-message "called from here" } */
+  c = a + b;
+}
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010.c b/gcc/testsuite/gcc.target/powerpc/pr70010.c
new file mode 100644
index 0000000..257ac29
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010.c
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -finline-functions" } */
+/* { dg-final { scan-assembler {\mbl vadd_no_vsx\M} } } */
+
+typedef int vec_t __attribute__((vector_size(16)));
+
+static vec_t
+__attribute__((__target__("no-vsx")))
+vadd_no_vsx (vec_t a, vec_t b)
+{
+  return a + b;
+}
+
+vec_t
+__attribute__((__target__("vsx")))
+call_vadd_no_vsx (vec_t x, vec_t y, vec_t z)
+{
+  return vadd_no_vsx (x, y) - z;
+}
-- 
cgit v1.1


From aab8c2fd6542a52663243eec160b80bdd61516d5 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 16 Oct 2019 14:21:06 +0000
Subject: tree-vect-loop.c (vect_valid_reduction_input_p): Remove.

2019-10-16  Richard Biener  <rguenther@suse.de>

	* tree-vect-loop.c (vect_valid_reduction_input_p): Remove.
	(vect_is_simple_reduction): Delay checking to
	vectorizable_reduction and relax the checking.
	(vectorizable_reduction): Check we have a simple use.  Check
	for bogus condition reductions.
	* tree-vect-stmts.c (vect_transform_stmt): Make sure we
	are looking at the last stmt in a pattern sequence when
	filling in backedge PHI values.

	* gcc.dg/vect/vect-cond-reduc-3.c: New testcase.
	* gcc.dg/vect/vect-cond-reduc-4.c: Likewise.

From-SVN: r277067
---
 gcc/ChangeLog                                 |  11 +++
 gcc/testsuite/ChangeLog                       |   5 +
 gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c |  45 +++++++++
 gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c |  45 +++++++++
 gcc/tree-vect-loop.c                          | 127 +++++++-------------------
 gcc/tree-vect-stmts.c                         |   1 +
 6 files changed, 138 insertions(+), 96 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c
 create mode 100644 gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da7bf1f..a6047ec 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-16  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-loop.c (vect_valid_reduction_input_p): Remove.
+	(vect_is_simple_reduction): Delay checking to
+	vectorizable_reduction and relax the checking.
+	(vectorizable_reduction): Check we have a simple use.  Check
+	for bogus condition reductions.
+	* tree-vect-stmts.c (vect_transform_stmt): Make sure we
+	are looking at the last stmt in a pattern sequence when
+	filling in backedge PHI values.
+
 2019-10-16  Peter Bergner <bergner@linux.ibm.com>
 	    Jiufu Guo  <guojiufu@linux.ibm.com>
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 93ca734..cd43ef6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-16  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/vect-cond-reduc-3.c: New testcase.
+	* gcc.dg/vect/vect-cond-reduc-4.c: Likewise.
+
 2019-10-16  Peter Bergner <bergner@linux.ibm.com>
 	    Jiufu Guo  <guojiufu@linux.ibm.com>
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c
new file mode 100644
index 0000000..a5b3849
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c
@@ -0,0 +1,45 @@
+/* { dg-require-effective-target vect_condition } */
+/* { dg-require-effective-target vect_float } */
+
+#include "tree-vect.h"
+
+extern void abort (void) __attribute__ ((noreturn));
+
+#define N 27
+
+/* Condition reduction with different types.  */
+
+int
+condition_reduction (float *a, float min_v)
+{
+  int last = 0;
+
+  for (int i = 0; i < N; i++)
+    if (a[i] < min_v)
+      last = i;
+
+  return last;
+}
+
+int
+main (void)
+{
+  float a[N] = {
+  11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+  1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+  21, 22, 23, 24, 25, 26, 27
+  };
+
+  check_vect ();
+
+  int ret = condition_reduction (a, 10);
+  if (ret != 18)
+    abort ();
+
+  return 0;
+}
+
+/* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
+
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c
new file mode 100644
index 0000000..6b6d17f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c
@@ -0,0 +1,45 @@
+/* { dg-require-effective-target vect_condition } */
+/* { dg-require-effective-target vect_double } */
+
+#include "tree-vect.h"
+
+extern void abort (void) __attribute__ ((noreturn));
+
+#define N 27
+
+/* Condition reduction with different types.  */
+
+int
+condition_reduction (double *a, double min_v)
+{
+  int last = 0;
+
+  for (int i = 0; i < N; i++)
+    if (a[i] < min_v)
+      last = i;
+
+  return last;
+}
+
+int
+main (void)
+{
+  double a[N] = {
+  11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+  1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+  21, 22, 23, 24, 25, 26, 27
+  };
+
+  check_vect ();
+
+  int ret = condition_reduction (a, 10);
+  if (ret != 18)
+    abort ();
+
+  return 0;
+}
+
+/* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
+
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 4552510..0530d66 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2532,21 +2532,6 @@ report_vect_op (dump_flags_t msg_type, gimple *stmt, const char *msg)
   dump_printf_loc (msg_type, vect_location, "%s%G", msg, stmt);
 }
 
-/* DEF_STMT_INFO occurs in a loop that contains a potential reduction
-   operation.  Return true if the results of DEF_STMT_INFO are something
-   that can be accumulated by such a reduction.  */
-
-static bool
-vect_valid_reduction_input_p (stmt_vec_info def_stmt_info)
-{
-  return (is_gimple_assign (def_stmt_info->stmt)
-	  || is_gimple_call (def_stmt_info->stmt)
-	  || STMT_VINFO_DEF_TYPE (def_stmt_info) == vect_induction_def
-	  || (gimple_code (def_stmt_info->stmt) == GIMPLE_PHI
-	      && STMT_VINFO_DEF_TYPE (def_stmt_info) == vect_internal_def
-	      && !is_loop_header_bb_p (gimple_bb (def_stmt_info->stmt))));
-}
-
 /* Return true if we need an in-order reduction for operation CODE
    on type TYPE.  NEED_WRAPPING_INTEGRAL_OVERFLOW is true if integer
    overflow must wrap.  */
@@ -2748,13 +2733,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 			  bool *double_reduc)
 {
   gphi *phi = as_a <gphi *> (phi_info->stmt);
-  class loop *loop = (gimple_bb (phi))->loop_father;
-  class loop *vect_loop = LOOP_VINFO_LOOP (loop_info);
-  bool nested_in_vect_loop = flow_loop_nested_p (vect_loop, loop);
   gimple *phi_use_stmt = NULL;
-  enum tree_code orig_code, code;
-  tree op1, op2, op3 = NULL_TREE, op4 = NULL_TREE;
-  tree type;
   imm_use_iterator imm_iter;
   use_operand_p use_p;
 
@@ -2768,6 +2747,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
      can be constant.  See PR60382.  */
   if (has_zero_uses (phi_name))
     return NULL;
+  class loop *loop = (gimple_bb (phi))->loop_father;
   unsigned nphi_def_loop_uses = 0;
   FOR_EACH_IMM_USE_FAST (use_p, imm_iter, phi_name)
     {
@@ -2802,6 +2782,8 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       || !flow_bb_inside_loop_p (loop, gimple_bb (def_stmt_info->stmt)))
     return NULL;
 
+  bool nested_in_vect_loop
+    = flow_loop_nested_p (LOOP_VINFO_LOOP (loop_info), loop);
   unsigned nlatch_def_loop_uses = 0;
   auto_vec<gphi *, 3> lcphis;
   bool inner_loop_of_double_reduc = false;
@@ -2849,8 +2831,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
      defined in the inner loop.  */
   if (gphi *def_stmt = dyn_cast <gphi *> (def_stmt_info->stmt))
     {
-      op1 = PHI_ARG_DEF (def_stmt, 0);
-
+      tree op1 = PHI_ARG_DEF (def_stmt, 0);
       if (gimple_phi_num_args (def_stmt) != 1
           || TREE_CODE (op1) != SSA_NAME)
         {
@@ -2890,7 +2871,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 			 def_stmt_info->stmt);
       return NULL;
     }
-  code = orig_code = gimple_assign_rhs_code (def_stmt);
+  enum tree_code code = gimple_assign_rhs_code (def_stmt);
 
   /* We can handle "res -= x[i]", which is non-associative by
      simply rewriting this into "res += -x[i]".  Avoid changing
@@ -2899,26 +2880,11 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
   if (code == MINUS_EXPR && gimple_assign_rhs2 (def_stmt) != phi_name)
     code = PLUS_EXPR;
 
+  tree op1, op2;
   if (code == COND_EXPR)
     {
       if (! nested_in_vect_loop)
 	STMT_VINFO_REDUC_TYPE (phi_info) = COND_REDUCTION;
-
-      op3 = gimple_assign_rhs1 (def_stmt);
-      if (COMPARISON_CLASS_P (op3))
-        {
-          op4 = TREE_OPERAND (op3, 1);
-          op3 = TREE_OPERAND (op3, 0);
-        }
-      if (op3 == phi_name || op4 == phi_name)
-	{
-	  if (dump_enabled_p ())
-	    report_vect_op (MSG_MISSED_OPTIMIZATION, def_stmt,
-			    "reduction: condition depends on previous"
-			    " iteration: ");
-	  return NULL;
-	}
-
       op1 = gimple_assign_rhs2 (def_stmt);
       op2 = gimple_assign_rhs3 (def_stmt);
     }
@@ -2951,33 +2917,6 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       return NULL;
     }
 
-  type = TREE_TYPE (gimple_assign_lhs (def_stmt));
-  if ((TREE_CODE (op1) == SSA_NAME
-       && !types_compatible_p (type,TREE_TYPE (op1)))
-      || (TREE_CODE (op2) == SSA_NAME
-          && !types_compatible_p (type, TREE_TYPE (op2)))
-      || (op3 && TREE_CODE (op3) == SSA_NAME
-          && !types_compatible_p (type, TREE_TYPE (op3)))
-      || (op4 && TREE_CODE (op4) == SSA_NAME
-          && !types_compatible_p (type, TREE_TYPE (op4))))
-    {
-      if (dump_enabled_p ())
-        {
-          dump_printf_loc (MSG_NOTE, vect_location,
-			   "reduction: multiple types: operation type: "
-			   "%T, operands types: %T,%T",
-			   type,  TREE_TYPE (op1), TREE_TYPE (op2));
-          if (op3)
-	    dump_printf (MSG_NOTE, ",%T", TREE_TYPE (op3));
-
-          if (op4)
-	    dump_printf (MSG_NOTE, ",%T", TREE_TYPE (op4));
-          dump_printf (MSG_NOTE, "\n");
-        }
-
-      return NULL;
-    }
-
   /* Check whether it's ok to change the order of the computation.
      Generally, when vectorizing a reduction we change the order of the
      computation.  This may change the behavior of the program in some
@@ -2985,6 +2924,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
      vectorizing an outer-loop: the inner-loop is executed sequentially,
      and therefore vectorizing reductions in the inner-loop during
      outer-loop vectorization is safe.  */
+  tree type = TREE_TYPE (gimple_assign_lhs (def_stmt));
   if (STMT_VINFO_REDUC_TYPE (phi_info) == TREE_CODE_REDUCTION
       && needs_fold_left_reduction_p (type, code))
     STMT_VINFO_REDUC_TYPE (phi_info) = FOLD_LEFT_REDUCTION;
@@ -2993,38 +2933,19 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
      1) integer arithmetic and no trapv
      2) floating point arithmetic, and special flags permit this optimization
      3) nested cycle (i.e., outer loop vectorization).  */
+
+  /* Check for the simple case that one def is the reduction def,
+     defined by the PHI node.  */
   stmt_vec_info def1_info = loop_info->lookup_def (op1);
   stmt_vec_info def2_info = loop_info->lookup_def (op2);
-  if (code != COND_EXPR && !def1_info && !def2_info)
-    {
-      if (dump_enabled_p ())
-	report_vect_op (MSG_NOTE, def_stmt, "reduction: no defs for operands: ");
-      return NULL;
-    }
-
-  /* Check that one def is the reduction def, defined by PHI,
-     the other def is either defined in the loop ("vect_internal_def"),
-     or it's an induction (defined by a loop-header phi-node).  */
-
-  if (def2_info
-      && def2_info->stmt == phi
-      && (code == COND_EXPR
-	  || !def1_info
-	  || !flow_bb_inside_loop_p (loop, gimple_bb (def1_info->stmt))
-	  || vect_valid_reduction_input_p (def1_info)))
+  if (def2_info && def2_info->stmt == phi)
     {
       STMT_VINFO_REDUC_IDX (def_stmt_info) = 1 + (code == COND_EXPR ? 1 : 0);
       if (dump_enabled_p ())
 	report_vect_op (MSG_NOTE, def_stmt, "detected reduction: ");
       return def_stmt_info;
     }
-
-  if (def1_info
-      && def1_info->stmt == phi
-      && (code == COND_EXPR
-	  || !def2_info
-	  || !flow_bb_inside_loop_p (loop, gimple_bb (def2_info->stmt))
-	  || vect_valid_reduction_input_p (def2_info)))
+  else if (def1_info && def1_info->stmt == phi)
     {
       STMT_VINFO_REDUC_IDX (def_stmt_info) = 0 + (code == COND_EXPR ? 1 : 0);
       if (dump_enabled_p ())
@@ -3032,7 +2953,8 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       return def_stmt_info;
     }
 
-  /* Look for the expression computing latch_def from loop PHI result.  */
+  /* Look for the expression computing latch_def from then loop PHI result
+     in a way involving more than one stmt.  */
   auto_vec<std::pair<ssa_op_iter, use_operand_p> > path;
   if (check_reduction_path (vect_location, loop, phi, latch_def, code,
 			    path))
@@ -5716,7 +5638,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   enum vect_def_type dt, cond_reduc_dt = vect_unknown_def_type;
   stmt_vec_info cond_stmt_vinfo = NULL;
   tree scalar_type;
-  bool is_simple_use;
   int i;
   int ncopies;
   bool single_defuse_cycle = false;
@@ -5887,10 +5808,15 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
         continue;
 
       stmt_vec_info def_stmt_info;
-      is_simple_use = vect_is_simple_use (ops[i], loop_vinfo, &dts[i], &tem,
-					  &def_stmt_info);
+      if (!vect_is_simple_use (ops[i], loop_vinfo, &dts[i], &tem,
+			       &def_stmt_info))
+	{
+	  if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "use not simple.\n");
+	  return false;
+	}
       dt = dts[i];
-      gcc_assert (is_simple_use);
       if (dt == vect_reduction_def
 	  && ops[i] == reduc_def)
 	{
@@ -6000,6 +5926,15 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 	  return false;
 	}
 
+      /* When the condition uses the reduction value in the condition, fail.  */
+      if (reduc_index == 0)
+	{
+	  if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "condition depends on previous iteration\n");
+	  return false;
+	}
+
       if (direct_internal_fn_supported_p (IFN_FOLD_EXTRACT_LAST,
 					  vectype_in, OPTIMIZE_FOR_SPEED))
 	{
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index ff9863f..e7255fb 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -10901,6 +10901,7 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   stmt_vec_info orig_stmt_info = vect_orig_stmt (stmt_info);
   stmt_vec_info reduc_info;
   if (STMT_VINFO_REDUC_DEF (orig_stmt_info)
+      && vect_stmt_to_vectorize (orig_stmt_info) == stmt_info
       && (reduc_info = info_for_reduction (orig_stmt_info))
       && STMT_VINFO_REDUC_TYPE (reduc_info) != FOLD_LEFT_REDUCTION
       && STMT_VINFO_REDUC_TYPE (reduc_info) != EXTRACT_LAST_REDUCTION)
-- 
cgit v1.1


From 7d3b27ff12610fde9d6c4b56abc70c6ee9b6b3db Mon Sep 17 00:00:00 2001
From: Wilco Dijkstra <wdijkstr@arm.com>
Date: Wed, 16 Oct 2019 14:24:41 +0000
Subject: [AArch64] Fix symbol offset limit

In aarch64_classify_symbol symbols are allowed large offsets on relocations.
This means the offset can use all of the +/-4GB offset, leaving no offset
available for the symbol itself.  This results in relocation overflow and
link-time errors for simple expressions like &global_array + 0xffffff00.

To avoid this, unless the offset_within_block_p is true, limit the offset
to +/-1MB so that the symbol needs to be within a 3.9GB offset from its
references.  For the tiny code model use a 64KB offset, allowing most of
the 1MB range for code/data between the symbol and its references.

    gcc/
	* config/aarch64/aarch64.c (aarch64_classify_symbol):
	Apply reasonable limit to symbol offsets.

    testsuite/
	* gcc.target/aarch64/symbol-range.c: Improve testcase.
	* gcc.target/aarch64/symbol-range-tiny.c: Likewise.

From-SVN: r277068
---
 gcc/ChangeLog                                      |  5 ++++
 gcc/config/aarch64/aarch64.c                       | 33 +++++++++++++---------
 gcc/testsuite/ChangeLog                            |  5 ++++
 .../gcc.target/aarch64/symbol-range-tiny.c         |  8 +++---
 gcc/testsuite/gcc.target/aarch64/symbol-range.c    |  8 +++---
 5 files changed, 37 insertions(+), 22 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a6047ec..70e51c5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-16  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* config/aarch64/aarch64.c (aarch64_classify_symbol):
+	Apply reasonable limit to symbol offsets.
+
 2019-10-16  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-loop.c (vect_valid_reduction_input_p): Remove.
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 1f0e74a..af74354 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -14122,26 +14122,31 @@ aarch64_classify_symbol (rtx x, HOST_WIDE_INT offset)
 	     the offset does not cause overflow of the final address.  But
 	     we have no way of knowing the address of symbol at compile time
 	     so we can't accurately say if the distance between the PC and
-	     symbol + offset is outside the addressible range of +/-1M in the
-	     TINY code model.  So we rely on images not being greater than
-	     1M and cap the offset at 1M and anything beyond 1M will have to
-	     be loaded using an alternative mechanism.  Furthermore if the
-	     symbol is a weak reference to something that isn't known to
-	     resolve to a symbol in this module, then force to memory.  */
-	  if ((SYMBOL_REF_WEAK (x)
-	       && !aarch64_symbol_binds_local_p (x))
-	      || !IN_RANGE (offset, -1048575, 1048575))
+	     symbol + offset is outside the addressible range of +/-1MB in the
+	     TINY code model.  So we limit the maximum offset to +/-64KB and
+	     assume the offset to the symbol is not larger than +/-(1MB - 64KB).
+	     If offset_within_block_p is true we allow larger offsets.
+	     Furthermore force to memory if the symbol is a weak reference to
+	     something that doesn't resolve to a symbol in this module.  */
+
+	  if (SYMBOL_REF_WEAK (x) && !aarch64_symbol_binds_local_p (x))
 	    return SYMBOL_FORCE_TO_MEM;
+	  if (!(IN_RANGE (offset, -0x10000, 0x10000)
+		|| offset_within_block_p (x, offset)))
+	    return SYMBOL_FORCE_TO_MEM;
+
 	  return SYMBOL_TINY_ABSOLUTE;
 
 	case AARCH64_CMODEL_SMALL:
 	  /* Same reasoning as the tiny code model, but the offset cap here is
-	     4G.  */
-	  if ((SYMBOL_REF_WEAK (x)
-	       && !aarch64_symbol_binds_local_p (x))
-	      || !IN_RANGE (offset, HOST_WIDE_INT_C (-4294967263),
-			    HOST_WIDE_INT_C (4294967264)))
+	     1MB, allowing +/-3.9GB for the offset to the symbol.  */
+
+	  if (SYMBOL_REF_WEAK (x) && !aarch64_symbol_binds_local_p (x))
 	    return SYMBOL_FORCE_TO_MEM;
+	  if (!(IN_RANGE (offset, -0x100000, 0x100000)
+		|| offset_within_block_p (x, offset)))
+	    return SYMBOL_FORCE_TO_MEM;
+
 	  return SYMBOL_SMALL_ABSOLUTE;
 
 	case AARCH64_CMODEL_TINY_PIC:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd43ef6..2c1d794 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-16  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* gcc.target/aarch64/symbol-range.c: Improve testcase.
+	* gcc.target/aarch64/symbol-range-tiny.c: Likewise.
+
 2019-10-16  Richard Biener  <rguenther@suse.de>
 
 	* gcc.dg/vect/vect-cond-reduc-3.c: New testcase.
diff --git a/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c b/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c
index d7e46b0..fc6a4f3 100644
--- a/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c
+++ b/gcc/testsuite/gcc.target/aarch64/symbol-range-tiny.c
@@ -1,12 +1,12 @@
-/* { dg-do compile } */
+/* { dg-do link } */
 /* { dg-options "-O3 -save-temps -mcmodel=tiny" } */
 
-int fixed_regs[0x00200000];
+char fixed_regs[0x00080000];
 
 int
-foo()
+main ()
 {
-  return fixed_regs[0x00080000];
+  return fixed_regs[0x000ff000];
 }
 
 /* { dg-final { scan-assembler-not "adr\tx\[0-9\]+, fixed_regs\\\+" } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/symbol-range.c b/gcc/testsuite/gcc.target/aarch64/symbol-range.c
index 6574cf4..d8e82fa 100644
--- a/gcc/testsuite/gcc.target/aarch64/symbol-range.c
+++ b/gcc/testsuite/gcc.target/aarch64/symbol-range.c
@@ -1,12 +1,12 @@
-/* { dg-do compile } */
+/* { dg-do link } */
 /* { dg-options "-O3 -save-temps -mcmodel=small" } */
 
-int fixed_regs[0x200000000ULL];
+char fixed_regs[0x80000000];
 
 int
-foo()
+main ()
 {
-  return fixed_regs[0x100000000ULL];
+  return fixed_regs[0xfffff000];
 }
 
 /* { dg-final { scan-assembler-not "adrp\tx\[0-9\]+, fixed_regs\\\+" } } */
-- 
cgit v1.1


From 26e7516aa90b62a80f71c6c64040e448587d0e17 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Wed, 16 Oct 2019 15:00:38 +0000
Subject: find_partition_fixes: remove unused bbs_in_cold_partition variable

gcc/ChangeLog:

2019-10-16  Ilya Leoshkevich  <iii@linux.ibm.com>

	* cfgrtl.c (find_partition_fixes): Remove bbs_in_cold_partition.

From-SVN: r277070
---
 gcc/ChangeLog | 4 ++++
 gcc/cfgrtl.c  | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70e51c5..2424b97 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-16  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* cfgrtl.c (find_partition_fixes): Remove bbs_in_cold_partition.
+
 2019-10-16  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* config/aarch64/aarch64.c (aarch64_classify_symbol):
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 39fc7aa..f279d08 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -2375,7 +2375,6 @@ static vec<basic_block>
 find_partition_fixes (bool flag_only)
 {
   basic_block bb;
-  vec<basic_block> bbs_in_cold_partition = vNULL;
   vec<basic_block> bbs_to_fix = vNULL;
   hash_set<basic_block> set;
 
@@ -2394,7 +2393,6 @@ find_partition_fixes (bool flag_only)
 	else
 	  BB_SET_PARTITION (bb, BB_COLD_PARTITION);
 	bbs_to_fix.safe_push (bb);
-	bbs_in_cold_partition.safe_push (bb);
       }
 
   return bbs_to_fix;
-- 
cgit v1.1


From c32ffa8d1e16894d0338bbe79140bbae8e82a83c Mon Sep 17 00:00:00 2001
From: Mihailo Stojanovic <mistojanovic@wavecomp.com>
Date: Wed, 16 Oct 2019 15:14:17 +0000
Subject: mips.c (mips_expand_builtin_insn): Force the operands which
 correspond to the same input-output register to have...

	* config/mips/mips.c (mips_expand_builtin_insn): Force the
	operands which correspond to the same input-output register to
	have the same pseudo assigned to them.

	* gcc.target/mips/msa-dpadd-dpsub.c: New test.

From-SVN: r277071
---
 gcc/ChangeLog                                   |  6 ++++++
 gcc/config/mips/mips.c                          | 20 ++++++++++++++++++
 gcc/testsuite/ChangeLog                         |  4 ++++
 gcc/testsuite/gcc.target/mips/msa-dpadd-dpsub.c | 28 +++++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/mips/msa-dpadd-dpsub.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2424b97..11d3f13 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-16  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
+
+	* config/mips/mips.c (mips_expand_builtin_insn): Force the
+	operands which correspond to the same input-output register to
+	have the same pseudo assigned to them.
+
 2019-10-16  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* cfgrtl.c (find_partition_fixes): Remove bbs_in_cold_partition.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 7f6a0db..3a77097 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -16960,6 +16960,26 @@ mips_expand_builtin_insn (enum insn_code icode, unsigned int nops,
       std::swap (ops[1], ops[3]);
       break;
 
+    case CODE_FOR_msa_dpadd_s_w:
+    case CODE_FOR_msa_dpadd_s_h:
+    case CODE_FOR_msa_dpadd_s_d:
+    case CODE_FOR_msa_dpadd_u_w:
+    case CODE_FOR_msa_dpadd_u_h:
+    case CODE_FOR_msa_dpadd_u_d:
+    case CODE_FOR_msa_dpsub_s_w:
+    case CODE_FOR_msa_dpsub_s_h:
+    case CODE_FOR_msa_dpsub_s_d:
+    case CODE_FOR_msa_dpsub_u_w:
+    case CODE_FOR_msa_dpsub_u_h:
+    case CODE_FOR_msa_dpsub_u_d:
+      /* Force the operands which correspond to the same in-out register
+	  to have the same pseudo assigned to them.  If the input operand
+	  is not REG, create one for it.  */
+      if (!REG_P (ops[1].value))
+	ops[1].value = copy_to_mode_reg (ops[1].mode, ops[1].value);
+      create_output_operand (&ops[0], ops[1].value, ops[1].mode);
+      break;
+
     default:
       break;
   }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2c1d794..2641821 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-16  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
+
+	* gcc.target/mips/msa-dpadd-dpsub.c: New test.
+
 2019-10-16  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* gcc.target/aarch64/symbol-range.c: Improve testcase.
diff --git a/gcc/testsuite/gcc.target/mips/msa-dpadd-dpsub.c b/gcc/testsuite/gcc.target/mips/msa-dpadd-dpsub.c
new file mode 100644
index 0000000..c665bdf
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/msa-dpadd-dpsub.c
@@ -0,0 +1,28 @@
+/* { dg-do compile } */
+/* { dg-options "-mfp64 -mhard-float -mmsa" } */
+/* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */
+
+typedef short v8i16 __attribute__ ((vector_size (16)));
+typedef int v4i32 __attribute__ ((vector_size (16)));
+
+void foo (int *x, v8i16 *y, v8i16 *z)
+{
+	v4i32 acc[4];
+
+    acc[0] = __builtin_msa_ld_w(x, 0);
+    acc[1] = __builtin_msa_ld_w(x, 16);
+    acc[2] = __builtin_msa_ld_w(x, 32);
+    acc[3] = __builtin_msa_ld_w(x, 48);
+		
+    acc[0] = __builtin_msa_dpadd_s_w(acc[0], y[0], z[0]);
+    acc[1] = __builtin_msa_dpadd_s_w(acc[1], y[1], z[0]);
+    acc[2] = __builtin_msa_dpsub_s_w(acc[2], y[0], z[1]);
+    acc[3] = __builtin_msa_dpsub_s_w(acc[3], y[1], z[1]);
+
+    __builtin_msa_st_w(acc[0], x, 0);
+    __builtin_msa_st_w(acc[1], x, 16);
+    __builtin_msa_st_w(acc[2], x, 32);
+    __builtin_msa_st_w(acc[3], x, 48);
+}
+
+/* { dg-final { scan-assembler-not "move.v" } } */
-- 
cgit v1.1


From b7bfd3c503b063ad9bbcb975816423e82cf48636 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Wed, 16 Oct 2019 16:44:34 +0000
Subject: [arm] fix bootstrap failure due to uninitialized warning

The Arm port is failing bootstrap because GCC is now warning about an
unitialized array.

The code is complex enough that I certainly can't be sure the compiler
is wrong, so perhaps the best fix here is just to memset the entire
array before use.

	* config/arm/arm.c (neon_valid_immediate): Clear bytes before use.

From-SVN: r277073
---
 gcc/ChangeLog        | 4 ++++
 gcc/config/arm/arm.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11d3f13..5662f9f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-16  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/arm.c (neon_valid_immediate): Clear bytes before use.
+
 2019-10-16  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
 
 	* config/mips/mips.c (mips_expand_builtin_insn): Force the
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index ba33047..3bf8cd6 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -12233,7 +12233,7 @@ neon_valid_immediate (rtx op, machine_mode mode, int inverse,
 
   unsigned int i, elsize = 0, idx = 0, n_elts;
   unsigned int innersize;
-  unsigned char bytes[16];
+  unsigned char bytes[16] = {};
   int immtype = -1, matches;
   unsigned int invmask = inverse ? 0xff : 0;
   bool vector = GET_CODE (op) == CONST_VECTOR;
-- 
cgit v1.1


From 27c14dbc6b01d5b7238d9d6893bcddce19b7056c Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Wed, 16 Oct 2019 17:18:57 +0000
Subject: PR tree-optimization/91996 - fold non-constant strlen relational
 expressions

gcc/testsuite/ChangeLog:

	PR tree-optimization/91996
	* gcc.dg/strlenopt-80.c: New test.
	* gcc.dg/strlenopt-81.c: New test.

gcc/ChangeLog:

	PR tree-optimization/91996
	* tree-ssa-strlen.c (maybe_warn_pointless_strcmp): Improve location
	information.
	(compare_nonzero_chars): Add an overload.
	(count_nonzero_bytes): Add an argument.  Call overload above.
	Handle non-constant lengths in some range.
	(handle_store): Add an argument.
	(check_and_optimize_stmt): Pass an argument to handle_store.

From-SVN: r277076
---
 gcc/ChangeLog                       |  11 +++
 gcc/testsuite/ChangeLog             |   6 ++
 gcc/testsuite/gcc.dg/strlenopt-80.c | 108 ++++++++++++++++++++
 gcc/testsuite/gcc.dg/strlenopt-81.c | 190 ++++++++++++++++++++++++++++++++++++
 gcc/tree-ssa-strlen.c               | 148 ++++++++++++++++++++--------
 5 files changed, 422 insertions(+), 41 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-80.c
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-81.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5662f9f..018a0a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-16  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91996
+	* tree-ssa-strlen.c (maybe_warn_pointless_strcmp): Improve location
+	information.
+	(compare_nonzero_chars): Add an overload.
+	(count_nonzero_bytes): Add an argument.  Call overload above.
+	Handle non-constant lengths in some range.
+	(handle_store): Add an argument.
+	(check_and_optimize_stmt): Pass an argument to handle_store.
+
 2019-10-16  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/arm.c (neon_valid_immediate): Clear bytes before use.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2641821..8816472 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-16  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/91996
+	* gcc.dg/strlenopt-80.c: New test.
+	* gcc.dg/strlenopt-81.c: New test.
+
 2019-10-16  Mihailo Stojanovic  <mistojanovic@wavecomp.com>
 
 	* gcc.target/mips/msa-dpadd-dpsub.c: New test.
diff --git a/gcc/testsuite/gcc.dg/strlenopt-80.c b/gcc/testsuite/gcc.dg/strlenopt-80.c
new file mode 100644
index 0000000..9124fe4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-80.c
@@ -0,0 +1,108 @@
+/* PR tree-optimization/91996 - fold strlen relational expressions
+
+   The optimization is only implemented for MEM_REF stores and other
+   targets than those below may not transform the memcpy call into
+   such a store.
+   { dg-do compile { target aarch64*-*-* i?86-*-* powerpc*-*-* x86_64-*-* } }
+
+   { dg-options "-O2 -Wall -fdump-tree-optimized" } */
+
+#define CHAR_BIT      __CHAR_BIT__
+#define SIZE_MAX      __SIZE_MAX__
+#define LEN_MAX       (__PTRDIFF_MAX__ - 2)
+
+typedef __PTRDIFF_TYPE__ ptrdiff_t;
+typedef __SIZE_TYPE__    size_t;
+
+extern void* memcpy (void*, const void*, size_t);
+extern size_t strlen (const char*);
+
+#define CONCAT(a, b) a ## b
+#define CAT(a, b)    CONCAT (a, b)
+
+extern void sink (void*, ...);
+extern void failure_on_line (int);
+
+extern char src[];
+extern char dst[];
+
+/* Copy (1 << NCPYLOG) bytes from an unknown string SRC with strlen (SRC)
+   in the range [MINSRCLEN, MAXSRCLEN] into DST + DSTOFF and verify that
+   strlen (DST + DSTOFF) is in the range [MINDSTLEN, MAXDSTLEN].  */
+#define MIN_MAX(dst, dstoff, src,					\
+	     minsrclen, maxsrclen, mindstlen, maxdstlen, ncpylog)	\
+  void CAT (test_on_line_, __LINE__) (void)				\
+  {									\
+    size_t srclen = strlen (src);					\
+    if ((minsrclen) <= srclen && srclen <= (maxsrclen)) {		\
+      char *d = (dst) + (dstoff);					\
+      memcpy (d, src, (size_t)1 << (ncpylog));				\
+      size_t dstlen = strlen (d);					\
+      if (dstlen < (mindstlen) || (maxdstlen) < dstlen)			\
+	{								\
+	  failure_on_line (__LINE__);					\
+	}								\
+      sink (dst, src);							\
+    }									\
+  } typedef void dummy_type
+
+// Verify the lower bound of the resulting strlen range.
+#define MIN(dst, dstoff, src, minsrclen, mindstlen, ncpylog)		\
+  MIN_MAX (dst, dstoff, src, minsrclen, LEN_MAX, mindstlen, LEN_MAX, ncpylog)
+
+MIN (dst, 0, src, 2, 1, 0);
+MIN (dst, 0, src, 3, 1, 0);
+MIN (dst, 0, src, 3, 2, 1);
+MIN (dst, 0, src, 3, 2, 2);
+MIN (dst, 0, src, 3, 2, 3);
+
+MIN (dst, 1, src, 2, 1, 0);
+MIN (dst, 1, src, 3, 1, 0);
+MIN (dst, 1, src, 3, 2, 1);
+MIN (dst, 1, src, 3, 2, 2);
+MIN (dst, 1, src, 3, 2, 3);
+
+MIN (dst, 2, src, 2, 1, 0);
+MIN (dst, 3, src, 3, 1, 0);
+MIN (dst, 4, src, 3, 2, 1);
+MIN (dst, 5, src, 3, 2, 2);
+MIN (dst, 6, src, 3, 2, 3);
+
+
+MIN (dst, 0, src, 5, 1, 0);
+MIN (dst, 0, src, 5, 2, 1);
+MIN (dst, 0, src, 5, 4, 2);
+MIN (dst, 0, src, 5, 5, 3);
+
+#if __aarch64__ || __x86_64__
+/* Of the targets above only aarch64 and x86_64 transform memcpy calls
+   of (2 << 4) bytes into MEM_REF.  */
+MIN (dst, 0, src, 5, 5, 4);
+#endif
+
+MIN (dst, 11, src, 5, 1, 0);
+MIN (dst, 22, src, 5, 2, 1);
+MIN (dst, 33, src, 5, 4, 2);
+MIN (dst, 44, src, 5, 5, 3);
+
+#if __aarch64__ || __x86_64__
+MIN (dst, 55, src, 5, 5, 4);
+#endif
+
+MIN (dst, 11, src, LEN_MAX, 1, 0);
+MIN (dst, 22, src, LEN_MAX, 2, 1);
+MIN (dst, 33, src, LEN_MAX, 4, 2);
+MIN (dst, 44, src, LEN_MAX, 5, 3);
+MIN (dst, 55, src, LEN_MAX, 5, 4);
+MIN (dst, 66, src, LEN_MAX, 9, 8);
+MIN (dst, 66, src, LEN_MAX, LEN_MAX, sizeof (ptrdiff_t) * CHAR_BIT - 1);
+
+
+MIN_MAX (dst, 0, src, 3, 5, 1, LEN_MAX, 0);
+MIN_MAX (dst, 0, src, 3, 5, 2, LEN_MAX, 1);
+MIN_MAX (dst, 0, src, 3, 5, 3, LEN_MAX, 2);
+
+/* Upper bound not implemented yet.
+   MIN_MAX (dst, 0, src, 3, 5, 3, 5, 3);  */
+
+/* { dg-final { scan-tree-dump-times "failure_on_line \\(" 0 "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-81.c b/gcc/testsuite/gcc.dg/strlenopt-81.c
new file mode 100644
index 0000000..95ac29a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-81.c
@@ -0,0 +1,190 @@
+/* PR tree-optimization/ - fold strlen relational expressions
+   { dg-do run }
+   { dg-options "-O2 -Wall -Wno-unused-local-typedefs -fdump-tree-optimized" } */
+
+typedef __SIZE_TYPE__ size_t;
+
+#define NOIPA   __attribute__ ((noipa))
+
+#define CONCAT(a, b) a ## b
+#define CAT(a, b)    CONCAT (a, b)
+
+/* Used in tests where EXPR is expected to be folded to false.  */
+#define ELIM(expr)							\
+  if (expr) {								\
+    extern void								\
+      CAT (CAT (test_on_line_, __LINE__), _not_eliminated)(void);	\
+    CAT (CAT (test_on_line_, __LINE__), _not_eliminated)();		\
+  } typedef void dummy_type
+
+char a[32], b[32];
+
+void init (void)
+{
+  __builtin_strncpy (a, "abcdefgh", sizeof a);
+  __builtin_strncpy (b, "0123456789", sizeof b);
+}
+
+NOIPA void fail (const char *func)
+{
+  __builtin_printf ("failure in %s\n", func);
+  __builtin_abort ();
+}
+
+NOIPA void test_global_cpy_4 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char *d = a;
+  __builtin_memcpy (d, b, 4);
+
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 8)   // cannot be eliminated
+    fail ("test_global");
+}
+
+
+NOIPA void test_global_cpy_10 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char *d = a;
+  __builtin_memcpy (d, b, 10);
+
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 10)   // cannot be eliminated
+    fail ("test_global_cpy_10");
+}
+
+NOIPA void test_global_cpy_11 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char *d = a;
+  __builtin_memcpy (d, b, 11);
+
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 10)   // cannot be eliminated
+    fail ("test_global_cpy_11");
+}
+
+NOIPA void test_global_cpy_20 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char *d = a;
+  __builtin_memcpy (d, b, 20);
+
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 10)   // cannot be eliminated
+    fail ("test_global_cpy_20");
+}
+
+NOIPA void test_local_cpy_4 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char a[10] = "abcdefgh";
+  char *d = a;
+  __builtin_memcpy (d, b, 4);
+
+  size_t dlen = __builtin_strlen (d);
+  ELIM (dlen != 8);
+}
+
+NOIPA void test_local_cpy_10 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char a[32] = "abcdefgh";
+  char *d = a;
+  __builtin_memcpy (d, b, 10);
+
+  /* B can be longer than 9 and A can initially be longer than 10
+     so the test below cannot be eliminated.  */
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 10)
+    fail ("test_local_cpy_10");
+}
+
+NOIPA void test_local_cpy_11 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char a[32] = "abcdefgh";
+  char *d = a;
+  __builtin_memcpy (d, b, 11);
+
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 10)
+    fail ("test_global_cpy_20");
+}
+
+NOIPA void test_local_cpy_20 (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  char a[32] = "abcdefgh";
+  char *d = a;
+  __builtin_memcpy (d, b, 20);
+
+  size_t dlen = __builtin_strlen (d);
+  if (dlen != 10)
+    fail ("test_global_cpy_20");
+}
+
+NOIPA void test_global_length_eq (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen != 10) return;
+
+  size_t alen = __builtin_strlen (a);
+  if (alen != 8) return;
+
+  char *d = a;
+  __builtin_memcpy (d, b, 4);
+
+  size_t dlen = __builtin_strlen (d);
+  ELIM (dlen != 8);
+}
+
+
+NOIPA void test_global_length_gt (void)
+{
+  size_t blen = __builtin_strlen (b);
+  if (blen < 9) return;
+
+  size_t alen = __builtin_strlen (a);
+  if (alen < 8) return;
+
+  char *d = a;
+  __builtin_memcpy (d, b, 4);
+
+  size_t dlen = __builtin_strlen (d);
+  ELIM (dlen < 8);
+}
+
+#define TEST(name) do { init (); test_ ## name (); } while (0)
+
+int main (void)
+{
+  TEST (local_cpy_4);
+  TEST (local_cpy_10);
+  TEST (local_cpy_11);
+  TEST (local_cpy_20);
+
+  TEST (global_cpy_4);
+  TEST (global_cpy_10);
+  TEST (global_cpy_11);
+  TEST (global_cpy_20);
+  TEST (global_length_eq);
+  TEST (global_length_gt);
+}
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 5b90ad3..bd1eb0d 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -191,12 +191,12 @@ static void handle_builtin_stxncpy (built_in_function, gimple_stmt_iterator *);
 
 /* Return:
 
-   - 1 if SI is known to start with more than OFF nonzero characters.
+   *  +1  if SI is known to start with more than OFF nonzero characters.
 
-   - 0 if SI is known to start with OFF nonzero characters,
-     but is not known to start with more.
+   *   0  if SI is known to start with OFF nonzero characters,
+	  but is not known to start with more.
 
-   - -1 if SI might not start with OFF nonzero characters.  */
+   *  -1  if SI might not start with OFF nonzero characters.  */
 
 static inline int
 compare_nonzero_chars (strinfo *si, unsigned HOST_WIDE_INT off)
@@ -208,6 +208,33 @@ compare_nonzero_chars (strinfo *si, unsigned HOST_WIDE_INT off)
     return -1;
 }
 
+/* Same as above but suitable also for strings with non-constant lengths.
+   Uses RVALS to determine length range.  */
+
+static int
+compare_nonzero_chars (strinfo *si, unsigned HOST_WIDE_INT off,
+		       const vr_values *rvals)
+{
+  if (!si->nonzero_chars)
+    return -1;
+
+  if (TREE_CODE (si->nonzero_chars) == INTEGER_CST)
+    return compare_tree_int (si->nonzero_chars, off);
+
+  if (TREE_CODE (si->nonzero_chars) != SSA_NAME)
+    return -1;
+
+  const value_range *vr
+    = (CONST_CAST (class vr_values *, rvals)
+       ->get_value_range (si->nonzero_chars));
+
+  value_range_kind rng = vr->kind ();
+  if (rng != VR_RANGE || !range_int_cst_p (vr))
+    return -1;
+
+  return compare_tree_int (vr->min (), off);
+}
+
 /* Return true if SI is known to be a zero-length string.  */
 
 static inline bool
@@ -3619,7 +3646,8 @@ maybe_warn_pointless_strcmp (gimple *stmt, HOST_WIDE_INT bound,
 			     unsigned HOST_WIDE_INT len[2],
 			     unsigned HOST_WIDE_INT siz)
 {
-  gimple *use = used_only_for_zero_equality (gimple_call_lhs (stmt));
+  tree lhs = gimple_call_lhs (stmt);
+  gimple *use = used_only_for_zero_equality (lhs);
   if (!use)
     return;
 
@@ -3642,7 +3670,11 @@ maybe_warn_pointless_strcmp (gimple *stmt, HOST_WIDE_INT bound,
 
   /* FIXME: Include a note pointing to the declaration of the smaller
      array.  */
-  location_t stmt_loc = gimple_location (stmt);
+  location_t stmt_loc = gimple_nonartificial_location (stmt);
+  if (stmt_loc == UNKNOWN_LOCATION && EXPR_HAS_LOCATION (lhs))
+    stmt_loc = tree_nonartificial_location (lhs);
+  stmt_loc = expansion_point_location_if_in_system_header (stmt_loc);
+
   tree callee = gimple_call_fndecl (stmt);
   bool warned = false;
   if (siz <= minlen && bound == -1)
@@ -3918,40 +3950,70 @@ static bool
 count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 		     unsigned HOST_WIDE_INT nbytes,
 		     unsigned lenrange[3], bool *nulterm,
-		     bool *allnul, bool *allnonnul, ssa_name_limit_t &snlim)
+		     bool *allnul, bool *allnonnul, const vr_values *rvals,
+		     ssa_name_limit_t &snlim)
 {
   int idx = get_stridx (exp);
   if (idx > 0)
     {
       strinfo *si = get_strinfo (idx);
-      /* FIXME: Handle non-constant lengths in some range.  */
-      if (!si || !tree_fits_shwi_p (si->nonzero_chars))
+      if (!si)
 	return false;
 
-      unsigned len = tree_to_shwi (si->nonzero_chars);
-      unsigned size = len + si->full_string_p;
-      if (size <= offset)
+      /* Handle both constant lengths as well non-constant lengths
+	 in some range.  */
+      unsigned HOST_WIDE_INT minlen, maxlen;
+      if (tree_fits_shwi_p (si->nonzero_chars))
+	minlen = maxlen = tree_to_shwi (si->nonzero_chars);
+      else if (nbytes
+	       && si->nonzero_chars
+	       && TREE_CODE (si->nonzero_chars) == SSA_NAME)
+	{
+	  const value_range *vr
+	    = CONST_CAST (class vr_values *, rvals)
+	    ->get_value_range (si->nonzero_chars);
+	  if (vr->kind () != VR_RANGE
+	      || !range_int_cst_p (vr))
+	    return false;
+
+	 minlen = tree_to_uhwi (vr->min ());
+	 maxlen = tree_to_uhwi (vr->max ());
+	}
+      else
 	return false;
 
-      len -= offset;
+      if (maxlen < offset)
+	return false;
 
-      if (len < lenrange[0])
-	lenrange[0] = len;
-      if (lenrange[1] < len)
-	lenrange[1] = len;
-      if (lenrange[2] < nbytes)
-	lenrange[2] = nbytes;
+      minlen = minlen < offset ? 0 : minlen - offset;
+      maxlen -= offset;
+      if (maxlen + 1 < nbytes)
+	return false;
 
-      if (!si->full_string_p)
+      if (nbytes <= minlen)
 	*nulterm = false;
 
-      /* Since only the length of the string are known and
-	 its contents, clear ALLNUL and ALLNONNUL purely on
-	 the basis of the length.  */
-      if (len)
-	*allnul = false;
-      else
+      if (nbytes < minlen)
+	{
+	  minlen = nbytes;
+	  if (nbytes < maxlen)
+	    maxlen = nbytes;
+	}
+
+      if (minlen < lenrange[0])
+	lenrange[0] = minlen;
+      if (lenrange[1] < maxlen)
+	lenrange[1] = maxlen;
+
+      if (lenrange[2] < nbytes)
+	(lenrange[2] = nbytes);
+
+      /* Since only the length of the string are known and not its contents,
+	 clear ALLNUL and ALLNONNUL purely on the basis of the length.  */
+      *allnul = false;
+      if (minlen < nbytes)
 	*allnonnul = false;
+
       return true;
     }
 
@@ -3960,7 +4022,7 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 
   if (TREE_CODE (exp) == SSA_NAME)
     {
-      /* Handle a single-character specially.  */
+      /* Handle non-zero single-character stores specially.  */
       tree type = TREE_TYPE (exp);
       if (TREE_CODE (type) == INTEGER_TYPE
 	  && TYPE_MODE (type) == TYPE_MODE (char_type_node)
@@ -3972,7 +4034,7 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 	     for an arbitrary constant.  */
 	  exp = build_int_cst (type, 1);
 	  return count_nonzero_bytes (exp, offset, 1, lenrange,
-				      nulterm, allnul, allnonnul, snlim);
+				      nulterm, allnul, allnonnul, rvals, snlim);
 	}
 
       gimple *stmt = SSA_NAME_DEF_STMT (exp);
@@ -3981,6 +4043,7 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 	  exp = gimple_assign_rhs1 (stmt);
 	  if (TREE_CODE (exp) != MEM_REF)
 	    return false;
+	  /* Handle MEM_REF below.  */
 	}
       else if (gimple_code (stmt) == GIMPLE_PHI)
 	{
@@ -3996,7 +4059,7 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 	    {
 	      tree def = gimple_phi_arg_def (stmt, i);
 	      if (!count_nonzero_bytes (def, offset, nbytes, lenrange, nulterm,
-					allnul, allnonnul, snlim))
+					allnul, allnonnul, rvals, snlim))
 		return false;
 	    }
 
@@ -4033,7 +4096,7 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
 
       /* Handle MEM_REF = SSA_NAME types of assignments.  */
       return count_nonzero_bytes (arg, offset, nbytes, lenrange, nulterm,
-				  allnul, allnonnul, snlim);
+				  allnul, allnonnul, rvals, snlim);
     }
 
   if (TREE_CODE (exp) == VAR_DECL && TREE_READONLY (exp))
@@ -4132,11 +4195,13 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
   return true;
 }
 
-/* Same as above except with an implicit SSA_NAME limit.  */
+/* Same as above except with an implicit SSA_NAME limit.  RVALS is used
+   to determine ranges of dynamically computed string lengths (the results
+   of strlen).  */
 
 static bool
 count_nonzero_bytes (tree exp, unsigned lenrange[3], bool *nulterm,
-		     bool *allnul, bool *allnonnul)
+		     bool *allnul, bool *allnonnul, const vr_values *rvals)
 {
   /* Set to optimistic values so the caller doesn't have to worry about
      initializing these and to what.  On success, the function will clear
@@ -4149,7 +4214,7 @@ count_nonzero_bytes (tree exp, unsigned lenrange[3], bool *nulterm,
 
   ssa_name_limit_t snlim;
   return count_nonzero_bytes (exp, 0, 0, lenrange, nulterm, allnul, allnonnul,
-			      snlim);
+			      rvals, snlim);
 }
 
 /* Handle a single or multibyte store other than by a built-in function,
@@ -4158,7 +4223,7 @@ count_nonzero_bytes (tree exp, unsigned lenrange[3], bool *nulterm,
    '*(int*)a = 12345').  Return true when handled.  */
 
 static bool
-handle_store (gimple_stmt_iterator *gsi)
+handle_store (gimple_stmt_iterator *gsi, const vr_values *rvals)
 {
   int idx = -1;
   strinfo *si = NULL;
@@ -4184,7 +4249,7 @@ handle_store (gimple_stmt_iterator *gsi)
 	    si = get_strinfo (idx);
 	  if (offset == 0)
 	    ssaname = TREE_OPERAND (lhs, 0);
-	  else if (si == NULL || compare_nonzero_chars (si, offset) < 0)
+	  else if (si == NULL || compare_nonzero_chars (si, offset, rvals) < 0)
 	    return true;
 	}
     }
@@ -4214,7 +4279,8 @@ handle_store (gimple_stmt_iterator *gsi)
 
   const bool ranges_valid
     = count_nonzero_bytes (rhs, lenrange, &full_string_p,
-			   &storing_all_zeros_p, &storing_all_nonzero_p);
+			   &storing_all_zeros_p, &storing_all_nonzero_p,
+			   rvals);
   if (ranges_valid)
     {
       rhs_minlen = lenrange[0];
@@ -4233,7 +4299,7 @@ handle_store (gimple_stmt_iterator *gsi)
 		/* Fall back on the LHS location if the statement
 		   doesn't have one.  */
 		location_t loc = gimple_nonartificial_location (stmt);
-		if (loc == UNKNOWN_LOCATION)
+		if (loc == UNKNOWN_LOCATION && EXPR_HAS_LOCATION (lhs))
 		  loc = tree_nonartificial_location (lhs);
 		loc = expansion_point_location_if_in_system_header (loc);
 		if (warning_n (loc, OPT_Wstringop_overflow_,
@@ -4271,15 +4337,15 @@ handle_store (gimple_stmt_iterator *gsi)
 	{
 	  /* The offset of the last stored byte.  */
 	  unsigned HOST_WIDE_INT endoff = offset + lenrange[2] - 1;
-	  store_before_nul[0] = compare_nonzero_chars (si, offset);
+	  store_before_nul[0] = compare_nonzero_chars (si, offset, rvals);
 	  if (endoff == offset)
 	    store_before_nul[1] = store_before_nul[0];
 	  else
-	    store_before_nul[1] = compare_nonzero_chars (si, endoff);
+	    store_before_nul[1] = compare_nonzero_chars (si, endoff, rvals);
 	}
       else
 	{
-	  store_before_nul[0] = compare_nonzero_chars (si, offset);
+	  store_before_nul[0] = compare_nonzero_chars (si, offset, rvals);
 	  store_before_nul[1] = store_before_nul[0];
 	  gcc_assert (offset == 0 || store_before_nul[0] >= 0);
 	}
@@ -4841,7 +4907,7 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
 	  }
 
 	/* Handle a single or multibyte assignment.  */
-	if (is_char_store && !handle_store (gsi))
+	if (is_char_store && !handle_store (gsi, rvals))
 	  return false;
       }
     }
-- 
cgit v1.1


From 2fcb55d11f4167b966151057c121d0a47914c5c8 Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Wed, 16 Oct 2019 19:24:36 +0000
Subject: PR tree-optimization/83821 - local aggregate initialization defeats
 strlen optimization

gcc/ChangeLog:

	PR tree-optimization/83821
	* tree-ssa-strlen.c (maybe_invalidate): Add argument.  Consider
	the length of a string when available.
	(handle_builtin_memset) Add argument.
	(handle_store, strlen_check_and_optimize_call): Same.
	(check_and_optimize_stmt): Same.  Pass it to callees.

gcc/testsuite/ChangeLog:

	PR tree-optimization/83821
	* c-c++-common/Warray-bounds-4.c: Remove XFAIL.
	* gcc.dg/strlenopt-82.c: New test.
	* gcc.dg/strlenopt-83.c: Same.
	* gcc.dg/strlenopt-84.c: Same.
	* gcc.dg/strlenopt-85.c: Same.
	* gcc.dg/strlenopt-86.c: Same.
	* gcc.dg/tree-ssa/calloc-4.c: Same.
	* gcc.dg/tree-ssa/calloc-5.c: Same.

From-SVN: r277080
---
 gcc/ChangeLog                                |   9 ++
 gcc/testsuite/ChangeLog                      |  12 ++
 gcc/testsuite/c-c++-common/Warray-bounds-4.c |   2 +-
 gcc/testsuite/gcc.dg/strlenopt-82.c          | 224 +++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/strlenopt-83.c          |  83 ++++++++++
 gcc/testsuite/gcc.dg/strlenopt-84.c          | 135 ++++++++++++++++
 gcc/testsuite/gcc.dg/strlenopt-85.c          |  44 ++++++
 gcc/testsuite/gcc.dg/strlenopt-86.c          |  57 +++++++
 gcc/testsuite/gcc.dg/tree-ssa/calloc-4.c     |  37 +++++
 gcc/testsuite/gcc.dg/tree-ssa/calloc-5.c     |  22 +++
 gcc/tree-ssa-strlen.c                        |  81 ++++++++--
 11 files changed, 694 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-82.c
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-83.c
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-84.c
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-85.c
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-86.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/calloc-4.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/calloc-5.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 018a0a1..b81945b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-16  Martin Sebor  <msebor@redhat.com>
 
+	PR tree-optimization/83821
+	* tree-ssa-strlen.c (maybe_invalidate): Add argument.  Consider
+	the length of a string when available.
+	(handle_builtin_memset) Add argument.
+	(handle_store, strlen_check_and_optimize_call): Same.
+	(check_and_optimize_stmt): Same.  Pass it to callees.
+
+2019-10-16  Martin Sebor  <msebor@redhat.com>
+
 	PR tree-optimization/91996
 	* tree-ssa-strlen.c (maybe_warn_pointless_strcmp): Improve location
 	information.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8816472..0785e41 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,17 @@
 2019-10-16  Martin Sebor  <msebor@redhat.com>
 
+	PR tree-optimization/83821
+	* c-c++-common/Warray-bounds-4.c: Remove XFAIL.
+	* gcc.dg/strlenopt-82.c: New test.
+	* gcc.dg/strlenopt-83.c: Same.
+	* gcc.dg/strlenopt-84.c: Same.
+	* gcc.dg/strlenopt-85.c: Same.
+	* gcc.dg/strlenopt-86.c: Same.
+	* gcc.dg/tree-ssa/calloc-4.c: Same.
+	* gcc.dg/tree-ssa/calloc-5.c: Same.
+
+2019-10-16  Martin Sebor  <msebor@redhat.com>
+
 	PR tree-optimization/91996
 	* gcc.dg/strlenopt-80.c: New test.
 	* gcc.dg/strlenopt-81.c: New test.
diff --git a/gcc/testsuite/c-c++-common/Warray-bounds-4.c b/gcc/testsuite/c-c++-common/Warray-bounds-4.c
index 961107a..a09a08d 100644
--- a/gcc/testsuite/c-c++-common/Warray-bounds-4.c
+++ b/gcc/testsuite/c-c++-common/Warray-bounds-4.c
@@ -63,7 +63,7 @@ void test_strcpy_bounds_memarray_range (void)
   TM ("0", "",     ma.a5 + i, ma.a5);
   TM ("01", "",    ma.a5 + i, ma.a5);
   TM ("012", "",   ma.a5 + i, ma.a5);
-  TM ("0123", "",  ma.a5 + i, ma.a5);     /* { dg-warning "offset 6 from the object at .ma. is out of the bounds of referenced subobject .a5. with type .char\\\[5]. at offset 0" "strcpy" { xfail *-*-* } } */
+  TM ("0123", "",  ma.a5 + i, ma.a5);     /* { dg-warning "offset 5 from the object at .ma. is out of the bounds of referenced subobject .\(MA::\)?a5. with type .char *\\\[5]. at offset 0" "strcpy" } */
 
 #if __i386__ || __x86_64__
   /* Disabled for non-x86 targets due to bug 83462.  */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-82.c b/gcc/testsuite/gcc.dg/strlenopt-82.c
new file mode 100644
index 0000000..8070f6c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-82.c
@@ -0,0 +1,224 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+
+   Avoid exercising targets other than x86_64 in LP64 mode due to PR 83543
+   - strlen of a local array member not optimized on some targets
+   { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } }
+
+   { dg-options "-O2 -Wall -fdump-tree-optimized" } */
+
+#include "strlenopt.h"
+
+#define CAT(x, y) x ## y
+#define CONCAT(x, y) CAT (x, y)
+#define FAILNAME(name) CONCAT (call_ ## name ##_on_line_, __LINE__)
+
+#define FAIL(name) do {				\
+    extern void FAILNAME (name) (void);		\
+    FAILNAME (name)();				\
+  } while (0)
+
+/* Macro to emit a call to function named
+     call_in_true_branch_not_eliminated_on_line_NNN()
+   for each call that's expected to be eliminated.  The dg-final
+   scan-tree-dump-time directive at the bottom of the test verifies
+   that no such call appears in output.  */
+#define ELIM(expr) \
+  if (!(expr)) FAIL (in_true_branch_not_eliminated); else (void)0
+
+/* Macro to emit a call to a function named
+     call_made_in_{true,false}_branch_on_line_NNN()
+   for each call that's expected to be retained.  The dg-final
+   scan-tree-dump-time directive at the bottom of the test verifies
+   that the expected number of both kinds of calls appears in output
+   (a pair for each line with the invocation of the KEEP() macro.  */
+#define KEEP(expr)				\
+  if (expr)					\
+    FAIL (made_in_true_branch);			\
+  else						\
+    FAIL (made_in_false_branch)
+
+#define STR10 "0123456789"
+#define STR20 STR10 STR10
+#define STR30 STR20 STR10
+#define STR40 STR20 STR20
+
+void elim_char_array_init_consecutive (void)
+{
+  char a[][10] = { "1", "12", "123", "1234", "12345", "12345" };
+
+  ELIM (strlen (a[0]) == 1);
+  ELIM (strlen (a[1]) == 2);
+  ELIM (strlen (a[2]) == 3);
+  ELIM (strlen (a[3]) == 4);
+  ELIM (strlen (a[4]) == 5);
+}
+
+void elim_char_array_cpy_consecutive (void)
+{
+  char a[5][10];
+
+  strcpy (a[0], "12345");
+  strcpy (a[1], "1234");
+  strcpy (a[2], "123");
+  strcpy (a[3], "12");
+  strcpy (a[4], "1");
+
+  ELIM (strlen (a[0]) == 5);
+  ELIM (strlen (a[1]) == 4);
+  ELIM (strlen (a[2]) == 3);
+  ELIM (strlen (a[3]) == 2);
+  ELIM (strlen (a[4]) == 1);
+}
+
+void elim_clear_char_array_cpy_consecutive (void)
+{
+  char a[5][10] = { };
+
+  strcpy (a[0], "12345");
+  strcpy (a[1], "1234");
+  strcpy (a[2], "123");
+  strcpy (a[3], "12");
+  strcpy (a[4], "1");
+
+  ELIM (strlen (a[0]) == 5);
+  ELIM (strlen (a[1]) == 4);
+  ELIM (strlen (a[2]) == 3);
+  ELIM (strlen (a[3]) == 2);
+  ELIM (strlen (a[4]) == 1);
+}
+
+struct Consec
+{
+  char s1[sizeof STR40];
+  char s2[sizeof STR40];
+  const char *p1;
+  const char *p2;
+};
+
+void elim_struct_init_consecutive (void)
+{
+  struct Consec a = { STR10, STR10, STR10, STR10 };
+
+  ELIM (strlen (a.s1) == sizeof STR10 - 1);
+  ELIM (strlen (a.s2) == sizeof STR10 - 1);
+  ELIM (strlen (a.p1) == sizeof STR10 - 1);
+  ELIM (strlen (a.p2) == sizeof STR10 - 1);
+}
+
+void elim_struct_array_init_consecutive (void)
+{
+  struct Consec a[2] = {
+    { STR10, STR20, STR30, STR40 },
+    { STR40, STR30, STR20, STR10 }
+  };
+
+  ELIM (strlen (a[0].s1) == sizeof STR10 - 1);
+  ELIM (strlen (a[0].s2) == sizeof STR20 - 1);
+  ELIM (strlen (a[0].p1) == sizeof STR30 - 1);
+  ELIM (strlen (a[0].p2) == sizeof STR40 - 1);
+
+  ELIM (strlen (a[1].s1) == sizeof STR40 - 1);
+  ELIM (strlen (a[1].s2) == sizeof STR30 - 1);
+  ELIM (strlen (a[1].p1) == sizeof STR20 - 1);
+  ELIM (strlen (a[1].p2) == sizeof STR10 - 1);
+}
+
+struct NonConsec
+{
+  char s1[sizeof STR40];
+  int i1;
+  char s2[sizeof STR40];
+  int i2;
+  const char *p1;
+  int i3;
+  const char *p2;
+  int i4;
+};
+
+void elim_struct_init_nonconsecutive (void)
+{
+  struct NonConsec b = { STR10, 123, STR20, 456, b.s1, 789, b.s2, 123 };
+
+  ELIM (strlen (b.s1) == sizeof STR10 - 1);
+  ELIM (strlen (b.s2) == sizeof STR20 - 1);
+  ELIM (strlen (b.p1) == sizeof STR10 - 1);
+  ELIM (strlen (b.p2) == sizeof STR20 - 1);
+}
+
+void elim_struct_assign_tmp_nonconsecutive (void)
+{
+  struct NonConsec b = { "a", 1, "b", 2, "c", 3, "d", 4 };
+
+  b = (struct NonConsec){ STR10, 123, STR20, 456, STR30, 789, STR40, 123 };
+
+  ELIM (strlen (b.s1) == sizeof STR10 - 1);
+  ELIM (strlen (b.s2) == sizeof STR20 - 1);
+  ELIM (strlen (b.p1) == sizeof STR30 - 1);
+  ELIM (strlen (b.p2) == sizeof STR40 - 1);
+}
+
+const struct NonConsec bcst = {
+  STR40, -1, STR30, -2, STR20, -3, STR10, -4
+};
+
+void elim_struct_assign_cst_nonconsecutive (void)
+{
+  struct NonConsec b = { "a", 1, "b", 2, "c", 3, "d" };
+
+  b = bcst;
+
+  ELIM (strlen (b.s1) == sizeof STR40 - 1);
+  ELIM (strlen (b.s2) == sizeof STR30 - 1);
+  ELIM (strlen (b.p1) == sizeof STR20 - 1);
+  ELIM (strlen (b.p2) == sizeof STR10 - 1);
+}
+
+void elim_struct_copy_cst_nonconsecutive (void)
+{
+  struct NonConsec b = { "a", 1, "b", 2, "c", 3, "d" };
+  memcpy (&b, &bcst, sizeof b);
+
+  /* ELIM (strlen (b.s1) == sizeof STR40 - 1);
+     ELIM (strlen (b.s2) == sizeof STR30 - 1); */
+  ELIM (strlen (b.p1) == sizeof STR20 - 1);
+  ELIM (strlen (b.p2) == sizeof STR10 - 1);
+}
+
+
+#line 1000
+
+int sink (void*);
+
+void keep_init_nonconsecutive (void)
+{
+  struct NonConsec b = {
+    STR10, 123, STR20, 456, b.s1, 789, b.s2,
+    sink (&b)
+  };
+
+  KEEP (strlen (b.s1) == sizeof STR10 - 1);
+  KEEP (strlen (b.s2) == sizeof STR10 - 1);
+  KEEP (strlen (b.p1) == sizeof STR10 - 1);
+  KEEP (strlen (b.p2) == sizeof STR10 - 1);
+}
+
+void keep_assign_tmp_nonconsecutive (void)
+{
+  struct NonConsec b = { "a", 1, "b", 2, "c", 3, "d", 4 };
+
+  b = (struct NonConsec){
+    STR10, 123, STR20, 456, STR30, 789, STR40,
+    sink (&b)
+  };
+
+  KEEP (strlen (b.s1) == sizeof STR10 - 1);
+  KEEP (strlen (b.s2) == sizeof STR20 - 1);
+  KEEP (strlen (b.p1) == sizeof STR30 - 1);
+  KEEP (strlen (b.p2) == sizeof STR40 - 1);
+}
+
+/* { dg-final { scan-tree-dump-times "call_in_true_branch_not_eliminated_" 0 "optimized" } }
+
+   { dg-final { scan-tree-dump-times "call_made_in_true_branch_on_line_1\[0-9\]\[0-9\]\[0-9\]" 8 "optimized" } }
+   { dg-final { scan-tree-dump-times "call_made_in_false_branch_on_line_1\[0-9\]\[0-9\]\[0-9\]" 8 "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-83.c b/gcc/testsuite/gcc.dg/strlenopt-83.c
new file mode 100644
index 0000000..5baafea
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-83.c
@@ -0,0 +1,83 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+   { dg-do compile }
+   { dg-options "-O2 -Wall -fdump-tree-optimized" } */
+
+#include "strlenopt.h"
+char *p_p2, *p_p5, *p_p9, *p_p14;
+
+unsigned n0, n1, n2, n3, n4;
+
+
+static inline __attribute__ ((always_inline)) void
+elim_strlen_of_consecutive_strcpy (char *p)
+{
+  p_p2 = p + 2;
+  __builtin_strcpy (p_p2, "12");
+
+  p_p5 = p_p2 + 3;
+  __builtin_strcpy (p_p5, "124");
+
+  p_p9 = p_p5 + 4;
+  __builtin_strcpy (p_p9, "1245");
+
+  p_p14 = p_p9 + 5;
+
+  n0 = __builtin_strlen (p);
+  n1 = __builtin_strlen (p_p2);
+  n2 = __builtin_strlen (p_p5);
+  n3 = __builtin_strlen (p_p9);
+
+  /* The following isn't handled yet:
+     n4 = __builtin_strlen (p_p14); */
+
+  if (n0 || n1 != 2 || n2 != 3 || n3 != 4)
+    __builtin_abort ();
+}
+
+
+void elim_strlen_of_consecutive_strcpy_in_alloca (unsigned n)
+{
+  /* Only known sizes are handled so far.  */
+  n = 14;
+
+  char *p = __builtin_alloca (n);
+
+  *p = '\0';
+
+  elim_strlen_of_consecutive_strcpy (p);
+}
+
+
+void elim_strlen_of_consecutive_strcpy_in_vla (unsigned n)
+{
+  /* Only known sizes are handled so far.  */
+  n = 14;
+
+  char vla[n];
+
+  *vla = '\0';
+
+  elim_strlen_of_consecutive_strcpy (vla);
+}
+
+void elim_strlen_of_consecutive_strcpy_in_malloc (unsigned n)
+{
+  char *p = __builtin_malloc (n);
+
+  *p = '\0';
+
+  elim_strlen_of_consecutive_strcpy (p);
+}
+
+
+void elim_strlen_of_consecutive_strcpy_in_calloc (unsigned n)
+{
+  char *p = __builtin_calloc (n, 1);
+
+  /* Do not store into *P to verify that strlen knows it's zero.  */
+
+  elim_strlen_of_consecutive_strcpy (p);
+}
+
+/* { dg-final { scan-tree-dump-not "abort" "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-84.c b/gcc/testsuite/gcc.dg/strlenopt-84.c
new file mode 100644
index 0000000..d6102b6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-84.c
@@ -0,0 +1,135 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+   Verify that stores that overwrite an interior nul are correctly
+   reflected in strlen results.
+   { dg-do run }
+   { dg-options "-O2 -Wall" } */
+
+#define false (0 == 1)
+#define true (0 == 0)
+#define assert(e)							\
+  ((e) ? (void)0 : (__builtin_printf ("assertion failed on line %i\n",	\
+				      __LINE__), __builtin_abort ()))
+
+#define ATTR(...) __attribute__ ((__VA_ARGS__))
+
+static inline int ATTR (always_inline)
+assign_and_get_length (char *p, _Bool clear)
+{
+  p[0] = 'a';
+
+  if (clear)
+    p[1] = 0;
+
+  p[2] = 'c';
+
+  if (clear)
+    p[3] = 0;
+
+  p[1] = 'b';
+
+  return __builtin_strlen (p);
+}
+
+ATTR (noipa) void array_get_length (void)
+{
+  char a[4];
+  unsigned n = assign_and_get_length (a, true);
+  assert (n == 3);
+}
+
+ATTR (noipa) void clear_array_get_length (void)
+{
+  char a[4] = { };
+  unsigned n = assign_and_get_length (a, false);
+  assert (n == 3);
+}
+
+ATTR (noipa) void calloc_get_length (void)
+{
+  char *p = __builtin_calloc (5, 1);
+  unsigned n = assign_and_get_length (p, false);
+  assert (n == 3);
+}
+
+ATTR (noipa) void malloc_get_length (void)
+{
+  char *p = __builtin_malloc (5);
+  unsigned n = assign_and_get_length (p, true);
+  assert (n == 3);
+}
+
+ATTR (noipa) void vla_get_length (int n)
+{
+  char a[n];
+  unsigned len = assign_and_get_length (a, true);
+  assert (len == 3);
+}
+
+
+static inline void ATTR (always_inline)
+assign_and_test_length (char *p, _Bool clear)
+{
+  p[0] = 'a';
+
+  if (clear)
+    p[1] = 0;
+
+  p[2] = 'c';
+
+  if (clear)
+    p[3] = 0;
+
+  unsigned n0 =  __builtin_strlen (p);
+
+  p[1] = 'b';
+
+  unsigned n1 =  __builtin_strlen (p);
+  assert (n0 != n1);
+}
+
+ATTR (noipa) void array_test_length (void)
+{
+  char a[4];
+  assign_and_test_length (a, true);
+}
+
+ATTR (noipa) void clear_array_test_length (void)
+{
+  char a[4] = { };
+  assign_and_test_length (a, false);
+}
+
+ATTR (noipa) void calloc_test_length (void)
+{
+  char *p = __builtin_calloc (5, 1);
+  assign_and_test_length (p, false);
+}
+
+ATTR (noipa) void malloc_test_length (void)
+{
+  char *p = __builtin_malloc (5);
+  assign_and_test_length (p, true);
+}
+
+ATTR (noipa) void vla_test_length (int n)
+{
+  char a[n];
+  assign_and_test_length (a, true);
+}
+
+int main (void)
+{
+  array_get_length ();
+  clear_array_get_length ();
+  calloc_get_length ();
+  malloc_get_length ();
+  vla_get_length (4);
+
+  array_test_length ();
+  clear_array_test_length ();
+  calloc_test_length ();
+  malloc_test_length ();
+  vla_test_length (4);
+}
+
diff --git a/gcc/testsuite/gcc.dg/strlenopt-85.c b/gcc/testsuite/gcc.dg/strlenopt-85.c
new file mode 100644
index 0000000..e049e0c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-85.c
@@ -0,0 +1,44 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+   Verify that a strlen() call is eliminated for a pointer to a region
+   of memory allocated by calloc() even if one or more nul bytes are
+   written into it.
+   { dg-do compile }
+   { dg-options "-O2 -fdump-tree-optimized" } */
+
+unsigned n0, n1;
+
+void* elim_strlen_calloc_store_memset_1 (unsigned a, unsigned b)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[0] = '\0';
+  p[1] = '\0';
+  p[2] = '\0';
+  p[3] = '\0';
+
+  __builtin_memset (p, 0, b);
+
+  n0 = __builtin_strlen (p);
+
+  return p;
+}
+
+void* elim_strlen_calloc_store_memset_2 (unsigned a, unsigned b, unsigned c)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[1] = '\0';
+  __builtin_memset (p, 0, b);
+
+  n0 = __builtin_strlen (p);
+
+  p[3] = 0;
+  __builtin_memset (p, 0, c);
+
+  n1 = __builtin_strlen (p);
+
+  return p;
+}
+
+/* { dg-final { scan-tree-dump-not "__builtin_strlen" "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-86.c b/gcc/testsuite/gcc.dg/strlenopt-86.c
new file mode 100644
index 0000000..3e86fa3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-86.c
@@ -0,0 +1,57 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+   Verify that a strlen() call is not eliminated for a pointer to a region
+   of memory allocated by calloc() if a byte is written into the region
+   that isn't known to be nul.
+   { dg-do compile }
+   { dg-options "-O2 -fdump-tree-optimized" } */
+
+unsigned n0, n1;
+
+void*
+keep_strlen_calloc_store_cst_memset (unsigned a, unsigned b)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[1] = 'x';
+
+  __builtin_memset (p, 0, b);
+
+  n0 = __builtin_strlen (p);
+
+  return p;
+}
+
+void*
+keep_strlen_calloc_store_var_memset (int x, unsigned a, unsigned b)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[1] = x;
+
+  __builtin_memset (p, 0, b);
+
+  n0 = __builtin_strlen (p);
+
+  return p;
+}
+
+void*
+keep_strlen_calloc_store_memset_2 (int x, unsigned a, unsigned b, unsigned c)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[1] = x;
+  __builtin_memset (p, 0, b);
+
+  n0 = __builtin_strlen (p);
+
+  p[3] = x;
+  __builtin_memset (p, 0, c);
+
+  n1 = __builtin_strlen (p);
+
+  return p;
+}
+
+/* { dg-final { scan-tree-dump-times "__builtin_strlen" 4 "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/calloc-4.c b/gcc/testsuite/gcc.dg/tree-ssa/calloc-4.c
new file mode 100644
index 0000000..b3a1d0c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/calloc-4.c
@@ -0,0 +1,37 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+   Verify that a memset() call to zero out a subregion of memory
+   allocated by calloc() is eliminated even if a zero byte is written
+   into it in between the two calls.  See the calloc-2.c test that
+   verifies that the memset() calls isn't eliminated if the written
+   value is non-zero.
+   { dg-do compile }
+   { dg-options "-O2 -fdump-tree-optimized" } */
+
+void* elim_calloc_store_memset_1 (unsigned a, unsigned b)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[1] = '\0';
+
+  __builtin_memset (p, 0, b);   // should be eliminated
+
+  return p;
+}
+
+void* elim_calloc_store_memset_2 (unsigned a, unsigned b, unsigned c)
+{
+  char *p = __builtin_calloc (a, 1);
+
+  p[1] = '\0';
+  __builtin_memset (p, 0, b);   // should be eliminated
+
+  p[3] = '\0';
+  __builtin_memset (p, 0, c);   // should also be eliminated
+
+  return p;
+}
+
+/* { dg-final { scan-tree-dump-not "malloc" "optimized" } }
+   { dg-final { scan-tree-dump-times "_calloc \\\(" 2 "optimized" } }
+   { dg-final { scan-tree-dump-not "_memset \\\(" "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/calloc-5.c b/gcc/testsuite/gcc.dg/tree-ssa/calloc-5.c
new file mode 100644
index 0000000..3d3e5a1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/calloc-5.c
@@ -0,0 +1,22 @@
+/* PR tree-optimization/83821 - local aggregate initialization defeats
+   strlen optimization
+   Verify that with DSE disabled, a memset() call to zero out a subregion
+   of memory allocated by calloc() is not eliminated after a non-zero byte
+   is written into it using memset() in between the two calls.
+   { dg-do compile }
+   { dg-options "-O2 -fno-tree-dse -fdump-tree-optimized" } */
+
+char* keep_memset_calls (void)
+{
+  char *p = __builtin_calloc (12, 1);
+
+  __builtin_memset (p + 5, 1, 2);   /* dead store (not eliminated) */
+
+  __builtin_memset (p, 0, 12);      /* must not be eliminated */
+
+  return p;
+}
+
+/* { dg-final { scan-tree-dump-not "malloc" "optimized" } }
+   { dg-final { scan-tree-dump-times "_calloc \\\(" 1 "optimized" } }
+   { dg-final { scan-tree-dump-times "_memset \\\(" 2 "optimized" } } */
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index bd1eb0d..ff9b92b 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -1094,11 +1094,16 @@ get_range_strlen_dynamic (tree src, c_strlen_data *pdata,
 }
 
 /* Invalidate string length information for strings whose length
-   might change due to stores in stmt.  */
+   might change due to stores in stmt, except those marked DON'T
+   INVALIDATE.  For string-modifying statements, ZERO_WRITE is
+   set when the statement wrote only zeros.  */
 
 static bool
-maybe_invalidate (gimple *stmt)
+maybe_invalidate (gimple *stmt, bool zero_write = false)
 {
+  if (dump_file && (dump_flags & TDF_DETAILS))
+    fprintf (dump_file, "  %s()\n", __func__);
+
   strinfo *si;
   unsigned int i;
   bool nonempty = false;
@@ -1109,18 +1114,59 @@ maybe_invalidate (gimple *stmt)
 	if (!si->dont_invalidate)
 	  {
 	    ao_ref r;
-	    /* Do not use si->nonzero_chars.  */
-	    ao_ref_init_from_ptr_and_size (&r, si->ptr, NULL_TREE);
+	    tree size = NULL_TREE;
+	    if (si->nonzero_chars)
+	      {
+		/* Include the terminating nul in the size of the string
+		   to consider when determining possible clobber.  */
+		tree type = TREE_TYPE (si->nonzero_chars);
+		size = fold_build2 (PLUS_EXPR, type, si->nonzero_chars,
+				    build_int_cst (type, 1));
+	      }
+	    ao_ref_init_from_ptr_and_size (&r, si->ptr, size);
 	    if (stmt_may_clobber_ref_p_1 (stmt, &r))
 	      {
+		if (dump_file && (dump_flags & TDF_DETAILS))
+		  {
+		    if (size && tree_fits_uhwi_p (size))
+		      fprintf (dump_file,
+			       "  statement may clobber string %zu long\n",
+			       tree_to_uhwi (size));
+		    else
+		      fprintf (dump_file,
+			       "  statement may clobber string\n");
+		  }
+
 		set_strinfo (i, NULL);
 		free_strinfo (si);
 		continue;
 	      }
+
+	    if (size
+		&& !zero_write
+		&& si->stmt
+		&& is_gimple_call (si->stmt)
+		&& (DECL_FUNCTION_CODE (gimple_call_fndecl (si->stmt))
+		    == BUILT_IN_CALLOC))
+	      {
+		/* If the clobber test above considered the length of
+		   the string (including the nul), then for (potentially)
+		   non-zero writes that might modify storage allocated by
+		   calloc consider the whole object and if it might be
+		   clobbered by the statement reset the allocation
+		   statement.  */
+		ao_ref_init_from_ptr_and_size (&r, si->ptr, NULL_TREE);
+		if (stmt_may_clobber_ref_p_1 (stmt, &r))
+		  si->stmt = NULL;
+	      }
 	  }
 	si->dont_invalidate = false;
 	nonempty = true;
       }
+
+  if (dump_file && (dump_flags & TDF_DETAILS))
+    fprintf (dump_file, "  %s() ==> %i\n", __func__, nonempty);
+
   return nonempty;
 }
 
@@ -3213,11 +3259,15 @@ handle_builtin_malloc (enum built_in_function bcode, gimple_stmt_iterator *gsi)
    return true when the call is transfomred, false otherwise.  */
 
 static bool
-handle_builtin_memset (gimple_stmt_iterator *gsi)
+handle_builtin_memset (gimple_stmt_iterator *gsi, bool *zero_write)
 {
   gimple *stmt2 = gsi_stmt (*gsi);
   if (!integer_zerop (gimple_call_arg (stmt2, 1)))
     return false;
+
+  /* Let the caller know the memset call cleared the destination.  */
+  *zero_write = true;
+
   tree ptr = gimple_call_arg (stmt2, 0);
   int idx1 = get_stridx (ptr);
   if (idx1 <= 0)
@@ -4223,7 +4273,7 @@ count_nonzero_bytes (tree exp, unsigned lenrange[3], bool *nulterm,
    '*(int*)a = 12345').  Return true when handled.  */
 
 static bool
-handle_store (gimple_stmt_iterator *gsi, const vr_values *rvals)
+handle_store (gimple_stmt_iterator *gsi, bool *zero_write, const vr_values *rvals)
 {
   int idx = -1;
   strinfo *si = NULL;
@@ -4250,7 +4300,10 @@ handle_store (gimple_stmt_iterator *gsi, const vr_values *rvals)
 	  if (offset == 0)
 	    ssaname = TREE_OPERAND (lhs, 0);
 	  else if (si == NULL || compare_nonzero_chars (si, offset, rvals) < 0)
-	    return true;
+	    {
+	      *zero_write = initializer_zerop (rhs);
+	      return true;
+	    }
 	}
     }
   else
@@ -4285,6 +4338,7 @@ handle_store (gimple_stmt_iterator *gsi, const vr_values *rvals)
     {
       rhs_minlen = lenrange[0];
       storing_nonzero_p = lenrange[1] > 0;
+      *zero_write = storing_all_zeros_p;
 
       /* Avoid issuing multiple warnings for the same LHS or statement.
 	 For example, -Warray-bounds may have already been issued for
@@ -4649,6 +4703,7 @@ is_char_type (tree type)
 
 static bool
 strlen_check_and_optimize_call (gimple_stmt_iterator *gsi,
+				bool *zero_write,
 				const vr_values *rvals)
 {
   gimple *stmt = gsi_stmt (*gsi);
@@ -4708,7 +4763,7 @@ strlen_check_and_optimize_call (gimple_stmt_iterator *gsi,
       handle_builtin_malloc (DECL_FUNCTION_CODE (callee), gsi);
       break;
     case BUILT_IN_MEMSET:
-      if (handle_builtin_memset (gsi))
+      if (handle_builtin_memset (gsi, zero_write))
 	return false;
       break;
     case BUILT_IN_MEMCMP:
@@ -4855,9 +4910,13 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
 {
   gimple *stmt = gsi_stmt (*gsi);
 
+  /* For statements that modify a string, set to true if the write
+     is only zeros.  */
+  bool zero_write = false;
+
   if (is_gimple_call (stmt))
     {
-      if (!strlen_check_and_optimize_call (gsi, rvals))
+      if (!strlen_check_and_optimize_call (gsi, &zero_write, rvals))
 	return false;
     }
   else if (!flag_optimize_strlen || !strlen_optimize)
@@ -4907,7 +4966,7 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
 	  }
 
 	/* Handle a single or multibyte assignment.  */
-	if (is_char_store && !handle_store (gsi, rvals))
+	if (is_char_store && !handle_store (gsi, &zero_write, rvals))
 	  return false;
       }
     }
@@ -4920,7 +4979,7 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
     }
 
   if (gimple_vdef (stmt))
-    maybe_invalidate (stmt);
+    maybe_invalidate (stmt, zero_write);
   return true;
 }
 
-- 
cgit v1.1


From 3599dfbaa22b95ecabd3da9ba68ad4bb4f1124a4 Mon Sep 17 00:00:00 2001
From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Wed, 16 Oct 2019 22:01:25 +0100
Subject: RISC-V: Include more registers in SIBCALL_REGS.

This finishes the part 1 of 2 patch submitted by Andrew Burgess on Aug 19.
This adds the argument registers but not t0 (aka x5) to SIBCALL_REGS.  It
also adds the missing riscv_regno_to_class change.

Tested with cross riscv32-elf and riscv64-linux toolchain build and check.
There were no regressions.  I see about a 0.01% code size reduction for the
C and libstdc++ libraries.

	gcc/
	* config/riscv/riscv.h (REG_CLASS_CONTENTS): Add argument passing
	regs to SIBCALL_REGS.
	* config/riscv/riscv.c (riscv_regno_to_class): Change argument
	passing regs to SIBCALL_REGS.

Co-Authored-By: Jim Wilson <jimw@sifive.com>

From-SVN: r277082
---
 gcc/ChangeLog            | 8 ++++++++
 gcc/config/riscv/riscv.c | 6 +++---
 gcc/config/riscv/riscv.h | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b81945b..5c56e0a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-16  Andrew Burgess  <andrew.burgess@embecosm.com>
+	    Jim Wilson  <jimw@sifive.com>
+
+	* config/riscv/riscv.h (REG_CLASS_CONTENTS): Add argument passing
+	regs to SIBCALL_REGS.
+	* config/riscv/riscv.c (riscv_regno_to_class): Change argument
+	passing regs to SIBCALL_REGS.
+
 2019-10-16  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/83821
diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
index b8a8778..77a3ad9 100644
--- a/gcc/config/riscv/riscv.c
+++ b/gcc/config/riscv/riscv.c
@@ -256,9 +256,9 @@ enum riscv_microarchitecture_type riscv_microarchitecture;
 const enum reg_class riscv_regno_to_class[FIRST_PSEUDO_REGISTER] = {
   GR_REGS,	GR_REGS,	GR_REGS,	GR_REGS,
   GR_REGS,	GR_REGS,	SIBCALL_REGS,	SIBCALL_REGS,
-  JALR_REGS,	JALR_REGS,	JALR_REGS,	JALR_REGS,
-  JALR_REGS,	JALR_REGS,	JALR_REGS,	JALR_REGS,
-  JALR_REGS,	JALR_REGS, 	JALR_REGS,	JALR_REGS,
+  JALR_REGS,	JALR_REGS,	SIBCALL_REGS,	SIBCALL_REGS,
+  SIBCALL_REGS,	SIBCALL_REGS,	SIBCALL_REGS,	SIBCALL_REGS,
+  SIBCALL_REGS,	SIBCALL_REGS,	JALR_REGS,	JALR_REGS,
   JALR_REGS,	JALR_REGS,	JALR_REGS,	JALR_REGS,
   JALR_REGS,	JALR_REGS,	JALR_REGS,	JALR_REGS,
   SIBCALL_REGS,	SIBCALL_REGS,	SIBCALL_REGS,	SIBCALL_REGS,
diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
index 5fc9be8..2464946 100644
--- a/gcc/config/riscv/riscv.h
+++ b/gcc/config/riscv/riscv.h
@@ -400,7 +400,7 @@ enum reg_class
 #define REG_CLASS_CONTENTS						\
 {									\
   { 0x00000000, 0x00000000, 0x00000000 },	/* NO_REGS */		\
-  { 0xf00000c0, 0x00000000, 0x00000000 },	/* SIBCALL_REGS */	\
+  { 0xf003fcc0, 0x00000000, 0x00000000 },	/* SIBCALL_REGS */	\
   { 0xffffffc0, 0x00000000, 0x00000000 },	/* JALR_REGS */		\
   { 0xffffffff, 0x00000000, 0x00000000 },	/* GR_REGS */		\
   { 0x00000000, 0xffffffff, 0x00000000 },	/* FP_REGS */		\
-- 
cgit v1.1


From e5b04038edcea3b3f65dec5bd34a0d018b45c1b1 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 17 Oct 2019 00:18:31 +0200
Subject: tree-ssa-strlen.c (maybe_invalidate): Use
 HOST_WIDE_INT_PRINT_UNSIGNED instead of "%zu".

	* tree-ssa-strlen.c (maybe_invalidate): Use
	HOST_WIDE_INT_PRINT_UNSIGNED instead of "%zu".

From-SVN: r277083
---
 gcc/ChangeLog         | 5 +++++
 gcc/tree-ssa-strlen.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c56e0a..85b88cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* tree-ssa-strlen.c (maybe_invalidate): Use
+	HOST_WIDE_INT_PRINT_UNSIGNED instead of "%zu".
+
 2019-10-16  Andrew Burgess  <andrew.burgess@embecosm.com>
 	    Jim Wilson  <jimw@sifive.com>
 
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index ff9b92b..5c229ca 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -1130,7 +1130,8 @@ maybe_invalidate (gimple *stmt, bool zero_write = false)
 		  {
 		    if (size && tree_fits_uhwi_p (size))
 		      fprintf (dump_file,
-			       "  statement may clobber string %zu long\n",
+			       "  statement may clobber string "
+			       HOST_WIDE_INT_PRINT_UNSIGNED " long\n",
 			       tree_to_uhwi (size));
 		    else
 		      fprintf (dump_file,
-- 
cgit v1.1


From 606358faa6dbcebb271c1eb9b269a93374fba784 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 17 Oct 2019 00:19:13 +0200
Subject: decl.c (cxx_maybe_build_cleanup): When clearing location of
 cleanup...

	* decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,
	if cleanup is a nop, clear location of its operand too.

From-SVN: r277084
---
 gcc/cp/ChangeLog | 5 +++++
 gcc/cp/decl.c    | 2 ++
 2 files changed, 7 insertions(+)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ecaf312..6c1e6b4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,
+	if cleanup is a nop, clear location of its operand too.
+
 2019-10-15  Nathan Sidwell  <nathan@acm.org>
 
 	* class.c (build_clones): Break out of clone_function_decl.  Just
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a9ff427..5e510c9 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -16864,6 +16864,8 @@ cxx_maybe_build_cleanup (tree decl, tsubst_flags_t complain)
      the end of the block.  So let's unset the location of the
      destructor call instead.  */
   protected_set_expr_location (cleanup, UNKNOWN_LOCATION);
+  if (cleanup && CONVERT_EXPR_P (cleanup))
+    protected_set_expr_location (TREE_OPERAND (cleanup, 0), UNKNOWN_LOCATION);
 
   if (cleanup
       && DECL_P (decl)
-- 
cgit v1.1


From f347c16be21bcb7ade7a495bb17f6321fa494f05 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Thu, 17 Oct 2019 00:16:16 +0000
Subject: Daily bump.

From-SVN: r277088
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index e6b876a..6f145ca 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191016
+20191017
-- 
cgit v1.1


From 24baab8af424826d87c992592944ddef7bfa2e93 Mon Sep 17 00:00:00 2001
From: Luis Machado <luis.machado@linaro.org>
Date: Thu, 17 Oct 2019 00:37:05 +0000
Subject: Fix old file reference in gcc/cp/cp-gimplify.c

I've found this stale reference while looking at cp-gimplify.c. tree-gimple.c
no longer exists and its contents were merged into gimple.c.

Seems obvious enough.

gcc/cp/ChangeLog:

2019-10-16  Luis Machado  <luis.machado@linaro.org>

	* cp-gimplify.c: Fix reference to non-existing tree-gimple.c file.

From-SVN: r277089
---
 gcc/cp/ChangeLog     | 4 ++++
 gcc/cp/cp-gimplify.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6c1e6b4..679c26d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-16  Luis Machado  <luis.machado@linaro.org>
+
+	* cp-gimplify.c: Fix reference to non-existing tree-gimple.c file.
+
 2019-10-16  Jakub Jelinek  <jakub@redhat.com>
 
 	* decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 154fa70..0ab0438 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -1,4 +1,4 @@
-/* C++-specific tree lowering bits; see also c-gimplify.c and tree-gimple.c.
+/* C++-specific tree lowering bits; see also c-gimplify.c and gimple.c.
 
    Copyright (C) 2002-2019 Free Software Foundation, Inc.
    Contributed by Jason Merrill <jason@redhat.com>
-- 
cgit v1.1


From abf0474f8a8a466befb8fa4b00b44a51bab22143 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 17 Oct 2019 06:16:50 +0000
Subject: re PR debug/91887 (-fdebug-types-section ICE building chromium)

2019-10-17  Richard Biener  <rguenther@suse.de>

	PR debug/91887
	* dwarf2out.c (gen_formal_parameter_die): Also try to match
	context_die against a DW_TAG_GNU_formal_parameter_pack parent.

	* g++.dg/debug/dwarf2/pr91887.C: New testcase.

From-SVN: r277090
---
 gcc/ChangeLog                               |  6 ++++++
 gcc/dwarf2out.c                             | 23 +++++++++++------------
 gcc/testsuite/ChangeLog                     |  5 +++++
 gcc/testsuite/g++.dg/debug/dwarf2/pr91887.C | 12 ++++++++++++
 4 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/debug/dwarf2/pr91887.C

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85b88cf..afe0d29 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
+	PR debug/91887
+	* dwarf2out.c (gen_formal_parameter_die): Also try to match
+	context_die against a DW_TAG_GNU_formal_parameter_pack parent.
+
 2019-10-16  Jakub Jelinek  <jakub@redhat.com>
 
 	* tree-ssa-strlen.c (maybe_invalidate): Use
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index bf69ce4..9f1d921 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -22304,19 +22304,18 @@ gen_formal_parameter_die (tree node, tree origin, bool emit_name_p,
       /* If the contexts differ, we may not be talking about the same
 	 thing.
 	 ???  When in LTO the DIE parent is the "abstract" copy and the
-	 context_die is the specification "copy".  But this whole block
-	 should eventually be no longer needed.  */
-      if (parm_die && parm_die->die_parent != context_die && !in_lto_p)
+	 context_die is the specification "copy".  */
+      if (parm_die
+	  && parm_die->die_parent != context_die
+	  && (parm_die->die_parent->die_tag != DW_TAG_GNU_formal_parameter_pack
+	      || parm_die->die_parent->die_parent != context_die)
+	  && !in_lto_p)
 	{
-	  if (!DECL_ABSTRACT_P (node))
-	    {
-	      /* This can happen when creating an inlined instance, in
-		 which case we need to create a new DIE that will get
-		 annotated with DW_AT_abstract_origin.  */
-	      parm_die = NULL;
-	    }
-	  else
-	    gcc_unreachable ();
+	  gcc_assert (!DECL_ABSTRACT_P (node));
+	  /* This can happen when creating a concrete instance, in
+	     which case we need to create a new DIE that will get
+	     annotated with DW_AT_abstract_origin.  */
+	  parm_die = NULL;
 	}
 
       if (parm_die && parm_die->die_parent == NULL)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0785e41..b574d99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
+	PR debug/91887
+	* g++.dg/debug/dwarf2/pr91887.C: New testcase.
+
 2019-10-16  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/83821
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr91887.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr91887.C
new file mode 100644
index 0000000..6cd99cc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr91887.C
@@ -0,0 +1,12 @@
+// { dg-do compile }
+// { dg-require-effective-target c++11 }
+// { dg-options "-g -fdebug-types-section" }
+class A {
+public:
+  A();
+  template <typename U> A(U);
+};
+template <class> struct B { typedef A type; };
+template <class R, typename... Args>
+int Bind(R(Args...), typename B<Args>::type...) { return 0; }
+void KeepBufferRefs(A, A) { A a, b(Bind(KeepBufferRefs, a, b)); }
-- 
cgit v1.1


From 62900598dfec3c26b203bb8847277db9f4c40ed2 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 17 Oct 2019 08:46:53 +0200
Subject: re PR fortran/87752 (ICE in omp_add_variable, at gimplify.c:6776)

	PR fortran/87752
	* gfortran.dg/gomp/pr87752.f90: New test.

From-SVN: r277091
---
 gcc/testsuite/ChangeLog                    |  5 +++++
 gcc/testsuite/gfortran.dg/gomp/pr87752.f90 | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 gcc/testsuite/gfortran.dg/gomp/pr87752.f90

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b574d99..e23272a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR fortran/87752
+	* gfortran.dg/gomp/pr87752.f90: New test.
+
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
 	PR debug/91887
diff --git a/gcc/testsuite/gfortran.dg/gomp/pr87752.f90 b/gcc/testsuite/gfortran.dg/gomp/pr87752.f90
new file mode 100644
index 0000000..072de21
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/pr87752.f90
@@ -0,0 +1,12 @@
+! PR fortran/87752
+! { dg-do compile }
+! { dg-additional-options "-Ofast" }
+
+subroutine foo (n, u, v)
+  integer :: n
+  real, pointer :: u(:), v(:)
+  !$omp parallel do simd
+  do i = 1, n
+    u(:) = v(:)
+  end do
+end
-- 
cgit v1.1


From 432b4f729dff4808de4f3b00ff9b312db095afc3 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 17 Oct 2019 09:20:36 +0200
Subject: re PR tree-optimization/92115 (ICE in gimple_cond_get_ops_from_tree,
 at gimple-expr.c:577)

	PR tree-optimization/92115
	* tree-ssa-ifcombine.c (ifcombine_ifandif): Force condition into
	temporary if it could trap.

	* gcc.dg/pr92115.c: New test.

From-SVN: r277092
---
 gcc/ChangeLog                  |  6 ++++++
 gcc/testsuite/ChangeLog        |  3 +++
 gcc/testsuite/gcc.dg/pr92115.c | 10 ++++++++++
 gcc/tree-ssa-ifcombine.c       |  6 ++++++
 4 files changed, 25 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/pr92115.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afe0d29..5fccbd4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/92115
+	* tree-ssa-ifcombine.c (ifcombine_ifandif): Force condition into
+	temporary if it could trap.
+
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
 	PR debug/91887
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e23272a..c79ba7b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-10-17  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/92115
+	* gcc.dg/pr92115.c: New test.
+
 	PR fortran/87752
 	* gfortran.dg/gomp/pr87752.f90: New test.
 
diff --git a/gcc/testsuite/gcc.dg/pr92115.c b/gcc/testsuite/gcc.dg/pr92115.c
new file mode 100644
index 0000000..ae506d4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr92115.c
@@ -0,0 +1,10 @@
+/* PR tree-optimization/92115 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -fexceptions -ffinite-math-only -fnon-call-exceptions -fsignaling-nans -fno-signed-zeros" } */
+
+void
+foo (double x)
+{
+  if (x == 0.0 && !__builtin_signbit (x))
+    __builtin_abort ();
+}
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 90d8bb5..21c1b0e 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -599,6 +599,12 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
       t = canonicalize_cond_expr_cond (t);
       if (!t)
 	return false;
+      if (!is_gimple_condexpr_for_cond (t))
+	{
+	  gsi = gsi_for_stmt (inner_cond);
+	  t = force_gimple_operand_gsi_1 (&gsi, t, is_gimple_condexpr_for_cond,
+					  NULL, true, GSI_SAME_STMT);
+	}
       gimple_cond_set_condition_from_tree (inner_cond, t);
       update_stmt (inner_cond);
 
-- 
cgit v1.1


From 0bbb0ca112279e5b6704d1e51b396f0e2a136251 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 17 Oct 2019 09:21:24 +0200
Subject: re PR tree-optimization/92056 (ice in expr_object_size, at
 tree-object-si ze.c:675 with -O3)

	PR tree-optimization/92056
	* tree-object-size.c (cond_expr_object_size): Return early if then_
	processing resulted in unknown size.

	* gcc.c-torture/compile/pr92056.c: New test.

From-SVN: r277093
---
 gcc/ChangeLog                                 |  4 ++++
 gcc/testsuite/ChangeLog                       |  3 +++
 gcc/testsuite/gcc.c-torture/compile/pr92056.c | 18 ++++++++++++++++++
 gcc/tree-object-size.c                        |  3 +++
 4 files changed, 28 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr92056.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5fccbd4..0dd5d8c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-17  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/92056
+	* tree-object-size.c (cond_expr_object_size): Return early if then_
+	processing resulted in unknown size.
+
 	PR tree-optimization/92115
 	* tree-ssa-ifcombine.c (ifcombine_ifandif): Force condition into
 	temporary if it could trap.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c79ba7b..eb3112d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-10-17  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/92056
+	* gcc.c-torture/compile/pr92056.c: New test.
+
 	PR tree-optimization/92115
 	* gcc.dg/pr92115.c: New test.
 
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr92056.c b/gcc/testsuite/gcc.c-torture/compile/pr92056.c
new file mode 100644
index 0000000..d04da76
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr92056.c
@@ -0,0 +1,18 @@
+/* PR tree-optimization/92056 */
+
+const char *d;
+
+void
+foo (int c, char *e, const char *a, const char *b)
+{
+  switch (c)
+    {
+    case 33:
+      for (;; d++)
+        if (__builtin_strcmp (b ? : "", d))
+          return;
+      break;
+    case 4:
+      __builtin_sprintf (e, a);
+    }
+}
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index db9b569..6e79bbd 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -903,6 +903,9 @@ cond_expr_object_size (struct object_size_info *osi, tree var, gimple *stmt)
   else
     expr_object_size (osi, var, then_);
 
+  if (object_sizes[object_size_type][varno] == unknown[object_size_type])
+    return reexamine;
+
   if (TREE_CODE (else_) == SSA_NAME)
     reexamine |= merge_object_sizes (osi, var, else_, 0);
   else
-- 
cgit v1.1


From 7ca9ca86bd43ab86cb023c1a7cf1dc465b2e2c25 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 17 Oct 2019 07:39:37 +0000
Subject: re PR tree-optimization/92129 (ICE in vectorizable_reduction, at
 tree-vect-loop.c:5869)

2019-10-17  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92129
	* tree-vect-loop.c (vectorizable_reduction): Also fail
	on GIMPLE_SINGLE_RHS.

From-SVN: r277094
---
 gcc/ChangeLog        | 6 ++++++
 gcc/tree-vect-loop.c | 1 +
 2 files changed, 7 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dd5d8c..607b94d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92129
+	* tree-vect-loop.c (vectorizable_reduction): Also fail
+	on GIMPLE_SINGLE_RHS.
+
 2019-10-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/92056
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 0530d66..d2ddc66 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -5772,6 +5772,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       break;
 
     case GIMPLE_UNARY_RHS:
+    case GIMPLE_SINGLE_RHS:
       return false;
 
     default:
-- 
cgit v1.1


From e9934c8c081bb4b412684809e1d8a1293c7ea21f Mon Sep 17 00:00:00 2001
From: Feng Xue <fxue@os.amperecomputing.com>
Date: Thu, 17 Oct 2019 09:55:37 +0000
Subject: re PR testsuite/92125 (New test gcc.dg/ipa/pr91088.c introduced in
 r277054 fails)

PR testsuite/92125

2019-10-17  Feng Xue  <fxue@os.amperecomputing.com>

        PR testsuite/92125
        * gcc.dg/ipa/pr91088.c: Change char conversion to bitand.

From-SVN: r277095
---
 gcc/testsuite/ChangeLog            | 5 +++++
 gcc/testsuite/gcc.dg/ipa/pr91088.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eb3112d..38dd0d2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  Feng Xue  <fxue@os.amperecomputing.com>
+
+	PR testsuite/92125
+	* gcc.dg/ipa/pr91088.c: Change char conversion to bitand.
+
 2019-10-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/92056
diff --git a/gcc/testsuite/gcc.dg/ipa/pr91088.c b/gcc/testsuite/gcc.dg/ipa/pr91088.c
index a81c59f..cc146a8 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr91088.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr91088.c
@@ -76,7 +76,7 @@ int callee2 (short *p)
 
 int callee3 (int v)
 {
-  if ((27 % ((1 - (char) v) * 3)) < 6)
+  if ((27 % ((1 - (v & 0xff)) * 3)) < 6)
     {
       large_code;
       return v + 2;
@@ -117,4 +117,4 @@ int caller ()
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of callee3" 1 "cp" } } */
 /* { dg-final { scan-ipa-dump "op0\\\[offset: 32],\\(\\(short int\\) #\\),\\(\\(int\\) #\\),\\(1300 / #\\) == 19" "cp" } } */
 /* { dg-final { scan-ipa-dump "op0\\\[ref offset: 0],\\(# \\^ 1\\) <" "cp" } } */
-/* { dg-final { scan-ipa-dump "op0,\\(\\(char\\) #\\),\\(\\(int\\) #\\),\\(1 - #\\),\\(# \\* 3\\),\\(27 % #\\) <" "cp" } } */
+/* { dg-final { scan-ipa-dump "op0,\\(# & 255\\),\\(1 - #\\),\\(# \\* 3\\),\\(27 % #\\) <" "cp" } } */
-- 
cgit v1.1


From 7fa848b52615cc1e937c07b20e640a7379bbdfa0 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Thu, 17 Oct 2019 10:21:08 +0000
Subject: progmem-error-1.cpp: Fix location of the expected diagnostic.

gcc/testsuite/
	* gcc.target/avr/progmem-error-1.cpp: Fix location of the
	expected diagnostic.

From-SVN: r277096
---
 gcc/testsuite/ChangeLog                          | 5 +++++
 gcc/testsuite/gcc.target/avr/progmem-error-1.cpp | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 38dd0d2..65e80d5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  Georg-Johann Lay  <avr@gjlay.de>
+
+	* gcc.target/avr/progmem-error-1.cpp: Fix location of the
+	expected diagnostic.
+
 2019-10-17  Feng Xue  <fxue@os.amperecomputing.com>
 
 	PR testsuite/92125
diff --git a/gcc/testsuite/gcc.target/avr/progmem-error-1.cpp b/gcc/testsuite/gcc.target/avr/progmem-error-1.cpp
index b1676c1..a948819 100644
--- a/gcc/testsuite/gcc.target/avr/progmem-error-1.cpp
+++ b/gcc/testsuite/gcc.target/avr/progmem-error-1.cpp
@@ -2,7 +2,4 @@
 
 #include "progmem.h"
 
-char str[] PROGMEM = "Hallo";
-/* This is the line number of the PROGMEM definition in progmem.h.  Keep it 
-   absolute.  */
-/* { dg-error "must be const" "" { target avr-*-* } 1 } */
+char str[] PROGMEM = "Hallo"; /* { dg-error "must be const" "" { target avr-*-* } } */
-- 
cgit v1.1


From c95ee96bee5db83038e931750c0866608a59107c Mon Sep 17 00:00:00 2001
From: Mark Eggleston <mark.eggleston@codethink.com>
Date: Thu, 17 Oct 2019 10:39:49 +0000
Subject: Additional test cases for using automatic variables in equivalence
 statements.

From-SVN: r277097
---
 gcc/testsuite/ChangeLog                       |  8 ++++++++
 gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90 | 19 +++++++++++++++++++
 gcc/testsuite/gfortran.dg/auto_in_equiv_4.f90 | 18 ++++++++++++++++++
 gcc/testsuite/gfortran.dg/auto_in_equiv_5.f90 | 18 ++++++++++++++++++
 gcc/testsuite/gfortran.dg/auto_in_equiv_6.f90 | 18 ++++++++++++++++++
 gcc/testsuite/gfortran.dg/auto_in_equiv_7.f90 | 19 +++++++++++++++++++
 6 files changed, 100 insertions(+)
 create mode 100644 gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90
 create mode 100644 gcc/testsuite/gfortran.dg/auto_in_equiv_4.f90
 create mode 100644 gcc/testsuite/gfortran.dg/auto_in_equiv_5.f90
 create mode 100644 gcc/testsuite/gfortran.dg/auto_in_equiv_6.f90
 create mode 100644 gcc/testsuite/gfortran.dg/auto_in_equiv_7.f90

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 65e80d5..401149a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-17  Mark Eggleston <mark.eggleston@codethink.com>
+
+	* gfortran.dg/auto_in_equiv_3.f90: New test.
+	* gfortran.dg/auto_in_equiv_4.f90: New test.
+	* gfortran.dg/auto_in_equiv_5.f90: New test.
+	* gfortran.dg/auto_in_equiv_6.f90: New test.
+	* gfortran.dg/auto_in_equiv_7.f90: New test.
+
 2019-10-17  Georg-Johann Lay  <avr@gjlay.de>
 
 	* gcc.target/avr/progmem-error-1.cpp: Fix location of the
diff --git a/gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90 b/gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90
new file mode 100644
index 0000000..35f6e0f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/auto_in_equiv_3.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! { dg-options "-fdec-static -fdump-tree-original" }
+!
+
+subroutine foo
+  integer, automatic :: a
+  integer :: b
+  equivalence (a, b)
+  a = 5
+  if (b.ne.5) stop 1
+end subroutine
+
+! { dg-final { scan-tree-dump "union" "original" } }
+! { dg-final { scan-tree-dump-not "static union" "original" } }
+! { dg-final { scan-tree-dump "integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump-not "static integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump "integer\\(kind=4\\) b" "original" } }
+! { dg-final { scan-tree-dump-not "static integer\\(kind=4\\) b" "original" } }
+
diff --git a/gcc/testsuite/gfortran.dg/auto_in_equiv_4.f90 b/gcc/testsuite/gfortran.dg/auto_in_equiv_4.f90
new file mode 100644
index 0000000..3188f19
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/auto_in_equiv_4.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! { dg-options "-fdec-static -fno-automatic -fdump-tree-original" }
+!
+! Neither of the local variable have the automatic attribute so they
+! not be allocated on the stack.
+
+subroutine foo
+  integer :: a
+  integer :: b
+  equivalence (a, b)
+  a = 5
+  if (b.ne.5) stop 1
+end subroutine
+
+! { dg-final { scan-tree-dump "static union" "original" } }
+! { dg-final { scan-tree-dump "static integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump "static integer\\(kind=4\\) b" "original" } }
+
diff --git a/gcc/testsuite/gfortran.dg/auto_in_equiv_5.f90 b/gcc/testsuite/gfortran.dg/auto_in_equiv_5.f90
new file mode 100644
index 0000000..d1e08a6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/auto_in_equiv_5.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! { dg-options "-fdump-tree-original" }
+!
+! Neither of the local variable have the automatic attribute so they
+! not be allocated on the stack.
+
+subroutine foo
+  integer, save :: a
+  integer :: b
+  equivalence (a, b)
+  a = 5
+  if (b.ne.5) stop 1
+end subroutine
+
+! { dg-final { scan-tree-dump "static union" "original" } }
+! { dg-final { scan-tree-dump "static integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump "static integer\\(kind=4\\) b" "original" } }
+
diff --git a/gcc/testsuite/gfortran.dg/auto_in_equiv_6.f90 b/gcc/testsuite/gfortran.dg/auto_in_equiv_6.f90
new file mode 100644
index 0000000..f413521
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/auto_in_equiv_6.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! { dg-options "-fdec-static -fdump-tree-original" }
+!
+! Neither of the local variable have the automatic attribute so they
+! not be allocated on the stack.
+
+subroutine foo
+  integer, static :: a
+  integer :: b
+  equivalence (a, b)
+  a = 5
+  if (b.ne.5) stop 1
+end subroutine
+
+! { dg-final { scan-tree-dump "static union" "original" } }
+! { dg-final { scan-tree-dump "static integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump "static integer\\(kind=4\\) b" "original" } }
+
diff --git a/gcc/testsuite/gfortran.dg/auto_in_equiv_7.f90 b/gcc/testsuite/gfortran.dg/auto_in_equiv_7.f90
new file mode 100644
index 0000000..fd7e672
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/auto_in_equiv_7.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! { dg-options "-fdec-static -fdump-tree-original" }
+!
+
+subroutine foo
+  integer :: a
+  integer, automatic :: b
+  equivalence (a, b)
+  a = 5
+  if (b.ne.5) stop 1
+end subroutine
+
+! { dg-final { scan-tree-dump "union" "original" } }
+! { dg-final { scan-tree-dump-not "static union" "original" } }
+! { dg-final { scan-tree-dump "integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump-not "static integer\\(kind=4\\) a" "original" } }
+! { dg-final { scan-tree-dump "integer\\(kind=4\\) b" "original" } }
+! { dg-final { scan-tree-dump-not "static integer\\(kind=4\\) b" "original" } }
+
-- 
cgit v1.1


From 54a31ca9bd6e56e0416a2a57bfa70dc77d099fca Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 17 Oct 2019 11:11:40 +0000
Subject: tree-ssa-pre.c (create_component_ref_by_pieces_1): Fix TARGET_MEM_REF
 creation.

2019-10-17  Richard Biener  <rguenther@suse.de>

	* tree-ssa-pre.c (create_component_ref_by_pieces_1): Fix
	TARGET_MEM_REF creation.

From-SVN: r277098
---
 gcc/ChangeLog      | 5 +++++
 gcc/tree-ssa-pre.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 607b94d..bdafc58 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
+	* tree-ssa-pre.c (create_component_ref_by_pieces_1): Fix
+	TARGET_MEM_REF creation.
+
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/92129
 	* tree-vect-loop.c (vectorizable_reduction): Also fail
 	on GIMPLE_SINGLE_RHS.
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 0f8f424..363dec6 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -2492,7 +2492,7 @@ create_component_ref_by_pieces_1 (basic_block block, vn_reference_t ref,
     case TARGET_MEM_REF:
       {
 	tree genop0 = NULL_TREE, genop1 = NULL_TREE;
-	vn_reference_op_t nextop = &ref->operands[++*operand];
+	vn_reference_op_t nextop = &ref->operands[(*operand)++];
 	tree baseop = create_component_ref_by_pieces_1 (block, ref, operand,
 							stmts);
 	if (!baseop)
-- 
cgit v1.1


From 728ece16a633863c0a2f78239dc2679167b099dc Mon Sep 17 00:00:00 2001
From: Christophe Lyon <christophe.lyon@linaro.org>
Date: Thu, 17 Oct 2019 11:28:04 +0000
Subject: [ARM,testsuite] Fix typo in arm_arch_v8a_ok effective target.

The arm_arch_v8a_ok effective-target lacks a closing bracket in these
tests, resulting in it being ignored.

2019-10-17  Christophe Lyon  <christophe.lyon@linaro.org>

	gcc/testsuite/
	* gcc.target/arm/vseleqdf.c: Add missing closing bracket.
	* gcc.target/arm/vseleqsf.c: Likewise.
	* gcc.target/arm/vselgedf.c: Likewise.
	* gcc.target/arm/vselgesf.c: Likewise.
	* gcc.target/arm/vselgtdf.c: Likewise.
	* gcc.target/arm/vselgtsf.c: Likewise.
	* gcc.target/arm/vselledf.c: Likewise.
	* gcc.target/arm/vsellesf.c: Likewise.
	* gcc.target/arm/vselltdf.c: Likewise.
	* gcc.target/arm/vselltsf.c: Likewise.
	* gcc.target/arm/vselnedf.c: Likewise.
	* gcc.target/arm/vselnesf.c: Likewise.
	* gcc.target/arm/vselvcdf.c: Likewise.
	* gcc.target/arm/vselvcsf.c: Likewise.
	* gcc.target/arm/vselvsdf.c: Likewise.
	* gcc.target/arm/vselvssf.c: Likewise.

From-SVN: r277099
---
 gcc/testsuite/ChangeLog                 | 19 +++++++++++++++++++
 gcc/testsuite/gcc.target/arm/vseleqdf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vseleqsf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselgedf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselgesf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselgtdf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselgtsf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselledf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vsellesf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselltdf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselltsf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselnedf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselnesf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselvcdf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselvcsf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselvsdf.c |  2 +-
 gcc/testsuite/gcc.target/arm/vselvssf.c |  2 +-
 17 files changed, 35 insertions(+), 16 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 401149a..3949616 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2019-10-17  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/arm/vseleqdf.c: Add missing closing bracket.
+	* gcc.target/arm/vseleqsf.c: Likewise.
+	* gcc.target/arm/vselgedf.c: Likewise.
+	* gcc.target/arm/vselgesf.c: Likewise.
+	* gcc.target/arm/vselgtdf.c: Likewise.
+	* gcc.target/arm/vselgtsf.c: Likewise.
+	* gcc.target/arm/vselledf.c: Likewise.
+	* gcc.target/arm/vsellesf.c: Likewise.
+	* gcc.target/arm/vselltdf.c: Likewise.
+	* gcc.target/arm/vselltsf.c: Likewise.
+	* gcc.target/arm/vselnedf.c: Likewise.
+	* gcc.target/arm/vselnesf.c: Likewise.
+	* gcc.target/arm/vselvcdf.c: Likewise.
+	* gcc.target/arm/vselvcsf.c: Likewise.
+	* gcc.target/arm/vselvsdf.c: Likewise.
+	* gcc.target/arm/vselvssf.c: Likewise.
+
 2019-10-17  Mark Eggleston <mark.eggleston@codethink.com>
 
 	* gfortran.dg/auto_in_equiv_3.f90: New test.
diff --git a/gcc/testsuite/gcc.target/arm/vseleqdf.c b/gcc/testsuite/gcc.target/arm/vseleqdf.c
index 64d5784..8a43335 100644
--- a/gcc/testsuite/gcc.target/arm/vseleqdf.c
+++ b/gcc/testsuite/gcc.target/arm/vseleqdf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vseleqsf.c b/gcc/testsuite/gcc.target/arm/vseleqsf.c
index b052704..fc46318 100644
--- a/gcc/testsuite/gcc.target/arm/vseleqsf.c
+++ b/gcc/testsuite/gcc.target/arm/vseleqsf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselgedf.c b/gcc/testsuite/gcc.target/arm/vselgedf.c
index e10508f..9a74edd 100644
--- a/gcc/testsuite/gcc.target/arm/vselgedf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgedf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselgesf.c b/gcc/testsuite/gcc.target/arm/vselgesf.c
index 645cf5d..5f10954 100644
--- a/gcc/testsuite/gcc.target/arm/vselgesf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgesf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselgtdf.c b/gcc/testsuite/gcc.target/arm/vselgtdf.c
index 741b9a8..7ceaa34 100644
--- a/gcc/testsuite/gcc.target/arm/vselgtdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgtdf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselgtsf.c b/gcc/testsuite/gcc.target/arm/vselgtsf.c
index 3042c5b..9062ba2 100644
--- a/gcc/testsuite/gcc.target/arm/vselgtsf.c
+++ b/gcc/testsuite/gcc.target/arm/vselgtsf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselledf.c b/gcc/testsuite/gcc.target/arm/vselledf.c
index dcf46a3..4aa66ce 100644
--- a/gcc/testsuite/gcc.target/arm/vselledf.c
+++ b/gcc/testsuite/gcc.target/arm/vselledf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vsellesf.c b/gcc/testsuite/gcc.target/arm/vsellesf.c
index 38b06eb..9dcb791 100644
--- a/gcc/testsuite/gcc.target/arm/vsellesf.c
+++ b/gcc/testsuite/gcc.target/arm/vsellesf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselltdf.c b/gcc/testsuite/gcc.target/arm/vselltdf.c
index 4d4d91c..238860d 100644
--- a/gcc/testsuite/gcc.target/arm/vselltdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselltdf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselltsf.c b/gcc/testsuite/gcc.target/arm/vselltsf.c
index ab3f77f..6f179ba 100644
--- a/gcc/testsuite/gcc.target/arm/vselltsf.c
+++ b/gcc/testsuite/gcc.target/arm/vselltsf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselnedf.c b/gcc/testsuite/gcc.target/arm/vselnedf.c
index 4b0fa5e..3f5881e 100644
--- a/gcc/testsuite/gcc.target/arm/vselnedf.c
+++ b/gcc/testsuite/gcc.target/arm/vselnedf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselnesf.c b/gcc/testsuite/gcc.target/arm/vselnesf.c
index 4fcd5a0..e72b902 100644
--- a/gcc/testsuite/gcc.target/arm/vselnesf.c
+++ b/gcc/testsuite/gcc.target/arm/vselnesf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselvcdf.c b/gcc/testsuite/gcc.target/arm/vselvcdf.c
index 9701e11..408d095 100644
--- a/gcc/testsuite/gcc.target/arm/vselvcdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvcdf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselvcsf.c b/gcc/testsuite/gcc.target/arm/vselvcsf.c
index 2d47f30..ccded1f 100644
--- a/gcc/testsuite/gcc.target/arm/vselvcsf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvcsf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselvsdf.c b/gcc/testsuite/gcc.target/arm/vselvsdf.c
index 54555a2..f67bde1 100644
--- a/gcc/testsuite/gcc.target/arm/vselvsdf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvsdf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
diff --git a/gcc/testsuite/gcc.target/arm/vselvssf.c b/gcc/testsuite/gcc.target/arm/vselvssf.c
index a37305d..1e1d2c5 100644
--- a/gcc/testsuite/gcc.target/arm/vselvssf.c
+++ b/gcc/testsuite/gcc.target/arm/vselvssf.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm_arch_v8a_ok */
+/* { dg-require-effective-target arm_arch_v8a_ok } */
 /* { dg-require-effective-target arm_v8_vfp_ok } */
 /* { dg-options "-O2 -mcpu=cortex-a57" } */
 /* { dg-add-options arm_v8_vfp } */
-- 
cgit v1.1


From aa9dffac731d0359a0e7a925ff8f4a1bef182eac Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 17 Oct 2019 11:48:45 +0000
Subject: tree-vect-loop.c (needs_fold_left_reduction_p): Export.

2019-10-17  Richard Biener  <rguenther@suse.de>

	* tree-vect-loop.c (needs_fold_left_reduction_p): Export.
	(vect_is_simple_reduction): Move all validity checks ...
	(vectorizable_reduction): ... here.  Compute whether we
	need a fold-left reduction here.
	* tree-vect-patterns.c (vect_reassociating_reduction_p): Merge
	both overloads, check needs_fold_left_reduction_p directly.
	* tree-vectorizer.h (needs_fold_left_reduction_p): Declare.

From-SVN: r277100
---
 gcc/ChangeLog            |  10 ++++
 gcc/tree-vect-loop.c     | 127 ++++++++++++++++++++++-------------------------
 gcc/tree-vect-patterns.c |  23 ++++-----
 gcc/tree-vectorizer.h    |   1 +
 4 files changed, 80 insertions(+), 81 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdafc58..eebb890 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
+	* tree-vect-loop.c (needs_fold_left_reduction_p): Export.
+	(vect_is_simple_reduction): Move all validity checks ...
+	(vectorizable_reduction): ... here.  Compute whether we
+	need a fold-left reduction here.
+	* tree-vect-patterns.c (vect_reassociating_reduction_p): Merge
+	both overloads, check needs_fold_left_reduction_p directly.
+	* tree-vectorizer.h (needs_fold_left_reduction_p): Declare.
+
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
 	* tree-ssa-pre.c (create_component_ref_by_pieces_1): Fix
 	TARGET_MEM_REF creation.
 
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index d2ddc66..0ad32ce 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2536,7 +2536,7 @@ report_vect_op (dump_flags_t msg_type, gimple *stmt, const char *msg)
    on type TYPE.  NEED_WRAPPING_INTEGRAL_OVERFLOW is true if integer
    overflow must wrap.  */
 
-static bool
+bool
 needs_fold_left_reduction_p (tree type, tree_code code)
 {
   /* CHECKME: check for !flag_finite_math_only too?  */
@@ -2888,13 +2888,6 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       op1 = gimple_assign_rhs2 (def_stmt);
       op2 = gimple_assign_rhs3 (def_stmt);
     }
-  else if (!commutative_tree_code (code) || !associative_tree_code (code))
-    {
-      if (dump_enabled_p ())
-	report_vect_op (MSG_MISSED_OPTIMIZATION, def_stmt,
-			"reduction: not commutative/associative: ");
-      return NULL;
-    }
   else if (get_gimple_rhs_class (code) == GIMPLE_BINARY_RHS)
     {
       op1 = gimple_assign_rhs1 (def_stmt);
@@ -2917,18 +2910,6 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       return NULL;
     }
 
-  /* Check whether it's ok to change the order of the computation.
-     Generally, when vectorizing a reduction we change the order of the
-     computation.  This may change the behavior of the program in some
-     cases, so we need to check that this is ok.  One exception is when
-     vectorizing an outer-loop: the inner-loop is executed sequentially,
-     and therefore vectorizing reductions in the inner-loop during
-     outer-loop vectorization is safe.  */
-  tree type = TREE_TYPE (gimple_assign_lhs (def_stmt));
-  if (STMT_VINFO_REDUC_TYPE (phi_info) == TREE_CODE_REDUCTION
-      && needs_fold_left_reduction_p (type, code))
-    STMT_VINFO_REDUC_TYPE (phi_info) = FOLD_LEFT_REDUCTION;
-
   /* Reduction is safe. We're dealing with one of the following:
      1) integer arithmetic and no trapv
      2) floating point arithmetic, and special flags permit this optimization
@@ -5633,7 +5614,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
   enum tree_code code;
-  internal_fn reduc_fn;
   int op_type;
   enum vect_def_type dt, cond_reduc_dt = vect_unknown_def_type;
   stmt_vec_info cond_stmt_vinfo = NULL;
@@ -5873,19 +5853,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
      operation in the reduction meta.  */
   STMT_VINFO_REDUC_IDX (reduc_info) = reduc_index;
 
-  /* When vectorizing a reduction chain w/o SLP the reduction PHI is not
-     directy used in stmt.  */
-  if (reduc_index == -1)
-    {
-      if (STMT_VINFO_REDUC_TYPE (phi_info) == FOLD_LEFT_REDUCTION)
-	{
-	  if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "in-order reduction chain without SLP.\n");
-	  return false;
-	}
-    }
-
   if (!(reduc_index == -1
 	|| dts[reduc_index] == vect_reduction_def
 	|| dts[reduc_index] == vect_nested_cycle
@@ -6048,17 +6015,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       double_reduc = true;
     }
 
-  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
-  if ((double_reduc || reduction_type != TREE_CODE_REDUCTION)
-      && ncopies > 1)
-    {
-      if (dump_enabled_p ())
-	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			 "multiple types in double reduction or condition "
-			 "reduction.\n");
-      return false;
-    }
-
   /* 4.2. Check support for the epilog operation.
 
           If STMT represents a reduction pattern, then the type of the
@@ -6094,38 +6050,75 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
           (and also the same tree-code) when generating the epilog code and
           when generating the code inside the loop.  */
 
-  enum tree_code orig_code;
-  if (orig_stmt_info
-      && (reduction_type == TREE_CODE_REDUCTION
-	  || reduction_type == FOLD_LEFT_REDUCTION))
+  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
+  enum tree_code orig_code = ERROR_MARK;
+  if (reduction_type == CONST_COND_REDUCTION
+      || reduction_type == INTEGER_INDUC_COND_REDUCTION)
     {
-      /* This is a reduction pattern: get the vectype from the type of the
-         reduction variable, and get the tree-code from orig_stmt.  */
-      orig_code = gimple_assign_rhs_code (orig_stmt_info->stmt);
-      gcc_assert (vectype_out);
+      /* For simple condition reductions, replace with the actual expression
+	 we want to base our reduction around.  */
+      orig_code = STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info);
+      gcc_assert (orig_code == MAX_EXPR || orig_code == MIN_EXPR);
     }
-  else
+  else if (reduction_type == COND_REDUCTION)
+    orig_code = COND_EXPR;
+  else if (reduction_type == TREE_CODE_REDUCTION
+	   || reduction_type == FOLD_LEFT_REDUCTION)
     {
-      /* Regular reduction: use the same vectype and tree-code as used for
-         the vector code inside the loop can be used for the epilog code. */
-      orig_code = code;
-
-      if (code == MINUS_EXPR)
+      if (orig_stmt_info)
+	orig_code = gimple_assign_rhs_code (orig_stmt_info->stmt);
+      else
+	orig_code = code;
+      gcc_assert (vectype_out);
+      if (orig_code == MINUS_EXPR)
 	orig_code = PLUS_EXPR;
+    }
+  STMT_VINFO_REDUC_CODE (reduc_info) = orig_code;
 
-      /* For simple condition reductions, replace with the actual expression
-	 we want to base our reduction around.  */
-      if (reduction_type == CONST_COND_REDUCTION
-	  || reduction_type == INTEGER_INDUC_COND_REDUCTION)
+  if (reduction_type == TREE_CODE_REDUCTION)
+    {
+      /* Check whether it's ok to change the order of the computation.
+	 Generally, when vectorizing a reduction we change the order of the
+	 computation.  This may change the behavior of the program in some
+	 cases, so we need to check that this is ok.  One exception is when
+	 vectorizing an outer-loop: the inner-loop is executed sequentially,
+	 and therefore vectorizing reductions in the inner-loop during
+	 outer-loop vectorization is safe.  */
+      if (needs_fold_left_reduction_p (scalar_type, orig_code))
+	{
+	  STMT_VINFO_REDUC_TYPE (reduc_info)
+	    = reduction_type = FOLD_LEFT_REDUCTION;
+	  /* When vectorizing a reduction chain w/o SLP the reduction PHI is not
+	     directy used in stmt.  */
+	  if (reduc_index == -1)
+	    {
+	      if (dump_enabled_p ())
+		dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+				 "in-order reduction chain without SLP.\n");
+	      return false;
+	    }
+	}
+      else if (!commutative_tree_code (orig_code)
+	       || !associative_tree_code (orig_code))
 	{
-	  orig_code = STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info);
-	  gcc_assert (orig_code == MAX_EXPR || orig_code == MIN_EXPR);
+	  if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			    "reduction: not commutative/associative");
+	  return false;
 	}
     }
-  STMT_VINFO_REDUC_CODE (reduc_info) = orig_code;
 
-  reduc_fn = IFN_LAST;
+  if ((double_reduc || reduction_type != TREE_CODE_REDUCTION)
+      && ncopies > 1)
+    {
+      if (dump_enabled_p ())
+	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			 "multiple types in double reduction or condition "
+			 "reduction or fold-left reduction.\n");
+      return false;
+    }
 
+  internal_fn reduc_fn = IFN_LAST;
   if (reduction_type == TREE_CODE_REDUCTION
       || reduction_type == FOLD_LEFT_REDUCTION
       || reduction_type == INTEGER_INDUC_COND_REDUCTION
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 385482f..5387563 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -833,19 +833,8 @@ vect_convert_output (stmt_vec_info stmt_info, tree type, gimple *pattern_stmt,
 /* Return true if STMT_VINFO describes a reduction for which reassociation
    is allowed.  If STMT_INFO is part of a group, assume that it's part of
    a reduction chain and optimistically assume that all statements
-   except the last allow reassociation.  */
-
-static bool
-vect_reassociating_reduction_p (stmt_vec_info stmt_vinfo)
-{
-  if (STMT_VINFO_DEF_TYPE (stmt_vinfo) == vect_reduction_def)
-    return (STMT_VINFO_REDUC_TYPE (STMT_VINFO_REDUC_DEF (stmt_vinfo))
-	    != FOLD_LEFT_REDUCTION);
-  else
-    return REDUC_GROUP_FIRST_ELEMENT (stmt_vinfo) != NULL;
-}
-
-/* As above, but also require it to have code CODE and to be a reduction
+   except the last allow reassociation.
+   Also require it to have code CODE and to be a reduction
    in the outermost loop.  When returning true, store the operands in
    *OP0_OUT and *OP1_OUT.  */
 
@@ -867,7 +856,13 @@ vect_reassociating_reduction_p (stmt_vec_info stmt_info, tree_code code,
   if (loop && nested_in_vect_loop_p (loop, stmt_info))
     return false;
 
-  if (!vect_reassociating_reduction_p (stmt_info))
+  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_reduction_def)
+    {
+      if (needs_fold_left_reduction_p (TREE_TYPE (gimple_assign_lhs (assign)),
+				       code))
+	return false;
+    }
+  else if (REDUC_GROUP_FIRST_ELEMENT (stmt_info) == NULL)
     return false;
 
   *op0_out = gimple_assign_rhs1 (assign);
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 291304f..559d78d 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1632,6 +1632,7 @@ extern widest_int vect_iv_limit_for_full_masking (loop_vec_info loop_vinfo);
 /* Used in gimple-loop-interchange.c and tree-parloops.c.  */
 extern bool check_reduction_path (dump_user_location_t, loop_p, gphi *, tree,
 				  enum tree_code);
+extern bool needs_fold_left_reduction_p (tree, tree_code);
 /* Drive for loop analysis stage.  */
 extern opt_loop_vec_info vect_analyze_loop (class loop *,
 					    loop_vec_info,
-- 
cgit v1.1


From a421fe9e610b5dbfce1913cd724c8ba193addd47 Mon Sep 17 00:00:00 2001
From: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date: Thu, 17 Oct 2019 11:59:35 +0000
Subject: [vect] Refactor versioning threshold

gcc/ChangeLog:
2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* tree-vect-loop.c (vect_transform_loop): Move code from here...
	* tree-vect-loop-manip.c (vect_loop_versioning): ... to here.
	* tree-vectorizer.h (vect_loop_versioning): Remove unused parameters.

From-SVN: r277101
---
 gcc/ChangeLog              |  6 ++++++
 gcc/tree-vect-loop-manip.c | 11 +++++++----
 gcc/tree-vect-loop.c       | 12 +-----------
 gcc/tree-vectorizer.h      |  3 +--
 4 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eebb890..4c90b48 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	* tree-vect-loop.c (vect_transform_loop): Move code from here...
+	* tree-vect-loop-manip.c (vect_loop_versioning): ... to here.
+	* tree-vectorizer.h (vect_loop_versioning): Remove unused parameters.
+
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-loop.c (needs_fold_left_reduction_p): Export.
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 5c25441..a290226 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -2966,9 +2966,7 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, tree * cond_expr)
    *COND_EXPR_STMT_LIST.  */
 
 class loop *
-vect_loop_versioning (loop_vec_info loop_vinfo,
-		      unsigned int th, bool check_profitability,
-		      poly_uint64 versioning_threshold)
+vect_loop_versioning (loop_vec_info loop_vinfo)
 {
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo), *nloop;
   class loop *scalar_loop = LOOP_VINFO_SCALAR_LOOP (loop_vinfo);
@@ -2988,10 +2986,15 @@ vect_loop_versioning (loop_vec_info loop_vinfo,
   bool version_align = LOOP_REQUIRES_VERSIONING_FOR_ALIGNMENT (loop_vinfo);
   bool version_alias = LOOP_REQUIRES_VERSIONING_FOR_ALIAS (loop_vinfo);
   bool version_niter = LOOP_REQUIRES_VERSIONING_FOR_NITERS (loop_vinfo);
+  poly_uint64 versioning_threshold
+    = LOOP_VINFO_VERSIONING_THRESHOLD (loop_vinfo);
   tree version_simd_if_cond
     = LOOP_REQUIRES_VERSIONING_FOR_SIMD_IF_COND (loop_vinfo);
+  unsigned th = LOOP_VINFO_COST_MODEL_THRESHOLD (loop_vinfo);
 
-  if (check_profitability)
+  if (th >= vect_vf_for_cost (loop_vinfo)
+      && !LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo)
+      && !ordered_p (th, versioning_threshold))
     cond_expr = fold_build2 (GE_EXPR, boolean_type_node, scalar_loop_iters,
 			     build_int_cst (TREE_TYPE (scalar_loop_iters),
 					    th - 1));
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 0ad32ce..cdbf768 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -8083,18 +8083,8 @@ vect_transform_loop (loop_vec_info loop_vinfo)
 
   if (LOOP_REQUIRES_VERSIONING (loop_vinfo))
     {
-      poly_uint64 versioning_threshold
-	= LOOP_VINFO_VERSIONING_THRESHOLD (loop_vinfo);
-      if (check_profitability
-	  && ordered_p (poly_uint64 (th), versioning_threshold))
-	{
-	  versioning_threshold = ordered_max (poly_uint64 (th),
-					      versioning_threshold);
-	  check_profitability = false;
-	}
       class loop *sloop
-	= vect_loop_versioning (loop_vinfo, th, check_profitability,
-				versioning_threshold);
+	= vect_loop_versioning (loop_vinfo);
       sloop->force_vectorize = false;
       check_profitability = false;
     }
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 559d78d..ad8be02 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1514,8 +1514,7 @@ extern void vect_set_loop_condition (class loop *, loop_vec_info,
 extern bool slpeel_can_duplicate_loop_p (const class loop *, const_edge);
 class loop *slpeel_tree_duplicate_loop_to_edge_cfg (class loop *,
 						     class loop *, edge);
-class loop *vect_loop_versioning (loop_vec_info, unsigned int, bool,
-				   poly_uint64);
+class loop *vect_loop_versioning (loop_vec_info);
 extern class loop *vect_do_peeling (loop_vec_info, tree, tree,
 				     tree *, tree *, tree *, int, bool, bool);
 extern void vect_prepare_for_masked_peels (loop_vec_info);
-- 
cgit v1.1


From e400b49192683f2f57e1e977b5d4d302c63ab8aa Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 17 Oct 2019 12:04:51 +0000
Subject: [C++ PATCH] builtin fn creation

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01283.html
	* decl.c (builtin_function_1): Merge into ...
	(cxx_builtin_function): ... here.  Nadger the decl before maybe
	copying it.  Set the context.
	(cxx_builtin_function_ext_scope): Push to top level, then call
	cxx_builtin_function.

From-SVN: r277102
---
 gcc/cp/ChangeLog |  8 ++++++
 gcc/cp/decl.c    | 77 +++++++++++++++++++++-----------------------------------
 2 files changed, 36 insertions(+), 49 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 679c26d..09fe6b1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-17  Nathan Sidwell  <nathan@acm.org>
+
+	* decl.c (builtin_function_1): Merge into ...
+	(cxx_builtin_function): ... here.  Nadger the decl before maybe
+	copying it.  Set the context.
+	(cxx_builtin_function_ext_scope): Push to top level, then call
+	cxx_builtin_function.
+
 2019-10-16  Luis Machado  <luis.machado@linaro.org>
 
 	* cp-gimplify.c: Fix reference to non-existing tree-gimple.c file.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 5e510c9..23e04e5 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -71,7 +71,6 @@ static tree grokvardecl (tree, tree, tree, const cp_decl_specifier_seq *,
 			 int, int, int, bool, int, tree, location_t);
 static void check_static_variable_definition (tree, tree);
 static void record_unknown_type (tree, const char *);
-static tree builtin_function_1 (tree, tree, bool);
 static int member_function_or_else (tree, tree, enum overload_flags);
 static tree local_variable_p_walkfn (tree *, int *, void *);
 static const char *tag_name (enum tag_types);
@@ -4629,12 +4628,13 @@ cp_make_fname_decl (location_t loc, tree id, int type_dep)
   return decl;
 }
 
-static tree
-builtin_function_1 (tree decl, tree context, bool is_global)
-{
-  tree          id = DECL_NAME (decl);
-  const char *name = IDENTIFIER_POINTER (id);
+/* Install DECL as a builtin function at current (global) scope.
+   Return the new decl (if we found an existing version).  Also
+   installs it into ::std, if it's not '_*'.  */
 
+tree
+cxx_builtin_function (tree decl)
+{
   retrofit_lang_decl (decl);
 
   DECL_ARTIFICIAL (decl) = 1;
@@ -4644,47 +4644,35 @@ builtin_function_1 (tree decl, tree context, bool is_global)
   DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
   DECL_VISIBILITY_SPECIFIED (decl) = 1;
 
-  DECL_CONTEXT (decl) = context;
-
-  /* A function in the user's namespace should have an explicit
-     declaration before it is used.  Mark the built-in function as
-     anticipated but not actually declared.  */
+  tree id = DECL_NAME (decl);
+  const char *name = IDENTIFIER_POINTER (id);
   if (name[0] != '_' || name[1] != '_')
+    /* In the user's namespace, it must be declared before use.  */
+    DECL_ANTICIPATED (decl) = 1;
+  else if (IDENTIFIER_LENGTH (id) > strlen ("___chk")
+	   && 0 != strncmp (name + 2, "builtin_", strlen ("builtin_"))
+	   && 0 == memcmp (name + IDENTIFIER_LENGTH (id) - strlen ("_chk"),
+			   "_chk", strlen ("_chk") + 1))
+    /* Treat __*_chk fortification functions as anticipated as well,
+       unless they are __builtin_*_chk.  */
     DECL_ANTICIPATED (decl) = 1;
-  else if (strncmp (name + 2, "builtin_", strlen ("builtin_")) != 0)
-    {
-      size_t len = strlen (name);
-
-      /* Treat __*_chk fortification functions as anticipated as well,
-	 unless they are __builtin_*.  */
-      if (len > strlen ("___chk")
-	  && memcmp (name + len - strlen ("_chk"),
-		     "_chk", strlen ("_chk") + 1) == 0)
-	DECL_ANTICIPATED (decl) = 1;
-    }
-
-  if (is_global)
-    return pushdecl_top_level (decl);
-  else
-    return pushdecl (decl);
-}
 
-tree
-cxx_builtin_function (tree decl)
-{
-  tree          id = DECL_NAME (decl);
-  const char *name = IDENTIFIER_POINTER (id);
   /* All builtins that don't begin with an '_' should additionally
      go in the 'std' namespace.  */
   if (name[0] != '_')
     {
-      tree decl2 = copy_node(decl);
+      tree std_decl = copy_decl (decl);
+
       push_namespace (std_identifier);
-      builtin_function_1 (decl2, std_node, false);
+      DECL_CONTEXT (std_decl) = FROB_CONTEXT (std_node);
+      pushdecl (std_decl);
       pop_namespace ();
     }
 
-  return builtin_function_1 (decl, NULL_TREE, false);
+  DECL_CONTEXT (decl) = FROB_CONTEXT (current_namespace);
+  decl = pushdecl (decl);
+
+  return decl;
 }
 
 /* Like cxx_builtin_function, but guarantee the function is added to the global
@@ -4696,20 +4684,11 @@ cxx_builtin_function (tree decl)
 tree
 cxx_builtin_function_ext_scope (tree decl)
 {
+  push_nested_namespace (global_namespace);
+  decl = cxx_builtin_function (decl);
+  pop_nested_namespace (global_namespace);
 
-  tree          id = DECL_NAME (decl);
-  const char *name = IDENTIFIER_POINTER (id);
-  /* All builtins that don't begin with an '_' should additionally
-     go in the 'std' namespace.  */
-  if (name[0] != '_')
-    {
-      tree decl2 = copy_node(decl);
-      push_namespace (std_identifier);
-      builtin_function_1 (decl2, std_node, true);
-      pop_namespace ();
-    }
-
-  return builtin_function_1 (decl, NULL_TREE, true);
+  return decl;
 }
 
 /* Generate a FUNCTION_DECL with the typical flags for a runtime library
-- 
cgit v1.1


From 31b35fd503e1c6713839db24044812d237aba5f1 Mon Sep 17 00:00:00 2001
From: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date: Thu, 17 Oct 2019 12:07:04 +0000
Subject: [vect] Outline code into new function: determine_peel_for_niter

gcc/ChangeLog:
2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* tree-vect-loop.c (determine_peel_for_niter): New function contained
	outlined code from ...
	(vect_analyze_loop_2): ... here.

From-SVN: r277103
---
 gcc/ChangeLog        |  6 ++++
 gcc/tree-vect-loop.c | 92 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 58 insertions(+), 40 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c90b48..9b17a6d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
+	* tree-vect-loop.c (determine_peel_for_niter): New function contained
+	outlined code from ...
+	(vect_analyze_loop_2): ... here.
+
+2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
 	* tree-vect-loop.c (vect_transform_loop): Move code from here...
 	* tree-vect-loop-manip.c (vect_loop_versioning): ... to here.
 	* tree-vectorizer.h (vect_loop_versioning): Remove unused parameters.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index cdbf768..df9f159 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -1808,6 +1808,57 @@ vect_dissolve_slp_only_groups (loop_vec_info loop_vinfo)
     }
 }
 
+
+/* Decides whether we need to create an epilogue loop to handle
+   remaining scalar iterations and sets PEELING_FOR_NITERS accordingly.  */
+
+void
+determine_peel_for_niter (loop_vec_info loop_vinfo)
+{
+  LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = false;
+
+  unsigned HOST_WIDE_INT const_vf;
+  HOST_WIDE_INT max_niter
+    = likely_max_stmt_executions_int (LOOP_VINFO_LOOP (loop_vinfo));
+
+  unsigned th = LOOP_VINFO_COST_MODEL_THRESHOLD (loop_vinfo);
+  if (!th && LOOP_VINFO_ORIG_LOOP_INFO (loop_vinfo))
+    th = LOOP_VINFO_COST_MODEL_THRESHOLD (LOOP_VINFO_ORIG_LOOP_INFO
+					  (loop_vinfo));
+
+  if (LOOP_VINFO_FULLY_MASKED_P (loop_vinfo))
+    /* The main loop handles all iterations.  */
+    LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = false;
+  else if (LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo)
+	   && LOOP_VINFO_PEELING_FOR_ALIGNMENT (loop_vinfo) >= 0)
+    {
+      /* Work out the (constant) number of iterations that need to be
+	 peeled for reasons other than niters.  */
+      unsigned int peel_niter = LOOP_VINFO_PEELING_FOR_ALIGNMENT (loop_vinfo);
+      if (LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo))
+	peel_niter += 1;
+      if (!multiple_p (LOOP_VINFO_INT_NITERS (loop_vinfo) - peel_niter,
+		       LOOP_VINFO_VECT_FACTOR (loop_vinfo)))
+	LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = true;
+    }
+  else if (LOOP_VINFO_PEELING_FOR_ALIGNMENT (loop_vinfo)
+	   /* ??? When peeling for gaps but not alignment, we could
+	      try to check whether the (variable) niters is known to be
+	      VF * N + 1.  That's something of a niche case though.  */
+	   || LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo)
+	   || !LOOP_VINFO_VECT_FACTOR (loop_vinfo).is_constant (&const_vf)
+	   || ((tree_ctz (LOOP_VINFO_NITERS (loop_vinfo))
+		< (unsigned) exact_log2 (const_vf))
+	       /* In case of versioning, check if the maximum number of
+		  iterations is greater than th.  If they are identical,
+		  the epilogue is unnecessary.  */
+	       && (!LOOP_REQUIRES_VERSIONING (loop_vinfo)
+		   || ((unsigned HOST_WIDE_INT) max_niter
+		       > (th / const_vf) * const_vf))))
+    LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = true;
+}
+
+
 /* Function vect_analyze_loop_2.
 
    Apply a set of analyses on LOOP, and create a loop_vec_info struct
@@ -1935,7 +1986,6 @@ vect_analyze_loop_2 (loop_vec_info loop_vinfo, bool &fatal, unsigned *n_stmts)
   vect_compute_single_scalar_iteration_cost (loop_vinfo);
 
   poly_uint64 saved_vectorization_factor = LOOP_VINFO_VECT_FACTOR (loop_vinfo);
-  unsigned th;
 
   /* Check the SLP opportunities in the loop, analyze and build SLP trees.  */
   ok = vect_analyze_slp (loop_vinfo, *n_stmts);
@@ -1975,9 +2025,6 @@ start_over:
 		   LOOP_VINFO_INT_NITERS (loop_vinfo));
     }
 
-  HOST_WIDE_INT max_niter
-    = likely_max_stmt_executions_int (LOOP_VINFO_LOOP (loop_vinfo));
-
   /* Analyze the alignment of the data-refs in the loop.
      Fail if a data reference is found that cannot be vectorized.  */
 
@@ -2081,42 +2128,7 @@ start_over:
     return opt_result::failure_at (vect_location,
 				   "Loop costings not worthwhile.\n");
 
-  /* Decide whether we need to create an epilogue loop to handle
-     remaining scalar iterations.  */
-  th = LOOP_VINFO_COST_MODEL_THRESHOLD (loop_vinfo);
-
-  unsigned HOST_WIDE_INT const_vf;
-  if (LOOP_VINFO_FULLY_MASKED_P (loop_vinfo))
-    /* The main loop handles all iterations.  */
-    LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = false;
-  else if (LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo)
-	   && LOOP_VINFO_PEELING_FOR_ALIGNMENT (loop_vinfo) >= 0)
-    {
-      /* Work out the (constant) number of iterations that need to be
-	 peeled for reasons other than niters.  */
-      unsigned int peel_niter = LOOP_VINFO_PEELING_FOR_ALIGNMENT (loop_vinfo);
-      if (LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo))
-	peel_niter += 1;
-      if (!multiple_p (LOOP_VINFO_INT_NITERS (loop_vinfo) - peel_niter,
-		       LOOP_VINFO_VECT_FACTOR (loop_vinfo)))
-	LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = true;
-    }
-  else if (LOOP_VINFO_PEELING_FOR_ALIGNMENT (loop_vinfo)
-	   /* ??? When peeling for gaps but not alignment, we could
-	      try to check whether the (variable) niters is known to be
-	      VF * N + 1.  That's something of a niche case though.  */
-	   || LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo)
-	   || !LOOP_VINFO_VECT_FACTOR (loop_vinfo).is_constant (&const_vf)
-	   || ((tree_ctz (LOOP_VINFO_NITERS (loop_vinfo))
-		< (unsigned) exact_log2 (const_vf))
-	       /* In case of versioning, check if the maximum number of
-		  iterations is greater than th.  If they are identical,
-		  the epilogue is unnecessary.  */
-	       && (!LOOP_REQUIRES_VERSIONING (loop_vinfo)
-		   || ((unsigned HOST_WIDE_INT) max_niter
-		       > (th / const_vf) * const_vf))))
-    LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo) = true;
-
+  determine_peel_for_niter (loop_vinfo);
   /* If an epilogue loop is required make sure we can create one.  */
   if (LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo)
       || LOOP_VINFO_PEELING_FOR_NITER (loop_vinfo))
-- 
cgit v1.1


From f261d4808cc28a2dfd47fe06c97364c0869bb78f Mon Sep 17 00:00:00 2001
From: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date: Thu, 17 Oct 2019 12:35:33 +0000
Subject: [vect] Be consistent in versioning threshold use

gcc/ChangeLog:
2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* tree-vect-loop.c (vect_analyze_loop_2): Use same condition to decide
	when to use versioning threshold.

From-SVN: r277105
---
 gcc/ChangeLog        | 5 +++++
 gcc/tree-vect-loop.c | 9 +++++++++
 2 files changed, 14 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b17a6d..9c0e754 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
+	* tree-vect-loop.c (vect_analyze_loop_2): Use same condition to decide
+	when to use versioning threshold.
+
+2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
 	* tree-vect-loop.c (determine_peel_for_niter): New function contained
 	outlined code from ...
 	(vect_analyze_loop_2): ... here.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index df9f159..fa5c216 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2154,6 +2154,7 @@ start_over:
   if (LOOP_REQUIRES_VERSIONING (loop_vinfo))
     {
       poly_uint64 niters_th = 0;
+      unsigned int th = LOOP_VINFO_COST_MODEL_THRESHOLD (loop_vinfo);
 
       if (!vect_use_loop_mask_for_alignment_p (loop_vinfo))
 	{
@@ -2174,6 +2175,14 @@ start_over:
       /* One additional iteration because of peeling for gap.  */
       if (LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo))
 	niters_th += 1;
+
+      /*  Use the same condition as vect_transform_loop to decide when to use
+	  the cost to determine a versioning threshold.  */
+      if (th >= vect_vf_for_cost (loop_vinfo)
+	  && !LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo)
+	  && ordered_p (th, niters_th))
+	niters_th = ordered_max (poly_uint64 (th), niters_th);
+
       LOOP_VINFO_VERSIONING_THRESHOLD (loop_vinfo) = niters_th;
     }
 
-- 
cgit v1.1


From b223a28db4e098ef2005daaac6c669912f249d97 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@redhat.com>
Date: Thu, 17 Oct 2019 12:38:38 +0000
Subject: re PR tree-optimization/92131 (incorrect assumption that (ao >= 0) is
 always false)

	PR tree-optimization/92131
	* tree-vrp.c (value_range_base::dump): Display +INF for both
	pointers and integers when appropriate.

From-SVN: r277107
---
 gcc/ChangeLog                         | 6 ++++++
 gcc/testsuite/ChangeLog               | 4 ++++
 gcc/testsuite/gcc.dg/tree-ssa/evrp4.c | 2 +-
 gcc/tree-vrp.c                        | 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9c0e754..3126adc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-17  Aldy Hernandez  <aldyh@redhat.com>
+
+	PR tree-optimization/92131
+	* tree-vrp.c (value_range_base::dump): Display +INF for both
+	pointers and integers when appropriate.
+
 2019-10-17  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
 	* tree-vect-loop.c (vect_analyze_loop_2): Use same condition to decide
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3949616..abd9dd1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-17  Aldy Hernandez  <aldyh@redhat.com>
+
+	* gcc.dg/tree-ssa/evrp4.c: Check for +INF instead of -1.
+
 2019-10-17  Christophe Lyon  <christophe.lyon@linaro.org>
 
 	* gcc.target/arm/vseleqdf.c: Add missing closing bracket.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
index ba2f6b9..6710e6b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
@@ -17,4 +17,4 @@ int bar (struct st *s)
   foo (&s->a);
 }
 
-/* { dg-final { scan-tree-dump "\\\[1B, -1B\\\]" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[1B, \\+INF\\\]" "evrp" } } */
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 21910b3..8d4f16e 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -428,8 +428,8 @@ value_range_base::dump (FILE *file) const
 
       fprintf (file, ", ");
 
-      if (INTEGRAL_TYPE_P (ttype)
-	  && vrp_val_is_max (max ())
+      if (supports_type_p (ttype)
+	  && vrp_val_is_max (max (), true)
 	  && TYPE_PRECISION (ttype) != 1)
 	fprintf (file, "+INF");
       else
-- 
cgit v1.1


From 9309a5470833460a6ee80cfa422b5258411be29e Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@gcc.gnu.org>
Date: Thu, 17 Oct 2019 12:41:45 +0000
Subject: Remove incorrect PR from ChangeLog.

From-SVN: r277108
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3126adc..efbc5c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,5 @@
 2019-10-17  Aldy Hernandez  <aldyh@redhat.com>
 
-	PR tree-optimization/92131
 	* tree-vrp.c (value_range_base::dump): Display +INF for both
 	pointers and integers when appropriate.
 
-- 
cgit v1.1


From 2d57b12e2acd52b843adbcd6d5909cb0b9f7196b Mon Sep 17 00:00:00 2001
From: Yuliang Wang <yuliang.wang@arm.com>
Date: Thu, 17 Oct 2019 13:23:52 +0000
Subject: [AArch64][SVE2] Support for EOR3 and variants of BSL

2019-10-17  Yuliang Wang  <yuliang.wang@arm.com>

gcc/
	* config/aarch64/aarch64-sve2.md (aarch64_sve2_eor3<mode>)
	(aarch64_sve2_nor<mode>, aarch64_sve2_nand<mode>)
	(aarch64_sve2_bsl<mode>, aarch64_sve2_nbsl<mode>)
	(aarch64_sve2_bsl1n<mode>, aarch64_sve2_bsl2n<mode>):
	New combine patterns.
	* config/aarch64/iterators.md (BSL_DUP): New int iterator for the
	above.
	(bsl_1st, bsl_2nd, bsl_dup, bsl_mov): Attributes for the above.

gcc/testsuite/
	* gcc.target/aarch64/sve2/eor3_1.c: New test.
	* gcc.target/aarch64/sve2/nlogic_1.c: As above.
	* gcc.target/aarch64/sve2/nlogic_2.c: As above.
	* gcc.target/aarch64/sve2/bitsel_1.c: As above.
	* gcc.target/aarch64/sve2/bitsel_2.c: As above.
	* gcc.target/aarch64/sve2/bitsel_3.c: As above.
	* gcc.target/aarch64/sve2/bitsel_4.c: As above.

From-SVN: r277110
---
 gcc/ChangeLog                                    |  11 ++
 gcc/config/aarch64/aarch64-sve2.md               | 184 +++++++++++++++++++++++
 gcc/config/aarch64/iterators.md                  |  14 ++
 gcc/testsuite/ChangeLog                          |  10 ++
 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_1.c |  32 ++++
 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_2.c |  14 ++
 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_3.c |  13 ++
 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_4.c |  14 ++
 gcc/testsuite/gcc.target/aarch64/sve2/eor3_1.c   |  12 ++
 gcc/testsuite/gcc.target/aarch64/sve2/nlogic_1.c |  33 ++++
 gcc/testsuite/gcc.target/aarch64/sve2/nlogic_2.c |  14 ++
 11 files changed, 351 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_1.c
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_2.c
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_3.c
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/bitsel_4.c
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/eor3_1.c
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/nlogic_1.c
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sve2/nlogic_2.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efbc5c6..7eb331d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-17  Yuliang Wang  <yuliang.wang@arm.com>
+
+	* config/aarch64/aarch64-sve2.md (aarch64_sve2_eor3<mode>)
+	(aarch64_sve2_nor<mode>, aarch64_sve2_nand<mode>)
+	(aarch64_sve2_bsl<mode>, aarch64_sve2_nbsl<mode>)
+	(aarch64_sve2_bsl1n<mode>, aarch64_sve2_bsl2n<mode>):
+	New combine patterns.
+	* config/aarch64/iterators.md (BSL_DUP): New int iterator for the
+	above.
+	(bsl_1st, bsl_2nd, bsl_dup, bsl_mov): Attributes for the above.
+
 2019-10-17  Aldy Hernandez  <aldyh@redhat.com>
 
 	* tree-vrp.c (value_range_base::dump): Display +INF for both
diff --git a/gcc/config/aarch64/aarch64-sve2.md b/gcc/config/aarch64/aarch64-sve2.md
index b018f5b..ecbee97 100644
--- a/gcc/config/aarch64/aarch64-sve2.md
+++ b/gcc/config/aarch64/aarch64-sve2.md
@@ -142,3 +142,187 @@
   }
 )
 
+;; Unpredicated 3-way exclusive OR.
+(define_insn "*aarch64_sve2_eor3<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, w, w, ?&w")
+	(xor:SVE_I
+	  (xor:SVE_I
+	    (match_operand:SVE_I 1 "register_operand" "0, w, w, w")
+	    (match_operand:SVE_I 2 "register_operand" "w, 0, w, w"))
+	  (match_operand:SVE_I 3 "register_operand" "w, w, 0, w")))]
+  "TARGET_SVE2"
+  "@
+  eor3\t%0.d, %0.d, %2.d, %3.d
+  eor3\t%0.d, %0.d, %1.d, %3.d
+  eor3\t%0.d, %0.d, %1.d, %2.d
+  movprfx\t%0, %1\;eor3\t%0.d, %0.d, %2.d, %3.d"
+  [(set_attr "movprfx" "*,*,*,yes")]
+)
+
+;; Use NBSL for vector NOR.
+(define_insn_and_rewrite "*aarch64_sve2_nor<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(unspec:SVE_I
+	  [(match_operand 3)
+	   (and:SVE_I
+	     (not:SVE_I
+	       (match_operand:SVE_I 1 "register_operand" "%0, w"))
+	     (not:SVE_I
+	       (match_operand:SVE_I 2 "register_operand" "w, w")))]
+	  UNSPEC_PRED_X))]
+  "TARGET_SVE2"
+  "@
+  nbsl\t%0.d, %0.d, %2.d, %0.d
+  movprfx\t%0, %1\;nbsl\t%0.d, %0.d, %2.d, %0.d"
+  "&& !CONSTANT_P (operands[3])"
+  {
+    operands[3] = CONSTM1_RTX (<VPRED>mode);
+  }
+  [(set_attr "movprfx" "*,yes")]
+)
+
+;; Use NBSL for vector NAND.
+(define_insn_and_rewrite "*aarch64_sve2_nand<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(unspec:SVE_I
+	  [(match_operand 3)
+	   (ior:SVE_I
+	     (not:SVE_I
+	       (match_operand:SVE_I 1 "register_operand" "%0, w"))
+	     (not:SVE_I
+	       (match_operand:SVE_I 2 "register_operand" "w, w")))]
+	  UNSPEC_PRED_X))]
+  "TARGET_SVE2"
+  "@
+  nbsl\t%0.d, %0.d, %2.d, %2.d
+  movprfx\t%0, %1\;nbsl\t%0.d, %0.d, %2.d, %2.d"
+  "&& !CONSTANT_P (operands[3])"
+  {
+    operands[3] = CONSTM1_RTX (<VPRED>mode);
+  }
+  [(set_attr "movprfx" "*,yes")]
+)
+
+;; Unpredicated bitwise select.
+;; (op3 ? bsl_mov : bsl_dup) == (((bsl_mov ^ bsl_dup) & op3) ^ bsl_dup)
+(define_insn "*aarch64_sve2_bsl<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(xor:SVE_I
+	  (and:SVE_I
+	    (xor:SVE_I
+	      (match_operand:SVE_I 1 "register_operand" "<bsl_1st>, w")
+	      (match_operand:SVE_I 2 "register_operand" "<bsl_2nd>, w"))
+	    (match_operand:SVE_I 3 "register_operand" "w, w"))
+	  (match_dup BSL_DUP)))]
+  "TARGET_SVE2"
+  "@
+  bsl\t%0.d, %0.d, %<bsl_dup>.d, %3.d
+  movprfx\t%0, %<bsl_mov>\;bsl\t%0.d, %0.d, %<bsl_dup>.d, %3.d"
+  [(set_attr "movprfx" "*,yes")]
+)
+
+;; Unpredicated bitwise inverted select.
+;; (~(op3 ? bsl_mov : bsl_dup)) == (~(((bsl_mov ^ bsl_dup) & op3) ^ bsl_dup))
+(define_insn_and_rewrite "*aarch64_sve2_nbsl<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(unspec:SVE_I
+	  [(match_operand 4)
+	   (not:SVE_I
+	     (xor:SVE_I
+	       (and:SVE_I
+		 (xor:SVE_I
+		   (match_operand:SVE_I 1 "register_operand" "<bsl_1st>, w")
+		   (match_operand:SVE_I 2 "register_operand" "<bsl_2nd>, w"))
+		 (match_operand:SVE_I 3 "register_operand" "w, w"))
+	       (match_dup BSL_DUP)))]
+	  UNSPEC_PRED_X))]
+  "TARGET_SVE2"
+  "@
+  nbsl\t%0.d, %0.d, %<bsl_dup>.d, %3.d
+  movprfx\t%0, %<bsl_mov>\;nbsl\t%0.d, %0.d, %<bsl_dup>.d, %3.d"
+  "&& !CONSTANT_P (operands[4])"
+  {
+    operands[4] = CONSTM1_RTX (<VPRED>mode);
+  }
+  [(set_attr "movprfx" "*,yes")]
+)
+
+;; Unpredicated bitwise select with inverted first operand.
+;; (op3 ? ~bsl_mov : bsl_dup) == ((~(bsl_mov ^ bsl_dup) & op3) ^ bsl_dup)
+(define_insn_and_rewrite "*aarch64_sve2_bsl1n<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(xor:SVE_I
+	  (and:SVE_I
+	    (unspec:SVE_I
+	      [(match_operand 4)
+	       (not:SVE_I
+		 (xor:SVE_I
+		   (match_operand:SVE_I 1 "register_operand" "<bsl_1st>, w")
+		   (match_operand:SVE_I 2 "register_operand" "<bsl_2nd>, w")))]
+	      UNSPEC_PRED_X)
+	    (match_operand:SVE_I 3 "register_operand" "w, w"))
+	  (match_dup BSL_DUP)))]
+  "TARGET_SVE2"
+  "@
+  bsl1n\t%0.d, %0.d, %<bsl_dup>.d, %3.d
+  movprfx\t%0, %<bsl_mov>\;bsl1n\t%0.d, %0.d, %<bsl_dup>.d, %3.d"
+  "&& !CONSTANT_P (operands[4])"
+  {
+    operands[4] = CONSTM1_RTX (<VPRED>mode);
+  }
+  [(set_attr "movprfx" "*,yes")]
+)
+
+;; Unpredicated bitwise select with inverted second operand.
+;; (bsl_dup ? bsl_mov : ~op3) == ((bsl_dup & bsl_mov) | (~op3 & ~bsl_dup))
+(define_insn_and_rewrite "*aarch64_sve2_bsl2n<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(ior:SVE_I
+	  (and:SVE_I
+	    (match_operand:SVE_I 1 "register_operand" "<bsl_1st>, w")
+	    (match_operand:SVE_I 2 "register_operand" "<bsl_2nd>, w"))
+	  (unspec:SVE_I
+	    [(match_operand 4)
+	     (and:SVE_I
+	       (not:SVE_I
+		 (match_operand:SVE_I 3 "register_operand" "w, w"))
+	       (not:SVE_I
+		 (match_dup BSL_DUP)))]
+	    UNSPEC_PRED_X)))]
+  "TARGET_SVE2"
+  "@
+  bsl2n\t%0.d, %0.d, %3.d, %<bsl_dup>.d
+  movprfx\t%0, %<bsl_mov>\;bsl2n\t%0.d, %0.d, %3.d, %<bsl_dup>.d"
+  "&& !CONSTANT_P (operands[4])"
+  {
+    operands[4] = CONSTM1_RTX (<VPRED>mode);
+  }
+  [(set_attr "movprfx" "*,yes")]
+)
+
+;; Unpredicated bitwise select with inverted second operand, alternative form.
+;; (bsl_dup ? bsl_mov : ~op3) == ((bsl_dup & bsl_mov) | (~bsl_dup & ~op3))
+(define_insn_and_rewrite "*aarch64_sve2_bsl2n<mode>"
+  [(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
+	(ior:SVE_I
+	  (and:SVE_I
+	    (match_operand:SVE_I 1 "register_operand" "<bsl_1st>, w")
+	    (match_operand:SVE_I 2 "register_operand" "<bsl_2nd>, w"))
+	  (unspec:SVE_I
+	    [(match_operand 4)
+	     (and:SVE_I
+	       (not:SVE_I
+		 (match_dup BSL_DUP))
+	       (not:SVE_I
+		 (match_operand:SVE_I 3 "register_operand" "w, w")))]
+	    UNSPEC_PRED_X)))]
+  "TARGET_SVE2"
+  "@
+  bsl2n\t%0.d, %0.d, %3.d, %<bsl_dup>.d
+  movprfx\t%0, %<bsl_mov>\;bsl2n\t%0.d, %0.d, %3.d, %<bsl_dup>.d"
+  "&& !CONSTANT_P (operands[4])"
+  {
+    operands[4] = CONSTM1_RTX (<VPRED>mode);
+  }
+  [(set_attr "movprfx" "*,yes")]
+)
diff --git a/gcc/config/aarch64/iterators.md b/gcc/config/aarch64/iterators.md
index 1e321af..f879fad 100644
--- a/gcc/config/aarch64/iterators.md
+++ b/gcc/config/aarch64/iterators.md
@@ -1611,6 +1611,8 @@
 
 (define_int_iterator SHRNT [UNSPEC_SHRNT UNSPEC_RSHRNT])
 
+(define_int_iterator BSL_DUP [1 2])
+
 (define_int_iterator DOTPROD [UNSPEC_SDOT UNSPEC_UDOT])
 
 (define_int_iterator ADDSUBHN [UNSPEC_ADDHN UNSPEC_RADDHN
@@ -1976,6 +1978,18 @@
 			 (UNSPEC_RADDHN2 "add")
 			 (UNSPEC_RSUBHN2 "sub")])
 
+;; BSL variants: first commutative operand.
+(define_int_attr bsl_1st [(1 "w") (2 "0")])
+
+;; BSL variants: second commutative operand.
+(define_int_attr bsl_2nd [(1 "0") (2 "w")])
+
+;; BSL variants: duplicated input operand.
+(define_int_attr bsl_dup [(1 "1") (2 "2")])
+
+;; BSL variants: operand which requires preserving via movprfx.
+(define_int_attr bsl_mov [(1 "2") (2 "1")])
+
 (define_int_attr offsetlr [(UNSPEC_SSLI "") (UNSPEC_USLI "")
 			   (UNSPEC_SSRI "offset_")
 			   (UNSPEC_USRI "offset_")])
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index abd9dd1..5ea4a73 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-17  Yuliang Wang  <yuliang.wang@arm.com>
+
+	* gcc.target/aarch64/sve2/eor3_1.c: New test.
+	* gcc.target/aarch64/sve2/nlogic_1.c: As above.
+	* gcc.target/aarch64/sve2/nlogic_2.c: As above.
+	* gcc.target/aarch64/sve2/bitsel_1.c: As above.
+	* gcc.target/aarch64/sve2/bitsel_2.c: As above.
+	* gcc.target/aarch64/sve2/bitsel_3.c: As above.
+	* gcc.target/aarch64/sve2/bitsel_4.c: As above.
+
 2019-10-17  Aldy Hernandez  <aldyh@redhat.com>
 
 	* gcc.dg/tree-ssa/evrp4.c: Check for +INF instead of -1.
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_1.c b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_1.c
new file mode 100644
index 0000000..629f741
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_1.c
@@ -0,0 +1,32 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#include <stdint.h>
+
+#ifndef OP
+#define OP(x,y,z) (((x) & (z)) | ((y) & ~(z)))
+#endif
+
+#define TYPE(N) int##N##_t
+
+#define TEMPLATE(SIZE)						\
+void __attribute__ ((noinline, noclone))			\
+f_##SIZE##_##OP							\
+  (TYPE(SIZE) *restrict a, TYPE(SIZE) *restrict b,		\
+   TYPE(SIZE) *restrict c, TYPE(SIZE) *restrict d, int n)	\
+{								\
+  for (int i = 0; i < n; i++)					\
+    a[i] = OP (b[i], c[i], d[i]);				\
+}
+
+TEMPLATE (8);
+TEMPLATE (16);
+TEMPLATE (32);
+TEMPLATE (64);
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\teor\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tand\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\tbsl\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_2.c b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_2.c
new file mode 100644
index 0000000..ee2d4a3
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_2.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#define OP(x,y,z) (~(((x) & (z)) | ((y) & ~(z))))
+
+#include "bitsel_1.c"
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\teor\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tand\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tnot\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\tnbsl\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_3.c b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_3.c
new file mode 100644
index 0000000..d0dc713
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_3.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#define OP(x,y,z) ((~(x) & (z)) | ((y) & ~(z)))
+
+#include "bitsel_1.c"
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\teor\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tbic\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\tbsl1n\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_4.c b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_4.c
new file mode 100644
index 0000000..5eb71c9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/bitsel_4.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#define OP(x,y,z) (((x) & (z)) | (~(y) & ~(z)))
+
+#include "bitsel_1.c"
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\torr\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tand\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tnot\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\tbsl2n\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/eor3_1.c b/gcc/testsuite/gcc.target/aarch64/sve2/eor3_1.c
new file mode 100644
index 0000000..13df93e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/eor3_1.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#define OP(x,y,z) ((x) ^ (y) ^ (z))
+
+#include "bitsel_1.c"
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\teor\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\teor3\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/nlogic_1.c b/gcc/testsuite/gcc.target/aarch64/sve2/nlogic_1.c
new file mode 100644
index 0000000..de34b6d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/nlogic_1.c
@@ -0,0 +1,33 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#include <stdint.h>
+
+#ifndef OP
+#define OP(x,y) (~((x) | (y)))
+#endif
+
+#define TYPE(N) int##N##_t
+
+#define TEMPLATE(SIZE)					\
+void __attribute__ ((noinline, noclone))		\
+f_##SIZE##_##OP						\
+  (TYPE(SIZE) *restrict a, TYPE(SIZE) *restrict b,	\
+   TYPE(SIZE) *restrict c, int n)			\
+{							\
+  for (int i = 0; i < n; i++)				\
+    a[i] = OP (b[i], c[i]);				\
+}
+
+TEMPLATE (8);
+TEMPLATE (16);
+TEMPLATE (32);
+TEMPLATE (64);
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\tand\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\torr\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tnot\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\tnbsl\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/nlogic_2.c b/gcc/testsuite/gcc.target/aarch64/sve2/nlogic_2.c
new file mode 100644
index 0000000..14400b5
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve2/nlogic_2.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details --save-temps" } */
+
+#define OP(x,y) (~((x) & (y)))
+
+#include "nlogic_1.c"
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 4 "vect" } } */
+
+/* { dg-final { scan-assembler-not {\tand\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\torr\tz[0-9]+\.[bhsd]} } } */
+/* { dg-final { scan-assembler-not {\tnot\tz[0-9]+\.[bhsd]} } } */
+
+/* { dg-final { scan-assembler-times {\tnbsl\tz[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d, z[0-9]+\.d\n} 4 } } */
-- 
cgit v1.1


From cdb77369ca02673e878b1a1b7856de0f979d2fec Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Thu, 17 Oct 2019 13:55:11 +0000
Subject: [arm] Add default FPU for Marvell-pj4

According to GAS, the Marvell PJ4 CPU has a VFPv3-D16 floating point
unit, but GCC's CPU configuration tables omits this meaning that
-mfpu=auto will not correctly select the FPU.  This patch fixes this
by adding the +fp option to the architecture specification for this
device.

	* config/arm/arm-cpus.in (marvel-pj4): Add +fp to the architecture.

From-SVN: r277111
---
 gcc/ChangeLog              | 4 ++++
 gcc/config/arm/arm-cpus.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7eb331d..97cb064 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-17  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/arm-cpus.in (marvel-pj4): Add +fp to the architecture.
+
 2019-10-17  Yuliang Wang  <yuliang.wang@arm.com>
 
 	* config/aarch64/aarch64-sve2.md (aarch64_sve2_eor3<mode>)
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
index f8a3b3d..50379a0 100644
--- a/gcc/config/arm/arm-cpus.in
+++ b/gcc/config/arm/arm-cpus.in
@@ -1150,7 +1150,7 @@ end cpu cortex-m3
 
 begin cpu marvell-pj4
  tune flags LDSCHED
- architecture armv7-a+mp+sec
+ architecture armv7-a+mp+sec+fp
  costs marvell_pj4
 end cpu marvell-pj4
 
-- 
cgit v1.1


From 58baf7ab85cbb1068a651c96f7d56e2902ead6cc Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 17 Oct 2019 14:08:16 +0000
Subject: tree-vect-loop.c (check_reduction_path): Compute reduction operation
 here.

2019-10-17  Richard Biener  <rguenther@suse.de>

	* tree-vect-loop.c (check_reduction_path): Compute reduction
	operation here.
	(vect_is_simple_reduction): Remove special-case of single-stmt
	reduction path detection.

From-SVN: r277112
---
 gcc/ChangeLog        |   7 +++
 gcc/tree-vect-loop.c | 139 ++++++++++++++-------------------------------------
 2 files changed, 45 insertions(+), 101 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 97cb064..143f4d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-loop.c (check_reduction_path): Compute reduction
+	operation here.
+	(vect_is_simple_reduction): Remove special-case of single-stmt
+	reduction path detection.
+
 2019-10-17  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/arm-cpus.in (marvel-pj4): Add +fp to the architecture.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index fa5c216..d7df0a4 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2586,11 +2586,12 @@ needs_fold_left_reduction_p (tree type, tree_code code)
 }
 
 /* Return true if the reduction PHI in LOOP with latch arg LOOP_ARG and
-   reduction operation CODE has a handled computation expression.  */
+   has a handled computation expression.  Store the main reduction
+   operation in *CODE.  */
 
 static bool
 check_reduction_path (dump_user_location_t loc, loop_p loop, gphi *phi,
-		      tree loop_arg, enum tree_code code,
+		      tree loop_arg, enum tree_code *code,
 		      vec<std::pair<ssa_op_iter, use_operand_p> > &path)
 {
   auto_bitmap visited;
@@ -2660,6 +2661,7 @@ pop:
   /* Check whether the reduction path detected is valid.  */
   bool fail = path.length () == 0;
   bool neg = false;
+  *code = ERROR_MARK;
   for (unsigned i = 1; i < path.length (); ++i)
     {
       gimple *use_stmt = USE_STMT (path[i].second);
@@ -2676,23 +2678,23 @@ pop:
 	  fail = true;
 	  break;
 	}
-      if (gimple_assign_rhs_code (use_stmt) != code)
+      enum tree_code use_code = gimple_assign_rhs_code (use_stmt);
+      if (use_code == MINUS_EXPR)
 	{
-	  if (code == PLUS_EXPR
-	      && gimple_assign_rhs_code (use_stmt) == MINUS_EXPR)
-	    {
-	      /* Track whether we negate the reduction value each iteration.  */
-	      if (gimple_assign_rhs2 (use_stmt) == op)
-		neg = ! neg;
-	    }
-	  else
-	    {
-	      fail = true;
-	      break;
-	    }
+	  use_code = PLUS_EXPR;
+	  /* Track whether we negate the reduction value each iteration.  */
+	  if (gimple_assign_rhs2 (use_stmt) == op)
+	    neg = ! neg;
+	}
+      if (*code == ERROR_MARK)
+	*code = use_code;
+      else if (use_code != *code)
+	{
+	  fail = true;
+	  break;
 	}
     }
-  return ! fail && ! neg;
+  return ! fail && ! neg && *code != ERROR_MARK;
 }
 
 bool
@@ -2700,7 +2702,9 @@ check_reduction_path (dump_user_location_t loc, loop_p loop, gphi *phi,
 		      tree loop_arg, enum tree_code code)
 {
   auto_vec<std::pair<ssa_op_iter, use_operand_p> > path;
-  return check_reduction_path (loc, loop, phi, loop_arg, code, path);
+  enum tree_code code_;
+  return (check_reduction_path (loc, loop, phi, loop_arg, &code_, path)
+	  && code_ == code);
 }
 
 
@@ -2883,86 +2887,18 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
       return NULL;
     }
 
-  gassign *def_stmt = dyn_cast <gassign *> (def_stmt_info->stmt);
-  if (!def_stmt)
-    {
-      if (dump_enabled_p ())
-	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			 "reduction: unhandled reduction operation: %G",
-			 def_stmt_info->stmt);
-      return NULL;
-    }
-  enum tree_code code = gimple_assign_rhs_code (def_stmt);
-
-  /* We can handle "res -= x[i]", which is non-associative by
-     simply rewriting this into "res += -x[i]".  Avoid changing
-     gimple instruction for the first simple tests and only do this
-     if we're allowed to change code at all.  */
-  if (code == MINUS_EXPR && gimple_assign_rhs2 (def_stmt) != phi_name)
-    code = PLUS_EXPR;
-
-  tree op1, op2;
-  if (code == COND_EXPR)
-    {
-      if (! nested_in_vect_loop)
-	STMT_VINFO_REDUC_TYPE (phi_info) = COND_REDUCTION;
-      op1 = gimple_assign_rhs2 (def_stmt);
-      op2 = gimple_assign_rhs3 (def_stmt);
-    }
-  else if (get_gimple_rhs_class (code) == GIMPLE_BINARY_RHS)
-    {
-      op1 = gimple_assign_rhs1 (def_stmt);
-      op2 = gimple_assign_rhs2 (def_stmt);
-    }
-  else
-    {
-      if (dump_enabled_p ())
-	report_vect_op (MSG_MISSED_OPTIMIZATION, def_stmt,
-			"reduction: not handled operation: ");
-      return NULL;
-    }
-
-  if (TREE_CODE (op1) != SSA_NAME && TREE_CODE (op2) != SSA_NAME)
-    {
-      if (dump_enabled_p ())
-	report_vect_op (MSG_MISSED_OPTIMIZATION, def_stmt,
-			"reduction: both uses not ssa_names: ");
-
-      return NULL;
-    }
-
-  /* Reduction is safe. We're dealing with one of the following:
-     1) integer arithmetic and no trapv
-     2) floating point arithmetic, and special flags permit this optimization
-     3) nested cycle (i.e., outer loop vectorization).  */
-
-  /* Check for the simple case that one def is the reduction def,
-     defined by the PHI node.  */
-  stmt_vec_info def1_info = loop_info->lookup_def (op1);
-  stmt_vec_info def2_info = loop_info->lookup_def (op2);
-  if (def2_info && def2_info->stmt == phi)
-    {
-      STMT_VINFO_REDUC_IDX (def_stmt_info) = 1 + (code == COND_EXPR ? 1 : 0);
-      if (dump_enabled_p ())
-	report_vect_op (MSG_NOTE, def_stmt, "detected reduction: ");
-      return def_stmt_info;
-    }
-  else if (def1_info && def1_info->stmt == phi)
-    {
-      STMT_VINFO_REDUC_IDX (def_stmt_info) = 0 + (code == COND_EXPR ? 1 : 0);
-      if (dump_enabled_p ())
-	report_vect_op (MSG_NOTE, def_stmt, "detected reduction: ");
-      return def_stmt_info;
-    }
-
-  /* Look for the expression computing latch_def from then loop PHI result
-     in a way involving more than one stmt.  */
+  /* Look for the expression computing latch_def from then loop PHI result.  */
   auto_vec<std::pair<ssa_op_iter, use_operand_p> > path;
-  if (check_reduction_path (vect_location, loop, phi, latch_def, code,
+  enum tree_code code;
+  if (check_reduction_path (vect_location, loop, phi, latch_def, &code,
 			    path))
     {
-      /* Try building an SLP reduction chain for which the additional
-         restriction is that all operations in the chain are the same.  */
+      if (code == COND_EXPR && !nested_in_vect_loop)
+	STMT_VINFO_REDUC_TYPE (phi_info) = COND_REDUCTION;
+
+      /* Fill in STMT_VINFO_REDUC_IDX and gather stmts for an SLP
+	 reduction chain for which the additional restriction is that
+	 all operations in the chain are the same.  */
       auto_vec<stmt_vec_info, 8> reduc_chain;
       unsigned i;
       bool is_slp_reduc = !nested_in_vect_loop && code != COND_EXPR;
@@ -2976,7 +2912,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 	    = path[i].second->use - gimple_assign_rhs1_ptr (stmt);
 	  reduc_chain.safe_push (stmt_info);
 	}
-      if (is_slp_reduc)
+      if (is_slp_reduc && reduc_chain.length () > 1)
 	{
 	  for (unsigned i = 0; i < reduc_chain.length () - 1; ++i)
 	    {
@@ -2991,18 +2927,19 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
 	  REDUC_GROUP_SIZE (reduc_chain[0]) = reduc_chain.length ();
 
 	  if (dump_enabled_p ())
-	    report_vect_op (MSG_NOTE, def_stmt,
-			    "reduction: detected reduction chain: ");
+	    dump_printf_loc (MSG_NOTE, vect_location,
+			    "reduction: detected reduction chain\n");
 	}
+      else if (dump_enabled_p ())
+	dump_printf_loc (MSG_NOTE, vect_location,
+			 "reduction: detected reduction\n");
 
       return def_stmt_info;
     }
 
   if (dump_enabled_p ())
-    {
-      report_vect_op (MSG_MISSED_OPTIMIZATION, def_stmt,
-		      "reduction: unknown pattern: ");
-    }
+    dump_printf_loc (MSG_NOTE, vect_location,
+		     "reduction: unknown pattern\n");
 
   return NULL;
 }
-- 
cgit v1.1


From 25e22b199bee93f071e8f16e2f0c0684f7a6fe98 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Thu, 17 Oct 2019 14:34:15 +0000
Subject: i386: Add clear_ratio to processor_costs

i386.h has

 #define CLEAR_RATIO(speed) ((speed) ? MIN (6, ix86_cost->move_ratio) : 2)

It is impossible to have CLEAR_RATIO > 6.  This patch adds clear_ratio
to processor_costs, sets it to the minimum of 6 and move_ratio in all
cost models and defines CLEAR_RATIO with clear_ratio.

	* config/i386/i386.h (processor_costs): Add clear_ratio.
	(CLEAR_RATIO): Remove MIN and use ix86_cost->clear_ratio.
	* config/i386/x86-tune-costs.h: Set clear_ratio to the minimum
	of 6 and move_ratio in all cost models.

From-SVN: r277114
---
 gcc/ChangeLog                    |  7 +++++++
 gcc/config/i386/i386.h           |  4 +++-
 gcc/config/i386/x86-tune-costs.h | 24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 143f4d6..7cc72d7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/i386/i386.h (processor_costs): Add clear_ratio.
+	(CLEAR_RATIO): Remove MIN and use ix86_cost->clear_ratio.
+	* config/i386/x86-tune-costs.h: Set clear_ratio to the minimum
+	of 6 and move_ratio in all cost models.
+
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-loop.c (check_reduction_path): Compute reduction
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 4e37336..afa0aa8 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -291,6 +291,8 @@ struct processor_costs {
   const int large_insn;		/* insns larger than this cost more */
   const int move_ratio;		/* The threshold of number of scalar
 				   memory-to-memory move insns.  */
+  const int clear_ratio;	/* The threshold of number of scalar
+				   memory clearing insns.  */
   const int int_load[3];	/* cost of loading integer registers
 				   in QImode, HImode and SImode relative
 				   to reg-reg move (2).  */
@@ -1947,7 +1949,7 @@ typedef struct ix86_args {
 /* If a clear memory operation would take CLEAR_RATIO or more simple
    move-instruction sequences, we will do a clrmem or libcall instead.  */
 
-#define CLEAR_RATIO(speed) ((speed) ? MIN (6, ix86_cost->move_ratio) : 2)
+#define CLEAR_RATIO(speed) ((speed) ? ix86_cost->clear_ratio : 2)
 
 /* Define if shifts truncate the shift count which implies one can
    omit a sign-extension or zero-extension of a shift count.
diff --git a/gcc/config/i386/x86-tune-costs.h b/gcc/config/i386/x86-tune-costs.h
index 8e6f4b5..99816ae 100644
--- a/gcc/config/i386/x86-tune-costs.h
+++ b/gcc/config/i386/x86-tune-costs.h
@@ -81,6 +81,7 @@ struct processor_costs ix86_size_cost = {/* costs for tuning for size */
   COSTS_N_BYTES (3),			/* cost of movzx */
   0,					/* "large" insn */
   2,					/* MOVE_RATIO */
+  2,					/* CLEAR_RATIO */
   {2, 2, 2},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -185,6 +186,7 @@ struct processor_costs i386_cost = {	/* 386 specific costs */
   COSTS_N_INSNS (2),			/* cost of movzx */
   15,					/* "large" insn */
   3,					/* MOVE_RATIO */
+  3,					/* CLEAR_RATIO */
   {2, 4, 2},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -286,6 +288,7 @@ struct processor_costs i486_cost = {	/* 486 specific costs */
   COSTS_N_INSNS (2),			/* cost of movzx */
   15,					/* "large" insn */
   3,					/* MOVE_RATIO */
+  3,					/* CLEAR_RATIO */
   {2, 4, 2},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -389,6 +392,7 @@ struct processor_costs pentium_cost = {
   COSTS_N_INSNS (2),			/* cost of movzx */
   8,					/* "large" insn */
   6,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {2, 4, 2},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -483,6 +487,7 @@ struct processor_costs lakemont_cost = {
   COSTS_N_INSNS (2),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {2, 4, 2},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -592,6 +597,7 @@ struct processor_costs pentiumpro_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   6,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {4, 4, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -692,6 +698,7 @@ struct processor_costs geode_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   4,					/* MOVE_RATIO */
+  4,					/* CLEAR_RATIO */
   {2, 2, 2},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -792,6 +799,7 @@ struct processor_costs k6_cost = {
   COSTS_N_INSNS (2),			/* cost of movzx */
   8,					/* "large" insn */
   4,					/* MOVE_RATIO */
+  4,					/* CLEAR_RATIO */
   {4, 5, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -898,6 +906,7 @@ struct processor_costs athlon_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   9,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {3, 4, 3},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1006,6 +1015,7 @@ struct processor_costs k8_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   9,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {3, 4, 3},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1127,6 +1137,7 @@ struct processor_costs amdfam10_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   9,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {3, 4, 3},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1240,6 +1251,7 @@ const struct processor_costs bdver_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   9,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {8, 8, 8},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1364,6 +1376,7 @@ struct processor_costs znver1_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx.  */
   8,					/* "large" insn.  */
   9,					/* MOVE_RATIO.  */
+  6,					/* CLEAR_RATIO */
   {6, 6, 6},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1503,6 +1516,7 @@ struct processor_costs znver2_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx.  */
   8,					/* "large" insn.  */
   9,					/* MOVE_RATIO.  */
+  6,					/* CLEAR_RATIO */
   {6, 6, 6},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1635,6 +1649,7 @@ struct processor_costs skylake_cost = {
   COSTS_N_INSNS (0),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {4, 4, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1740,6 +1755,7 @@ const struct processor_costs btver1_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   9,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {6, 8, 6},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1843,6 +1859,7 @@ const struct processor_costs btver2_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   9,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {8, 8, 6},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -1945,6 +1962,7 @@ struct processor_costs pentium4_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   16,					/* "large" insn */
   6,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {4, 5, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -2050,6 +2068,7 @@ struct processor_costs nocona_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   16,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {4, 4, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -2153,6 +2172,7 @@ struct processor_costs atom_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {6, 6, 6},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -2256,6 +2276,7 @@ struct processor_costs slm_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {8, 8, 8},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -2359,6 +2380,7 @@ struct processor_costs intel_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {4, 4, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -2469,6 +2491,7 @@ struct processor_costs generic_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {6, 6, 6},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
@@ -2585,6 +2608,7 @@ struct processor_costs core_cost = {
   COSTS_N_INSNS (1),			/* cost of movzx */
   8,					/* "large" insn */
   17,					/* MOVE_RATIO */
+  6,					/* CLEAR_RATIO */
   {4, 4, 4},				/* cost of loading integer registers
 					   in QImode, HImode and SImode.
 					   Relative to reg-reg move (2).  */
-- 
cgit v1.1


From 4c3784ae0fb0a3cc3a3a6c262e6dff0908a0d795 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Thu, 17 Oct 2019 15:06:22 +0000
Subject: Fix breakage introduced by r276985.

	* config/avr/avr.c (avr_option_override): Remove set of
	PARAM_ALLOW_STORE_DATA_RACES.
	* common/config/avr/avr-common.c (avr_option_optimization_table)
	[OPT_LEVELS_ALL]: Turn on -fallow-store-data-races.

From-SVN: r277115
---
 gcc/ChangeLog                      | 9 +++++++++
 gcc/common/config/avr/avr-common.c | 5 +++++
 gcc/config/avr/avr.c               | 9 ---------
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cc72d7..2d91ec1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-17  Georg-Johann Lay  <avr@gjlay.de>
+
+	Fix breakage introduced by r276985.
+
+	* config/avr/avr.c (avr_option_override): Remove set of
+	PARAM_ALLOW_STORE_DATA_RACES.
+	* common/config/avr/avr-common.c (avr_option_optimization_table)
+	[OPT_LEVELS_ALL]: Turn on -fallow-store-data-races.
+
 2019-10-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/i386/i386.h (processor_costs): Add clear_ratio.
diff --git a/gcc/common/config/avr/avr-common.c b/gcc/common/config/avr/avr-common.c
index 15ba440..dae42e7 100644
--- a/gcc/common/config/avr/avr-common.c
+++ b/gcc/common/config/avr/avr-common.c
@@ -38,6 +38,11 @@ static const struct default_options avr_option_optimization_table[] =
     { OPT_LEVELS_ALL, OPT_fcaller_saves, NULL, 0 },
     { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_mgas_isr_prologues, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_mmain_is_OS_task, NULL, 1 },
+    /* Allow optimizer to introduce store data races. This used to be the
+       default -- it was changed because bigger targets did not see any
+       performance decrease. For the AVR though, disallowing data races
+       introduces additional code in LIM and increases reg pressure.  */
+    { OPT_LEVELS_ALL, OPT_fallow_store_data_races, NULL, 1 },
     { OPT_LEVELS_NONE, 0, NULL, 0 }
   };
 
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 3ccff8e..c630a30 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -741,15 +741,6 @@ avr_option_override (void)
   if (avr_strict_X)
     flag_caller_saves = 0;
 
-  /* Allow optimizer to introduce store data races. This used to be the
-     default - it was changed because bigger targets did not see any
-     performance decrease. For the AVR though, disallowing data races
-     introduces additional code in LIM and increases reg pressure.  */
-
-  maybe_set_param_value (PARAM_ALLOW_STORE_DATA_RACES, 1,
-                         global_options.x_param_values,
-                         global_options_set.x_param_values);
-
   /* Unwind tables currently require a frame pointer for correctness,
      see toplev.c:process_options().  */
 
-- 
cgit v1.1


From c11cccc0285f02f117a1e80924fb7673b6486ce9 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 17 Oct 2019 17:30:49 +0000
Subject: tree-vectorizer.h (_stmt_vec_info::cond_reduc_code): Remove.

2019-10-17  Richard Biener  <rguenther@suse.de>

	* tree-vectorizer.h (_stmt_vec_info::cond_reduc_code): Remove.
	(STMT_VINFO_VEC_COND_REDUC_CODE): Likewise.
	* tree-vectorizer.c (vec_info::new_stmt_vec_info): Do not
	initialize STMT_VINFO_VEC_COND_REDUC_CODE.
	* tree-vect-loop.c (vect_is_simple_reduction): Set
	STMT_VINFO_REDUC_CODE.
	(vectorizable_reduction): Remove dead and redundant code, use
	STMT_VINFO_REDUC_CODE instead of STMT_VINFO_VEC_COND_REDUC_CODE.

From-SVN: r277126
---
 gcc/ChangeLog         |  11 ++++
 gcc/tree-vect-loop.c  | 135 ++++++++++++--------------------------------------
 gcc/tree-vectorizer.c |   1 -
 gcc/tree-vectorizer.h |   5 --
 4 files changed, 43 insertions(+), 109 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2d91ec1..0f37201 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-17  Richard Biener  <rguenther@suse.de>
+
+	* tree-vectorizer.h (_stmt_vec_info::cond_reduc_code): Remove.
+	(STMT_VINFO_VEC_COND_REDUC_CODE): Likewise.
+	* tree-vectorizer.c (vec_info::new_stmt_vec_info): Do not
+	initialize STMT_VINFO_VEC_COND_REDUC_CODE.
+	* tree-vect-loop.c (vect_is_simple_reduction): Set
+	STMT_VINFO_REDUC_CODE.
+	(vectorizable_reduction): Remove dead and redundant code, use
+	STMT_VINFO_REDUC_CODE instead of STMT_VINFO_VEC_COND_REDUC_CODE.
+
 2019-10-17  Georg-Johann Lay  <avr@gjlay.de>
 
 	Fix breakage introduced by r276985.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index d7df0a4..80db6ab 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2893,6 +2893,7 @@ vect_is_simple_reduction (loop_vec_info loop_info, stmt_vec_info phi_info,
   if (check_reduction_path (vect_location, loop, phi, latch_def, &code,
 			    path))
     {
+      STMT_VINFO_REDUC_CODE (phi_info) = code;
       if (code == COND_EXPR && !nested_in_vect_loop)
 	STMT_VINFO_REDUC_TYPE (phi_info) = COND_REDUCTION;
 
@@ -5571,17 +5572,13 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   tree vectype_in = NULL_TREE;
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
-  enum tree_code code;
-  int op_type;
-  enum vect_def_type dt, cond_reduc_dt = vect_unknown_def_type;
+  enum vect_def_type cond_reduc_dt = vect_unknown_def_type;
   stmt_vec_info cond_stmt_vinfo = NULL;
   tree scalar_type;
   int i;
   int ncopies;
   bool single_defuse_cycle = false;
-  tree ops[3];
-  enum vect_def_type dts[3];
-  bool nested_cycle = false, found_nested_cycle_def = false;
+  bool nested_cycle = false;
   bool double_reduc = false;
   int vec_num;
   tree tem;
@@ -5688,25 +5685,10 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
         which is defined by the loop-header-phi.  */
 
   gassign *stmt = as_a <gassign *> (stmt_info->stmt);
-
-  /* Flatten RHS.  */
   switch (get_gimple_rhs_class (gimple_assign_rhs_code (stmt)))
     {
     case GIMPLE_BINARY_RHS:
-      code = gimple_assign_rhs_code (stmt);
-      op_type = TREE_CODE_LENGTH (code);
-      gcc_assert (op_type == binary_op);
-      ops[0] = gimple_assign_rhs1 (stmt);
-      ops[1] = gimple_assign_rhs2 (stmt);
-      break;
-
     case GIMPLE_TERNARY_RHS:
-      code = gimple_assign_rhs_code (stmt);
-      op_type = TREE_CODE_LENGTH (code);
-      gcc_assert (op_type == ternary_op);
-      ops[0] = gimple_assign_rhs1 (stmt);
-      ops[1] = gimple_assign_rhs2 (stmt);
-      ops[2] = gimple_assign_rhs3 (stmt);
       break;
 
     case GIMPLE_UNARY_RHS:
@@ -5716,9 +5698,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
     default:
       gcc_unreachable ();
     }
-
-  if (code == COND_EXPR && slp_node)
-    return false;
+  enum tree_code code = gimple_assign_rhs_code (stmt);
+  int op_type = TREE_CODE_LENGTH (code);
 
   scalar_dest = gimple_assign_lhs (stmt);
   scalar_type = TREE_TYPE (scalar_dest);
@@ -5742,12 +5723,14 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   int reduc_index = -1;
   for (i = 0; i < op_type; i++)
     {
+      tree op = gimple_op (stmt, i + 1);
       /* The condition of COND_EXPR is checked in vectorizable_condition().  */
       if (i == 0 && code == COND_EXPR)
         continue;
 
       stmt_vec_info def_stmt_info;
-      if (!vect_is_simple_use (ops[i], loop_vinfo, &dts[i], &tem,
+      enum vect_def_type dt;
+      if (!vect_is_simple_use (op, loop_vinfo, &dt, &tem,
 			       &def_stmt_info))
 	{
 	  if (dump_enabled_p ())
@@ -5755,36 +5738,25 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 			     "use not simple.\n");
 	  return false;
 	}
-      dt = dts[i];
-      if (dt == vect_reduction_def
-	  && ops[i] == reduc_def)
+      if ((dt == vect_reduction_def || dt == vect_nested_cycle)
+	  && op == reduc_def)
 	{
 	  reduc_index = i;
 	  continue;
 	}
-      else if (tem)
-	{
-	  /* To properly compute ncopies we are interested in the widest
-	     input type in case we're looking at a widening accumulation.  */
-	  if (!vectype_in
-	      || (GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (vectype_in)))
-		  < GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (tem)))))
-	    vectype_in = tem;
-	}
 
-      if (dt != vect_internal_def
-	  && dt != vect_external_def
-	  && dt != vect_constant_def
-	  && dt != vect_induction_def
-          && !(dt == vect_nested_cycle && nested_cycle))
+      /* There should be only one cycle def in the stmt, the one
+         leading to reduc_def.  */
+      if (VECTORIZABLE_CYCLE_DEF (dt))
 	return false;
 
-      if (dt == vect_nested_cycle
-	  && ops[i] == reduc_def)
-	{
-	  found_nested_cycle_def = true;
-	  reduc_index = i;
-	}
+      /* To properly compute ncopies we are interested in the widest
+	 input type in case we're looking at a widening accumulation.  */
+      if (tem
+	  && (!vectype_in
+	      || (GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (vectype_in)))
+		  < GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (tem))))))
+	vectype_in = tem;
 
       if (code == COND_EXPR)
 	{
@@ -5792,7 +5764,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 	  if (dt == vect_constant_def)
 	    {
 	      cond_reduc_dt = dt;
-	      cond_reduc_val = ops[i];
+	      cond_reduc_val = op;
 	    }
 	  if (dt == vect_induction_def
 	      && def_stmt_info
@@ -5811,27 +5783,14 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
      operation in the reduction meta.  */
   STMT_VINFO_REDUC_IDX (reduc_info) = reduc_index;
 
-  if (!(reduc_index == -1
-	|| dts[reduc_index] == vect_reduction_def
-	|| dts[reduc_index] == vect_nested_cycle
-	|| ((dts[reduc_index] == vect_internal_def
-	     || dts[reduc_index] == vect_external_def
-	     || dts[reduc_index] == vect_constant_def
-	     || dts[reduc_index] == vect_induction_def)
-	    && nested_cycle && found_nested_cycle_def)))
-    {
-      /* For pattern recognized stmts, orig_stmt might be a reduction,
-	 but some helper statements for the pattern might not, or
-	 might be COND_EXPRs with reduction uses in the condition.  */
-      gcc_assert (orig_stmt_info);
-      return false;
-    }
-
   enum vect_reduction_type v_reduc_type = STMT_VINFO_REDUC_TYPE (phi_info);
   STMT_VINFO_REDUC_TYPE (reduc_info) = v_reduc_type;
   /* If we have a condition reduction, see if we can simplify it further.  */
   if (v_reduc_type == COND_REDUCTION)
     {
+      if (slp_node)
+	return false;
+
       /* TODO: We can't yet handle reduction chains, since we need to treat
 	 each COND_EXPR in the chain specially, not just the last one.
 	 E.g. for:
@@ -5912,7 +5871,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 		dump_printf_loc (MSG_NOTE, vect_location,
 				 "condition expression based on "
 				 "integer induction.\n");
-	      STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info) = cond_reduc_op_code;
+	      STMT_VINFO_REDUC_CODE (reduc_info) = cond_reduc_op_code;
 	      STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info)
 		= cond_reduc_val;
 	      STMT_VINFO_REDUC_TYPE (reduc_info) = INTEGER_INDUC_COND_REDUCTION;
@@ -5921,9 +5880,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       else if (cond_reduc_dt == vect_constant_def)
 	{
 	  enum vect_def_type cond_initial_dt;
-	  gimple *def_stmt = SSA_NAME_DEF_STMT (ops[reduc_index]);
 	  tree cond_initial_val
-	    = PHI_ARG_DEF_FROM_EDGE (def_stmt, loop_preheader_edge (loop));
+	    = PHI_ARG_DEF_FROM_EDGE (reduc_def_phi, loop_preheader_edge (loop));
 
 	  gcc_assert (cond_reduc_val != NULL_TREE);
 	  vect_is_simple_use (cond_initial_val, loop_vinfo, &cond_initial_dt);
@@ -5940,7 +5898,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 				     "condition expression based on "
 				     "compile time constant.\n");
 		  /* Record reduction code at analysis stage.  */
-		  STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info)
+		  STMT_VINFO_REDUC_CODE (reduc_info)
 		    = integer_onep (e) ? MAX_EXPR : MIN_EXPR;
 		  STMT_VINFO_REDUC_TYPE (reduc_info) = CONST_COND_REDUCTION;
 		}
@@ -6008,31 +5966,10 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
           (and also the same tree-code) when generating the epilog code and
           when generating the code inside the loop.  */
 
-  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
-  enum tree_code orig_code = ERROR_MARK;
-  if (reduction_type == CONST_COND_REDUCTION
-      || reduction_type == INTEGER_INDUC_COND_REDUCTION)
-    {
-      /* For simple condition reductions, replace with the actual expression
-	 we want to base our reduction around.  */
-      orig_code = STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info);
-      gcc_assert (orig_code == MAX_EXPR || orig_code == MIN_EXPR);
-    }
-  else if (reduction_type == COND_REDUCTION)
-    orig_code = COND_EXPR;
-  else if (reduction_type == TREE_CODE_REDUCTION
-	   || reduction_type == FOLD_LEFT_REDUCTION)
-    {
-      if (orig_stmt_info)
-	orig_code = gimple_assign_rhs_code (orig_stmt_info->stmt);
-      else
-	orig_code = code;
-      gcc_assert (vectype_out);
-      if (orig_code == MINUS_EXPR)
-	orig_code = PLUS_EXPR;
-    }
+  enum tree_code orig_code = STMT_VINFO_REDUC_CODE (phi_info);
   STMT_VINFO_REDUC_CODE (reduc_info) = orig_code;
 
+  vect_reduction_type reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
   if (reduction_type == TREE_CODE_REDUCTION)
     {
       /* Check whether it's ok to change the order of the computation.
@@ -6139,7 +6076,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   tree neutral_op = NULL_TREE;
   if (slp_node)
     neutral_op = neutral_op_for_slp_reduction
-      (slp_node_instance->reduc_phis, code,
+      (slp_node_instance->reduc_phis, orig_code,
        REDUC_GROUP_FIRST_ELEMENT (stmt_info) != NULL);
 
   if (double_reduc && reduction_type == FOLD_LEFT_REDUCTION)
@@ -6230,14 +6167,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 	}
     }
 
-  /* In case of widenning multiplication by a constant, we update the type
-     of the constant to be the type of the other operand.  We check that the
-     constant fits the type in the pattern recognition pass.  */
-  if (code == DOT_PROD_EXPR
-      && !types_compatible_p (TREE_TYPE (ops[0]), TREE_TYPE (ops[1])))
-    /* No testcase for this.  PR49478.  */
-    gcc_unreachable ();
-
   if (reduction_type == COND_REDUCTION)
     {
       widest_int ni;
@@ -6761,9 +6690,9 @@ vect_transform_cycle_phi (stmt_vec_info stmt_info, stmt_vec_info *vec_stmt,
 	  tree induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info);
 	  if (TREE_CODE (initial_def) == INTEGER_CST
 	      && !integer_zerop (induc_val)
-	      && (((STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info) == MAX_EXPR)
+	      && ((STMT_VINFO_REDUC_CODE (reduc_info) == MAX_EXPR
 		   && tree_int_cst_lt (initial_def, induc_val))
-		  || ((STMT_VINFO_VEC_COND_REDUC_CODE (reduc_info) == MIN_EXPR)
+		  || (STMT_VINFO_REDUC_CODE (reduc_info) == MIN_EXPR
 		      && tree_int_cst_lt (induc_val, initial_def))))
 	    {
 	      induc_val = initial_def;
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 3e8637f..512e2e0 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -638,7 +638,6 @@ vec_info::new_stmt_vec_info (gimple *stmt)
   STMT_VINFO_RELEVANT (res) = vect_unused_in_scope;
   STMT_VINFO_VECTORIZABLE (res) = true;
   STMT_VINFO_REDUC_TYPE (res) = TREE_CODE_REDUCTION;
-  STMT_VINFO_VEC_COND_REDUC_CODE (res) = ERROR_MARK;
   STMT_VINFO_REDUC_CODE (res) = ERROR_MARK;
   STMT_VINFO_REDUC_FN (res) = IFN_LAST;
   STMT_VINFO_REDUC_IDX (res) = -1;
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index ad8be02..d59ba13 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -933,10 +933,6 @@ public:
      for loop vectorization.  */
   vect_memory_access_type memory_access_type;
 
-  /* For CONST_COND_REDUCTION and INTEGER_INDUC_COND_REDUCTION, the
-     reduction code.  */
-  enum tree_code cond_reduc_code;
-
   /* For INTEGER_INDUC_COND_REDUCTION, the initial value to be used.  */
   tree induc_cond_initial_val;
 
@@ -1052,7 +1048,6 @@ STMT_VINFO_BB_VINFO (stmt_vec_info stmt_vinfo)
 #define STMT_VINFO_STRIDED_P(S)	   	   (S)->strided_p
 #define STMT_VINFO_MEMORY_ACCESS_TYPE(S)   (S)->memory_access_type
 #define STMT_VINFO_SIMD_LANE_ACCESS_P(S)   (S)->simd_lane_access_p
-#define STMT_VINFO_VEC_COND_REDUC_CODE(S)  (S)->cond_reduc_code
 #define STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL(S) (S)->induc_cond_initial_val
 #define STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT(S) (S)->reduc_epilogue_adjustment
 #define STMT_VINFO_REDUC_IDX(S)		   (S)->reduc_idx
-- 
cgit v1.1


From 8e5993e236a50ffc161dd45d1ef3ab86133e3363 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 17 Oct 2019 15:09:53 -0400
Subject: cp-gimplify.c (cp_gimplify_expr): Use get_initialized_tmp_var.

	* cp-gimplify.c (cp_gimplify_expr): Use get_initialized_tmp_var.

The comment for get_formal_tmp_var says that it shouldn't be used for
expressions whose value might change between initialization and use, and in
this case we're creating a temporary precisely because the value might
change, so we should use get_initialized_tmp_var instead.

I also noticed that many callers of get_initialized_tmp_var pass NULL for
post_p, so it seems appropriate to make it a default argument.

gcc/
	* gimplify.h (get_initialized_tmp_var): Add default argument to
	post_p.
	* gimplify.c (gimplify_self_mod_expr, gimplify_omp_atomic): Remove
	NULL post_p argument.
	* targhooks (std_gimplify_va_arg_expr): Likewise.

From-SVN: r277128
---
 gcc/ChangeLog        | 8 ++++++++
 gcc/cp/ChangeLog     | 5 +++++
 gcc/cp/cp-gimplify.c | 4 ++--
 gcc/gimplify.c       | 9 +++++----
 gcc/gimplify.h       | 2 +-
 gcc/targhooks.c      | 6 +++---
 6 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f37201..99a6b00 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-17  Jason Merrill  <jason@redhat.com>
+
+	* gimplify.h (get_initialized_tmp_var): Add default argument to
+	post_p.
+	* gimplify.c (gimplify_self_mod_expr, gimplify_omp_atomic): Remove
+	NULL post_p argument.
+	* targhooks (std_gimplify_va_arg_expr): Likewise.
+
 2019-10-17  Richard Biener  <rguenther@suse.de>
 
 	* tree-vectorizer.h (_stmt_vec_info::cond_reduc_code): Remove.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 09fe6b1..d5c7e13 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  Jason Merrill  <jason@redhat.com>
+
+	* cp-gimplify.c (cp_gimplify_expr): Use get_initialized_tmp_var.
+	(gimplify_to_rvalue): Remove default NULL argument.
+
 2019-10-17  Nathan Sidwell  <nathan@acm.org>
 
 	* decl.c (builtin_function_1): Merge into ...
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 0ab0438..9fc60c9 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -650,7 +650,7 @@ gimplify_to_rvalue (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
   if (t == GS_ERROR)
     return GS_ERROR;
   else if (is_gimple_variable (*expr_p) && TREE_CODE (*expr_p) != SSA_NAME)
-    *expr_p = get_initialized_tmp_var (*expr_p, pre_p, NULL);
+    *expr_p = get_initialized_tmp_var (*expr_p, pre_p);
   return t;
 }
 
@@ -767,7 +767,7 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
 		&& (TREE_CODE (op1) == CALL_EXPR
 		    || (SCALAR_TYPE_P (TREE_TYPE (op1))
 			&& !TREE_CONSTANT (op1))))
-	 TREE_OPERAND (*expr_p, 1) = get_formal_tmp_var (op1, pre_p);
+	 TREE_OPERAND (*expr_p, 1) = get_initialized_tmp_var (op1, pre_p);
       }
       ret = GS_OK;
       break;
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 8367069..914bb8e 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -661,8 +661,9 @@ get_formal_tmp_var (tree val, gimple_seq *pre_p)
    are as in gimplify_expr.  */
 
 tree
-get_initialized_tmp_var (tree val, gimple_seq *pre_p, gimple_seq *post_p,
-			 bool allow_ssa)
+get_initialized_tmp_var (tree val, gimple_seq *pre_p,
+			 gimple_seq *post_p /* = NULL */,
+			 bool allow_ssa /* = true */)
 {
   return internal_get_tmp_var (val, pre_p, post_p, false, allow_ssa);
 }
@@ -3149,7 +3150,7 @@ gimplify_self_mod_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
       if (ret == GS_ERROR)
 	return ret;
 
-      lhs = get_initialized_tmp_var (lhs, pre_p, NULL);
+      lhs = get_initialized_tmp_var (lhs, pre_p);
     }
 
   /* For POINTERs increment, use POINTER_PLUS_EXPR.  */
@@ -12688,7 +12689,7 @@ gimplify_omp_atomic (tree *expr_p, gimple_seq *pre_p)
 	  tree bitsize;
 	  tree tmp_store = tmp_load;
 	  if (TREE_CODE (*expr_p) == OMP_ATOMIC_CAPTURE_OLD)
-	    tmp_store = get_initialized_tmp_var (tmp_load, pre_p, NULL);
+	    tmp_store = get_initialized_tmp_var (tmp_load, pre_p);
 	  if (INTEGRAL_TYPE_P (TREE_TYPE (op1)))
 	    bitsize = bitsize_int (TYPE_PRECISION (TREE_TYPE (op1)));
 	  else
diff --git a/gcc/gimplify.h b/gcc/gimplify.h
index 1070006..6c997a7 100644
--- a/gcc/gimplify.h
+++ b/gcc/gimplify.h
@@ -57,7 +57,7 @@ extern gbind *gimple_current_bind_expr (void);
 extern vec<gbind *> gimple_bind_expr_stack (void);
 extern void gimplify_and_add (tree, gimple_seq *);
 extern tree get_formal_tmp_var (tree, gimple_seq *);
-extern tree get_initialized_tmp_var (tree, gimple_seq *, gimple_seq *,
+extern tree get_initialized_tmp_var (tree, gimple_seq *, gimple_seq * = NULL,
 				     bool = true);
 extern void declare_vars (tree, gimple *, bool);
 extern void gimple_add_tmp_var (tree);
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 5445038..fee4cc2 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -2164,11 +2164,11 @@ std_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p,
 
       real_part = std_gimplify_va_arg_expr (valist,
 					    TREE_TYPE (type), pre_p, NULL);
-      real_part = get_initialized_tmp_var (real_part, pre_p, NULL);
+      real_part = get_initialized_tmp_var (real_part, pre_p);
 
       imag_part = std_gimplify_va_arg_expr (unshare_expr (valist),
 					    TREE_TYPE (type), pre_p, NULL);
-      imag_part = get_initialized_tmp_var (imag_part, pre_p, NULL);
+      imag_part = get_initialized_tmp_var (imag_part, pre_p);
 
       return build2 (COMPLEX_EXPR, type, real_part, imag_part);
    }
@@ -2186,7 +2186,7 @@ std_gimplify_va_arg_expr (tree valist, tree type, gimple_seq *pre_p,
   boundary /= BITS_PER_UNIT;
 
   /* Hoist the valist value into a temporary for the moment.  */
-  valist_tmp = get_initialized_tmp_var (valist, pre_p, NULL);
+  valist_tmp = get_initialized_tmp_var (valist, pre_p);
 
   /* va_list pointer is aligned to PARM_BOUNDARY.  If argument actually
      requires greater alignment, we must perform dynamic alignment.  */
-- 
cgit v1.1


From 8228c8f2a54be12c70070d4eb2cd64483782b138 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Thu, 17 Oct 2019 19:46:52 +0000
Subject: [Darwin, PPC] Fix PR 65342.

The current Darwin load/store lo_sum patterns have neither predicate nor
constraint.  This means that most parts of the backend, which rely on
recog() to validate the rtx, can produce invalid combinations/selections.

For 32bit cases this isn't a problem since we can load/store to unaligned
addresses using D-mode insns.

Conversely, for 64bit instructions that use DS mode, this can manifest as
assemble errors (for an assembler that checks the LO14 relocations), or as
crashes caused by wrong offsets (or worse, wrong content for the two LSBs).

What we want to check for "Y" on Darwin is:
  - that the alignment of the Symbols' target is sufficient for DS mode
  - that the offset is suitable for DS mode.
(while looking through the Mach-O PIC unspecs).

So, the patch removes the Darwin-specific lo_sum patterns (we begin using
the movdi_internal64 patterns).  We also we need to extend the handling of the
mem_operand_gpr constraint to allow looking through Mach-O PIC UNSPECs in
the lo_sum cases.

gcc/ChangeLog:

2019-10-17  Iain Sandoe  <iain@sandoe.co.uk>

	PR target/65342
	* config/rs6000/darwin.md (movdi_low, movsi_low_st): Delete.
	(movdi_low_st): Delete.
	* config/rs6000/rs6000.c
	(darwin_rs6000_legitimate_lo_sum_const_p): New.
	(mem_operand_gpr): Validate Mach-O LO_SUM cases separately.
	* config/rs6000/rs6000.md (movsi_low): Delete.

From-SVN: r277130
---
 gcc/ChangeLog               |  10 +++++
 gcc/config/rs6000/darwin.md |  27 ------------
 gcc/config/rs6000/rs6000.c  | 105 +++++++++++++++++++++++++++++++++++++++++++-
 gcc/config/rs6000/rs6000.md |   7 ---
 4 files changed, 114 insertions(+), 35 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99a6b00..ebb7cbc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-17  Iain Sandoe  <iain@sandoe.co.uk>
+
+	PR target/65342
+	* config/rs6000/darwin.md (movdi_low, movsi_low_st): Delete.
+	(movdi_low_st): Delete.
+	* config/rs6000/rs6000.c
+	(darwin_rs6000_legitimate_lo_sum_const_p): New.
+	(mem_operand_gpr): Validate Mach-O LO_SUM cases separately.
+	* config/rs6000/rs6000.md (movsi_low): Delete.
+
 2019-10-17  Jason Merrill  <jason@redhat.com>
 
 	* gimplify.h (get_initialized_tmp_var): Add default argument to
diff --git a/gcc/config/rs6000/darwin.md b/gcc/config/rs6000/darwin.md
index 3994447..16f710b 100644
--- a/gcc/config/rs6000/darwin.md
+++ b/gcc/config/rs6000/darwin.md
@@ -122,33 +122,6 @@ You should have received a copy of the GNU General Public License
   [(set_attr "type" "store")])
 
 ;; 64-bit MachO load/store support
-(define_insn "movdi_low"
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r,*!d")
-        (mem:DI (lo_sum:DI (match_operand:DI 1 "gpc_reg_operand" "b,b")
-                           (match_operand 2 "" ""))))]
-  "TARGET_MACHO && TARGET_64BIT"
-  "@
-   ld %0,lo16(%2)(%1)
-   lfd %0,lo16(%2)(%1)"
-  [(set_attr "type" "load")])
-
-(define_insn "movsi_low_st"
-  [(set (mem:SI (lo_sum:SI (match_operand:SI 1 "gpc_reg_operand" "b")
-                           (match_operand 2 "" "")))
-	(match_operand:SI 0 "gpc_reg_operand" "r"))]
-  "TARGET_MACHO && ! TARGET_64BIT"
-  "stw %0,lo16(%2)(%1)"
-  [(set_attr "type" "store")])
-
-(define_insn "movdi_low_st"
-  [(set (mem:DI (lo_sum:DI (match_operand:DI 1 "gpc_reg_operand" "b,b")
-                           (match_operand 2 "" "")))
-	(match_operand:DI 0 "gpc_reg_operand" "r,*!d"))]
-  "TARGET_MACHO && TARGET_64BIT"
-  "@
-   std %0,lo16(%2)(%1)
-   stfd %0,lo16(%2)(%1)"
-  [(set_attr "type" "store")])
 
 ;; Mach-O PIC.
 
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index a129137d..5876714 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -7329,6 +7329,103 @@ address_offset (rtx op)
   return NULL_RTX;
 }
 
+/* This tests that a lo_sum {constant, symbol, symbol+offset} is valid for
+   the mode.  If we can't find (or don't know) the alignment of the symbol
+   we assume (optimistically) that it's sufficiently aligned [??? maybe we
+   should be pessimistic].  Offsets are validated in the same way as for
+   reg + offset.  */
+static bool
+darwin_rs6000_legitimate_lo_sum_const_p (rtx x, machine_mode mode)
+{
+  /* We should not get here with this.  */
+  gcc_checking_assert (! mode_supports_dq_form (mode));
+
+  if (GET_CODE (x) == CONST)
+    x = XEXP (x, 0);
+
+  if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_MACHOPIC_OFFSET)
+    x =  XVECEXP (x, 0, 0);
+
+  rtx sym = NULL_RTX;
+  unsigned HOST_WIDE_INT offset = 0;
+
+  if (GET_CODE (x) == PLUS)
+    {
+      sym = XEXP (x, 0);
+      if (! SYMBOL_REF_P (sym))
+	return false;
+      if (!CONST_INT_P (XEXP (x, 1)))
+	return false;
+      offset = INTVAL (XEXP (x, 1));
+    }
+  else if (SYMBOL_REF_P (x))
+    sym = x;
+  else if (CONST_INT_P (x))
+    offset = INTVAL (x);
+  else if (GET_CODE (x) == LABEL_REF)
+    offset = 0; // We assume code labels are Pmode aligned
+  else
+    return false; // not sure what we have here.
+
+  /* If we don't know the alignment of the thing to which the symbol refers,
+     we assume optimistically it is "enough".
+     ??? maybe we should be pessimistic instead.  */
+  unsigned align = 0;
+
+  if (sym)
+    {
+      tree decl = SYMBOL_REF_DECL (sym);
+#if TARGET_MACHO
+      if (MACHO_SYMBOL_INDIRECTION_P (sym))
+      /* The decl in an indirection symbol is the original one, which might
+	 be less aligned than the indirection.  Our indirections are always
+	 pointer-aligned.  */
+	;
+      else
+#endif
+      if (decl && DECL_ALIGN (decl))
+	align = DECL_ALIGN_UNIT (decl);
+   }
+
+  unsigned int extra = 0;
+  switch (mode)
+    {
+    case E_DFmode:
+    case E_DDmode:
+    case E_DImode:
+      /* If we are using VSX scalar loads, restrict ourselves to reg+reg
+	 addressing.  */
+      if (VECTOR_MEM_VSX_P (mode))
+	return false;
+
+      if (!TARGET_POWERPC64)
+	extra = 4;
+      else if ((offset & 3) || (align & 3))
+	return false;
+      break;
+
+    case E_TFmode:
+    case E_IFmode:
+    case E_KFmode:
+    case E_TDmode:
+    case E_TImode:
+    case E_PTImode:
+      extra = 8;
+      if (!TARGET_POWERPC64)
+	extra = 12;
+      else if ((offset & 3) || (align & 3))
+	return false;
+      break;
+
+    default:
+      break;
+    }
+
+  /* We only care if the access(es) would cause a change to the high part.  */
+  offset = ((offset & 0xffff) ^ 0x8000) - 0x8000;
+  return SIGNED_16BIT_OFFSET_EXTRA_P (offset, extra);
+}
+
 /* Return true if the MEM operand is a memory operand suitable for use
    with a (full width, possibly multiple) gpr load/store.  On
    powerpc64 this means the offset must be divisible by 4.
@@ -7366,7 +7463,13 @@ mem_operand_gpr (rtx op, machine_mode mode)
   if (address_is_prefixed (addr, mode, NON_PREFIXED_DS))
     return true;
 
-  /* Don't allow non-offsettable addresses.  See PRs 83969 and 84279.  */
+  /* We need to look through Mach-O PIC unspecs to determine if a lo_sum is
+     really OK.  Doing this early avoids teaching all the other machinery
+     about them.  */
+  if (TARGET_MACHO && GET_CODE (addr) == LO_SUM)
+    return darwin_rs6000_legitimate_lo_sum_const_p (XEXP (addr, 1), mode);
+
+  /* Only allow offsettable addresses.  See PRs 83969 and 84279.  */
   if (!rs6000_offsettable_memref_p (op, mode, false))
     return false;
 
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 2dca269..29dd616 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -6894,13 +6894,6 @@
 ;; do the load 16-bits at a time.  We could do this by loading from memory,
 ;; and this is even supposed to be faster, but it is simpler not to get
 ;; integers in the TOC.
-(define_insn "movsi_low"
-  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-        (mem:SI (lo_sum:SI (match_operand:SI 1 "gpc_reg_operand" "b")
-                           (match_operand 2 "" ""))))]
-  "TARGET_MACHO && ! TARGET_64BIT"
-  "lwz %0,lo16(%2)(%1)"
-  [(set_attr "type" "load")])
 
 ;;		MR           LA           LWZ          LFIWZX       LXSIWZX
 ;;		STW          STFIWX       STXSIWX      LI           LIS
-- 
cgit v1.1


From ac4c7868f1032bb9184cd9a59ee17845f6f456c6 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Thu, 17 Oct 2019 20:00:38 +0000
Subject: decl.c (grokfndecl): Remove redundant use of in_system_header_at.

/cp
2019-10-17  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokfndecl): Remove redundant use of in_system_header_at.
	(compute_array_index_type_loc): Likewise.
	(grokdeclarator): Likewise.
	* error.c (cp_printer): Likewise.
	* lambda.c (add_default_capture): Likewise.
	* parser.c (cp_parser_primary_expression): Likewise.
	(cp_parser_selection_statement): Likewise.
	(cp_parser_toplevel_declaration): Likewise.
	(cp_parser_enumerator_list): Likewise.
	(cp_parser_using_declaration): Likewise.
	(cp_parser_member_declaration): Likewise.
	(cp_parser_exception_specification_opt): Likewise.
	(cp_parser_std_attribute_spec): Likewise.
	* pt.c (do_decl_instantiation): Likewise.
	(do_type_instantiation): Likewise.
	* typeck.c (cp_build_unary_op): Likewise.

	* decl.c (check_tag_decl): Pass to in_system_header_at the same
	location used for the permerror.
	(grokdeclarator): Likewise.

	* decl.c (check_tag_decl): Use locations[ds_typedef] in error_at.

/testsuite
2019-10-17  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.old-deja/g++.other/decl9.C: Check locations too.

From-SVN: r277133
---
 gcc/cp/ChangeLog                             | 25 +++++++++++++++++++++++++
 gcc/cp/decl.c                                | 21 ++++++++-------------
 gcc/cp/error.c                               |  5 +----
 gcc/cp/lambda.c                              |  3 +--
 gcc/cp/parser.c                              | 19 +++++++------------
 gcc/cp/pt.c                                  | 21 +++++++++------------
 gcc/cp/typeck.c                              |  2 +-
 gcc/testsuite/ChangeLog                      |  4 ++++
 gcc/testsuite/g++.old-deja/g++.other/decl9.C |  4 ++--
 9 files changed, 58 insertions(+), 46 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d5c7e13..d07a5e5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,28 @@
+2019-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* decl.c (grokfndecl): Remove redundant use of in_system_header_at.
+	(compute_array_index_type_loc): Likewise.
+	(grokdeclarator): Likewise.
+	* error.c (cp_printer): Likewise.
+	* lambda.c (add_default_capture): Likewise.
+	* parser.c (cp_parser_primary_expression): Likewise.
+	(cp_parser_selection_statement): Likewise.
+	(cp_parser_toplevel_declaration): Likewise.
+	(cp_parser_enumerator_list): Likewise.
+	(cp_parser_using_declaration): Likewise.
+	(cp_parser_member_declaration): Likewise.
+	(cp_parser_exception_specification_opt): Likewise.
+	(cp_parser_std_attribute_spec): Likewise.
+	* pt.c (do_decl_instantiation): Likewise.
+	(do_type_instantiation): Likewise.
+	* typeck.c (cp_build_unary_op): Likewise.
+
+	* decl.c (check_tag_decl): Pass to in_system_header_at the same
+	location used for the permerror.
+	(grokdeclarator): Likewise.
+
+	* decl.c (check_tag_decl): Use locations[ds_typedef] in error_at.
+
 2019-10-17  Jason Merrill  <jason@redhat.com>
 
 	* cp-gimplify.c (cp_gimplify_expr): Use get_initialized_tmp_var.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 23e04e5..35fa9e9 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4912,9 +4912,9 @@ check_tag_decl (cp_decl_specifier_seq *declspecs,
 	      "multiple types in one declaration");
   else if (declspecs->redefined_builtin_type)
     {
-      if (!in_system_header_at (input_location))
-	permerror (declspecs->locations[ds_redefined_builtin_type_spec],
-		   "redeclaration of C++ built-in type %qT",
+      location_t loc = declspecs->locations[ds_redefined_builtin_type_spec];
+      if (!in_system_header_at (loc))
+	permerror (loc, "redeclaration of C++ built-in type %qT",
 		   declspecs->redefined_builtin_type);
       return NULL_TREE;
     }
@@ -4963,7 +4963,8 @@ check_tag_decl (cp_decl_specifier_seq *declspecs,
 	 --end example]  */
       if (saw_typedef)
 	{
-	  error ("missing type-name in typedef-declaration");
+	  error_at (declspecs->locations[ds_typedef],
+		    "missing type-name in typedef-declaration");
 	  return NULL_TREE;
 	}
       /* Anonymous unions are objects, so they can have specifiers.  */;
@@ -9307,7 +9308,6 @@ grokfndecl (tree ctype,
 	    }
 	  /* 17.6.3.3.5  */
 	  if (suffix[0] != '_'
-	      && !in_system_header_at (location)
 	      && !current_function_decl && !(friendp && !funcdef_flag))
 	    warning_at (location, OPT_Wliteral_suffix,
 			"literal operator suffixes not preceded by %<_%>"
@@ -10015,8 +10015,6 @@ compute_array_index_type_loc (location_t name_loc, tree name, tree size,
 	       indicated by the state of complain), so that
 	       another substitution can be found.  */
 	    return error_mark_node;
-	  else if (in_system_header_at (input_location))
-	    /* Allow them in system headers because glibc uses them.  */;
 	  else if (name)
 	    pedwarn (loc, OPT_Wpedantic,
 		     "ISO C++ forbids zero-size array %qD", name);
@@ -10983,7 +10981,7 @@ grokdeclarator (const cp_declarator *declarator,
 
       if (type_was_error_mark_node)
 	/* We've already issued an error, don't complain more.  */;
-      else if (in_system_header_at (input_location) || flag_ms_extensions)
+      else if (in_system_header_at (id_loc) || flag_ms_extensions)
 	/* Allow it, sigh.  */;
       else if (! is_main)
 	permerror (id_loc, "ISO C++ forbids declaration of %qs with no type",
@@ -11016,7 +11014,7 @@ grokdeclarator (const cp_declarator *declarator,
 	}
       /* Don't pedwarn if the alternate "__intN__" form has been used instead
 	 of "__intN".  */
-      else if (!int_n_alt && pedantic && ! in_system_header_at (input_location))
+      else if (!int_n_alt && pedantic)
 	pedwarn (declspecs->locations[ds_type_spec], OPT_Wpedantic,
 		 "ISO C++ does not support %<__int%d%> for %qs",
 		 int_n_data[declspecs->int_n_idx].bitsize, name);
@@ -12674,10 +12672,7 @@ grokdeclarator (const cp_declarator *declarator,
 	    else
 	      {
 		/* Array is a flexible member.  */
-		if (in_system_header_at (input_location))
-		  /* Do not warn on flexible array members in system
-		     headers because glibc uses them.  */;
-		else if (name)
+		if (name)
 		  pedwarn (id_loc, OPT_Wpedantic,
 			   "ISO C++ forbids flexible array member %qs", name);
 		else
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 1fd87d2..30166f9 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -4317,10 +4317,7 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec,
 void
 maybe_warn_cpp0x (cpp0x_warn_str str)
 {
-  if ((cxx_dialect == cxx98) && !in_system_header_at (input_location))
-    /* We really want to suppress this warning in system headers,
-       because libstdc++ uses variadic templates even when we aren't
-       in C++0x mode. */
+  if (cxx_dialect == cxx98)
     switch (str)
       {
       case CPP0X_INITIALIZER_LISTS:
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index b503e97..f128ed8 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -697,8 +697,7 @@ add_default_capture (tree lambda_stack, tree id, tree initializer)
       /* Warn about deprecated implicit capture of this via [=].  */
       if (cxx_dialect >= cxx2a
 	  && this_capture_p
-	  && LAMBDA_EXPR_DEFAULT_CAPTURE_MODE (lambda) == CPLD_COPY
-	  && !in_system_header_at (LAMBDA_EXPR_LOCATION (lambda)))
+	  && LAMBDA_EXPR_DEFAULT_CAPTURE_MODE (lambda) == CPLD_COPY)
 	{
 	  if (warning_at (LAMBDA_EXPR_LOCATION (lambda), OPT_Wdeprecated,
 			  "implicit capture of %qE via %<[=]%> is deprecated "
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 53db8af..b29ed0c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -5364,8 +5364,7 @@ cp_parser_primary_expression (cp_parser *parser,
 	  {
 	    expr = cp_parser_fold_expression (parser, expr);
 	    if (expr != error_mark_node
-		&& cxx_dialect < cxx17
-		&& !in_system_header_at (input_location))
+		&& cxx_dialect < cxx17)
 	      pedwarn (input_location, 0, "fold-expressions only available "
 		       "with %<-std=c++17%> or %<-std=gnu++17%>");
 	  }
@@ -11817,7 +11816,7 @@ cp_parser_selection_statement (cp_parser* parser, bool *if_p,
 	  {
 	    cx = true;
 	    cp_token *tok = cp_lexer_consume_token (parser->lexer);
-	    if (cxx_dialect < cxx17 && !in_system_header_at (tok->location))
+	    if (cxx_dialect < cxx17)
 	      pedwarn (tok->location, 0, "%<if constexpr%> only available "
 		       "with %<-std=c++17%> or %<-std=gnu++17%>");
 	  }
@@ -13314,8 +13313,7 @@ cp_parser_toplevel_declaration (cp_parser* parser)
       /* A declaration consisting of a single semicolon is
 	 invalid.  Allow it unless we're being pedantic.  */
       cp_lexer_consume_token (parser->lexer);
-      if (!in_system_header_at (input_location))
-	pedwarn (input_location, OPT_Wpedantic, "extra %<;%>");
+      pedwarn (input_location, OPT_Wpedantic, "extra %<;%>");
     }
   else
     /* Parse the declaration itself.  */
@@ -19193,7 +19191,7 @@ cp_parser_enumerator_list (cp_parser* parser, tree type)
       /* If the next token is a `}', there is a trailing comma.  */
       if (cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_BRACE))
 	{
-	  if (cxx_dialect < cxx11 && !in_system_header_at (input_location))
+	  if (cxx_dialect < cxx11)
 	    pedwarn (input_location, OPT_Wpedantic,
                      "comma at end of enumerator list");
 	  break;
@@ -19655,8 +19653,7 @@ cp_parser_using_declaration (cp_parser* parser,
   else if (cp_lexer_next_token_is (parser->lexer, CPP_ELLIPSIS))
     {
       cp_token *ell = cp_lexer_consume_token (parser->lexer);
-      if (cxx_dialect < cxx17
-	  && !in_system_header_at (ell->location))
+      if (cxx_dialect < cxx17)
 	pedwarn (ell->location, 0,
 		 "pack expansion in using-declaration only available "
 		 "with %<-std=c++17%> or %<-std=gnu++17%>");
@@ -24835,7 +24832,6 @@ cp_parser_member_declaration (cp_parser* parser)
 		  location_t loc
 		    = cp_lexer_peek_token (parser->lexer)->location;
 		  if (cxx_dialect < cxx2a
-		      && !in_system_header_at (loc)
 		      && identifier != NULL_TREE)
 		    pedwarn (loc, 0,
 			     "default member initializers for bit-fields "
@@ -25692,7 +25688,7 @@ cp_parser_exception_specification_opt (cp_parser* parser, cp_parser_flags flags)
 			 "specifications");
 	  type_id_list = NULL_TREE;
 	}
-      else if (cxx_dialect >= cxx11 && !in_system_header_at (loc))
+      else if (cxx_dialect >= cxx11)
 	warning_at (loc, OPT_Wdeprecated,
 		    "dynamic exception specifications are deprecated in "
 		    "C++11");
@@ -26680,8 +26676,7 @@ cp_parser_std_attribute_spec (cp_parser *parser)
 	  if (attr_ns
 	      && cp_lexer_nth_token_is (parser->lexer, 3, CPP_COLON))
 	    {
-	      if (cxx_dialect < cxx17
-		  && !in_system_header_at (input_location))
+	      if (cxx_dialect < cxx17)
 		pedwarn (input_location, 0,
 			 "attribute using prefix only available "
 			 "with %<-std=c++17%> or %<-std=gnu++17%>");
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 773eb43..7f7f992 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -24257,7 +24257,7 @@ do_decl_instantiation (tree decl, tree storage)
     ;
   else if (storage == ridpointers[(int) RID_EXTERN])
     {
-      if (!in_system_header_at (input_location) && (cxx_dialect == cxx98))
+      if (cxx_dialect == cxx98)
 	pedwarn (input_location, OPT_Wpedantic,
 		 "ISO C++ 1998 forbids the use of %<extern%> on explicit "
 		 "instantiations");
@@ -24339,20 +24339,17 @@ do_type_instantiation (tree t, tree storage, tsubst_flags_t complain)
 
   if (storage != NULL_TREE)
     {
-      if (!in_system_header_at (input_location))
+      if (storage == ridpointers[(int) RID_EXTERN])
 	{
-	  if (storage == ridpointers[(int) RID_EXTERN])
-	    {
-	      if (cxx_dialect == cxx98)
-		pedwarn (input_location, OPT_Wpedantic,
-			 "ISO C++ 1998 forbids the use of %<extern%> on "
-			 "explicit instantiations");
-	    }
-	  else
+	  if (cxx_dialect == cxx98)
 	    pedwarn (input_location, OPT_Wpedantic,
-		     "ISO C++ forbids the use of %qE"
-		     " on explicit instantiations", storage);
+		     "ISO C++ 1998 forbids the use of %<extern%> on "
+		     "explicit instantiations");
 	}
+      else
+	pedwarn (input_location, OPT_Wpedantic,
+		 "ISO C++ forbids the use of %qE"
+		 " on explicit instantiations", storage);
 
       if (storage == ridpointers[(int) RID_INLINE])
 	nomem_p = 1;
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 141d86f..83604f5 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -6533,7 +6533,7 @@ cp_build_unary_op (enum tree_code code, tree xarg, bool noconvert,
 		    return error_mark_node;
 		  }
 		/* Otherwise, [depr.incr.bool] says this is deprecated.  */
-		else if (!in_system_header_at (input_location))
+		else
 		  warning (OPT_Wdeprecated, "use of an operand of type %qT "
 			   "in %<operator++%> is deprecated",
 			   boolean_type_node);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ea4a73..93f15a5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.old-deja/g++.other/decl9.C: Check locations too.
+
 2019-10-17  Yuliang Wang  <yuliang.wang@arm.com>
 
 	* gcc.target/aarch64/sve2/eor3_1.c: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.other/decl9.C b/gcc/testsuite/g++.old-deja/g++.other/decl9.C
index 9be187a..a8d944c 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/decl9.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/decl9.C
@@ -4,7 +4,7 @@
 // Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 typedef struct { } S;           // OK
-typedef struct { };             // { dg-error "" } Missing type-name
+typedef struct { };             // { dg-error "1:missing type-name" } Missing type-name
 
 typedef union { } U;            // OK
-typedef union { };              // { dg-error "" } Missing type-name
+typedef union { };              // { dg-error "1:missing type-name" } Missing type-name
-- 
cgit v1.1


From 928a7c35ae25f4921611a83b5e7c44d4cdc5e728 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 18 Oct 2019 00:21:12 +0200
Subject: re PR tree-optimization/92056 (ice in expr_object_size, at
 tree-object-si ze.c:675 with -O3)

	PR tree-optimization/92056
	* tree-ssa-strlen.c (determine_min_objsize): Call init_object_sizes
	before calling compute_builtin_object_size.

	* gcc.dg/tree-ssa/pr92056.c: New test.

From-SVN: r277134
---
 gcc/ChangeLog                           |  6 ++++++
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/gcc.dg/tree-ssa/pr92056.c | 36 +++++++++++++++++++++++++++++++++
 gcc/tree-ssa-strlen.c                   |  2 ++
 4 files changed, 49 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr92056.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ebb7cbc..c137c56 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/92056
+	* tree-ssa-strlen.c (determine_min_objsize): Call init_object_sizes
+	before calling compute_builtin_object_size.
+
 2019-10-17  Iain Sandoe  <iain@sandoe.co.uk>
 
 	PR target/65342
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 93f15a5..2d2a274 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/92056
+	* gcc.dg/tree-ssa/pr92056.c: New test.
+
 2019-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.old-deja/g++.other/decl9.C: Check locations too.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr92056.c b/gcc/testsuite/gcc.dg/tree-ssa/pr92056.c
new file mode 100644
index 0000000..e43d0c0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr92056.c
@@ -0,0 +1,36 @@
+/* PR tree-optimization/92056 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+/* { dg-final { scan-tree-dump-times "return 1;" 2 "optimized" } } */
+/* { dg-final { scan-tree-dump-not "strcmp \\(" "optimized" } } */
+
+void bar (int, char *);
+
+int
+foo (int x, char *y, const char *z)
+{
+  char *a;
+  __builtin_sprintf (y, z);
+  if (x == 3)
+    a = __builtin_malloc (5);
+  else if (x == 7)
+    a = __builtin_malloc (6);
+  else
+    a = __builtin_malloc (7);
+  bar (x, a);
+  return __builtin_strcmp (a, "abcdefg") != 0;
+}
+
+int
+baz (int x)
+{
+  char *a;
+  if (x == 3)
+    a = __builtin_malloc (5);
+  else if (x == 7)
+    a = __builtin_malloc (6);
+  else
+    a = __builtin_malloc (7);
+  bar (x, a);
+  return __builtin_strcmp (a, "abcdefg") != 0;
+}
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 5c229ca..d5833f69 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -3462,6 +3462,8 @@ determine_min_objsize (tree dest)
 {
   unsigned HOST_WIDE_INT size = 0;
 
+  init_object_sizes ();
+
   if (compute_builtin_object_size (dest, 2, &size))
     return size;
 
-- 
cgit v1.1


From 274ec8c4f6ed14cf07fe047017b097e5737f93c8 Mon Sep 17 00:00:00 2001
From: John David Anglin <danglin@gcc.gnu.org>
Date: Thu, 17 Oct 2019 22:39:43 +0000
Subject: pa.c (pa_output_indirect_call): Fix typos in last change.

	* config/pa/pa.c (pa_output_indirect_call): Fix typos in last change.

From-SVN: r277135
---
 gcc/ChangeLog      |  4 ++++
 gcc/config/pa/pa.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c137c56..b9a6c15 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-17  John David Anglin  <danglin@gcc.gnu.org>
+
+	* config/pa/pa.c (pa_output_indirect_call): Fix typos in last change.
+
 2019-10-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/92056
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index d8aff71..7412835 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -8228,22 +8228,22 @@ pa_output_indirect_call (rtx_insn *insn, rtx call_dest)
       if (TARGET_NO_SPACE_REGS)
 	{
 	  pa_output_arg_descriptor (insn);
-	  output_asm_insn ("bl .+8,%rp\b\t"
-			   "ldo 20(%r2),%r2\n\t"
-			   "extru,<> %r22,30,1,%r0\n\t"
-			   "bv,n %%r0(%r22)\n\t"
+	  output_asm_insn ("bl .+8,%%r2\n\t"
+			   "ldo 20(%%r2),%%r2\n\t"
+			   "extru,<> %%r22,30,1,%%r0\n\t"
+			   "bv,n %%r0(%%r22)\n\t"
 			   "ldw -2(%%r22),%%r21\n\t"
-			   "bv %%r0(%r21)\n\t"
+			   "bv %%r0(%%r21)\n\t"
 			   "ldw 2(%%r22),%%r19", xoperands);
 	  return "";
 	}
       if (TARGET_PA_20)
 	{
 	  pa_output_arg_descriptor (insn);
-	  output_asm_insn ("bl .+8,%%r2\b\t"
+	  output_asm_insn ("bl .+8,%%r2\n\t"
 			   "ldo 24(%%r2),%%r2\n\t"
 			   "stw %%r2,-24(%%sp)\n\t"
-			   "extru,<> %r22,30,1,%r0\n\t"
+			   "extru,<> %r22,30,1,%%r0\n\t"
 			   "bve,n (%%r22)\n\t"
 			   "ldw -2(%%r22),%%r21\n\t"
 			   "bve (%%r21)\n\t"
-- 
cgit v1.1


From 4aa255f52588be89a56b2d30ebada235c7bb7c15 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Fri, 18 Oct 2019 00:16:22 +0000
Subject: Daily bump.

From-SVN: r277140
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 6f145ca..9e5dc63 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191017
+20191018
-- 
cgit v1.1


From cc1facefe3b4e3b067d95291a7dba834b830ff18 Mon Sep 17 00:00:00 2001
From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
Date: Fri, 18 Oct 2019 05:13:26 +0000
Subject: re PR target/86753 (gcc.target/aarch64/sve/vcond_[45].c fail after
 recent combine patch)

2019-10-18  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
	    Richard Sandiford  <richard.sandiford@arm.com>

	PR target/86753
	* tree-vectorizer.h (scalar_cond_masked_key): New struct,
	and define hashmap traits for it.
	(loop_vec_info::scalar_cond_masked_set): New member.
	(vect_record_loop_mask): Adjust prototype.
	* tree-vectorizer.c (scalar_cond_masked_key::get_cond_ops_from_tree):
	Implement method.
	* tree-vect-loop.c (vectorizable_reduction): Pass NULL as last arg to
	vect_record_loop_mask.
	(vectorizable_live_operation): Likewise.
	(vect_record_loop_mask): New param scalar_mask. Add entry
	cond, loop_mask	to scalar_cond_masked_set if scalar_mask is non NULL.
	* tree-vect-stmts.c (check_load_store_masking): New param scalar_mask.
	Pass it as last arg to vect_record_loop_mask.
	(vectorizable_call): Pass scalar_mask as last arg to
	vect_record_loop_mask.
	(vectorizable_store): Likewise.
	(vectorizable_load): Likewise.
	(vectorizable_condition): Check if another part of vectorized code
	applies loop_mask to condition or to it's inverse, and if yes,
	apply loop_mask to result of vector comparison.

testsuite/
	* gcc.target/aarch64/sve/cond_cnot_2.c: Remove XFAIL
	from { scan-assembler-not {\tsel\t}.
	* gcc.target/aarch64/sve/cond_convert_1.c: Adjust to make
	only one load conditional.
	* gcc.target/aarch64/sve/cond_convert_4.c: Likewise.
	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
	* gcc.target/aarch64/sve/vcond_4.c: Remove XFAIL's.
	* gcc.target/aarch64/sve/vcond_5.c: Likewise.

Co-Authored-By: Richard Sandiford <richard.sandiford@arm.com>

From-SVN: r277141
---
 gcc/ChangeLog                                      | 25 ++++++
 gcc/testsuite/ChangeLog                            | 13 +++
 gcc/testsuite/gcc.target/aarch64/sve/cond_cnot_2.c |  2 +-
 .../gcc.target/aarch64/sve/cond_convert_1.c        |  5 +-
 .../gcc.target/aarch64/sve/cond_convert_4.c        |  5 +-
 .../gcc.target/aarch64/sve/cond_unary_2.c          |  5 +-
 gcc/testsuite/gcc.target/aarch64/sve/vcond_4.c     | 36 ++++----
 gcc/testsuite/gcc.target/aarch64/sve/vcond_5.c     | 16 ++--
 gcc/tree-vect-loop.c                               | 16 +++-
 gcc/tree-vect-stmts.c                              | 95 ++++++++++++++++++++--
 gcc/tree-vectorizer.c                              | 33 ++++++++
 gcc/tree-vectorizer.h                              | 73 ++++++++++++++++-
 12 files changed, 281 insertions(+), 43 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9a6c15..273d13c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,28 @@
+2019-10-18  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+	    Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR target/86753
+	* tree-vectorizer.h (scalar_cond_masked_key): New struct,
+	and define hashmap traits for it.
+	(loop_vec_info::scalar_cond_masked_set): New member.
+	(vect_record_loop_mask): Adjust prototype.
+	* tree-vectorizer.c (scalar_cond_masked_key::get_cond_ops_from_tree):
+	Implement method.
+	* tree-vect-loop.c (vectorizable_reduction): Pass NULL as last arg to
+	vect_record_loop_mask.
+	(vectorizable_live_operation): Likewise.
+	(vect_record_loop_mask): New param scalar_mask. Add entry
+	cond, loop_mask	to scalar_cond_masked_set if scalar_mask is non NULL.
+	* tree-vect-stmts.c (check_load_store_masking): New param scalar_mask.
+	Pass it as last arg to vect_record_loop_mask.
+	(vectorizable_call): Pass scalar_mask as last arg to
+	vect_record_loop_mask.
+	(vectorizable_store): Likewise.
+	(vectorizable_load): Likewise.
+	(vectorizable_condition): Check if another part of vectorized code
+	applies loop_mask to condition or to it's inverse, and if yes,
+	apply loop_mask to result of vector comparison.
+
 2019-10-17  John David Anglin  <danglin@gcc.gnu.org>
 
 	* config/pa/pa.c (pa_output_indirect_call): Fix typos in last change.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2d2a274..fc63457 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-18  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+	    Richard Sandiford  <richard.sandiford@arm.com>
+
+	PR target/86753
+	* gcc.target/aarch64/sve/cond_cnot_2.c: Remove XFAIL
+	from { scan-assembler-not {\tsel\t}.
+	* gcc.target/aarch64/sve/cond_convert_1.c: Adjust to make
+	only one load conditional.
+	* gcc.target/aarch64/sve/cond_convert_4.c: Likewise.
+	* gcc.target/aarch64/sve/cond_unary_2.c: Likewise.
+	* gcc.target/aarch64/sve/vcond_4.c: Remove XFAIL's.
+	* gcc.target/aarch64/sve/vcond_5.c: Likewise.
+
 2019-10-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/92056
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/cond_cnot_2.c b/gcc/testsuite/gcc.target/aarch64/sve/cond_cnot_2.c
index d689e21..3df2431 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/cond_cnot_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/cond_cnot_2.c
@@ -32,4 +32,4 @@ TEST_ALL (DEF_LOOP)
 /* { dg-final { scan-assembler-not {\tmov\tz} } } */
 /* { dg-final { scan-assembler-not {\tmovprfx\t} } } */
 /* Currently we canonicalize the ?: so that !b[i] is the "false" value.  */
-/* { dg-final { scan-assembler-not {\tsel\t} { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not {\tsel\t} } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_1.c b/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_1.c
index dcc3076..86064eb 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_1.c
@@ -11,7 +11,10 @@
 		   INT_TYPE *__restrict pred, int n)		\
   {								\
     for (int i = 0; i < n; ++i)					\
-      r[i] = pred[i] ? (FLOAT_TYPE) a[i] : b[i];		\
+      {								\
+	FLOAT_TYPE bi = b[i];					\
+	r[i] = pred[i] ? (FLOAT_TYPE) a[i] : bi;		\
+      }								\
   }
 
 #define TEST_ALL(T) \
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_4.c b/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_4.c
index 7e5f2a7..e3a947b 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_4.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/cond_convert_4.c
@@ -11,7 +11,10 @@
 		   INT_TYPE *__restrict pred, int n)		\
   {								\
     for (int i = 0; i < n; ++i)					\
-      r[i] = pred[i] ? (INT_TYPE) a[i] : b[i];			\
+      {								\
+	INT_TYPE bi = b[i];					\
+	r[i] = pred[i] ? (INT_TYPE) a[i] : bi;			\
+      }								\
   }
 
 #define TEST_ALL(T) \
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/cond_unary_2.c b/gcc/testsuite/gcc.target/aarch64/sve/cond_unary_2.c
index 991ccf0..97d1b8f 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/cond_unary_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/cond_unary_2.c
@@ -13,7 +13,10 @@
 		      TYPE *__restrict pred, int n)		\
   {								\
     for (int i = 0; i < n; ++i)					\
-      r[i] = pred[i] ? OP (a[i]) : b[i];			\
+      {								\
+	TYPE bi = b[i];						\
+	r[i] = pred[i] ? OP (a[i]) : bi;			\
+      }								\
   }
 
 #define TEST_INT_TYPE(T, TYPE) \
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/vcond_4.c b/gcc/testsuite/gcc.target/aarch64/sve/vcond_4.c
index 00d8476..b38f23e 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/vcond_4.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/vcond_4.c
@@ -98,24 +98,24 @@ TEST_CMP (nugt)
 /* { dg-final { scan-assembler-times {\tfcmne\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 { xfail *-*-* } } } */
 
 /* 5 for lt, 5 for ult and 5 for nult.  */
-/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 } } */
+/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 } } */
 
 /* 5 for le, 5 for ule and 5 for nule.  */
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 } } */
 
 /* 5 for gt, 5 for ugt and 5 for nugt.  */
-/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 } } */
+/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 } } */
 
 /* 5 for ge, 5 for uge and 5 for nuge.  */
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} 15 } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 30 } } */
 
 /* { dg-final { scan-assembler-not {\tfcmuo\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0\n} } } */
 /* 3 loops * 5 invocations for all 12 unordered comparisons.  */
-/* { dg-final { scan-assembler-times {\tfcmuo\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 180 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmuo\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s\n} 180 } } */
 
 /* { dg-final { scan-assembler-times {\tfcmeq\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 7 { xfail *-*-* } } } */
 /* { dg-final { scan-assembler-times {\tfcmeq\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 14 { xfail *-*-* } } } */
@@ -123,19 +123,19 @@ TEST_CMP (nugt)
 /* { dg-final { scan-assembler-times {\tfcmne\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 { xfail *-*-* } } } */
 /* { dg-final { scan-assembler-times {\tfcmne\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 { xfail *-*-* } } } */
 
-/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 } } */
+/* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 } } */
 
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 } } */
 
-/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 } } */
+/* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 } } */
 
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} 21 } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 42 } } */
 
 /* { dg-final { scan-assembler-not {\tfcmuo\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0\n} } } */
 /* 3 loops * 5 invocations, with 2 invocations having ncopies == 2,
    for all 12 unordered comparisons.  */
-/* { dg-final { scan-assembler-times {\tfcmuo\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 252 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmuo\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d\n} 252 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/vcond_5.c b/gcc/testsuite/gcc.target/aarch64/sve/vcond_5.c
index 23bfb7b..2f16fbf 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/vcond_5.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/vcond_5.c
@@ -19,16 +19,16 @@
 /* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s} 40 { xfail *-*-* } } } */
 
 /* 5 for le, 5 for ule and 5 for nule.  */
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0} 15 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s} 30 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0} 15 } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s} 30 } } */
 
 /* 5 for gt, 5 for ugt, 5 for nueq and 5 for nugt.  */
 /* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0} 20 { xfail *-*-* } } } */
 /* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s} 40 { xfail *-*-* } } } */
 
 /* 5 for ge, 5 for uge and 5 for nuge.  */
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0} 15 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s} 30 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0} 15 } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, z[0-9]+\.s} 30 } } */
 
 /* { dg-final { scan-assembler-not {\tfcmuo\tp[0-9]+\.s, p[0-7]/z, z[0-9]+\.s, #0\.0} } } */
 /* 3 loops * 5 invocations for ordered, unordered amd ueq.  */
@@ -43,14 +43,14 @@
 /* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} 28 { xfail *-*-* } } } */
 /* { dg-final { scan-assembler-times {\tfcmlt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d} 56 { xfail *-*-* } } } */
 
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} 21 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d} 42 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} 21 } } */
+/* { dg-final { scan-assembler-times {\tfcmle\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d} 42 } } */
 
 /* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} 28 { xfail *-*-* } } } */
 /* { dg-final { scan-assembler-times {\tfcmgt\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d} 56 { xfail *-*-* } } } */
 
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} 21 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d} 42 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} 21 } } */
+/* { dg-final { scan-assembler-times {\tfcmge\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, z[0-9]+\.d} 42 } } */
 
 /* { dg-final { scan-assembler-not {\tfcmuo\tp[0-9]+\.d, p[0-7]/z, z[0-9]+\.d, #0\.0} } } */
 /* 3 loops * 5 invocations, with 2 invocations having ncopies == 2,
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 80db6ab..10920ac 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -6330,7 +6330,7 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 	}
       else
 	vect_record_loop_mask (loop_vinfo, masks, ncopies * vec_num,
-			       vectype_in);
+			       vectype_in, NULL);
     }
   if (dump_enabled_p ()
       && reduction_type == FOLD_LEFT_REDUCTION)
@@ -7561,7 +7561,7 @@ vectorizable_live_operation (stmt_vec_info stmt_info,
 	      gcc_assert (ncopies == 1 && !slp_node);
 	      vect_record_loop_mask (loop_vinfo,
 				     &LOOP_VINFO_MASKS (loop_vinfo),
-				     1, vectype);
+				     1, vectype, NULL);
 	    }
 	}
       return true;
@@ -7760,11 +7760,12 @@ vect_double_mask_nunits (tree type)
 
 /* Record that a fully-masked version of LOOP_VINFO would need MASKS to
    contain a sequence of NVECTORS masks that each control a vector of type
-   VECTYPE.  */
+   VECTYPE.  If SCALAR_MASK is nonnull, the fully-masked loop would AND
+   these vector masks with the vector version of SCALAR_MASK.  */
 
 void
 vect_record_loop_mask (loop_vec_info loop_vinfo, vec_loop_masks *masks,
-		       unsigned int nvectors, tree vectype)
+		       unsigned int nvectors, tree vectype, tree scalar_mask)
 {
   gcc_assert (nvectors != 0);
   if (masks->length () < nvectors)
@@ -7775,6 +7776,13 @@ vect_record_loop_mask (loop_vec_info loop_vinfo, vec_loop_masks *masks,
   unsigned int nscalars_per_iter
     = exact_div (nvectors * TYPE_VECTOR_SUBPARTS (vectype),
 		 LOOP_VINFO_VECT_FACTOR (loop_vinfo)).to_constant ();
+
+  if (scalar_mask)
+    {
+      scalar_cond_masked_key cond (scalar_mask, nvectors);
+      loop_vinfo->scalar_cond_masked_set.add (cond);
+    }
+
   if (rgm->max_nscalars_per_iter < nscalars_per_iter)
     {
       rgm->max_nscalars_per_iter = nscalars_per_iter;
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index e7255fb..acdd907 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -1879,7 +1879,8 @@ static tree permute_vec_elements (tree, tree, tree, stmt_vec_info,
    says how the load or store is going to be implemented and GROUP_SIZE
    is the number of load or store statements in the containing group.
    If the access is a gather load or scatter store, GS_INFO describes
-   its arguments.
+   its arguments.  If the load or store is conditional, SCALAR_MASK is the
+   condition under which it occurs.
 
    Clear LOOP_VINFO_CAN_FULLY_MASK_P if a fully-masked loop is not
    supported, otherwise record the required mask types.  */
@@ -1888,7 +1889,7 @@ static void
 check_load_store_masking (loop_vec_info loop_vinfo, tree vectype,
 			  vec_load_store_type vls_type, int group_size,
 			  vect_memory_access_type memory_access_type,
-			  gather_scatter_info *gs_info)
+			  gather_scatter_info *gs_info, tree scalar_mask)
 {
   /* Invariant loads need no special support.  */
   if (memory_access_type == VMAT_INVARIANT)
@@ -1912,7 +1913,7 @@ check_load_store_masking (loop_vec_info loop_vinfo, tree vectype,
 	  return;
 	}
       unsigned int ncopies = vect_get_num_copies (loop_vinfo, vectype);
-      vect_record_loop_mask (loop_vinfo, masks, ncopies, vectype);
+      vect_record_loop_mask (loop_vinfo, masks, ncopies, vectype, scalar_mask);
       return;
     }
 
@@ -1936,7 +1937,7 @@ check_load_store_masking (loop_vec_info loop_vinfo, tree vectype,
 	  return;
 	}
       unsigned int ncopies = vect_get_num_copies (loop_vinfo, vectype);
-      vect_record_loop_mask (loop_vinfo, masks, ncopies, vectype);
+      vect_record_loop_mask (loop_vinfo, masks, ncopies, vectype, scalar_mask);
       return;
     }
 
@@ -1974,7 +1975,7 @@ check_load_store_masking (loop_vec_info loop_vinfo, tree vectype,
   poly_uint64 vf = LOOP_VINFO_VECT_FACTOR (loop_vinfo);
   unsigned int nvectors;
   if (can_div_away_from_zero_p (group_size * vf, nunits, &nvectors))
-    vect_record_loop_mask (loop_vinfo, masks, nvectors, vectype);
+    vect_record_loop_mask (loop_vinfo, masks, nvectors, vectype, scalar_mask);
   else
     gcc_unreachable ();
 }
@@ -3436,7 +3437,9 @@ vectorizable_call (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	  unsigned int nvectors = (slp_node
 				   ? SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node)
 				   : ncopies);
-	  vect_record_loop_mask (loop_vinfo, masks, nvectors, vectype_out);
+	  tree scalar_mask = gimple_call_arg (stmt_info->stmt, mask_opno);
+	  vect_record_loop_mask (loop_vinfo, masks, nvectors,
+				 vectype_out, scalar_mask);
 	}
       return true;
     }
@@ -7390,7 +7393,7 @@ vectorizable_store (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       if (loop_vinfo
 	  && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo))
 	check_load_store_masking (loop_vinfo, vectype, vls_type, group_size,
-				  memory_access_type, &gs_info);
+				  memory_access_type, &gs_info, mask);
 
       STMT_VINFO_TYPE (stmt_info) = store_vec_info_type;
       vect_model_store_cost (stmt_info, ncopies, rhs_dt, memory_access_type,
@@ -8637,7 +8640,7 @@ vectorizable_load (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       if (loop_vinfo
 	  && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo))
 	check_load_store_masking (loop_vinfo, vectype, VLS_LOAD, group_size,
-				  memory_access_type, &gs_info);
+				  memory_access_type, &gs_info, mask);
 
       STMT_VINFO_TYPE (stmt_info) = load_vec_info_type;
       vect_model_load_cost (stmt_info, ncopies, memory_access_type,
@@ -10007,6 +10010,35 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   /* Handle cond expr.  */
   for (j = 0; j < ncopies; j++)
     {
+      tree loop_mask = NULL_TREE;
+      bool swap_cond_operands = false;
+
+      /* See whether another part of the vectorized code applies a loop
+	 mask to the condition, or to its inverse.  */
+
+      if (loop_vinfo && LOOP_VINFO_FULLY_MASKED_P (loop_vinfo))
+	{
+	  scalar_cond_masked_key cond (cond_expr, ncopies);
+	  if (loop_vinfo->scalar_cond_masked_set.contains (cond))
+	    {
+	      vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
+	      loop_mask = vect_get_loop_mask (gsi, masks, ncopies, vectype, j);
+	    }
+	  else
+	    {
+	      bool honor_nans = HONOR_NANS (TREE_TYPE (cond.op0));
+	      cond.code = invert_tree_comparison (cond.code, honor_nans);
+	      if (loop_vinfo->scalar_cond_masked_set.contains (cond))
+		{
+		  vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
+		  loop_mask = vect_get_loop_mask (gsi, masks, ncopies,
+						  vectype, j);
+		  cond_code = cond.code;
+		  swap_cond_operands = true;
+		}
+	    }
+	}
+
       stmt_vec_info new_stmt_info = NULL;
       if (j == 0)
 	{
@@ -10084,6 +10116,9 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
           vec_then_clause = vec_oprnds2[i];
           vec_else_clause = vec_oprnds3[i];
 
+	  if (swap_cond_operands)
+	    std::swap (vec_then_clause, vec_else_clause);
+
 	  if (masked)
 	    vec_compare = vec_cond_lhs;
 	  else
@@ -10122,6 +10157,50 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 		    }
 		}
 	    }
+
+	  /* If we decided to apply a loop mask to the result of the vector
+             comparison, AND the comparison with the mask now.  Later passes
+             should then be able to reuse the AND results between mulitple
+             vector statements.
+
+	     For example:
+	     for (int i = 0; i < 100; ++i)
+	       x[i] = y[i] ? z[i] : 10;
+
+	     results in following optimized GIMPLE:
+
+	     mask__35.8_43 = vect__4.7_41 != { 0, ... };
+	     vec_mask_and_46 = loop_mask_40 & mask__35.8_43;
+	     _19 = &MEM[base: z_12(D), index: ivtmp_56, step: 4, offset: 0B];
+	     vect_iftmp.11_47 = .MASK_LOAD (_19, 4B, vec_mask_and_46);
+	     vect_iftmp.12_52 = VEC_COND_EXPR <vec_mask_and_46,
+					       vect_iftmp.11_47, { 10, ... }>;
+
+	     instead of using a masked and unmasked forms of
+	     vec != { 0, ... } (masked in the MASK_LOAD,
+	     unmasked in the VEC_COND_EXPR).  */
+
+	  if (loop_mask)
+	    {
+	      if (COMPARISON_CLASS_P (vec_compare))
+		{
+		  tree tmp = make_ssa_name (vec_cmp_type);
+		  tree op0 = TREE_OPERAND (vec_compare, 0);
+		  tree op1 = TREE_OPERAND (vec_compare, 1);
+		  gassign *g = gimple_build_assign (tmp,
+						    TREE_CODE (vec_compare),
+						    op0, op1);
+		  vect_finish_stmt_generation (stmt_info, g, gsi);
+		  vec_compare = tmp;
+		}
+
+	      tree tmp2 = make_ssa_name (vec_cmp_type);
+	      gassign *g = gimple_build_assign (tmp2, BIT_AND_EXPR,
+						vec_compare, loop_mask);
+	      vect_finish_stmt_generation (stmt_info, g, gsi);
+	      vec_compare = tmp2;
+	    }
+
 	  if (reduction_type == EXTRACT_LAST_REDUCTION)
 	    {
 	      if (!is_gimple_val (vec_compare))
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 512e2e0..1a0cc93 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -1515,3 +1515,36 @@ make_pass_ipa_increase_alignment (gcc::context *ctxt)
 {
   return new pass_ipa_increase_alignment (ctxt);
 }
+
+/* If the condition represented by T is a comparison or the SSA name
+   result of a comparison, extract the comparison's operands.  Represent
+   T as NE_EXPR <T, 0> otherwise.  */
+
+void
+scalar_cond_masked_key::get_cond_ops_from_tree (tree t)
+{
+  if (TREE_CODE_CLASS (TREE_CODE (t)) == tcc_comparison)
+    {
+      this->code = TREE_CODE (t);
+      this->op0 = TREE_OPERAND (t, 0);
+      this->op1 = TREE_OPERAND (t, 1);
+      return;
+    }
+
+  if (TREE_CODE (t) == SSA_NAME)
+    if (gassign *stmt = dyn_cast<gassign *> (SSA_NAME_DEF_STMT (t)))
+      {
+	tree_code code = gimple_assign_rhs_code (stmt);
+	if (TREE_CODE_CLASS (code) == tcc_comparison)
+	  {
+	    this->code = code;
+	    this->op0 = gimple_assign_rhs1 (stmt);
+	    this->op1 = gimple_assign_rhs2 (stmt);
+	    return;
+	  }
+      }
+
+  this->code = NE_EXPR;
+  this->op0 = t;
+  this->op1 = build_zero_cst (TREE_TYPE (t));
+}
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index d59ba13..5c3b3c9 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -177,7 +177,75 @@ public:
 #define SLP_TREE_TWO_OPERATORS(S)		 (S)->two_operators
 #define SLP_TREE_DEF_TYPE(S)			 (S)->def_type
 
+/* Key for map that records association between
+   scalar conditions and corresponding loop mask, and
+   is populated by vect_record_loop_mask.  */
 
+struct scalar_cond_masked_key
+{
+  scalar_cond_masked_key (tree t, unsigned ncopies_)
+    : ncopies (ncopies_)
+  {
+    get_cond_ops_from_tree (t);
+  }
+
+  void get_cond_ops_from_tree (tree);
+
+  unsigned ncopies;
+  tree_code code;
+  tree op0;
+  tree op1;
+};
+
+template<>
+struct default_hash_traits<scalar_cond_masked_key>
+{
+  typedef scalar_cond_masked_key compare_type;
+  typedef scalar_cond_masked_key value_type;
+
+  static inline hashval_t
+  hash (value_type v)
+  {
+    inchash::hash h;
+    h.add_int (v.code);
+    inchash::add_expr (v.op0, h, 0);
+    inchash::add_expr (v.op1, h, 0);
+    h.add_int (v.ncopies);
+    return h.end ();
+  }
+
+  static inline bool
+  equal (value_type existing, value_type candidate)
+  {
+    return (existing.ncopies == candidate.ncopies
+           && existing.code == candidate.code
+           && operand_equal_p (existing.op0, candidate.op0, 0)
+           && operand_equal_p (existing.op1, candidate.op1, 0));
+  }
+
+  static inline void
+  mark_empty (value_type &v)
+  {
+    v.ncopies = 0;
+  }
+
+  static inline bool
+  is_empty (value_type v)
+  {
+    return v.ncopies == 0;
+  }
+
+  static inline void mark_deleted (value_type &) {}
+
+  static inline bool is_deleted (const value_type &)
+  {
+    return false;
+  }
+
+  static inline void remove (value_type &) {}
+};
+
+typedef hash_set<scalar_cond_masked_key> scalar_cond_masked_set_type;
 
 /* Describes two objects whose addresses must be unequal for the vectorized
    loop to be valid.  */
@@ -426,6 +494,9 @@ public:
      on inactive scalars.  */
   vec_loop_masks masks;
 
+  /* Set of scalar conditions that have loop mask applied.  */
+  scalar_cond_masked_set_type scalar_cond_masked_set;
+
   /* If we are using a loop mask to align memory addresses, this variable
      contains the number of vector elements that we should skip in the
      first iteration of the vector loop (i.e. the number of leading
@@ -1637,7 +1708,7 @@ extern void vect_gen_vector_loop_niters (loop_vec_info, tree, tree *,
 extern tree vect_halve_mask_nunits (tree);
 extern tree vect_double_mask_nunits (tree);
 extern void vect_record_loop_mask (loop_vec_info, vec_loop_masks *,
-				   unsigned int, tree);
+				   unsigned int, tree, tree);
 extern tree vect_get_loop_mask (gimple_stmt_iterator *, vec_loop_masks *,
 				unsigned int, tree, unsigned int);
 extern stmt_vec_info info_for_reduction (stmt_vec_info);
-- 
cgit v1.1


From 8d1a718e0685688e763d768d357e8ed84db22d30 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Fri, 18 Oct 2019 06:46:03 +0000
Subject: Fix some fallout for small targets.

gcc/testsuite/
	Fix some fallout for small targets.

	PR testsuite/52641
	* gcc.c-torture/execute/20190820-1.c:
	Add dg-require-effective-target int32plus.
	* gcc.c-torture/execute/pr85331.c
	Add dg-require-effective-target double64plus.
	* gcc.dg/pow-sqrt-1.c: Same.
	* gcc.dg/pow-sqrt-2.c: Same.
	* gcc.dg/pow-sqrt-3.c: Same.
	* gcc.c-torture/execute/20190901-1.c: Same.
	* gcc.c-torture/execute/user-printf.c [avr]: Skip.
	* gcc.c-torture/execute/fprintf-2.c [avr]: Skip.
	* gcc.c-torture/execute/printf-2.c [avr]: Skip.
	* gcc.dg/Wlarger-than3.c [avr]: Skip.
	* gcc.c-torture/execute/ieee/20041213-1.c (sqrt)
	[avr,double=float]: Provide custom prototype.
	* gcc.dg/pr36017.c: Same.
	* gcc.c-torture/execute/pr90025.c: Use 32-bit int.
	* gcc.dg/complex-7.c: Add dg-require-effective-target double64.
	* gcc.dg/loop-versioning-1.c:
	Add dg-require-effective-target size32plus.
	* gcc.dg/loop-versioning-2.c: Same.

From-SVN: r277142
---
 gcc/testsuite/ChangeLog                            | 26 ++++++++++++++++++++++
 gcc/testsuite/gcc.c-torture/execute/20190820-1.c   |  1 +
 gcc/testsuite/gcc.c-torture/execute/20190901-1.c   |  5 +++++
 gcc/testsuite/gcc.c-torture/execute/fprintf-2.c    |  1 +
 .../gcc.c-torture/execute/ieee/20041213-1.c        |  4 ++++
 gcc/testsuite/gcc.c-torture/execute/pr85331.c      |  1 +
 gcc/testsuite/gcc.c-torture/execute/pr90025.c      |  4 ++--
 gcc/testsuite/gcc.c-torture/execute/printf-2.c     |  1 +
 gcc/testsuite/gcc.c-torture/execute/user-printf.c  |  1 +
 gcc/testsuite/gcc.dg/Wlarger-than3.c               |  2 +-
 gcc/testsuite/gcc.dg/complex-7.c                   |  1 +
 gcc/testsuite/gcc.dg/loop-versioning-1.c           |  1 +
 gcc/testsuite/gcc.dg/loop-versioning-2.c           |  1 +
 gcc/testsuite/gcc.dg/pow-sqrt-1.c                  |  1 +
 gcc/testsuite/gcc.dg/pow-sqrt-2.c                  |  1 +
 gcc/testsuite/gcc.dg/pow-sqrt-3.c                  |  1 +
 gcc/testsuite/gcc.dg/pr36017.c                     |  4 ++++
 17 files changed, 53 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fc63457..b783c8d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,29 @@
+2019-10-18  Georg-Johann Lay  <avr@gjlay.de>
+
+	Fix some fallout for small targets.
+
+	PR testsuite/52641
+	* gcc.c-torture/execute/20190820-1.c:
+	Add dg-require-effective-target int32plus.
+	* gcc.c-torture/execute/pr85331.c
+	Add dg-require-effective-target double64plus.
+	* gcc.dg/pow-sqrt-1.c: Same.
+	* gcc.dg/pow-sqrt-2.c: Same.
+	* gcc.dg/pow-sqrt-3.c: Same.
+	* gcc.c-torture/execute/20190901-1.c: Same.
+	* gcc.c-torture/execute/user-printf.c [avr]: Skip.
+	* gcc.c-torture/execute/fprintf-2.c [avr]: Skip.
+	* gcc.c-torture/execute/printf-2.c [avr]: Skip.
+	* gcc.dg/Wlarger-than3.c [avr]: Skip.
+	* gcc.c-torture/execute/ieee/20041213-1.c (sqrt)
+	[avr,double=float]: Provide custom prototype.
+	* gcc.dg/pr36017.c: Same.
+	* gcc.c-torture/execute/pr90025.c: Use 32-bit int.
+	* gcc.dg/complex-7.c: Add dg-require-effective-target double64.
+	* gcc.dg/loop-versioning-1.c:
+	Add dg-require-effective-target size32plus.
+	* gcc.dg/loop-versioning-2.c: Same.
+
 2019-10-18  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 	    Richard Sandiford  <richard.sandiford@arm.com>
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/20190820-1.c b/gcc/testsuite/gcc.c-torture/execute/20190820-1.c
index 6a06eff..10e48d3 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20190820-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20190820-1.c
@@ -1,5 +1,6 @@
 /* PR rtl-optimization/91347 */
 /* Reported by John David Anglin <danglin@gcc.gnu.org> */
+/* { dg-require-effective-target int32plus } */
 
 typedef unsigned short __u16;
 typedef __signed__ int __s32;
diff --git a/gcc/testsuite/gcc.c-torture/execute/20190901-1.c b/gcc/testsuite/gcc.c-torture/execute/20190901-1.c
index c78715e..2345e51 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20190901-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20190901-1.c
@@ -1,7 +1,12 @@
 /* PR target/91472 */
 /* Reported by John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> */
+/* { dg-require-effective-target double64plus } */
 
+#if __SIZEOF_INT__ >= 4
 typedef unsigned int gmp_uint_least32_t;
+#else
+typedef __UINT_LEAST32_TYPE__ gmp_uint_least32_t;
+#endif
 
 union ieee_double_extract
 {
diff --git a/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c b/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c
index bba4a44..7280b9b 100644
--- a/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/fprintf-2.c
@@ -1,6 +1,7 @@
 /* Verify that calls to fprintf don't get eliminated even if their
    result on success can be computed at compile time (they can fail).
    The calls can still be transformed into those of other functions.
+   { dg-skip-if "requires io" { avr-*-* } }
    { dg-skip-if "requires io" { freestanding } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c b/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
index 07bdf68..6830359 100644
--- a/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/ieee/20041213-1.c
@@ -1,4 +1,8 @@
+#if defined (__AVR__) && (__SIZEOF_DOUBLE__ == __SIZEOF_FLOAT__)
+extern double sqrt (double) __asm ("sqrtf");
+#else
 extern double sqrt (double);
+#endif
 extern void abort (void);
 int once;
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr85331.c b/gcc/testsuite/gcc.c-torture/execute/pr85331.c
index 3ef805a..e0c426f 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr85331.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr85331.c
@@ -1,4 +1,5 @@
 /* PR tree-optimization/85331 */
+/* { dg-require-effective-target double64plus } */
 
 typedef double V __attribute__((vector_size (2 * sizeof (double))));
 typedef long long W __attribute__((vector_size (2 * sizeof (long long))));
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr90025.c b/gcc/testsuite/gcc.c-torture/execute/pr90025.c
index a1ddd00..052d97c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr90025.c
+++ b/gcc/testsuite/gcc.c-torture/execute/pr90025.c
@@ -13,10 +13,10 @@ bar (char *p)
 }
 
 __attribute__((noipa)) void
-foo (unsigned int x)
+foo (__UINT32_TYPE__ x)
 {
   char s[32] = { 'f', 'o', 'o', 'b', 'a', 'r', 0 };
-  ((unsigned int *) s)[2] = __builtin_bswap32 (x);
+  ((__UINT32_TYPE__ *) s)[2] = __builtin_bswap32 (x);
   bar (s);
 }
 
diff --git a/gcc/testsuite/gcc.c-torture/execute/printf-2.c b/gcc/testsuite/gcc.c-torture/execute/printf-2.c
index 2e9f2a2..c2d729a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/printf-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/printf-2.c
@@ -2,6 +2,7 @@
    result on success can be computed at compile time (they can fail).
    The calls can still be transformed into those of other functions.
    { dg-require-effective-target unwrapped }
+   { dg-skip-if "requires io" { avr-*-* } }
    { dg-skip-if "requires io" { freestanding } } */
 
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.c-torture/execute/user-printf.c b/gcc/testsuite/gcc.c-torture/execute/user-printf.c
index 11c61fa..0f81bec 100644
--- a/gcc/testsuite/gcc.c-torture/execute/user-printf.c
+++ b/gcc/testsuite/gcc.c-torture/execute/user-printf.c
@@ -2,6 +2,7 @@
    don't get eliminated even if their result on success can be computed at
    compile time (they can fail).
    { dg-require-effective-target unwrapped }
+   { dg-skip-if "requires io" { avr-*-* } }
    { dg-skip-if "requires io" { freestanding } } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/Wlarger-than3.c b/gcc/testsuite/gcc.dg/Wlarger-than3.c
index ebac525..17af07b 100644
--- a/gcc/testsuite/gcc.dg/Wlarger-than3.c
+++ b/gcc/testsuite/gcc.dg/Wlarger-than3.c
@@ -1,6 +1,6 @@
 /* Exercise -Wlarger-than= with a byte-size suffix.
    { dg-do compile }
-   { dg-skip-if "small address space" { "pdp11-*-*" } }
+   { dg-skip-if "small address space" { "pdp11-*-*" } { "avr-*-*" } }
    { dg-options "-Wlarger-than=1MiB" } */
 
 #define MB (1000 * 1000)    /* MegaByte */
diff --git a/gcc/testsuite/gcc.dg/complex-7.c b/gcc/testsuite/gcc.dg/complex-7.c
index 78f1a29..a1f136c 100644
--- a/gcc/testsuite/gcc.dg/complex-7.c
+++ b/gcc/testsuite/gcc.dg/complex-7.c
@@ -2,6 +2,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-cplxlower" } */
+/* { dg-require-effective-target double64 } */
 
 __complex double
 foo (__complex double a, __complex double b)
diff --git a/gcc/testsuite/gcc.dg/loop-versioning-1.c b/gcc/testsuite/gcc.dg/loop-versioning-1.c
index e61ff7a..17e95fd 100644
--- a/gcc/testsuite/gcc.dg/loop-versioning-1.c
+++ b/gcc/testsuite/gcc.dg/loop-versioning-1.c
@@ -1,4 +1,5 @@
 /* { dg-options "-O3 -fdump-tree-lversion-details" } */
+/* { dg-require-effective-target size32plus } */
 
 /* The simplest IV case.  */
 
diff --git a/gcc/testsuite/gcc.dg/loop-versioning-2.c b/gcc/testsuite/gcc.dg/loop-versioning-2.c
index 9416b54..3d07f83 100644
--- a/gcc/testsuite/gcc.dg/loop-versioning-2.c
+++ b/gcc/testsuite/gcc.dg/loop-versioning-2.c
@@ -1,4 +1,5 @@
 /* { dg-options "-O3 -fdump-tree-lversion-details" } */
+/* { dg-require-effective-target size32plus } */
 
 /* Versioning for step == 1 in these loops would allow loop interchange,
    but otherwise isn't worthwhile.  At the moment we decide not to version.  */
diff --git a/gcc/testsuite/gcc.dg/pow-sqrt-1.c b/gcc/testsuite/gcc.dg/pow-sqrt-1.c
index 0793b6f..17003c5 100644
--- a/gcc/testsuite/gcc.dg/pow-sqrt-1.c
+++ b/gcc/testsuite/gcc.dg/pow-sqrt-1.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -ffast-math --param max-pow-sqrt-depth=5" } */
+/* { dg-require-effective-target double64plus } */
 
 #define EXPN (-6 * (0.5*0.5*0.5*0.5))
 
diff --git a/gcc/testsuite/gcc.dg/pow-sqrt-2.c b/gcc/testsuite/gcc.dg/pow-sqrt-2.c
index b2fada4..96d7ce9 100644
--- a/gcc/testsuite/gcc.dg/pow-sqrt-2.c
+++ b/gcc/testsuite/gcc.dg/pow-sqrt-2.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -ffast-math --param max-pow-sqrt-depth=5" } */
+/* { dg-require-effective-target double64plus } */
 
 #define EXPN (-5.875)
 #include "pow-sqrt.x"
diff --git a/gcc/testsuite/gcc.dg/pow-sqrt-3.c b/gcc/testsuite/gcc.dg/pow-sqrt-3.c
index 18c7231..c166586 100644
--- a/gcc/testsuite/gcc.dg/pow-sqrt-3.c
+++ b/gcc/testsuite/gcc.dg/pow-sqrt-3.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -ffast-math --param max-pow-sqrt-depth=3" } */
+/* { dg-require-effective-target double64plus } */
 
 #define EXPN (1.25)
 #include "pow-sqrt.x"
diff --git a/gcc/testsuite/gcc.dg/pr36017.c b/gcc/testsuite/gcc.dg/pr36017.c
index 2af71e6..d18c97d 100644
--- a/gcc/testsuite/gcc.dg/pr36017.c
+++ b/gcc/testsuite/gcc.dg/pr36017.c
@@ -2,7 +2,11 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
 
+#if defined (__AVR__) && (__SIZEOF_DOUBLE__ == __SIZEOF_FLOAT__)
+extern double sqrt (double) __asm ("sqrtf");
+#else
 extern double sqrt (double);
+#endif
 extern void abort (void);
 
 __attribute__((noinline)) double
-- 
cgit v1.1


From bec3c279a86d951003452727bca933e4fa7731ca Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Fri, 18 Oct 2019 06:53:34 +0000
Subject: re PR target/86040 ([avr]: RAMPZ is not always cleared after loading
 __flashN data)

	PR target/86040
	* config/avr/avr.c (avr_out_lpm): Do not shortcut-return.

From-SVN: r277143
---
 gcc/ChangeLog        |  5 +++++
 gcc/config/avr/avr.c | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 273d13c..2f4906e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-18  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR target/86040
+	* config/avr/avr.c (avr_out_lpm): Do not shortcut-return.
+
 2019-10-18  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 	    Richard Sandiford  <richard.sandiford@arm.com>
 
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index c630a30..fc21389 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -3771,13 +3771,14 @@ avr_out_lpm (rtx_insn *insn, rtx *op, int *plen)
           gcc_unreachable();
 
         case 1:
-          return avr_asm_len ("%4lpm %0,%a2", xop, plen, 1);
+          avr_asm_len ("%4lpm %0,%a2", xop, plen, 1);
+          break;
 
         case 2:
           if (REGNO (dest) == REG_Z)
-            return avr_asm_len ("%4lpm %5,%a2+" CR_TAB
-                                "%4lpm %B0,%a2" CR_TAB
-                                "mov %A0,%5", xop, plen, 3);
+            avr_asm_len ("%4lpm %5,%a2+" CR_TAB
+                         "%4lpm %B0,%a2" CR_TAB
+                         "mov %A0,%5", xop, plen, 3);
           else
             {
               avr_asm_len ("%4lpm %A0,%a2+" CR_TAB
@@ -3806,9 +3807,9 @@ avr_out_lpm (rtx_insn *insn, rtx *op, int *plen)
                        "%4lpm %B0,%a2+", xop, plen, 2);
 
           if (REGNO (dest) == REG_Z - 2)
-            return avr_asm_len ("%4lpm %5,%a2+" CR_TAB
-                                "%4lpm %C0,%a2" CR_TAB
-                                "mov %D0,%5", xop, plen, 3);
+            avr_asm_len ("%4lpm %5,%a2+" CR_TAB
+                         "%4lpm %C0,%a2" CR_TAB
+                         "mov %D0,%5", xop, plen, 3);
           else
             {
               avr_asm_len ("%4lpm %C0,%a2+" CR_TAB
-- 
cgit v1.1


From 7c929c9c611546f0e77753e90b652f7607d06484 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Fri, 18 Oct 2019 12:04:31 +0000
Subject: Fortran] PR91586 Fix ICE on invalid code with CLASS

        gcc/fortran/
        PR fortran/91586
        * class.c (gfc_find_derived_vtab): Return NULL
        instead of deref'ing NULL pointer.

        gcc/testsuite/
        PR fortran/91586
        * gfortran.dg/class_71.f90: New.

From-SVN: r277153
---
 gcc/fortran/ChangeLog                  |  6 ++++++
 gcc/fortran/class.c                    |  3 +++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gfortran.dg/class_71.f90 | 13 +++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 gcc/testsuite/gfortran.dg/class_71.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1dbc890..8a1beea 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/91586
+	* class.c (gfc_find_derived_vtab): Return NULL
+	instead of deref'ing NULL pointer.
+
 2019-10-15  James Norris  <jnorris@codesourcery.com>
 	    Tobias Burnus  <tobias@codesourcery.com>
 
diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c
index 8a1f43f..9117121 100644
--- a/gcc/fortran/class.c
+++ b/gcc/fortran/class.c
@@ -2241,6 +2241,9 @@ gfc_find_derived_vtab (gfc_symbol *derived)
   if (!derived->attr.unlimited_polymorphic && derived->attr.is_class)
     derived = gfc_get_derived_super_type (derived);
 
+  if (!derived)
+    return NULL;
+
   /* Find the gsymbol for the module of use associated derived types.  */
   if ((derived->attr.use_assoc || derived->attr.used_in_submodule)
        && !derived->attr.vtype && !derived->attr.is_class)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b783c8d..4e817eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-18  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/91586
+	* gfortran.dg/class_71.f90: New.
+
 2019-10-18  Georg-Johann Lay  <avr@gjlay.de>
 
 	Fix some fallout for small targets.
diff --git a/gcc/testsuite/gfortran.dg/class_71.f90 b/gcc/testsuite/gfortran.dg/class_71.f90
new file mode 100644
index 0000000..bc0ffcd
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/class_71.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+!
+! PR fortran/91586
+!
+! Contributed by G. Steinmetz
+!
+program p
+   type t
+      class(*), allocatable :: a
+   end type
+   class(t) :: x, y  ! { dg-error "must be dummy, allocatable or pointer" }
+   y = x  ! { dg-error "Nonallocatable variable must not be polymorphic in intrinsic assignment" }
+end
-- 
cgit v1.1


From 638ba8121dd2042469c4b0051539c6bb8d3a5845 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Fri, 18 Oct 2019 12:46:01 +0000
Subject: [C++ PATCH] anon type names

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01354.html
I noticed that we use a bitfield flag to note types with names for linkage
purposes:
  typedef struct {} foo;
but, we can infer this by comparing TYPE_STUB_DECL and TYPE_DECL of the
main variant.  It's only checked in two places -- the C++ parser
and the objective C++ encoder.
	* cp-tree.h (struct lang_type): Remove was_anonymous.
	(TYPE_WAS_UNNAMED): Implement by checking TYPE_DECL &
	TYPE_STUB_DECL.
	* decl.c (name_unnamed_type): Don't set TYPE_WAS_UNNAMED.

From-SVN: r277155
---
 gcc/cp/ChangeLog |  7 +++++++
 gcc/cp/cp-tree.h | 15 +++++++++------
 gcc/cp/decl.c    |  3 ---
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d07a5e5..ba533d5f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-18  Nathan Sidwell  <nathan@acm.org>
+
+	* cp-tree.h (struct lang_type): Remove was_anonymous.
+	(TYPE_WAS_UNNAMED): Implement by checking TYPE_DECL &
+	TYPE_STUB_DECL.
+	* decl.c (name_unnamed_type): Don't set TYPE_WAS_UNNAMED.
+
 2019-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* decl.c (grokfndecl): Remove redundant use of in_system_header_at.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 663d84b..8c11ac5 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -2152,7 +2152,6 @@ struct GTY(()) lang_type {
   unsigned fields_readonly : 1;
   unsigned ptrmemfunc_flag : 1;
 
-  unsigned was_anonymous : 1;
   unsigned lazy_default_ctor : 1;
   unsigned lazy_copy_ctor : 1;
   unsigned lazy_copy_assign : 1;
@@ -2160,8 +2159,8 @@ struct GTY(()) lang_type {
   unsigned has_const_copy_ctor : 1;
   unsigned has_complex_copy_ctor : 1;
   unsigned has_complex_copy_assign : 1;
-
   unsigned non_aggregate : 1;
+
   unsigned has_complex_dflt : 1;
   unsigned has_list_ctor : 1;
   unsigned non_std_layout : 1;
@@ -2169,8 +2168,8 @@ struct GTY(()) lang_type {
   unsigned lazy_move_ctor : 1;
   unsigned lazy_move_assign : 1;
   unsigned has_complex_move_ctor : 1;
-
   unsigned has_complex_move_assign : 1;
+
   unsigned has_constexpr_ctor : 1;
   unsigned unique_obj_representations : 1;
   unsigned unique_obj_representations_set : 1;
@@ -2182,7 +2181,7 @@ struct GTY(()) lang_type {
   /* There are some bits left to fill out a 32-bit word.  Keep track
      of this by updating the size of this bitfield whenever you add or
      remove a flag.  */
-  unsigned dummy : 4;
+  unsigned dummy : 5;
 
   tree primary_base;
   vec<tree_pair_s, va_gc> *vcall_indices;
@@ -4585,8 +4584,12 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
 
 /* Define fields and accessors for nodes representing declared names.  */
 
-/* Nonzero if TYPE is an unnamed class with a typedef for linkage purposes.  */
-#define TYPE_WAS_UNNAMED(NODE) (LANG_TYPE_CLASS_CHECK (NODE)->was_anonymous)
+/* True if TYPE is an unnamed structured type with a typedef for
+   linkage purposes.  In that case TYPE_NAME and TYPE_STUB_DECL of the
+   MAIN-VARIANT are different. */
+#define TYPE_WAS_UNNAMED(NODE)				\
+  (TYPE_NAME (TYPE_MAIN_VARIANT (NODE))			\
+   != TYPE_STUB_DECL (TYPE_MAIN_VARIANT (NODE)))
 
 /* C++: all of these are overloaded!  These apply only to TYPE_DECLs.  */
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 35fa9e9..52f1f02 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10441,9 +10441,6 @@ name_unnamed_type (tree type, tree decl)
       /*debug_hooks->set_name (t, decl);*/
       TYPE_NAME (t) = decl;
 
-  if (TYPE_LANG_SPECIFIC (type))
-    TYPE_WAS_UNNAMED (type) = 1;
-
   /* If this is a typedef within a template class, the nested
      type is a (non-primary) template.  The name for the
      template needs updating as well.  */
-- 
cgit v1.1


From f4c8d44e27e90e6d822d02f4853e3f6ab80382ff Mon Sep 17 00:00:00 2001
From: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date: Fri, 18 Oct 2019 15:00:32 +0000
Subject: [Arm] Fix multilibs for Armv7-R

This patch maps multilibs using -march=armv7-r+vfpv3-d16-fp16 and
-march=armv7-r+vfpv3-d16-fp16+idiv to v7+fp.  This patch also adds a new
multilib for armv7-r+fp.sp and maps -march=armv7-r+fp.sp+idiv,
-march=armv7-r+vfpv3xd-fp16 and -march=armv7-r+vfpv3xd-fp16+idiv to it.

This patch also makes it so that the generated multilib header file is
regenerated if changes have been made to either t-multilib, t-aprofile or
t-rmprofile when doing incremental builds.

gcc/ChangeLog:
2019-10-18  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* config/arm/t-multilib: Add rule to regenerate mutlilib header file
	with any change to t-multilib, t-aprofile and t-rmprofile.  Also add
	new multilib variants and new mappings.

gcc/testsuite/ChangeLog:
2019-10-18  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* gcc.target/arm/multilib.exp: Add extra tests.

From-SVN: r277156
---
 gcc/ChangeLog                             |  6 ++++++
 gcc/config/arm/t-multilib                 | 29 +++++++++++++++++++++--------
 gcc/testsuite/ChangeLog                   |  4 ++++
 gcc/testsuite/gcc.target/arm/multilib.exp | 22 ++++++++++++++++++++++
 4 files changed, 53 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f4906e..dda2718 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	* config/arm/t-multilib: Add rule to regenerate mutlilib header file
+	with any change to t-multilib, t-aprofile and t-rmprofile.  Also add
+	new multilib variants and new mappings.
+
 2019-10-18  Georg-Johann Lay  <avr@gjlay.de>
 
 	PR target/86040
diff --git a/gcc/config/arm/t-multilib b/gcc/config/arm/t-multilib
index 0852630..dc97c8f 100644
--- a/gcc/config/arm/t-multilib
+++ b/gcc/config/arm/t-multilib
@@ -24,6 +24,8 @@
 # values during the configure step.  We enforce this during the
 # top-level configury.
 
+s-mlib: $(srcdir)/config/arm/t-multilib $(srcdir)/config/arm/t-aprofile $(srcdir)/config/arm/t-rmprofile
+
 MULTILIB_OPTIONS     =
 MULTILIB_DIRNAMES    =
 MULTILIB_EXCEPTIONS  =
@@ -63,6 +65,8 @@ all_early_arch		:= armv5tej armv6 armv6j armv6k armv6z armv6kz \
 v7_a_arch_variants	:= $(call all_feat_combs, mp sec)
 v7_a_nosimd_variants	:= +fp +vfpv3 +vfpv3-d16-fp16 +vfpv3-fp16 +vfpv4-d16 +vfpv4
 v7_a_simd_variants	:= +simd +neon-fp16 +neon-vfpv4
+v7_r_sp_variants	:= +fp.sp +fp.sp+idiv +vfpv3xd-fp16 +vfpv3xd-fp16+idiv
+v7_r_dp_variants	:= +fp +fp+idiv +vfpv3-d16-fp16 +vfpv3-d16-fp16+idiv
 v7ve_nosimd_variants	:= +vfpv3-d16 +vfpv3 +vfpv3-d16-fp16 +vfpv3-fp16 +fp +vfpv4
 v7ve_vfpv3_simd_variants := +neon +neon-fp16
 v7ve_vfpv4_simd_variants := +simd
@@ -86,8 +90,8 @@ SEP := $(and $(HAS_APROFILE),$(HAS_RMPROFILE),/)
 MULTILIB_OPTIONS	+= marm/mthumb
 MULTILIB_DIRNAMES	+= arm thumb
 
-MULTILIB_OPTIONS	+= march=armv5te+fp/march=armv7/march=armv7+fp/$(MULTI_ARCH_OPTS_A)$(SEP)$(MULTI_ARCH_OPTS_RM)
-MULTILIB_DIRNAMES	+= v5te v7 v7+fp $(MULTI_ARCH_DIRS_A) $(MULTI_ARCH_DIRS_RM)
+MULTILIB_OPTIONS	+= march=armv5te+fp/march=armv7/march=armv7+fp/march=armv7-r+fp.sp/$(MULTI_ARCH_OPTS_A)$(SEP)$(MULTI_ARCH_OPTS_RM)
+MULTILIB_DIRNAMES	+= v5te v7 v7+fp v7-r+fp.sp $(MULTI_ARCH_DIRS_A) $(MULTI_ARCH_DIRS_RM)
 
 MULTILIB_OPTIONS	+= mfloat-abi=soft/mfloat-abi=softfp/mfloat-abi=hard
 MULTILIB_DIRNAMES	+= nofp softfp hard
@@ -100,22 +104,31 @@ MULTILIB_REQUIRED	+= mthumb/march=armv7/mfloat-abi=soft
 MULTILIB_REQUIRED	+= mthumb/march=armv7+fp/mfloat-abi=softfp
 MULTILIB_REQUIRED	+= mthumb/march=armv7+fp/mfloat-abi=hard
 
-# Map v7-r down onto common v7 code.
+MULTILIB_REQUIRED	+= mthumb/march=armv7-r+fp.sp/mfloat-abi=softfp
+MULTILIB_REQUIRED	+= mthumb/march=armv7-r+fp.sp/mfloat-abi=hard
+
+# Map v7-r with double precision down onto common v7 code.
 MULTILIB_MATCHES	+= march?armv7=march?armv7-r
 MULTILIB_MATCHES	+= march?armv7=march?armv7-r+idiv
-MULTILIB_MATCHES	+= march?armv7+fp=march?armv7-r+fp
-MULTILIB_MATCHES	+= march?armv7+fp=march?armv7-r+fp+idiv
+MULTILIB_MATCHES	+= $(foreach ARCH, $(v7_r_dp_variants), \
+			     march?armv7+fp=march?armv7-r$(ARCH))
+
+# Map v7-r single precision variants to v7-r with single precision.
+MULTILIB_MATCHES	+= $(foreach ARCH, \
+			     $(filter-out +fp.sp, $(v7_r_sp_variants)), \
+			     march?armv7-r+fp.sp=march?armv7-r$(ARCH))
 
 MULTILIB_MATCHES	+= $(foreach ARCH, $(all_early_arch), \
 			     march?armv5te+fp=march?$(ARCH)+fp)
-# Map v8-r down onto common v7 code.
+# Map v8-r down onto common v7 code or v7-r sp.
 MULTILIB_MATCHES	+= march?armv7=march?armv8-r
 MULTILIB_MATCHES	+= $(foreach ARCH, $(v8_r_nosimd_variants), \
 			     march?armv7=march?armv8-r$(ARCH))
 MULTILIB_MATCHES	+= $(foreach ARCH,+simd +crypto, \
 			     march?armv7+fp=march?armv8-r$(ARCH) \
 			     march?armv7+fp=march?armv8-r+crc$(ARCH))
-
+MULTILIB_MATCHES	+= march?armv7-r+fp.sp=march?armv8-r+fp.sp
+MULTILIB_MATCHES	+= march?armv7-r+fp.sp=march?armv8-r+crc+fp.sp
 
 ifeq (,$(HAS_APROFILE))
 # Map all v7-a
@@ -177,7 +190,7 @@ MULTILIB_MATCHES	+= $(foreach ARCH, $(v8_5_a_simd_variants), \
 MULTILIB_REUSE		+= mthumb/march.armv7/mfloat-abi.soft=marm/march.armv7/mfloat-abi.soft
 
 MULTILIB_REUSE		+= $(foreach ABI, hard softfp, \
-			     $(foreach ARCH, armv7+fp, \
+			     $(foreach ARCH, armv7+fp armv7-r+fp\.sp, \
 			       mthumb/march.$(ARCH)/mfloat-abi.$(ABI)=marm/march.$(ARCH)/mfloat-abi.$(ABI)))
 
 # Softfp but no FP, use the soft-float libraries.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4e817eb..7d427a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-18  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	* gcc.target/arm/multilib.exp: Add extra tests.
+
 2019-10-18  Tobias Burnus  <tobias@codesourcery.com>
 
 	PR fortran/91586
diff --git a/gcc/testsuite/gcc.target/arm/multilib.exp b/gcc/testsuite/gcc.target/arm/multilib.exp
index d82306e..dcea829 100644
--- a/gcc/testsuite/gcc.target/arm/multilib.exp
+++ b/gcc/testsuite/gcc.target/arm/multilib.exp
@@ -753,6 +753,28 @@ if {[multilib_config "rmprofile"] } {
 	{-march=armv8-m.main+fp.dp -mfpu=fpv5-d16 -mfloat-abi=softfp} "thumb/v8-m.main+dp/softfp"
 	{-march=armv8-m.main+fp+dsp -mfpu=fpv5-d16 -mfloat-abi=softfp} "thumb/v8-m.main+dp/softfp"
 	{-march=armv8-m.main+fp.dp+dsp -mfpu=fpv5-d16 -mfloat-abi=softfp} "thumb/v8-m.main+dp/softfp"
+	{-march=armv7-r+fp -mfpu=auto -mfloat-abi=softfp} "thumb/v7+fp/softfp"
+	{-march=armv7-r+fp -mfpu=auto -mfloat-abi=hard} "thumb/v7+fp/hard"
+	{-march=armv7-r+fp+idiv -mfpu=auto -mfloat-abi=softfp} "thumb/v7+fp/softfp"
+	{-march=armv7-r+fp+idiv -mfpu=auto -mfloat-abi=hard} "thumb/v7+fp/hard"
+	{-march=armv7-r+vfpv3-d16-fp16 -mfpu=auto -mfloat-abi=softfp} "thumb/v7+fp/softfp"
+	{-march=armv7-r+vfpv3-d16-fp16 -mfpu=auto -mfloat-abi=hard} "thumb/v7+fp/hard"
+	{-march=armv7-r+vfpv3-d16-fp16+idiv -mfpu=auto -mfloat-abi=softfp} "thumb/v7+fp/softfp"
+	{-march=armv7-r+vfpv3-d16-fp16+idiv -mfpu=auto -mfloat-abi=hard} "thumb/v7+fp/hard"
+	{-march=armv7-r+fp.sp -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv7-r+fp.sp -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
+	{-march=armv7-r+fp.sp+idiv -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv7-r+fp.sp+idiv -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
+	{-march=armv7-r+vfpv3xd -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv7-r+vfpv3xd -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
+	{-march=armv7-r+vfpv3xd+idiv -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv7-r+vfpv3xd+idiv -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
+	{-march=armv7-r+vfpv3xd-fp16+idiv -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv7-r+vfpv3xd-fp16+idiv -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
+	{-march=armv8-r+fp.sp -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv8-r+fp.sp -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
+	{-march=armv8-r+crc+fp.sp -mfpu=auto -mfloat-abi=softfp} "thumb/v7-r+fp.sp/softfp"
+	{-march=armv8-r+crc+fp.sp -mfpu=auto -mfloat-abi=hard} "thumb/v7-r+fp.sp/hard"
     } {
 	check_multi_dir $opts $dir
     }
-- 
cgit v1.1


From 9e0d2031c32b748eaf3ea89082c0f8658edcbf82 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 18 Oct 2019 19:18:21 +0200
Subject: re PR middle-end/92153 (ICE / segmentation fault, use-after-free at
 gcc/ggc-page.c:1159)

	PR middle-end/92153
	* ggc-page.c (release_pages): Read g->alloc_size before free rather
	than after it.

From-SVN: r277157
---
 gcc/ChangeLog  | 6 ++++++
 gcc/ggc-page.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dda2718..724ce8e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/92153
+	* ggc-page.c (release_pages): Read g->alloc_size before free rather
+	than after it.
+
 2019-10-18  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
 	* config/arm/t-multilib: Add rule to regenerate mutlilib header file
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 4560206..a18d7a9 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -1155,8 +1155,8 @@ release_pages (void)
       {
 	*gp = g->next;
 	G.bytes_mapped -= g->alloc_size;
-	free (g->allocation);
 	n1 += g->alloc_size;
+	free (g->allocation);
       }
     else
       gp = &g->next;
-- 
cgit v1.1


From b941459c5f0931937fe18cb25bdd608a3933ec20 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Fri, 18 Oct 2019 17:27:06 +0000
Subject: re PR fortran/69455 ([F08] Assembler error(s) when using intrinsic
 modules in two BLOCK)

2019-10-18  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/69455
	* trans-decl.c (generate_local_decl): Avoid misconstructed
	intrinsic modules in a BLOCK construct.

2019-10-18  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/69455
	* gfortran.dg/pr69455_1.f90: New test.
	* gfortran.dg/pr69455_2.f90: Ditto.

From-SVN: r277158
---
 gcc/fortran/ChangeLog                   |  6 ++++++
 gcc/fortran/trans-decl.c                |  9 ++++++++-
 gcc/testsuite/ChangeLog                 |  6 ++++++
 gcc/testsuite/gfortran.dg/pr69455_1.f90 | 14 ++++++++++++++
 gcc/testsuite/gfortran.dg/pr69455_2.f90 | 13 +++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr69455_1.f90
 create mode 100644 gcc/testsuite/gfortran.dg/pr69455_2.f90

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8a1beea..5ba62d2 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/69455
+	* trans-decl.c (generate_local_decl): Avoid misconstructed
+	intrinsic modules in a BLOCK construct.
+
 2019-10-18  Tobias Burnus  <tobias@codesourcery.com>
 
 	PR fortran/91586
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 3ad802e..fc295b4 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -5987,7 +5987,14 @@ generate_local_decl (gfc_symbol * sym)
 
       if (sym->ns && sym->ns->construct_entities)
 	{
-	  if (sym->attr.referenced)
+	  /* Construction of the intrinsic modules within a BLOCK
+	     construct, where ONLY and RENAMED entities are included,
+	     seems to be bogus.  This is a workaround that can be removed
+	     if someone ever takes on the task to creating full-fledge
+	     modules.  See PR 69455.  */
+	  if (sym->attr.referenced
+	      && sym->from_intmod != INTMOD_ISO_C_BINDING
+	      && sym->from_intmod != INTMOD_ISO_FORTRAN_ENV)
 	    gfc_get_symbol_decl (sym);
 	  sym->mark = 1;
 	}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d427a9..5379447 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/69455
+	* gfortran.dg/pr69455_1.f90: New test.
+	* gfortran.dg/pr69455_2.f90: Ditto.
+
 2019-10-18  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
 	* gcc.target/arm/multilib.exp: Add extra tests.
diff --git a/gcc/testsuite/gfortran.dg/pr69455_1.f90 b/gcc/testsuite/gfortran.dg/pr69455_1.f90
new file mode 100644
index 0000000..fe62e5c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr69455_1.f90
@@ -0,0 +1,14 @@
+! { dg-do run }
+program foo
+   block
+      use, intrinsic :: iso_c_binding, only: wp => c_float, ik => c_int
+      if (ik /= 4) stop 1
+      if (wp /= 4) stop 2
+   end block
+   block
+      use, intrinsic :: iso_c_binding, only: wp => c_double, ik => c_int64_t
+      if (ik /= 8) stop 3
+      if (wp /= 8) stop 4
+   end block
+end program foo
+
diff --git a/gcc/testsuite/gfortran.dg/pr69455_2.f90 b/gcc/testsuite/gfortran.dg/pr69455_2.f90
new file mode 100644
index 0000000..8f9fb35
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr69455_2.f90
@@ -0,0 +1,13 @@
+! { dg-do run }
+program foo
+   block
+      use, intrinsic :: ISO_FORTRAN_ENV, only: wp => REAL32, ik => INT32
+      if (ik /= 4) stop 1
+      if (wp /= 4) stop 2
+   end block
+   block
+      use, intrinsic :: ISO_FORTRAN_ENV, only: wp => REAL64, ik => INT64
+      if (ik /= 8) stop 3
+      if (wp /= 8) stop 4
+   end block
+end program foo
-- 
cgit v1.1


From 1769e3f3ac65d8d59bd8cc73aebd93af588388d2 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:01:40 +0000
Subject: [arm] Rip out DImode addition and subtraction splits.

The first step towards early splitting of addition and subtraction at
DImode is to rip out the old patterns that are designed to propagate
DImode through the RTL optimization passes and the do late splitting.

This patch does cause some code size regressions, but it should still
execute correctly.  We will progressively add back the optimizations
we had here in later patches.

A small number of tests in the Arm-specific testsuite do fail as a
result of this patch, but that's to be expected, since the
optimizations they are looking for have just been removed.  I've kept
the tests, but XFAILed them for now.

One small technical change is also done in this patch as part of the
cleanup: the uaddv<mode>4 expander is changed to use LTU as the branch
comparison.  This eliminates the need for CC_Cmode to recognize
somewhat bogus equality constraints.

gcc:
	* arm.md (adddi3): Only accept register operands.
	(arm_adddi3): Convert to simple insn with no split.  Do not accept
	constants.
	(adddi_sesidi_di): Delete patern.
	(adddi_zesidi_di): Likewise.
	(uaddv<mode>4): Use LTU as condition for branch.
	(adddi3_compareV): Convert to simple insn with no split.
	(addsi3_compareV_upper): Delete pattern.
	(adddi3_compareC): Convert to simple insn with no split.  Correct
	flags setting expression.
	(addsi3_compareC_upper): Delete pattern.
	(addsi3_compareC): Correct flags setting expression.
	(subdi3_compare1): Convert to simple insn with no split.
	(subsi3_carryin_compare): Delete pattern.
	(arm_subdi3): Convert to simple insn with no split.
	(subdi_zesidi): Delete pattern.
	(subdi_di_sesidi): Delete pattern.
	(subdi_zesidi_di): Delete pattern.
	(subdi_sesidi_di): Delete pattern.
	(subdi_zesidi_zesidi): Delete pattern.
	(negvdi3): Use s_register_operand.
	(negdi2_compare): Convert to simple insn with no split.
	(negdi2_insn): Likewise.
	(negsi2_carryin_compare): Delete pattern.
	(negdi_zero_extendsidi): Delete pattern.
	(arm_cmpdi_insn): Convert to simple insn with no split.
	(negdi2): Don't call gen_negdi2_neon.
	* config/arm/neon.md (adddi3_neon): Delete pattern.
	(subdi3_neon): Delete pattern.
	(negdi2_neon): Delete pattern.
	(splits for negdi2_neon): Delete splits.

testsuite:
	* gcc.target/arm/negdi-3.c: Add XFAILS.
	* gcc.target/arm/pr3447-1.c: Likewise.
	* gcc.target/arm/pr3447-3.c: Likewise.
	* gcc.target/arm/pr3447-4.c: Likewise.

From-SVN: r277164
---
 gcc/ChangeLog                            |  34 ++
 gcc/config/arm/arm.c                     |   2 -
 gcc/config/arm/arm.md                    | 569 +++----------------------------
 gcc/testsuite/ChangeLog                  |   7 +
 gcc/testsuite/gcc.target/arm/negdi-3.c   |   8 +-
 gcc/testsuite/gcc.target/arm/pr53447-1.c |   2 +-
 gcc/testsuite/gcc.target/arm/pr53447-3.c |   2 +-
 gcc/testsuite/gcc.target/arm/pr53447-4.c |   2 +-
 8 files changed, 97 insertions(+), 529 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 724ce8e..05ae1ea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,37 @@
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.md (adddi3): Only accept register operands.
+	(arm_adddi3): Convert to simple insn with no split.  Do not accept
+	constants.
+	(adddi_sesidi_di): Delete patern.
+	(adddi_zesidi_di): Likewise.
+	(uaddv<mode>4): Use LTU as condition for branch.
+	(adddi3_compareV): Convert to simple insn with no split.
+	(addsi3_compareV_upper): Delete pattern.
+	(adddi3_compareC): Convert to simple insn with no split.  Correct
+	flags setting expression.
+	(addsi3_compareC_upper): Delete pattern.
+	(addsi3_compareC): Correct flags setting expression.
+	(subdi3_compare1): Convert to simple insn with no split.
+	(subsi3_carryin_compare): Delete pattern.
+	(arm_subdi3): Convert to simple insn with no split.
+	(subdi_zesidi): Delete pattern.
+	(subdi_di_sesidi): Delete pattern.
+	(subdi_zesidi_di): Delete pattern.
+	(subdi_sesidi_di): Delete pattern.
+	(subdi_zesidi_zesidi): Delete pattern.
+	(negvdi3): Use s_register_operand.
+	(negdi2_compare): Convert to simple insn with no split.
+	(negdi2_insn): Likewise.
+	(negsi2_carryin_compare): Delete pattern.
+	(negdi_zero_extendsidi): Delete pattern.
+	(arm_cmpdi_insn): Convert to simple insn with no split.
+	(negdi2): Don't call gen_negdi2_neon.
+	* config/arm/neon.md (adddi3_neon): Delete pattern.
+	(subdi3_neon): Delete pattern.
+	(negdi2_neon): Delete pattern.
+	(splits for negdi2_neon): Delete splits.
+
 2019-10-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/92153
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 3bf8cd6..e8ec426 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -23581,8 +23581,6 @@ maybe_get_arm_condition_code (rtx comparison)
 	{
 	case LTU: return ARM_CS;
 	case GEU: return ARM_CC;
-	case NE: return ARM_CS;
-	case EQ: return ARM_CC;
 	default: return ARM_NV;
 	}
 
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index f861c72..241ba97 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -437,7 +437,7 @@
  [(parallel
    [(set (match_operand:DI           0 "s_register_operand")
 	  (plus:DI (match_operand:DI 1 "s_register_operand")
-	           (match_operand:DI 2 "arm_adddi_operand")))
+	           (match_operand:DI 2 "s_register_operand")))
     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_EITHER"
   "
@@ -446,87 +446,13 @@
   "
 )
 
-(define_insn_and_split "*arm_adddi3"
-  [(set (match_operand:DI          0 "arm_general_register_operand" "=&r,&r,&r,&r,&r")
-	(plus:DI (match_operand:DI 1 "arm_general_register_operand" "%0, 0, r, 0, r")
-		 (match_operand:DI 2 "arm_general_adddi_operand"    "r,  0, r, Dd, Dd")))
+(define_insn "*arm_adddi3"
+  [(set (match_operand:DI 0 "s_register_operand"  "=&r,&r,&r")
+	(plus:DI (match_operand:DI 1 "s_register_operand" " %0,0,r")
+		 (match_operand:DI 2 "s_register_operand" " r,0,r")))
    (clobber (reg:CC CC_REGNUM))]
   "TARGET_32BIT"
-  "#"
-  "TARGET_32BIT"
-  [(parallel [(set (reg:CC_C CC_REGNUM)
-		   (compare:CC_C (plus:SI (match_dup 1) (match_dup 2))
-				 (match_dup 1)))
-	      (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (plus:SI (plus:SI (match_dup 4) (match_dup 5))
-			       (ltu:SI (reg:CC_C CC_REGNUM) (const_int 0))))]
-  "
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[5] = gen_highpart_mode (SImode, DImode, operands[2]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-  }"
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*adddi_sesidi_di"
-  [(set (match_operand:DI 0 "s_register_operand" "=&r,&r")
-	(plus:DI (sign_extend:DI
-		  (match_operand:SI 2 "s_register_operand" "r,r"))
-		 (match_operand:DI 1 "s_register_operand" "0,r")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#"
-  "TARGET_32BIT && reload_completed"
-  [(parallel [(set (reg:CC_C CC_REGNUM)
-		   (compare:CC_C (plus:SI (match_dup 1) (match_dup 2))
-				 (match_dup 1)))
-	      (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (plus:SI (plus:SI (ashiftrt:SI (match_dup 2)
-						     (const_int 31))
-					(match_dup 4))
-			       (ltu:SI (reg:CC_C CC_REGNUM) (const_int 0))))]
-  "
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-  }"
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*adddi_zesidi_di"
-  [(set (match_operand:DI 0 "s_register_operand" "=&r,&r")
-	(plus:DI (zero_extend:DI
-		  (match_operand:SI 2 "s_register_operand" "r,r"))
-		 (match_operand:DI 1 "s_register_operand" "0,r")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#"
-  "TARGET_32BIT && reload_completed"
-  [(parallel [(set (reg:CC_C CC_REGNUM)
-		   (compare:CC_C (plus:SI (match_dup 1) (match_dup 2))
-				 (match_dup 1)))
-	      (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (plus:SI (plus:SI (match_dup 4) (const_int 0))
-			       (ltu:SI (reg:CC_C CC_REGNUM) (const_int 0))))]
-  "
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-  }"
+  "adds\\t%Q0, %Q1, %Q2;adc\\t%R0, %R1, %R2"
   [(set_attr "conds" "clob")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
@@ -553,7 +479,7 @@
   "TARGET_32BIT"
 {
   emit_insn (gen_add<mode>3_compareC (operands[0], operands[1], operands[2]));
-  arm_gen_unlikely_cbranch (NE, CC_Cmode, operands[3]);
+  arm_gen_unlikely_cbranch (LTU, CC_Cmode, operands[3]);
 
   DONE;
 })
@@ -636,44 +562,17 @@
  ]
 )
 
-(define_insn_and_split "adddi3_compareV"
+(define_insn "adddi3_compareV"
   [(set (reg:CC_V CC_REGNUM)
 	(ne:CC_V
 	  (plus:TI
-	    (sign_extend:TI (match_operand:DI 1 "register_operand" "r"))
-	    (sign_extend:TI (match_operand:DI 2 "register_operand" "r")))
+	    (sign_extend:TI (match_operand:DI 1 "s_register_operand" "r"))
+	    (sign_extend:TI (match_operand:DI 2 "s_register_operand" "r")))
 	  (sign_extend:TI (plus:DI (match_dup 1) (match_dup 2)))))
-   (set (match_operand:DI 0 "register_operand" "=&r")
+   (set (match_operand:DI 0 "s_register_operand" "=&r")
 	(plus:DI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
-  "#"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC_C CC_REGNUM)
-		   (compare:CC_C (plus:SI (match_dup 1) (match_dup 2))
-				 (match_dup 1)))
-	      (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
-   (parallel [(set (reg:CC_V CC_REGNUM)
-		   (ne:CC_V
-		    (plus:DI (plus:DI
-			      (sign_extend:DI (match_dup 4))
-			      (sign_extend:DI (match_dup 5)))
-			     (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))
-		    (plus:DI (sign_extend:DI
-			      (plus:SI (match_dup 4) (match_dup 5)))
-			     (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))))
-	     (set (match_dup 3) (plus:SI (plus:SI
-					  (match_dup 4) (match_dup 5))
-					 (ltu:SI (reg:CC_C CC_REGNUM)
-						 (const_int 0))))])]
-  "
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[5] = gen_highpart (SImode, operands[2]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-  }"
+  "adds\\t%Q0, %Q1, %Q2;adcs\\t%R0, %R1, %R2"
  [(set_attr "conds" "set")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
@@ -694,99 +593,27 @@
    (set_attr "type" "alus_sreg")]
 )
 
-(define_insn "*addsi3_compareV_upper"
-  [(set (reg:CC_V CC_REGNUM)
-	(ne:CC_V
-	  (plus:DI
-	   (plus:DI
-	    (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
-	    (sign_extend:DI (match_operand:SI 2 "register_operand" "r")))
-	   (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))
-	  (plus:DI (sign_extend:DI
-		    (plus:SI (match_dup 1) (match_dup 2)))
-		   (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))))
-   (set (match_operand:SI 0 "register_operand" "=r")
-	(plus:SI
-	 (plus:SI (match_dup 1) (match_dup 2))
-	 (ltu:SI (reg:CC_C CC_REGNUM) (const_int 0))))]
-  "TARGET_32BIT"
-  "adcs%?\\t%0, %1, %2"
-  [(set_attr "conds" "set")
-   (set_attr "type" "adcs_reg")]
-)
-
-(define_insn_and_split "adddi3_compareC"
+(define_insn "adddi3_compareC"
   [(set (reg:CC_C CC_REGNUM)
-	(ne:CC_C
-	  (plus:TI
-	    (zero_extend:TI (match_operand:DI 1 "register_operand" "r"))
-	    (zero_extend:TI (match_operand:DI 2 "register_operand" "r")))
-	  (zero_extend:TI (plus:DI (match_dup 1) (match_dup 2)))))
+	(compare:CC_C
+	  (plus:DI
+	    (match_operand:DI 1 "register_operand" "r")
+	    (match_operand:DI 2 "register_operand" "r"))
+	  (match_dup 1)))
    (set (match_operand:DI 0 "register_operand" "=&r")
 	(plus:DI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
-  "#"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC_C CC_REGNUM)
-		   (compare:CC_C (plus:SI (match_dup 1) (match_dup 2))
-				 (match_dup 1)))
-	      (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
-   (parallel [(set (reg:CC_C CC_REGNUM)
-		   (ne:CC_C
-		    (plus:DI (plus:DI
-			      (zero_extend:DI (match_dup 4))
-			      (zero_extend:DI (match_dup 5)))
-			     (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))
-		    (plus:DI (zero_extend:DI
-			      (plus:SI (match_dup 4) (match_dup 5)))
-			     (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))))
-	     (set (match_dup 3) (plus:SI
-				 (plus:SI (match_dup 4) (match_dup 5))
-				 (ltu:SI (reg:CC_C CC_REGNUM)
-					 (const_int 0))))])]
-  "
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[5] = gen_highpart (SImode, operands[2]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-  }"
+  "adds\\t%Q0, %Q1, %Q2;adcs\\t%R0, %R1, %R2"
  [(set_attr "conds" "set")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
 )
 
-(define_insn "*addsi3_compareC_upper"
-  [(set (reg:CC_C CC_REGNUM)
-	(ne:CC_C
-	  (plus:DI
-	   (plus:DI
-	    (zero_extend:DI (match_operand:SI 1 "register_operand" "r"))
-	    (zero_extend:DI (match_operand:SI 2 "register_operand" "r")))
-	   (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))
-	  (plus:DI (zero_extend:DI
-		    (plus:SI (match_dup 1) (match_dup 2)))
-		   (ltu:DI (reg:CC_C CC_REGNUM) (const_int 0)))))
-   (set (match_operand:SI 0 "register_operand" "=r")
-	(plus:SI
-	 (plus:SI (match_dup 1) (match_dup 2))
-	 (ltu:SI (reg:CC_C CC_REGNUM) (const_int 0))))]
-  "TARGET_32BIT"
-  "adcs%?\\t%0, %1, %2"
-  [(set_attr "conds" "set")
-   (set_attr "type" "adcs_reg")]
-)
-
 (define_insn "addsi3_compareC"
    [(set (reg:CC_C CC_REGNUM)
-	 (ne:CC_C
-	  (plus:DI
-	   (zero_extend:DI (match_operand:SI 1 "register_operand" "r"))
-	   (zero_extend:DI (match_operand:SI 2 "register_operand" "r")))
-	  (zero_extend:DI
-	   (plus:SI (match_dup 1) (match_dup 2)))))
+	 (compare:CC_C (plus:SI (match_operand:SI 1 "register_operand" "r")
+				(match_operand:SI 2 "register_operand" "r"))
+		       (match_dup 1)))
     (set (match_operand:SI 0 "register_operand" "=r")
 	 (plus:SI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
@@ -1094,31 +921,15 @@
   DONE;
 })
 
-(define_insn_and_split "subdi3_compare1"
+(define_insn "subdi3_compare1"
   [(set (reg:CC CC_REGNUM)
 	(compare:CC
-	  (match_operand:DI 1 "register_operand" "r")
-	  (match_operand:DI 2 "register_operand" "r")))
-   (set (match_operand:DI 0 "register_operand" "=&r")
+	  (match_operand:DI 1 "s_register_operand" "r")
+	  (match_operand:DI 2 "s_register_operand" "r")))
+   (set (match_operand:DI 0 "s_register_operand" "=&r")
 	(minus:DI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
-  "#"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 1) (match_dup 2)))
-	      (set (match_dup 0) (minus:SI (match_dup 1) (match_dup 2)))])
-   (parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 4) (match_dup 5)))
-	     (set (match_dup 3) (minus:SI (minus:SI (match_dup 4) (match_dup 5))
-			       (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))])]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[5] = gen_highpart (SImode, operands[2]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-   }
+  "subs\\t%Q0, %Q1, %Q2;sbcs\\t%R0, %R1, %R2"
   [(set_attr "conds" "set")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
@@ -1175,49 +986,6 @@
    (set_attr "type" "adc_imm")]
 )
 
-(define_insn "*subsi3_carryin_compare"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC (match_operand:SI 1 "s_register_operand" "r")
-		    (match_operand:SI 2 "s_register_operand" "r")))
-   (set (match_operand:SI 0 "s_register_operand" "=r")
-	(minus:SI (minus:SI (match_dup 1) (match_dup 2))
-		  (match_operand:SI 3 "arm_borrow_operation" "")))]
-  "TARGET_32BIT"
-  "sbcs\\t%0, %1, %2"
-  [(set_attr "conds" "set")
-   (set_attr "type" "adcs_reg")]
-)
-
-(define_insn "*subsi3_carryin_compare_const"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC (match_operand:SI 1 "reg_or_int_operand" "r")
-		    (match_operand:SI 2 "const_int_I_operand" "I")))
-   (set (match_operand:SI 0 "s_register_operand" "=r")
-	(minus:SI (plus:SI
-		   (match_dup 1)
-		   (match_operand:SI 3 "arm_neg_immediate_operand" "L"))
-		  (match_operand:SI 4 "arm_borrow_operation" "")))]
-  "TARGET_32BIT
-   && (INTVAL (operands[2])
-       == trunc_int_for_mode (-INTVAL (operands[3]), SImode))"
-  "sbcs\\t%0, %1, #%n3"
-  [(set_attr "conds" "set")
-   (set_attr "type" "adcs_imm")]
-)
-
-(define_insn "*subsi3_carryin_compare_const0"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC (match_operand:SI 1 "reg_or_int_operand" "r")
-		    (const_int 0)))
-   (set (match_operand:SI 0 "s_register_operand" "=r")
-	(minus:SI (match_dup 1)
-		  (match_operand:SI 2 "arm_borrow_operation" "")))]
-  "TARGET_32BIT"
-  "sbcs\\t%0, %1, #0"
-  [(set_attr "conds" "set")
-   (set_attr "type" "adcs_imm")]
-)
-
 (define_insn "*subsi3_carryin_shift"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(minus:SI (minus:SI
@@ -1286,166 +1054,19 @@
  [(parallel
    [(set (match_operand:DI            0 "s_register_operand")
 	  (minus:DI (match_operand:DI 1 "s_register_operand")
-	            (match_operand:DI 2 "s_register_operand")))
+		    (match_operand:DI 2 "s_register_operand")))
     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_EITHER"
   "
 ")
 
-(define_insn_and_split "*arm_subdi3"
-  [(set (match_operand:DI           0 "arm_general_register_operand" "=&r,&r,&r")
+(define_insn "*arm_subdi3"
+  [(set (match_operand:DI 0 "arm_general_register_operand" "=&r,&r,&r")
 	(minus:DI (match_operand:DI 1 "arm_general_register_operand" "0,r,0")
 		  (match_operand:DI 2 "arm_general_register_operand" "r,0,0")))
    (clobber (reg:CC CC_REGNUM))]
   "TARGET_32BIT"
-  "#"  ; "subs\\t%Q0, %Q1, %Q2\;sbc\\t%R0, %R1, %R2"
-  "TARGET_32BIT"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 1) (match_dup 2)))
-	      (set (match_dup 0) (minus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (minus:SI (minus:SI (match_dup 4) (match_dup 5))
-			       (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[5] = gen_highpart (SImode, operands[2]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-   }
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*subdi_di_zesidi"
-  [(set (match_operand:DI           0 "s_register_operand" "=&r,&r")
-	(minus:DI (match_operand:DI 1 "s_register_operand"  "0,r")
-		  (zero_extend:DI
-		   (match_operand:SI 2 "s_register_operand"  "r,r"))))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#"   ; "subs\\t%Q0, %Q1, %2\;sbc\\t%R0, %R1, #0"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 1) (match_dup 2)))
-	      (set (match_dup 0) (minus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (minus:SI (match_dup 4)
-				(ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-   }
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*subdi_di_sesidi"
-  [(set (match_operand:DI            0 "s_register_operand" "=&r,&r")
-	(minus:DI (match_operand:DI  1 "s_register_operand"  "0,r")
-		  (sign_extend:DI
-		   (match_operand:SI 2 "s_register_operand"  "r,r"))))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#"   ; "subs\\t%Q0, %Q1, %2\;sbc\\t%R0, %R1, %2, asr #31"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 1) (match_dup 2)))
-	      (set (match_dup 0) (minus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (minus:SI (minus:SI (match_dup 4)
-                                         (ashiftrt:SI (match_dup 2)
-                                                      (const_int 31)))
-                                (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-  }
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*subdi_zesidi_di"
-  [(set (match_operand:DI            0 "s_register_operand" "=&r,&r")
-	(minus:DI (zero_extend:DI
-		   (match_operand:SI 2 "s_register_operand"  "r,r"))
-		  (match_operand:DI  1 "s_register_operand" "0,r")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARM"
-  "#"   ; "rsbs\\t%Q0, %Q1, %2\;rsc\\t%R0, %R1, #0"
-        ; is equivalent to:
-        ; "subs\\t%Q0, %2, %Q1\;rsc\\t%R0, %R1, #0"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 2) (match_dup 1)))
-	      (set (match_dup 0) (minus:SI (match_dup 2) (match_dup 1)))])
-   (set (match_dup 3) (minus:SI (minus:SI (const_int 0) (match_dup 4))
-			       (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-  }
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*subdi_sesidi_di"
-  [(set (match_operand:DI            0 "s_register_operand" "=&r,&r")
-	(minus:DI (sign_extend:DI
-		   (match_operand:SI 2 "s_register_operand"   "r,r"))
-		  (match_operand:DI  1 "s_register_operand"  "0,r")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARM"
-  "#"   ; "rsbs\\t%Q0, %Q1, %2\;rsc\\t%R0, %R1, %2, asr #31"
-        ; is equivalent to:
-        ; "subs\\t%Q0, %2, %Q1\;rsc\\t%R0, %R1, %2, asr #31"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 2) (match_dup 1)))
-	      (set (match_dup 0) (minus:SI (match_dup 2) (match_dup 1)))])
-   (set (match_dup 3) (minus:SI (minus:SI
-                                (ashiftrt:SI (match_dup 2)
-                                             (const_int 31))
-                                (match_dup 4))
-			       (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[4] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-  }
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*subdi_zesidi_zesidi"
-  [(set (match_operand:DI            0 "s_register_operand" "=r")
-	(minus:DI (zero_extend:DI
-		   (match_operand:SI 1 "s_register_operand"  "r"))
-		  (zero_extend:DI
-		   (match_operand:SI 2 "s_register_operand"  "r"))))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#"   ; "subs\\t%Q0, %1, %2\;sbc\\t%R0, %1, %1"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 1) (match_dup 2)))
-	      (set (match_dup 0) (minus:SI (match_dup 1) (match_dup 2)))])
-   (set (match_dup 3) (minus:SI (minus:SI (match_dup 1) (match_dup 1))
-			       (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-       operands[3] = gen_highpart (SImode, operands[0]);
-       operands[0] = gen_lowpart (SImode, operands[0]);
-  }
+  "subs\\t%Q0, %Q1, %Q2\;sbc\\t%R0, %R1, %R2"
   [(set_attr "conds" "clob")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
@@ -4035,8 +3656,8 @@
 })
 
 (define_expand "negvdi3"
-  [(match_operand:DI 0 "register_operand")
-   (match_operand:DI 1 "register_operand")
+  [(match_operand:DI 0 "s_register_operand")
+   (match_operand:DI 1 "s_register_operand")
    (match_operand 2 "")]
   "TARGET_ARM"
 {
@@ -4047,34 +3668,19 @@
 })
 
 
-(define_insn_and_split "negdi2_compare"
+(define_insn "negdi2_compare"
   [(set (reg:CC CC_REGNUM)
 	(compare:CC
 	  (const_int 0)
-	  (match_operand:DI 1 "register_operand" "0,r")))
-   (set (match_operand:DI 0 "register_operand" "=r,&r")
+	  (match_operand:DI 1 "register_operand" "r,r")))
+   (set (match_operand:DI 0 "register_operand" "=&r,&r")
 	(minus:DI (const_int 0) (match_dup 1)))]
   "TARGET_ARM"
-  "#"
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (const_int 0) (match_dup 1)))
-	      (set (match_dup 0) (minus:SI (const_int 0)
-					   (match_dup 1)))])
-   (parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (const_int 0) (match_dup 3)))
-	     (set (match_dup 2)
-		  (minus:SI
-		   (minus:SI (const_int 0) (match_dup 3))
-		   (ltu:SI (reg:CC CC_REGNUM)
-			   (const_int 0))))])]
-  {
-    operands[2] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[3] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-  }
+  "@
+   rsbs\\t%Q0, %Q1, #0;rscs\\t%R0, %R1, #0
+   rsbs\\t%Q0, %Q1, #0;sbcs\\t%R0, %R1, %R1, lsl #1"
   [(set_attr "conds" "set")
+   (set_attr "arch" "a,t2")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
 )
@@ -4088,45 +3694,20 @@
 )
 
 ;; The constraints here are to prevent a *partial* overlap (where %Q0 == %R1).
-;; The first alternative allows the common case of a *full* overlap.
-(define_insn_and_split "*negdi2_insn"
-  [(set (match_operand:DI         0 "s_register_operand" "=r,&r")
-	(neg:DI (match_operand:DI 1 "s_register_operand"  "0,r")))
+(define_insn "*negdi2_insn"
+  [(set (match_operand:DI 0 "s_register_operand" "=&r,&r")
+	(neg:DI (match_operand:DI 1 "s_register_operand"  "r,r")))
    (clobber (reg:CC CC_REGNUM))]
   "TARGET_32BIT"
-  "#"	; rsbs %Q0, %Q1, #0; rsc %R0, %R1, #0	       (ARM)
-	; negs %Q0, %Q1    ; sbc %R0, %R1, %R1, lsl #1 (Thumb-2)
-  "TARGET_32BIT"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (const_int 0) (match_dup 1)))
-	      (set (match_dup 0) (minus:SI (const_int 0) (match_dup 1)))])
-   (set (match_dup 2) (minus:SI (minus:SI (const_int 0) (match_dup 3))
-                                (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[2] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    operands[3] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-  }
+  "@
+   rsbs\\t%Q0, %Q1, #0; rsc\\t%R0, %R1, #0
+   negs\\t%Q0, %Q1; sbc\\t%R0, %R1, %R1, lsl #1"
   [(set_attr "conds" "clob")
+   (set_attr "arch" "a,t2")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
 )
 
-(define_insn "*negsi2_carryin_compare"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC (const_int 0)
-		    (match_operand:SI 1 "s_register_operand" "r")))
-   (set (match_operand:SI 0 "s_register_operand" "=r")
-	(minus:SI (minus:SI (const_int 0)
-			    (match_dup 1))
-		  (match_operand:SI 2 "arm_borrow_operation" "")))]
-  "TARGET_ARM"
-  "rscs\\t%0, %1, #0"
-  [(set_attr "conds" "set")
-   (set_attr "type" "alus_imm")]
-)
-
 (define_expand "negsi2"
   [(set (match_operand:SI         0 "s_register_operand")
 	(neg:SI (match_operand:SI 1 "s_register_operand")))]
@@ -4249,29 +3830,6 @@
    (set_attr "type" "multiple")]
 )
 
-(define_insn_and_split "*negdi_zero_extendsidi"
-  [(set (match_operand:DI 0 "s_register_operand" "=r,&r")
-	(neg:DI (zero_extend:DI (match_operand:SI 1 "s_register_operand" "0,r"))))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#" ; "rsbs\\t%Q0, %1, #0\;sbc\\t%R0,%R0,%R0"
-      ;; Don't care what register is input to sbc,
-      ;; since we just need to propagate the carry.
-  "&& reload_completed"
-  [(parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (const_int 0) (match_dup 1)))
-	      (set (match_dup 0) (minus:SI (const_int 0) (match_dup 1)))])
-   (set (match_dup 2) (minus:SI (minus:SI (match_dup 2) (match_dup 2))
-				(ltu:SI (reg:CC CC_REGNUM) (const_int 0))))]
-  {
-    operands[2] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-  }
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]   ;; length in thumb is 4
-)
-
 ;; abssi2 doesn't really clobber the condition codes if a different register
 ;; is being set.  To keep things simple, assume during rtl manipulations that
 ;; it does, but tell the final scan operator the truth.  Similarly for
@@ -6824,42 +6382,13 @@
 ;; if-conversion cannot reduce to a conditional compare, so we do
 ;; that directly.
 
-(define_insn_and_split "*arm_cmpdi_insn"
+(define_insn "*arm_cmpdi_insn"
   [(set (reg:CC_NCV CC_REGNUM)
 	(compare:CC_NCV (match_operand:DI 0 "s_register_operand" "r")
 			(match_operand:DI 1 "arm_di_operand"	   "rDi")))
    (clobber (match_scratch:SI 2 "=r"))]
   "TARGET_32BIT"
-  "#"   ; "cmp\\t%Q0, %Q1\;sbcs\\t%2, %R0, %R1"
-  "&& reload_completed"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC (match_dup 0) (match_dup 1)))
-   (parallel [(set (reg:CC CC_REGNUM)
-		   (compare:CC (match_dup 3) (match_dup 4)))
-	      (set (match_dup 2)
-		   (minus:SI (match_dup 5)
-			     (ltu:SI (reg:CC CC_REGNUM) (const_int 0))))])]
-  {
-    operands[3] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    if (CONST_INT_P (operands[1]))
-      {
-	operands[4] = gen_highpart_mode (SImode, DImode, operands[1]);
-	if (operands[4] == const0_rtx)
-	  operands[5] = operands[3];
-	else
-	  operands[5] = gen_rtx_PLUS (SImode, operands[3],
-				      gen_int_mode (-UINTVAL (operands[4]),
-						    SImode));
-      }
-    else
-      {
-        operands[4] = gen_highpart (SImode, operands[1]);
-        operands[5] = gen_rtx_MINUS (SImode, operands[3], operands[4]);
-      }
-    operands[1] = gen_lowpart (SImode, operands[1]);
-    operands[2] = gen_lowpart (SImode, operands[2]);
-  }
+  "cmp\\t%Q0, %Q1\;sbcs\\t%2, %R0, %R1"
   [(set_attr "conds" "set")
    (set_attr "length" "8")
    (set_attr "type" "multiple")]
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5379447..0c5b6e4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
+	* gcc.target/arm/negdi-3.c: Add XFAILS.
+	* gcc.target/arm/pr3447-1.c: Likewise.
+	* gcc.target/arm/pr3447-3.c: Likewise.
+	* gcc.target/arm/pr3447-4.c: Likewise.
+
 2019-10-18  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/69455
diff --git a/gcc/testsuite/gcc.target/arm/negdi-3.c b/gcc/testsuite/gcc.target/arm/negdi-3.c
index 76ddf49..3f6f2d1 100644
--- a/gcc/testsuite/gcc.target/arm/negdi-3.c
+++ b/gcc/testsuite/gcc.target/arm/negdi-3.c
@@ -11,7 +11,7 @@ Expected output:
         rsbs    r0, r0, #0
         sbc     r1, r1, r1
 */
-/* { dg-final { scan-assembler-times "rsb" 1 } } */
-/* { dg-final { scan-assembler-times "sbc" 1 } } */
-/* { dg-final { scan-assembler-times "mov" 0 } } */
-/* { dg-final { scan-assembler-times "rsc" 0 } } */
+/* { dg-final { scan-assembler-times "rsb" 1 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times "sbc" 1 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times "mov" 0 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times "rsc" 0 { xfail *-*-* } } } */
diff --git a/gcc/testsuite/gcc.target/arm/pr53447-1.c b/gcc/testsuite/gcc.target/arm/pr53447-1.c
index dc09418..0fd98b7 100644
--- a/gcc/testsuite/gcc.target/arm/pr53447-1.c
+++ b/gcc/testsuite/gcc.target/arm/pr53447-1.c
@@ -1,6 +1,6 @@
 /* { dg-options "-O2" }  */
 /* { dg-require-effective-target arm32 } */
-/* { dg-final { scan-assembler-not "mov" } } */
+/* { dg-final { scan-assembler-not "mov" { xfail *-*-* } } } */
 
 void t0p(long long * p)
 {
diff --git a/gcc/testsuite/gcc.target/arm/pr53447-3.c b/gcc/testsuite/gcc.target/arm/pr53447-3.c
index 8e48f11..79d3691 100644
--- a/gcc/testsuite/gcc.target/arm/pr53447-3.c
+++ b/gcc/testsuite/gcc.target/arm/pr53447-3.c
@@ -1,6 +1,6 @@
 /* { dg-options "-O2" }  */
 /* { dg-require-effective-target arm32 } */
-/* { dg-final { scan-assembler-not "mov" } } */
+/* { dg-final { scan-assembler-not "mov" { xfail *-*-* } } } */
 
 
 void t0p(long long * p)
diff --git a/gcc/testsuite/gcc.target/arm/pr53447-4.c b/gcc/testsuite/gcc.target/arm/pr53447-4.c
index 22acb97..bfa20df 100644
--- a/gcc/testsuite/gcc.target/arm/pr53447-4.c
+++ b/gcc/testsuite/gcc.target/arm/pr53447-4.c
@@ -1,6 +1,6 @@
 /* { dg-options "-O2" }  */
 /* { dg-require-effective-target arm32 } */
-/* { dg-final { scan-assembler-not "mov" } } */
+/* { dg-final { scan-assembler-not "mov" { xfail *-*-* } } } */
 
 
 void t0p(long long * p)
-- 
cgit v1.1


From 0406dccda5c9adfaf65e132fda5b8c0fbc5ce1d5 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:01:49 +0000
Subject: [arm] Perform early splitting of adddi3.

This patch causes the expansion of adddi3 to split the operation
immediately for Arm and Thumb-2.  This is desirable as it frees up the
register allocator to pick what ever combination of registers suits
best and reduces the number of auxiliary patterns that we need in the
back-end.  Three of the testcases that we disabled earlier are already
fixed by this patch.  Finally, we add a new pattern to match the
canonicalization of add-with-carry when using an immediate of zero.

gcc:
	* config/arm/arm-protos.h (arm_decompose_di_binop): New prototype.
	* config/arm/arm.c (arm_decompose_di_binop): New function.
	* config/arm/arm.md (adddi3): Also accept any const_int for op2.
	If not generating Thumb-1 code, decompose the operation into 32-bit
	pieces.
	* add0si_carryin_<optab>: New pattern.

testsuite:
	* gcc.target/arm/pr53447-1.c: Remove XFAIL.
	* gcc.target/arm/pr53447-3.c: Remove XFAIL.
	* gcc.target/arm/pr53447-4.c: Remove XFAIL.

From-SVN: r277165
---
 gcc/ChangeLog                            |  9 ++++
 gcc/config/arm/arm-protos.h              |  1 +
 gcc/config/arm/arm.c                     | 15 +++++++
 gcc/config/arm/arm.md                    | 73 +++++++++++++++++++++++++-------
 gcc/testsuite/ChangeLog                  |  6 +++
 gcc/testsuite/gcc.target/arm/pr53447-1.c |  2 +-
 gcc/testsuite/gcc.target/arm/pr53447-3.c |  2 +-
 gcc/testsuite/gcc.target/arm/pr53447-4.c |  2 +-
 8 files changed, 91 insertions(+), 19 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05ae1ea..a4acdcc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm-protos.h (arm_decompose_di_binop): New prototype.
+	* config/arm/arm.c (arm_decompose_di_binop): New function.
+	* config/arm/arm.md (adddi3): Also accept any const_int for op2.
+	If not generating Thumb-1 code, decompose the operation into 32-bit
+	pieces.
+	* add0si_carryin_<optab>: New pattern.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* arm.md (adddi3): Only accept register operands.
 	(arm_adddi3): Convert to simple insn with no split.  Do not accept
 	constants.
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index f995974..c685bcb 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -57,6 +57,7 @@ extern rtx arm_simd_vect_par_cnst_half (machine_mode mode, bool high);
 extern bool arm_simd_check_vect_par_cnst_half_p (rtx op, machine_mode mode,
 						 bool high);
 extern void arm_emit_speculation_barrier_function (void);
+extern void arm_decompose_di_binop (rtx, rtx, rtx *, rtx *, rtx *, rtx *);
 
 #ifdef RTX_CODE
 extern void arm_gen_unlikely_cbranch (enum rtx_code, machine_mode cc_mode,
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index e8ec426..f26945d 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -14933,6 +14933,21 @@ gen_cpymem_ldrd_strd (rtx *operands)
   return true;
 }
 
+/* Decompose operands for a 64-bit binary operation in OP1 and OP2
+   into its component 32-bit subregs.  OP2 may be an immediate
+   constant and we want to simplify it in that case.  */
+void
+arm_decompose_di_binop (rtx op1, rtx op2, rtx *lo_op1, rtx *hi_op1,
+			rtx *lo_op2, rtx *hi_op2)
+{
+  *lo_op1 = gen_lowpart (SImode, op1);
+  *hi_op1 = gen_highpart (SImode, op1);
+  *lo_op2 = simplify_gen_subreg (SImode, op2, DImode,
+				 subreg_lowpart_offset (SImode, DImode));
+  *hi_op2 = simplify_gen_subreg (SImode, op2, DImode,
+				 subreg_highpart_offset (SImode, DImode));
+}
+
 /* Select a dominance comparison mode if possible for a test of the general
    form (OP (COND_OR (X) (Y)) (const_int 0)).  We support three forms.
    COND_OR == DOM_CC_X_AND_Y => (X && Y)
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 241ba97..5ba42a1 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -437,25 +437,53 @@
  [(parallel
    [(set (match_operand:DI           0 "s_register_operand")
 	  (plus:DI (match_operand:DI 1 "s_register_operand")
-	           (match_operand:DI 2 "s_register_operand")))
+		   (match_operand:DI 2 "reg_or_int_operand")))
     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_EITHER"
   "
-  if (TARGET_THUMB1 && !REG_P (operands[2]))
-    operands[2] = force_reg (DImode, operands[2]);
-  "
-)
+  if (TARGET_THUMB1)
+    {
+      if (!REG_P (operands[2]))
+	operands[2] = force_reg (DImode, operands[2]);
+    }
+  else
+    {
+      rtx lo_result, hi_result, lo_dest, hi_dest;
+      rtx lo_op1, hi_op1, lo_op2, hi_op2;
+      arm_decompose_di_binop (operands[1], operands[2], &lo_op1, &hi_op1,
+			      &lo_op2, &hi_op2);
+      lo_result = lo_dest = gen_lowpart (SImode, operands[0]);
+      hi_result = hi_dest = gen_highpart (SImode, operands[0]);
+
+      if (lo_op2 == const0_rtx)
+	{
+	  lo_dest = lo_op1;
+	  if (!arm_add_operand (hi_op2, SImode))
+	    hi_op2 = force_reg (SImode, hi_op2);
+	  /* Assume hi_op2 won't also be zero.  */
+	  emit_insn (gen_addsi3 (hi_dest, hi_op1, hi_op2));
+	}
+      else
+	{
+	  if (!arm_add_operand (lo_op2, SImode))
+	    lo_op2 = force_reg (SImode, lo_op2);
+	  if (!arm_not_operand (hi_op2, SImode))
+	    hi_op2 = force_reg (SImode, hi_op2);
+
+	  emit_insn (gen_addsi3_compareC (lo_dest, lo_op1, lo_op2));
+	  if (hi_op2 == const0_rtx)
+	    emit_insn (gen_add0si3_carryin_ltu (hi_dest, hi_op1));
+	  else
+	    emit_insn (gen_addsi3_carryin_ltu (hi_dest, hi_op1, hi_op2));
+	}
 
-(define_insn "*arm_adddi3"
-  [(set (match_operand:DI 0 "s_register_operand"  "=&r,&r,&r")
-	(plus:DI (match_operand:DI 1 "s_register_operand" " %0,0,r")
-		 (match_operand:DI 2 "s_register_operand" " r,0,r")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "adds\\t%Q0, %Q1, %Q2;adc\\t%R0, %R1, %R2"
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
+      if (lo_result != lo_dest)
+	emit_move_insn (lo_result, lo_dest);
+      if (hi_result != hi_dest)
+	emit_move_insn (gen_highpart (SImode, operands[0]), hi_dest);
+      DONE;
+    }
+  "
 )
 
 (define_expand "addv<mode>4"
@@ -830,7 +858,7 @@
    (set_attr "type" "alus_imm,alus_sreg,alus_imm,alus_imm,alus_sreg")]
  )
 
-(define_insn "*addsi3_carryin_<optab>"
+(define_insn "addsi3_carryin_<optab>"
   [(set (match_operand:SI 0 "s_register_operand" "=l,r,r")
         (plus:SI (plus:SI (match_operand:SI 1 "s_register_operand" "%l,r,r")
                           (match_operand:SI 2 "arm_not_operand" "0,rI,K"))
@@ -848,6 +876,19 @@
    (set_attr "type" "adc_reg,adc_reg,adc_imm")]
 )
 
+;; Canonicalization of the above when the immediate is zero.
+(define_insn "add0si3_carryin_<optab>"
+  [(set (match_operand:SI 0 "s_register_operand" "=r")
+	(plus:SI (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))
+		 (match_operand:SI 1 "arm_not_operand" "r")))]
+  "TARGET_32BIT"
+  "adc%?\\t%0, %1, #0"
+  [(set_attr "conds" "use")
+   (set_attr "predicable" "yes")
+   (set_attr "length" "4")
+   (set_attr "type" "adc_imm")]
+)
+
 (define_insn "*addsi3_carryin_alt2_<optab>"
   [(set (match_operand:SI 0 "s_register_operand" "=l,r,r")
         (plus:SI (plus:SI (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c5b6e4..ae9d216 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* gcc.target/arm/pr53447-1.c: Remove XFAIL.
+	* gcc.target/arm/pr53447-3.c: Remove XFAIL.
+	* gcc.target/arm/pr53447-4.c: Remove XFAIL.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* gcc.target/arm/negdi-3.c: Add XFAILS.
 	* gcc.target/arm/pr3447-1.c: Likewise.
 	* gcc.target/arm/pr3447-3.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/arm/pr53447-1.c b/gcc/testsuite/gcc.target/arm/pr53447-1.c
index 0fd98b7..dc09418 100644
--- a/gcc/testsuite/gcc.target/arm/pr53447-1.c
+++ b/gcc/testsuite/gcc.target/arm/pr53447-1.c
@@ -1,6 +1,6 @@
 /* { dg-options "-O2" }  */
 /* { dg-require-effective-target arm32 } */
-/* { dg-final { scan-assembler-not "mov" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not "mov" } } */
 
 void t0p(long long * p)
 {
diff --git a/gcc/testsuite/gcc.target/arm/pr53447-3.c b/gcc/testsuite/gcc.target/arm/pr53447-3.c
index 79d3691..8e48f11 100644
--- a/gcc/testsuite/gcc.target/arm/pr53447-3.c
+++ b/gcc/testsuite/gcc.target/arm/pr53447-3.c
@@ -1,6 +1,6 @@
 /* { dg-options "-O2" }  */
 /* { dg-require-effective-target arm32 } */
-/* { dg-final { scan-assembler-not "mov" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not "mov" } } */
 
 
 void t0p(long long * p)
diff --git a/gcc/testsuite/gcc.target/arm/pr53447-4.c b/gcc/testsuite/gcc.target/arm/pr53447-4.c
index bfa20df..22acb97 100644
--- a/gcc/testsuite/gcc.target/arm/pr53447-4.c
+++ b/gcc/testsuite/gcc.target/arm/pr53447-4.c
@@ -1,6 +1,6 @@
 /* { dg-options "-O2" }  */
 /* { dg-require-effective-target arm32 } */
-/* { dg-final { scan-assembler-not "mov" { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not "mov" } } */
 
 
 void t0p(long long * p)
-- 
cgit v1.1


From 0250355849a16456a8b8e6dce2d2d7874696649e Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:01:57 +0000
Subject: [arm] Early split zero- and sign-extension

This patch changes the insn patterns for zero- and sign-extend into
define_expands that generate the appropriate word operations
immediately.

	* config/arm/arm.md (zero_extend<mode>di2): Convert to define_expand.
	(extend<mode>di2): Likewise.

From-SVN: r277166
---
 gcc/ChangeLog         |  5 ++++
 gcc/config/arm/arm.md | 75 ++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 59 insertions(+), 21 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4acdcc..7935f1f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (zero_extend<mode>di2): Convert to define_expand.
+	(extend<mode>di2): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm-protos.h (arm_decompose_di_binop): New prototype.
 	* config/arm/arm.c (arm_decompose_di_binop): New function.
 	* config/arm/arm.md (adddi3): Also accept any const_int for op2.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 5ba42a1..4a7a64e 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -4196,31 +4196,64 @@
 
 ;; Zero and sign extension instructions.
 
-(define_insn "zero_extend<mode>di2"
-  [(set (match_operand:DI 0 "s_register_operand" "=r,?r")
-        (zero_extend:DI (match_operand:QHSI 1 "<qhs_zextenddi_op>"
-					    "<qhs_zextenddi_cstr>")))]
+(define_expand "zero_extend<mode>di2"
+  [(set (match_operand:DI 0 "s_register_operand" "")
+	(zero_extend:DI (match_operand:QHSI 1 "<qhs_zextenddi_op>" "")))]
   "TARGET_32BIT <qhs_zextenddi_cond>"
-  "#"
-  [(set_attr "length" "4,8")
-   (set_attr "arch" "*,*")
-   (set_attr "ce_count" "2")
-   (set_attr "predicable" "yes")
-   (set_attr "type" "mov_reg,multiple")]
+  {
+    rtx res_lo, res_hi, op0_lo, op0_hi;
+    res_lo = gen_lowpart (SImode, operands[0]);
+    res_hi = gen_highpart (SImode, operands[0]);
+    if (can_create_pseudo_p ())
+      {
+	op0_lo = <MODE>mode == SImode ? operands[1] : gen_reg_rtx (SImode);
+	op0_hi = gen_reg_rtx (SImode);
+      }
+    else
+      {
+	op0_lo = <MODE>mode == SImode ? operands[1] : res_lo;
+	op0_hi = res_hi;
+      }
+    if (<MODE>mode != SImode)
+      emit_insn (gen_rtx_SET (op0_lo,
+			      gen_rtx_ZERO_EXTEND (SImode, operands[1])));
+    emit_insn (gen_movsi (op0_hi, const0_rtx));
+    if (res_lo != op0_lo)
+      emit_move_insn (res_lo, op0_lo);
+    if (res_hi != op0_hi)
+      emit_move_insn (res_hi, op0_hi);
+    DONE;
+  }
 )
 
-(define_insn "extend<mode>di2"
-  [(set (match_operand:DI 0 "s_register_operand" "=r,?r,?r")
-        (sign_extend:DI (match_operand:QHSI 1 "<qhs_extenddi_op>"
-					    "<qhs_extenddi_cstr>")))]
+(define_expand "extend<mode>di2"
+  [(set (match_operand:DI 0 "s_register_operand" "")
+	(sign_extend:DI (match_operand:QHSI 1 "<qhs_extenddi_op>" "")))]
   "TARGET_32BIT <qhs_sextenddi_cond>"
-  "#"
-  [(set_attr "length" "4,8,8")
-   (set_attr "ce_count" "2")
-   (set_attr "shift" "1")
-   (set_attr "predicable" "yes")
-   (set_attr "arch" "*,a,t")
-   (set_attr "type" "mov_reg,multiple,multiple")]
+  {
+    rtx res_lo, res_hi, op0_lo, op0_hi;
+    res_lo = gen_lowpart (SImode, operands[0]);
+    res_hi = gen_highpart (SImode, operands[0]);
+    if (can_create_pseudo_p ())
+      {
+	op0_lo = <MODE>mode == SImode ? operands[1] : gen_reg_rtx (SImode);
+	op0_hi = gen_reg_rtx (SImode);
+      }
+    else
+      {
+	op0_lo = <MODE>mode == SImode ? operands[1] : res_lo;
+	op0_hi = res_hi;
+      }
+    if (<MODE>mode != SImode)
+      emit_insn (gen_rtx_SET (op0_lo,
+			      gen_rtx_SIGN_EXTEND (SImode, operands[1])));
+    emit_insn (gen_ashrsi3 (op0_hi, op0_lo, GEN_INT (31)));
+    if (res_lo != op0_lo)
+      emit_move_insn (res_lo, op0_lo);
+    if (res_hi != op0_hi)
+      emit_move_insn (res_hi, op0_hi);
+    DONE;
+  }
 )
 
 ;; Splits for all extensions to DImode
-- 
cgit v1.1


From 717e1281604655ef608931fff028f02d462e78b6 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:05 +0000
Subject: [arm] Rewrite addsi3_carryin_shift_<optab> in canonical form

The add-with-carry operation which involves a shift doesn't match at present
because it isn't matching the canonical form generated by combine.  Fixing
this is simply a matter of re-ordering the operands.

	* config/arm/arm.md (addsi3_carryin_shift_<optab>): Reorder operands
	to match canonical form.

From-SVN: r277167
---
 gcc/ChangeLog         | 5 +++++
 gcc/config/arm/arm.md | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7935f1f..cb2abfe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (addsi3_carryin_shift_<optab>): Reorder operands
+	to match canonical form.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (zero_extend<mode>di2): Convert to define_expand.
 	(extend<mode>di2): Likewise.
 
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 4a7a64e..9754a76 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -913,8 +913,8 @@
 		  (match_operator:SI 2 "shift_operator"
 		    [(match_operand:SI 3 "s_register_operand" "r")
 		     (match_operand:SI 4 "reg_or_int_operand" "rM")])
-		  (match_operand:SI 1 "s_register_operand" "r"))
-		 (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))))]
+		  (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0)))
+		 (match_operand:SI 1 "s_register_operand" "r")))]
   "TARGET_32BIT"
   "adc%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "use")
-- 
cgit v1.1


From 494c4921c7c7970562ab3ee3838809e8e7f0623a Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:12 +0000
Subject: [arm] fix constraints on addsi3_carryin_alt2

addsi3_carryin_alt2 has a more strict constraint than the predicate
when adding a constant.  This leads to sub-optimal code in some
circumstances.

	* config/arm/arm.md (addsi3_carryin_alt2): Use arm_not_operand for
	operand 2.

From-SVN: r277168
---
 gcc/ChangeLog         | 5 +++++
 gcc/config/arm/arm.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb2abfe..1c96b17 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (addsi3_carryin_alt2): Use arm_not_operand for
+	operand 2.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (addsi3_carryin_shift_<optab>): Reorder operands
 	to match canonical form.
 
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 9754a76..fbe154a 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -893,7 +893,7 @@
   [(set (match_operand:SI 0 "s_register_operand" "=l,r,r")
         (plus:SI (plus:SI (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))
                           (match_operand:SI 1 "s_register_operand" "%l,r,r"))
-                 (match_operand:SI 2 "arm_rhs_operand" "l,rI,K")))]
+                 (match_operand:SI 2 "arm_not_operand" "l,rI,K")))]
   "TARGET_32BIT"
   "@
    adc%?\\t%0, %1, %2
-- 
cgit v1.1


From da0e6bd3d347117e928a92841e8ed6da202e1426 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:20 +0000
Subject: [arm] Early split subdi3

This patch adds early splitting of subdi3 so that the individual
operations can be seen by the optimizers, particuarly combine.  This
should allow us to do at least as good a job as previously, but with
far fewer patterns in the machine description.

This is just the initial patch to add the early splitting.  The
cleanups will follow later.

A special trick is used to handle the 'reverse subtract and compare'
where a register is subtracted from a constant.  The natural
comparison

    (COMPARE (const) (reg))

is not canonical in this case and combine will never correctly
generate it (trying to swap the order of the operands.  To handle this
we write the comparison as

    (COMPARE (NOT (reg)) (~const)),

which has the same result for EQ, NE, LTU, LEU, GTU and GEU, which are
all the cases we are really interested in here.

Finally, we delete the negdi2 pattern.  The generic expanders will use
our new subdi3 expander if this pattern is missing and that can handle
the negate case just fine.

	* config/arm/arm-modes.def (CC_RSB): New CC mode.
	* config/arm/predicates.md (arm_borrow_operation): Handle CC_RSBmode.
	* config/arm/arm.c (arm_select_cc_mode): Detect when we should
	return CC_RSBmode.
	(maybe_get_arm_condition_code): Handle CC_RSBmode.
	* config/arm/arm.md (subsi3_carryin): Make this pattern available to
	expand.
	(subdi3): Rewrite to early-expand the sub-operations.
	(rsb_im_compare): New pattern.
	(negdi2): Delete.
	(negdi2_insn): Delete.
	(arm_negsi2): Correct type attribute to alu_imm.
	(negsi2_0compare): New insn pattern.
	(negsi2_carryin): New insn pattern.

From-SVN: r277169
---
 gcc/ChangeLog                |  17 ++++++
 gcc/config/arm/arm-modes.def |   4 ++
 gcc/config/arm/arm.c         |  23 +++++++
 gcc/config/arm/arm.md        | 141 ++++++++++++++++++++++++++++++++++---------
 gcc/config/arm/predicates.md |   2 +-
 5 files changed, 158 insertions(+), 29 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c96b17..0f389a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,22 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm-modes.def (CC_RSB): New CC mode.
+	* config/arm/predicates.md (arm_borrow_operation): Handle CC_RSBmode.
+	* config/arm/arm.c (arm_select_cc_mode): Detect when we should
+	return CC_RSBmode.
+	(maybe_get_arm_condition_code): Handle CC_RSBmode.
+	* config/arm/arm.md (subsi3_carryin): Make this pattern available to
+	expand.
+	(subdi3): Rewrite to early-expand the sub-operations.
+	(rsb_im_compare): New pattern.
+	(negdi2): Delete.
+	(negdi2_insn): Delete.
+	(arm_negsi2): Correct type attribute to alu_imm.
+	(negsi2_0compare): New insn pattern.
+	(negsi2_carryin): New insn pattern.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (addsi3_carryin_alt2): Use arm_not_operand for
 	operand 2.
 
diff --git a/gcc/config/arm/arm-modes.def b/gcc/config/arm/arm-modes.def
index 8f131c3..4fa7f1b 100644
--- a/gcc/config/arm/arm-modes.def
+++ b/gcc/config/arm/arm-modes.def
@@ -36,6 +36,9 @@ ADJUST_FLOAT_FORMAT (HF, ((arm_fp16_format == ARM_FP16_FORMAT_ALTERNATIVE)
    CC_Nmode should be used if only the N (sign) flag is set correctly
    CC_CZmode should be used if only the C and Z flags are correct
    (used for DImode unsigned comparisons).
+   CC_RSBmode should be used where the comparison is set by an RSB immediate,
+     or NEG instruction.  The form of the comparison for (const - reg) will
+     be (COMPARE (not (reg)) (~const)).
    CC_NCVmode should be used if only the N, C, and V flags are correct
    (used for DImode signed comparisons).
    CCmode should be used otherwise.  */
@@ -45,6 +48,7 @@ CC_MODE (CC_Z);
 CC_MODE (CC_CZ);
 CC_MODE (CC_NCV);
 CC_MODE (CC_SWP);
+CC_MODE (CC_RSB);
 CC_MODE (CCFP);
 CC_MODE (CCFPE);
 CC_MODE (CC_DNE);
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index f26945d..41e4832 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15214,6 +15214,17 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 	  || (TARGET_32BIT && GET_CODE (x) == ZERO_EXTRACT)))
     return CC_NOOVmode;
 
+  /* An unsigned comparison of ~reg with a const is really a special
+     canoncialization of compare (~const, reg), which is a reverse
+     subtract operation.  We may not get here if CONST is 0, but that
+     doesn't matter because ~0 isn't a valid immediate for RSB.  */
+  if (GET_MODE (x) == SImode
+      && GET_CODE (x) == NOT
+      && CONST_INT_P (y)
+      && (op == EQ || op == NE
+	  || op == LTU || op == LEU || op == GEU || op == GTU))
+    return CC_RSBmode;
+
   if (GET_MODE (x) == QImode && (op == EQ || op == NE))
     return CC_Zmode;
 
@@ -23629,6 +23640,18 @@ maybe_get_arm_condition_code (rtx comparison)
 	default: return ARM_NV;
 	}
 
+    case E_CC_RSBmode:
+      switch (comp_code)
+	{
+	case NE: return ARM_NE;
+	case EQ: return ARM_EQ;
+	case GEU: return ARM_CS;
+	case GTU: return ARM_HI;
+	case LEU: return ARM_LS;
+	case LTU: return ARM_CC;
+	default: return ARM_NV;
+	}
+
     case E_CCmode:
       switch (comp_code)
 	{
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index fbe154a..99d9315 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -989,7 +989,7 @@
    (set_attr "type" "alus_sreg")]
 )
 
-(define_insn "*subsi3_carryin"
+(define_insn "subsi3_carryin"
   [(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
 	(minus:SI (minus:SI (match_operand:SI 1 "reg_or_int_operand" "r,I,Pz")
 			    (match_operand:SI 2 "s_register_operand" "r,r,r"))
@@ -1094,12 +1094,72 @@
 (define_expand "subdi3"
  [(parallel
    [(set (match_operand:DI            0 "s_register_operand")
-	  (minus:DI (match_operand:DI 1 "s_register_operand")
+	  (minus:DI (match_operand:DI 1 "reg_or_int_operand")
 		    (match_operand:DI 2 "s_register_operand")))
     (clobber (reg:CC CC_REGNUM))])]
   "TARGET_EITHER"
   "
-")
+  if (TARGET_THUMB1)
+    {
+      if (!REG_P (operands[1]))
+	operands[1] = force_reg (DImode, operands[1]);
+    }
+  else
+    {
+      rtx lo_result, hi_result, lo_dest, hi_dest;
+      rtx lo_op1, hi_op1, lo_op2, hi_op2;
+      rtx condition;
+
+      /* Since operands[1] may be an integer, pass it second, so that
+	 any necessary simplifications will be done on the decomposed
+	 constant.  */
+      arm_decompose_di_binop (operands[2], operands[1], &lo_op2, &hi_op2,
+			      &lo_op1, &hi_op1);
+      lo_result = lo_dest = gen_lowpart (SImode, operands[0]);
+      hi_result = hi_dest = gen_highpart (SImode, operands[0]);
+
+      if (!arm_rhs_operand (lo_op1, SImode))
+	lo_op1 = force_reg (SImode, lo_op1);
+
+      if ((TARGET_THUMB2 && ! s_register_operand (hi_op1, SImode))
+	  || !arm_rhs_operand (hi_op1, SImode))
+	hi_op1 = force_reg (SImode, hi_op1);
+
+      rtx cc_reg;
+      if (lo_op1 == const0_rtx)
+	{
+	  cc_reg = gen_rtx_REG (CC_RSBmode, CC_REGNUM);
+	  emit_insn (gen_negsi2_0compare (lo_dest, lo_op2));
+	}
+      else if (CONST_INT_P (lo_op1))
+	{
+	  cc_reg = gen_rtx_REG (CC_RSBmode, CC_REGNUM);
+	  emit_insn (gen_rsb_imm_compare (lo_dest, lo_op1, lo_op2, 
+					  GEN_INT (~UINTVAL (lo_op1))));
+	}
+      else
+	{
+	  cc_reg = gen_rtx_REG (CCmode, CC_REGNUM);
+	  emit_insn (gen_subsi3_compare (lo_dest, lo_op1, lo_op2));
+	}
+
+      condition = gen_rtx_LTU (SImode, cc_reg, const0_rtx);
+
+      if (hi_op1 == const0_rtx)
+        emit_insn (gen_negsi2_carryin (hi_dest, hi_op2, condition));
+      else
+	emit_insn (gen_subsi3_carryin (hi_dest, hi_op1, hi_op2, condition));
+
+      if (lo_result != lo_dest)
+	emit_move_insn (lo_result, lo_dest);
+
+      if (hi_result != hi_dest)
+	emit_move_insn (hi_result, hi_dest);
+
+      DONE;
+    }
+  "
+)
 
 (define_insn "*arm_subdi3"
   [(set (match_operand:DI 0 "arm_general_register_operand" "=&r,&r,&r")
@@ -1213,7 +1273,23 @@
    subs%?\\t%0, %1, %2
    rsbs%?\\t%0, %2, %1"
   [(set_attr "conds" "set")
-   (set_attr "type" "alus_imm,alus_sreg,alus_sreg")]
+   (set_attr "type" "alus_imm,alus_sreg,alus_imm")]
+)
+
+;; To keep the comparison in canonical form we express it as (~reg cmp ~0)
+;; rather than (0 cmp reg).  This gives the same results for unsigned
+;; and equality compares which is what we mostly need here.
+(define_insn "rsb_imm_compare"
+  [(set (reg:CC_RSB CC_REGNUM)
+	(compare:CC_RSB (not:SI (match_operand:SI 2 "s_register_operand" "r"))
+			(match_operand 3 "const_int_operand" "")))
+   (set (match_operand:SI 0 "s_register_operand" "=r")
+	(minus:SI (match_operand 1 "arm_immediate_operand" "I")
+		  (match_dup 2)))]
+  "TARGET_32BIT && ~UINTVAL (operands[1]) == UINTVAL (operands[3])"
+  "rsbs\\t%0, %2, %1"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
 )
 
 (define_expand "subsf3"
@@ -3726,29 +3802,6 @@
    (set_attr "type" "multiple")]
 )
 
-(define_expand "negdi2"
- [(parallel
-   [(set (match_operand:DI 0 "s_register_operand")
-	 (neg:DI (match_operand:DI 1 "s_register_operand")))
-    (clobber (reg:CC CC_REGNUM))])]
-  "TARGET_EITHER"
-)
-
-;; The constraints here are to prevent a *partial* overlap (where %Q0 == %R1).
-(define_insn "*negdi2_insn"
-  [(set (match_operand:DI 0 "s_register_operand" "=&r,&r")
-	(neg:DI (match_operand:DI 1 "s_register_operand"  "r,r")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "@
-   rsbs\\t%Q0, %Q1, #0; rsc\\t%R0, %R1, #0
-   negs\\t%Q0, %Q1; sbc\\t%R0, %R1, %R1, lsl #1"
-  [(set_attr "conds" "clob")
-   (set_attr "arch" "a,t2")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
 (define_expand "negsi2"
   [(set (match_operand:SI         0 "s_register_operand")
 	(neg:SI (match_operand:SI 1 "s_register_operand")))]
@@ -3765,7 +3818,39 @@
    (set_attr "predicable_short_it" "yes,no")
    (set_attr "arch" "t2,*")
    (set_attr "length" "4")
-   (set_attr "type" "alu_sreg")]
+   (set_attr "type" "alu_imm")]
+)
+
+;; To keep the comparison in canonical form we express it as (~reg cmp ~0)
+;; rather than (0 cmp reg).  This gives the same results for unsigned
+;; and equality compares which is what we mostly need here.
+(define_insn "negsi2_0compare"
+  [(set (reg:CC_RSB CC_REGNUM)
+	(compare:CC_RSB (not:SI (match_operand:SI 1 "s_register_operand" "l,r"))
+			(const_int -1)))
+   (set (match_operand:SI 0 "s_register_operand" "=l,r")
+	(neg:SI (match_dup 1)))]
+  "TARGET_32BIT"
+  "@
+   negs\\t%0, %1
+   rsbs\\t%0, %1, #0"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,*")
+   (set_attr "type" "alus_imm")]
+)
+
+(define_insn "negsi2_carryin"
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
+	(minus:SI (neg:SI (match_operand:SI 1 "s_register_operand" "r,r"))
+		  (match_operand:SI 2 "arm_borrow_operation" "")))]
+  "TARGET_32BIT"
+  "@
+   rsc\\t%0, %1, #0
+   sbc\\t%0, %1, %1, lsl #1"
+  [(set_attr "conds" "use")
+   (set_attr "arch" "a,t2")
+   (set_attr "type" "adc_imm,adc_reg")]
 )
 
 (define_expand "negsf2"
diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md
index 8b36e7ee..e6766a9 100644
--- a/gcc/config/arm/predicates.md
+++ b/gcc/config/arm/predicates.md
@@ -371,7 +371,7 @@
     machine_mode ccmode = GET_MODE (op0);
     if (ccmode == CC_Cmode)
       return GET_CODE (op) == GEU;
-    else if (ccmode == CCmode)
+    else if (ccmode == CCmode || ccmode == CC_RSBmode)
       return GET_CODE (op) == LTU;
     return false;
   }
-- 
cgit v1.1


From bc8dd50fe4cddc779349ef79f55e9e623c3c215f Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:28 +0000
Subject: [arm] Remove redundant DImode subtract patterns

Now that we early split DImode subtracts, the patterns to emit the
original and to match zero-extend with subtraction or negation are
no-longer useful.

	* config/arm/arm.md (arm_subdi3): Delete insn.
	(zextendsidi_negsi, negdi_extendsidi): Delete insn_and_split.

From-SVN: r277170
---
 gcc/ChangeLog         |   5 +++
 gcc/config/arm/arm.md | 102 --------------------------------------------------
 2 files changed, 5 insertions(+), 102 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f389a1..0051bbb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (arm_subdi3): Delete insn.
+	(zextendsidi_negsi, negdi_extendsidi): Delete insn_and_split.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm-modes.def (CC_RSB): New CC mode.
 	* config/arm/predicates.md (arm_borrow_operation): Handle CC_RSBmode.
 	* config/arm/arm.c (arm_select_cc_mode): Detect when we should
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 99d9315..f597a27 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1161,18 +1161,6 @@
   "
 )
 
-(define_insn "*arm_subdi3"
-  [(set (match_operand:DI 0 "arm_general_register_operand" "=&r,&r,&r")
-	(minus:DI (match_operand:DI 1 "arm_general_register_operand" "0,r,0")
-		  (match_operand:DI 2 "arm_general_register_operand" "r,0,0")))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "subs\\t%Q0, %Q1, %Q2\;sbc\\t%R0, %R1, %R2"
-  [(set_attr "conds" "clob")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
 (define_expand "subsi3"
   [(set (match_operand:SI           0 "s_register_operand")
 	(minus:SI (match_operand:SI 1 "reg_or_int_operand")
@@ -3866,96 +3854,6 @@
   "TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_VFP_DOUBLE"
   "")
 
-(define_insn_and_split "*zextendsidi_negsi"
-  [(set (match_operand:DI 0 "s_register_operand" "=r")
-        (zero_extend:DI (neg:SI (match_operand:SI 1 "s_register_operand" "r"))))]
-   "TARGET_32BIT"
-   "#"
-   ""
-   [(set (match_dup 2)
-         (neg:SI (match_dup 1)))
-    (set (match_dup 3)
-         (const_int 0))]
-   {
-      operands[2] = gen_lowpart (SImode, operands[0]);
-      operands[3] = gen_highpart (SImode, operands[0]);
-   }
- [(set_attr "length" "8")
-  (set_attr "type" "multiple")]
-)
-
-;; Negate an extended 32-bit value.
-(define_insn_and_split "*negdi_extendsidi"
-  [(set (match_operand:DI 0 "s_register_operand" "=l,r")
-	(neg:DI (sign_extend:DI
-		 (match_operand:SI 1 "s_register_operand" "l,r"))))
-   (clobber (reg:CC CC_REGNUM))]
-  "TARGET_32BIT"
-  "#"
-  "&& reload_completed"
-  [(const_int 0)]
-  {
-    rtx low = gen_lowpart (SImode, operands[0]);
-    rtx high = gen_highpart (SImode, operands[0]);
-
-    if (reg_overlap_mentioned_p (low, operands[1]))
-      {
-	/* Input overlaps the low word of the output.  Use:
-		asr	Rhi, Rin, #31
-		rsbs	Rlo, Rin, #0
-		rsc	Rhi, Rhi, #0 (thumb2: sbc Rhi, Rhi, Rhi, lsl #1).  */
-	rtx cc_reg = gen_rtx_REG (CCmode, CC_REGNUM);
-
-	emit_insn (gen_rtx_SET (high,
-				gen_rtx_ASHIFTRT (SImode, operands[1],
-						  GEN_INT (31))));
-
-	emit_insn (gen_subsi3_compare (low, const0_rtx, operands[1]));
-	if (TARGET_ARM)
-	  emit_insn (gen_rtx_SET (high,
-				  gen_rtx_MINUS (SImode,
-						 gen_rtx_MINUS (SImode,
-								const0_rtx,
-								high),
-						 gen_rtx_LTU (SImode,
-							      cc_reg,
-							      const0_rtx))));
-	else
-	  {
-	    rtx two_x = gen_rtx_ASHIFT (SImode, high, GEN_INT (1));
-	    emit_insn (gen_rtx_SET (high,
-				    gen_rtx_MINUS (SImode,
-						   gen_rtx_MINUS (SImode,
-								  high,
-								  two_x),
-						   gen_rtx_LTU (SImode,
-								cc_reg,
-								const0_rtx))));
-	  }
-      }
-    else
-      {
-	/* No overlap, or overlap on high word.  Use:
-		rsb	Rlo, Rin, #0
-		bic	Rhi, Rlo, Rin
-		asr	Rhi, Rhi, #31
-	   Flags not needed for this sequence.  */
-	emit_insn (gen_rtx_SET (low, gen_rtx_NEG (SImode, operands[1])));
-	emit_insn (gen_rtx_SET (high,
-				gen_rtx_AND (SImode,
-					     gen_rtx_NOT (SImode, operands[1]),
-					     low)));
-	emit_insn (gen_rtx_SET (high,
-				gen_rtx_ASHIFTRT (SImode, high,
-						  GEN_INT (31))));
-      }
-    DONE;
-  }
-  [(set_attr "length" "12")
-   (set_attr "arch" "t2,*")
-   (set_attr "type" "multiple")]
-)
-
 ;; abssi2 doesn't really clobber the condition codes if a different register
 ;; is being set.  To keep things simple, assume during rtl manipulations that
 ;; it does, but tell the final scan operator the truth.  Similarly for
-- 
cgit v1.1


From 1e271beeec163b124eb424c0c9918b045e289c06 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:35 +0000
Subject: [arm] Introduce arm_carry_operation

An earlier patch introduced arm_borrow_operation, this one introduces
the carry variant, which is the same except that the logic of the
carry-setting is inverted.  Having done this we can now match more
cases where the carry flag is propagated from comparisons with
different modes without having to define even more patterns.  A few
small changes to the expand patterns are required to directly create
the carry representation.

The iterators LTUGEU is no-longer needed and removed, as is the code
attribute 'cnb'.

Finally, we fix a long-standing bug which was probably inert before:
in Thumb2 a shift with ADC can only be by an immediate amount;
register-specified shifts are not permitted.

	* config/arm/predicates.md (arm_carry_operation): New special
	predicate.
	* config/arm/iterators.md (LTUGEU): Delete iterator.
	(cnb): Delete code attribute.
	(optab): Delete ltu and geu elements.
	* config/arm/arm.md (addsi3_carryin): Renamed from
	addsi3_carryin_<optab>.  Remove iterator and use arm_carry_operand.
	(add0si3_carryin): Similarly, but from add0si3_carryin_<optab>.
	(addsi3_carryin_alt2): Similarly, but from addsi3_carryin_alt2_<optab>.
	(addsi3_carryin_clobercc): Similarly.
	(addsi3_carryin_shift): Similarly.  Do not allow register shifts in
	Thumb2 state.

From-SVN: r277171
---
 gcc/ChangeLog                | 15 +++++++++++++++
 gcc/config/arm/arm.md        | 36 ++++++++++++++++++++----------------
 gcc/config/arm/iterators.md  | 11 +----------
 gcc/config/arm/predicates.md | 21 +++++++++++++++++++++
 4 files changed, 57 insertions(+), 26 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0051bbb..e4f10c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,20 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/predicates.md (arm_carry_operation): New special
+	predicate.
+	* config/arm/iterators.md (LTUGEU): Delete iterator.
+	(cnb): Delete code attribute.
+	(optab): Delete ltu and geu elements.
+	* config/arm/arm.md (addsi3_carryin): Renamed from
+	addsi3_carryin_<optab>.  Remove iterator and use arm_carry_operand.
+	(add0si3_carryin): Similarly, but from add0si3_carryin_<optab>.
+	(addsi3_carryin_alt2): Similarly, but from addsi3_carryin_alt2_<optab>.
+	(addsi3_carryin_clobercc): Similarly.
+	(addsi3_carryin_shift): Similarly.  Do not allow register shifts in
+	Thumb2 state.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (arm_subdi3): Delete insn.
 	(zextendsidi_negsi, negdi_extendsidi): Delete insn_and_split.
 
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index f597a27..f53dbc2 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -471,10 +471,12 @@
 	    hi_op2 = force_reg (SImode, hi_op2);
 
 	  emit_insn (gen_addsi3_compareC (lo_dest, lo_op1, lo_op2));
+	  rtx carry = gen_rtx_LTU (SImode, gen_rtx_REG (CC_Cmode, CC_REGNUM),
+				   const0_rtx);
 	  if (hi_op2 == const0_rtx)
-	    emit_insn (gen_add0si3_carryin_ltu (hi_dest, hi_op1));
+	    emit_insn (gen_add0si3_carryin (hi_dest, hi_op1, carry));
 	  else
-	    emit_insn (gen_addsi3_carryin_ltu (hi_dest, hi_op1, hi_op2));
+	    emit_insn (gen_addsi3_carryin (hi_dest, hi_op1, hi_op2, carry));
 	}
 
       if (lo_result != lo_dest)
@@ -858,11 +860,11 @@
    (set_attr "type" "alus_imm,alus_sreg,alus_imm,alus_imm,alus_sreg")]
  )
 
-(define_insn "addsi3_carryin_<optab>"
+(define_insn "addsi3_carryin"
   [(set (match_operand:SI 0 "s_register_operand" "=l,r,r")
         (plus:SI (plus:SI (match_operand:SI 1 "s_register_operand" "%l,r,r")
                           (match_operand:SI 2 "arm_not_operand" "0,rI,K"))
-                 (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))))]
+                 (match_operand:SI 3 "arm_carry_operation" "")))]
   "TARGET_32BIT"
   "@
    adc%?\\t%0, %1, %2
@@ -877,9 +879,9 @@
 )
 
 ;; Canonicalization of the above when the immediate is zero.
-(define_insn "add0si3_carryin_<optab>"
+(define_insn "add0si3_carryin"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
-	(plus:SI (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))
+	(plus:SI (match_operand:SI 2 "arm_carry_operation" "")
 		 (match_operand:SI 1 "arm_not_operand" "r")))]
   "TARGET_32BIT"
   "adc%?\\t%0, %1, #0"
@@ -889,9 +891,9 @@
    (set_attr "type" "adc_imm")]
 )
 
-(define_insn "*addsi3_carryin_alt2_<optab>"
+(define_insn "*addsi3_carryin_alt2"
   [(set (match_operand:SI 0 "s_register_operand" "=l,r,r")
-        (plus:SI (plus:SI (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))
+        (plus:SI (plus:SI (match_operand:SI 3 "arm_carry_operation" "")
                           (match_operand:SI 1 "s_register_operand" "%l,r,r"))
                  (match_operand:SI 2 "arm_not_operand" "l,rI,K")))]
   "TARGET_32BIT"
@@ -907,28 +909,30 @@
    (set_attr "type" "adc_reg,adc_reg,adc_imm")]
 )
 
-(define_insn "*addsi3_carryin_shift_<optab>"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
+(define_insn "*addsi3_carryin_shift"
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(plus:SI (plus:SI
 		  (match_operator:SI 2 "shift_operator"
-		    [(match_operand:SI 3 "s_register_operand" "r")
-		     (match_operand:SI 4 "reg_or_int_operand" "rM")])
-		  (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0)))
-		 (match_operand:SI 1 "s_register_operand" "r")))]
+		    [(match_operand:SI 3 "s_register_operand" "r,r")
+		     (match_operand:SI 4 "shift_amount_operand" "M,r")])
+		  (match_operand:SI 5 "arm_carry_operation" ""))
+		 (match_operand:SI 1 "s_register_operand" "r,r")))]
   "TARGET_32BIT"
   "adc%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "use")
+   (set_attr "arch" "32,a")
+   (set_attr "shift" "3")
    (set_attr "predicable" "yes")
    (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
 		      (const_string "alu_shift_imm")
 		      (const_string "alu_shift_reg")))]
 )
 
-(define_insn "*addsi3_carryin_clobercc_<optab>"
+(define_insn "*addsi3_carryin_clobercc"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(plus:SI (plus:SI (match_operand:SI 1 "s_register_operand" "%r")
 			  (match_operand:SI 2 "arm_rhs_operand" "rI"))
-		 (LTUGEU:SI (reg:<cnb> CC_REGNUM) (const_int 0))))
+		 (match_operand:SI 3 "arm_carry_operation" "")))
    (clobber (reg:CC CC_REGNUM))]
    "TARGET_32BIT"
    "adcs%?\\t%0, %1, %2"
diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md
index 8c9f712..77e1645 100644
--- a/gcc/config/arm/iterators.md
+++ b/gcc/config/arm/iterators.md
@@ -219,11 +219,6 @@
 ;; Code iterators
 ;;----------------------------------------------------------------------------
 
-;; A list of condition codes used in compare instructions where
-;; the carry flag from the addition is used instead of doing the
-;; compare a second time.
-(define_code_iterator LTUGEU [ltu geu])
-
 ;; The signed gt, ge comparisons
 (define_code_iterator GTGE [gt ge])
 
@@ -809,13 +804,9 @@
 (define_code_attr VQH_sign [(plus "i") (smin "s") (smax "s") (umin "u")
                 (umax "u")])
 
-(define_code_attr cnb [(ltu "CC_C") (geu "CC")])
-
 ;; Map rtl operator codes to optab names
 (define_code_attr optab
- [(ltu "ltu")
-  (geu "geu")
-  (and "and")
+ [(and "and")
   (ior "ior")
   (xor "xor")])
 
diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md
index e6766a9..ed7495b 100644
--- a/gcc/config/arm/predicates.md
+++ b/gcc/config/arm/predicates.md
@@ -356,6 +356,27 @@
 (define_special_predicate "lt_ge_comparison_operator"
   (match_code "lt,ge"))
 
+(define_special_predicate "arm_carry_operation"
+  (match_code "geu,ltu")
+  {
+    if (XEXP (op, 1) != const0_rtx)
+      return false;
+
+    rtx op0 = XEXP (op, 0);
+
+    if (!REG_P (op0) || REGNO (op0) != CC_REGNUM)
+      return false;
+
+    machine_mode ccmode = GET_MODE (op0);
+    if (ccmode == CC_Cmode)
+      return GET_CODE (op) == LTU;
+    else if (ccmode == CCmode || ccmode == CC_RSBmode)
+      return GET_CODE (op) == GEU;
+
+    return false;
+  }
+)
+
 ;; Match a "borrow" operation for use with SBC.  The precise code will
 ;; depend on the form of the comparison.  This is generally the inverse of
 ;; a carry operation, since the logic of SBC uses "not borrow" in it's
-- 
cgit v1.1


From 0a67306e3cc2adfe0ef2fe313a86f57141ab57b2 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:43 +0000
Subject: [arm] Correctly cost addition with a carry-in

The cost routine for Arm and Thumb2 was not recognising the idioms that
describe the addition with carry, this results in the instructions
appearing more expensive than they really are, which occasionally can lead
to poor choices by combine.  Recognising all the possible variants is
a little trickier than normal because the expressions can become complex
enough that this is no single canonical from.

	* config/arm/arm.c (strip_carry_operation): New function.
	(arm_rtx_costs_internal, case PLUS): Handle addtion with carry-in
	for SImode.

From-SVN: r277172
---
 gcc/ChangeLog        |  6 +++++
 gcc/config/arm/arm.c | 76 ++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4f10c6..aa6b2cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.c (strip_carry_operation): New function.
+	(arm_rtx_costs_internal, case PLUS): Handle addtion with carry-in
+	for SImode.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/predicates.md (arm_carry_operation): New special
 	predicate.
 	* config/arm/iterators.md (LTUGEU): Delete iterator.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 41e4832..820a41f 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -9504,6 +9504,20 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer)
     }
 }
 
+/* Helper function for arm_rtx_costs.  If one operand of the OP, a
+   PLUS, adds the carry flag, then return the other operand.  If
+   neither is a carry, return OP unchanged.  */
+static rtx
+strip_carry_operation (rtx op)
+{
+  gcc_assert (GET_CODE (op) == PLUS);
+  if (arm_carry_operation (XEXP (op, 0), GET_MODE (op)))
+    return XEXP (op, 1);
+  else if (arm_carry_operation (XEXP (op, 1), GET_MODE (op)))
+    return XEXP (op, 0);
+  return op;
+}
+
 /* Helper function for arm_rtx_costs.  If the operand is a valid shift
    operand, then return the operand that is being shifted.  If the shift
    is not by a constant, then set SHIFT_REG to point to the operand.
@@ -10253,8 +10267,41 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 	      return true;
 	    }
 
+	  rtx op0 = XEXP (x, 0);
+	  rtx op1 = XEXP (x, 1);
+
+	  /* Handle a side effect of adding in the carry to an addition.  */
+	  if (GET_CODE (op0) == PLUS
+	      && arm_carry_operation (op1, mode))
+	    {
+	      op1 = XEXP (op0, 1);
+	      op0 = XEXP (op0, 0);
+	    }
+	  else if (GET_CODE (op1) == PLUS
+		   && arm_carry_operation (op0, mode))
+	    {
+	      op0 = XEXP (op1, 0);
+	      op1 = XEXP (op1, 1);
+	    }
+	  else if (GET_CODE (op0) == PLUS)
+	    {
+	      op0 = strip_carry_operation (op0);
+	      if (swap_commutative_operands_p (op0, op1))
+		std::swap (op0, op1);
+	    }
+
+	  if (arm_carry_operation (op0, mode))
+	    {
+	      /* Adding the carry to a register is a canonicalization of
+		 adding 0 to the register plus the carry.  */
+	      if (speed_p)
+		*cost += extra_cost->alu.arith;
+	      *cost += rtx_cost (op1, mode, PLUS, 1, speed_p);
+	      return true;
+	    }
+
 	  shift_reg = NULL;
-	  shift_op = shifter_op_p (XEXP (x, 0), &shift_reg);
+	  shift_op = shifter_op_p (op0, &shift_reg);
 	  if (shift_op != NULL)
 	    {
 	      if (shift_reg)
@@ -10267,12 +10314,13 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 		*cost += extra_cost->alu.arith_shift;
 
 	      *cost += (rtx_cost (shift_op, mode, ASHIFT, 0, speed_p)
-			+ rtx_cost (XEXP (x, 1), mode, PLUS, 1, speed_p));
+			+ rtx_cost (op1, mode, PLUS, 1, speed_p));
 	      return true;
 	    }
-	  if (GET_CODE (XEXP (x, 0)) == MULT)
+
+	  if (GET_CODE (op0) == MULT)
 	    {
-	      rtx mul_op = XEXP (x, 0);
+	      rtx mul_op = op0;
 
 	      if (TARGET_DSP_MULTIPLY
 		  && ((GET_CODE (XEXP (mul_op, 0)) == SIGN_EXTEND
@@ -10296,7 +10344,7 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 				      SIGN_EXTEND, 0, speed_p)
 			    + rtx_cost (XEXP (XEXP (mul_op, 1), 0), mode,
 					SIGN_EXTEND, 0, speed_p)
-			    + rtx_cost (XEXP (x, 1), mode, PLUS, 1, speed_p));
+			    + rtx_cost (op1, mode, PLUS, 1, speed_p));
 		  return true;
 		}
 
@@ -10304,24 +10352,30 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 		*cost += extra_cost->mult[0].add;
 	      *cost += (rtx_cost (XEXP (mul_op, 0), mode, MULT, 0, speed_p)
 			+ rtx_cost (XEXP (mul_op, 1), mode, MULT, 1, speed_p)
-			+ rtx_cost (XEXP (x, 1), mode, PLUS, 1, speed_p));
+			+ rtx_cost (op1, mode, PLUS, 1, speed_p));
 	      return true;
 	    }
-	  if (CONST_INT_P (XEXP (x, 1)))
+
+	  if (CONST_INT_P (op1))
 	    {
 	      int insns = arm_gen_constant (PLUS, SImode, NULL_RTX,
-					    INTVAL (XEXP (x, 1)), NULL_RTX,
+					    INTVAL (op1), NULL_RTX,
 					    NULL_RTX, 1, 0);
 	      *cost = COSTS_N_INSNS (insns);
 	      if (speed_p)
 		*cost += insns * extra_cost->alu.arith;
-	      *cost += rtx_cost (XEXP (x, 0), mode, PLUS, 0, speed_p);
+	      *cost += rtx_cost (op0, mode, PLUS, 0, speed_p);
 	      return true;
 	    }
-	  else if (speed_p)
+
+	  if (speed_p)
 	    *cost += extra_cost->alu.arith;
 
-	  return false;
+	  /* Don't recurse here because we want to test the operands
+	     without any carry operation.  */
+	  *cost += rtx_cost (op0, mode, PLUS, 0, speed_p);
+	  *cost += rtx_cost (op1, mode, PLUS, 1, speed_p);
+	  return true;
 	}
 
       if (mode == DImode)
-- 
cgit v1.1


From bbead5babc046279d886b059e68e613b0185b2ff Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:02:50 +0000
Subject: [arm] Correct cost calculations involving borrow for subtracts.

The rtx_cost calculations when a borrow operation was being performed were
not being calculated correctly.  The borrow is free as part of the
subtract-with-carry instructions.  This patch recognizes the various
idioms that can describe this and returns the correct costs.

	* config/arm/arm.c (arm_rtx_costs_internal, case MINUS): Handle
	borrow operations.

From-SVN: r277173
---
 gcc/ChangeLog        |  5 +++++
 gcc/config/arm/arm.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa6b2cb..e40511b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.c (arm_rtx_costs_internal, case MINUS): Handle
+	borrow operations.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.c (strip_carry_operation): New function.
 	(arm_rtx_costs_internal, case PLUS): Handle addtion with carry-in
 	for SImode.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 820a41f..fd74222 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -10049,15 +10049,46 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 	  rtx shift_by_reg = NULL;
 	  rtx shift_op;
 	  rtx non_shift_op;
+	  rtx op0 = XEXP (x, 0);
+	  rtx op1 = XEXP (x, 1);
 
-	  shift_op = shifter_op_p (XEXP (x, 0), &shift_by_reg);
+	  /* Factor out any borrow operation.  There's more than one way
+	     of expressing this; try to recognize them all.  */
+	  if (GET_CODE (op0) == MINUS)
+	    {
+	      if (arm_borrow_operation (op1, SImode))
+		{
+		  op1 = XEXP (op0, 1);
+		  op0 = XEXP (op0, 0);
+		}
+	      else if (arm_borrow_operation (XEXP (op0, 1), SImode))
+		op0 = XEXP (op0, 0);
+	    }
+	  else if (GET_CODE (op1) == PLUS
+		   && arm_borrow_operation (XEXP (op1, 0), SImode))
+	    op1 = XEXP (op1, 0);
+	  else if (GET_CODE (op0) == NEG
+		   && arm_borrow_operation (op1, SImode))
+	    {
+	      /* Negate with carry-in.  For Thumb2 this is done with
+		 SBC R, X, X lsl #1 (ie X - 2X - C) as Thumb lacks the
+		 RSC instruction that exists in Arm mode.  */
+	      if (speed_p)
+		*cost += (TARGET_THUMB2
+			  ? extra_cost->alu.arith_shift
+			  : extra_cost->alu.arith);
+	      *cost += rtx_cost (XEXP (op0, 0), mode, MINUS, 0, speed_p);
+	      return true;
+	    }
+
+	  shift_op = shifter_op_p (op0, &shift_by_reg);
 	  if (shift_op == NULL)
 	    {
-	      shift_op = shifter_op_p (XEXP (x, 1), &shift_by_reg);
-	      non_shift_op = XEXP (x, 0);
+	      shift_op = shifter_op_p (op1, &shift_by_reg);
+	      non_shift_op = op0;
 	    }
 	  else
-	    non_shift_op = XEXP (x, 1);
+	    non_shift_op = op1;
 
 	  if (shift_op != NULL)
 	    {
@@ -10087,10 +10118,10 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 	      return true;
 	    }
 
-	  if (CONST_INT_P (XEXP (x, 0)))
+	  if (CONST_INT_P (op0))
 	    {
 	      int insns = arm_gen_constant (MINUS, SImode, NULL_RTX,
-					    INTVAL (XEXP (x, 0)), NULL_RTX,
+					    INTVAL (op0), NULL_RTX,
 					    NULL_RTX, 1, 0);
 	      *cost = COSTS_N_INSNS (insns);
 	      if (speed_p)
@@ -10101,7 +10132,11 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 	  else if (speed_p)
 	    *cost += extra_cost->alu.arith;
 
-	  return false;
+	  /* Don't recurse as we don't want to cost any borrow that
+	     we've stripped.  */
+	  *cost += rtx_cost (op0, mode, MINUS, 0, speed_p);
+	  *cost += rtx_cost (op1, mode, MINUS, 1, speed_p);
+	  return true;
 	}
 
       if (GET_MODE_CLASS (mode) == MODE_INT
-- 
cgit v1.1


From 24d28a8778f4c7efcebea6c785806082eeacf9fe Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:03 +0000
Subject: [arm] Reduce cost of insns that are simple reg-reg moves.

Consider this sequence during combine:

Trying 18, 7 -> 22:
   18: r118:SI=r122:SI
      REG_DEAD r122:SI
    7: r114:SI=0x1-r118:SI-ltu(cc:CC_RSB,0)
      REG_DEAD r118:SI
      REG_DEAD cc:CC_RSB
   22: r1:SI=r114:SI
      REG_DEAD r114:SI
Failed to match this instruction:
(set (reg:SI 1 r1 [+4 ])
    (minus:SI (geu:SI (reg:CC_RSB 100 cc)
            (const_int 0 [0]))
        (reg:SI 122)))
Successfully matched this instruction:
(set (reg:SI 114)
    (geu:SI (reg:CC_RSB 100 cc)
        (const_int 0 [0])))
Successfully matched this instruction:
(set (reg:SI 1 r1 [+4 ])
    (minus:SI (reg:SI 114)
        (reg:SI 122)))
allowing combination of insns 18, 7 and 22
original costs 4 + 4 + 4 = 12
replacement costs 8 + 4 = 12

The costs are all correct, but we really don't want this combination
to take place.  The original costs contain an insn that is a simple
move of one pseudo register to another and it is extremely likely that
register allocation will eliminate this insn entirely.  On the other
hand, the resulting sequence really does expand into a sequence that
costs 12 (ie 3 insns).

We don't want to prevent combine from eliminating such moves, as this
can expose more combine opportunities, but we shouldn't rate them as
profitable in themselves.  We can do this be adjusting the costs
slightly so that the benefit of eliminating such a simple insn is
reduced.

We only do this before register allocation; after allocation we give
such insns their full cost.

	* config/arm/arm.c (arm_insn_cost): New function.
	(TARGET_INSN_COST): Override default definition.

From-SVN: r277174
---
 gcc/ChangeLog        |  5 +++++
 gcc/config/arm/arm.c | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e40511b..91b80e5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.c (arm_insn_cost): New function.
+	(TARGET_INSN_COST): Override default definition.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.c (arm_rtx_costs_internal, case MINUS): Handle
 	borrow operations.
 
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index fd74222..bdea81d2 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -181,6 +181,7 @@ static bool arm_have_conditional_execution (void);
 static bool arm_cannot_force_const_mem (machine_mode, rtx);
 static bool arm_legitimate_constant_p (machine_mode, rtx);
 static bool arm_rtx_costs (rtx, machine_mode, int, int, int *, bool);
+static int arm_insn_cost (rtx_insn *, bool);
 static int arm_address_cost (rtx, machine_mode, addr_space_t, bool);
 static int arm_register_move_cost (machine_mode, reg_class_t, reg_class_t);
 static int arm_memory_move_cost (machine_mode, reg_class_t, bool);
@@ -510,6 +511,8 @@ static const struct attribute_spec arm_attribute_table[] =
 #define TARGET_RTX_COSTS arm_rtx_costs
 #undef  TARGET_ADDRESS_COST
 #define TARGET_ADDRESS_COST arm_address_cost
+#undef TARGET_INSN_COST
+#define TARGET_INSN_COST arm_insn_cost
 
 #undef TARGET_SHIFT_TRUNCATION_MASK
 #define TARGET_SHIFT_TRUNCATION_MASK arm_shift_truncation_mask
@@ -11486,6 +11489,24 @@ arm_rtx_costs (rtx x, machine_mode mode ATTRIBUTE_UNUSED, int outer_code,
   return result;
 }
 
+static int
+arm_insn_cost (rtx_insn *insn, bool speed)
+{
+  int cost;
+
+  /* Don't cost a simple reg-reg move at a full insn cost: such moves
+     will likely disappear during register allocation.  */
+  if (!reload_completed
+      && GET_CODE (PATTERN (insn)) == SET
+      && REG_P (SET_DEST (PATTERN (insn)))
+      && REG_P (SET_SRC (PATTERN (insn))))
+    return 2;
+  cost = pattern_cost (PATTERN (insn), speed);
+  /* If the cost is zero, then it's likely a complex insn.  We don't want the
+     cost of these to be less than something we know about.  */
+  return cost ? cost : COSTS_N_INSNS (2);
+}
+
 /* All address computations that can be done are free, but rtx cost returns
    the same for practically all of them.  So we weight the different types
    of address here in the order (most pref first):
-- 
cgit v1.1


From f6ff841bc8dd87ce364deb217dc6d1ec5dc31de8 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:11 +0000
Subject: [arm] Implement negscc using SBC when appropriate.

When the carry flag is appropriately set by a comprison, negscc
patterns can expand into a simple SBC of a register with itself.  This
means we can convert two conditional instructions into a single
non-conditional instruction.  Furthermore, in Thumb2 we can avoid the
need for an IT instruction as well.  This patch also fixes the remaining
testcase that we initially XFAILed in the first patch of this series.

gcc:
	* config/arm/arm.md (negscc_borrow): New pattern.
	(mov_negscc): Don't split if the insn would match negscc_borrow.
	* config/arm/thumb2.md (thumb2_mov_negscc): Likewise.
	(thumb2_mov_negscc_strict_it): Likewise.

testsuite:
	* gcc.target/arm/negdi-3.c: Remove XFAIL markers.

From-SVN: r277175
---
 gcc/ChangeLog                          |  7 +++++++
 gcc/config/arm/arm.md                  | 14 ++++++++++++--
 gcc/config/arm/thumb2.md               |  8 ++++++--
 gcc/testsuite/ChangeLog                |  4 ++++
 gcc/testsuite/gcc.target/arm/negdi-3.c |  8 ++++----
 5 files changed, 33 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91b80e5..4d2812a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (negscc_borrow): New pattern.
+	(mov_negscc): Don't split if the insn would match negscc_borrow.
+	* config/arm/thumb2.md (thumb2_mov_negscc): Likewise.
+	(thumb2_mov_negscc_strict_it): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.c (arm_insn_cost): New function.
 	(TARGET_INSN_COST): Override default definition.
 
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index f53dbc2..74f417f 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -6612,13 +6612,23 @@
    (set_attr "type" "multiple")]
 )
 
+(define_insn "*negscc_borrow"
+  [(set (match_operand:SI 0 "s_register_operand" "=r")
+	(neg:SI (match_operand:SI 1 "arm_borrow_operation" "")))]
+  "TARGET_32BIT"
+  "sbc\\t%0, %0, %0"
+  [(set_attr "conds" "use")
+   (set_attr "length" "4")
+   (set_attr "type" "adc_reg")]
+)
+
 (define_insn_and_split "*mov_negscc"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(neg:SI (match_operator:SI 1 "arm_comparison_operator_mode"
 		 [(match_operand 2 "cc_register" "") (const_int 0)])))]
-  "TARGET_ARM"
+  "TARGET_ARM && !arm_borrow_operation (operands[1], SImode)"
   "#"   ; "mov%D1\\t%0, #0\;mvn%d1\\t%0, #0"
-  "TARGET_ARM"
+  "&& true"
   [(set (match_dup 0)
         (if_then_else:SI (match_dup 1)
                          (match_dup 3)
diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md
index 6ccc875..8d0b6be 100644
--- a/gcc/config/arm/thumb2.md
+++ b/gcc/config/arm/thumb2.md
@@ -368,7 +368,9 @@
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(neg:SI (match_operator:SI 1 "arm_comparison_operator_mode"
 		 [(match_operand 2 "cc_register" "") (const_int 0)])))]
-  "TARGET_THUMB2 && !arm_restrict_it"
+  "TARGET_THUMB2
+   && !arm_restrict_it
+   && !arm_borrow_operation (operands[1], SImode)"
   "#"   ; "ite\\t%D1\;mov%D1\\t%0, #0\;mvn%d1\\t%0, #0"
   "&& true"
   [(set (match_dup 0)
@@ -387,7 +389,9 @@
   [(set (match_operand:SI 0 "low_register_operand" "=l")
 	(neg:SI (match_operator:SI 1 "arm_comparison_operator_mode"
 		 [(match_operand 2 "cc_register" "") (const_int 0)])))]
-  "TARGET_THUMB2 && arm_restrict_it"
+  "TARGET_THUMB2
+   && arm_restrict_it
+   && !arm_borrow_operation (operands[1], SImode)"
   "#"   ; ";mvn\\t%0, #0 ;it\\t%D1\;mov%D1\\t%0, #0\"
   "&& reload_completed"
   [(set (match_dup 0)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ae9d216..d5d934d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* gcc.target/arm/negdi-3.c: Remove XFAIL markers.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* gcc.target/arm/pr53447-1.c: Remove XFAIL.
 	* gcc.target/arm/pr53447-3.c: Remove XFAIL.
 	* gcc.target/arm/pr53447-4.c: Remove XFAIL.
diff --git a/gcc/testsuite/gcc.target/arm/negdi-3.c b/gcc/testsuite/gcc.target/arm/negdi-3.c
index 3f6f2d1..76ddf49 100644
--- a/gcc/testsuite/gcc.target/arm/negdi-3.c
+++ b/gcc/testsuite/gcc.target/arm/negdi-3.c
@@ -11,7 +11,7 @@ Expected output:
         rsbs    r0, r0, #0
         sbc     r1, r1, r1
 */
-/* { dg-final { scan-assembler-times "rsb" 1 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times "sbc" 1 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times "mov" 0 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times "rsc" 0 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times "rsb" 1 } } */
+/* { dg-final { scan-assembler-times "sbc" 1 } } */
+/* { dg-final { scan-assembler-times "mov" 0 } } */
+/* { dg-final { scan-assembler-times "rsc" 0 } } */
-- 
cgit v1.1


From 0b478cddf9e95406cd865c94bf99705ec8acddde Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:19 +0000
Subject: [arm] Add alternative canonicalizations for subtract-with-carry +
 shift

This patch adds a couple of alternative canonicalizations to allow
combine to match a subtract-with-carry operation when one of the operands
is shifted first.  The most common case of this is when combining a
sign-extend of one operand with a long-long value during subtraction.
The RSC variant is only enabled for Arm, the SBC variant for any 32-bit
compilation.

	* config/arm/arm.md (subsi3_carryin_shift_alt): New pattern.
	(rsbsi3_carryin_shift_alt): Likewise.

From-SVN: r277176
---
 gcc/ChangeLog         |  5 +++++
 gcc/config/arm/arm.md | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d2812a..393fcbd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (subsi3_carryin_shift_alt): New pattern.
+	(rsbsi3_carryin_shift_alt): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (negscc_borrow): New pattern.
 	(mov_negscc): Don't split if the insn would match negscc_borrow.
 	* config/arm/thumb2.md (thumb2_mov_negscc): Likewise.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 74f417f..613f50a 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1048,6 +1048,23 @@
 				    (const_string "alu_shift_reg")))]
 )
 
+(define_insn "*subsi3_carryin_shift_alt"
+  [(set (match_operand:SI 0 "s_register_operand" "=r")
+	(minus:SI (minus:SI
+		   (match_operand:SI 1 "s_register_operand" "r")
+		   (match_operand:SI 5 "arm_borrow_operation" ""))
+		  (match_operator:SI 2 "shift_operator"
+		   [(match_operand:SI 3 "s_register_operand" "r")
+		    (match_operand:SI 4 "reg_or_int_operand" "rM")])))]
+  "TARGET_32BIT"
+  "sbc%?\\t%0, %1, %3%S2"
+  [(set_attr "conds" "use")
+   (set_attr "predicable" "yes")
+   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
+				    (const_string "alu_shift_imm")
+				    (const_string "alu_shift_reg")))]
+)
+
 (define_insn "*rsbsi3_carryin_shift"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(minus:SI (minus:SI
@@ -1065,6 +1082,23 @@
 		      (const_string "alu_shift_reg")))]
 )
 
+(define_insn "*rsbsi3_carryin_shift_alt"
+  [(set (match_operand:SI 0 "s_register_operand" "=r")
+	(minus:SI (minus:SI
+		   (match_operator:SI 2 "shift_operator"
+		    [(match_operand:SI 3 "s_register_operand" "r")
+		     (match_operand:SI 4 "reg_or_int_operand" "rM")])
+		    (match_operand:SI 5 "arm_borrow_operation" ""))
+		  (match_operand:SI 1 "s_register_operand" "r")))]
+  "TARGET_ARM"
+  "rsc%?\\t%0, %1, %3%S2"
+  [(set_attr "conds" "use")
+   (set_attr "predicable" "yes")
+   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
+		      (const_string "alu_shift_imm")
+		      (const_string "alu_shift_reg")))]
+)
+
 ; transform ((x << y) - 1) to ~(~(x-1) << y)  Where X is a constant.
 (define_split
   [(set (match_operand:SI 0 "s_register_operand" "")
-- 
cgit v1.1


From 5899656b61231cc0e2dac4d7a58fab58674ba344 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:27 +0000
Subject: [arm] Early split simple DImode equality comparisons

This is the first step of early splitting all the DImode comparison
operations.  We start by factoring the DImode handling out of
arm_gen_compare_reg into its own function.

Simple DImode equality comparisions (such as equality with zero, or
equality with a constant that is zero in one of the two word values
that it comprises) can be done using a single subtract followed by an
ORRS instruction.  This avoids the need for conditional execution.

For example, (r0 != 5) can be written as

	SUB	Rt, R0, #5
	ORRS	Rt, Rt, R1

The ORRS is now expanded using an SImode pattern that already exists
in the MD file and this gives the register allocator more freedom to
select registers (consecutive pairs are no-longer required).
Furthermore, we can then delete the arm_cmpdi_zero pattern as it is
no-longer required.  We use SUB for the value adjustment as this has a
generally more flexible range of immediates than XOR and what's more
has the opportunity to be relaxed in thumb2 to a 16-bit SUBS
instruction.

	* config/arm/arm.c (arm_select_cc_mode): For DImode equality tests
	return CC_Zmode if comparing against a constant where one word is
	zero.
	(arm_gen_compare_reg): Split DImode handling to ...
	(arm_gen_dicompare_reg): ... here.  Handle equality comparisons
	against simple constants.
	* config/arm/arm.md (arm_cmpdi_zero): Delete pattern.

From-SVN: r277177
---
 gcc/ChangeLog         | 10 ++++++
 gcc/config/arm/arm.c  | 87 ++++++++++++++++++++++++++++++++++++++++-----------
 gcc/config/arm/arm.md | 11 -------
 3 files changed, 78 insertions(+), 30 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 393fcbd..51a2c3f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.c (arm_select_cc_mode): For DImode equality tests
+	return CC_Zmode if comparing against a constant where one word is
+	zero.
+	(arm_gen_compare_reg): Split DImode handling to ...
+	(arm_gen_dicompare_reg): ... here.  Handle equality comparisons
+	against simple constants.
+	* config/arm/arm.md (arm_cmpdi_zero): Delete pattern.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (subsi3_carryin_shift_alt): New pattern.
 	(rsbsi3_carryin_shift_alt): Likewise.
 
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index bdea81d2..97ebf63 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15350,8 +15350,14 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 	case EQ:
 	case NE:
 	  /* A DImode comparison against zero can be implemented by
-	     or'ing the two halves together.  */
-	  if (y == const0_rtx)
+	     or'ing the two halves together.  We can also handle
+	     immediates where one word of that value is zero by
+	     subtracting the non-zero word from the corresponding word
+	     in the other register and then ORRing it with the other
+	     word.  */
+	  if (CONST_INT_P (y)
+	      && ((UINTVAL (y) & 0xffffffff) == 0
+		  || (UINTVAL (y) >> 32) == 0))
 	    return CC_Zmode;
 
 	  /* We can do an equality test in three Thumb instructions.  */
@@ -15393,37 +15399,64 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
   return CCmode;
 }
 
-/* X and Y are two things to compare using CODE.  Emit the compare insn and
-   return the rtx for register 0 in the proper mode.  FP means this is a
-   floating point compare: I don't think that it is needed on the arm.  */
-rtx
-arm_gen_compare_reg (enum rtx_code code, rtx x, rtx y, rtx scratch)
+/* X and Y are two (DImode) things to compare for the condition CODE.  Emit
+   the sequence of instructions needed to generate a suitable condition
+   code register.  Return the CC register result.  */
+static rtx
+arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 {
-  machine_mode mode;
-  rtx cc_reg;
-  int dimode_comparison = GET_MODE (x) == DImode || GET_MODE (y) == DImode;
+  /* We don't currently handle DImode in thumb1, but rely on libgcc.  */
+  gcc_assert (TARGET_32BIT);
 
   /* We might have X as a constant, Y as a register because of the predicates
      used for cmpdi.  If so, force X to a register here.  */
-  if (dimode_comparison && !REG_P (x))
+  if (!REG_P (x))
     x = force_reg (DImode, x);
 
-  mode = SELECT_CC_MODE (code, x, y);
-  cc_reg = gen_rtx_REG (mode, CC_REGNUM);
+  machine_mode mode = SELECT_CC_MODE (code, x, y);
+  rtx cc_reg = gen_rtx_REG (mode, CC_REGNUM);
 
-  if (dimode_comparison
-      && mode != CC_CZmode)
+  if (mode != CC_CZmode)
     {
       rtx clobber, set;
 
       /* To compare two non-zero values for equality, XOR them and
 	 then compare against zero.  Not used for ARM mode; there
 	 CC_CZmode is cheaper.  */
-      if (mode == CC_Zmode && y != const0_rtx)
+      if (mode == CC_Zmode)
 	{
-	  gcc_assert (!reload_completed);
-	  x = expand_binop (DImode, xor_optab, x, y, NULL_RTX, 0, OPTAB_WIDEN);
-	  y = const0_rtx;
+	  mode = CC_NOOVmode;
+	  PUT_MODE (cc_reg, mode);
+	  if (y != const0_rtx)
+	    {
+	      gcc_assert (CONST_INT_P (y));
+	      rtx xlo, xhi, ylo, yhi;
+	      arm_decompose_di_binop (x, y, &xlo, &xhi, &ylo, &yhi);
+	      if (!scratch)
+		scratch = gen_reg_rtx (SImode);
+	      if (ylo == const0_rtx)
+		{
+		  yhi = GEN_INT (-INTVAL(yhi));
+		  if (!arm_add_operand (yhi, SImode))
+		    yhi = force_reg (SImode, yhi);
+		  emit_insn (gen_addsi3 (scratch, xhi, yhi));
+		  y = xlo;
+		}
+	      else
+		{
+		  gcc_assert (yhi == const0_rtx);
+		  ylo = GEN_INT (-INTVAL(ylo));
+		  if (!arm_add_operand (ylo, SImode))
+		    ylo = force_reg (SImode, ylo);
+		  emit_insn (gen_addsi3 (scratch, xlo, ylo));
+		  y = xhi;
+		}
+	      x = gen_rtx_IOR (SImode, scratch, y);
+	      y = const0_rtx;
+	    }
+	  else
+	    x = gen_rtx_IOR (SImode, gen_lowpart (SImode, x),
+			     gen_highpart (SImode, x));
 	}
 
       /* A scratch register is required.  */
@@ -15442,6 +15475,22 @@ arm_gen_compare_reg (enum rtx_code code, rtx x, rtx y, rtx scratch)
   return cc_reg;
 }
 
+/* X and Y are two things to compare using CODE.  Emit the compare insn and
+   return the rtx for register 0 in the proper mode.  */
+rtx
+arm_gen_compare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
+{
+  if (GET_MODE (x) == DImode || GET_MODE (y) == DImode)
+    return arm_gen_dicompare_reg (code, x, y, scratch);
+
+  machine_mode mode = SELECT_CC_MODE (code, x, y);
+  rtx cc_reg = gen_rtx_REG (mode, CC_REGNUM);
+
+  emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
+
+  return cc_reg;
+}
+
 /* Generate a sequence of insns that will generate the correct return
    address mask depending on the physical architecture that the program
    is running on.  */
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 613f50a..a6b0c19 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -6518,17 +6518,6 @@
    (set_attr "type" "multiple")]
 )
 
-(define_insn "*arm_cmpdi_zero"
-  [(set (reg:CC_Z CC_REGNUM)
-	(compare:CC_Z (match_operand:DI 0 "s_register_operand" "r")
-		      (const_int 0)))
-   (clobber (match_scratch:SI 1 "=r"))]
-  "TARGET_32BIT"
-  "orrs%?\\t%1, %Q0, %R0"
-  [(set_attr "conds" "set")
-   (set_attr "type" "logics_reg")]
-)
-
 ; This insn allows redundant compares to be removed by cse, nothing should
 ; ever appear in the output file since (set (reg x) (reg x)) is a no-op that
 ; is deleted later on. The match_dup will match the mode here, so that
-- 
cgit v1.1


From 22060d0e575e7754eb1355763d22bbe37c3caa13 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:35 +0000
Subject: [arm] Improve handling of DImode comparisions against constants.

In almost all cases it is better to handle inequality handling against constants
by transforming comparisons of the form (reg <GE/LT/GEU/LTU> const) into
(reg <GT/LE/GTU/LEU> (const+1)).  However, there are many cases that we could
handle but currently failed to do so because we forced the constant into a
register too early in the pattern expansion.  To permit this to be done we need
to defer forcing the constant into a register until after we've had the chance
to do the transform - in some cases that may even mean that we no-longer need
to force the constant into a register at all.  For example, on Arm, the case:

_Bool f8 (unsigned long long a) { return a > 0xffffffff; }

previously compiled to

        mov     r3, #0
        cmp     r1, r3
        mvn     r2, #0
        cmpeq   r0, r2
        movhi   r0, #1
        movls   r0, #0
        bx      lr

But now compiles to

        cmp     r1, #1
        cmpeq   r0, #0
        movcs   r0, #1
        movcc   r0, #0
        bx      lr

Which although not yet completely optimal, is certainly better than
previously.

	* config/arm/arm.md (cbranchdi4): Accept reg_or_int_operand for
	operand 2.
	(cstoredi4): Similarly, but for operand 3.
	* config/arm/arm.c (arm_canoncialize_comparison): Allow canonicalization
	of unsigned compares with a constant on Arm.  Prefer using const+1 and
	adjusting the comparison over swapping the operands whenever the
	original constant was not valid.
	(arm_gen_dicompare_reg): If Y is not a valid operand, force it to a
	register here.
	(arm_validize_comparison): Do not force invalid DImode operands to
	registers here.

From-SVN: r277178
---
 gcc/ChangeLog         | 14 ++++++++++++++
 gcc/config/arm/arm.c  | 37 +++++++++++++++++++++++--------------
 gcc/config/arm/arm.md |  4 ++--
 3 files changed, 39 insertions(+), 16 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 51a2c3f..52d14e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,19 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (cbranchdi4): Accept reg_or_int_operand for
+	operand 2.
+	(cstoredi4): Similarly, but for operand 3.
+	* config/arm/arm.c (arm_canoncialize_comparison): Allow
+	canonicalization of unsigned compares with a constant on Arm.
+	Prefer using const+1 and adjusting the comparison over swapping the
+	operands whenever the original constant was not valid.
+	(arm_gen_dicompare_reg): If Y is not a valid operand, force it to a
+	register here.
+	(arm_validize_comparison): Do not force invalid DImode operands to
+	registers here.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.c (arm_select_cc_mode): For DImode equality tests
 	return CC_Zmode if comparing against a constant where one word is
 	zero.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 97ebf63..e7924df 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -5372,15 +5372,16 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
 
   maxval = (HOST_WIDE_INT_1U << (GET_MODE_BITSIZE (mode) - 1)) - 1;
 
-  /* For DImode, we have GE/LT/GEU/LTU comparisons.  In ARM mode
-     we can also use cmp/cmpeq for GTU/LEU.  GT/LE must be either
-     reversed or (for constant OP1) adjusted to GE/LT.  Similarly
-     for GTU/LEU in Thumb mode.  */
+  /* For DImode, we have GE/LT/GEU/LTU comparisons (with cmp/sbc).  In
+     ARM mode we can also use cmp/cmpeq for GTU/LEU.  GT/LE must be
+     either reversed or (for constant OP1) adjusted to GE/LT.
+     Similarly for GTU/LEU in Thumb mode.  */
   if (mode == DImode)
     {
 
       if (*code == GT || *code == LE
-	  || (!TARGET_ARM && (*code == GTU || *code == LEU)))
+	  || ((!TARGET_ARM || CONST_INT_P (*op1))
+	      && (*code == GTU || *code == LEU)))
 	{
 	  /* Missing comparison.  First try to use an available
 	     comparison.  */
@@ -5392,23 +5393,27 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
 		case GT:
 		case LE:
 		  if (i != maxval
-		      && arm_const_double_by_immediates (GEN_INT (i + 1)))
+		      && (!arm_const_double_by_immediates (*op1)
+			  || arm_const_double_by_immediates (GEN_INT (i + 1))))
 		    {
 		      *op1 = GEN_INT (i + 1);
 		      *code = *code == GT ? GE : LT;
 		      return;
 		    }
 		  break;
+
 		case GTU:
 		case LEU:
 		  if (i != ~((unsigned HOST_WIDE_INT) 0)
-		      && arm_const_double_by_immediates (GEN_INT (i + 1)))
+		      && (!arm_const_double_by_immediates (*op1)
+			  || arm_const_double_by_immediates (GEN_INT (i + 1))))
 		    {
 		      *op1 = GEN_INT (i + 1);
 		      *code = *code == GTU ? GEU : LTU;
 		      return;
 		    }
 		  break;
+
 		default:
 		  gcc_unreachable ();
 		}
@@ -15436,7 +15441,7 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 		scratch = gen_reg_rtx (SImode);
 	      if (ylo == const0_rtx)
 		{
-		  yhi = GEN_INT (-INTVAL(yhi));
+		  yhi = gen_int_mode (-INTVAL (yhi), SImode);
 		  if (!arm_add_operand (yhi, SImode))
 		    yhi = force_reg (SImode, yhi);
 		  emit_insn (gen_addsi3 (scratch, xhi, yhi));
@@ -15445,7 +15450,7 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	      else
 		{
 		  gcc_assert (yhi == const0_rtx);
-		  ylo = GEN_INT (-INTVAL(ylo));
+		  ylo = gen_int_mode (-INTVAL (ylo), SImode);
 		  if (!arm_add_operand (ylo, SImode))
 		    ylo = force_reg (SImode, ylo);
 		  emit_insn (gen_addsi3 (scratch, xlo, ylo));
@@ -15458,6 +15463,8 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	    x = gen_rtx_IOR (SImode, gen_lowpart (SImode, x),
 			     gen_highpart (SImode, x));
 	}
+      else if (!cmpdi_operand (y, mode))
+	y = force_reg (DImode, y);
 
       /* A scratch register is required.  */
       if (reload_completed)
@@ -15470,7 +15477,12 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
       emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set, clobber)));
     }
   else
-    emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
+    {
+      if (!cmpdi_operand (y, mode))
+	y = force_reg (DImode, y);
+
+      emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
+    }
 
   return cc_reg;
 }
@@ -30479,10 +30491,7 @@ arm_validize_comparison (rtx *comparison, rtx * op1, rtx * op2)
       return true;
 
     case E_DImode:
-      if (!cmpdi_operand (*op1, mode))
-	*op1 = force_reg (mode, *op1);
-      if (!cmpdi_operand (*op2, mode))
-	*op2 = force_reg (mode, *op2);
+      /* gen_compare_reg() will sort out any invalid operands.  */
       return true;
 
     case E_HFmode:
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index a6b0c19..9d8b137 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -6397,7 +6397,7 @@
   [(set (pc) (if_then_else
 	      (match_operator 0 "expandable_comparison_operator"
 	       [(match_operand:DI 1 "s_register_operand")
-	        (match_operand:DI 2 "cmpdi_operand")])
+	        (match_operand:DI 2 "reg_or_int_operand")])
 	      (label_ref (match_operand 3 "" ""))
 	      (pc)))]
   "TARGET_32BIT"
@@ -6862,7 +6862,7 @@
   [(set (match_operand:SI 0 "s_register_operand")
 	(match_operator:SI 1 "expandable_comparison_operator"
 	 [(match_operand:DI 2 "s_register_operand")
-	  (match_operand:DI 3 "cmpdi_operand")]))]
+	  (match_operand:DI 3 "reg_or_int_operand")]))]
   "TARGET_32BIT"
   "{
      if (!arm_validize_comparison (&operands[1],
-- 
cgit v1.1


From 8b8ab8f473b42933b9c1e292c4b1ab02adf1863a Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:43 +0000
Subject: [arm] early split most DImode comparison operations.

This patch does most of the work for early splitting the DImode
comparisons.  We now handle EQ, NE, LT, GE, LTU and GEU during early
expansion, in addition to EQ and NE, for which the expansion has now
been reworked to use a standard conditional-compare pattern already in
the back-end.

To handle this we introduce two new condition flag modes that are used
when comparing the upper words of decomposed DImode values: one for
signed, and one for unsigned comparisons.  CC_Bmode (B for Borrow) is
essentially the inverse of CC_Cmode and is used when the carry flag is
set by a subtraction of unsigned values.

	* config/arm/arm-modes.def (CC_NV, CC_B): New CC modes.
	* config/arm/arm.c (arm_select_cc_mode): Recognize constructs that
	need these modes.
	(arm_gen_dicompare_reg): New code to early expand the sub-operations
	of EQ, NE, LT, GE, LTU and GEU.
	* config/arm/iterators.md (CC_EXTEND): New code attribute.
	* config/arm/predicates.md (arm_adcimm_operand): New predicate..
	* config/arm/arm.md (cmpsi3_carryin_<CC_EXTEND>out): New pattern.
	(cmpsi3_imm_carryin_<CC_EXTEND>out): Likewise.
	(cmpsi3_0_carryin_<CC_EXTEND>out): Likewise.

From-SVN: r277179
---
 gcc/ChangeLog                |  13 +++
 gcc/config/arm/arm-modes.def |   6 ++
 gcc/config/arm/arm.c         | 220 ++++++++++++++++++++++++++++++++++++++++++-
 gcc/config/arm/arm.md        |  45 +++++++++
 gcc/config/arm/iterators.md  |   4 +
 gcc/config/arm/predicates.md |   6 ++
 6 files changed, 291 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52d14e9..aa489bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,18 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm-modes.def (CC_NV, CC_B): New CC modes.
+	* config/arm/arm.c (arm_select_cc_mode): Recognize constructs that
+	need these modes.
+	(arm_gen_dicompare_reg): New code to early expand the sub-operations
+	of EQ, NE, LT, GE, LTU and GEU.
+	* config/arm/iterators.md (CC_EXTEND): New code attribute.
+	* config/arm/predicates.md (arm_adcimm_operand): New predicate..
+	* config/arm/arm.md (cmpsi3_carryin_<CC_EXTEND>out): New pattern.
+	(cmpsi3_imm_carryin_<CC_EXTEND>out): Likewise.
+	(cmpsi3_0_carryin_<CC_EXTEND>out): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (cbranchdi4): Accept reg_or_int_operand for
 	operand 2.
 	(cstoredi4): Similarly, but for operand 3.
diff --git a/gcc/config/arm/arm-modes.def b/gcc/config/arm/arm-modes.def
index 4fa7f1b..65cddf6 100644
--- a/gcc/config/arm/arm-modes.def
+++ b/gcc/config/arm/arm-modes.def
@@ -34,12 +34,16 @@ ADJUST_FLOAT_FORMAT (HF, ((arm_fp16_format == ARM_FP16_FORMAT_ALTERNATIVE)
    CC_Cmode should be used if only the C flag is set correctly, after an
      addition.
    CC_Nmode should be used if only the N (sign) flag is set correctly
+   CC_NVmode should be used if only the N and V bits are set correctly,
+     (used for signed comparisons when the carry is propagated in).
    CC_CZmode should be used if only the C and Z flags are correct
    (used for DImode unsigned comparisons).
    CC_RSBmode should be used where the comparison is set by an RSB immediate,
      or NEG instruction.  The form of the comparison for (const - reg) will
      be (COMPARE (not (reg)) (~const)).
    CC_NCVmode should be used if only the N, C, and V flags are correct
+   CC_Bmode should be used if only the C flag is correct after a subtract
+     (eg after an unsigned borrow with carry-in propagation).
    (used for DImode signed comparisons).
    CCmode should be used otherwise.  */
 
@@ -47,6 +51,7 @@ CC_MODE (CC_NOOV);
 CC_MODE (CC_Z);
 CC_MODE (CC_CZ);
 CC_MODE (CC_NCV);
+CC_MODE (CC_NV);
 CC_MODE (CC_SWP);
 CC_MODE (CC_RSB);
 CC_MODE (CCFP);
@@ -62,6 +67,7 @@ CC_MODE (CC_DLTU);
 CC_MODE (CC_DGEU);
 CC_MODE (CC_DGTU);
 CC_MODE (CC_C);
+CC_MODE (CC_B);
 CC_MODE (CC_N);
 CC_MODE (CC_V);
 
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index e7924df..74c8eca 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15348,6 +15348,22 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
       && (rtx_equal_p (XEXP (x, 0), y) || rtx_equal_p (XEXP (x, 1), y)))
     return CC_Cmode;
 
+  if (GET_MODE (x) == DImode
+      && (op == GE || op == LT)
+      && GET_CODE (x) == SIGN_EXTEND
+      && ((GET_CODE (y) == PLUS
+	   && arm_borrow_operation (XEXP (y, 0), DImode))
+	  || arm_borrow_operation (y, DImode)))
+    return CC_NVmode;
+
+  if (GET_MODE (x) == DImode
+      && (op == GEU || op == LTU)
+      && GET_CODE (x) == ZERO_EXTEND
+      && ((GET_CODE (y) == PLUS
+	   && arm_borrow_operation (XEXP (y, 0), DImode))
+	  || arm_borrow_operation (y, DImode)))
+    return CC_Bmode;
+
   if (GET_MODE (x) == DImode || GET_MODE (y) == DImode)
     {
       switch (op)
@@ -15410,16 +15426,198 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 static rtx
 arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 {
-  /* We don't currently handle DImode in thumb1, but rely on libgcc.  */
+  machine_mode mode;
+  rtx cc_reg;
+
+    /* We don't currently handle DImode in thumb1, but rely on libgcc.  */
   gcc_assert (TARGET_32BIT);
 
+  rtx x_lo = simplify_gen_subreg (SImode, x, DImode,
+				  subreg_lowpart_offset (SImode, DImode));
+  rtx x_hi = simplify_gen_subreg (SImode, x, DImode,
+				  subreg_highpart_offset (SImode, DImode));
+  rtx y_lo = simplify_gen_subreg (SImode, y, DImode,
+				  subreg_lowpart_offset (SImode, DImode));
+  rtx y_hi = simplify_gen_subreg (SImode, y, DImode,
+				  subreg_highpart_offset (SImode, DImode));
+  switch (code)
+    {
+    case EQ:
+    case NE:
+      {
+	/* We should never have X as a const_int in this case.  */
+	gcc_assert (!CONST_INT_P (x));
+
+	if (y_lo == const0_rtx || y_hi == const0_rtx)
+	  {
+	    if (y_lo != const0_rtx)
+	      {
+		rtx scratch2 = scratch ? scratch : gen_reg_rtx (SImode);
+
+		gcc_assert (y_hi == const0_rtx);
+		y_lo = gen_int_mode (-INTVAL (y_lo), SImode);
+		if (!arm_add_operand (y_lo, SImode))
+		  y_lo = force_reg (SImode, y_lo);
+		emit_insn (gen_addsi3 (scratch2, x_lo, y_lo));
+		x_lo = scratch2;
+	      }
+	    else if (y_hi != const0_rtx)
+	      {
+		rtx scratch2 = scratch ? scratch : gen_reg_rtx (SImode);
+
+		y_hi = gen_int_mode (-INTVAL (y_hi), SImode);
+		if (!arm_add_operand (y_hi, SImode))
+		  y_hi = force_reg (SImode, y_hi);
+		emit_insn (gen_addsi3 (scratch2, x_hi, y_hi));
+		x_hi = scratch2;
+	      }
+
+	    if (!scratch)
+	      {
+		gcc_assert (!reload_completed);
+		scratch = gen_rtx_SCRATCH (SImode);
+	      }
+
+	    rtx clobber = gen_rtx_CLOBBER (VOIDmode, scratch);
+	    cc_reg = gen_rtx_REG (CC_NOOVmode, CC_REGNUM);
+
+	    rtx set
+	      = gen_rtx_SET (cc_reg,
+			     gen_rtx_COMPARE (CC_NOOVmode,
+					      gen_rtx_IOR (SImode, x_lo, x_hi),
+					      const0_rtx));
+	    emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set,
+							      clobber)));
+	    return cc_reg;
+	  }
+
+	if (!arm_add_operand (y_lo, SImode))
+	  y_lo = force_reg (SImode, y_lo);
+
+	if (!arm_add_operand (y_hi, SImode))
+	  y_hi = force_reg (SImode, y_hi);
+
+	rtx cmp1 = gen_rtx_NE (SImode, x_lo, y_lo);
+	rtx cmp2 = gen_rtx_NE (SImode, x_hi, y_hi);
+	rtx conjunction = gen_rtx_IOR (SImode, cmp1, cmp2);
+	mode = SELECT_CC_MODE (code, conjunction, const0_rtx);
+	cc_reg = gen_rtx_REG (mode, CC_REGNUM);
+
+	emit_insn (gen_rtx_SET (cc_reg,
+				gen_rtx_COMPARE (VOIDmode, conjunction,
+						 const0_rtx)));
+	return cc_reg;
+      }
+
+    case LT:
+    case GE:
+      {
+	if (y_lo == const0_rtx)
+	  {
+	    /* If the low word of y is 0, then this is simply a normal
+	       compare of the upper words.  */
+	    if (!arm_add_operand (y_hi, SImode))
+	      y_hi = force_reg (SImode, y_hi);
+
+	    return arm_gen_compare_reg (code, x_hi, y_hi, NULL_RTX);
+	  }
+
+	if (!arm_add_operand (y_lo, SImode))
+	  y_lo = force_reg (SImode, y_lo);
+
+	/* Just for now.  */
+	if (!register_operand (x_lo, SImode))
+	  x_lo = force_reg (SImode, x_lo);
+
+	rtx cmp1
+	  = gen_rtx_LTU (DImode,
+			 arm_gen_compare_reg (LTU, x_lo, y_lo, NULL_RTX),
+			 const0_rtx);
+
+	if (!scratch)
+	  scratch = gen_rtx_SCRATCH (SImode);
+	if (!arm_not_operand (y_hi, SImode))
+	  y_hi = force_reg (SImode, y_hi);
+
+	/* Just for now.  */
+	if (!register_operand (x_hi, SImode))
+	  x_hi = force_reg (SImode, x_hi);
+
+	rtx_insn *insn;
+	if (y_hi == const0_rtx)
+	  insn = emit_insn (gen_cmpsi3_0_carryin_CC_NVout (scratch, x_hi,
+							   cmp1));
+	else if (CONST_INT_P (y_hi))
+	  insn = emit_insn (gen_cmpsi3_imm_carryin_CC_NVout (scratch, x_hi,
+							     y_hi, cmp1));
+	else
+	  insn = emit_insn (gen_cmpsi3_carryin_CC_NVout (scratch, x_hi, y_hi,
+							 cmp1));
+	return SET_DEST (single_set (insn));
+      }
+
+    case LTU:
+    case GEU:
+      {
+	if (y_lo == const0_rtx)
+	  {
+	    /* If the low word of y is 0, then this is simply a normal
+	       compare of the upper words.  */
+	    if (!arm_add_operand (y_hi, SImode))
+	      y_hi = force_reg (SImode, y_hi);
+
+	    return arm_gen_compare_reg (code, x_hi, y_hi, NULL_RTX);
+	  }
+
+	if (!arm_add_operand (y_lo, SImode))
+	  y_lo = force_reg (SImode, y_lo);
+
+	/* Just for now.  */
+	if (!register_operand (x_lo, SImode))
+	  x_lo = force_reg (SImode, x_lo);
+
+	rtx cmp1
+	  = gen_rtx_LTU (DImode,
+			 arm_gen_compare_reg (LTU, x_lo, y_lo, NULL_RTX),
+			 const0_rtx);
+
+	if (!scratch)
+	  scratch = gen_rtx_SCRATCH (SImode);
+	if (!arm_not_operand (y_hi, SImode))
+	  y_hi = force_reg (SImode, y_hi);
+
+	/* Just for now.  */
+	if (!register_operand (x_hi, SImode))
+	  x_hi = force_reg (SImode, x_hi);
+
+	rtx_insn *insn;
+	if (y_hi == const0_rtx)
+	  insn = emit_insn (gen_cmpsi3_0_carryin_CC_Bout (scratch, x_hi,
+							  cmp1));
+	else if (CONST_INT_P (y_hi))
+	  {
+	    /* Constant is viewed as unsigned when zero-extended.  */
+	    y_hi = GEN_INT (UINTVAL (y_hi) & 0xffffffffULL);
+	    insn = emit_insn (gen_cmpsi3_imm_carryin_CC_Bout (scratch, x_hi,
+							      y_hi, cmp1));
+	  }
+	else
+	  insn = emit_insn (gen_cmpsi3_carryin_CC_Bout (scratch, x_hi, y_hi,
+							cmp1));
+	return SET_DEST (single_set (insn));
+      }
+
+    default:
+      break;
+    }
+
   /* We might have X as a constant, Y as a register because of the predicates
      used for cmpdi.  If so, force X to a register here.  */
   if (!REG_P (x))
     x = force_reg (DImode, x);
 
-  machine_mode mode = SELECT_CC_MODE (code, x, y);
-  rtx cc_reg = gen_rtx_REG (mode, CC_REGNUM);
+  mode = SELECT_CC_MODE (code, x, y);
+  cc_reg = gen_rtx_REG (mode, CC_REGNUM);
 
   if (mode != CC_CZmode)
     {
@@ -23803,6 +24001,22 @@ maybe_get_arm_condition_code (rtx comparison)
 	default: return ARM_NV;
 	}
 
+    case E_CC_NVmode:
+      switch (comp_code)
+	{
+	case GE: return ARM_GE;
+	case LT: return ARM_LT;
+	default: return ARM_NV;
+	}
+
+    case E_CC_Bmode:
+      switch (comp_code)
+	{
+	case GEU: return ARM_CS;
+	case LTU: return ARM_CC;
+	default: return ARM_NV;
+	}
+
     case E_CC_Vmode:
       switch (comp_code)
 	{
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 9d8b137..f0ff4dd 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1009,6 +1009,51 @@
    (set_attr "type" "adc_reg,adc_imm,alu_shift_imm")]
 )
 
+(define_insn "cmpsi3_carryin_<CC_EXTEND>out"
+  [(set (reg:<CC_EXTEND> CC_REGNUM)
+	(compare:<CC_EXTEND>
+	 (SE:DI (match_operand:SI 1 "s_register_operand" "0,r"))
+	 (plus:DI (match_operand:DI 3 "arm_borrow_operation" "")
+		  (SE:DI (match_operand:SI 2 "s_register_operand" "l,r")))))
+   (clobber (match_scratch:SI 0 "=l,r"))]
+  "TARGET_32BIT"
+  "sbcs\\t%0, %1, %2"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")
+   (set_attr "type" "adc_reg")]
+)
+
+;; Similar to the above, but handling a constant which has a different
+;; canonicalization.
+(define_insn "cmpsi3_imm_carryin_<CC_EXTEND>out"
+  [(set (reg:<CC_EXTEND> CC_REGNUM)
+	(compare:<CC_EXTEND>
+	 (SE:DI (match_operand:SI 1 "s_register_operand" "r,r"))
+	 (plus:DI (match_operand:DI 3 "arm_borrow_operation" "")
+		  (match_operand:DI 2 "arm_adcimm_operand" "I,K"))))
+   (clobber (match_scratch:SI 0 "=l,r"))]
+  "TARGET_32BIT"
+  "@
+   sbcs\\t%0, %1, %2
+   adcs\\t%0, %1, #%B2"
+  [(set_attr "conds" "set")
+   (set_attr "type" "adc_imm")]
+)
+
+;; Further canonicalization when the constant is zero.
+(define_insn "cmpsi3_0_carryin_<CC_EXTEND>out"
+  [(set (reg:<CC_EXTEND> CC_REGNUM)
+	(compare:<CC_EXTEND>
+	 (SE:DI (match_operand:SI 1 "s_register_operand" "r,r"))
+	 (match_operand:DI 2 "arm_borrow_operation" "")))
+   (clobber (match_scratch:SI 0 "=l,r"))]
+  "TARGET_32BIT"
+  "sbcs\\t%0, %1, #0"
+  [(set_attr "conds" "set")
+   (set_attr "type" "adc_imm")]
+)
+
 (define_insn "*subsi3_carryin_const"
   [(set (match_operand:SI 0 "s_register_operand" "=r")
 	(minus:SI (plus:SI
diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md
index 77e1645..5f1c833 100644
--- a/gcc/config/arm/iterators.md
+++ b/gcc/config/arm/iterators.md
@@ -792,6 +792,10 @@
 ;; Code attributes
 ;;----------------------------------------------------------------------------
 
+;; Determine the mode of a 'wide compare', ie where the carry flag is
+;; propagated into the comparison.
+(define_code_attr CC_EXTEND [(sign_extend "CC_NV") (zero_extend "CC_B")])
+
 ;; Assembler mnemonics for vqh_ops and vqhs_ops iterators.
 (define_code_attr VQH_mnem [(plus "vadd") (smin "vmin") (smax "vmax")
                 (umin "vmin") (umax "vmax")])
diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md
index ed7495b..d9470df 100644
--- a/gcc/config/arm/predicates.md
+++ b/gcc/config/arm/predicates.md
@@ -229,6 +229,12 @@
   (ior (match_operand 0 "arm_rhs_operand")
        (match_operand 0 "arm_not_immediate_operand")))
 
+;; A constant that can be used with ADC(SBC) or SBC(ADC) when bit-wise
+;; inverted.  Similar to arm_not_operand, but excludes registers.
+(define_predicate "arm_adcimm_operand"
+  (ior (match_operand 0 "arm_immediate_operand")
+       (match_operand 0 "arm_not_immediate_operand")))
+
 (define_predicate "arm_di_operand"
   (ior (match_operand 0 "s_register_operand")
        (match_operand 0 "arm_immediate_di_operand")))
-- 
cgit v1.1


From af74bfeee1faccef25dc0086d4249eb0f127c820 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:50 +0000
Subject: [arm] Handle some constant comparisons using rsbs+rscs

In a small number of cases it is preferable to handle comparisons with
constants using the sequence

	RSBS	tmp, Xlo, constlo
	RSCS	tmp, Xhi, consthi

which allows us to handle a small number of LE/GT/LEU/GEU cases when
changing the code to use LT/GE/LTU/GEU would make the constant more
expensive.  Sadly, we cannot do this on Thumb, since we need RSC, so we
now always use the incremented constant in that case since normally that
still works out cheaper than forcing the entire constant into a register.

Further investigation has also shown that the canonicalization of a
reverse subtract and compare is valid for signed as well as unsigned value,
so we relax the restriction on selecting CC_RSBmode to allow all types
of compare.

	* config/arm/arm.c (arm_const_double_prefer_rsbs_rsc): New function.
	(arm_canonicalize_comparison): For GT/LE/GTU/GEU, use the constant
	unchanged only if that will be cheaper.
	(arm_select_cc_mode): Recognize a swapped comparison that will
	be regenerated using RSBS or RSCS.  Relax restriction on selecting
	CC_RSBmode.
	(arm_gen_dicompare_reg): Handle LE/GT/LEU/GEU comparisons against
	a constant.
	(arm_gen_compare_reg): Handle compare (CONST, X) when the mode
	is CC_RSBmode.
	(maybe_get_arm_condition_code): CC_RSBmode now returns the same codes
	as CCmode.
	* config/arm/arm.md (rsb_imm_compare_scratch): New pattern.
	(rscsi3_<CC_EXTEND>out_scratch): New pattern.

From-SVN: r277180
---
 gcc/ChangeLog         |  17 ++++++
 gcc/config/arm/arm.c  | 153 +++++++++++++++++++++++++++++++++++---------------
 gcc/config/arm/arm.md |  27 +++++++++
 3 files changed, 151 insertions(+), 46 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa489bd..b4b1811 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,22 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.c (arm_const_double_prefer_rsbs_rsc): New function.
+	(arm_canonicalize_comparison): For GT/LE/GTU/GEU, use the constant
+	unchanged only if that will be cheaper.
+	(arm_select_cc_mode): Recognize a swapped comparison that will
+	be regenerated using RSBS or RSCS.  Relax restriction on selecting
+	CC_RSBmode.
+	(arm_gen_dicompare_reg): Handle LE/GT/LEU/GEU comparisons against
+	a constant.
+	(arm_gen_compare_reg): Handle compare (CONST, X) when the mode
+	is CC_RSBmode.
+	(maybe_get_arm_condition_code): CC_RSBmode now returns the same codes
+	as CCmode.
+	* config/arm/arm.md (rsb_imm_compare_scratch): New pattern.
+	(rscsi3_<CC_EXTEND>out_scratch): New pattern.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm-modes.def (CC_NV, CC_B): New CC modes.
 	* config/arm/arm.c (arm_select_cc_mode): Recognize constructs that
 	need these modes.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 74c8eca..55fd16d 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -5355,6 +5355,21 @@ arm_gen_constant (enum rtx_code code, machine_mode mode, rtx cond,
   return insns;
 }
 
+/* Return TRUE if op is a constant where both the low and top words are
+   suitable for RSB/RSC instructions.  This is never true for Thumb, since
+   we do not have RSC in that case.  */
+static bool
+arm_const_double_prefer_rsbs_rsc (rtx op)
+{
+  /* Thumb lacks RSC, so we never prefer that sequence.  */
+  if (TARGET_THUMB || !CONST_INT_P (op))
+    return false;
+  HOST_WIDE_INT hi, lo;
+  lo = UINTVAL (op) & 0xffffffffULL;
+  hi = UINTVAL (op) >> 32;
+  return const_ok_for_arm (lo) && const_ok_for_arm (hi);
+}
+
 /* Canonicalize a comparison so that we are more likely to recognize it.
    This can be done for a few constant compares, where we can make the
    immediate value easier to load.  */
@@ -5380,8 +5395,7 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
     {
 
       if (*code == GT || *code == LE
-	  || ((!TARGET_ARM || CONST_INT_P (*op1))
-	      && (*code == GTU || *code == LEU)))
+	  || *code == GTU || *code == LEU)
 	{
 	  /* Missing comparison.  First try to use an available
 	     comparison.  */
@@ -5392,10 +5406,13 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
 		{
 		case GT:
 		case LE:
-		  if (i != maxval
-		      && (!arm_const_double_by_immediates (*op1)
-			  || arm_const_double_by_immediates (GEN_INT (i + 1))))
+		  if (i != maxval)
 		    {
+		      /* Try to convert to GE/LT, unless that would be more
+			 expensive.  */
+		      if (!arm_const_double_by_immediates (GEN_INT (i + 1))
+			  && arm_const_double_prefer_rsbs_rsc (*op1))
+			return;
 		      *op1 = GEN_INT (i + 1);
 		      *code = *code == GT ? GE : LT;
 		      return;
@@ -5404,10 +5421,13 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
 
 		case GTU:
 		case LEU:
-		  if (i != ~((unsigned HOST_WIDE_INT) 0)
-		      && (!arm_const_double_by_immediates (*op1)
-			  || arm_const_double_by_immediates (GEN_INT (i + 1))))
+		  if (i != ~((unsigned HOST_WIDE_INT) 0))
 		    {
+		      /* Try to convert to GEU/LTU, unless that would
+			 be more expensive.  */
+		      if (!arm_const_double_by_immediates (GEN_INT (i + 1))
+			  && arm_const_double_prefer_rsbs_rsc (*op1))
+			return;
 		      *op1 = GEN_INT (i + 1);
 		      *code = *code == GTU ? GEU : LTU;
 		      return;
@@ -5419,7 +5439,6 @@ arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
 		}
 	    }
 
-	  /* If that did not work, reverse the condition.  */
 	  if (!op0_preserve_value)
 	    {
 	      std::swap (*op0, *op1);
@@ -15251,6 +15270,28 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 	  || GET_CODE (x) == ROTATERT))
     return CC_SWPmode;
 
+  /* A widened compare of the sum of a value plus a carry against a
+     constant.  This is a representation of RSC.  We want to swap the
+     result of the comparison at output.  Not valid if the Z bit is
+     needed.  */
+  if (GET_MODE (x) == DImode
+      && GET_CODE (x) == PLUS
+      && arm_borrow_operation (XEXP (x, 1), DImode)
+      && CONST_INT_P (y)
+      && ((GET_CODE (XEXP (x, 0)) == SIGN_EXTEND
+	   && (op == LE || op == GT))
+	  || (GET_CODE (XEXP (x, 0)) == ZERO_EXTEND
+	      && (op == LEU || op == GTU))))
+    return CC_SWPmode;
+
+  /* If X is a constant we want to use CC_RSBmode.  This is
+     non-canonical, but arm_gen_compare_reg uses this to generate the
+     correct canonical form.  */
+  if (GET_MODE (y) == SImode
+      && (REG_P (y) || GET_CODE (y) == SUBREG)
+      && CONST_INT_P (x))
+    return CC_RSBmode;
+
   /* This operation is performed swapped, but since we only rely on the Z
      flag we don't need an additional mode.  */
   if (GET_MODE (y) == SImode
@@ -15329,15 +15370,13 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 	  || (TARGET_32BIT && GET_CODE (x) == ZERO_EXTRACT)))
     return CC_NOOVmode;
 
-  /* An unsigned comparison of ~reg with a const is really a special
+  /* A comparison of ~reg with a const is really a special
      canoncialization of compare (~const, reg), which is a reverse
      subtract operation.  We may not get here if CONST is 0, but that
      doesn't matter because ~0 isn't a valid immediate for RSB.  */
   if (GET_MODE (x) == SImode
       && GET_CODE (x) == NOT
-      && CONST_INT_P (y)
-      && (op == EQ || op == NE
-	  || op == LTU || op == LEU || op == GEU || op == GTU))
+      && CONST_INT_P (y))
     return CC_RSBmode;
 
   if (GET_MODE (x) == QImode && (op == EQ || op == NE))
@@ -15431,6 +15470,7 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 
     /* We don't currently handle DImode in thumb1, but rely on libgcc.  */
   gcc_assert (TARGET_32BIT);
+  gcc_assert (!CONST_INT_P (x));
 
   rtx x_lo = simplify_gen_subreg (SImode, x, DImode,
 				  subreg_lowpart_offset (SImode, DImode));
@@ -15445,9 +15485,6 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
     case EQ:
     case NE:
       {
-	/* We should never have X as a const_int in this case.  */
-	gcc_assert (!CONST_INT_P (x));
-
 	if (y_lo == const0_rtx || y_hi == const0_rtx)
 	  {
 	    if (y_lo != const0_rtx)
@@ -15525,10 +15562,6 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	if (!arm_add_operand (y_lo, SImode))
 	  y_lo = force_reg (SImode, y_lo);
 
-	/* Just for now.  */
-	if (!register_operand (x_lo, SImode))
-	  x_lo = force_reg (SImode, x_lo);
-
 	rtx cmp1
 	  = gen_rtx_LTU (DImode,
 			 arm_gen_compare_reg (LTU, x_lo, y_lo, NULL_RTX),
@@ -15536,13 +15569,10 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 
 	if (!scratch)
 	  scratch = gen_rtx_SCRATCH (SImode);
+
 	if (!arm_not_operand (y_hi, SImode))
 	  y_hi = force_reg (SImode, y_hi);
 
-	/* Just for now.  */
-	if (!register_operand (x_hi, SImode))
-	  x_hi = force_reg (SImode, x_hi);
-
 	rtx_insn *insn;
 	if (y_hi == const0_rtx)
 	  insn = emit_insn (gen_cmpsi3_0_carryin_CC_NVout (scratch, x_hi,
@@ -15556,6 +15586,27 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	return SET_DEST (single_set (insn));
       }
 
+    case LE:
+    case GT:
+      {
+	/* During expansion, we only expect to get here if y is a
+	   constant that we want to handle, otherwise we should have
+	   swapped the operands already.  */
+	gcc_assert (arm_const_double_prefer_rsbs_rsc (y));
+
+	if (!const_ok_for_arm (INTVAL (y_lo)))
+	  y_lo = force_reg (SImode, y_lo);
+
+	/* Perform a reverse subtract and compare.  */
+	rtx cmp1
+	  = gen_rtx_LTU (DImode,
+			 arm_gen_compare_reg (LTU, y_lo, x_lo, scratch),
+			 const0_rtx);
+	rtx_insn *insn = emit_insn (gen_rscsi3_CC_NVout_scratch (scratch, y_hi,
+								 x_hi, cmp1));
+	return SET_DEST (single_set (insn));
+      }
+
     case LTU:
     case GEU:
       {
@@ -15572,10 +15623,6 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	if (!arm_add_operand (y_lo, SImode))
 	  y_lo = force_reg (SImode, y_lo);
 
-	/* Just for now.  */
-	if (!register_operand (x_lo, SImode))
-	  x_lo = force_reg (SImode, x_lo);
-
 	rtx cmp1
 	  = gen_rtx_LTU (DImode,
 			 arm_gen_compare_reg (LTU, x_lo, y_lo, NULL_RTX),
@@ -15586,10 +15633,6 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	if (!arm_not_operand (y_hi, SImode))
 	  y_hi = force_reg (SImode, y_hi);
 
-	/* Just for now.  */
-	if (!register_operand (x_hi, SImode))
-	  x_hi = force_reg (SImode, x_hi);
-
 	rtx_insn *insn;
 	if (y_hi == const0_rtx)
 	  insn = emit_insn (gen_cmpsi3_0_carryin_CC_Bout (scratch, x_hi,
@@ -15607,6 +15650,28 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 	return SET_DEST (single_set (insn));
       }
 
+    case LEU:
+    case GTU:
+      {
+	/* During expansion, we only expect to get here if y is a
+	   constant that we want to handle, otherwise we should have
+	   swapped the operands already.  */
+	gcc_assert (arm_const_double_prefer_rsbs_rsc (y));
+
+	if (!const_ok_for_arm (INTVAL (y_lo)))
+	  y_lo = force_reg (SImode, y_lo);
+
+	/* Perform a reverse subtract and compare.  */
+	rtx cmp1
+	  = gen_rtx_LTU (DImode,
+			 arm_gen_compare_reg (LTU, y_lo, x_lo, scratch),
+			 const0_rtx);
+	y_hi = GEN_INT (0xffffffff & UINTVAL (y_hi));
+	rtx_insn *insn = emit_insn (gen_rscsi3_CC_Bout_scratch (scratch, y_hi,
+								x_hi, cmp1));
+	return SET_DEST (single_set (insn));
+      }
+
     default:
       break;
     }
@@ -15695,8 +15760,15 @@ arm_gen_compare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
 
   machine_mode mode = SELECT_CC_MODE (code, x, y);
   rtx cc_reg = gen_rtx_REG (mode, CC_REGNUM);
-
-  emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
+  if (mode == CC_RSBmode)
+    {
+      if (!scratch)
+	scratch = gen_rtx_SCRATCH (SImode);
+      emit_insn (gen_rsb_imm_compare_scratch (scratch,
+					      GEN_INT (~UINTVAL (x)), y));
+    }
+  else
+    emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
 
   return cc_reg;
 }
@@ -24025,19 +24097,8 @@ maybe_get_arm_condition_code (rtx comparison)
 	default: return ARM_NV;
 	}
 
-    case E_CC_RSBmode:
-      switch (comp_code)
-	{
-	case NE: return ARM_NE;
-	case EQ: return ARM_EQ;
-	case GEU: return ARM_CS;
-	case GTU: return ARM_HI;
-	case LEU: return ARM_LS;
-	case LTU: return ARM_CC;
-	default: return ARM_NV;
-	}
-
     case E_CCmode:
+    case E_CC_RSBmode:
       switch (comp_code)
 	{
 	case NE: return ARM_NE;
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index f0ff4dd..8607c6f 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1363,6 +1363,33 @@
    (set_attr "type" "alus_imm")]
 )
 
+;; Similarly, but the result is unused.
+(define_insn "rsb_imm_compare_scratch"
+  [(set (reg:CC_RSB CC_REGNUM)
+	(compare:CC_RSB (not:SI (match_operand:SI 2 "s_register_operand" "r"))
+			(match_operand 1 "arm_not_immediate_operand" "K")))
+   (clobber (match_scratch:SI 0 "=r"))]
+  "TARGET_32BIT"
+  "rsbs\\t%0, %2, #%B1"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
+)
+
+;; Compare the sum of a value plus a carry against a constant.  Uses
+;; RSC, so the result is swapped.  Only available on Arm
+(define_insn "rscsi3_<CC_EXTEND>out_scratch"
+  [(set (reg:CC_SWP CC_REGNUM)
+	(compare:CC_SWP
+	 (plus:DI (SE:DI (match_operand:SI 2 "s_register_operand" "r"))
+		  (match_operand:DI 3 "arm_borrow_operation" ""))
+	 (match_operand 1 "arm_immediate_operand" "I")))
+   (clobber (match_scratch:SI 0 "=r"))]
+  "TARGET_ARM"
+  "rscs\\t%0, %2, %1"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
+)
+
 (define_expand "subsf3"
   [(set (match_operand:SF           0 "s_register_operand")
 	(minus:SF (match_operand:SF 1 "s_register_operand")
-- 
cgit v1.1


From f9f6247d14dde9cd7202743ec60d253050a60d58 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:03:58 +0000
Subject: [arm] Cleanup dead code - old support for DImode comparisons

Now that all the major patterns for DImode have been converted to
early expansion, we can safely clean up some dead code for the old way
of handling DImode.

	* config/arm/arm-modes.def (CC_NCV, CC_CZ): Delete CC modes.
	* config/arm/arm.c (arm_select_cc_mode): Remove old selection code
	for DImode operands.
	(arm_gen_dicompare_reg): Remove unreachable expansion code.
	(maybe_get_arm_condition_code): Remove support for CC_CZmode and
	CC_NCVmode.
	* config/arm/arm.md (arm_cmpdi_insn): Delete.
	(arm_cmpdi_unsigned): Delete.

From-SVN: r277181
---
 gcc/ChangeLog                |  11 ++++
 gcc/config/arm/arm-modes.def |   5 --
 gcc/config/arm/arm.c         | 147 +------------------------------------------
 gcc/config/arm/arm.md        |  45 -------------
 4 files changed, 12 insertions(+), 196 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4b1811..7c015cd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm-modes.def (CC_NCV, CC_CZ): Delete CC modes.
+	* config/arm/arm.c (arm_select_cc_mode): Remove old selection code
+	for DImode operands.
+	(arm_gen_dicompare_reg): Remove unreachable expansion code.
+	(maybe_get_arm_condition_code): Remove support for CC_CZmode and
+	CC_NCVmode.
+	* config/arm/arm.md (arm_cmpdi_insn): Delete.
+	(arm_cmpdi_unsigned): Delete.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.c (arm_const_double_prefer_rsbs_rsc): New function.
 	(arm_canonicalize_comparison): For GT/LE/GTU/GEU, use the constant
 	unchanged only if that will be cheaper.
diff --git a/gcc/config/arm/arm-modes.def b/gcc/config/arm/arm-modes.def
index 65cddf6..f0eb841 100644
--- a/gcc/config/arm/arm-modes.def
+++ b/gcc/config/arm/arm-modes.def
@@ -36,12 +36,9 @@ ADJUST_FLOAT_FORMAT (HF, ((arm_fp16_format == ARM_FP16_FORMAT_ALTERNATIVE)
    CC_Nmode should be used if only the N (sign) flag is set correctly
    CC_NVmode should be used if only the N and V bits are set correctly,
      (used for signed comparisons when the carry is propagated in).
-   CC_CZmode should be used if only the C and Z flags are correct
-   (used for DImode unsigned comparisons).
    CC_RSBmode should be used where the comparison is set by an RSB immediate,
      or NEG instruction.  The form of the comparison for (const - reg) will
      be (COMPARE (not (reg)) (~const)).
-   CC_NCVmode should be used if only the N, C, and V flags are correct
    CC_Bmode should be used if only the C flag is correct after a subtract
      (eg after an unsigned borrow with carry-in propagation).
    (used for DImode signed comparisons).
@@ -49,8 +46,6 @@ ADJUST_FLOAT_FORMAT (HF, ((arm_fp16_format == ARM_FP16_FORMAT_ALTERNATIVE)
 
 CC_MODE (CC_NOOV);
 CC_MODE (CC_Z);
-CC_MODE (CC_CZ);
-CC_MODE (CC_NCV);
 CC_MODE (CC_NV);
 CC_MODE (CC_SWP);
 CC_MODE (CC_RSB);
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 55fd16d..6c1e913 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15403,56 +15403,6 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 	  || arm_borrow_operation (y, DImode)))
     return CC_Bmode;
 
-  if (GET_MODE (x) == DImode || GET_MODE (y) == DImode)
-    {
-      switch (op)
-	{
-	case EQ:
-	case NE:
-	  /* A DImode comparison against zero can be implemented by
-	     or'ing the two halves together.  We can also handle
-	     immediates where one word of that value is zero by
-	     subtracting the non-zero word from the corresponding word
-	     in the other register and then ORRing it with the other
-	     word.  */
-	  if (CONST_INT_P (y)
-	      && ((UINTVAL (y) & 0xffffffff) == 0
-		  || (UINTVAL (y) >> 32) == 0))
-	    return CC_Zmode;
-
-	  /* We can do an equality test in three Thumb instructions.  */
-	  if (!TARGET_32BIT)
-	    return CC_Zmode;
-
-	  /* FALLTHROUGH */
-
-	case LTU:
-	case LEU:
-	case GTU:
-	case GEU:
-	  /* DImode unsigned comparisons can be implemented by cmp +
-	     cmpeq without a scratch register.  Not worth doing in
-	     Thumb-2.  */
-	  if (TARGET_32BIT)
-	    return CC_CZmode;
-
-	  /* FALLTHROUGH */
-
-	case LT:
-	case LE:
-	case GT:
-	case GE:
-	  /* DImode signed and unsigned comparisons can be implemented
-	     by cmp + sbcs with a scratch register, but that does not
-	     set the Z flag - we must reverse GT/LE/GTU/LEU.  */
-	  gcc_assert (op != EQ && op != NE);
-	  return CC_NCVmode;
-
-	default:
-	  gcc_unreachable ();
-	}
-    }
-
   if (GET_MODE_CLASS (GET_MODE (x)) == MODE_CC)
     return GET_MODE (x);
 
@@ -15673,81 +15623,8 @@ arm_gen_dicompare_reg (rtx_code code, rtx x, rtx y, rtx scratch)
       }
 
     default:
-      break;
-    }
-
-  /* We might have X as a constant, Y as a register because of the predicates
-     used for cmpdi.  If so, force X to a register here.  */
-  if (!REG_P (x))
-    x = force_reg (DImode, x);
-
-  mode = SELECT_CC_MODE (code, x, y);
-  cc_reg = gen_rtx_REG (mode, CC_REGNUM);
-
-  if (mode != CC_CZmode)
-    {
-      rtx clobber, set;
-
-      /* To compare two non-zero values for equality, XOR them and
-	 then compare against zero.  Not used for ARM mode; there
-	 CC_CZmode is cheaper.  */
-      if (mode == CC_Zmode)
-	{
-	  mode = CC_NOOVmode;
-	  PUT_MODE (cc_reg, mode);
-	  if (y != const0_rtx)
-	    {
-	      gcc_assert (CONST_INT_P (y));
-	      rtx xlo, xhi, ylo, yhi;
-	      arm_decompose_di_binop (x, y, &xlo, &xhi, &ylo, &yhi);
-	      if (!scratch)
-		scratch = gen_reg_rtx (SImode);
-	      if (ylo == const0_rtx)
-		{
-		  yhi = gen_int_mode (-INTVAL (yhi), SImode);
-		  if (!arm_add_operand (yhi, SImode))
-		    yhi = force_reg (SImode, yhi);
-		  emit_insn (gen_addsi3 (scratch, xhi, yhi));
-		  y = xlo;
-		}
-	      else
-		{
-		  gcc_assert (yhi == const0_rtx);
-		  ylo = gen_int_mode (-INTVAL (ylo), SImode);
-		  if (!arm_add_operand (ylo, SImode))
-		    ylo = force_reg (SImode, ylo);
-		  emit_insn (gen_addsi3 (scratch, xlo, ylo));
-		  y = xhi;
-		}
-	      x = gen_rtx_IOR (SImode, scratch, y);
-	      y = const0_rtx;
-	    }
-	  else
-	    x = gen_rtx_IOR (SImode, gen_lowpart (SImode, x),
-			     gen_highpart (SImode, x));
-	}
-      else if (!cmpdi_operand (y, mode))
-	y = force_reg (DImode, y);
-
-      /* A scratch register is required.  */
-      if (reload_completed)
-	gcc_assert (scratch != NULL && GET_MODE (scratch) == SImode);
-      else
-	scratch = gen_rtx_SCRATCH (SImode);
-
-      clobber = gen_rtx_CLOBBER (VOIDmode, scratch);
-      set = gen_rtx_SET (cc_reg, gen_rtx_COMPARE (mode, x, y));
-      emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set, clobber)));
-    }
-  else
-    {
-      if (!cmpdi_operand (y, mode))
-	y = force_reg (DImode, y);
-
-      emit_set_insn (cc_reg, gen_rtx_COMPARE (mode, x, y));
+      gcc_unreachable ();
     }
-
-  return cc_reg;
 }
 
 /* X and Y are two things to compare using CODE.  Emit the compare insn and
@@ -24051,28 +23928,6 @@ maybe_get_arm_condition_code (rtx comparison)
 	default: return ARM_NV;
 	}
 
-    case E_CC_CZmode:
-      switch (comp_code)
-	{
-	case NE: return ARM_NE;
-	case EQ: return ARM_EQ;
-	case GEU: return ARM_CS;
-	case GTU: return ARM_HI;
-	case LEU: return ARM_LS;
-	case LTU: return ARM_CC;
-	default: return ARM_NV;
-	}
-
-    case E_CC_NCVmode:
-      switch (comp_code)
-	{
-	case GE: return ARM_GE;
-	case LT: return ARM_LT;
-	case GEU: return ARM_CS;
-	case LTU: return ARM_CC;
-	default: return ARM_NV;
-	}
-
     case E_CC_NVmode:
       switch (comp_code)
 	{
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 8607c6f..eaadfd6 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -6545,51 +6545,6 @@
    (set_attr "predicable" "yes")]
 )
 
-;; DImode comparisons.  The generic code generates branches that
-;; if-conversion cannot reduce to a conditional compare, so we do
-;; that directly.
-
-(define_insn "*arm_cmpdi_insn"
-  [(set (reg:CC_NCV CC_REGNUM)
-	(compare:CC_NCV (match_operand:DI 0 "s_register_operand" "r")
-			(match_operand:DI 1 "arm_di_operand"	   "rDi")))
-   (clobber (match_scratch:SI 2 "=r"))]
-  "TARGET_32BIT"
-  "cmp\\t%Q0, %Q1\;sbcs\\t%2, %R0, %R1"
-  [(set_attr "conds" "set")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
-(define_insn_and_split "*arm_cmpdi_unsigned"
-  [(set (reg:CC_CZ CC_REGNUM)
-        (compare:CC_CZ (match_operand:DI 0 "s_register_operand" "l,r,r,r")
-                       (match_operand:DI 1 "arm_di_operand"     "Py,r,Di,rDi")))]
-
-  "TARGET_32BIT"
-  "#"   ; "cmp\\t%R0, %R1\;it eq\;cmpeq\\t%Q0, %Q1"
-  "&& reload_completed"
-  [(set (reg:CC CC_REGNUM)
-        (compare:CC (match_dup 2) (match_dup 3)))
-   (cond_exec (eq:SI (reg:CC CC_REGNUM) (const_int 0))
-              (set (reg:CC CC_REGNUM)
-                   (compare:CC (match_dup 0) (match_dup 1))))]
-  {
-    operands[2] = gen_highpart (SImode, operands[0]);
-    operands[0] = gen_lowpart (SImode, operands[0]);
-    if (CONST_INT_P (operands[1]))
-      operands[3] = gen_highpart_mode (SImode, DImode, operands[1]);
-    else
-      operands[3] = gen_highpart (SImode, operands[1]);
-    operands[1] = gen_lowpart (SImode, operands[1]);
-  }
-  [(set_attr "conds" "set")
-   (set_attr "enabled_for_short_it" "yes,yes,no,*")
-   (set_attr "arch" "t2,t2,t2,a")
-   (set_attr "length" "6,6,10,8")
-   (set_attr "type" "multiple")]
-)
-
 ; This insn allows redundant compares to be removed by cse, nothing should
 ; ever appear in the output file since (set (reg x) (reg x)) is a no-op that
 ; is deleted later on. The match_dup will match the mode here, so that
-- 
cgit v1.1


From ed6588f239790be8437515ca2dc5e44568963342 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:06 +0000
Subject: [arm] Handle immediate values in uaddvsi4

The uaddv patterns in the arm back-end do not currenty handle immediates
during expansion.  This patch adds this support for uaddvsi4.  It's really
a stepping-stone towards early expansion of uaddvdi4, but it complete and
a useful change in its own right.

Whilst making this change I also observed that we really had two patterns
that did exactly the same thing, but with slightly different properties;
consequently I've cleaned up all of the add-and-compare patterns to bring
some consistency.

	* config/arm/arm.md (adddi3): Call gen_addsi3_compare_op1.
	* (uaddv<mode>4): Delete expansion pattern.
	(uaddvsi4): New pattern.
	(uaddvdi4): Likewise.
	(addsi3_compareC): Delete pattern, change callers to use
	addsi3_compare_op1.
	(addsi3_compare_op1): No-longer anonymous.  Clean up constraints to
	reduce the number of alternatives and re-work type attribute handling.
	(addsi3_compare_op2): Clean up constraints to reduce the number of
	alternatives and re-work type attribute handling.
	(compare_addsi2_op0): Likewise.
	(compare_addsi2_op1): Likewise.

From-SVN: r277182
---
 gcc/ChangeLog         |  15 +++++++
 gcc/config/arm/arm.md | 118 ++++++++++++++++++++++++++------------------------
 2 files changed, 77 insertions(+), 56 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c015cd..3b8f9f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,20 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (adddi3): Call gen_addsi3_compare_op1.
+	* (uaddv<mode>4): Delete expansion pattern.
+	(uaddvsi4): New pattern.
+	(uaddvdi4): Likewise.
+	(addsi3_compareC): Delete pattern, change callers to use
+	addsi3_compare_op1.
+	(addsi3_compare_op1): No-longer anonymous.  Clean up constraints to
+	reduce the number of alternatives and re-work type attribute handling.
+	(addsi3_compare_op2): Clean up constraints to reduce the number of
+	alternatives and re-work type attribute handling.
+	(compare_addsi2_op0): Likewise.
+	(compare_addsi2_op1): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm-modes.def (CC_NCV, CC_CZ): Delete CC modes.
 	* config/arm/arm.c (arm_select_cc_mode): Remove old selection code
 	for DImode operands.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index eaadfd6..4ea6f4b 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -470,7 +470,7 @@
 	  if (!arm_not_operand (hi_op2, SImode))
 	    hi_op2 = force_reg (SImode, hi_op2);
 
-	  emit_insn (gen_addsi3_compareC (lo_dest, lo_op1, lo_op2));
+	  emit_insn (gen_addsi3_compare_op1 (lo_dest, lo_op1, lo_op2));
 	  rtx carry = gen_rtx_LTU (SImode, gen_rtx_REG (CC_Cmode, CC_REGNUM),
 				   const0_rtx);
 	  if (hi_op2 == const0_rtx)
@@ -501,14 +501,27 @@
   DONE;
 })
 
-(define_expand "uaddv<mode>4"
-  [(match_operand:SIDI 0 "register_operand")
-   (match_operand:SIDI 1 "register_operand")
-   (match_operand:SIDI 2 "register_operand")
+(define_expand "uaddvsi4"
+  [(match_operand:SI 0 "s_register_operand")
+   (match_operand:SI 1 "s_register_operand")
+   (match_operand:SI 2 "arm_add_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_add<mode>3_compareC (operands[0], operands[1], operands[2]));
+  emit_insn (gen_addsi3_compare_op1 (operands[0], operands[1], operands[2]));
+  arm_gen_unlikely_cbranch (LTU, CC_Cmode, operands[3]);
+
+  DONE;
+})
+
+(define_expand "uaddvdi4"
+  [(match_operand:DI 0 "s_register_operand")
+   (match_operand:DI 1 "s_register_operand")
+   (match_operand:DI 2 "s_register_operand")
+   (match_operand 3 "")]
+  "TARGET_32BIT"
+{
+  emit_insn (gen_adddi3_compareC (operands[0], operands[1], operands[2]));
   arm_gen_unlikely_cbranch (LTU, CC_Cmode, operands[3]);
 
   DONE;
@@ -639,19 +652,6 @@
    (set_attr "type" "multiple")]
 )
 
-(define_insn "addsi3_compareC"
-   [(set (reg:CC_C CC_REGNUM)
-	 (compare:CC_C (plus:SI (match_operand:SI 1 "register_operand" "r")
-				(match_operand:SI 2 "register_operand" "r"))
-		       (match_dup 1)))
-    (set (match_operand:SI 0 "register_operand" "=r")
-	 (plus:SI (match_dup 1) (match_dup 2)))]
-  "TARGET_32BIT"
-  "adds%?\\t%0, %1, %2"
-  [(set_attr "conds" "set")
-   (set_attr "type" "alus_sreg")]
-)
-
 (define_insn "addsi3_compare0"
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
@@ -770,13 +770,13 @@
 ;; the operands, and we know that the use of the condition code is
 ;; either GEU or LTU, so we can use the carry flag from the addition
 ;; instead of doing the compare a second time.
-(define_insn "*addsi3_compare_op1"
+(define_insn "addsi3_compare_op1"
   [(set (reg:CC_C CC_REGNUM)
 	(compare:CC_C
-	 (plus:SI (match_operand:SI 1 "s_register_operand" "l,0,l,0,r,r,r")
-		  (match_operand:SI 2 "arm_add_operand" "lPd,Py,lPx,Pw,I,L,r"))
+	 (plus:SI (match_operand:SI 1 "s_register_operand" "l,0,l,0,rk,rk")
+		  (match_operand:SI 2 "arm_add_operand" "lPd,Py,lPx,Pw,rkI,L"))
 	 (match_dup 1)))
-   (set (match_operand:SI 0 "s_register_operand" "=l,l,l,l,r,r,r")
+   (set (match_operand:SI 0 "s_register_operand" "=l,l,l,l,rk,rk")
 	(plus:SI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
   "@
@@ -785,22 +785,23 @@
    subs%?\\t%0, %1, #%n2
    subs%?\\t%0, %0, #%n2
    adds%?\\t%0, %1, %2
-   subs%?\\t%0, %1, #%n2
-   adds%?\\t%0, %1, %2"
+   subs%?\\t%0, %1, #%n2"
   [(set_attr "conds" "set")
-   (set_attr "arch" "t2,t2,t2,t2,*,*,*")
-   (set_attr "length" "2,2,2,2,4,4,4")
-   (set_attr "type"
-    "alus_sreg,alus_imm,alus_sreg,alus_imm,alus_imm,alus_imm,alus_sreg")]
+   (set_attr "arch" "t2,t2,t2,t2,*,*")
+   (set_attr "length" "2,2,2,2,4,4")
+   (set (attr "type")
+	(if_then_else (match_operand 2 "const_int_operand")
+		      (const_string "alu_imm")
+		      (const_string "alu_sreg")))]
 )
 
 (define_insn "*addsi3_compare_op2"
   [(set (reg:CC_C CC_REGNUM)
 	(compare:CC_C
-	 (plus:SI (match_operand:SI 1 "s_register_operand" "l,0,l,0,r,r,r")
-		  (match_operand:SI 2 "arm_add_operand" "lPd,Py,lPx,Pw,I,L,r"))
+	 (plus:SI (match_operand:SI 1 "s_register_operand" "l,0,l,0,r,r")
+		  (match_operand:SI 2 "arm_add_operand" "lPd,Py,lPx,Pw,rI,L"))
 	 (match_dup 2)))
-   (set (match_operand:SI 0 "s_register_operand" "=l,l,l,l,r,r,r")
+   (set (match_operand:SI 0 "s_register_operand" "=l,l,l,l,r,r")
 	(plus:SI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
   "@
@@ -809,55 +810,60 @@
    subs%?\\t%0, %1, #%n2
    subs%?\\t%0, %0, #%n2
    adds%?\\t%0, %1, %2
-   subs%?\\t%0, %1, #%n2
-   adds%?\\t%0, %1, %2"
+   subs%?\\t%0, %1, #%n2"
   [(set_attr "conds" "set")
-   (set_attr "arch" "t2,t2,t2,t2,*,*,*")
-   (set_attr "length" "2,2,2,2,4,4,4")
-   (set_attr "type"
-    "alus_sreg,alus_imm,alus_sreg,alus_imm,alus_imm,alus_imm,alus_sreg")]
+   (set_attr "arch" "t2,t2,t2,t2,*,*")
+   (set_attr "length" "2,2,2,2,4,4")
+   (set (attr "type")
+	(if_then_else (match_operand 2 "const_int_operand")
+		      (const_string "alu_imm")
+		      (const_string "alu_sreg")))]
 )
 
 (define_insn "*compare_addsi2_op0"
   [(set (reg:CC_C CC_REGNUM)
         (compare:CC_C
-          (plus:SI (match_operand:SI 0 "s_register_operand" "l,l,r,r,r")
-                   (match_operand:SI 1 "arm_add_operand" "Pv,l,I,L,r"))
+          (plus:SI (match_operand:SI 0 "s_register_operand" "l,l,r,r")
+                   (match_operand:SI 1 "arm_add_operand"    "l,Pw,rI,L"))
           (match_dup 0)))]
   "TARGET_32BIT"
   "@
-   cmp%?\\t%0, #%n1
-   cmn%?\\t%0, %1
    cmn%?\\t%0, %1
    cmp%?\\t%0, #%n1
-   cmn%?\\t%0, %1"
+   cmn%?\\t%0, %1
+   cmp%?\\t%0, #%n1"
   [(set_attr "conds" "set")
    (set_attr "predicable" "yes")
-   (set_attr "arch" "t2,t2,*,*,*")
-   (set_attr "predicable_short_it" "yes,yes,no,no,no")
-   (set_attr "length" "2,2,4,4,4")
-   (set_attr "type" "alus_imm,alus_sreg,alus_imm,alus_imm,alus_sreg")]
+   (set_attr "arch" "t2,t2,*,*")
+   (set_attr "predicable_short_it" "yes,yes,no,no")
+   (set_attr "length" "2,2,4,4")
+   (set (attr "type")
+	(if_then_else (match_operand 1 "const_int_operand")
+		      (const_string "alu_imm")
+		      (const_string "alu_sreg")))]
 )
 
 (define_insn "*compare_addsi2_op1"
   [(set (reg:CC_C CC_REGNUM)
         (compare:CC_C
-          (plus:SI (match_operand:SI 0 "s_register_operand" "l,l,r,r,r")
-                   (match_operand:SI 1 "arm_add_operand" "Pv,l,I,L,r"))
+          (plus:SI (match_operand:SI 0 "s_register_operand" "l,l,r,r")
+                   (match_operand:SI 1 "arm_add_operand" "l,Pw,rI,L"))
           (match_dup 1)))]
   "TARGET_32BIT"
   "@
-   cmp%?\\t%0, #%n1
-   cmn%?\\t%0, %1
    cmn%?\\t%0, %1
    cmp%?\\t%0, #%n1
-   cmn%?\\t%0, %1"
+   cmn%?\\t%0, %1
+   cmp%?\\t%0, #%n1"
   [(set_attr "conds" "set")
    (set_attr "predicable" "yes")
-   (set_attr "arch" "t2,t2,*,*,*")
-   (set_attr "predicable_short_it" "yes,yes,no,no,no")
-   (set_attr "length" "2,2,4,4,4")
-   (set_attr "type" "alus_imm,alus_sreg,alus_imm,alus_imm,alus_sreg")]
+   (set_attr "arch" "t2,t2,*,*")
+   (set_attr "predicable_short_it" "yes,yes,no,no")
+   (set_attr "length" "2,2,4,4")
+   (set (attr "type")
+	(if_then_else (match_operand 1 "const_int_operand")
+		      (const_string "alu_imm")
+		      (const_string "alu_sreg")))]
  )
 
 (define_insn "addsi3_carryin"
-- 
cgit v1.1


From deb254e029c9430a0c3d0cb044e4ca7b3f15b619 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:15 +0000
Subject: [arm] Early expansion of uaddvdi4.

This code borrows strongly on the uaddvti4 expansion for aarch64 since
the principles are similar.  Firstly, if the one of the low words of
the expansion is 0, we can simply copy the other low word to the
destination and use uaddvsi4 for the upper word.  If that doesn't work
we have to handle three possible cases for the upper work (the lower
word is simply an add-with-carry operation as for adddi3): zero in the
upper word, some other constant and a register (each has a different
canonicalization).  We use CC_ADCmode (a new CC mode variant) to
describe the cases as the introduction of the carry means we can
no-longer use the normal overflow trick of comparing the sum against
one of the operands.

	* config/arm/arm-modes.def (CC_ADC): New CC mode.
	* config/arm/arm.c (arm_select_cc_mode): Detect selection of
	CC_ADCmode.
	(maybe_get_arm_condition_code): Handle CC_ADCmode.
	* config/arm/arm.md (uaddvdi4): Early expansion of unsigned addition
	with overflow.
	(addsi3_cin_cout_reg, addsi3_cin_cout_imm, addsi3_cin_cout_0): New
	expand patterns.
	(addsi3_cin_cout_reg_insn, addsi3_cin_cout_0_insn): New insn patterns
	(addsi3_cin_cout_imm_insn): Likewise.
	(adddi3_compareC): Delete insn.
	* config/arm/predicates.md (arm_carry_operation): Handle CC_ADCmode.

From-SVN: r277183
---
 gcc/ChangeLog                |  15 ++++
 gcc/config/arm/arm-modes.def |   4 +
 gcc/config/arm/arm.c         |  16 ++++
 gcc/config/arm/arm.md        | 171 ++++++++++++++++++++++++++++++++++++++-----
 gcc/config/arm/predicates.md |   2 +-
 5 files changed, 188 insertions(+), 20 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b8f9f3..902cf51 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,20 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm-modes.def (CC_ADC): New CC mode.
+	* config/arm/arm.c (arm_select_cc_mode): Detect selection of
+	CC_ADCmode.
+	(maybe_get_arm_condition_code): Handle CC_ADCmode.
+	* config/arm/arm.md (uaddvdi4): Early expansion of unsigned addition
+	with overflow.
+	(addsi3_cin_cout_reg, addsi3_cin_cout_imm, addsi3_cin_cout_0): New
+	expand patterns.
+	(addsi3_cin_cout_reg_insn, addsi3_cin_cout_0_insn): New insn patterns
+	(addsi3_cin_cout_imm_insn): Likewise.
+	(adddi3_compareC): Delete insn.
+	* config/arm/predicates.md (arm_carry_operation): Handle CC_ADCmode.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (adddi3): Call gen_addsi3_compare_op1.
 	* (uaddv<mode>4): Delete expansion pattern.
 	(uaddvsi4): New pattern.
diff --git a/gcc/config/arm/arm-modes.def b/gcc/config/arm/arm-modes.def
index f0eb841..a6b520d 100644
--- a/gcc/config/arm/arm-modes.def
+++ b/gcc/config/arm/arm-modes.def
@@ -42,6 +42,9 @@ ADJUST_FLOAT_FORMAT (HF, ((arm_fp16_format == ARM_FP16_FORMAT_ALTERNATIVE)
    CC_Bmode should be used if only the C flag is correct after a subtract
      (eg after an unsigned borrow with carry-in propagation).
    (used for DImode signed comparisons).
+   CC_ADCmode is used when the carry is formed from the output of ADC for an
+     addtion.  In this case we cannot use the trick of comparing the sum
+     against one of the other operands.
    CCmode should be used otherwise.  */
 
 CC_MODE (CC_NOOV);
@@ -65,6 +68,7 @@ CC_MODE (CC_C);
 CC_MODE (CC_B);
 CC_MODE (CC_N);
 CC_MODE (CC_V);
+CC_MODE (CC_ADC);
 
 /* Vector modes.  */
 VECTOR_MODES (INT, 4);        /*            V4QI V2HI */
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 6c1e913..fb1a681 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15388,6 +15388,14 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
     return CC_Cmode;
 
   if (GET_MODE (x) == DImode
+      && GET_CODE (x) == PLUS
+      && GET_CODE (XEXP (x, 1)) == ZERO_EXTEND
+      && CONST_INT_P (y)
+      && UINTVAL (y) == 0x800000000
+      && (op == GEU || op == LTU))
+    return CC_ADCmode;
+
+  if (GET_MODE (x) == DImode
       && (op == GE || op == LT)
       && GET_CODE (x) == SIGN_EXTEND
       && ((GET_CODE (y) == PLUS
@@ -23952,6 +23960,14 @@ maybe_get_arm_condition_code (rtx comparison)
 	default: return ARM_NV;
 	}
 
+    case E_CC_ADCmode:
+      switch (comp_code)
+	{
+	case GEU: return ARM_CS;
+	case LTU: return ARM_CC;
+	default: return ARM_NV;
+	}
+
     case E_CCmode:
     case E_CC_RSBmode:
       switch (comp_code)
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 4ea6f4b..9f0e435 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -517,16 +517,165 @@
 (define_expand "uaddvdi4"
   [(match_operand:DI 0 "s_register_operand")
    (match_operand:DI 1 "s_register_operand")
-   (match_operand:DI 2 "s_register_operand")
+   (match_operand:DI 2 "reg_or_int_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_adddi3_compareC (operands[0], operands[1], operands[2]));
-  arm_gen_unlikely_cbranch (LTU, CC_Cmode, operands[3]);
+  rtx lo_result, hi_result;
+  rtx lo_op1, hi_op1, lo_op2, hi_op2;
+  arm_decompose_di_binop (operands[1], operands[2], &lo_op1, &hi_op1,
+			  &lo_op2, &hi_op2);
+  lo_result = gen_lowpart (SImode, operands[0]);
+  hi_result = gen_highpart (SImode, operands[0]);
+
+  if (lo_op2 == const0_rtx)
+    {
+      emit_move_insn (lo_result, lo_op1);
+      if (!arm_add_operand (hi_op2, SImode))
+	hi_op2 = force_reg (SImode, hi_op2);
+
+      gen_uaddvsi4 (hi_result, hi_op1, hi_op2, operands[3]);
+    }
+  else
+    {
+      if (!arm_add_operand (lo_op2, SImode))
+	lo_op2 = force_reg (SImode, lo_op2);
+      if (!arm_not_operand (hi_op2, SImode))
+	hi_op2 = force_reg (SImode, hi_op2);
+
+      emit_insn (gen_addsi3_compare_op1 (lo_result, lo_op1, lo_op2));
+
+      if (hi_op2 == const0_rtx)
+        emit_insn (gen_addsi3_cin_cout_0 (hi_result, hi_op1));
+      else if (CONST_INT_P (hi_op2))
+        emit_insn (gen_addsi3_cin_cout_imm (hi_result, hi_op1, hi_op2));
+      else
+        emit_insn (gen_addsi3_cin_cout_reg (hi_result, hi_op1, hi_op2));
+
+      arm_gen_unlikely_cbranch (GEU, CC_ADCmode, operands[3]);
+    }
 
   DONE;
 })
 
+(define_expand "addsi3_cin_cout_reg"
+  [(parallel
+    [(set (match_dup 3)
+	  (compare:CC_ADC
+	   (plus:DI
+	    (plus:DI (match_dup 4)
+		     (zero_extend:DI (match_operand:SI 1 "s_register_operand")))
+	    (zero_extend:DI (match_operand:SI 2 "s_register_operand")))
+	   (const_int 4294967296)))
+     (set (match_operand:SI 0 "s_register_operand")
+	  (plus:SI (plus:SI (match_dup 5) (match_dup 1))
+		   (match_dup 2)))])]
+  "TARGET_32BIT"
+  {
+    operands[3] = gen_rtx_REG (CC_ADCmode, CC_REGNUM);
+    rtx ccin = gen_rtx_REG (CC_Cmode, CC_REGNUM);
+    operands[4] = gen_rtx_LTU (DImode, ccin, const0_rtx);
+    operands[5] = gen_rtx_LTU (SImode, ccin, const0_rtx);
+  }
+)
+
+(define_insn "*addsi3_cin_cout_reg_insn"
+  [(set (reg:CC_ADC CC_REGNUM)
+	(compare:CC_ADC
+	 (plus:DI
+	  (plus:DI
+	   (match_operand:DI 3 "arm_carry_operation" "")
+	   (zero_extend:DI (match_operand:SI 1 "s_register_operand" "%0,r")))
+	  (zero_extend:DI (match_operand:SI 2 "s_register_operand" "l,r")))
+	(const_int 4294967296)))
+   (set (match_operand:SI 0 "s_register_operand" "=l,r")
+	(plus:SI (plus:SI (match_operand:SI 4 "arm_carry_operation" "")
+			  (match_dup 1))
+		 (match_dup 2)))]
+  "TARGET_32BIT"
+  "@
+   adcs%?\\t%0, %0, %2
+   adcs%?\\t%0, %1, %2"
+  [(set_attr "type" "alus_sreg")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")]
+)
+
+(define_expand "addsi3_cin_cout_imm"
+  [(parallel
+    [(set (match_dup 3)
+	  (compare:CC_ADC
+	   (plus:DI
+	    (plus:DI (match_dup 4)
+		     (zero_extend:DI (match_operand:SI 1 "s_register_operand")))
+	    (match_dup 6))
+	   (const_int 4294967296)))
+     (set (match_operand:SI 0 "s_register_operand")
+	  (plus:SI (plus:SI (match_dup 5) (match_dup 1))
+		   (match_operand:SI 2 "arm_adcimm_operand")))])]
+  "TARGET_32BIT"
+  {
+    operands[3] = gen_rtx_REG (CC_ADCmode, CC_REGNUM);
+    rtx ccin = gen_rtx_REG (CC_Cmode, CC_REGNUM);
+    operands[4] = gen_rtx_LTU (DImode, ccin, const0_rtx);
+    operands[5] = gen_rtx_LTU (SImode, ccin, const0_rtx);
+    operands[6] = GEN_INT (UINTVAL (operands[2]) & 0xffffffff);
+  }
+)
+
+(define_insn "*addsi3_cin_cout_imm_insn"
+  [(set (reg:CC_ADC CC_REGNUM)
+	(compare:CC_ADC
+	 (plus:DI
+	  (plus:DI
+	   (match_operand:DI 3 "arm_carry_operation" "")
+	   (zero_extend:DI (match_operand:SI 1 "s_register_operand" "r,r")))
+	  (match_operand:DI 5 "const_int_operand" "n,n"))
+	(const_int 4294967296)))
+   (set (match_operand:SI 0 "s_register_operand" "=r,r")
+	(plus:SI (plus:SI (match_operand:SI 4 "arm_carry_operation" "")
+			  (match_dup 1))
+		 (match_operand:SI 2 "arm_adcimm_operand" "I,K")))]
+  "TARGET_32BIT
+   && (UINTVAL (operands[2]) & 0xffffffff) == UINTVAL (operands[5])"
+  "@
+   adcs%?\\t%0, %1, %2
+   sbcs%?\\t%0, %1, #%B2"
+  [(set_attr "type" "alus_imm")]
+)
+
+(define_expand "addsi3_cin_cout_0"
+  [(parallel
+    [(set (match_dup 2)
+	  (compare:CC_ADC
+	   (plus:DI (match_dup 3)
+		    (zero_extend:DI (match_operand:SI 1 "s_register_operand")))
+	   (const_int 4294967296)))
+     (set (match_operand:SI 0 "s_register_operand")
+	  (plus:SI (match_dup 4) (match_dup 1)))])]
+  "TARGET_32BIT"
+  {
+    operands[2] = gen_rtx_REG (CC_ADCmode, CC_REGNUM);
+    rtx ccin = gen_rtx_REG (CC_Cmode, CC_REGNUM);
+    operands[3] = gen_rtx_LTU (DImode, ccin, const0_rtx);
+    operands[4] = gen_rtx_LTU (SImode, ccin, const0_rtx);
+  }
+)
+
+(define_insn "*addsi3_cin_cout_0_insn"
+  [(set (reg:CC_ADC CC_REGNUM)
+	(compare:CC_ADC
+	 (plus:DI
+	  (match_operand:DI 2 "arm_carry_operation" "")
+	  (zero_extend:DI (match_operand:SI 1 "s_register_operand" "r")))
+	(const_int 4294967296)))
+   (set (match_operand:SI 0 "s_register_operand" "=r")
+	(plus:SI (match_operand:SI 3 "arm_carry_operation" "") (match_dup 1)))]
+  "TARGET_32BIT"
+  "adcs%?\\t%0, %1, #0"
+  [(set_attr "type" "alus_imm")]
+)
+
 (define_expand "addsi3"
   [(set (match_operand:SI          0 "s_register_operand")
 	(plus:SI (match_operand:SI 1 "s_register_operand")
@@ -636,22 +785,6 @@
    (set_attr "type" "alus_sreg")]
 )
 
-(define_insn "adddi3_compareC"
-  [(set (reg:CC_C CC_REGNUM)
-	(compare:CC_C
-	  (plus:DI
-	    (match_operand:DI 1 "register_operand" "r")
-	    (match_operand:DI 2 "register_operand" "r"))
-	  (match_dup 1)))
-   (set (match_operand:DI 0 "register_operand" "=&r")
-	(plus:DI (match_dup 1) (match_dup 2)))]
-  "TARGET_32BIT"
-  "adds\\t%Q0, %Q1, %Q2;adcs\\t%R0, %R1, %R2"
- [(set_attr "conds" "set")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
 (define_insn "addsi3_compare0"
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md
index d9470df..8a8f10c 100644
--- a/gcc/config/arm/predicates.md
+++ b/gcc/config/arm/predicates.md
@@ -376,7 +376,7 @@
     machine_mode ccmode = GET_MODE (op0);
     if (ccmode == CC_Cmode)
       return GET_CODE (op) == LTU;
-    else if (ccmode == CCmode || ccmode == CC_RSBmode)
+    else if (ccmode == CCmode || ccmode == CC_RSBmode || ccmode == CC_ADCmode)
       return GET_CODE (op) == GEU;
 
     return false;
-- 
cgit v1.1


From dbba8a1707ffe25375282e0a075e7dff8d41ef90 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:22 +0000
Subject: [arm] Improve code generation for addvsi4.

Similar to the improvements for uaddvsi4, this patch improves the code
generation for addvsi4 to handle immediates and to add alternatives
that better target thumb2.  To do this we separate out the expansion
of uaddvsi4 from that of uaddvdi4 and then add an additional pattern
to handle constants.  Also, while doing this I've fixed the incorrect
usage of NE instead of COMPARE in the generated RTL.

	* config/arm/arm.md (addv<mode>4): Delete.
	(addvsi4): New pattern.  Handle immediate values that the architecture
	supports.
	(addvdi4): New pattern.
	(addsi3_compareV): Rename to ...
	(addsi3_compareV_reg): ... this.  Add constraints for thumb2 variants
	and use COMPARE rather than NE.
	(addsi3_compareV_imm): New pattern.
	* config/arm/arm.c (arm_select_cc_mode): Return CC_Vmode for
	a signed-overflow check.

From-SVN: r277184
---
 gcc/ChangeLog         | 13 +++++++++++
 gcc/config/arm/arm.c  |  8 +++++++
 gcc/config/arm/arm.md | 63 +++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 74 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 902cf51..4c82758 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,18 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (addv<mode>4): Delete.
+	(addvsi4): New pattern.  Handle immediate values that the architecture
+	supports.
+	(addvdi4): New pattern.
+	(addsi3_compareV): Rename to ...
+	(addsi3_compareV_reg): ... this.  Add constraints for thumb2 variants
+	and use COMPARE rather than NE.
+	(addsi3_compareV_imm): New pattern.
+	* config/arm/arm.c (arm_select_cc_mode): Return CC_Vmode for
+	a signed-overflow check.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm-modes.def (CC_ADC): New CC mode.
 	* config/arm/arm.c (arm_select_cc_mode): Detect selection of
 	CC_ADCmode.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index fb1a681..ba23970 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15411,6 +15411,14 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 	  || arm_borrow_operation (y, DImode)))
     return CC_Bmode;
 
+  if (GET_MODE (x) == DImode
+      && (op == EQ || op == NE)
+      && GET_CODE (x) == PLUS
+      && GET_CODE (XEXP (x, 0)) == SIGN_EXTEND
+      && GET_CODE (y) == SIGN_EXTEND
+      && GET_CODE (XEXP (y, 0)) == PLUS)
+    return CC_Vmode;
+
   if (GET_MODE_CLASS (GET_MODE (x)) == MODE_CC)
     return GET_MODE (x);
 
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 9f0e435..b5214c7 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -488,14 +488,30 @@
   "
 )
 
-(define_expand "addv<mode>4"
-  [(match_operand:SIDI 0 "register_operand")
-   (match_operand:SIDI 1 "register_operand")
-   (match_operand:SIDI 2 "register_operand")
+(define_expand "addvsi4"
+  [(match_operand:SI 0 "s_register_operand")
+   (match_operand:SI 1 "s_register_operand")
+   (match_operand:SI 2 "arm_add_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_add<mode>3_compareV (operands[0], operands[1], operands[2]));
+  if (CONST_INT_P (operands[2]))
+    emit_insn (gen_addsi3_compareV_imm (operands[0], operands[1], operands[2]));
+  else
+    emit_insn (gen_addsi3_compareV_reg (operands[0], operands[1], operands[2]));
+  arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
+
+  DONE;
+})
+
+(define_expand "addvdi4"
+  [(match_operand:DI 0 "register_operand")
+   (match_operand:DI 1 "register_operand")
+   (match_operand:DI 2 "register_operand")
+   (match_operand 3 "")]
+  "TARGET_32BIT"
+{
+  emit_insn (gen_adddi3_compareV (operands[0], operands[1], operands[2]));
   arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
 
   DONE;
@@ -770,21 +786,48 @@
    (set_attr "type" "multiple")]
 )
 
-(define_insn "addsi3_compareV"
+(define_insn "addsi3_compareV_reg"
   [(set (reg:CC_V CC_REGNUM)
-	(ne:CC_V
+	(compare:CC_V
 	  (plus:DI
-	    (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
-	    (sign_extend:DI (match_operand:SI 2 "register_operand" "r")))
+	    (sign_extend:DI (match_operand:SI 1 "register_operand" "%l,0,r"))
+	    (sign_extend:DI (match_operand:SI 2 "register_operand" "l,r,r")))
 	  (sign_extend:DI (plus:SI (match_dup 1) (match_dup 2)))))
-   (set (match_operand:SI 0 "register_operand" "=r")
+   (set (match_operand:SI 0 "register_operand" "=l,r,r")
 	(plus:SI (match_dup 1) (match_dup 2)))]
   "TARGET_32BIT"
   "adds%?\\t%0, %1, %2"
   [(set_attr "conds" "set")
+   (set_attr "arch" "t2,t2,*")
+   (set_attr "length" "2,2,4")
    (set_attr "type" "alus_sreg")]
 )
 
+(define_insn "addsi3_compareV_imm"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	  (plus:DI
+	    (sign_extend:DI
+	     (match_operand:SI 1 "register_operand" "l,0,l,0,r,r"))
+	    (match_operand 2 "arm_addimm_operand" "Pd,Py,Px,Pw,I,L"))
+	  (sign_extend:DI (plus:SI (match_dup 1) (match_dup 2)))))
+   (set (match_operand:SI 0 "register_operand" "=l,l,l,l,r,r")
+	(plus:SI (match_dup 1) (match_dup 2)))]
+  "TARGET_32BIT
+   && INTVAL (operands[2]) == ARM_SIGN_EXTEND (INTVAL (operands[2]))"
+  "@
+   adds%?\\t%0, %1, %2
+   adds%?\\t%0, %0, %2
+   subs%?\\t%0, %1, #%n2
+   subs%?\\t%0, %0, #%n2
+   adds%?\\t%0, %1, %2
+   subs%?\\t%0, %1, #%n2"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,t2,t2,t2,*,*")
+   (set_attr "length" "2,2,2,2,4,4")
+   (set_attr "type" "alus_imm")]
+)
+
 (define_insn "addsi3_compare0"
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
-- 
cgit v1.1


From db962d0ad4501f2f673fc3fadd4ac572ef9a177e Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:30 +0000
Subject: [arm] Allow the summation result of signed add-with-overflow to be
 discarded.

This patch matches the signed add-with-overflow patterns when the
summation itself is dropped.  In this case we can use CMN (or CMP with
some immediates).  There are a small number of constants in thumb2
where this can result in less dense code (as we lack 16-bit CMN with
immediate patterns).  To handle this we use peepholes to try these
alternatives when either a scratch is available (0 <= i <= 7) or the
original register is dead (0 <= i <= 255).  We don't use a scratch in
the pattern as if those conditions are not satisfied then the 32-bit
form is preferable to forcing a reload.

	* config/arm/arm.md (addsi3_compareV_reg_nosum): New insn.
	(addsi3_compareV_imm_nosum): New insn.  Also add peephole2 patterns
	to transform this back into the summation version when that leads
	to smaller code.

From-SVN: r277185
---
 gcc/ChangeLog         |  7 +++++
 gcc/config/arm/arm.md | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c82758..4a5a139 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (addsi3_compareV_reg_nosum): New insn.
+	(addsi3_compareV_imm_nosum): New insn.  Also add peephole2 patterns
+	to transform this back into the summation version when that leads
+	to smaller code.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (addv<mode>4): Delete.
 	(addvsi4): New pattern.  Handle immediate values that the architecture
 	supports.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index b5214c7..be002f7 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -803,6 +803,21 @@
    (set_attr "type" "alus_sreg")]
 )
 
+(define_insn "*addsi3_compareV_reg_nosum"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	  (plus:DI
+	    (sign_extend:DI (match_operand:SI 0 "register_operand" "%l,r"))
+	    (sign_extend:DI (match_operand:SI 1 "register_operand" "l,r")))
+	  (sign_extend:DI (plus:SI (match_dup 0) (match_dup 1)))))]
+  "TARGET_32BIT"
+  "cmn%?\\t%0, %1"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")
+   (set_attr "type" "alus_sreg")]
+)
+
 (define_insn "addsi3_compareV_imm"
   [(set (reg:CC_V CC_REGNUM)
 	(compare:CC_V
@@ -828,6 +843,69 @@
    (set_attr "type" "alus_imm")]
 )
 
+(define_insn "addsi3_compareV_imm_nosum"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	  (plus:DI
+	    (sign_extend:DI
+	     (match_operand:SI 0 "register_operand" "l,r,r"))
+	    (match_operand 1 "arm_addimm_operand" "Pw,I,L"))
+	  (sign_extend:DI (plus:SI (match_dup 0) (match_dup 1)))))]
+  "TARGET_32BIT
+   && INTVAL (operands[1]) == ARM_SIGN_EXTEND (INTVAL (operands[1]))"
+  "@
+   cmp%?\\t%0, #%n1
+   cmn%?\\t%0, %1
+   cmp%?\\t%0, #%n1"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*,*")
+   (set_attr "length" "2,4,4")
+   (set_attr "type" "alus_imm")]
+)
+
+;; We can handle more constants efficently if we can clobber either a scratch
+;; or the other source operand.  We deliberately leave this late as in
+;; high register pressure situations it's not worth forcing any reloads.
+(define_peephole2
+  [(match_scratch:SI 2 "l")
+   (set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	  (plus:DI
+	    (sign_extend:DI
+	     (match_operand:SI 0 "low_register_operand"))
+	    (match_operand 1 "const_int_operand"))
+	  (sign_extend:DI (plus:SI (match_dup 0) (match_dup 1)))))]
+  "TARGET_THUMB2
+   && satisfies_constraint_Pd (operands[1])"
+  [(parallel[
+    (set (reg:CC_V CC_REGNUM)
+	 (compare:CC_V
+	  (plus:DI (sign_extend:DI (match_dup 0))
+		   (sign_extend:DI (match_dup 1)))
+	  (sign_extend:DI (plus:SI (match_dup 0) (match_dup 1)))))
+    (set (match_dup 2) (plus:SI (match_dup 0) (match_dup 1)))])]
+)
+
+(define_peephole2
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	  (plus:DI
+	    (sign_extend:DI
+	     (match_operand:SI 0 "low_register_operand"))
+	    (match_operand 1 "const_int_operand"))
+	  (sign_extend:DI (plus:SI (match_dup 0) (match_dup 1)))))]
+  "TARGET_THUMB2
+   && dead_or_set_p (peep2_next_insn (0), operands[0])
+   && satisfies_constraint_Py (operands[1])"
+  [(parallel[
+    (set (reg:CC_V CC_REGNUM)
+	 (compare:CC_V
+	  (plus:DI (sign_extend:DI (match_dup 0))
+		   (sign_extend:DI (match_dup 1)))
+	  (sign_extend:DI (plus:SI (match_dup 0) (match_dup 1)))))
+    (set (match_dup 0) (plus:SI (match_dup 0) (match_dup 1)))])]
+)
+
 (define_insn "addsi3_compare0"
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
-- 
cgit v1.1


From fa62df0e600ef617bce549d64026c0e5cc817c31 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:38 +0000
Subject: [arm] Early split addvdi4

This patch adds early splitting for addvdi4; it's very similar to the
uaddvdi4 splitter, but the details are just different enough in
places, especially for the patterns that match the splitting, where we
have to compare against the non-widened version to detect if overflow
occurred.

I've also added a testcase to the testsuite for a couple of constants
that caught me out during the development of this patch.  They're
probably arm-specific values, but the test is generic enough that I've
included it for all targets.

[gcc]
	* config/arm/arm.c (arm_select_cc_mode): Allow either the first
	or second operand of the PLUS inside a DImode equality test to be
	sign-extend when selecting CC_Vmode.
	* config/arm/arm.md (addvdi4): Early-split the operation into SImode
	instructions.
	(addsi3_cin_vout_reg, addsi3_cin_vout_imm, addsi3_cin_vout_0): New
	expand patterns.
	(addsi3_cin_vout_reg_insn, addsi3_cin_vout_imm_insn): New patterns.
	(addsi3_cin_vout_0): Likewise.
	(adddi3_compareV): Delete.

[gcc/testsuite]
	* gcc.dg/builtin-arith-overflow-3.c: New test.

From-SVN: r277186
---
 gcc/ChangeLog                                   |  13 ++
 gcc/config/arm/arm.c                            |   3 +-
 gcc/config/arm/arm.md                           | 181 +++++++++++++++++++++---
 gcc/testsuite/ChangeLog                         |   4 +
 gcc/testsuite/gcc.dg/builtin-arith-overflow-3.c |  41 ++++++
 5 files changed, 220 insertions(+), 22 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/builtin-arith-overflow-3.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4a5a139..8275411 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,18 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.c (arm_select_cc_mode): Allow either the first
+	or second operand of the PLUS inside a DImode equality test to be
+	sign-extend when selecting CC_Vmode.
+	* config/arm/arm.md (addvdi4): Early-split the operation into SImode
+	instructions.
+	(addsi3_cin_vout_reg, addsi3_cin_vout_imm, addsi3_cin_vout_0): New
+	expand patterns.
+	(addsi3_cin_vout_reg_insn, addsi3_cin_vout_imm_insn): New patterns.
+	(addsi3_cin_vout_0): Likewise.
+	(adddi3_compareV): Delete.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (addsi3_compareV_reg_nosum): New insn.
 	(addsi3_compareV_imm_nosum): New insn.  Also add peephole2 patterns
 	to transform this back into the summation version when that leads
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index ba23970..fe240b2 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15414,7 +15414,8 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
   if (GET_MODE (x) == DImode
       && (op == EQ || op == NE)
       && GET_CODE (x) == PLUS
-      && GET_CODE (XEXP (x, 0)) == SIGN_EXTEND
+      && (GET_CODE (XEXP (x, 0)) == SIGN_EXTEND
+	  || GET_CODE (XEXP (x, 1)) == SIGN_EXTEND)
       && GET_CODE (y) == SIGN_EXTEND
       && GET_CODE (XEXP (y, 0)) == PLUS)
     return CC_Vmode;
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index be002f7..e9e0ca9 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -505,18 +505,173 @@
 })
 
 (define_expand "addvdi4"
-  [(match_operand:DI 0 "register_operand")
-   (match_operand:DI 1 "register_operand")
-   (match_operand:DI 2 "register_operand")
+  [(match_operand:DI 0 "s_register_operand")
+   (match_operand:DI 1 "s_register_operand")
+   (match_operand:DI 2 "reg_or_int_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_adddi3_compareV (operands[0], operands[1], operands[2]));
-  arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
+  rtx lo_result, hi_result;
+  rtx lo_op1, hi_op1, lo_op2, hi_op2;
+  arm_decompose_di_binop (operands[1], operands[2], &lo_op1, &hi_op1,
+			  &lo_op2, &hi_op2);
+  lo_result = gen_lowpart (SImode, operands[0]);
+  hi_result = gen_highpart (SImode, operands[0]);
+
+  if (lo_op2 == const0_rtx)
+    {
+      emit_move_insn (lo_result, lo_op1);
+      if (!arm_add_operand (hi_op2, SImode))
+	hi_op2 = force_reg (SImode, hi_op2);
+
+      emit_insn (gen_addvsi4 (hi_result, hi_op1, hi_op2, operands[3]));
+    }
+  else
+    {
+      if (!arm_add_operand (lo_op2, SImode))
+	lo_op2 = force_reg (SImode, lo_op2);
+      if (!arm_not_operand (hi_op2, SImode))
+	hi_op2 = force_reg (SImode, hi_op2);
+
+      emit_insn (gen_addsi3_compare_op1 (lo_result, lo_op1, lo_op2));
+
+      if (hi_op2 == const0_rtx)
+        emit_insn (gen_addsi3_cin_vout_0 (hi_result, hi_op1));
+      else if (CONST_INT_P (hi_op2))
+        emit_insn (gen_addsi3_cin_vout_imm (hi_result, hi_op1, hi_op2));
+      else
+        emit_insn (gen_addsi3_cin_vout_reg (hi_result, hi_op1, hi_op2));
+
+      arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
+    }
 
   DONE;
 })
 
+(define_expand "addsi3_cin_vout_reg"
+  [(parallel
+    [(set (match_dup 3)
+	  (compare:CC_V
+	   (plus:DI
+	    (plus:DI (match_dup 4)
+		     (sign_extend:DI (match_operand:SI 1 "s_register_operand")))
+	    (sign_extend:DI (match_operand:SI 2 "s_register_operand")))
+	   (sign_extend:DI (plus:SI (plus:SI (match_dup 5) (match_dup 1))
+				    (match_dup 2)))))
+     (set (match_operand:SI 0 "s_register_operand")
+	  (plus:SI (plus:SI (match_dup 5) (match_dup 1))
+		   (match_dup 2)))])]
+  "TARGET_32BIT"
+  {
+    operands[3] = gen_rtx_REG (CC_Vmode, CC_REGNUM);
+    rtx ccin = gen_rtx_REG (CC_Cmode, CC_REGNUM);
+    operands[4] = gen_rtx_LTU (DImode, ccin, const0_rtx);
+    operands[5] = gen_rtx_LTU (SImode, ccin, const0_rtx);
+  }
+)
+
+(define_insn "*addsi3_cin_vout_reg_insn"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (plus:DI
+	  (plus:DI
+	   (match_operand:DI 3 "arm_carry_operation" "")
+	   (sign_extend:DI (match_operand:SI 1 "s_register_operand" "%0,r")))
+	  (sign_extend:DI (match_operand:SI 2 "s_register_operand" "l,r")))
+	 (sign_extend:DI
+	  (plus:SI (plus:SI (match_operand:SI 4 "arm_carry_operation" "")
+			    (match_dup 1))
+		   (match_dup 2)))))
+   (set (match_operand:SI 0 "s_register_operand" "=l,r")
+	(plus:SI (plus:SI (match_dup 4) (match_dup 1))
+		 (match_dup 2)))]
+  "TARGET_32BIT"
+  "@
+   adcs%?\\t%0, %0, %2
+   adcs%?\\t%0, %1, %2"
+  [(set_attr "type" "alus_sreg")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")]
+)
+
+(define_expand "addsi3_cin_vout_imm"
+  [(parallel
+    [(set (match_dup 3)
+	  (compare:CC_V
+	   (plus:DI
+	    (plus:DI (match_dup 4)
+		     (sign_extend:DI (match_operand:SI 1 "s_register_operand")))
+	    (match_dup 2))
+	   (sign_extend:DI (plus:SI (plus:SI (match_dup 5) (match_dup 1))
+				    (match_dup 2)))))
+     (set (match_operand:SI 0 "s_register_operand")
+	  (plus:SI (plus:SI (match_dup 5) (match_dup 1))
+		   (match_operand 2 "arm_adcimm_operand")))])]
+  "TARGET_32BIT"
+  {
+    operands[3] = gen_rtx_REG (CC_Vmode, CC_REGNUM);
+    rtx ccin = gen_rtx_REG (CC_Cmode, CC_REGNUM);
+    operands[4] = gen_rtx_LTU (DImode, ccin, const0_rtx);
+    operands[5] = gen_rtx_LTU (SImode, ccin, const0_rtx);
+  }
+)
+
+(define_insn "*addsi3_cin_vout_imm_insn"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (plus:DI
+	  (plus:DI
+	   (match_operand:DI 3 "arm_carry_operation" "")
+	   (sign_extend:DI (match_operand:SI 1 "s_register_operand" "r,r")))
+	  (match_operand 2 "arm_adcimm_operand" "I,K"))
+	 (sign_extend:DI
+	  (plus:SI (plus:SI (match_operand:SI 4 "arm_carry_operation" "")
+			    (match_dup 1))
+		   (match_dup 2)))))
+   (set (match_operand:SI 0 "s_register_operand" "=r,r")
+	(plus:SI (plus:SI (match_dup 4) (match_dup 1))
+		 (match_dup 2)))]
+  "TARGET_32BIT"
+  "@
+   adcs%?\\t%0, %1, %2
+   sbcs%?\\t%0, %1, #%B2"
+  [(set_attr "type" "alus_imm")]
+)
+
+(define_expand "addsi3_cin_vout_0"
+  [(parallel
+    [(set (match_dup 2)
+	  (compare:CC_V
+	   (plus:DI (match_dup 3)
+		    (sign_extend:DI (match_operand:SI 1 "s_register_operand")))
+	   (sign_extend:DI (plus:SI (match_dup 4) (match_dup 1)))))
+     (set (match_operand:SI 0 "s_register_operand")
+	  (plus:SI (match_dup 4) (match_dup 1)))])]
+  "TARGET_32BIT"
+  {
+    operands[2] = gen_rtx_REG (CC_Vmode, CC_REGNUM);
+    rtx ccin = gen_rtx_REG (CC_Cmode, CC_REGNUM);
+    operands[3] = gen_rtx_LTU (DImode, ccin, const0_rtx);
+    operands[4] = gen_rtx_LTU (SImode, ccin, const0_rtx);
+  }
+)
+
+(define_insn "*addsi3_cin_vout_0_insn"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (plus:DI
+	  (match_operand:DI 2 "arm_carry_operation" "")
+	  (sign_extend:DI (match_operand:SI 1 "s_register_operand" "r")))
+	 (sign_extend:DI (plus:SI
+			  (match_operand:SI 3 "arm_carry_operation" "")
+			  (match_dup 1)))))
+   (set (match_operand:SI 0 "s_register_operand" "=r")
+	(plus:SI (match_dup 3) (match_dup 1)))]
+  "TARGET_32BIT"
+  "adcs%?\\t%0, %1, #0"
+  [(set_attr "type" "alus_imm")]
+)
+
 (define_expand "uaddvsi4"
   [(match_operand:SI 0 "s_register_operand")
    (match_operand:SI 1 "s_register_operand")
@@ -770,22 +925,6 @@
  ]
 )
 
-(define_insn "adddi3_compareV"
-  [(set (reg:CC_V CC_REGNUM)
-	(ne:CC_V
-	  (plus:TI
-	    (sign_extend:TI (match_operand:DI 1 "s_register_operand" "r"))
-	    (sign_extend:TI (match_operand:DI 2 "s_register_operand" "r")))
-	  (sign_extend:TI (plus:DI (match_dup 1) (match_dup 2)))))
-   (set (match_operand:DI 0 "s_register_operand" "=&r")
-	(plus:DI (match_dup 1) (match_dup 2)))]
-  "TARGET_32BIT"
-  "adds\\t%Q0, %Q1, %Q2;adcs\\t%R0, %R1, %R2"
- [(set_attr "conds" "set")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
 (define_insn "addsi3_compareV_reg"
   [(set (reg:CC_V CC_REGNUM)
 	(compare:CC_V
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d5d934d..4267ac4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* gcc.dg/builtin-arith-overflow-3.c: New test.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* gcc.target/arm/negdi-3.c: Remove XFAIL markers.
 
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
diff --git a/gcc/testsuite/gcc.dg/builtin-arith-overflow-3.c b/gcc/testsuite/gcc.dg/builtin-arith-overflow-3.c
new file mode 100644
index 0000000..6feae1e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/builtin-arith-overflow-3.c
@@ -0,0 +1,41 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+static int cnt = 0;
+
+#define LL_MIN ((long long)(-__LONG_LONG_MAX__ - 1))
+
+#define SC1 (LL_MIN + 5)
+#define UC1 ((1ULL << (__LONG_LONG_WIDTH__ - 1)) | 5ULL)
+#define UC2 (~UC1)
+
+long long __attribute__ ((noinline, noclone))
+f1 (long long a)
+{
+  long long x;
+  if (__builtin_add_overflow (a, SC1, &x)) cnt++;
+  return x;
+}
+
+unsigned long long __attribute__ ((noinline, noclone))
+f2 (unsigned long long a)
+{
+  unsigned long long x;
+  if (__builtin_add_overflow (a, UC1, &x))
+    cnt++;
+  return x;
+}
+
+int main ()
+{
+  if (f1 (-5) != LL_MIN) __builtin_abort ();
+  if (cnt != 0) __builtin_abort ();
+  f1 (-6);
+  if (cnt != 1) __builtin_abort ();
+  cnt = 0;
+  if (f2 (UC2) != ~0ULL) __builtin_abort ();
+  if (cnt != 0) __builtin_abort ();
+  if (f2 (UC2 + 1) != 0) __builtin_abort ();
+  if (cnt != 1) __builtin_abort ();
+  return 0;
+}
-- 
cgit v1.1


From a79048f6250febc1acce09d790035276d534e754 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:46 +0000
Subject: [arm] Improve constant handling for usubvsi4.

This patch improves the expansion of usubvsi4 by allowing suitable
constants to be passed directly.  Unlike normal subtraction, either
operand may be a constant (and indeed I have seen cases where both can
be with LTO enabled).  One interesting testcase that improves as a
result of this is:

unsigned f6 (unsigned a)
{
  unsigned x;
  return __builtin_sub_overflow (5U, a, &x) ? 0 : x;
}

Which previously compiled to:

	rsbs	r3, r0, #5
	cmp	r0, #5
	movls	r0, r3
	movhi	r0, #0

but now generates the optimal sequence:

	rsbs	r0, r0, #5
	movcc	r0, #0

	* config/arm/arm.md (usubv<mode>4): Delete expansion.
	(usubvsi4): New pattern.  Allow some immediate values for inputs.
	(usubvdi4): New pattern.

From-SVN: r277187
---
 gcc/ChangeLog         |  6 ++++++
 gcc/config/arm/arm.md | 46 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8275411..9e4e2d7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (usubv<mode>4): Delete expansion.
+	(usubvsi4): New pattern.  Allow some immediate values for inputs.
+	(usubvdi4): New pattern.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.c (arm_select_cc_mode): Allow either the first
 	or second operand of the PLUS inside a DImode equality test to be
 	sign-extend when selecting CC_Vmode.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index e9e0ca9..a465bf8 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1352,14 +1352,50 @@
   DONE;
 })
 
-(define_expand "usubv<mode>4"
-  [(match_operand:SIDI 0 "register_operand")
-   (match_operand:SIDI 1 "register_operand")
-   (match_operand:SIDI 2 "register_operand")
+(define_expand "usubvsi4"
+  [(match_operand:SI 0 "s_register_operand")
+   (match_operand:SI 1 "arm_rhs_operand")
+   (match_operand:SI 2 "arm_add_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_sub<mode>3_compare1 (operands[0], operands[1], operands[2]));
+  machine_mode mode = CCmode;
+  if (CONST_INT_P (operands[1]) && CONST_INT_P (operands[2]))
+    {
+      /* If both operands are constants we can decide the result statically.  */
+      wi::overflow_type overflow;
+      wide_int val = wi::sub (rtx_mode_t (operands[1], SImode),
+			      rtx_mode_t (operands[2], SImode),
+			      UNSIGNED, &overflow);
+      emit_move_insn (operands[0], GEN_INT (val.to_shwi ()));
+      if (overflow != wi::OVF_NONE)
+	emit_jump_insn (gen_jump (operands[3]));
+      DONE;
+    }
+  else if (CONST_INT_P (operands[2]))
+    emit_insn (gen_cmpsi2_addneg (operands[0], operands[1], operands[2],
+				  GEN_INT (-INTVAL (operands[2]))));
+  else if (CONST_INT_P (operands[1]))
+    {
+      mode = CC_RSBmode;
+      emit_insn (gen_rsb_imm_compare (operands[0], operands[1], operands[2],
+				      GEN_INT (~UINTVAL (operands[1]))));
+    }
+  else
+    emit_insn (gen_subsi3_compare1 (operands[0], operands[1], operands[2]));
+  arm_gen_unlikely_cbranch (LTU, mode, operands[3]);
+
+  DONE;
+})
+
+(define_expand "usubvdi4"
+  [(match_operand:DI 0 "s_register_operand")
+   (match_operand:DI 1 "s_register_operand")
+   (match_operand:DI 2 "s_register_operand")
+   (match_operand 3 "")]
+  "TARGET_32BIT"
+{
+  emit_insn (gen_subdi3_compare1 (operands[0], operands[1], operands[2]));
   arm_gen_unlikely_cbranch (LTU, CCmode, operands[3]);
 
   DONE;
-- 
cgit v1.1


From eff5ce0a95699d3eeded9854bff25913cfbdb2f3 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:04:54 +0000
Subject: [arm] Early expansion of usubvdi4.

This patch adds early expansion of usubvdi4, allowing us to handle some
constants in place, which previously we were unable to do.

	* config/arm/arm.md (usubvdi4): Allow registers or integers for
	incoming operands.  Early split the calculation into SImode
	operations.
	(usubvsi3_borrow): New insn pattern.
	(usubvsi3_borrow_imm): Likewise.

From-SVN: r277188
---
 gcc/ChangeLog         |   8 ++++
 gcc/config/arm/arm.md | 113 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 117 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e4e2d7..dbc421d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (usubvdi4): Allow registers or integers for
+	incoming operands.  Early split the calculation into SImode
+	operations.
+	(usubvsi3_borrow): New insn pattern.
+	(usubvsi3_borrow_imm): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (usubv<mode>4): Delete expansion.
 	(usubvsi4): New pattern.  Allow some immediate values for inputs.
 	(usubvdi4): New pattern.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index a465bf8..92f1823 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1390,13 +1390,81 @@
 
 (define_expand "usubvdi4"
   [(match_operand:DI 0 "s_register_operand")
-   (match_operand:DI 1 "s_register_operand")
-   (match_operand:DI 2 "s_register_operand")
+   (match_operand:DI 1 "reg_or_int_operand")
+   (match_operand:DI 2 "reg_or_int_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_subdi3_compare1 (operands[0], operands[1], operands[2]));
-  arm_gen_unlikely_cbranch (LTU, CCmode, operands[3]);
+  rtx lo_result, hi_result;
+  rtx lo_op1, hi_op1, lo_op2, hi_op2;
+  lo_result = gen_lowpart (SImode, operands[0]);
+  hi_result = gen_highpart (SImode, operands[0]);
+  machine_mode mode = CCmode;
+
+  if (CONST_INT_P (operands[1]) && CONST_INT_P (operands[2]))
+    {
+      /* If both operands are constants we can decide the result statically.  */
+      wi::overflow_type overflow;
+      wide_int val = wi::sub (rtx_mode_t (operands[1], DImode),
+			      rtx_mode_t (operands[2], DImode),
+			      UNSIGNED, &overflow);
+      emit_move_insn (operands[0], GEN_INT (val.to_shwi ()));
+      if (overflow != wi::OVF_NONE)
+	emit_jump_insn (gen_jump (operands[3]));
+      DONE;
+    }
+  else if (CONST_INT_P (operands[1]))
+    {
+      arm_decompose_di_binop (operands[2], operands[1], &lo_op2, &hi_op2,
+			      &lo_op1, &hi_op1);
+      if (const_ok_for_arm (INTVAL (lo_op1)))
+	{
+	  emit_insn (gen_rsb_imm_compare (lo_result, lo_op1, lo_op2,
+					  GEN_INT (~UINTVAL (lo_op1))));
+	  /* We could potentially use RSC here in Arm state, but not
+	     in Thumb, so it's probably not worth the effort of handling
+	     this.  */
+	  hi_op1 = force_reg (SImode, hi_op1);
+	  mode = CC_RSBmode;
+	  goto highpart;
+	}
+      operands[1] = force_reg (DImode, operands[1]);
+    }
+
+  arm_decompose_di_binop (operands[1], operands[2], &lo_op1, &hi_op1,
+			  &lo_op2, &hi_op2);
+  if (lo_op2 == const0_rtx)
+    {
+      emit_move_insn (lo_result, lo_op1);
+      if (!arm_add_operand (hi_op2, SImode))
+        hi_op2 = force_reg (SImode, hi_op2);
+      emit_insn (gen_usubvsi4 (hi_result, hi_op1, hi_op2, operands[3]));
+      DONE;
+    }
+
+  if (CONST_INT_P (lo_op2) && !arm_addimm_operand (lo_op2, SImode))
+    lo_op2 = force_reg (SImode, lo_op2);
+  if (CONST_INT_P (lo_op2))
+    emit_insn (gen_cmpsi2_addneg (lo_result, lo_op1, lo_op2,
+				  GEN_INT (-INTVAL (lo_op2))));
+  else
+    emit_insn (gen_subsi3_compare1 (lo_result, lo_op1, lo_op2));
+
+ highpart:
+  if (!arm_not_operand (hi_op2, SImode))
+    hi_op2 = force_reg (SImode, hi_op2);
+  rtx ccreg = gen_rtx_REG (mode, CC_REGNUM);
+  if (CONST_INT_P (hi_op2))
+    emit_insn (gen_usubvsi3_borrow_imm (hi_result, hi_op1, hi_op2,
+					GEN_INT (UINTVAL (hi_op2) & 0xffffffff),
+					gen_rtx_LTU (SImode, ccreg, const0_rtx),
+					gen_rtx_LTU (DImode, ccreg,
+						     const0_rtx)));
+  else
+    emit_insn (gen_usubvsi3_borrow (hi_result, hi_op1, hi_op2,
+				    gen_rtx_LTU (SImode, ccreg, const0_rtx),
+				    gen_rtx_LTU (DImode, ccreg, const0_rtx)));
+  arm_gen_unlikely_cbranch (LTU, CC_Bmode, operands[3]);
 
   DONE;
 })
@@ -1825,6 +1893,43 @@
    (set_attr "type" "alus_imm")]
 )
 
+(define_insn "usubvsi3_borrow"
+  [(set (reg:CC_B CC_REGNUM)
+	(compare:CC_B
+	 (zero_extend:DI (match_operand:SI 1 "s_register_operand" "0,r"))
+	 (plus:DI (match_operand:DI 4 "arm_borrow_operation" "")
+	          (zero_extend:DI
+		   (match_operand:SI 2 "s_register_operand" "l,r")))))
+   (set (match_operand:SI 0 "s_register_operand" "=l,r")
+	(minus:SI (match_dup 1)
+		  (plus:SI (match_operand:SI 3 "arm_borrow_operation" "")
+			   (match_dup 2))))]
+  "TARGET_32BIT"
+  "sbcs%?\\t%0, %1, %2"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")]
+)
+
+(define_insn "usubvsi3_borrow_imm"
+  [(set (reg:CC_B CC_REGNUM)
+	(compare:CC_B
+	 (zero_extend:DI (match_operand:SI 1 "s_register_operand" "r,r"))
+	 (plus:DI (match_operand:DI 5 "arm_borrow_operation" "")
+		  (match_operand:DI 3 "const_int_operand" "n,n"))))
+   (set (match_operand:SI 0 "s_register_operand" "=r,r")
+	(minus:SI (match_dup 1)
+		  (plus:SI (match_operand:SI 4 "arm_borrow_operation" "")
+			   (match_operand:SI 2 "arm_adcimm_operand" "I,K"))))]
+  "TARGET_32BIT
+   && (UINTVAL (operands[2]) & 0xffffffff) == UINTVAL (operands[3])"
+  "@
+  sbcs%?\\t%0, %1, %2
+  adcs%?\\t%0, %1, #%B2"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
+)
+
 (define_expand "subsf3"
   [(set (match_operand:SF           0 "s_register_operand")
 	(minus:SF (match_operand:SF 1 "s_register_operand")
-- 
cgit v1.1


From 238273fe06e3da6dd1d80b04217d53c76cf5fa41 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:05:01 +0000
Subject: [arm] Improve constant handling for subvsi4.

This patch addresses constant handling in subvsi4.  Either operand may
be a constant.  If the second input (operand[2]) is a constant, then
we can canonicalize this into an addition form, providing we take care
of the INT_MIN case.  In that case the negation has to handle the fact
that -INT_MIN is still INT_MIN and we need to ensure that a subtract
operation is performed rather than an addition.  The remaining cases
are largely duals of the usubvsi4 expansion.

This patch also fixes a technical correctness bug in the old
expansion, where we did not realy describe the test for overflow in
the RTL.  We seem to have got away with that, however...

	* config/arm/arm.md (subv<mode>4): Delete.
	(subvdi4): New expander pattern.
	(subvsi4): Likewise.  Handle some immediate values.
	(subvsi3_intmin): New insn pattern.
	(subvsi3): Likewise.
	(subvsi3_imm1): Likewise.
	* config/arm/arm.c (select_cc_mode): Also allow minus for CC_V
	idioms.

From-SVN: r277189
---
 gcc/ChangeLog         | 11 ++++++
 gcc/config/arm/arm.c  |  5 +--
 gcc/config/arm/arm.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 105 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbc421d..153792e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (subv<mode>4): Delete.
+	(subvdi4): New expander pattern.
+	(subvsi4): Likewise.  Handle some immediate values.
+	(subvsi3_intmin): New insn pattern.
+	(subvsi3): Likewise.
+	(subvsi3_imm1): Likewise.
+	* config/arm/arm.c (select_cc_mode): Also allow minus for CC_V
+	idioms.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (usubvdi4): Allow registers or integers for
 	incoming operands.  Early split the calculation into SImode
 	operations.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index fe240b2..5491ad0 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -15413,11 +15413,12 @@ arm_select_cc_mode (enum rtx_code op, rtx x, rtx y)
 
   if (GET_MODE (x) == DImode
       && (op == EQ || op == NE)
-      && GET_CODE (x) == PLUS
+      && (GET_CODE (x) == PLUS
+	  || GET_CODE (x) == MINUS)
       && (GET_CODE (XEXP (x, 0)) == SIGN_EXTEND
 	  || GET_CODE (XEXP (x, 1)) == SIGN_EXTEND)
       && GET_CODE (y) == SIGN_EXTEND
-      && GET_CODE (XEXP (y, 0)) == PLUS)
+      && GET_CODE (XEXP (y, 0)) == GET_CODE (x))
     return CC_Vmode;
 
   if (GET_MODE_CLASS (GET_MODE (x)) == MODE_CC)
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 92f1823..05b735c 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -957,6 +957,22 @@
    (set_attr "type" "alus_sreg")]
 )
 
+(define_insn "subvsi3_intmin"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	  (plus:DI
+	    (sign_extend:DI
+	     (match_operand:SI 1 "register_operand" "r"))
+	    (const_int 2147483648))
+	  (sign_extend:DI (plus:SI (match_dup 1) (const_int -2147483648)))))
+   (set (match_operand:SI 0 "register_operand" "=r")
+	(plus:SI (match_dup 1) (const_int -2147483648)))]
+  "TARGET_32BIT"
+  "subs%?\\t%0, %1, #-2147483648"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
+)
+
 (define_insn "addsi3_compareV_imm"
   [(set (reg:CC_V CC_REGNUM)
 	(compare:CC_V
@@ -1339,14 +1355,52 @@
     (set_attr "type" "adcs_reg")]
 )
 
-(define_expand "subv<mode>4"
-  [(match_operand:SIDI 0 "register_operand")
-   (match_operand:SIDI 1 "register_operand")
-   (match_operand:SIDI 2 "register_operand")
+(define_expand "subvsi4"
+  [(match_operand:SI 0 "s_register_operand")
+   (match_operand:SI 1 "arm_rhs_operand")
+   (match_operand:SI 2 "arm_add_operand")
+   (match_operand 3 "")]
+  "TARGET_32BIT"
+{
+  if (CONST_INT_P (operands[1]) && CONST_INT_P (operands[2]))
+    {
+      /* If both operands are constants we can decide the result statically.  */
+      wi::overflow_type overflow;
+      wide_int val = wi::sub (rtx_mode_t (operands[1], SImode),
+			      rtx_mode_t (operands[2], SImode),
+			      SIGNED, &overflow);
+      emit_move_insn (operands[0], GEN_INT (val.to_shwi ()));
+      if (overflow != wi::OVF_NONE)
+	emit_jump_insn (gen_jump (operands[3]));
+      DONE;
+    }
+  else if (CONST_INT_P (operands[2]))
+    {
+      operands[2] = GEN_INT (-INTVAL (operands[2]));
+      /* Special case for INT_MIN.  */
+      if (INTVAL (operands[2]) == 0x80000000)
+	emit_insn (gen_subvsi3_intmin (operands[0], operands[1]));
+      else
+	emit_insn (gen_addsi3_compareV_imm (operands[0], operands[1],
+					  operands[2]));
+    }
+  else if (CONST_INT_P (operands[1]))
+    emit_insn (gen_subvsi3_imm1 (operands[0], operands[1], operands[2]));
+  else
+    emit_insn (gen_subvsi3 (operands[0], operands[1], operands[2]));
+
+  arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
+  DONE;
+})
+
+(define_expand "subvdi4"
+  [(match_operand:DI 0 "s_register_operand")
+   (match_operand:DI 1 "s_register_operand")
+   (match_operand:DI 2 "s_register_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_sub<mode>3_compare1 (operands[0], operands[1], operands[2]));
+  emit_insn (gen_subdi3_compare1 (operands[0], operands[1], operands[2]));
   arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
 
   DONE;
@@ -1496,6 +1550,38 @@
    (set_attr "type" "alus_sreg")]
 )
 
+(define_insn "subvsi3"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (minus:DI
+	  (sign_extend:DI (match_operand:SI 1 "s_register_operand" "l,r"))
+	  (sign_extend:DI (match_operand:SI 2 "s_register_operand" "l,r")))
+	 (sign_extend:DI (minus:SI (match_dup 1) (match_dup 2)))))
+   (set (match_operand:SI 0 "s_register_operand" "=l,r")
+	(minus:SI (match_dup 1) (match_dup 2)))]
+  "TARGET_32BIT"
+  "subs%?\\t%0, %1, %2"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")
+   (set_attr "type" "alus_sreg")]
+)
+
+(define_insn "subvsi3_imm1"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (minus:DI
+	  (match_operand 1 "arm_immediate_operand" "I")
+	  (sign_extend:DI (match_operand:SI 2 "s_register_operand" "r")))
+	 (sign_extend:DI (minus:SI (match_dup 1) (match_dup 2)))))
+   (set (match_operand:SI 0 "s_register_operand" "=r")
+	(minus:SI (match_dup 1) (match_dup 2)))]
+  "TARGET_32BIT"
+  "rsbs%?\\t%0, %2, %1"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
+)
+
 (define_insn "subsi3_carryin"
   [(set (match_operand:SI 0 "s_register_operand" "=r,r,r")
 	(minus:SI (minus:SI (match_operand:SI 1 "reg_or_int_operand" "r,I,Pz")
-- 
cgit v1.1


From ead327735c15436cc0516f427da107be0d747822 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:05:09 +0000
Subject: [arm] Early expansion of subvdi4

This patch adds early expansion of subvdi4.  The expansion sequence
is broadly based on the expansion of usubvdi4.

	* config/arm/arm.md (subvdi4): Decompose calculation into 32-bit
	operations.
	(subdi3_compare1): Delete pattern.
	(subvsi3_borrow): New insn pattern.
	(subvsi3_borrow_imm): Likewise.

From-SVN: r277190
---
 gcc/ChangeLog         |   8 +++
 gcc/config/arm/arm.md | 131 +++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 122 insertions(+), 17 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 153792e..3f2fbb7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (subvdi4): Decompose calculation into 32-bit
+	operations.
+	(subdi3_compare1): Delete pattern.
+	(subvsi3_borrow): New insn pattern.
+	(subvsi3_borrow_imm): Likewise.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (subv<mode>4): Delete.
 	(subvdi4): New expander pattern.
 	(subvsi4): Likewise.  Handle some immediate values.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 05b735c..5a8175f 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1395,12 +1395,79 @@
 
 (define_expand "subvdi4"
   [(match_operand:DI 0 "s_register_operand")
-   (match_operand:DI 1 "s_register_operand")
-   (match_operand:DI 2 "s_register_operand")
+   (match_operand:DI 1 "reg_or_int_operand")
+   (match_operand:DI 2 "reg_or_int_operand")
    (match_operand 3 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_subdi3_compare1 (operands[0], operands[1], operands[2]));
+  rtx lo_result, hi_result;
+  rtx lo_op1, hi_op1, lo_op2, hi_op2;
+  lo_result = gen_lowpart (SImode, operands[0]);
+  hi_result = gen_highpart (SImode, operands[0]);
+  machine_mode mode = CCmode;
+
+  if (CONST_INT_P (operands[1]) && CONST_INT_P (operands[2]))
+    {
+      /* If both operands are constants we can decide the result statically.  */
+      wi::overflow_type overflow;
+      wide_int val = wi::sub (rtx_mode_t (operands[1], DImode),
+			      rtx_mode_t (operands[2], DImode),
+			      SIGNED, &overflow);
+      emit_move_insn (operands[0], GEN_INT (val.to_shwi ()));
+      if (overflow != wi::OVF_NONE)
+	emit_jump_insn (gen_jump (operands[3]));
+      DONE;
+    }
+  else if (CONST_INT_P (operands[1]))
+    {
+      arm_decompose_di_binop (operands[2], operands[1], &lo_op2, &hi_op2,
+			      &lo_op1, &hi_op1);
+      if (const_ok_for_arm (INTVAL (lo_op1)))
+	{
+	  emit_insn (gen_rsb_imm_compare (lo_result, lo_op1, lo_op2,
+					  GEN_INT (~UINTVAL (lo_op1))));
+	  /* We could potentially use RSC here in Arm state, but not
+	     in Thumb, so it's probably not worth the effort of handling
+	     this.  */
+	  hi_op1 = force_reg (SImode, hi_op1);
+	  mode = CC_RSBmode;
+	  goto highpart;
+	}
+      operands[1] = force_reg (DImode, operands[1]);
+    }
+
+  arm_decompose_di_binop (operands[1], operands[2], &lo_op1, &hi_op1,
+			  &lo_op2, &hi_op2);
+  if (lo_op2 == const0_rtx)
+    {
+      emit_move_insn (lo_result, lo_op1);
+      if (!arm_add_operand (hi_op2, SImode))
+        hi_op2 = force_reg (SImode, hi_op2);
+      emit_insn (gen_subvsi4 (hi_result, hi_op1, hi_op2, operands[3]));
+      DONE;
+    }
+
+  if (CONST_INT_P (lo_op2) && !arm_addimm_operand (lo_op2, SImode))
+    lo_op2 = force_reg (SImode, lo_op2);
+  if (CONST_INT_P (lo_op2))
+    emit_insn (gen_cmpsi2_addneg (lo_result, lo_op1, lo_op2,
+				  GEN_INT (-INTVAL (lo_op2))));
+  else
+    emit_insn (gen_subsi3_compare1 (lo_result, lo_op1, lo_op2));
+
+ highpart:
+  if (!arm_not_operand (hi_op2, SImode))
+    hi_op2 = force_reg (SImode, hi_op2);
+  rtx ccreg = gen_rtx_REG (mode, CC_REGNUM);
+  if (CONST_INT_P (hi_op2))
+    emit_insn (gen_subvsi3_borrow_imm (hi_result, hi_op1, hi_op2,
+				       gen_rtx_LTU (SImode, ccreg, const0_rtx),
+				       gen_rtx_LTU (DImode, ccreg,
+						    const0_rtx)));
+  else
+    emit_insn (gen_subvsi3_borrow (hi_result, hi_op1, hi_op2,
+				   gen_rtx_LTU (SImode, ccreg, const0_rtx),
+				   gen_rtx_LTU (DImode, ccreg, const0_rtx)));
   arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[3]);
 
   DONE;
@@ -1523,20 +1590,6 @@
   DONE;
 })
 
-(define_insn "subdi3_compare1"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC
-	  (match_operand:DI 1 "s_register_operand" "r")
-	  (match_operand:DI 2 "s_register_operand" "r")))
-   (set (match_operand:DI 0 "s_register_operand" "=&r")
-	(minus:DI (match_dup 1) (match_dup 2)))]
-  "TARGET_32BIT"
-  "subs\\t%Q0, %Q1, %Q2;sbcs\\t%R0, %R1, %R2"
-  [(set_attr "conds" "set")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
 (define_insn "subsi3_compare1"
   [(set (reg:CC CC_REGNUM)
 	(compare:CC
@@ -2016,6 +2069,50 @@
    (set_attr "type" "alus_imm")]
 )
 
+(define_insn "subvsi3_borrow"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (minus:DI
+	  (minus:DI
+	   (sign_extend:DI (match_operand:SI 1 "s_register_operand" "0,r"))
+	   (sign_extend:DI (match_operand:SI 2 "s_register_operand" "l,r")))
+	  (match_operand:DI 4 "arm_borrow_operation" ""))
+	 (sign_extend:DI
+	  (minus:SI (minus:SI (match_dup 1) (match_dup 2))
+		    (match_operand:SI 3 "arm_borrow_operation" "")))))
+   (set (match_operand:SI 0 "s_register_operand" "=l,r")
+	(minus:SI (minus:SI (match_dup 1) (match_dup 2))
+		  (match_dup 3)))]
+  "TARGET_32BIT"
+  "sbcs%?\\t%0, %1, %2"
+  [(set_attr "conds" "set")
+   (set_attr "arch" "t2,*")
+   (set_attr "length" "2,4")]
+)
+
+(define_insn "subvsi3_borrow_imm"
+  [(set (reg:CC_V CC_REGNUM)
+	(compare:CC_V
+	 (minus:DI
+	  (minus:DI
+	   (sign_extend:DI (match_operand:SI 1 "s_register_operand" "r,r"))
+	   (match_operand 2 "arm_adcimm_operand" "I,K"))
+	  (match_operand:DI 4 "arm_borrow_operation" ""))
+	 (sign_extend:DI
+	  (minus:SI (minus:SI (match_dup 1) (match_dup 2))
+		    (match_operand:SI 3 "arm_borrow_operation" "")))))
+   (set (match_operand:SI 0 "s_register_operand" "=r,r")
+	(minus:SI (minus:SI (match_dup 1) (match_dup 2))
+		  (match_dup 3)))]
+  "TARGET_32BIT
+   && INTVAL (operands[2]) == ARM_SIGN_EXTEND (INTVAL (operands[2]))"
+  "@
+  sbcs%?\\t%0, %1, %2
+  adcs%?\\t%0, %1, #%B2"
+  [(set_attr "conds" "set")
+   (set_attr "type" "alus_imm")]
+)
+
 (define_expand "subsf3"
   [(set (match_operand:SF           0 "s_register_operand")
 	(minus:SF (match_operand:SF 1 "s_register_operand")
-- 
cgit v1.1


From a7c3ebae9348ccc3cc22fb51d6b98f8d7fbfcf88 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:05:16 +0000
Subject: [arm] Improvements to negvsi4 and negvdi4.

The generic expansion code for negv does not try the subv patterns,
but instead emits a sub and a compare separately.  Fortunately, the
patterns can make use of the new subv operations, so just call those.
We can also rewrite this using an iterator to simplify things further.
Finally, we can now make negvdi4 work on Thumb2 as well as Arm.

	* config/arm/arm.md (negv<SIDI:mode>3): New expansion rule.
	(negvsi3, negvdi3): Delete.
	(negdi2_compare): Delete.

From-SVN: r277191
---
 gcc/ChangeLog         |  6 ++++++
 gcc/config/arm/arm.md | 41 +++++------------------------------------
 2 files changed, 11 insertions(+), 36 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f2fbb7..6ef72d4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (negv<SIDI:mode>3): New expansion rule.
+	(negvsi3, negvdi3): Delete.
+	(negdi2_compare): Delete.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/arm.md (subvdi4): Decompose calculation into 32-bit
 	operations.
 	(subdi3_compare1): Delete pattern.
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 5a8175f..7ef0c16 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -4581,48 +4581,17 @@
 
 ;; Unary arithmetic insns
 
-(define_expand "negvsi3"
-  [(match_operand:SI 0 "register_operand")
-   (match_operand:SI 1 "register_operand")
+(define_expand "negv<SIDI:mode>3"
+  [(match_operand:SIDI 0 "s_register_operand")
+   (match_operand:SIDI 1 "s_register_operand")
    (match_operand 2 "")]
   "TARGET_32BIT"
 {
-  emit_insn (gen_subsi3_compare (operands[0], const0_rtx, operands[1]));
-  arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[2]);
-
-  DONE;
-})
-
-(define_expand "negvdi3"
-  [(match_operand:DI 0 "s_register_operand")
-   (match_operand:DI 1 "s_register_operand")
-   (match_operand 2 "")]
-  "TARGET_ARM"
-{
-  emit_insn (gen_negdi2_compare (operands[0], operands[1]));
-  arm_gen_unlikely_cbranch (NE, CC_Vmode, operands[2]);
-
+  emit_insn (gen_subv<mode>4 (operands[0], const0_rtx, operands[1],
+			      operands[2]));
   DONE;
 })
 
-
-(define_insn "negdi2_compare"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC
-	  (const_int 0)
-	  (match_operand:DI 1 "register_operand" "r,r")))
-   (set (match_operand:DI 0 "register_operand" "=&r,&r")
-	(minus:DI (const_int 0) (match_dup 1)))]
-  "TARGET_ARM"
-  "@
-   rsbs\\t%Q0, %Q1, #0;rscs\\t%R0, %R1, #0
-   rsbs\\t%Q0, %Q1, #0;sbcs\\t%R0, %R1, %R1, lsl #1"
-  [(set_attr "conds" "set")
-   (set_attr "arch" "a,t2")
-   (set_attr "length" "8")
-   (set_attr "type" "multiple")]
-)
-
 (define_expand "negsi2"
   [(set (match_operand:SI         0 "s_register_operand")
 	(neg:SI (match_operand:SI 1 "s_register_operand")))]
-- 
cgit v1.1


From f8b9b1edef77be79b3f98021f9d1f24a1e986ffd Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Fri, 18 Oct 2019 19:05:25 +0000
Subject: [arm] Fix testsuite nit when compiling for thumb2

In thumb2 we now generate a NEGS instruction rather than RSBS, so this
test needs updating.

	* gcc.target/arm/negdi-3.c: Update expected output to allow NEGS.

From-SVN: r277192
---
 gcc/testsuite/ChangeLog                | 4 ++++
 gcc/testsuite/gcc.target/arm/negdi-3.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4267ac4..5875702 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
+	* gcc.target/arm/negdi-3.c: Update expected output to allow NEGS.
+
+2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
+
 	* gcc.dg/builtin-arith-overflow-3.c: New test.
 
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
diff --git a/gcc/testsuite/gcc.target/arm/negdi-3.c b/gcc/testsuite/gcc.target/arm/negdi-3.c
index 76ddf49..1520e9c 100644
--- a/gcc/testsuite/gcc.target/arm/negdi-3.c
+++ b/gcc/testsuite/gcc.target/arm/negdi-3.c
@@ -8,10 +8,10 @@ signed long long negdi_zero_extendsidi (unsigned int x)
 }
 /*
 Expected output:
-        rsbs    r0, r0, #0
+        rsbs    r0, r0, #0 (arm) | negs	r0, r0 (thumb2)
         sbc     r1, r1, r1
 */
-/* { dg-final { scan-assembler-times "rsb" 1 } } */
+/* { dg-final { scan-assembler-times "rsbs|negs" 1 } } */
 /* { dg-final { scan-assembler-times "sbc" 1 } } */
 /* { dg-final { scan-assembler-times "mov" 0 } } */
 /* { dg-final { scan-assembler-times "rsc" 0 } } */
-- 
cgit v1.1


From 9c233ad0cb1b31ed305c3534e3d9279e5af43477 Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Fri, 18 Oct 2019 22:26:39 +0000
Subject: PR tree-optimization/92157 - incorrect strcmp() == 0 result for
 unknown strings

gcc/testsuite/ChangeLog:

	PR tree-optimization/92157
	* gcc.dg/strlenopt-69.c: Disable test failing due to PR 92155.
	* gcc.dg/strlenopt-87.c: New test.

gcc/ChangeLog:

	PR tree-optimization/92157
	* tree-ssa-strlen.c (handle_builtin_string_cmp): Be prepared for
	compute_string_length to return a negative result.

From-SVN: r277194
---
 gcc/ChangeLog                       |   6 +++
 gcc/testsuite/ChangeLog             |   6 +++
 gcc/testsuite/gcc.dg/strlenopt-69.c |   3 ++
 gcc/testsuite/gcc.dg/strlenopt-87.c | 105 ++++++++++++++++++++++++++++++++++++
 gcc/tree-ssa-strlen.c               |  12 ++++-
 5 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/strlenopt-87.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ef72d4..ccf870c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/92157
+	* tree-ssa-strlen.c (handle_builtin_string_cmp): Be prepared for
+	compute_string_length to return a negative result.
+
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/arm.md (negv<SIDI:mode>3): New expansion rule.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5875702..1a87247 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/92157
+	* gcc.dg/strlenopt-69.c: Disable test failing due to PR 92155.
+	* gcc.dg/strlenopt-87.c: New test.
+
 2019-10-18  Richard Earnshaw  <rearnsha@arm.com>
 
 	* gcc.target/arm/negdi-3.c: Update expected output to allow NEGS.
diff --git a/gcc/testsuite/gcc.dg/strlenopt-69.c b/gcc/testsuite/gcc.dg/strlenopt-69.c
index 46ceb9d..9ad8e2e 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-69.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-69.c
@@ -66,11 +66,14 @@ void test_empty_string (void)
   b4[2] = '\0';
   A (0 == strcmp (&a4[2], &b4[2]));
 
+#if 0
+  /* The following isn't handled yet due to PR 92155.  */
   clobber (a4, b4);
 
   memset (a4, 0, sizeof a4);
   memset (b4, 0, sizeof b4);
   A (0 == strcmp (a4, b4));
+#endif
 }
 
 /* Verify that comparison of dynamically created strings with unknown
diff --git a/gcc/testsuite/gcc.dg/strlenopt-87.c b/gcc/testsuite/gcc.dg/strlenopt-87.c
new file mode 100644
index 0000000..082c7b2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/strlenopt-87.c
@@ -0,0 +1,105 @@
+/* PR tree-optimization/92157 - incorrect strcmp() == 0 result for unknown
+   strings​
+   { dg-do run }
+   { dg-options "-O2 -Wall" } */
+
+#include "strlenopt.h"
+
+
+char a2[2], a3[3];
+
+
+static inline __attribute__ ((always_inline)) int
+verify_not_equal (const char *s, const char *t, int x)
+{
+  int n = x < 0 ? strlen (s) : 0 < x ? strlen (t) : strlen (s) + strlen (t);
+
+  if (strcmp (t, s) == 0)
+    abort ();
+
+  return n;
+}
+
+__attribute__ ((noipa)) int test_a2_s (const char *s)
+{
+  return verify_not_equal (a2, s, 0);
+}
+
+__attribute__ ((noipa)) int test_a2_a3 (void)
+{
+  return verify_not_equal (a2, a3, 0);
+}
+
+__attribute__ ((noipa)) int test_a3_a2 (void)
+{
+  return verify_not_equal (a3, a2, 0);
+}
+
+__attribute__ ((noipa)) int test_s_a2 (const char *s)
+{
+  return verify_not_equal (s, a2, 0);
+}
+
+
+__attribute__ ((noipa)) int test_a2_s_1 (const char *s)
+{
+  return verify_not_equal (a2, s, -1);
+}
+
+__attribute__ ((noipa)) int test_a2_a3_1 (void)
+{
+  return verify_not_equal (a2, a3, -1);
+}
+
+__attribute__ ((noipa)) int test_a3_a2_1 (void)
+{
+  return verify_not_equal (a3, a2, -1);
+}
+
+__attribute__ ((noipa)) int test_s_a2_1 (const char *s)
+{
+  return verify_not_equal (s, a2, -1);
+}
+
+
+__attribute__ ((noipa)) int test_a2_s_2 (const char *s)
+{
+  return verify_not_equal (a2, s, +1);
+}
+
+__attribute__ ((noipa)) int test_a2_a3_2 (void)
+{
+  return verify_not_equal (a2, a3, +1);
+}
+
+__attribute__ ((noipa)) int test_a3_a2_2 (void)
+{
+  return verify_not_equal (a3, a2, +1);
+}
+
+__attribute__ ((noipa)) int test_s_a2_2 (const char *s)
+{
+  return verify_not_equal (s, a2, +1);
+}
+
+int main (void)
+{
+  a2[0] = '1';
+  a3[0] = '1';
+  a3[0] = '2';
+
+  test_a2_s ("");
+  test_a2_a3 ();
+  test_a3_a2 ();
+  test_s_a2 ("");
+
+  test_a2_s_1 ("");
+  test_a2_a3_1 ();
+  test_a3_a2_1 ();
+  test_s_a2_1 ("");
+
+  test_a2_s_2 ("");
+  test_a2_a3_2 ();
+  test_a3_a2_2 ();
+  test_s_a2_2 ("");
+}
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index d5833f69..4381458 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -3842,7 +3842,7 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi)
   HOST_WIDE_INT arysiz1 = -1, arysiz2 = -1;
 
   if (idx1)
-    cstlen1 = compute_string_length (idx1) + 1;
+    cstlen1 = compute_string_length (idx1);
   else
     arysiz1 = determine_min_objsize (arg1);
 
@@ -3853,13 +3853,21 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi)
 
   /* Repeat for the second argument.  */
   if (idx2)
-    cstlen2 = compute_string_length (idx2) + 1;
+    cstlen2 = compute_string_length (idx2);
   else
     arysiz2 = determine_min_objsize (arg2);
 
   if (cstlen2 < 0 && arysiz2 < 0)
     return false;
 
+  if (cstlen1 < 0 && cstlen2 < 0)
+    return false;
+
+  if (cstlen1 >= 0)
+    ++cstlen1;
+  if (cstlen2 >= 0)
+    ++cstlen2;
+
   /* The exact number of characters to compare.  */
   HOST_WIDE_INT cmpsiz = bound < 0 ? cstlen1 < 0 ? cstlen2 : cstlen1 : bound;
   /* The size of the array in which the unknown string is stored.  */
-- 
cgit v1.1


From 9299523c9aad158f5276df2bfe777044bb144230 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Sat, 19 Oct 2019 00:18:25 +0000
Subject: Daily bump.

From-SVN: r277199
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 9e5dc63..7fd1715 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191018
+20191019
-- 
cgit v1.1


From 8ad0c477e888d34c8fc6dbcc008ef66505071d65 Mon Sep 17 00:00:00 2001
From: JeanHeyd Meneide <phdofthehouse@gmail.com>
Date: Sat, 19 Oct 2019 04:51:59 +0000
Subject: Implement C++20 P1301 [[nodiscard("should have a reason")]].

2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>

gcc/
        * escaped_string.h (escaped_string): New header.
        * tree.c (escaped_string): Remove escaped_string class.

gcc/c-family
        * c-lex.c (c_common_has_attribute): Update nodiscard value.

gcc/cp/
        * tree.c (handle_nodiscard_attribute) Added C++2a nodiscard
	string message.
        (std_attribute_table) Increase nodiscard argument handling
	max_length from 0 to 1.
        * parser.c (cp_parser_check_std_attribute): Add requirement
	that nodiscard only be seen once in attribute-list.
        (cp_parser_std_attribute): Check that empty parenthesis lists are
        not specified for attributes that have max_length > 0 (e.g.
	[[attr()]]).
        * cvt.c (maybe_warn_nodiscard): Add nodiscard message to
	output, if applicable.
	(convert_to_void): Allow constructors to be nodiscard-able (P1771).

gcc/testsuite/g++.dg/cpp0x
        * gen-attrs-67.C: Test new error message for empty-parenthesis-list.

gcc/testsuite/g++.dg/cpp2a
        * nodiscard-construct.C: New test.
        * nodiscard-once.C: New test.
        * nodiscard-reason-nonstring.C: New test.
        * nodiscard-reason-only-one.C: New test.
        * nodiscard-reason.C: New test.

Reviewed-by: Jason Merrill <jason@redhat.com>

From-SVN: r277200
---
 gcc/ChangeLog                                      |   5 +
 gcc/c-family/ChangeLog                             |   4 +
 gcc/c-family/c-lex.c                               |   3 +-
 gcc/cp/ChangeLog                                   |  16 ++
 gcc/cp/cvt.c                                       |  36 +++-
 gcc/cp/parser.c                                    |  15 +-
 gcc/cp/tree.c                                      |   9 +-
 gcc/escaped_string.h                               |  43 +++++
 gcc/testsuite/g++.dg/cpp0x/gen-attrs-67.C          |   2 +-
 gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C            |   2 +-
 gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C            |   4 +-
 gcc/testsuite/g++.dg/cpp2a/nodiscard-constructor.c |  13 ++
 gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C        |  12 ++
 .../g++.dg/cpp2a/nodiscard-reason-nonstring.C      |  12 ++
 .../g++.dg/cpp2a/nodiscard-reason-only-one.C       |  12 ++
 gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C      | 203 +++++++++++++++++++++
 gcc/tree.c                                         |  17 +-
 17 files changed, 373 insertions(+), 35 deletions(-)
 create mode 100644 gcc/escaped_string.h
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/nodiscard-constructor.c
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ccf870c..3e03890 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>
+
+	* escaped_string.h (escaped_string): New header.
+	* tree.c (escaped_string): Remove escaped_string class.
+
 2019-10-18  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/92157
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index cb3b9cf..aeae149 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>
+
+	* c-lex.c (c_common_has_attribute): Update nodiscard value.
+
 2019-10-14  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* c-common.h (user_facing_original_type_p): Declare.
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index e3c602f..fb05b5f 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -353,13 +353,14 @@ c_common_has_attribute (cpp_reader *pfile)
 	      else if (is_attribute_p ("deprecated", attr_name))
 		result = 201309;
 	      else if (is_attribute_p ("maybe_unused", attr_name)
-		       || is_attribute_p ("nodiscard", attr_name)
 		       || is_attribute_p ("fallthrough", attr_name))
 		result = 201603;
 	      else if (is_attribute_p ("no_unique_address", attr_name)
 		       || is_attribute_p ("likely", attr_name)
 		       || is_attribute_p ("unlikely", attr_name))
 		result = 201803;
+	      else if (is_attribute_p ("nodiscard", attr_name))
+		result = 201907;
 	      if (result)
 		attr_name = NULL_TREE;
 	    }
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ba533d5f..30accc5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>
+
+	Implement p1301 [[nodiscard("should have a reason")]] + p1771 DR
+	* tree.c (handle_nodiscard_attribute): Handle C++2a nodiscard
+	string message.
+	(std_attribute_table) Increase nodiscard argument handling
+	max_length from 0 to 1.
+	* parser.c (cp_parser_check_std_attribute): Add requirement
+	that nodiscard only be seen once in attribute-list.
+	(cp_parser_std_attribute): Check that empty parenthesis lists are
+	not specified for attributes that have max_length > 0 (e.g.
+	[[attr()]]).
+	* cvt.c (maybe_warn_nodiscard): Add nodiscard message to
+	output, if applicable.
+	(convert_to_void): Allow constructors to be nodiscard-able (P1771).
+
 2019-10-18  Nathan Sidwell  <nathan@acm.org>
 
 	* cp-tree.h (struct lang_type): Remove was_anonymous.
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 364af72..d41aeb8 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "convert.h"
 #include "stringpool.h"
 #include "attribs.h"
+#include "escaped_string.h"
 
 static tree convert_to_pointer_force (tree, tree, tsubst_flags_t);
 static tree build_type_conversion (tree, tree);
@@ -1026,22 +1027,39 @@ maybe_warn_nodiscard (tree expr, impl_conv_void implicit)
 
   tree rettype = TREE_TYPE (type);
   tree fn = cp_get_fndecl_from_callee (callee);
+  tree attr;
   if (implicit != ICV_CAST && fn
-      && lookup_attribute ("nodiscard", DECL_ATTRIBUTES (fn)))
+      && (attr = lookup_attribute ("nodiscard", DECL_ATTRIBUTES (fn))))
     {
+      escaped_string msg;
+      tree args = TREE_VALUE (attr);
+      if (args)
+	msg.escape (TREE_STRING_POINTER (TREE_VALUE (args)));
+      const char* format = (msg ?
+	G_("ignoring return value of %qD, "
+	   "declared with attribute %<nodiscard%>: %<%s%>") :
+	G_("ignoring return value of %qD, "
+	   "declared with attribute %<nodiscard%>%s"));
+      const char* raw_msg = msg ? msg : "";
       auto_diagnostic_group d;
-      if (warning_at (loc, OPT_Wunused_result,
-		      "ignoring return value of %qD, "
-		      "declared with attribute nodiscard", fn))
+      if (warning_at (loc, OPT_Wunused_result, format, fn, raw_msg))
 	inform (DECL_SOURCE_LOCATION (fn), "declared here");
     }
   else if (implicit != ICV_CAST
-	   && lookup_attribute ("nodiscard", TYPE_ATTRIBUTES (rettype)))
+	   && (attr = lookup_attribute ("nodiscard", TYPE_ATTRIBUTES (rettype))))
     {
+      escaped_string msg;
+      tree args = TREE_VALUE (attr);
+      if (args)
+	msg.escape (TREE_STRING_POINTER (TREE_VALUE (args)));
+      const char* format = msg ?
+	G_("ignoring returned value of type %qT, "
+	   "declared with attribute %<nodiscard%>: %<%s%>") :
+	G_("ignoring returned value of type %qT, "
+	   "declared with attribute %<nodiscard%>%s");
+      const char* raw_msg = msg ? msg : "";
       auto_diagnostic_group d;
-      if (warning_at (loc, OPT_Wunused_result,
-		      "ignoring returned value of type %qT, "
-		      "declared with attribute nodiscard", rettype))
+      if (warning_at (loc, OPT_Wunused_result, format, rettype, raw_msg))
 	{
 	  if (fn)
 	    inform (DECL_SOURCE_LOCATION (fn),
@@ -1180,7 +1198,7 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain)
 	 instantiations be affected by an ABI property that is, or at
 	 least ought to be transparent to the language.  */
       if (tree fn = cp_get_callee_fndecl_nofold (expr))
-	if (DECL_CONSTRUCTOR_P (fn) || DECL_DESTRUCTOR_P (fn))
+	if (DECL_DESTRUCTOR_P (fn))
 	  return expr;
 
       maybe_warn_nodiscard (expr, implicit);
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b29ed0c..450b144 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -26551,6 +26551,11 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns)
       arguments = error_mark_node;
     else
       {
+	if (vec->is_empty())
+	  /* e.g. [[attr()]].  */
+	  error_at (token->location, "parentheses must be omitted if "
+		    "%qE attribute argument list is empty",
+		    attr_id);
 	arguments = build_tree_list_vec (vec);
 	release_tree_vector (vec);
       }
@@ -26565,9 +26570,9 @@ cp_parser_std_attribute (cp_parser *parser, tree attr_ns)
 }
 
 /* Check that the attribute ATTRIBUTE appears at most once in the
-   attribute-list ATTRIBUTES.  This is enforced for noreturn (7.6.3)
-   and deprecated (7.6.5).  Note that carries_dependency (7.6.4)
-   isn't implemented yet in GCC.  */
+   attribute-list ATTRIBUTES.  This is enforced for noreturn (7.6.3),
+   nodiscard, and deprecated (7.6.5).  Note that
+   carries_dependency (7.6.4) isn't implemented yet in GCC.  */
 
 static void
 cp_parser_check_std_attribute (tree attributes, tree attribute)
@@ -26583,6 +26588,10 @@ cp_parser_check_std_attribute (tree attributes, tree attribute)
 	       && lookup_attribute ("deprecated", attributes))
 	error ("attribute %<deprecated%> can appear at most once "
 	       "in an attribute-list");
+      else if (is_attribute_p ("nodiscard", name)
+	       && lookup_attribute ("nodiscard", attributes))
+	error ("attribute %<nodiscard%> can appear at most once "
+	       "in an attribute-list");
     }
 }
 
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 7f71891..a004bb1 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -4369,9 +4369,14 @@ zero_init_p (const_tree t)
    warn_unused_result attribute.  */
 
 static tree
-handle_nodiscard_attribute (tree *node, tree name, tree /*args*/,
+handle_nodiscard_attribute (tree *node, tree name, tree args,
 			    int /*flags*/, bool *no_add_attrs)
 {
+  if (args && TREE_CODE (TREE_VALUE (args)) != STRING_CST)
+    {
+      error ("%qE attribute argument must be a string constant", name);
+      *no_add_attrs = true;
+    }
   if (TREE_CODE (*node) == FUNCTION_DECL)
     {
       if (VOID_TYPE_P (TREE_TYPE (TREE_TYPE (*node)))
@@ -4461,7 +4466,7 @@ const struct attribute_spec std_attribute_table[] =
        affects_type_identity, handler, exclude } */
   { "maybe_unused", 0, 0, false, false, false, false,
     handle_unused_attribute, NULL },
-  { "nodiscard", 0, 0, false, false, false, false,
+  { "nodiscard", 0, 1, false, false, false, false,
     handle_nodiscard_attribute, NULL },
   { "no_unique_address", 0, 0, true, false, false, false,
     handle_no_unique_addr_attribute, NULL },
diff --git a/gcc/escaped_string.h b/gcc/escaped_string.h
new file mode 100644
index 0000000..b83e128
--- /dev/null
+++ b/gcc/escaped_string.h
@@ -0,0 +1,43 @@
+/* Shared escaped string class.
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_ESCAPED_STRING_H
+#define GCC_ESCAPED_STRING_H
+
+#include <cstdlib>
+
+/* A class to handle converting a string that might contain
+   control characters, (eg newline, form-feed, etc), into one
+   in which contains escape sequences instead.  */
+
+class escaped_string
+{
+ public:
+  escaped_string () { m_owned = false; m_str = NULL; };
+  ~escaped_string () { if (m_owned) free (m_str); }
+  operator const char *() const { return m_str; }
+  void escape (const char *);
+ private:
+  escaped_string(const escaped_string&) {}
+  escaped_string& operator=(const escaped_string&) { return *this; }
+  char *m_str;
+  bool  m_owned;
+};
+
+#endif /* ! GCC_ESCAPED_STRING_H */
diff --git a/gcc/testsuite/g++.dg/cpp0x/gen-attrs-67.C b/gcc/testsuite/g++.dg/cpp0x/gen-attrs-67.C
index 3dd3a1f..c195dfe 100644
--- a/gcc/testsuite/g++.dg/cpp0x/gen-attrs-67.C
+++ b/gcc/testsuite/g++.dg/cpp0x/gen-attrs-67.C
@@ -5,7 +5,7 @@
 [[noreturn(1)]] void f1 (); // { dg-error ".noreturn. attribute does not take any arguments" }
 [[noreturn(1, 2)]] void f2 (); // { dg-error ".noreturn. attribute does not take any arguments" }
 [[maybe_unused()]] int f3(); // { dg-error ".maybe_unused. attribute does not take any arguments" }
-[[nodiscard()]] int f4(); // { dg-error ".nodiscard. attribute does not take any arguments" }
+[[nodiscard()]] int f4(); // { dg-error "parentheses must be omitted if .nodiscard. attribute argument list is empty" }
 [[gnu::noinline()]] int f5(); // { dg-error ".noinline. attribute does not take any arguments" }
 [[gnu::constructor]] int f6();
 [[gnu::constructor(101)]] int f7(); // { dg-error "constructor priorities are not supported" "" { target { ! init_priority } } }
diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
index a5d9446..a18d6ae 100644
--- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
+++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
@@ -439,7 +439,7 @@
 
 #  if ! __has_cpp_attribute(nodiscard)
 #    error "__has_cpp_attribute(nodiscard)"
-#  elif __has_cpp_attribute(nodiscard) != 201603
+#  elif (__has_cpp_attribute(nodiscard) != 201603 && __has_cpp_attribute(nodiscard) != 201907)
 #    error "__has_cpp_attribute(nodiscard) != 201603"
 #  endif
 
diff --git a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
index 2b9cfd0..95251c2 100644
--- a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
+++ b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
@@ -470,8 +470,8 @@
 
 #  if ! __has_cpp_attribute(nodiscard)
 #    error "__has_cpp_attribute(nodiscard)"
-#  elif __has_cpp_attribute(nodiscard) != 201603
-#    error "__has_cpp_attribute(nodiscard) != 201603"
+#  elif __has_cpp_attribute(nodiscard) != 201907
+#    error "__has_cpp_attribute(nodiscard) != 201907"
 #  endif
 
 #  if ! __has_cpp_attribute(fallthrough)
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-constructor.c b/gcc/testsuite/g++.dg/cpp2a/nodiscard-constructor.c
new file mode 100644
index 0000000..a5c2c65
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-constructor.c
@@ -0,0 +1,13 @@
+/* nodiscard attribute tests  */
+/* { dg-do compile { target c++2a } } */
+/* { dg-options "-O -ftrack-macro-expansion=0" } */
+
+struct A { [[nodiscard("bad constructor")]] A() {} };
+struct B { [[nodiscard]] B() {} };
+
+void
+test (void)
+{
+  A{}; /* { dg-warning "(?n)nodiscard.*bad constructor" } */
+  B{}; /* { dg-warning "(?n)nodiscard" } */
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C
new file mode 100644
index 0000000..4518a11
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C
@@ -0,0 +1,12 @@
+/* nodiscard attribute tests  */
+/* { dg-do compile { target c++2a } } */
+/* { dg-options "-O -ftrack-macro-expansion=0" } */
+
+[[nodiscard, nodiscard]] int check1 (void); /* { dg-error "(?n)nodiscard.*can appear at most once" } */
+
+void
+test (void)
+{
+  check1 ();
+  (void) check1 ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C
new file mode 100644
index 0000000..af715e2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C
@@ -0,0 +1,12 @@
+/* nodiscard attribute tests  */
+/* { dg-do compile { target c++2a } } */
+/* { dg-options "-O -ftrack-macro-expansion=0" } */
+
+[[nodiscard(123)]] int check1 (void); /* { dg-error "(?n)nodiscard.*must be a string constant" } */
+
+void
+test (void)
+{
+  check1 ();
+  (void) check1 ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C
new file mode 100644
index 0000000..602a4e2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C
@@ -0,0 +1,12 @@
+/* nodiscard attribute tests  */
+/* { dg-do compile { target c++2a } } */
+/* { dg-options "-O -ftrack-macro-expansion=0" } */
+
+[[nodiscard("not", "allowed")]] int check1 (void); /* { dg-error "(?n)wrong number of arguments..*nodiscard" } */
+
+void
+test (void)
+{
+  check1 ();
+  (void) check1 ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C
new file mode 100644
index 0000000..0113c90
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C
@@ -0,0 +1,203 @@
+/* nodiscard attribute tests, adapted from gcc.dg/attr-warn-unused-result.c.  */
+/* { dg-do compile { target c++2a } } */
+/* { dg-options "-O -ftrack-macro-expansion=0" } */
+
+#define NODIS [[nodiscard("exact_message")]]
+#define NODISAI [[nodiscard("exact_inline_message"), gnu::always_inline]] inline
+enum [[nodiscard("exact_E_message")]] E { e };
+typedef E (*fnt) (void);
+
+typedef struct { long i; } A;
+typedef struct { long i; long j; } B;
+typedef struct { char big[1024]; fnt fn; } C;
+struct [[nodiscard("exact_D_message")]] D { int i; D(); ~D(); };
+
+NODIS E check1 (void);
+NODIS void check2 (void); /* { dg-warning "(?n)10:.nodiscard.*exact_message" } */
+NODIS int foo;         /* { dg-warning "(?n)9:.nodiscard.*exact_message" } */
+int bar (void);
+NODISAI E check3 (void) { return (E)bar (); }
+NODIS A check4 (void);
+NODIS B check5 (void);
+NODIS C check6 (void);
+A bar7 (void);
+B bar8 (void);
+C bar9 (void);
+NODISAI A check7 (void) { return bar7 (); }
+NODISAI B check8 (void) { return bar8 (); }
+NODISAI C check9 (void) { return bar9 (); }
+/* This is useful for checking whether return value of statement
+   expressions (returning int in this case) is used.  */
+NODISAI int check_int_result (int res) { return res; }
+#define GU(v) ({ int e = 0; (v) = bar (); if ((v) < 23) e = 14; e; })
+fnt fnptr;
+NODIS E check10 (void);
+int baz (void);
+NODISAI E check11 (void) { return (E)baz (); }
+int k;
+
+D check12();
+
+void
+test (void)
+{
+  int i = 0, j;
+  const fnt pcheck1 = check1;
+  const fnt pcheck3 = check3;
+  A a;
+  B b;
+  C c;
+  D d;
+  if (check1 ())
+    return;
+  i += check1 ();
+  i += ({ check1 (); });
+  check1 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  (void) check1 ();
+  check1 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check2 ();
+  (void) check2 ();
+  check2 (), bar ();
+  if (check3 ())
+    return;
+  i += check3 ();
+  i += ({ check3 (); });
+  check3 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (void) check3 ();
+  check3 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  a = check4 ();
+  if (a.i)
+    return;
+  if (check4 ().i)
+    return;
+  if (({ check4 (); }).i)
+    return;
+  check4 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  (void) check4 ();
+  check4 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  b = check5 ();
+  if (b.i + b.j)
+    return;
+  if (check5 ().j)
+    return;
+  if (({ check5 (); }).j)
+    return;
+  check5 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  (void) check5 ();
+  check5 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  c = check6 ();
+  if (c.big[12] + c.big[29])
+    return;
+  if (check6 ().big[27])
+    return;
+  if (({ check6 (); }).big[0])
+    return;
+  check6 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  (void) check6 ();
+  check6 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  a = check7 ();
+  if (a.i)
+    return;
+  if (check7 ().i)
+    return;
+  if (({ check7 (); }).i)
+    return;
+  check7 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (void) check7 ();
+  check7 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  b = check8 ();
+  if (b.i + b.j)
+    return;
+  if (check8 ().j)
+    return;
+  if (({ check8 (); }).j)
+    return;
+  check8 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (void) check8 ();
+  check8 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  c = check9 ();
+  if (c.big[12] + c.big[29])
+    return;
+  if (check9 ().big[27])
+    return;
+  if (({ check9 (); }).big[0])
+    return;
+  check9 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (void) check9 ();
+  check9 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  if (check_int_result (GU (j)))
+    return;
+  i += check_int_result (GU (j));
+  i += ({ check_int_result (GU (j)); });
+  check_int_result (GU (j)); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (void) check_int_result (GU (j));
+  check_int_result (GU (j)), bar (); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  if (fnptr ())
+    return;
+  i += fnptr ();
+  i += ({ fnptr (); });
+  fnptr ();            /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) fnptr ();
+  fnptr (), bar ();    /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr = check1;
+  if (fnptr ())
+    return;
+  i += fnptr ();
+  i += ({ fnptr (); });
+  fnptr ();            /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) fnptr ();
+  fnptr (), bar ();    /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr = check3;
+  if (fnptr ())
+    return;
+  i += fnptr ();
+  i += ({ fnptr (); });
+  fnptr ();            /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) fnptr ();
+  fnptr (), bar ();    /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  if (bar9 ().fn ())
+    return;
+  i += bar9 ().fn ();
+  i += ({ bar9 ().fn (); });
+  bar9 ().fn ();       /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) bar9 ().fn ();
+  bar9 ().fn (), bar (); /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  if ((k ? check1 : check10) ())
+    return;
+  i += (k ? check1 : check10) ();
+  i += ({ (k ? check1 : check10) (); });
+  (k ? check1 : check10) (); /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) (k ? check1 : check10) ();
+  (k ? check1 : check10) (), bar (); /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  if ((k ? check3 : check11) ())
+    return;
+  i += (k ? check3 : check11) ();
+  i += ({ (k ? check3 : check11) (); });
+  (k ? check3 : check11) (); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (void) (k ? check3 : check11) ();
+  (k ? check3 : check11) (), bar (); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  if (pcheck1 ())
+    return;
+  i += pcheck1 ();
+  i += ({ pcheck1 (); });
+  pcheck1 ();          /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) pcheck1 ();
+  pcheck1 (), bar ();  /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  if (pcheck3 ())
+    return;
+  i += pcheck3 ();
+  i += ({ pcheck3 (); });
+  pcheck3 ();          /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (void) pcheck3 ();
+  pcheck3 (), bar ();  /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  d = check12 ();
+  if (d.i)
+    return;
+  if (check12 ().i)
+    return;
+  if (({ check12 (); }).i)
+    return;
+  check12 ();          /* { dg-warning "(?n)nodiscard.*exact_D_message" } */
+  (void) check12 ();
+  check12 (), bar ();  /* { dg-warning "(?n)nodiscard.*exact_D_message" } */
+}
diff --git a/gcc/tree.c b/gcc/tree.c
index e845fc7..2bee1d2 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -68,6 +68,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "tree-vector-builder.h"
 #include "gimple-fold.h"
+#include "escaped_string.h"
 
 /* Tree code classes.  */
 
@@ -13225,22 +13226,6 @@ typedef_variant_p (const_tree type)
   return is_typedef_decl (TYPE_NAME (type));
 }
 
-/* A class to handle converting a string that might contain
-   control characters, (eg newline, form-feed, etc), into one
-   in which contains escape sequences instead.  */
-
-class escaped_string
-{
- public:
-  escaped_string () { m_owned = false; m_str = NULL; };
-  ~escaped_string () { if (m_owned) free (m_str); }
-  operator const char *() const { return (const char *) m_str; }
-  void escape (const char *);
- private:
-  char *m_str;
-  bool  m_owned;
-};
-
 /* PR 84195: Replace control characters in "unescaped" with their
    escaped equivalents.  Allow newlines if -fmessage-length has
    been set to a non-zero value.  This is done here, rather than
-- 
cgit v1.1


From dc7e9feb19598ea98afb14b18507562211d55349 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iains@gcc.gnu.org>
Date: Sat, 19 Oct 2019 07:34:23 +0000
Subject: [PPC] Delete out of date comment.

Removes a comment that's no longer relevant.

gcc/ChangeLog:

2019-10-19  Iain Sandoe  <iain@sandoe.co.uk>

	* config/rs6000/rs6000.md: Delete out--of-date comment about
	special-casing integer loads.

From-SVN: r277201
---
 gcc/ChangeLog               | 7 ++++++-
 gcc/config/rs6000/rs6000.md | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e03890..7f77088 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>
+2019-10-19  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/rs6000/rs6000.md: Delete out--of-date comment about
+	special-casing integer loads.
+
+2019-10-19  JeanHeyd Meneide  <phdofthehouse@gmail.com>
 
 	* escaped_string.h (escaped_string): New header.
 	* tree.c (escaped_string): Remove escaped_string class.
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 29dd616..d0cca1e 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -6890,11 +6890,6 @@
 				 UNSPEC_MOVSI_GOT))]
   "")
 
-;; For SI, we special-case integers that can't be loaded in one insn.  We
-;; do the load 16-bits at a time.  We could do this by loading from memory,
-;; and this is even supposed to be faster, but it is simpler not to get
-;; integers in the TOC.
-
 ;;		MR           LA           LWZ          LFIWZX       LXSIWZX
 ;;		STW          STFIWX       STXSIWX      LI           LIS
 ;;		#            XXLOR        XXSPLTIB 0   XXSPLTIB -1  VSPLTISW
-- 
cgit v1.1


From 2366bf60c667d968c88e7bcec2eb9e2b84d0172d Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sat, 19 Oct 2019 07:44:49 +0000
Subject: [Darwin, testsuite] Fix Wnonnull on Darwin.

Darwin does not mark entries in string.h with nonnull attributes
so the test fails.  Since the purpose of the test is to check that
the warnings are issued for an inlined function, not that the target
headers are marked up, we can provide marked up headers for Darwin.

gcc/testsuite/ChangeLog:

2019-10-19  Iain Sandoe  <iain@sandoe.co.uk>

	* gcc.dg/Wnonnull.c: Add attributed function declarations for
	memcpy and strlen for Darwin.

From-SVN: r277202
---
 gcc/testsuite/ChangeLog         | 5 +++++
 gcc/testsuite/gcc.dg/Wnonnull.c | 9 +++++++++
 2 files changed, 14 insertions(+)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a87247..6fc0c82 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-19  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/Wnonnull.c: Add attributed function declarations for
+	memcpy and strlen for Darwin.
+
 2019-10-18  Martin Sebor  <msebor@redhat.com>
 
 	PR tree-optimization/92157
diff --git a/gcc/testsuite/gcc.dg/Wnonnull.c b/gcc/testsuite/gcc.dg/Wnonnull.c
index be89a5a..a165baa 100644
--- a/gcc/testsuite/gcc.dg/Wnonnull.c
+++ b/gcc/testsuite/gcc.dg/Wnonnull.c
@@ -2,7 +2,16 @@
    { dg-do compile }
    { dg-options "-O2 -Wall" } */
 
+#ifndef __APPLE__
 #include <string.h>
+#else
+/* OSX headers do not mark up the nonnull elements yet.  */
+# include <stddef.h>
+extern size_t strlen (const char *__s)
+		      __attribute ((pure)) __attribute ((nonnull (1)));
+extern void *memcpy (void *__restrict __dest, const void *__restrict __src,
+		     size_t __n) __attribute ((nonnull (1, 2)));
+#endif
 
 char buf[100];
 
-- 
cgit v1.1


From 15643a0dfc60e8e53d9b66165f4e2f4fcd8d98de Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 19 Oct 2019 14:46:57 +0200
Subject: re PR target/92140 (clang vs gcc optimizing with adc/sbb)

	PR target/92140
	* config/i386/predicates.md (int_nonimmediate_operand): New special
	predicate.
	* config/i386/i386.md (*add<mode>3_eq, *add<mode>3_ne,
	*add<mode>3_eq_0, *add<mode>3_ne_0, *sub<mode>3_eq, *sub<mode>3_ne,
	*sub<mode>3_eq_1, *sub<mode>3_eq_0, *sub<mode>3_ne_0): New
	define_insn_and_split patterns.

	* gcc.target/i386/pr92140.c: New test.
	* gcc.c-torture/execute/pr92140.c: New test.

Co-Authored-By: Uros Bizjak <ubizjak@gmail.com>

From-SVN: r277203
---
 gcc/ChangeLog                                 |  11 ++
 gcc/config/i386/i386.md                       | 222 ++++++++++++++++++++++++++
 gcc/config/i386/predicates.md                 |   9 ++
 gcc/testsuite/ChangeLog                       |   6 +
 gcc/testsuite/gcc.c-torture/execute/pr92140.c |  83 ++++++++++
 gcc/testsuite/gcc.target/i386/pr92140.c       |  38 +++++
 6 files changed, 369 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr92140.c
 create mode 100644 gcc/testsuite/gcc.target/i386/pr92140.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f77088..4919539 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-19  Jakub Jelinek  <jakub@redhat.com>
+	    Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/92140
+	* config/i386/predicates.md (int_nonimmediate_operand): New special
+	predicate.
+	* config/i386/i386.md (*add<mode>3_eq, *add<mode>3_ne,
+	*add<mode>3_eq_0, *add<mode>3_ne_0, *sub<mode>3_eq, *sub<mode>3_ne,
+	*sub<mode>3_eq_1, *sub<mode>3_eq_0, *sub<mode>3_ne_0): New
+	define_insn_and_split patterns.
+
 2019-10-19  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/rs6000/rs6000.md: Delete out--of-date comment about
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index b7e7d12..a1b849e 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -6843,6 +6843,228 @@
   [(set_attr "type" "alu")
    (set_attr "mode" "SI")])
 
+;; x == 0 with zero flag test can be done also as x < 1U with carry flag
+;; test, where the latter is preferrable if we have some carry consuming
+;; instruction.
+;; For x != 0, we need to use x < 1U with negation of carry, i.e.
+;; + (1 - CF).
+(define_insn_and_split "*add<mode>3_eq"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(plus:SWI
+	  (plus:SWI
+	    (eq:SWI (match_operand 3 "int_nonimmediate_operand") (const_int 0))
+	    (match_operand:SWI 1 "nonimmediate_operand"))
+	  (match_operand:SWI 2 "<general_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_binary_operator_ok (PLUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 3) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (plus:SWI
+		     (plus:SWI (ltu:SWI (reg:CC FLAGS_REG) (const_int 0))
+			       (match_dup 1))
+		     (match_dup 2)))
+	      (clobber (reg:CC FLAGS_REG))])])
+
+(define_insn_and_split "*add<mode>3_ne"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(plus:SWI
+	  (plus:SWI
+	    (ne:SWI (match_operand 3 "int_nonimmediate_operand") (const_int 0))
+	    (match_operand:SWI 1 "nonimmediate_operand"))
+	  (match_operand:SWI 2 "<immediate_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "CONST_INT_P (operands[2])
+   && (<MODE>mode != DImode
+       || INTVAL (operands[2]) != HOST_WIDE_INT_C (-0x80000000))
+   && ix86_binary_operator_ok (PLUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 3) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (minus:SWI
+		     (minus:SWI (match_dup 1)
+				(ltu:SWI (reg:CC FLAGS_REG) (const_int 0)))
+		     (match_dup 2)))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  operands[2] = gen_int_mode (~INTVAL (operands[2]),
+			      <MODE>mode == DImode ? SImode : <MODE>mode);
+})
+
+(define_insn_and_split "*add<mode>3_eq_0"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(plus:SWI
+	  (eq:SWI (match_operand 2 "int_nonimmediate_operand") (const_int 0))
+	  (match_operand:SWI 1 "<general_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_unary_operator_ok (PLUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 2) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (plus:SWI (ltu:SWI (reg:CC FLAGS_REG) (const_int 0))
+			     (match_dup 1)))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!nonimmediate_operand (operands[1], <MODE>mode))
+    operands[1] = force_reg (<MODE>mode, operands[1]);
+})
+
+(define_insn_and_split "*add<mode>3_ne_0"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(plus:SWI
+	  (ne:SWI (match_operand 2 "int_nonimmediate_operand") (const_int 0))
+	  (match_operand:SWI 1 "<general_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_unary_operator_ok (PLUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 2) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (minus:SWI (minus:SWI
+				(match_dup 1)
+				(ltu:SWI (reg:CC FLAGS_REG) (const_int 0)))
+			      (const_int -1)))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!nonimmediate_operand (operands[1], <MODE>mode))
+    operands[1] = force_reg (<MODE>mode, operands[1]);
+})
+
+(define_insn_and_split "*sub<mode>3_eq"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(minus:SWI
+	  (minus:SWI
+	    (match_operand:SWI 1 "nonimmediate_operand")
+	    (eq:SWI (match_operand 3 "int_nonimmediate_operand")
+		    (const_int 0)))
+	  (match_operand:SWI 2 "<general_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 3) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (minus:SWI
+		     (minus:SWI (match_dup 1)
+				(ltu:SWI (reg:CC FLAGS_REG) (const_int 0)))
+		     (match_dup 2)))
+	      (clobber (reg:CC FLAGS_REG))])])
+
+(define_insn_and_split "*sub<mode>3_ne"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(plus:SWI
+	  (minus:SWI
+	    (match_operand:SWI 1 "nonimmediate_operand")
+	    (ne:SWI (match_operand 3 "int_nonimmediate_operand")
+		    (const_int 0)))
+	  (match_operand:SWI 2 "<immediate_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "CONST_INT_P (operands[2])
+   && (<MODE>mode != DImode
+       || INTVAL (operands[2]) != HOST_WIDE_INT_C (-0x80000000))
+   && ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 3) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (plus:SWI
+		     (plus:SWI (ltu:SWI (reg:CC FLAGS_REG) (const_int 0))
+			       (match_dup 1))
+		     (match_dup 2)))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  operands[2] = gen_int_mode (INTVAL (operands[2]) - 1,
+			      <MODE>mode == DImode ? SImode : <MODE>mode);
+})
+
+(define_insn_and_split "*sub<mode>3_eq_1"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(plus:SWI
+	  (minus:SWI
+	    (match_operand:SWI 1 "nonimmediate_operand")
+	    (eq:SWI (match_operand 3 "int_nonimmediate_operand")
+		    (const_int 0)))
+	  (match_operand:SWI 2 "<immediate_operand>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "CONST_INT_P (operands[2])
+   && (<MODE>mode != DImode
+       || INTVAL (operands[2]) != HOST_WIDE_INT_C (-0x80000000))
+   && ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 3) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (minus:SWI
+		     (minus:SWI (match_dup 1)
+				(ltu:SWI (reg:CC FLAGS_REG) (const_int 0)))
+		     (match_dup 2)))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  operands[2] = gen_int_mode (-INTVAL (operands[2]),
+			      <MODE>mode == DImode ? SImode : <MODE>mode);
+})
+
+(define_insn_and_split "*sub<mode>3_eq_0"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(minus:SWI
+	  (match_operand:SWI 1 "<general_operand>")
+	  (eq:SWI (match_operand 2 "int_nonimmediate_operand") (const_int 0))))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_unary_operator_ok (MINUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 2) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (minus:SWI (match_dup 1)
+			      (ltu:SWI (reg:CC FLAGS_REG) (const_int 0))))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!nonimmediate_operand (operands[1], <MODE>mode))
+    operands[1] = force_reg (<MODE>mode, operands[1]);
+})
+
+(define_insn_and_split "*sub<mode>3_ne_0"
+  [(set (match_operand:SWI 0 "nonimmediate_operand")
+	(minus:SWI
+	  (match_operand:SWI 1 "<general_operand>")
+	  (ne:SWI (match_operand 2 "int_nonimmediate_operand") (const_int 0))))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_unary_operator_ok (MINUS, <MODE>mode, operands)
+   && can_create_pseudo_p ()"
+  "#"
+  "&& 1"
+  [(set (reg:CC FLAGS_REG)
+	(compare:CC (match_dup 2) (const_int 1)))
+   (parallel [(set (match_dup 0)
+		   (plus:SWI (plus:SWI
+			       (ltu:SWI (reg:CC FLAGS_REG) (const_int 0))
+			       (match_dup 1))
+			     (const_int -1)))
+	      (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!nonimmediate_operand (operands[1], <MODE>mode))
+    operands[1] = force_reg (<MODE>mode, operands[1]);
+})
+
 ;; The patterns that match these are at the end of this file.
 
 (define_expand "<plusminus_insn>xf3"
diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index 31f1cea..279827f 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -100,6 +100,15 @@
 	    (match_test "GET_MODE (op) == SImode")
 	    (match_test "GET_MODE (op) == HImode"))))
 
+;; Match a DI, SI, HI or QImode nonimmediate_operand.
+(define_special_predicate "int_nonimmediate_operand"
+  (and (match_operand 0 "nonimmediate_operand")
+       (ior (and (match_test "TARGET_64BIT")
+		 (match_test "GET_MODE (op) == DImode"))
+	    (match_test "GET_MODE (op) == SImode")
+	    (match_test "GET_MODE (op) == HImode")
+	    (match_test "GET_MODE (op) == QImode"))))
+
 ;; Match register operands, but include memory operands for TARGET_SSE_MATH.
 (define_predicate "register_ssemem_operand"
   (if_then_else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6fc0c82..c22b137 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/92140
+	* gcc.target/i386/pr92140.c: New test.
+	* gcc.c-torture/execute/pr92140.c: New test.
+
 2019-10-19  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* gcc.dg/Wnonnull.c: Add attributed function declarations for
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr92140.c b/gcc/testsuite/gcc.c-torture/execute/pr92140.c
new file mode 100644
index 0000000..1036fd8
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr92140.c
@@ -0,0 +1,83 @@
+/* PR target/92140 */
+
+char c;
+int v;
+
+__attribute__((noipa)) void f1 (void) { v += c != 0; }
+__attribute__((noipa)) void f2 (void) { v -= c != 0; }
+__attribute__((noipa)) void f3 (void) { v += c == 0; }
+__attribute__((noipa)) void f4 (void) { v -= c == 0; }
+__attribute__((noipa)) void f5 (void) { v += (c != 0) - 26; }
+__attribute__((noipa)) void f6 (void) { v -= (c != 0) - 26; }
+__attribute__((noipa)) void f7 (void) { v += (c == 0) - 26; }
+__attribute__((noipa)) void f8 (void) { v -= (c == 0) - 26; }
+__attribute__((noipa)) void f9 (void) { v += (c != 0) + 42; }
+__attribute__((noipa)) void f10 (void) { v -= (c != 0) + 42; }
+__attribute__((noipa)) void f11 (void) { v += (c == 0) + 42; }
+__attribute__((noipa)) void f12 (void) { v -= (c == 0) + 42; }
+__attribute__((noipa)) void f13 (int z) { v += (c == 0) + z; }
+__attribute__((noipa)) void f14 (int z) { v -= (c == 0) + z; }
+__attribute__((noipa)) unsigned int f15 (unsigned int n) { return n ? 2 : 1; }
+
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 2; i++)
+    {
+      v = 15;
+      if (i == 1)
+	c = 37;
+      f1 ();
+      if (v != 15 + i)
+	__builtin_abort ();
+      f2 ();
+      if (v != 15)
+	__builtin_abort ();
+      f3 ();
+      if (v != 16 - i)
+	__builtin_abort ();
+      f4 ();
+      if (v != 15)
+	__builtin_abort ();
+      f5 ();
+      if (v != 15 + i - 26)
+	__builtin_abort ();
+      f6 ();
+      if (v != 15)
+	__builtin_abort ();
+      f7 ();
+      if (v != 16 - i - 26)
+	__builtin_abort ();
+      f8 ();
+      if (v != 15)
+	__builtin_abort ();
+      f9 ();
+      if (v != 15 + i + 42)
+	__builtin_abort ();
+      f10 ();
+      if (v != 15)
+	__builtin_abort ();
+      f11 ();
+      if (v != 16 - i + 42)
+	__builtin_abort ();
+      f12 ();
+      if (v != 15)
+	__builtin_abort ();
+      f13 (173);
+      if (v != 16 - i + 173)
+	__builtin_abort ();
+      f14 (173);
+      if (v != 15)
+	__builtin_abort ();
+      f13 (-35);
+      if (v != 16 - i - 35)
+	__builtin_abort ();
+      f14 (-35);
+      if (v != 15)
+	__builtin_abort ();
+    }
+  if (f15 (0) != 1 || f15 (1) != 2 || f15 (371) != 2)
+    __builtin_abort ();
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.target/i386/pr92140.c b/gcc/testsuite/gcc.target/i386/pr92140.c
new file mode 100644
index 0000000..f21544e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr92140.c
@@ -0,0 +1,38 @@
+/* PR target/92140 */
+/* { dg-do compile { target nonpic } } */
+/* { dg-options "-O2 -mtune=generic -masm=att" } */
+/* { dg-additional-options "-mregparm=1" { target ia32 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$-1, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t\\\$-1, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t\\\$0, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$0, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$25, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t\\\$25, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t\\\$-26, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$-26, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$-43, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t\\\$-43, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t\\\$42, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$42, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tadcl\t%\[a-z0-9]*, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t%\[a-z0-9]*, v" 1 } } */
+/* { dg-final { scan-assembler-times "\tsbbl\t\\\$-1, %" 1 } } */
+
+char c;
+int v;
+
+__attribute__((noipa)) void f1 (void) { v += c != 0; }
+__attribute__((noipa)) void f2 (void) { v -= c != 0; }
+__attribute__((noipa)) void f3 (void) { v += c == 0; }
+__attribute__((noipa)) void f4 (void) { v -= c == 0; }
+__attribute__((noipa)) void f5 (void) { v += (c != 0) - 26; }
+__attribute__((noipa)) void f6 (void) { v -= (c != 0) - 26; }
+__attribute__((noipa)) void f7 (void) { v += (c == 0) - 26; }
+__attribute__((noipa)) void f8 (void) { v -= (c == 0) - 26; }
+__attribute__((noipa)) void f9 (void) { v += (c != 0) + 42; }
+__attribute__((noipa)) void f10 (void) { v -= (c != 0) + 42; }
+__attribute__((noipa)) void f11 (void) { v += (c == 0) + 42; }
+__attribute__((noipa)) void f12 (void) { v -= (c == 0) + 42; }
+__attribute__((noipa)) void f13 (int z) { v += (c == 0) + z; }
+__attribute__((noipa)) void f14 (int z) { v -= (c == 0) + z; }
+__attribute__((noipa)) unsigned int f15 (unsigned int n) { return n ? 2 : 1; }
-- 
cgit v1.1


From 0fcd86290d8ec7dbe8eb8c13b6767cb1775ccd3f Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 20 Oct 2019 00:27:10 +0200
Subject: nodiscard-reason-only-one.C: In dg-error or dg-warning remove (?n)
 uses and replace .* with \[^\n\r]*.

	* g++.dg/cpp2a/nodiscard-reason-only-one.C: In dg-error or dg-warning
	remove (?n) uses and replace .* with \[^\n\r]*.
	* g++.dg/cpp2a/nodiscard-reason.C: Likewise.
	* g++.dg/cpp2a/nodiscard-once.C: Likewise.
	* g++.dg/cpp2a/nodiscard-reason-nonstring.C: Likewise.

From-SVN: r277205
---
 gcc/testsuite/ChangeLog                            |  8 +++
 gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C        |  2 +-
 .../g++.dg/cpp2a/nodiscard-reason-nonstring.C      |  2 +-
 .../g++.dg/cpp2a/nodiscard-reason-only-one.C       |  2 +-
 gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C      | 76 +++++++++++-----------
 5 files changed, 49 insertions(+), 41 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c22b137..d03774b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/cpp2a/nodiscard-reason-only-one.C: In dg-error or dg-warning
+	remove (?n) uses and replace .* with \[^\n\r]*.
+	* g++.dg/cpp2a/nodiscard-reason.C: Likewise.
+	* g++.dg/cpp2a/nodiscard-once.C: Likewise.
+	* g++.dg/cpp2a/nodiscard-reason-nonstring.C: Likewise.
+
 2019-10-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/92140
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C
index 4518a11..b9dde5c 100644
--- a/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-once.C
@@ -2,7 +2,7 @@
 /* { dg-do compile { target c++2a } } */
 /* { dg-options "-O -ftrack-macro-expansion=0" } */
 
-[[nodiscard, nodiscard]] int check1 (void); /* { dg-error "(?n)nodiscard.*can appear at most once" } */
+[[nodiscard, nodiscard]] int check1 (void); /* { dg-error "nodiscard\[^\n\r]*can appear at most once" } */
 
 void
 test (void)
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C
index af715e2..76692e7 100644
--- a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C
@@ -2,7 +2,7 @@
 /* { dg-do compile { target c++2a } } */
 /* { dg-options "-O -ftrack-macro-expansion=0" } */
 
-[[nodiscard(123)]] int check1 (void); /* { dg-error "(?n)nodiscard.*must be a string constant" } */
+[[nodiscard(123)]] int check1 (void); /* { dg-error "nodiscard\[^\n\r]*must be a string constant" } */
 
 void
 test (void)
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C
index 602a4e2..d42f4dc 100644
--- a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-only-one.C
@@ -2,7 +2,7 @@
 /* { dg-do compile { target c++2a } } */
 /* { dg-options "-O -ftrack-macro-expansion=0" } */
 
-[[nodiscard("not", "allowed")]] int check1 (void); /* { dg-error "(?n)wrong number of arguments..*nodiscard" } */
+[[nodiscard("not", "allowed")]] int check1 (void); /* { dg-error "wrong number of arguments.\[^\n\r]*nodiscard" } */
 
 void
 test (void)
diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C
index 0113c90..e0230b1 100644
--- a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C
+++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason.C
@@ -13,8 +13,8 @@ typedef struct { char big[1024]; fnt fn; } C;
 struct [[nodiscard("exact_D_message")]] D { int i; D(); ~D(); };
 
 NODIS E check1 (void);
-NODIS void check2 (void); /* { dg-warning "(?n)10:.nodiscard.*exact_message" } */
-NODIS int foo;         /* { dg-warning "(?n)9:.nodiscard.*exact_message" } */
+NODIS void check2 (void); /* { dg-warning "10:.nodiscard\[^\n\r]*exact_message" } */
+NODIS int foo;         /* { dg-warning "9:.nodiscard\[^\n\r]*exact_message" } */
 int bar (void);
 NODISAI E check3 (void) { return (E)bar (); }
 NODIS A check4 (void);
@@ -52,9 +52,9 @@ test (void)
     return;
   i += check1 ();
   i += ({ check1 (); });
-  check1 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check1 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   (void) check1 ();
-  check1 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check1 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   check2 ();
   (void) check2 ();
   check2 (), bar ();
@@ -62,9 +62,9 @@ test (void)
     return;
   i += check3 ();
   i += ({ check3 (); });
-  check3 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check3 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   (void) check3 ();
-  check3 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check3 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   a = check4 ();
   if (a.i)
     return;
@@ -72,9 +72,9 @@ test (void)
     return;
   if (({ check4 (); }).i)
     return;
-  check4 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check4 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   (void) check4 ();
-  check4 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check4 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   b = check5 ();
   if (b.i + b.j)
     return;
@@ -82,9 +82,9 @@ test (void)
     return;
   if (({ check5 (); }).j)
     return;
-  check5 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check5 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   (void) check5 ();
-  check5 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check5 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   c = check6 ();
   if (c.big[12] + c.big[29])
     return;
@@ -92,9 +92,9 @@ test (void)
     return;
   if (({ check6 (); }).big[0])
     return;
-  check6 ();           /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check6 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   (void) check6 ();
-  check6 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_message" } */
+  check6 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_message" } */
   a = check7 ();
   if (a.i)
     return;
@@ -102,9 +102,9 @@ test (void)
     return;
   if (({ check7 (); }).i)
     return;
-  check7 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check7 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   (void) check7 ();
-  check7 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check7 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   b = check8 ();
   if (b.i + b.j)
     return;
@@ -112,9 +112,9 @@ test (void)
     return;
   if (({ check8 (); }).j)
     return;
-  check8 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check8 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   (void) check8 ();
-  check8 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check8 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   c = check9 ();
   if (c.big[12] + c.big[29])
     return;
@@ -122,74 +122,74 @@ test (void)
     return;
   if (({ check9 (); }).big[0])
     return;
-  check9 ();           /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check9 ();           /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   (void) check9 ();
-  check9 (), bar ();   /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check9 (), bar ();   /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   if (check_int_result (GU (j)))
     return;
   i += check_int_result (GU (j));
   i += ({ check_int_result (GU (j)); });
-  check_int_result (GU (j)); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check_int_result (GU (j)); /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   (void) check_int_result (GU (j));
-  check_int_result (GU (j)), bar (); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  check_int_result (GU (j)), bar (); /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   if (fnptr ())
     return;
   i += fnptr ();
   i += ({ fnptr (); });
-  fnptr ();            /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr ();            /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) fnptr ();
-  fnptr (), bar ();    /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr (), bar ();    /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   fnptr = check1;
   if (fnptr ())
     return;
   i += fnptr ();
   i += ({ fnptr (); });
-  fnptr ();            /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr ();            /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) fnptr ();
-  fnptr (), bar ();    /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr (), bar ();    /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   fnptr = check3;
   if (fnptr ())
     return;
   i += fnptr ();
   i += ({ fnptr (); });
-  fnptr ();            /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr ();            /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) fnptr ();
-  fnptr (), bar ();    /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  fnptr (), bar ();    /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   if (bar9 ().fn ())
     return;
   i += bar9 ().fn ();
   i += ({ bar9 ().fn (); });
-  bar9 ().fn ();       /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  bar9 ().fn ();       /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) bar9 ().fn ();
-  bar9 ().fn (), bar (); /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  bar9 ().fn (), bar (); /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   if ((k ? check1 : check10) ())
     return;
   i += (k ? check1 : check10) ();
   i += ({ (k ? check1 : check10) (); });
-  (k ? check1 : check10) (); /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (k ? check1 : check10) (); /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) (k ? check1 : check10) ();
-  (k ? check1 : check10) (), bar (); /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  (k ? check1 : check10) (), bar (); /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   if ((k ? check3 : check11) ())
     return;
   i += (k ? check3 : check11) ();
   i += ({ (k ? check3 : check11) (); });
-  (k ? check3 : check11) (); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (k ? check3 : check11) (); /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   (void) (k ? check3 : check11) ();
-  (k ? check3 : check11) (), bar (); /* { dg-warning "(?n)nodiscard.*exact_inline_message" } */
+  (k ? check3 : check11) (), bar (); /* { dg-warning "nodiscard\[^\n\r]*exact_inline_message" } */
   if (pcheck1 ())
     return;
   i += pcheck1 ();
   i += ({ pcheck1 (); });
-  pcheck1 ();          /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  pcheck1 ();          /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) pcheck1 ();
-  pcheck1 (), bar ();  /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  pcheck1 (), bar ();  /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   if (pcheck3 ())
     return;
   i += pcheck3 ();
   i += ({ pcheck3 (); });
-  pcheck3 ();          /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  pcheck3 ();          /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   (void) pcheck3 ();
-  pcheck3 (), bar ();  /* { dg-warning "(?n)nodiscard.*exact_E_message" } */
+  pcheck3 (), bar ();  /* { dg-warning "nodiscard\[^\n\r]*exact_E_message" } */
   d = check12 ();
   if (d.i)
     return;
@@ -197,7 +197,7 @@ test (void)
     return;
   if (({ check12 (); }).i)
     return;
-  check12 ();          /* { dg-warning "(?n)nodiscard.*exact_D_message" } */
+  check12 ();          /* { dg-warning "nodiscard\[^\n\r]*exact_D_message" } */
   (void) check12 ();
-  check12 (), bar ();  /* { dg-warning "(?n)nodiscard.*exact_D_message" } */
+  check12 (), bar ();  /* { dg-warning "nodiscard\[^\n\r]*exact_D_message" } */
 }
-- 
cgit v1.1


From b4edf5c524fd0d8fef50f991ce876c6eb5ed3a28 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Sun, 20 Oct 2019 00:16:28 +0000
Subject: Daily bump.

From-SVN: r277209
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 7fd1715..cf3b588 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191019
+20191020
-- 
cgit v1.1


From fa0c8df71d4f0476834db0b7cd88524878b46cf7 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Sun, 20 Oct 2019 12:58:22 +0000
Subject: Avoid recomputing data references in BB SLP

If the first attempt at applying BB SLP to a region fails, the main loop
in vect_slp_bb recomputes the region's bounds and datarefs for the next
vector size.  AFAICT this isn't needed any more; we should be able
to reuse the datarefs from the first attempt instead.

2019-10-20  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-slp.c (vect_slp_analyze_bb_1): Call save_datarefs
	when processing the given datarefs for the first time and
	check_datarefs subsequently.
	(vect_slp_bb_region): New function, split out of...
	(vect_slp_bb): ...here.  Don't recompute the region bounds and
	dataref sets when retrying with a different vector size.

From-SVN: r277210
---
 gcc/ChangeLog       |   9 ++++
 gcc/tree-vect-slp.c | 136 +++++++++++++++++++++++++++-------------------------
 2 files changed, 81 insertions(+), 64 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4919539..42cba4b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-20  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-vect-slp.c (vect_slp_analyze_bb_1): Call save_datarefs
+	when processing the given datarefs for the first time and
+	check_datarefs subsequently.
+	(vect_slp_bb_region): New function, split out of...
+	(vect_slp_bb): ...here.  Don't recompute the region bounds and
+	dataref sets when retrying with a different vector size.
+
 2019-10-19  Jakub Jelinek  <jakub@redhat.com>
 	    Uroš Bizjak  <ubizjak@gmail.com>
 
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 77b18ba..d21d18f 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -2852,6 +2852,7 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
   slp_instance instance;
   int i;
   poly_uint64 min_vf = 2;
+  bool first_time_p = shared->datarefs.is_empty ();
 
   /* The first group of checks is independent of the vector size.  */
   fatal = true;
@@ -2871,7 +2872,10 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
     return NULL;
 
   BB_VINFO_DATAREFS (bb_vinfo) = datarefs;
-  bb_vinfo->shared->save_datarefs ();
+  if (first_time_p)
+    bb_vinfo->shared->save_datarefs ();
+  else
+    bb_vinfo->shared->check_datarefs ();
 
   /* Analyze the data references.  */
 
@@ -3007,16 +3011,18 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
   return bb_vinfo;
 }
 
+/* Subroutine of vect_slp_bb.  Try to vectorize the statements between
+   REGION_BEGIN (inclusive) and REGION_END (exclusive), returning true
+   on success.  The region has N_STMTS statements and has the datarefs
+   given by DATAREFS.  */
 
-/* Main entry for the BB vectorizer.  Analyze and transform BB, returns
-   true if anything in the basic-block was vectorized.  */
-
-bool
-vect_slp_bb (basic_block bb)
+static bool
+vect_slp_bb_region (gimple_stmt_iterator region_begin,
+		    gimple_stmt_iterator region_end,
+		    vec<data_reference_p> datarefs,
+		    unsigned int n_stmts)
 {
   bb_vec_info bb_vinfo;
-  gimple_stmt_iterator gsi;
-  bool any_vectorized = false;
   auto_vector_sizes vector_sizes;
 
   /* Autodetect first vector size we try.  */
@@ -3024,46 +3030,15 @@ vect_slp_bb (basic_block bb)
   targetm.vectorize.autovectorize_vector_sizes (&vector_sizes, false);
   unsigned int next_size = 0;
 
-  gsi = gsi_start_bb (bb);
+  vec_info_shared shared;
 
   poly_uint64 autodetected_vector_size = 0;
   while (1)
     {
-      if (gsi_end_p (gsi))
-	break;
-
-      gimple_stmt_iterator region_begin = gsi;
-      vec<data_reference_p> datarefs = vNULL;
-      int insns = 0;
-
-      for (; !gsi_end_p (gsi); gsi_next (&gsi))
-	{
-	  gimple *stmt = gsi_stmt (gsi);
-	  if (is_gimple_debug (stmt))
-	    continue;
-	  insns++;
-
-	  if (gimple_location (stmt) != UNKNOWN_LOCATION)
-	    vect_location = stmt;
-
-	  if (!vect_find_stmt_data_reference (NULL, stmt, &datarefs))
-	    break;
-	}
-
-      /* Skip leading unhandled stmts.  */
-      if (gsi_stmt (region_begin) == gsi_stmt (gsi))
-	{
-	  gsi_next (&gsi);
-	  continue;
-	}
-
-      gimple_stmt_iterator region_end = gsi;
-
       bool vectorized = false;
       bool fatal = false;
-      vec_info_shared shared;
       bb_vinfo = vect_slp_analyze_bb_1 (region_begin, region_end,
-					datarefs, insns, fatal, &shared);
+					datarefs, n_stmts, fatal, &shared);
       if (bb_vinfo
 	  && dbg_cnt (vect_slp))
 	{
@@ -3090,8 +3065,6 @@ vect_slp_bb (basic_block bb)
 	}
       delete bb_vinfo;
 
-      any_vectorized |= vectorized;
-
       if (next_size == 0)
 	autodetected_vector_size = current_vector_size;
 
@@ -3105,33 +3078,68 @@ vect_slp_bb (basic_block bb)
 	  /* If vect_slp_analyze_bb_1 signaled that analysis for all
 	     vector sizes will fail do not bother iterating.  */
 	  || fatal)
+	return vectorized;
+
+      /* Try the next biggest vector size.  */
+      current_vector_size = vector_sizes[next_size++];
+      if (dump_enabled_p ())
 	{
-	  if (gsi_end_p (region_end))
-	    break;
+	  dump_printf_loc (MSG_NOTE, vect_location,
+			   "***** Re-trying analysis with "
+			   "vector size ");
+	  dump_dec (MSG_NOTE, current_vector_size);
+	  dump_printf (MSG_NOTE, "\n");
+	}
+    }
+}
 
-	  /* Skip the unhandled stmt.  */
-	  gsi_next (&gsi);
+/* Main entry for the BB vectorizer.  Analyze and transform BB, returns
+   true if anything in the basic-block was vectorized.  */
 
-	  /* And reset vector sizes.  */
-	  current_vector_size = 0;
-	  next_size = 0;
-	}
-      else
+bool
+vect_slp_bb (basic_block bb)
+{
+  gimple_stmt_iterator gsi;
+  bool any_vectorized = false;
+
+  gsi = gsi_start_bb (bb);
+  while (!gsi_end_p (gsi))
+    {
+      gimple_stmt_iterator region_begin = gsi;
+      vec<data_reference_p> datarefs = vNULL;
+      int insns = 0;
+
+      for (; !gsi_end_p (gsi); gsi_next (&gsi))
 	{
-	  /* Try the next biggest vector size.  */
-	  current_vector_size = vector_sizes[next_size++];
-	  if (dump_enabled_p ())
-	    {
-	      dump_printf_loc (MSG_NOTE, vect_location,
-			       "***** Re-trying analysis with "
-			       "vector size ");
-	      dump_dec (MSG_NOTE, current_vector_size);
-	      dump_printf (MSG_NOTE, "\n");
-	    }
+	  gimple *stmt = gsi_stmt (gsi);
+	  if (is_gimple_debug (stmt))
+	    continue;
+	  insns++;
+
+	  if (gimple_location (stmt) != UNKNOWN_LOCATION)
+	    vect_location = stmt;
+
+	  if (!vect_find_stmt_data_reference (NULL, stmt, &datarefs))
+	    break;
+	}
 
-	  /* Start over.  */
-	  gsi = region_begin;
+      /* Skip leading unhandled stmts.  */
+      if (gsi_stmt (region_begin) == gsi_stmt (gsi))
+	{
+	  gsi_next (&gsi);
+	  continue;
 	}
+
+      gimple_stmt_iterator region_end = gsi;
+
+      if (vect_slp_bb_region (region_begin, region_end, datarefs, insns))
+	any_vectorized = true;
+
+      if (gsi_end_p (region_end))
+	break;
+
+      /* Skip the unhandled stmt.  */
+      gsi_next (&gsi);
     }
 
   return any_vectorized;
-- 
cgit v1.1


From 1d778697b37aec23db5b6003dfe08d2d78bd9424 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Sun, 20 Oct 2019 12:59:45 +0000
Subject: Move code out of vect_slp_analyze_bb_1

After the previous patch, it seems more natural to apply the
PARAM_SLP_MAX_INSNS_IN_BB threshold as soon as we know what
the region is, rather than delaying it to vect_slp_analyze_bb_1.
(But rather than carve out the biggest region possible and then
reject it, wouldn't it be better to stop when the region gets
too big, to at least give us a chance of vectorising something?)

It also seems more natural for vect_slp_bb_region to create the
bb_vec_info itself rather than (a) having to pass bits of data down
for the initialisation and (b) forcing vect_slp_analyze_bb_1 to free
on every failure return.

2019-10-20  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-slp.c (vect_slp_analyze_bb_1): Take a bb_vec_info
	and return a boolean success value.  Move the allocation and
	initialization of the bb_vec_info to...
	(vect_slp_bb_region): ...here.  Update call accordingly.
	(vect_slp_bb): Apply PARAM_SLP_MAX_INSNS_IN_BB here rather
	than in vect_slp_analyze_bb_1.

From-SVN: r277211
---
 gcc/ChangeLog       |  9 +++++
 gcc/tree-vect-slp.c | 97 +++++++++++++++++++----------------------------------
 2 files changed, 44 insertions(+), 62 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42cba4b..f35cb40 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-20  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vect-slp.c (vect_slp_analyze_bb_1): Take a bb_vec_info
+	and return a boolean success value.  Move the allocation and
+	initialization of the bb_vec_info to...
+	(vect_slp_bb_region): ...here.  Update call accordingly.
+	(vect_slp_bb): Apply PARAM_SLP_MAX_INSNS_IN_BB here rather
+	than in vect_slp_analyze_bb_1.
+
+2019-10-20  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vect-slp.c (vect_slp_analyze_bb_1): Call save_datarefs
 	when processing the given datarefs for the first time and
 	check_datarefs subsequently.
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index d21d18f..5b4b37f 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -2836,47 +2836,24 @@ vect_bb_vectorization_profitable_p (bb_vec_info bb_vinfo)
   return true;
 }
 
-/* Check if the basic block can be vectorized.  Returns a bb_vec_info
-   if so and sets fatal to true if failure is independent of
-   current_vector_size.  */
-
-static bb_vec_info
-vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
-		       gimple_stmt_iterator region_end,
-		       vec<data_reference_p> datarefs, int n_stmts,
-		       bool &fatal, vec_info_shared *shared)
+/* Check if the region described by BB_VINFO can be vectorized, returning
+   true if so.  When returning false, set FATAL to true if the same failure
+   would prevent vectorization at other vector sizes, false if it is still
+   worth trying other sizes.  N_STMTS is the number of statements in the
+   region.  */
+
+static bool
+vect_slp_analyze_bb_1 (bb_vec_info bb_vinfo, int n_stmts, bool &fatal)
 {
   DUMP_VECT_SCOPE ("vect_slp_analyze_bb");
 
-  bb_vec_info bb_vinfo;
   slp_instance instance;
   int i;
   poly_uint64 min_vf = 2;
-  bool first_time_p = shared->datarefs.is_empty ();
 
   /* The first group of checks is independent of the vector size.  */
   fatal = true;
 
-  if (n_stmts > PARAM_VALUE (PARAM_SLP_MAX_INSNS_IN_BB))
-    {
-      if (dump_enabled_p ())
-	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			 "not vectorized: too many instructions in "
-			 "basic block.\n");
-      free_data_refs (datarefs);
-      return NULL;
-    }
-
-  bb_vinfo = new _bb_vec_info (region_begin, region_end, shared);
-  if (!bb_vinfo)
-    return NULL;
-
-  BB_VINFO_DATAREFS (bb_vinfo) = datarefs;
-  if (first_time_p)
-    bb_vinfo->shared->save_datarefs ();
-  else
-    bb_vinfo->shared->check_datarefs ();
-
   /* Analyze the data references.  */
 
   if (!vect_analyze_data_refs (bb_vinfo, &min_vf, NULL))
@@ -2885,9 +2862,7 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
         dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			 "not vectorized: unhandled data-ref in basic "
 			 "block.\n");
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   if (BB_VINFO_DATAREFS (bb_vinfo).length () < 2)
@@ -2896,9 +2871,7 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
         dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			 "not vectorized: not enough data-refs in "
 			 "basic block.\n");
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   if (!vect_analyze_data_ref_accesses (bb_vinfo))
@@ -2907,9 +2880,7 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
        dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			"not vectorized: unhandled data access in "
 			"basic block.\n");
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   /* If there are no grouped stores in the region there is no need
@@ -2921,9 +2892,7 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
 	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			 "not vectorized: no grouped stores in "
 			 "basic block.\n");
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   /* While the rest of the analysis below depends on it in some way.  */
@@ -2943,9 +2912,7 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
 			   "not vectorized: failed to find SLP opportunities "
 			   "in basic block.\n");
 	}
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   vect_record_base_alignments (bb_vinfo);
@@ -2976,19 +2943,14 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
       i++;
     }
   if (! BB_VINFO_SLP_INSTANCES (bb_vinfo).length ())
-    {
-      delete bb_vinfo;
-      return NULL;
-    }
+    return false;
 
   if (!vect_slp_analyze_operations (bb_vinfo))
     {
       if (dump_enabled_p ())
         dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			 "not vectorized: bad operation in basic block.\n");
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   /* Cost model: check if the vectorization is worthwhile.  */
@@ -2999,16 +2961,13 @@ vect_slp_analyze_bb_1 (gimple_stmt_iterator region_begin,
         dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			 "not vectorized: vectorization is not "
 			 "profitable.\n");
-
-      delete bb_vinfo;
-      return NULL;
+      return false;
     }
 
   if (dump_enabled_p ())
     dump_printf_loc (MSG_NOTE, vect_location,
 		     "Basic block will be vectorized using SLP\n");
-
-  return bb_vinfo;
+  return true;
 }
 
 /* Subroutine of vect_slp_bb.  Try to vectorize the statements between
@@ -3037,9 +2996,16 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
     {
       bool vectorized = false;
       bool fatal = false;
-      bb_vinfo = vect_slp_analyze_bb_1 (region_begin, region_end,
-					datarefs, n_stmts, fatal, &shared);
-      if (bb_vinfo
+      bb_vinfo = new _bb_vec_info (region_begin, region_end, &shared);
+
+      bool first_time_p = shared.datarefs.is_empty ();
+      BB_VINFO_DATAREFS (bb_vinfo) = datarefs;
+      if (first_time_p)
+	bb_vinfo->shared->save_datarefs ();
+      else
+	bb_vinfo->shared->check_datarefs ();
+
+      if (vect_slp_analyze_bb_1 (bb_vinfo, n_stmts, fatal)
 	  && dbg_cnt (vect_slp))
 	{
 	  if (dump_enabled_p ())
@@ -3132,7 +3098,14 @@ vect_slp_bb (basic_block bb)
 
       gimple_stmt_iterator region_end = gsi;
 
-      if (vect_slp_bb_region (region_begin, region_end, datarefs, insns))
+      if (insns > PARAM_VALUE (PARAM_SLP_MAX_INSNS_IN_BB))
+	{
+	  if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "not vectorized: too many instructions in "
+			     "basic block.\n");
+	}
+      else if (vect_slp_bb_region (region_begin, region_end, datarefs, insns))
 	any_vectorized = true;
 
       if (gsi_end_p (region_end))
-- 
cgit v1.1


From f373041ce59c7a1d13b733a167339815717e19f5 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Sun, 20 Oct 2019 20:53:37 +0200
Subject: tree-ssa-alias.c (nonoverlapping_refs_since_match_p): Do not skip
 non-zero array accesses.

	* tree-ssa-alias.c (nonoverlapping_refs_since_match_p): Do not
	skip non-zero array accesses.

	* gcc.c-torture/execute/alias-access-path-2.c: New testcase.
	* gcc.dg/tree-ssa/alias-access-path-11.c: xfail.

From-SVN: r277214
---
 gcc/ChangeLog                                      |  5 ++++
 gcc/testsuite/ChangeLog                            |  5 ++++
 .../gcc.c-torture/execute/alias-access-path-2.c    | 11 +++++++++
 .../gcc.dg/tree-ssa/alias-access-path-11.c         |  2 +-
 gcc/tree-ssa-alias.c                               | 28 +++++++++++++++++-----
 5 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/alias-access-path-2.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f35cb40..fec3514 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-20  Jan Hubicka  <hubicka@ucw.cz>
+
+	* tree-ssa-alias.c (nonoverlapping_refs_since_match_p): Do not
+	skip non-zero array accesses.
+
 2019-10-20  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-vect-slp.c (vect_slp_analyze_bb_1): Take a bb_vec_info
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d03774b..681cee6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-20  Jan Hubicka  <hubicka@ucw.cz>
+
+	* gcc.c-torture/execute/alias-access-path-2.c: New testcase.
+	* gcc.dg/tree-ssa/alias-access-path-11.c: xfail.
+
 2019-10-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* g++.dg/cpp2a/nodiscard-reason-only-one.C: In dg-error or dg-warning
diff --git a/gcc/testsuite/gcc.c-torture/execute/alias-access-path-2.c b/gcc/testsuite/gcc.c-torture/execute/alias-access-path-2.c
new file mode 100644
index 0000000..6dab37c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/alias-access-path-2.c
@@ -0,0 +1,11 @@
+int
+main (int argc, char **argv)
+{
+  int c;
+  unsigned char out[][1] = { {71}, {71}, {71} };
+
+  for (int i = 0; i < 3; i++)
+    if (!out[i][0])
+      __builtin_abort ();
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-access-path-11.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-access-path-11.c
index 1f83714..45d1b74 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-access-path-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-access-path-11.c
@@ -12,4 +12,4 @@ test(int i,int j)
   (*innerptr)[3][j]=11;
   return (*barptr)[i][2][j];
 }
-/* { dg-final { scan-tree-dump-times "return 10" 1 "fre3"} } */
+/* { dg-final { scan-tree-dump-times "return 10" 1 "fre3" { xfail *-*-* } } } */
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index d6c4438..4cfe3e2 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -1444,20 +1444,36 @@ nonoverlapping_refs_since_match_p (tree match1, tree ref1,
 	  for (; narray_refs1 > narray_refs2; narray_refs1--)
 	    {
 	      ref1 = component_refs1.pop ();
-	      /* Track whether we possibly introduced partial overlap assuming
-		 that innermost type sizes does not match.  This only can
-		 happen if the offset introduced by the ARRAY_REF
-		 is non-zero.  */
+
+	      /* If index is non-zero we need to check whether the reference
+		 does not break the main invariant that bases are either
+		 disjoint or equal.  Consider the example:
+
+		 unsigned char out[][1];
+		 out[1]="a";
+		 out[i][0];
+
+		 Here bases out and out are same, but after removing the
+		 [i] index, this invariant no longer holds, because
+		 out[i] points to the middle of array out.
+
+		 TODO: If size of type of the skipped reference is an integer
+		 multiply of the size of type of the other reference this
+		 invariant can be verified, but even then it is not completely
+		 safe with !flag_strict_aliasing if the other reference contains
+		 unbounded array accesses.
+		 See   */
+
 	      if (!operand_equal_p (TREE_OPERAND (ref1, 1),
 				    cheap_array_ref_low_bound (ref1), 0))
-	        seen_unmatched_ref_p = true;
+		return 0;
 	    }
 	  for (; narray_refs2 > narray_refs1; narray_refs2--)
 	    {
 	      ref2 = component_refs2.pop ();
 	      if (!operand_equal_p (TREE_OPERAND (ref2, 1),
 				    cheap_array_ref_low_bound (ref2), 0))
-	        seen_unmatched_ref_p = true;
+		return 0;
 	    }
 	  /* Try to disambiguate matched arrays.  */
 	  for (unsigned int i = 0; i < narray_refs1; i++)
-- 
cgit v1.1


From efbf0f1ed205adee3d5bd7267c977f2b39e6cac3 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@pfeifer.com>
Date: Sun, 20 Oct 2019 20:15:28 +0000
Subject: install.texi (Configuration, [...]): hboehm.info now defaults to
 https.

	* doc/install.texi (Configuration, --enable-objc-gc): hboehm.info
	now defaults to https.

From-SVN: r277215
---
 gcc/ChangeLog        | 5 +++++
 gcc/doc/install.texi | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fec3514..019b216 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-20  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* doc/install.texi (Configuration, --enable-objc-gc): hboehm.info
+	now defaults to https.
+
 2019-10-20  Jan Hubicka  <hubicka@ucw.cz>
 
 	* tree-ssa-alias.c (nonoverlapping_refs_since_match_p): Do not
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index dd36a1e..6c31789 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -2347,7 +2347,7 @@ The following options apply to the build of the Objective-C runtime library.
 @item --enable-objc-gc
 Specify that an additional variant of the GNU Objective-C runtime library
 is built, using an external build of the Boehm-Demers-Weiser garbage
-collector (@uref{http://www.hboehm.info/gc/}).  This library needs to be
+collector (@uref{https://www.hboehm.info/gc/}).  This library needs to be
 available for each multilib variant, unless configured with
 @option{--enable-objc-gc=@samp{auto}} in which case the build of the
 additional runtime library is skipped when not available and the build
-- 
cgit v1.1


From 51085ca56935bae64d32a7783b250c7f970fa9b1 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 20 Oct 2019 22:44:26 +0200
Subject: i386-protos.h (ix86_pre_reload_split): Declare.

	* config/i386/i386-protos.h (ix86_pre_reload_split): Declare.
	* config/i386/i386.c (ix86_pre_reload_split): New function.
	* config/i386/i386.md (*fix_trunc<mode>_i387_1, *add<mode>3_eq,
	*add<mode>3_ne, *add<mode>3_eq_0, *add<mode>3_ne_0, *add<mode>3_eq,
	*add<mode>3_ne, *add<mode>3_eq_1, *add<mode>3_eq_0, *add<mode>3_ne_0,
	*anddi3_doubleword, *andndi3_doubleword, *<code>di3_doubleword,
	*one_cmpldi2_doubleword, *ashl<dwi>3_doubleword_mask,
	*ashl<dwi>3_doubleword_mask_1, *ashl<mode>3_mask, *ashl<mode>3_mask_1,
	*<shift_insn><mode>3_mask, *<shift_insn><mode>3_mask_1,
	*<shift_insn><dwi>3_doubleword_mask,
	*<shift_insn><dwi>3_doubleword_mask_1, *<rotate_insn><mode>3_mask,
	*<rotate_insn><mode>3_mask_1, *<btsc><mode>_mask, *<btsc><mode>_mask_1,
	*btr<mode>_mask, *btr<mode>_mask_1, *jcc_bt<mode>, *jcc_bt<mode>_1,
	*jcc_bt<mode>_mask, *popcounthi2_1, frndintxf2_<rounding>,
	*fist<mode>2_<rounding>_1, *<code><mode>3_1, *<code>di3_doubleword):
	Use ix86_pre_reload_split instead of can_create_pseudo_p in condition.
	* config/i386/sse.md (*sse4_1_<code>v8qiv8hi2<mask_name>_2,
	*avx2_<code>v8qiv8si2<mask_name>_2,
	*sse4_1_<code>v4qiv4si2<mask_name>_2,
	*sse4_1_<code>v4hiv4si2<mask_name>_2,
	*avx512f_<code>v8qiv8di2<mask_name>_2,
	*avx2_<code>v4qiv4di2<mask_name>_2, *avx2_<code>v4hiv4di2<mask_name>_2,
	*sse4_1_<code>v2hiv2di2<mask_name>_2,
	*sse4_1_<code>v2siv2di2<mask_name>_2, sse4_2_pcmpestr,
	sse4_2_pcmpistr): Likewise.

From-SVN: r277216
---
 gcc/ChangeLog                 | 28 +++++++++++++++++
 gcc/config/i386/i386-protos.h |  1 +
 gcc/config/i386/i386.c        | 12 ++++++++
 gcc/config/i386/i386.md       | 72 +++++++++++++++++++++----------------------
 gcc/config/i386/sse.md        | 22 ++++++-------
 5 files changed, 88 insertions(+), 47 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 019b216..6b9a57b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,31 @@
+2019-10-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/i386/i386-protos.h (ix86_pre_reload_split): Declare.
+	* config/i386/i386.c (ix86_pre_reload_split): New function.
+	* config/i386/i386.md (*fix_trunc<mode>_i387_1, *add<mode>3_eq,
+	*add<mode>3_ne, *add<mode>3_eq_0, *add<mode>3_ne_0, *add<mode>3_eq,
+	*add<mode>3_ne, *add<mode>3_eq_1, *add<mode>3_eq_0, *add<mode>3_ne_0,
+	*anddi3_doubleword, *andndi3_doubleword, *<code>di3_doubleword,
+	*one_cmpldi2_doubleword, *ashl<dwi>3_doubleword_mask,
+	*ashl<dwi>3_doubleword_mask_1, *ashl<mode>3_mask, *ashl<mode>3_mask_1,
+	*<shift_insn><mode>3_mask, *<shift_insn><mode>3_mask_1,
+	*<shift_insn><dwi>3_doubleword_mask,
+	*<shift_insn><dwi>3_doubleword_mask_1, *<rotate_insn><mode>3_mask,
+	*<rotate_insn><mode>3_mask_1, *<btsc><mode>_mask, *<btsc><mode>_mask_1,
+	*btr<mode>_mask, *btr<mode>_mask_1, *jcc_bt<mode>, *jcc_bt<mode>_1,
+	*jcc_bt<mode>_mask, *popcounthi2_1, frndintxf2_<rounding>,
+	*fist<mode>2_<rounding>_1, *<code><mode>3_1, *<code>di3_doubleword):
+	Use ix86_pre_reload_split instead of can_create_pseudo_p in condition.
+	* config/i386/sse.md (*sse4_1_<code>v8qiv8hi2<mask_name>_2,
+	*avx2_<code>v8qiv8si2<mask_name>_2,
+	*sse4_1_<code>v4qiv4si2<mask_name>_2,
+	*sse4_1_<code>v4hiv4si2<mask_name>_2,
+	*avx512f_<code>v8qiv8di2<mask_name>_2,
+	*avx2_<code>v4qiv4di2<mask_name>_2, *avx2_<code>v4hiv4di2<mask_name>_2,
+	*sse4_1_<code>v2hiv2di2<mask_name>_2,
+	*sse4_1_<code>v2siv2di2<mask_name>_2, sse4_2_pcmpestr,
+	sse4_2_pcmpistr): Likewise.
+
 2019-10-20  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* doc/install.texi (Configuration, --enable-objc-gc): hboehm.info
diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h
index c07dfe5..ced1780 100644
--- a/gcc/config/i386/i386-protos.h
+++ b/gcc/config/i386/i386-protos.h
@@ -55,6 +55,7 @@ extern rtx standard_80387_constant_rtx (int);
 extern int standard_sse_constant_p (rtx, machine_mode);
 extern const char *standard_sse_constant_opcode (rtx_insn *, rtx *);
 extern bool ix86_standard_x87sse_constant_load_p (const rtx_insn *, rtx);
+extern bool ix86_pre_reload_split (void);
 extern bool symbolic_reference_mentioned_p (rtx);
 extern bool extended_reg_mentioned_p (rtx);
 extern bool x86_extended_QIreg_mentioned_p (rtx_insn *);
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 1a272d9..5354cdb 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4894,6 +4894,18 @@ ix86_standard_x87sse_constant_load_p (const rtx_insn *insn, rtx dst)
   return true;
 }
 
+/* Predicate for pre-reload splitters with associated instructions,
+   which can match any time before the split1 pass (usually combine),
+   then are unconditionally split in that pass and should not be
+   matched again afterwards.  */
+
+bool
+ix86_pre_reload_split (void)
+{
+  return (can_create_pseudo_p ()
+	  && !(cfun->curr_properties & PROP_rtl_split_insns));
+}
+
 /* Returns true if OP contains a symbol reference */
 
 bool
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index a1b849e..5e07959 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -4920,7 +4920,7 @@
    && !TARGET_FISTTP
    && !(SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
 	 && (TARGET_64BIT || <MODE>mode != DImode))
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -6857,7 +6857,7 @@
 	  (match_operand:SWI 2 "<general_operand>")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (PLUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -6881,7 +6881,7 @@
    && (<MODE>mode != DImode
        || INTVAL (operands[2]) != HOST_WIDE_INT_C (-0x80000000))
    && ix86_binary_operator_ok (PLUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -6904,7 +6904,7 @@
 	  (match_operand:SWI 1 "<general_operand>")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (PLUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -6925,7 +6925,7 @@
 	  (match_operand:SWI 1 "<general_operand>")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (PLUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -6951,7 +6951,7 @@
 	  (match_operand:SWI 2 "<general_operand>")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -6976,7 +6976,7 @@
    && (<MODE>mode != DImode
        || INTVAL (operands[2]) != HOST_WIDE_INT_C (-0x80000000))
    && ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -7005,7 +7005,7 @@
    && (<MODE>mode != DImode
        || INTVAL (operands[2]) != HOST_WIDE_INT_C (-0x80000000))
    && ix86_binary_operator_ok (MINUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -7028,7 +7028,7 @@
 	  (eq:SWI (match_operand 2 "int_nonimmediate_operand") (const_int 0))))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (MINUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -7049,7 +7049,7 @@
 	  (ne:SWI (match_operand 2 "int_nonimmediate_operand") (const_int 0))))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (MINUS, <MODE>mode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CC FLAGS_REG)
@@ -8621,7 +8621,7 @@
    (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_STV && TARGET_SSE2
    && ix86_binary_operator_ok (AND, DImode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -9076,7 +9076,7 @@
 	  (match_operand:DI 2 "nonimmediate_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_STV && TARGET_SSE2
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#")
 
 (define_split
@@ -9176,7 +9176,7 @@
    (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_STV && TARGET_SSE2
    && ix86_binary_operator_ok (<CODE>, DImode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -9898,7 +9898,7 @@
 	(not:DI (match_operand:DI 1 "nonimmediate_operand")))]
   "!TARGET_64BIT && TARGET_STV && TARGET_SSE2
    && ix86_unary_operator_ok (NOT, DImode, operands)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -10032,7 +10032,7 @@
 	      (match_operand:SI 3 "const_int_operand")) 0)))
    (clobber (reg:CC FLAGS_REG))]
   "(INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT)) == 0
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10073,7 +10073,7 @@
 	    (match_operand:QI 3 "const_int_operand"))))
    (clobber (reg:CC FLAGS_REG))]
   "(INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT)) == 0
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10228,7 +10228,7 @@
   "ix86_binary_operator_ok (ASHIFT, <MODE>mode, operands)
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10250,7 +10250,7 @@
   "ix86_binary_operator_ok (ASHIFT, <MODE>mode, operands)
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10748,7 +10748,7 @@
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10770,7 +10770,7 @@
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10791,7 +10791,7 @@
 	      (match_operand:SI 3 "const_int_operand")) 0)))
    (clobber (reg:CC FLAGS_REG))]
   "(INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT)) == 0
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -10832,7 +10832,7 @@
 	    (match_operand:QI 3 "const_int_operand"))))
    (clobber (reg:CC FLAGS_REG))]
   "(INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT)) == 0
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11298,7 +11298,7 @@
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11319,7 +11319,7 @@
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11622,7 +11622,7 @@
   "TARGET_USE_BT
    && (INTVAL (operands[2]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11647,7 +11647,7 @@
   "TARGET_USE_BT
    && (INTVAL (operands[2]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11687,7 +11687,7 @@
   "TARGET_USE_BT
    && (INTVAL (operands[2]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11712,7 +11712,7 @@
   "TARGET_USE_BT
    && (INTVAL (operands[2]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(parallel
@@ -11897,7 +11897,7 @@
 	  && INTVAL (operands[2])
 	       >= (optimize_function_for_size_p (cfun) ? 8 : 32))
        : !memory_operand (operands[1], <MODE>mode))
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CCC FLAGS_REG)
@@ -11929,7 +11929,7 @@
 		      (pc)))
    (clobber (reg:CC FLAGS_REG))]
   "(TARGET_USE_BT || optimize_function_for_size_p (cfun))
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CCC FLAGS_REG)
@@ -11965,7 +11965,7 @@
   "(TARGET_USE_BT || optimize_function_for_size_p (cfun))
    && (INTVAL (operands[3]) & (GET_MODE_BITSIZE (<MODE>mode)-1))
       == GET_MODE_BITSIZE (<MODE>mode)-1
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (reg:CCC FLAGS_REG)
@@ -14058,7 +14058,7 @@
 	  (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_POPCNT
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -16479,7 +16479,7 @@
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    && (flag_fp_int_builtin_inexact || !flag_trapping_math)
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -16582,7 +16582,7 @@
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -17973,7 +17973,7 @@
 	  (match_operand:MAXMIN_IMODE 2 "nonimmediate_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "(TARGET_64BIT || <MODE>mode != DImode) && TARGET_STV
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -18002,7 +18002,7 @@
 		   (match_operand:DI 2 "nonimmediate_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_STV && TARGET_AVX512VL
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index f474eed..403e91d 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -17363,7 +17363,7 @@
 		       (const_int 4) (const_int 5)
 		       (const_int 6) (const_int 7)]))))]
   "TARGET_SSE4_1 && <mask_avx512bw_condition> && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17420,7 +17420,7 @@
 		       (const_int 4) (const_int 5)
 		       (const_int 6) (const_int 7)]))))]
   "TARGET_AVX2 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17469,7 +17469,7 @@
 	    (parallel [(const_int 0) (const_int 1)
 		       (const_int 2) (const_int 3)]))))]
   "TARGET_SSE4_1 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17535,7 +17535,7 @@
 	    (parallel [(const_int 0) (const_int 1)
 		       (const_int 2) (const_int 3)]))))]
   "TARGET_SSE4_1 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17579,7 +17579,7 @@
 		       (const_int 2) (const_int 3)
 		       (const_int 4) (const_int 5)
 		       (const_int 6) (const_int 7)]))))]
-  "TARGET_AVX512F && can_create_pseudo_p ()"
+  "TARGET_AVX512F && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17626,7 +17626,7 @@
 	    (parallel [(const_int 0) (const_int 1)
 		       (const_int 2) (const_int 3)]))))]
   "TARGET_AVX2 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17693,7 +17693,7 @@
 	    (parallel [(const_int 0) (const_int 1)
 		       (const_int 2) (const_int 3)]))))]
   "TARGET_AVX2 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17740,7 +17740,7 @@
 		(const_int 1)) 0)
 	    (parallel [(const_int 0) (const_int 1)]))))]
   "TARGET_SSE4_1 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -17804,7 +17804,7 @@
 		(const_int 0)) 0)
 	    (parallel [(const_int 0) (const_int 1)]))))]
   "TARGET_SSE4_1 && <mask_avx512vl_condition>
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(set (match_dup 0)
@@ -18087,7 +18087,7 @@
 	   (match_dup 6)]
 	  UNSPEC_PCMPESTR))]
   "TARGET_SSE4_2
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
@@ -18223,7 +18223,7 @@
 	   (match_dup 4)]
 	  UNSPEC_PCMPISTR))]
   "TARGET_SSE4_2
-   && can_create_pseudo_p ()"
+   && ix86_pre_reload_split ()"
   "#"
   "&& 1"
   [(const_int 0)]
-- 
cgit v1.1


From df73e9715abe3a59c62ec3dfa4ffb36230f186c1 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sun, 20 Oct 2019 21:29:27 +0000
Subject: common.opt (-fcommon): Fix description.

2019-10-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * common.opt (-fcommon): Fix description.

From-SVN: r277217
---
 gcc/ChangeLog  | 4 ++++
 gcc/common.opt | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b9a57b..a68d0fc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* common.opt (-fcommon): Fix description.
+
 2019-10-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/i386/i386-protos.h (ix86_pre_reload_split): Declare.
diff --git a/gcc/common.opt b/gcc/common.opt
index 859c0f9..cc279f4 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1132,7 +1132,7 @@ Looks for opportunities to reduce stack adjustments and stack references.
 
 fcommon
 Common Report Var(flag_no_common,0)
-Do not put uninitialized globals in the common section.
+Put uninitialized globals in the common section.
 
 fcompare-debug
 Driver
-- 
cgit v1.1


From 5bf2f16265fdc120bc2aff12729c831f93fad7a1 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Mon, 21 Oct 2019 00:16:16 +0000
Subject: Daily bump.

From-SVN: r277221
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index cf3b588..f20c6fc 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191020
+20191021
-- 
cgit v1.1


From da157e2ee9e12348df78246ee33b244b7cc334df Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:40:36 +0000
Subject: Avoid setting current_vector_size in get_vec_alignment_for_array_type

The increase_alignment pass was using get_vectype_for_scalar_type
to get the preferred vector type for each array element type.
This has the effect of carrying over the vector size chosen by
the first successful call to all subsequent calls, whereas it seems
more natural to treat each array type independently and pick the
"best" vector type for each element type.

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.c (get_vec_alignment_for_array_type): Use
	get_vectype_for_scalar_type_and_size instead of
	get_vectype_for_scalar_type.

From-SVN: r277223
---
 gcc/ChangeLog         | 6 ++++++
 gcc/tree-vectorizer.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a68d0fc..4460d1e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-vectorizer.c (get_vec_alignment_for_array_type): Use
+	get_vectype_for_scalar_type_and_size instead of
+	get_vectype_for_scalar_type.
+
 2019-10-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 	* common.opt (-fcommon): Fix description.
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 1a0cc93..0c0c018 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -1347,7 +1347,8 @@ get_vec_alignment_for_array_type (tree type)
   gcc_assert (TREE_CODE (type) == ARRAY_TYPE);
   poly_uint64 array_size, vector_size;
 
-  tree vectype = get_vectype_for_scalar_type (strip_array_types (type));
+  tree scalar_type = strip_array_types (type);
+  tree vectype = get_vectype_for_scalar_type_and_size (scalar_type, 0);
   if (!vectype
       || !poly_int_tree_p (TYPE_SIZE (type), &array_size)
       || !poly_int_tree_p (TYPE_SIZE (vectype), &vector_size)
-- 
cgit v1.1


From a5c3185a503fbdbc1bf05efe8ab9d12850a211c1 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:40:41 +0000
Subject: Pass a vec_info to vect_supportable_shift

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (vect_supportable_shift): Take a vec_info.
	* tree-vect-stmts.c (vect_supportable_shift): Likewise.
	* tree-vect-patterns.c (vect_synth_mult_by_constant): Update call
	accordingly.

From-SVN: r277224
---
 gcc/ChangeLog            | 7 +++++++
 gcc/tree-vect-patterns.c | 3 ++-
 gcc/tree-vect-stmts.c    | 2 +-
 gcc/tree-vectorizer.h    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4460d1e..529a562 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (vect_supportable_shift): Take a vec_info.
+	* tree-vect-stmts.c (vect_supportable_shift): Likewise.
+	* tree-vect-patterns.c (vect_synth_mult_by_constant): Update call
+	accordingly.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.c (get_vec_alignment_for_array_type): Use
 	get_vectype_for_scalar_type_and_size instead of
 	get_vectype_for_scalar_type.
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 5387563..4faa6e7 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -2720,6 +2720,7 @@ static gimple *
 vect_synth_mult_by_constant (tree op, tree val,
 			     stmt_vec_info stmt_vinfo)
 {
+  vec_info *vinfo = stmt_vinfo->vinfo;
   tree itype = TREE_TYPE (op);
   machine_mode mode = TYPE_MODE (itype);
   struct algorithm alg;
@@ -2738,7 +2739,7 @@ vect_synth_mult_by_constant (tree op, tree val,
 
   /* Targets that don't support vector shifts but support vector additions
      can synthesize shifts that way.  */
-  bool synth_shift_p = !vect_supportable_shift (LSHIFT_EXPR, multtype);
+  bool synth_shift_p = !vect_supportable_shift (vinfo, LSHIFT_EXPR, multtype);
 
   HOST_WIDE_INT hwval = tree_to_shwi (val);
   /* Use MAX_COST here as we don't want to limit the sequence on rtx costs.
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index acdd907..f76b5d4 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5465,7 +5465,7 @@ vectorizable_assignment (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
    either as shift by a scalar or by a vector.  */
 
 bool
-vect_supportable_shift (enum tree_code code, tree scalar_type)
+vect_supportable_shift (vec_info *, enum tree_code code, tree scalar_type)
 {
 
   machine_mode vec_mode;
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 5c3b3c9..e1016d8 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1634,7 +1634,7 @@ extern void vect_get_load_cost (stmt_vec_info, int, bool,
 				stmt_vector_for_cost *, bool);
 extern void vect_get_store_cost (stmt_vec_info, int,
 				 unsigned int *, stmt_vector_for_cost *);
-extern bool vect_supportable_shift (enum tree_code, tree);
+extern bool vect_supportable_shift (vec_info *, enum tree_code, tree);
 extern tree vect_gen_perm_mask_any (tree, const vec_perm_indices &);
 extern tree vect_gen_perm_mask_checked (tree, const vec_perm_indices &);
 extern void optimize_mask_stores (class loop*);
-- 
cgit v1.1


From dcab2a0d1d4b2c0b4bba6f5e3834ec0678a2a5c8 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:40:44 +0000
Subject: Pass a vec_info to vect_supportable_direct_optab_p

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-patterns.c (vect_supportable_direct_optab_p): Take
	a vec_info.
	(vect_recog_dot_prod_pattern): Update call accordingly.
	(vect_recog_sad_pattern, vect_recog_pow_pattern): Likewise.
	(vect_recog_widen_sum_pattern): Likewise.

From-SVN: r277225
---
 gcc/ChangeLog            |  8 ++++++++
 gcc/tree-vect-patterns.c | 13 +++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 529a562..d3cba28 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vect-patterns.c (vect_supportable_direct_optab_p): Take
+	a vec_info.
+	(vect_recog_dot_prod_pattern): Update call accordingly.
+	(vect_recog_sad_pattern, vect_recog_pow_pattern): Likewise.
+	(vect_recog_widen_sum_pattern): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (vect_supportable_shift): Take a vec_info.
 	* tree-vect-stmts.c (vect_supportable_shift): Likewise.
 	* tree-vect-patterns.c (vect_synth_mult_by_constant): Update call
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 4faa6e7..b0b3163 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -187,7 +187,7 @@ vect_get_external_def_edge (vec_info *vinfo, tree var)
    is nonnull.  */
 
 static bool
-vect_supportable_direct_optab_p (tree otype, tree_code code,
+vect_supportable_direct_optab_p (vec_info *, tree otype, tree_code code,
 				 tree itype, tree *vecotype_out,
 				 tree *vecitype_out = NULL)
 {
@@ -985,7 +985,7 @@ vect_recog_dot_prod_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
   vect_pattern_detected ("vect_recog_dot_prod_pattern", last_stmt);
 
   tree half_vectype;
-  if (!vect_supportable_direct_optab_p (type, DOT_PROD_EXPR, half_type,
+  if (!vect_supportable_direct_optab_p (vinfo, type, DOT_PROD_EXPR, half_type,
 					type_out, &half_vectype))
     return NULL;
 
@@ -1143,7 +1143,7 @@ vect_recog_sad_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
   vect_pattern_detected ("vect_recog_sad_pattern", last_stmt);
 
   tree half_vectype;
-  if (!vect_supportable_direct_optab_p (sum_type, SAD_EXPR, half_type,
+  if (!vect_supportable_direct_optab_p (vinfo, sum_type, SAD_EXPR, half_type,
 					type_out, &half_vectype))
     return NULL;
 
@@ -1273,6 +1273,7 @@ vect_recog_widen_mult_pattern (stmt_vec_info last_stmt_info, tree *type_out)
 static gimple *
 vect_recog_pow_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 {
+  vec_info *vinfo = stmt_vinfo->vinfo;
   gimple *last_stmt = stmt_vinfo->stmt;
   tree base, exp;
   gimple *stmt;
@@ -1366,7 +1367,7 @@ vect_recog_pow_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       || (TREE_CODE (exp) == REAL_CST
           && real_equal (&TREE_REAL_CST (exp), &dconst2)))
     {
-      if (!vect_supportable_direct_optab_p (TREE_TYPE (base), MULT_EXPR,
+      if (!vect_supportable_direct_optab_p (vinfo, TREE_TYPE (base), MULT_EXPR,
 					    TREE_TYPE (base), type_out))
 	return NULL;
 
@@ -1472,8 +1473,8 @@ vect_recog_widen_sum_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 
   vect_pattern_detected ("vect_recog_widen_sum_pattern", last_stmt);
 
-  if (!vect_supportable_direct_optab_p (type, WIDEN_SUM_EXPR, unprom0.type,
-					type_out))
+  if (!vect_supportable_direct_optab_p (vinfo, type, WIDEN_SUM_EXPR,
+					unprom0.type, type_out))
     return NULL;
 
   var = vect_recog_temp_ssa_var (type, NULL);
-- 
cgit v1.1


From 1bd5196c9b1a0cd7280adadd6d788f81a82ca023 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:40:49 +0000
Subject: Pass a vec_info to get_mask_type_for_scalar_type

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (get_mask_type_for_scalar_type): Take a vec_info.
	* tree-vect-stmts.c (get_mask_type_for_scalar_type): Likewise.
	(vect_check_load_store_mask): Update call accordingly.
	(vect_get_mask_type_for_stmt): Likewise.
	* tree-vect-patterns.c (check_bool_pattern): Likewise.
	(search_type_for_mask_1, vect_recog_mask_conversion_pattern): Likewise.
	(vect_convert_mask_for_vectype): Likewise.

From-SVN: r277226
---
 gcc/ChangeLog            | 10 ++++++++++
 gcc/tree-vect-patterns.c | 15 ++++++++-------
 gcc/tree-vect-stmts.c    |  8 +++++---
 gcc/tree-vectorizer.h    |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d3cba28..bbb4710 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (get_mask_type_for_scalar_type): Take a vec_info.
+	* tree-vect-stmts.c (get_mask_type_for_scalar_type): Likewise.
+	(vect_check_load_store_mask): Update call accordingly.
+	(vect_get_mask_type_for_stmt): Likewise.
+	* tree-vect-patterns.c (check_bool_pattern): Likewise.
+	(search_type_for_mask_1, vect_recog_mask_conversion_pattern): Likewise.
+	(vect_convert_mask_for_vectype): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vect-patterns.c (vect_supportable_direct_optab_p): Take
 	a vec_info.
 	(vect_recog_dot_prod_pattern): Update call accordingly.
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index b0b3163..1be4cc0 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -3616,7 +3616,8 @@ check_bool_pattern (tree var, vec_info *vinfo, hash_set<gimple *> &stmts)
 	  if (comp_vectype == NULL_TREE)
 	    return false;
 
-	  tree mask_type = get_mask_type_for_scalar_type (TREE_TYPE (rhs1));
+	  tree mask_type = get_mask_type_for_scalar_type (vinfo,
+							  TREE_TYPE (rhs1));
 	  if (mask_type
 	      && expand_vec_cmp_expr_p (comp_vectype, mask_type, rhs_code))
 	    return false;
@@ -3943,7 +3944,7 @@ search_type_for_mask_1 (tree var, vec_info *vinfo,
 	      break;
 	    }
 
-	  mask_type = get_mask_type_for_scalar_type (TREE_TYPE (rhs1));
+	  mask_type = get_mask_type_for_scalar_type (vinfo, TREE_TYPE (rhs1));
 	  if (!mask_type
 	      || !expand_vec_cmp_expr_p (comp_vectype, mask_type, rhs_code))
 	    {
@@ -4275,7 +4276,7 @@ vect_recog_mask_conversion_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       tree mask_arg_type = search_type_for_mask (mask_arg, vinfo);
       if (!mask_arg_type)
 	return NULL;
-      vectype2 = get_mask_type_for_scalar_type (mask_arg_type);
+      vectype2 = get_mask_type_for_scalar_type (vinfo, mask_arg_type);
 
       if (!vectype1 || !vectype2
 	  || known_eq (TYPE_VECTOR_SUBPARTS (vectype1),
@@ -4352,7 +4353,7 @@ vect_recog_mask_conversion_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       else
 	return NULL;
 
-      vectype2 = get_mask_type_for_scalar_type (rhs1_type);
+      vectype2 = get_mask_type_for_scalar_type (vinfo, rhs1_type);
 
       if (!vectype1 || !vectype2)
 	return NULL;
@@ -4442,14 +4443,14 @@ vect_recog_mask_conversion_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 
   if (TYPE_PRECISION (rhs1_type) < TYPE_PRECISION (rhs2_type))
     {
-      vectype1 = get_mask_type_for_scalar_type (rhs1_type);
+      vectype1 = get_mask_type_for_scalar_type (vinfo, rhs1_type);
       if (!vectype1)
 	return NULL;
       rhs2 = build_mask_conversion (rhs2, vectype1, stmt_vinfo);
     }
   else
     {
-      vectype1 = get_mask_type_for_scalar_type (rhs2_type);
+      vectype1 = get_mask_type_for_scalar_type (vinfo, rhs2_type);
       if (!vectype1)
 	return NULL;
       rhs1 = build_mask_conversion (rhs1, vectype1, stmt_vinfo);
@@ -4520,7 +4521,7 @@ vect_convert_mask_for_vectype (tree mask, tree vectype,
   tree mask_type = search_type_for_mask (mask, vinfo);
   if (mask_type)
     {
-      tree mask_vectype = get_mask_type_for_scalar_type (mask_type);
+      tree mask_vectype = get_mask_type_for_scalar_type (vinfo, mask_type);
       if (mask_vectype
 	  && maybe_ne (TYPE_VECTOR_SUBPARTS (vectype),
 		       TYPE_VECTOR_SUBPARTS (mask_vectype)))
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index f76b5d4..d371820 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -2558,6 +2558,7 @@ vect_check_load_store_mask (stmt_vec_info stmt_info, tree mask,
 			    vect_def_type *mask_dt_out,
 			    tree *mask_vectype_out)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   if (!VECT_SCALAR_BOOLEAN_TYPE_P (TREE_TYPE (mask)))
     {
       if (dump_enabled_p ())
@@ -2586,7 +2587,7 @@ vect_check_load_store_mask (stmt_vec_info stmt_info, tree mask,
 
   tree vectype = STMT_VINFO_VECTYPE (stmt_info);
   if (!mask_vectype)
-    mask_vectype = get_mask_type_for_scalar_type (TREE_TYPE (vectype));
+    mask_vectype = get_mask_type_for_scalar_type (vinfo, TREE_TYPE (vectype));
 
   if (!mask_vectype || !VECTOR_BOOLEAN_TYPE_P (mask_vectype))
     {
@@ -11156,7 +11157,7 @@ get_vectype_for_scalar_type (tree scalar_type)
    of vectors of specified SCALAR_TYPE as supported by target.  */
 
 tree
-get_mask_type_for_scalar_type (tree scalar_type)
+get_mask_type_for_scalar_type (vec_info *, tree scalar_type)
 {
   tree vectype = get_vectype_for_scalar_type (scalar_type);
 
@@ -11986,6 +11987,7 @@ vect_get_vector_types_for_stmt (stmt_vec_info stmt_info,
 opt_tree
 vect_get_mask_type_for_stmt (stmt_vec_info stmt_info)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   gimple *stmt = stmt_info->stmt;
   tree mask_type = NULL;
   tree vectype, scalar_type;
@@ -11995,7 +11997,7 @@ vect_get_mask_type_for_stmt (stmt_vec_info stmt_info)
       && !VECT_SCALAR_BOOLEAN_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (stmt))))
     {
       scalar_type = TREE_TYPE (gimple_assign_rhs1 (stmt));
-      mask_type = get_mask_type_for_scalar_type (scalar_type);
+      mask_type = get_mask_type_for_scalar_type (vinfo, scalar_type);
 
       if (!mask_type)
 	return opt_tree::failure_at (stmt,
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index e1016d8..2dd9ea3 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1591,7 +1591,7 @@ extern bool vect_can_advance_ivs_p (loop_vec_info);
 extern poly_uint64 current_vector_size;
 extern tree get_vectype_for_scalar_type (tree);
 extern tree get_vectype_for_scalar_type_and_size (tree, poly_uint64);
-extern tree get_mask_type_for_scalar_type (tree);
+extern tree get_mask_type_for_scalar_type (vec_info *, tree);
 extern tree get_same_sized_vectype (tree, tree);
 extern bool vect_get_loop_mask_type (loop_vec_info);
 extern bool vect_is_simple_use (tree, vec_info *, enum vect_def_type *,
-- 
cgit v1.1


From 7ed54790da87bbb4a134020a9fb8bd1b72fd0acb Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:40:53 +0000
Subject: Pass a vec_info to get_vectype_for_scalar_type

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (get_vectype_for_scalar_type): Take a vec_info.
	* tree-vect-stmts.c (get_vectype_for_scalar_type): Likewise.
	(vect_prologue_cost_for_slp_op): Update call accordingly.
	(vect_get_vec_def_for_operand, vect_get_gather_scatter_ops)
	(vect_get_strided_load_store_ops, vectorizable_simd_clone_call)
	(vect_supportable_shift, vect_is_simple_cond, vectorizable_comparison)
	(get_mask_type_for_scalar_type): Likewise.
	(vect_get_vector_types_for_stmt): Likewise.
	* tree-vect-data-refs.c (vect_analyze_data_refs): Likewise.
	* tree-vect-loop.c (vect_determine_vectorization_factor): Likewise.
	(get_initial_def_for_reduction, build_vect_cond_expr): Likewise.
	* tree-vect-patterns.c (vect_supportable_direct_optab_p): Likewise.
	(vect_split_statement, vect_convert_input): Likewise.
	(vect_recog_widen_op_pattern, vect_recog_pow_pattern): Likewise.
	(vect_recog_over_widening_pattern, vect_recog_mulhs_pattern): Likewise.
	(vect_recog_average_pattern, vect_recog_cast_forwprop_pattern)
	(vect_recog_rotate_pattern, vect_recog_vector_vector_shift_pattern)
	(vect_synth_mult_by_constant, vect_recog_mult_pattern): Likewise.
	(vect_recog_divmod_pattern, vect_recog_mixed_size_cond_pattern)
	(check_bool_pattern, adjust_bool_pattern_cast, adjust_bool_pattern)
	(search_type_for_mask_1, vect_recog_bool_pattern): Likewise.
	(vect_recog_mask_conversion_pattern): Likewise.
	(vect_add_conversion_to_pattern): Likewise.
	(vect_recog_gather_scatter_pattern): Likewise.
	* tree-vect-slp.c (vect_build_slp_tree_2): Likewise.
	(vect_analyze_slp_instance, vect_get_constant_vectors): Likewise.

From-SVN: r277227
---
 gcc/ChangeLog             |  29 +++++++++++++
 gcc/tree-vect-data-refs.c |   5 ++-
 gcc/tree-vect-loop.c      |   8 ++--
 gcc/tree-vect-patterns.c  | 105 ++++++++++++++++++++++++++--------------------
 gcc/tree-vect-slp.c       |   7 ++--
 gcc/tree-vect-stmts.c     |  34 ++++++++-------
 gcc/tree-vectorizer.h     |   2 +-
 7 files changed, 118 insertions(+), 72 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bbb4710..42762a9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,34 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (get_vectype_for_scalar_type): Take a vec_info.
+	* tree-vect-stmts.c (get_vectype_for_scalar_type): Likewise.
+	(vect_prologue_cost_for_slp_op): Update call accordingly.
+	(vect_get_vec_def_for_operand, vect_get_gather_scatter_ops)
+	(vect_get_strided_load_store_ops, vectorizable_simd_clone_call)
+	(vect_supportable_shift, vect_is_simple_cond, vectorizable_comparison)
+	(get_mask_type_for_scalar_type): Likewise.
+	(vect_get_vector_types_for_stmt): Likewise.
+	* tree-vect-data-refs.c (vect_analyze_data_refs): Likewise.
+	* tree-vect-loop.c (vect_determine_vectorization_factor): Likewise.
+	(get_initial_def_for_reduction, build_vect_cond_expr): Likewise.
+	* tree-vect-patterns.c (vect_supportable_direct_optab_p): Likewise.
+	(vect_split_statement, vect_convert_input): Likewise.
+	(vect_recog_widen_op_pattern, vect_recog_pow_pattern): Likewise.
+	(vect_recog_over_widening_pattern, vect_recog_mulhs_pattern): Likewise.
+	(vect_recog_average_pattern, vect_recog_cast_forwprop_pattern)
+	(vect_recog_rotate_pattern, vect_recog_vector_vector_shift_pattern)
+	(vect_synth_mult_by_constant, vect_recog_mult_pattern): Likewise.
+	(vect_recog_divmod_pattern, vect_recog_mixed_size_cond_pattern)
+	(check_bool_pattern, adjust_bool_pattern_cast, adjust_bool_pattern)
+	(search_type_for_mask_1, vect_recog_bool_pattern): Likewise.
+	(vect_recog_mask_conversion_pattern): Likewise.
+	(vect_add_conversion_to_pattern): Likewise.
+	(vect_recog_gather_scatter_pattern): Likewise.
+	* tree-vect-slp.c (vect_build_slp_tree_2): Likewise.
+	(vect_analyze_slp_instance, vect_get_constant_vectors): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (get_mask_type_for_scalar_type): Take a vec_info.
 	* tree-vect-stmts.c (get_mask_type_for_scalar_type): Likewise.
 	(vect_check_load_store_mask): Update call accordingly.
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 9a4c01d..987dc0e 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -4344,7 +4344,7 @@ vect_analyze_data_refs (vec_info *vinfo, poly_uint64 *min_vf, bool *fatal)
       /* Set vectype for STMT.  */
       scalar_type = TREE_TYPE (DR_REF (dr));
       STMT_VINFO_VECTYPE (stmt_info)
-	= get_vectype_for_scalar_type (scalar_type);
+	= get_vectype_for_scalar_type (vinfo, scalar_type);
       if (!STMT_VINFO_VECTYPE (stmt_info))
         {
           if (dump_enabled_p ())
@@ -4392,7 +4392,8 @@ vect_analyze_data_refs (vec_info *vinfo, poly_uint64 *min_vf, bool *fatal)
 	  if (!vect_check_gather_scatter (stmt_info,
 					  as_a <loop_vec_info> (vinfo),
 					  &gs_info)
-	      || !get_vectype_for_scalar_type (TREE_TYPE (gs_info.offset)))
+	      || !get_vectype_for_scalar_type (vinfo,
+					       TREE_TYPE (gs_info.offset)))
 	    {
 	      if (fatal)
 		*fatal = false;
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 10920ac..304bb5e 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -327,7 +327,7 @@ vect_determine_vectorization_factor (loop_vec_info loop_vinfo)
 				 "get vectype for scalar type:  %T\n",
 				 scalar_type);
 
-	      vectype = get_vectype_for_scalar_type (scalar_type);
+	      vectype = get_vectype_for_scalar_type (loop_vinfo, scalar_type);
 	      if (!vectype)
 		return opt_result::failure_at (phi,
 					       "not vectorized: unsupported "
@@ -3774,7 +3774,7 @@ get_initial_def_for_reduction (stmt_vec_info stmt_vinfo,
   loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_vinfo);
   class loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
   tree scalar_type = TREE_TYPE (init_val);
-  tree vectype = get_vectype_for_scalar_type (scalar_type);
+  tree vectype = get_vectype_for_scalar_type (loop_vinfo, scalar_type);
   tree def_for_init;
   tree init_def;
   REAL_VALUE_TYPE real_init_val = dconst0;
@@ -5555,11 +5555,11 @@ build_vect_cond_expr (enum tree_code code, tree vop[3], tree mask,
    corresponds to the type of arguments to the reduction stmt, and should *NOT*
    be used to create the vectorized stmt.  The right vectype for the vectorized
    stmt is obtained from the type of the result X:
-        get_vectype_for_scalar_type (TREE_TYPE (X))
+      get_vectype_for_scalar_type (vinfo, TREE_TYPE (X))
 
    This means that, contrary to "regular" reductions (or "regular" stmts in
    general), the following equation:
-      STMT_VINFO_VECTYPE == get_vectype_for_scalar_type (TREE_TYPE (X))
+      STMT_VINFO_VECTYPE == get_vectype_for_scalar_type (vinfo, TREE_TYPE (X))
    does *NOT* necessarily hold for reduction patterns.  */
 
 bool
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 1be4cc0..b497ec9 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -187,15 +187,15 @@ vect_get_external_def_edge (vec_info *vinfo, tree var)
    is nonnull.  */
 
 static bool
-vect_supportable_direct_optab_p (vec_info *, tree otype, tree_code code,
+vect_supportable_direct_optab_p (vec_info *vinfo, tree otype, tree_code code,
 				 tree itype, tree *vecotype_out,
 				 tree *vecitype_out = NULL)
 {
-  tree vecitype = get_vectype_for_scalar_type (itype);
+  tree vecitype = get_vectype_for_scalar_type (vinfo, itype);
   if (!vecitype)
     return false;
 
-  tree vecotype = get_vectype_for_scalar_type (otype);
+  tree vecotype = get_vectype_for_scalar_type (vinfo, otype);
   if (!vecotype)
     return false;
 
@@ -635,6 +635,7 @@ static bool
 vect_split_statement (stmt_vec_info stmt2_info, tree new_rhs,
 		      gimple *stmt1, tree vectype)
 {
+  vec_info *vinfo = stmt2_info->vinfo;
   if (is_pattern_stmt_p (stmt2_info))
     {
       /* STMT2_INFO is part of a pattern.  Get the statement to which
@@ -678,7 +679,7 @@ vect_split_statement (stmt_vec_info stmt2_info, tree new_rhs,
 	 two-statement pattern now.  */
       gcc_assert (!STMT_VINFO_RELATED_STMT (stmt2_info));
       tree lhs_type = TREE_TYPE (gimple_get_lhs (stmt2_info->stmt));
-      tree lhs_vectype = get_vectype_for_scalar_type (lhs_type);
+      tree lhs_vectype = get_vectype_for_scalar_type (vinfo, lhs_type);
       if (!lhs_vectype)
 	return false;
 
@@ -715,6 +716,8 @@ static tree
 vect_convert_input (stmt_vec_info stmt_info, tree type,
 		    vect_unpromoted_value *unprom, tree vectype)
 {
+  vec_info *vinfo = stmt_info->vinfo;
+
   /* Check for a no-op conversion.  */
   if (types_compatible_p (type, TREE_TYPE (unprom->op)))
     return unprom->op;
@@ -752,7 +755,7 @@ vect_convert_input (stmt_vec_info stmt_info, tree type,
 	     unsigned promotion.  */
 	  tree midtype = build_nonstandard_integer_type
 	    (TYPE_PRECISION (type), TYPE_UNSIGNED (unprom->type));
-	  tree vec_midtype = get_vectype_for_scalar_type (midtype);
+	  tree vec_midtype = get_vectype_for_scalar_type (vinfo, midtype);
 	  if (vec_midtype)
 	    {
 	      input = vect_recog_temp_ssa_var (midtype, NULL);
@@ -1189,6 +1192,7 @@ vect_recog_widen_op_pattern (stmt_vec_info last_stmt_info, tree *type_out,
 			     tree_code orig_code, tree_code wide_code,
 			     bool shift_p, const char *name)
 {
+  vec_info *vinfo = last_stmt_info->vinfo;
   gimple *last_stmt = last_stmt_info->stmt;
 
   vect_unpromoted_value unprom[2];
@@ -1208,8 +1212,8 @@ vect_recog_widen_op_pattern (stmt_vec_info last_stmt_info, tree *type_out,
 					    TYPE_UNSIGNED (half_type));
 
   /* Check target support  */
-  tree vectype = get_vectype_for_scalar_type (half_type);
-  tree vecitype = get_vectype_for_scalar_type (itype);
+  tree vectype = get_vectype_for_scalar_type (vinfo, half_type);
+  tree vecitype = get_vectype_for_scalar_type (vinfo, itype);
   enum tree_code dummy_code;
   int dummy_int;
   auto_vec<tree> dummy_vec;
@@ -1221,7 +1225,7 @@ vect_recog_widen_op_pattern (stmt_vec_info last_stmt_info, tree *type_out,
 					  &dummy_int, &dummy_vec))
     return NULL;
 
-  *type_out = get_vectype_for_scalar_type (type);
+  *type_out = get_vectype_for_scalar_type (vinfo, type);
   if (!*type_out)
     return NULL;
 
@@ -1342,7 +1346,7 @@ vect_recog_pow_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 		  if (node->simd_clones == NULL)
 		    return NULL;
 		}
-	      *type_out = get_vectype_for_scalar_type (TREE_TYPE (base));
+	      *type_out = get_vectype_for_scalar_type (vinfo, TREE_TYPE (base));
 	      if (!*type_out)
 		return NULL;
 	      tree def = vect_recog_temp_ssa_var (TREE_TYPE (base), NULL);
@@ -1380,7 +1384,7 @@ vect_recog_pow_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
   if (TREE_CODE (exp) == REAL_CST
       && real_equal (&TREE_REAL_CST (exp), &dconsthalf))
     {
-      *type_out = get_vectype_for_scalar_type (TREE_TYPE (base));
+      *type_out = get_vectype_for_scalar_type (vinfo, TREE_TYPE (base));
       if (*type_out
 	  && direct_internal_fn_supported_p (IFN_SQRT, *type_out,
 					     OPTIMIZE_FOR_SPEED))
@@ -1665,7 +1669,7 @@ vect_recog_over_widening_pattern (stmt_vec_info last_stmt_info, tree *type_out)
 
   vect_pattern_detected ("vect_recog_over_widening_pattern", last_stmt);
 
-  *type_out = get_vectype_for_scalar_type (type);
+  *type_out = get_vectype_for_scalar_type (vinfo, type);
   if (!*type_out)
     return NULL;
 
@@ -1686,8 +1690,8 @@ vect_recog_over_widening_pattern (stmt_vec_info last_stmt_info, tree *type_out)
      wants to rewrite anyway.  If targets have a minimum element size
      for some optabs, we should pattern-match smaller ops to larger ops
      where beneficial.  */
-  tree new_vectype = get_vectype_for_scalar_type (new_type);
-  tree op_vectype = get_vectype_for_scalar_type (op_type);
+  tree new_vectype = get_vectype_for_scalar_type (vinfo, new_type);
+  tree op_vectype = get_vectype_for_scalar_type (vinfo, op_type);
   if (!new_vectype || !op_vectype)
     return NULL;
 
@@ -1864,7 +1868,7 @@ vect_recog_mulhs_pattern (stmt_vec_info last_stmt_info, tree *type_out)
       (target_precision, TYPE_UNSIGNED (new_type));
 
   /* Check for target support.  */
-  tree new_vectype = get_vectype_for_scalar_type (new_type);
+  tree new_vectype = get_vectype_for_scalar_type (vinfo, new_type);
   if (!new_vectype
       || !direct_internal_fn_supported_p
 	    (ifn, new_vectype, OPTIMIZE_FOR_SPEED))
@@ -1872,7 +1876,7 @@ vect_recog_mulhs_pattern (stmt_vec_info last_stmt_info, tree *type_out)
 
   /* The IR requires a valid vector type for the cast result, even though
      it's likely to be discarded.  */
-  *type_out = get_vectype_for_scalar_type (lhs_type);
+  *type_out = get_vectype_for_scalar_type (vinfo, lhs_type);
   if (!*type_out)
     return NULL;
 
@@ -2014,7 +2018,7 @@ vect_recog_average_pattern (stmt_vec_info last_stmt_info, tree *type_out)
 					       TYPE_UNSIGNED (new_type));
 
   /* Check for target support.  */
-  tree new_vectype = get_vectype_for_scalar_type (new_type);
+  tree new_vectype = get_vectype_for_scalar_type (vinfo, new_type);
   if (!new_vectype
       || !direct_internal_fn_supported_p (ifn, new_vectype,
 					  OPTIMIZE_FOR_SPEED))
@@ -2022,7 +2026,7 @@ vect_recog_average_pattern (stmt_vec_info last_stmt_info, tree *type_out)
 
   /* The IR requires a valid vector type for the cast result, even though
      it's likely to be discarded.  */
-  *type_out = get_vectype_for_scalar_type (type);
+  *type_out = get_vectype_for_scalar_type (vinfo, type);
   if (!*type_out)
     return NULL;
 
@@ -2108,7 +2112,7 @@ vect_recog_cast_forwprop_pattern (stmt_vec_info last_stmt_info, tree *type_out)
      the unnecessary widening and narrowing.  */
   vect_pattern_detected ("vect_recog_cast_forwprop_pattern", last_stmt);
 
-  *type_out = get_vectype_for_scalar_type (lhs_type);
+  *type_out = get_vectype_for_scalar_type (vinfo, lhs_type);
   if (!*type_out)
     return NULL;
 
@@ -2219,7 +2223,7 @@ vect_recog_rotate_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 	}
 
       type = TREE_TYPE (lhs);
-      vectype = get_vectype_for_scalar_type (type);
+      vectype = get_vectype_for_scalar_type (vinfo, type);
       if (vectype == NULL_TREE)
 	return NULL;
 
@@ -2285,7 +2289,7 @@ vect_recog_rotate_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       && dt != vect_external_def)
     return NULL;
 
-  vectype = get_vectype_for_scalar_type (type);
+  vectype = get_vectype_for_scalar_type (vinfo, type);
   if (vectype == NULL_TREE)
     return NULL;
 
@@ -2404,7 +2408,7 @@ vect_recog_rotate_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
     }
   else
     {
-      tree vecstype = get_vectype_for_scalar_type (stype);
+      tree vecstype = get_vectype_for_scalar_type (vinfo, stype);
 
       if (vecstype == NULL_TREE)
 	return NULL;
@@ -2533,7 +2537,7 @@ vect_recog_vector_vector_shift_pattern (stmt_vec_info stmt_vinfo,
   if (!def_vinfo)
     return NULL;
 
-  *type_out = get_vectype_for_scalar_type (TREE_TYPE (oprnd0));
+  *type_out = get_vectype_for_scalar_type (vinfo, TREE_TYPE (oprnd0));
   if (*type_out == NULL_TREE)
     return NULL;
 
@@ -2556,7 +2560,8 @@ vect_recog_vector_vector_shift_pattern (stmt_vec_info stmt_vinfo,
 				       TYPE_PRECISION (TREE_TYPE (oprnd1)));
 	      def = vect_recog_temp_ssa_var (TREE_TYPE (rhs1), NULL);
 	      def_stmt = gimple_build_assign (def, BIT_AND_EXPR, rhs1, mask);
-	      tree vecstype = get_vectype_for_scalar_type (TREE_TYPE (rhs1));
+	      tree vecstype = get_vectype_for_scalar_type (vinfo,
+							   TREE_TYPE (rhs1));
 	      append_pattern_def_seq (stmt_vinfo, def_stmt, vecstype);
 	    }
 	}
@@ -2751,7 +2756,7 @@ vect_synth_mult_by_constant (tree op, tree val,
   if (!possible)
     return NULL;
 
-  tree vectype = get_vectype_for_scalar_type (multtype);
+  tree vectype = get_vectype_for_scalar_type (vinfo, multtype);
 
   if (!vectype
       || !target_supports_mult_synth_alg (&alg, variant,
@@ -2897,6 +2902,7 @@ vect_synth_mult_by_constant (tree op, tree val,
 static gimple *
 vect_recog_mult_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 {
+  vec_info *vinfo = stmt_vinfo->vinfo;
   gimple *last_stmt = stmt_vinfo->stmt;
   tree oprnd0, oprnd1, vectype, itype;
   gimple *pattern_stmt;
@@ -2917,7 +2923,7 @@ vect_recog_mult_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       || !type_has_mode_precision_p (itype))
     return NULL;
 
-  vectype = get_vectype_for_scalar_type (itype);
+  vectype = get_vectype_for_scalar_type (vinfo, itype);
   if (vectype == NULL_TREE)
     return NULL;
 
@@ -2985,6 +2991,7 @@ vect_recog_mult_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 static gimple *
 vect_recog_divmod_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 {
+  vec_info *vinfo = stmt_vinfo->vinfo;
   gimple *last_stmt = stmt_vinfo->stmt;
   tree oprnd0, oprnd1, vectype, itype, cond;
   gimple *pattern_stmt, *def_stmt;
@@ -3017,7 +3024,7 @@ vect_recog_divmod_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
     return NULL;
 
   scalar_int_mode itype_mode = SCALAR_INT_TYPE_MODE (itype);
-  vectype = get_vectype_for_scalar_type (itype);
+  vectype = get_vectype_for_scalar_type (vinfo, itype);
   if (vectype == NULL_TREE)
     return NULL;
 
@@ -3115,7 +3122,7 @@ vect_recog_divmod_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 	    {
 	      tree utype
 		= build_nonstandard_integer_type (prec, 1);
-	      tree vecutype = get_vectype_for_scalar_type (utype);
+	      tree vecutype = get_vectype_for_scalar_type (vinfo, utype);
 	      tree shift
 		= build_int_cst (utype, GET_MODE_BITSIZE (itype_mode)
 					- tree_log2 (oprnd1));
@@ -3433,6 +3440,7 @@ vect_recog_divmod_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 static gimple *
 vect_recog_mixed_size_cond_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 {
+  vec_info *vinfo = stmt_vinfo->vinfo;
   gimple *last_stmt = stmt_vinfo->stmt;
   tree cond_expr, then_clause, else_clause;
   tree type, vectype, comp_vectype, itype = NULL_TREE, vecitype;
@@ -3455,7 +3463,7 @@ vect_recog_mixed_size_cond_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
     return NULL;
 
   comp_scalar_type = TREE_TYPE (TREE_OPERAND (cond_expr, 0));
-  comp_vectype = get_vectype_for_scalar_type (comp_scalar_type);
+  comp_vectype = get_vectype_for_scalar_type (vinfo, comp_scalar_type);
   if (comp_vectype == NULL_TREE)
     return NULL;
 
@@ -3503,7 +3511,7 @@ vect_recog_mixed_size_cond_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
   if (GET_MODE_BITSIZE (type_mode) == cmp_mode_size)
     return NULL;
 
-  vectype = get_vectype_for_scalar_type (type);
+  vectype = get_vectype_for_scalar_type (vinfo, type);
   if (vectype == NULL_TREE)
     return NULL;
 
@@ -3518,7 +3526,7 @@ vect_recog_mixed_size_cond_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       || GET_MODE_BITSIZE (SCALAR_TYPE_MODE (itype)) != cmp_mode_size)
     return NULL;
 
-  vecitype = get_vectype_for_scalar_type (itype);
+  vecitype = get_vectype_for_scalar_type (vinfo, itype);
   if (vecitype == NULL_TREE)
     return NULL;
 
@@ -3612,7 +3620,7 @@ check_bool_pattern (tree var, vec_info *vinfo, hash_set<gimple *> &stmts)
 	  if (stmt_could_throw_p (cfun, def_stmt))
 	    return false;
 
-	  comp_vectype = get_vectype_for_scalar_type (TREE_TYPE (rhs1));
+	  comp_vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (rhs1));
 	  if (comp_vectype == NULL_TREE)
 	    return false;
 
@@ -3627,7 +3635,7 @@ check_bool_pattern (tree var, vec_info *vinfo, hash_set<gimple *> &stmts)
 	      scalar_mode mode = SCALAR_TYPE_MODE (TREE_TYPE (rhs1));
 	      tree itype
 		= build_nonstandard_integer_type (GET_MODE_BITSIZE (mode), 1);
-	      vecitype = get_vectype_for_scalar_type (itype);
+	      vecitype = get_vectype_for_scalar_type (vinfo, itype);
 	      if (vecitype == NULL_TREE)
 		return false;
 	    }
@@ -3656,10 +3664,11 @@ check_bool_pattern (tree var, vec_info *vinfo, hash_set<gimple *> &stmts)
 static tree
 adjust_bool_pattern_cast (tree type, tree var, stmt_vec_info stmt_info)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   gimple *cast_stmt = gimple_build_assign (vect_recog_temp_ssa_var (type, NULL),
 					   NOP_EXPR, var);
   append_pattern_def_seq (stmt_info, cast_stmt,
-			  get_vectype_for_scalar_type (type));
+			  get_vectype_for_scalar_type (vinfo, type));
   return gimple_assign_lhs (cast_stmt);
 }
 
@@ -3673,6 +3682,7 @@ static void
 adjust_bool_pattern (tree var, tree out_type,
 		     stmt_vec_info stmt_info, hash_map <tree, tree> &defs)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   gimple *stmt = SSA_NAME_DEF_STMT (var);
   enum tree_code rhs_code, def_rhs_code;
   tree itype, cond_expr, rhs1, rhs2, irhs1, irhs2;
@@ -3834,7 +3844,7 @@ adjust_bool_pattern (tree var, tree out_type,
 
   gimple_set_location (pattern_stmt, loc);
   append_pattern_def_seq (stmt_info, pattern_stmt,
-			  get_vectype_for_scalar_type (itype));
+			  get_vectype_for_scalar_type (vinfo, itype));
   defs.put (var, gimple_assign_lhs (pattern_stmt));
 }
 
@@ -3937,7 +3947,7 @@ search_type_for_mask_1 (tree var, vec_info *vinfo,
 	      break;
 	    }
 
-	  comp_vectype = get_vectype_for_scalar_type (TREE_TYPE (rhs1));
+	  comp_vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (rhs1));
 	  if (comp_vectype == NULL_TREE)
 	    {
 	      res = NULL_TREE;
@@ -4052,7 +4062,7 @@ vect_recog_bool_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       if (! INTEGRAL_TYPE_P (TREE_TYPE (lhs))
 	  || TYPE_PRECISION (TREE_TYPE (lhs)) == 1)
 	return NULL;
-      vectype = get_vectype_for_scalar_type (TREE_TYPE (lhs));
+      vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (lhs));
       if (vectype == NULL_TREE)
 	return NULL;
 
@@ -4089,7 +4099,7 @@ vect_recog_bool_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 
 	  if (!useless_type_conversion_p (type, TREE_TYPE (lhs)))
 	    {
-	      tree new_vectype = get_vectype_for_scalar_type (type);
+	      tree new_vectype = get_vectype_for_scalar_type (vinfo, type);
 	      append_pattern_def_seq (stmt_vinfo, pattern_stmt, new_vectype);
 
 	      lhs = vect_recog_temp_ssa_var (TREE_TYPE (lhs), NULL);
@@ -4105,7 +4115,7 @@ vect_recog_bool_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
   else if (rhs_code == COND_EXPR
 	   && TREE_CODE (var) == SSA_NAME)
     {
-      vectype = get_vectype_for_scalar_type (TREE_TYPE (lhs));
+      vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (lhs));
       if (vectype == NULL_TREE)
 	return NULL;
 
@@ -4119,7 +4129,7 @@ vect_recog_bool_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
       tree type
 	= build_nonstandard_integer_type (prec,
 					  TYPE_UNSIGNED (TREE_TYPE (var)));
-      if (get_vectype_for_scalar_type (type) == NULL_TREE)
+      if (get_vectype_for_scalar_type (vinfo, type) == NULL_TREE)
 	return NULL;
 
       if (!check_bool_pattern (var, vinfo, bool_stmts))
@@ -4163,7 +4173,7 @@ vect_recog_bool_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 
 	  cst0 = build_int_cst (type, 0);
 	  cst1 = build_int_cst (type, 1);
-	  new_vectype = get_vectype_for_scalar_type (type);
+	  new_vectype = get_vectype_for_scalar_type (vinfo, type);
 
 	  rhs = vect_recog_temp_ssa_var (type, NULL);
 	  pattern_stmt = gimple_build_assign (rhs, COND_EXPR, var, cst1, cst0);
@@ -4264,12 +4274,12 @@ vect_recog_mask_conversion_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 	{
 	  int rhs_index = internal_fn_stored_value_index (ifn);
 	  tree rhs = gimple_call_arg (last_stmt, rhs_index);
-	  vectype1 = get_vectype_for_scalar_type (TREE_TYPE (rhs));
+	  vectype1 = get_vectype_for_scalar_type (vinfo, TREE_TYPE (rhs));
 	}
       else
 	{
 	  lhs = gimple_call_lhs (last_stmt);
-	  vectype1 = get_vectype_for_scalar_type (TREE_TYPE (lhs));
+	  vectype1 = get_vectype_for_scalar_type (vinfo, TREE_TYPE (lhs));
 	}
 
       tree mask_arg = gimple_call_arg (last_stmt, mask_argno);
@@ -4322,7 +4332,7 @@ vect_recog_mask_conversion_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
   /* Check for cond expression requiring mask conversion.  */
   if (rhs_code == COND_EXPR)
     {
-      vectype1 = get_vectype_for_scalar_type (TREE_TYPE (lhs));
+      vectype1 = get_vectype_for_scalar_type (vinfo, TREE_TYPE (lhs));
 
       if (TREE_CODE (rhs1) == SSA_NAME)
 	{
@@ -4388,7 +4398,8 @@ vect_recog_mask_conversion_pattern (stmt_vec_info stmt_vinfo, tree *type_out)
 	      tree wide_scalar_type = build_nonstandard_integer_type
 		(tree_to_uhwi (TYPE_SIZE (TREE_TYPE (vectype1))),
 		 TYPE_UNSIGNED (rhs1_type));
-	      tree vectype3 = get_vectype_for_scalar_type (wide_scalar_type);
+	      tree vectype3 = get_vectype_for_scalar_type (vinfo,
+							   wide_scalar_type);
 	      if (expand_vec_cond_expr_p (vectype1, vectype3, TREE_CODE (rhs1)))
 		return NULL;
 	    }
@@ -4544,10 +4555,11 @@ vect_add_conversion_to_pattern (tree type, tree value, stmt_vec_info stmt_info)
   if (useless_type_conversion_p (type, TREE_TYPE (value)))
     return value;
 
+  vec_info *vinfo = stmt_info->vinfo;
   tree new_value = vect_recog_temp_ssa_var (type, NULL);
   gassign *conversion = gimple_build_assign (new_value, CONVERT_EXPR, value);
   append_pattern_def_seq (stmt_info, conversion,
-			  get_vectype_for_scalar_type (type));
+			  get_vectype_for_scalar_type (vinfo, type));
   return new_value;
 }
 
@@ -4583,7 +4595,8 @@ vect_recog_gather_scatter_pattern (stmt_vec_info stmt_info, tree *type_out)
     return NULL;
 
   /* Convert the mask to the right form.  */
-  tree gs_vectype = get_vectype_for_scalar_type (gs_info.element_type);
+  tree gs_vectype = get_vectype_for_scalar_type (loop_vinfo,
+						 gs_info.element_type);
   if (mask)
     mask = vect_convert_mask_for_vectype (mask, gs_vectype, stmt_info,
 					  loop_vinfo);
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 5b4b37f..886bbce 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -1127,7 +1127,7 @@ vect_build_slp_tree_2 (vec_info *vinfo,
   if (gphi *stmt = dyn_cast <gphi *> (stmt_info->stmt))
     {
       tree scalar_type = TREE_TYPE (PHI_RESULT (stmt));
-      tree vectype = get_vectype_for_scalar_type (scalar_type);
+      tree vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
       if (!vect_record_max_nunits (stmt_info, group_size, vectype, max_nunits))
 	return NULL;
 
@@ -1926,7 +1926,7 @@ vect_analyze_slp_instance (vec_info *vinfo,
   if (STMT_VINFO_GROUPED_ACCESS (stmt_info))
     {
       scalar_type = TREE_TYPE (DR_REF (dr));
-      vectype = get_vectype_for_scalar_type (scalar_type);
+      vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
       group_size = DR_GROUP_SIZE (stmt_info);
     }
   else if (!dr && REDUC_GROUP_FIRST_ELEMENT (stmt_info))
@@ -3287,6 +3287,7 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
 {
   vec<stmt_vec_info> stmts = SLP_TREE_SCALAR_STMTS (slp_node);
   stmt_vec_info stmt_vinfo = stmts[0];
+  vec_info *vinfo = stmt_vinfo->vinfo;
   gimple *stmt = stmt_vinfo->stmt;
   unsigned HOST_WIDE_INT nunits;
   tree vec_cst;
@@ -3310,7 +3311,7 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
     vector_type
       = build_same_sized_truth_vector_type (STMT_VINFO_VECTYPE (stmt_vinfo));
   else
-    vector_type = get_vectype_for_scalar_type (TREE_TYPE (op));
+    vector_type = get_vectype_for_scalar_type (vinfo, TREE_TYPE (op));
 
   if (STMT_VINFO_DATA_REF (stmt_vinfo))
     {
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index d371820..35fe141 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -796,6 +796,7 @@ vect_prologue_cost_for_slp_op (slp_tree node, stmt_vec_info stmt_info,
 			       unsigned opno, enum vect_def_type dt,
 			       stmt_vector_for_cost *cost_vec)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   gimple *stmt = SLP_TREE_SCALAR_STMTS (node)[0]->stmt;
   tree op = gimple_op (stmt, opno);
   unsigned prologue_cost = 0;
@@ -803,7 +804,7 @@ vect_prologue_cost_for_slp_op (slp_tree node, stmt_vec_info stmt_info,
   /* Without looking at the actual initializer a vector of
      constants can be implemented as load from the constant pool.
      When all elements are the same we can use a splat.  */
-  tree vectype = get_vectype_for_scalar_type (TREE_TYPE (op));
+  tree vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (op));
   unsigned group_size = SLP_TREE_SCALAR_STMTS (node).length ();
   unsigned num_vects_to_check;
   unsigned HOST_WIDE_INT const_nunits;
@@ -1610,7 +1611,7 @@ vect_get_vec_def_for_operand (tree op, stmt_vec_info stmt_vinfo, tree vectype)
 	       && VECTOR_BOOLEAN_TYPE_P (stmt_vectype))
 	vector_type = build_same_sized_truth_vector_type (stmt_vectype);
       else
-	vector_type = get_vectype_for_scalar_type (TREE_TYPE (op));
+	vector_type = get_vectype_for_scalar_type (loop_vinfo, TREE_TYPE (op));
 
       gcc_assert (vector_type);
       return vect_init_vector (stmt_vinfo, op, vector_type, NULL);
@@ -2975,6 +2976,7 @@ vect_get_gather_scatter_ops (class loop *loop, stmt_vec_info stmt_info,
 			     gather_scatter_info *gs_info,
 			     tree *dataref_ptr, tree *vec_offset)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   gimple_seq stmts = NULL;
   *dataref_ptr = force_gimple_operand (gs_info->base, &stmts, true, NULL_TREE);
   if (stmts != NULL)
@@ -2985,7 +2987,7 @@ vect_get_gather_scatter_ops (class loop *loop, stmt_vec_info stmt_info,
       gcc_assert (!new_bb);
     }
   tree offset_type = TREE_TYPE (gs_info->offset);
-  tree offset_vectype = get_vectype_for_scalar_type (offset_type);
+  tree offset_vectype = get_vectype_for_scalar_type (vinfo, offset_type);
   *vec_offset = vect_get_vec_def_for_operand (gs_info->offset, stmt_info,
 					      offset_vectype);
 }
@@ -3020,7 +3022,7 @@ vect_get_strided_load_store_ops (stmt_vec_info stmt_info,
   /* The offset given in GS_INFO can have pointer type, so use the element
      type of the vector instead.  */
   tree offset_type = TREE_TYPE (gs_info->offset);
-  tree offset_vectype = get_vectype_for_scalar_type (offset_type);
+  tree offset_vectype = get_vectype_for_scalar_type (loop_vinfo, offset_type);
   offset_type = TREE_TYPE (offset_vectype);
 
   /* Calculate X = DR_STEP / SCALE and convert it to the appropriate type.  */
@@ -4101,9 +4103,8 @@ vectorizable_simd_clone_call (stmt_vec_info stmt_info,
 	 || arginfo[i].dt == vect_external_def)
 	&& bestn->simdclone->args[i].arg_type == SIMD_CLONE_ARG_TYPE_VECTOR)
       {
-	arginfo[i].vectype
-	  = get_vectype_for_scalar_type (TREE_TYPE (gimple_call_arg (stmt,
-								     i)));
+	tree arg_type = TREE_TYPE (gimple_call_arg (stmt, i));
+	arginfo[i].vectype = get_vectype_for_scalar_type (vinfo, arg_type);
 	if (arginfo[i].vectype == NULL
 	    || (simd_clone_subparts (arginfo[i].vectype)
 		> bestn->simdclone->simdlen))
@@ -5466,7 +5467,7 @@ vectorizable_assignment (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
    either as shift by a scalar or by a vector.  */
 
 bool
-vect_supportable_shift (vec_info *, enum tree_code code, tree scalar_type)
+vect_supportable_shift (vec_info *vinfo, enum tree_code code, tree scalar_type)
 {
 
   machine_mode vec_mode;
@@ -5474,7 +5475,7 @@ vect_supportable_shift (vec_info *, enum tree_code code, tree scalar_type)
   int icode;
   tree vectype;
 
-  vectype = get_vectype_for_scalar_type (scalar_type);
+  vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
   if (!vectype)
     return false;
 
@@ -9763,7 +9764,7 @@ vect_is_simple_cond (tree cond, vec_info *vinfo,
 	scalar_type = build_nonstandard_integer_type
 	  (tree_to_uhwi (TYPE_SIZE (TREE_TYPE (vectype))),
 	   TYPE_UNSIGNED (scalar_type));
-      *comp_vectype = get_vectype_for_scalar_type (scalar_type);
+      *comp_vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
     }
 
   return true;
@@ -10359,7 +10360,7 @@ vectorizable_comparison (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   /* Invariant comparison.  */
   if (!vectype)
     {
-      vectype = get_vectype_for_scalar_type (TREE_TYPE (rhs1));
+      vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (rhs1));
       if (maybe_ne (TYPE_VECTOR_SUBPARTS (vectype), nunits))
 	return false;
     }
@@ -11140,7 +11141,7 @@ poly_uint64 current_vector_size;
    by the target.  */
 
 tree
-get_vectype_for_scalar_type (tree scalar_type)
+get_vectype_for_scalar_type (vec_info *, tree scalar_type)
 {
   tree vectype;
   vectype = get_vectype_for_scalar_type_and_size (scalar_type,
@@ -11157,9 +11158,9 @@ get_vectype_for_scalar_type (tree scalar_type)
    of vectors of specified SCALAR_TYPE as supported by target.  */
 
 tree
-get_mask_type_for_scalar_type (vec_info *, tree scalar_type)
+get_mask_type_for_scalar_type (vec_info *vinfo, tree scalar_type)
 {
-  tree vectype = get_vectype_for_scalar_type (scalar_type);
+  tree vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
 
   if (!vectype)
     return NULL;
@@ -11853,6 +11854,7 @@ vect_get_vector_types_for_stmt (stmt_vec_info stmt_info,
 				tree *stmt_vectype_out,
 				tree *nunits_vectype_out)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   gimple *stmt = stmt_info->stmt;
 
   *stmt_vectype_out = NULL_TREE;
@@ -11919,7 +11921,7 @@ vect_get_vector_types_for_stmt (stmt_vec_info stmt_info,
       if (dump_enabled_p ())
 	dump_printf_loc (MSG_NOTE, vect_location,
 			 "get vectype for scalar type:  %T\n", scalar_type);
-      vectype = get_vectype_for_scalar_type (scalar_type);
+      vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
       if (!vectype)
 	return opt_result::failure_at (stmt,
 				       "not vectorized:"
@@ -11952,7 +11954,7 @@ vect_get_vector_types_for_stmt (stmt_vec_info stmt_info,
       if (dump_enabled_p ())
 	dump_printf_loc (MSG_NOTE, vect_location,
 			 "get vectype for scalar type:  %T\n", scalar_type);
-      nunits_vectype = get_vectype_for_scalar_type (scalar_type);
+      nunits_vectype = get_vectype_for_scalar_type (vinfo, scalar_type);
     }
   if (!nunits_vectype)
     return opt_result::failure_at (stmt,
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 2dd9ea3..108e704 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1589,7 +1589,7 @@ extern bool vect_can_advance_ivs_p (loop_vec_info);
 
 /* In tree-vect-stmts.c.  */
 extern poly_uint64 current_vector_size;
-extern tree get_vectype_for_scalar_type (tree);
+extern tree get_vectype_for_scalar_type (vec_info *, tree);
 extern tree get_vectype_for_scalar_type_and_size (tree, poly_uint64);
 extern tree get_mask_type_for_scalar_type (vec_info *, tree);
 extern tree get_same_sized_vectype (tree, tree);
-- 
cgit v1.1


From cdbe6e9bb4ae2882f77f94993783085fa342a9f9 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:01 +0000
Subject: Pass a vec_info to duplicate_and_interleave

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (duplicate_and_interleave): Take a vec_info.
	* tree-vect-slp.c (duplicate_and_interleave): Likewise.
	(vect_get_constant_vectors): Update call accordingly.
	* tree-vect-loop.c (get_initial_defs_for_reduction): Likewise.

From-SVN: r277228
---
 gcc/ChangeLog         | 7 +++++++
 gcc/tree-vect-loop.c  | 3 ++-
 gcc/tree-vect-slp.c   | 9 +++++----
 gcc/tree-vectorizer.h | 4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42762a9..67b640c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (duplicate_and_interleave): Take a vec_info.
+	* tree-vect-slp.c (duplicate_and_interleave): Likewise.
+	(vect_get_constant_vectors): Update call accordingly.
+	* tree-vect-loop.c (get_initial_defs_for_reduction): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (get_vectype_for_scalar_type): Take a vec_info.
 	* tree-vect-stmts.c (get_vectype_for_scalar_type): Likewise.
 	(vect_prologue_cost_for_slp_op): Update call accordingly.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 304bb5e..ecd9724 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -3878,6 +3878,7 @@ get_initial_defs_for_reduction (slp_tree slp_node,
 {
   vec<stmt_vec_info> stmts = SLP_TREE_SCALAR_STMTS (slp_node);
   stmt_vec_info stmt_vinfo = stmts[0];
+  vec_info *vinfo = stmt_vinfo->vinfo;
   unsigned HOST_WIDE_INT nunits;
   unsigned j, number_of_places_left_in_vector;
   tree vector_type;
@@ -3970,7 +3971,7 @@ get_initial_defs_for_reduction (slp_tree slp_node,
 	    {
 	      /* First time round, duplicate ELTS to fill the
 		 required number of vectors.  */
-	      duplicate_and_interleave (&ctor_seq, vector_type, elts,
+	      duplicate_and_interleave (vinfo, &ctor_seq, vector_type, elts,
 					number_of_vectors, *vec_oprnds);
 	      break;
 	    }
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 886bbce..cf1ff5a 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -3183,8 +3183,9 @@ vect_mask_constant_operand_p (stmt_vec_info stmt_vinfo)
    to cut down on the number of interleaves.  */
 
 void
-duplicate_and_interleave (gimple_seq *seq, tree vector_type, vec<tree> elts,
-			  unsigned int nresults, vec<tree> &results)
+duplicate_and_interleave (vec_info *, gimple_seq *seq, tree vector_type,
+			  vec<tree> elts, unsigned int nresults,
+			  vec<tree> &results)
 {
   unsigned int nelts = elts.length ();
   tree element_type = TREE_TYPE (vector_type);
@@ -3473,8 +3474,8 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
 	      else
 		{
 		  if (vec_oprnds->is_empty ())
-		    duplicate_and_interleave (&ctor_seq, vector_type, elts,
-					      number_of_vectors,
+		    duplicate_and_interleave (vinfo, &ctor_seq, vector_type,
+					      elts, number_of_vectors,
 					      permute_results);
 		  vec_cst = permute_results[number_of_vectors - j - 1];
 		}
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 108e704..ef54925 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1754,8 +1754,8 @@ extern bool is_simple_and_all_uses_invariant (stmt_vec_info, loop_vec_info);
 extern bool can_duplicate_and_interleave_p (unsigned int, machine_mode,
 					    unsigned int * = NULL,
 					    tree * = NULL, tree * = NULL);
-extern void duplicate_and_interleave (gimple_seq *, tree, vec<tree>,
-				      unsigned int, vec<tree> &);
+extern void duplicate_and_interleave (vec_info *, gimple_seq *, tree,
+				      vec<tree>, unsigned int, vec<tree> &);
 extern int vect_get_place_in_interleaving_chain (stmt_vec_info, stmt_vec_info);
 
 /* In tree-vect-patterns.c.  */
-- 
cgit v1.1


From 43fdde5738ea0554fa000987e9769add027f4876 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:05 +0000
Subject: Pass a vec_info to can_duplicate_and_interleave_p

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (can_duplicate_and_interleave_p): Take a vec_info.
	* tree-vect-slp.c (can_duplicate_and_interleave_p): Likewise.
	(duplicate_and_interleave): Update call accordingly.
	* tree-vect-loop.c (vectorizable_reduction): Likewise.

From-SVN: r277229
---
 gcc/ChangeLog         | 7 +++++++
 gcc/tree-vect-loop.c  | 3 ++-
 gcc/tree-vect-slp.c   | 9 +++++----
 gcc/tree-vectorizer.h | 3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67b640c..efb8917 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (can_duplicate_and_interleave_p): Take a vec_info.
+	* tree-vect-slp.c (can_duplicate_and_interleave_p): Likewise.
+	(duplicate_and_interleave): Update call accordingly.
+	* tree-vect-loop.c (vectorizable_reduction): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (duplicate_and_interleave): Take a vec_info.
 	* tree-vect-slp.c (duplicate_and_interleave): Likewise.
 	(vect_get_constant_vectors): Update call accordingly.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index ecd9724..21a0eae 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -6145,7 +6145,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       unsigned int group_size = SLP_INSTANCE_GROUP_SIZE (slp_node_instance);
       scalar_mode elt_mode = SCALAR_TYPE_MODE (TREE_TYPE (vectype_out));
       if (!neutral_op
-	  && !can_duplicate_and_interleave_p (group_size, elt_mode))
+	  && !can_duplicate_and_interleave_p (loop_vinfo, group_size,
+					      elt_mode))
 	{
 	  if (dump_enabled_p ())
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index cf1ff5a..ddb6086 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -233,7 +233,8 @@ vect_get_place_in_interleaving_chain (stmt_vec_info stmt_info,
    (if nonnull).  */
 
 bool
-can_duplicate_and_interleave_p (unsigned int count, machine_mode elt_mode,
+can_duplicate_and_interleave_p (vec_info *, unsigned int count,
+				machine_mode elt_mode,
 				unsigned int *nvectors_out,
 				tree *vector_type_out,
 				tree *permutes)
@@ -432,7 +433,7 @@ again:
 	       || dt == vect_external_def)
 	      && !current_vector_size.is_constant ()
 	      && (TREE_CODE (type) == BOOLEAN_TYPE
-		  || !can_duplicate_and_interleave_p (stmts.length (),
+		  || !can_duplicate_and_interleave_p (vinfo, stmts.length (),
 						      TYPE_MODE (type))))
 	    {
 	      if (dump_enabled_p ())
@@ -3183,7 +3184,7 @@ vect_mask_constant_operand_p (stmt_vec_info stmt_vinfo)
    to cut down on the number of interleaves.  */
 
 void
-duplicate_and_interleave (vec_info *, gimple_seq *seq, tree vector_type,
+duplicate_and_interleave (vec_info *vinfo, gimple_seq *seq, tree vector_type,
 			  vec<tree> elts, unsigned int nresults,
 			  vec<tree> &results)
 {
@@ -3194,7 +3195,7 @@ duplicate_and_interleave (vec_info *, gimple_seq *seq, tree vector_type,
   unsigned int nvectors = 1;
   tree new_vector_type;
   tree permutes[2];
-  if (!can_duplicate_and_interleave_p (nelts, TYPE_MODE (element_type),
+  if (!can_duplicate_and_interleave_p (vinfo, nelts, TYPE_MODE (element_type),
 				       &nvectors, &new_vector_type,
 				       permutes))
     gcc_unreachable ();
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index ef54925..e363d27 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1751,7 +1751,8 @@ extern void vect_get_slp_defs (vec<tree> , slp_tree, vec<vec<tree> > *);
 extern bool vect_slp_bb (basic_block);
 extern stmt_vec_info vect_find_last_scalar_stmt_in_slp (slp_tree);
 extern bool is_simple_and_all_uses_invariant (stmt_vec_info, loop_vec_info);
-extern bool can_duplicate_and_interleave_p (unsigned int, machine_mode,
+extern bool can_duplicate_and_interleave_p (vec_info *, unsigned int,
+					    machine_mode,
 					    unsigned int * = NULL,
 					    tree * = NULL, tree * = NULL);
 extern void duplicate_and_interleave (vec_info *, gimple_seq *, tree,
-- 
cgit v1.1


From 6c261c667801eee46a6221d3681d17493c0bbd65 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:10 +0000
Subject: Pass a vec_info to simple_integer_narrowing

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-stmts.c (simple_integer_narrowing): Take a vec_info.
	(vectorizable_call): Update call accordingly.

From-SVN: r277230
---
 gcc/ChangeLog         | 5 +++++
 gcc/tree-vect-stmts.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efb8917..f29cdda 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vect-stmts.c (simple_integer_narrowing): Take a vec_info.
+	(vectorizable_call): Update call accordingly.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (can_duplicate_and_interleave_p): Take a vec_info.
 	* tree-vect-slp.c (can_duplicate_and_interleave_p): Likewise.
 	(duplicate_and_interleave): Update call accordingly.
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 35fe141..55651eb 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -3175,7 +3175,7 @@ vectorizable_bswap (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
    *CONVERT_CODE.  */
 
 static bool
-simple_integer_narrowing (tree vectype_out, tree vectype_in,
+simple_integer_narrowing (vec_info *, tree vectype_out, tree vectype_in,
 			  tree_code *convert_code)
 {
   if (!INTEGRAL_TYPE_P (TREE_TYPE (vectype_out))
@@ -3369,7 +3369,7 @@ vectorizable_call (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   if (cfn != CFN_LAST
       && (modifier == NONE
 	  || (modifier == NARROW
-	      && simple_integer_narrowing (vectype_out, vectype_in,
+	      && simple_integer_narrowing (vinfo, vectype_out, vectype_in,
 					   &convert_code))))
     ifn = vectorizable_internal_function (cfn, callee, vectype_out,
 					  vectype_in);
-- 
cgit v1.1


From db8374a63fd0ea84f72ac76cc899be44df36df6a Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:15 +0000
Subject: Pass a vec_info to supportable_narrowing_operation

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (supportable_narrowing_operation): Take a vec_info.
	* tree-vect-stmts.c (supportable_narrowing_operation): Likewise.
	(simple_integer_narrowing): Update call accordingly.
	(vectorizable_conversion): Likewise.

From-SVN: r277231
---
 gcc/ChangeLog         |  7 +++++++
 gcc/tree-vect-stmts.c | 16 ++++++++--------
 gcc/tree-vectorizer.h |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f29cdda..d5b25ce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (supportable_narrowing_operation): Take a vec_info.
+	* tree-vect-stmts.c (supportable_narrowing_operation): Likewise.
+	(simple_integer_narrowing): Update call accordingly.
+	(vectorizable_conversion): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vect-stmts.c (simple_integer_narrowing): Take a vec_info.
 	(vectorizable_call): Update call accordingly.
 
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 55651eb..92c31ab 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -3175,7 +3175,7 @@ vectorizable_bswap (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
    *CONVERT_CODE.  */
 
 static bool
-simple_integer_narrowing (vec_info *, tree vectype_out, tree vectype_in,
+simple_integer_narrowing (vec_info *vinfo, tree vectype_out, tree vectype_in,
 			  tree_code *convert_code)
 {
   if (!INTEGRAL_TYPE_P (TREE_TYPE (vectype_out))
@@ -3185,8 +3185,8 @@ simple_integer_narrowing (vec_info *, tree vectype_out, tree vectype_in,
   tree_code code;
   int multi_step_cvt = 0;
   auto_vec <tree, 8> interm_types;
-  if (!supportable_narrowing_operation (NOP_EXPR, vectype_out, vectype_in,
-					&code, &multi_step_cvt,
+  if (!supportable_narrowing_operation (vinfo, NOP_EXPR, vectype_out,
+					vectype_in, &code, &multi_step_cvt,
 					&interm_types)
       || multi_step_cvt)
     return false;
@@ -4957,8 +4957,8 @@ vectorizable_conversion (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 
     case NARROW:
       gcc_assert (op_type == unary_op);
-      if (supportable_narrowing_operation (code, vectype_out, vectype_in,
-					   &code1, &multi_step_cvt,
+      if (supportable_narrowing_operation (vinfo, code, vectype_out,
+					   vectype_in, &code1, &multi_step_cvt,
 					   &interm_types))
 	break;
 
@@ -4974,8 +4974,8 @@ vectorizable_conversion (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       if (!supportable_convert_operation (code, cvt_type, vectype_in,
 					  &decl1, &codecvt1))
 	goto unsupported;
-      if (supportable_narrowing_operation (NOP_EXPR, vectype_out, cvt_type,
-					   &code1, &multi_step_cvt,
+      if (supportable_narrowing_operation (vinfo, NOP_EXPR, vectype_out,
+					   cvt_type, &code1, &multi_step_cvt,
 					   &interm_types))
 	break;
       goto unsupported;
@@ -11649,7 +11649,7 @@ supportable_widening_operation (enum tree_code code, stmt_vec_info stmt_info,
    narrowing operation (short in the above example).   */
 
 bool
-supportable_narrowing_operation (enum tree_code code,
+supportable_narrowing_operation (vec_info *, enum tree_code code,
 				 tree vectype_out, tree vectype_in,
 				 enum tree_code *code1, int *multi_step_cvt,
                                  vec<tree> *interm_types)
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index e363d27..71b1da5 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1603,8 +1603,8 @@ extern bool supportable_widening_operation (enum tree_code, stmt_vec_info,
 					    tree, tree, enum tree_code *,
 					    enum tree_code *, int *,
 					    vec<tree> *);
-extern bool supportable_narrowing_operation (enum tree_code, tree, tree,
-					     enum tree_code *,
+extern bool supportable_narrowing_operation (vec_info *, enum tree_code, tree,
+					     tree, enum tree_code *,
 					     int *, vec<tree> *);
 extern unsigned record_stmt_cost (stmt_vector_for_cost *, int,
 				  enum vect_cost_for_stmt, stmt_vec_info,
-- 
cgit v1.1


From b0dab10e71b03441beefbbf951c0812056413cd3 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:21 +0000
Subject: Pass a loop_vec_info to vect_maybe_permute_loop_masks

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Take
	a loop_vec_info.
	(vect_set_loop_condition_masked): Update call accordingly.

From-SVN: r277232
---
 gcc/ChangeLog              | 6 ++++++
 gcc/tree-vect-loop-manip.c | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5b25ce..9c07777 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Take
+	a loop_vec_info.
+	(vect_set_loop_condition_masked): Update call accordingly.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (supportable_narrowing_operation): Take a vec_info.
 	* tree-vect-stmts.c (supportable_narrowing_operation): Likewise.
 	(simple_integer_narrowing): Update call accordingly.
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index a290226..1f1f26f 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -317,7 +317,8 @@ interleave_supported_p (vec_perm_indices *indices, tree vectype,
    latter.  Return true on success, adding any new statements to SEQ.  */
 
 static bool
-vect_maybe_permute_loop_masks (gimple_seq *seq, rgroup_masks *dest_rgm,
+vect_maybe_permute_loop_masks (loop_vec_info, gimple_seq *seq,
+			       rgroup_masks *dest_rgm,
 			       rgroup_masks *src_rgm)
 {
   tree src_masktype = src_rgm->mask_type;
@@ -689,7 +690,8 @@ vect_set_loop_condition_masked (class loop *loop, loop_vec_info loop_vinfo,
 	  {
 	    rgroup_masks *half_rgm = &(*masks)[nmasks / 2 - 1];
 	    if (!half_rgm->masks.is_empty ()
-		&& vect_maybe_permute_loop_masks (&header_seq, rgm, half_rgm))
+		&& vect_maybe_permute_loop_masks (loop_vinfo, &header_seq,
+						  rgm, half_rgm))
 	      continue;
 	  }
 
-- 
cgit v1.1


From 830e90dab3dee5c8129c7760ff09ab112c2cd271 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:25 +0000
Subject: Pass a vec_info to vect_halve_mask_nunits

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (vect_halve_mask_nunits): Take a vec_info.
	* tree-vect-loop.c (vect_halve_mask_nunits): Likewise.
	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Update
	call accordingly.
	* tree-vect-stmts.c (supportable_widening_operation): Likewise.

From-SVN: r277233
---
 gcc/ChangeLog              | 8 ++++++++
 gcc/tree-vect-loop-manip.c | 4 ++--
 gcc/tree-vect-loop.c       | 2 +-
 gcc/tree-vect-stmts.c      | 3 ++-
 gcc/tree-vectorizer.h      | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9c07777..8ae7192 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (vect_halve_mask_nunits): Take a vec_info.
+	* tree-vect-loop.c (vect_halve_mask_nunits): Likewise.
+	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Update
+	call accordingly.
+	* tree-vect-stmts.c (supportable_widening_operation): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Take
 	a loop_vec_info.
 	(vect_set_loop_condition_masked): Update call accordingly.
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 1f1f26f..b3246bc 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -317,7 +317,7 @@ interleave_supported_p (vec_perm_indices *indices, tree vectype,
    latter.  Return true on success, adding any new statements to SEQ.  */
 
 static bool
-vect_maybe_permute_loop_masks (loop_vec_info, gimple_seq *seq,
+vect_maybe_permute_loop_masks (loop_vec_info loop_vinfo, gimple_seq *seq,
 			       rgroup_masks *dest_rgm,
 			       rgroup_masks *src_rgm)
 {
@@ -330,7 +330,7 @@ vect_maybe_permute_loop_masks (loop_vec_info, gimple_seq *seq,
     {
       /* Unpacking the source masks gives at least as many mask bits as
 	 we need.  We can then VIEW_CONVERT any excess bits away.  */
-      tree unpack_masktype = vect_halve_mask_nunits (src_masktype);
+      tree unpack_masktype = vect_halve_mask_nunits (loop_vinfo, src_masktype);
       for (unsigned int i = 0; i < dest_rgm->masks.length (); ++i)
 	{
 	  tree src = src_rgm->masks[i / 2];
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 21a0eae..5c29084 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -7745,7 +7745,7 @@ loop_niters_no_overflow (loop_vec_info loop_vinfo)
 /* Return a mask type with half the number of elements as TYPE.  */
 
 tree
-vect_halve_mask_nunits (tree type)
+vect_halve_mask_nunits (vec_info *, tree type)
 {
   poly_uint64 nunits = exact_div (TYPE_VECTOR_SUBPARTS (type), 2);
   return build_truth_vector_type (nunits, current_vector_size);
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 92c31ab..690e2c4 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -11385,6 +11385,7 @@ supportable_widening_operation (enum tree_code code, stmt_vec_info stmt_info,
                                 int *multi_step_cvt,
                                 vec<tree> *interm_types)
 {
+  vec_info *vinfo = stmt_info->vinfo;
   loop_vec_info loop_info = STMT_VINFO_LOOP_VINFO (stmt_info);
   class loop *vect_loop = NULL;
   machine_mode vec_mode;
@@ -11570,7 +11571,7 @@ supportable_widening_operation (enum tree_code code, stmt_vec_info stmt_info,
       intermediate_mode = insn_data[icode1].operand[0].mode;
       if (VECTOR_BOOLEAN_TYPE_P (prev_type))
 	{
-	  intermediate_type = vect_halve_mask_nunits (prev_type);
+	  intermediate_type = vect_halve_mask_nunits (vinfo, prev_type);
 	  if (intermediate_mode != TYPE_MODE (intermediate_type))
 	    return false;
 	}
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 71b1da5..4199b7c 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1705,7 +1705,7 @@ extern opt_loop_vec_info vect_analyze_loop (class loop *,
 extern tree vect_build_loop_niters (loop_vec_info, bool * = NULL);
 extern void vect_gen_vector_loop_niters (loop_vec_info, tree, tree *,
 					 tree *, bool);
-extern tree vect_halve_mask_nunits (tree);
+extern tree vect_halve_mask_nunits (vec_info *, tree);
 extern tree vect_double_mask_nunits (tree);
 extern void vect_record_loop_mask (loop_vec_info, vec_loop_masks *,
 				   unsigned int, tree, tree);
-- 
cgit v1.1


From 8d1473958808fe4714ec24991ac83ee6cbf45397 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:31 +0000
Subject: Pass a vec_info to vect_double_mask_nunits

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (vect_double_mask_nunits): Take a vec_info.
	* tree-vect-loop.c (vect_double_mask_nunits): Likewise.
	* tree-vect-stmts.c (supportable_narrowing_operation):  Update call
	accordingly.

From-SVN: r277234
---
 gcc/ChangeLog         | 7 +++++++
 gcc/tree-vect-loop.c  | 2 +-
 gcc/tree-vect-stmts.c | 4 ++--
 gcc/tree-vectorizer.h | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ae7192..dc092c5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (vect_double_mask_nunits): Take a vec_info.
+	* tree-vect-loop.c (vect_double_mask_nunits): Likewise.
+	* tree-vect-stmts.c (supportable_narrowing_operation):  Update call
+	accordingly.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (vect_halve_mask_nunits): Take a vec_info.
 	* tree-vect-loop.c (vect_halve_mask_nunits): Likewise.
 	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Update
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 5c29084..f6101f3 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -7754,7 +7754,7 @@ vect_halve_mask_nunits (vec_info *, tree type)
 /* Return a mask type with twice as many elements as TYPE.  */
 
 tree
-vect_double_mask_nunits (tree type)
+vect_double_mask_nunits (vec_info *, tree type)
 {
   poly_uint64 nunits = TYPE_VECTOR_SUBPARTS (type) * 2;
   return build_truth_vector_type (nunits, current_vector_size);
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 690e2c4..c8f1582 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -11650,7 +11650,7 @@ supportable_widening_operation (enum tree_code code, stmt_vec_info stmt_info,
    narrowing operation (short in the above example).   */
 
 bool
-supportable_narrowing_operation (vec_info *, enum tree_code code,
+supportable_narrowing_operation (vec_info *vinfo, enum tree_code code,
 				 tree vectype_out, tree vectype_in,
 				 enum tree_code *code1, int *multi_step_cvt,
                                  vec<tree> *interm_types)
@@ -11759,7 +11759,7 @@ supportable_narrowing_operation (vec_info *, enum tree_code code,
       intermediate_mode = insn_data[icode1].operand[0].mode;
       if (VECTOR_BOOLEAN_TYPE_P (prev_type))
 	{
-	  intermediate_type = vect_double_mask_nunits (prev_type);
+	  intermediate_type = vect_double_mask_nunits (vinfo, prev_type);
 	  if (intermediate_mode != TYPE_MODE (intermediate_type))
 	    return false;
 	}
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 4199b7c..67d4894 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -1706,7 +1706,7 @@ extern tree vect_build_loop_niters (loop_vec_info, bool * = NULL);
 extern void vect_gen_vector_loop_niters (loop_vec_info, tree, tree *,
 					 tree *, bool);
 extern tree vect_halve_mask_nunits (vec_info *, tree);
-extern tree vect_double_mask_nunits (tree);
+extern tree vect_double_mask_nunits (vec_info *, tree);
 extern void vect_record_loop_mask (loop_vec_info, vec_loop_masks *,
 				   unsigned int, tree, tree);
 extern tree vect_get_loop_mask (gimple_stmt_iterator *, vec_loop_masks *,
-- 
cgit v1.1


From ba7f76dd6bbf038948bbe516764a8bb0c851f750 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 21 Oct 2019 06:41:36 +0000
Subject: Replace current_vector_size with vec_info::vector_size

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (vec_info::vector_size): New member variable.
	(vect_update_max_nunits): Update comment.
	(current_vector_size): Delete.
	* tree-vect-stmts.c (current_vector_size): Likewise.
	(get_vectype_for_scalar_type): Use vec_info::vector_size instead
	of current_vector_size.
	(get_mask_type_for_scalar_type): Likewise.
	* tree-vectorizer.c (try_vectorize_loop_1): Likewise.
	* tree-vect-loop.c (vect_update_vf_for_slp): Likewise.
	(vect_analyze_loop, vect_halve_mask_nunits): Likewise.
	(vect_double_mask_nunits, vect_transform_loop): Likewise.
	* tree-vect-slp.c (can_duplicate_and_interleave_p): Likewise.
	(vect_make_slp_decision, vect_slp_bb_region): Likewise.

From-SVN: r277235
---
 gcc/ChangeLog         | 16 ++++++++++++++++
 gcc/tree-vect-loop.c  | 32 +++++++++++++++-----------------
 gcc/tree-vect-slp.c   | 24 +++++++++++++-----------
 gcc/tree-vect-stmts.c | 12 +++++-------
 gcc/tree-vectorizer.c |  2 +-
 gcc/tree-vectorizer.h |  7 +++++--
 6 files changed, 55 insertions(+), 38 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc092c5..fbde37c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,21 @@
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* tree-vectorizer.h (vec_info::vector_size): New member variable.
+	(vect_update_max_nunits): Update comment.
+	(current_vector_size): Delete.
+	* tree-vect-stmts.c (current_vector_size): Likewise.
+	(get_vectype_for_scalar_type): Use vec_info::vector_size instead
+	of current_vector_size.
+	(get_mask_type_for_scalar_type): Likewise.
+	* tree-vectorizer.c (try_vectorize_loop_1): Likewise.
+	* tree-vect-loop.c (vect_update_vf_for_slp): Likewise.
+	(vect_analyze_loop, vect_halve_mask_nunits): Likewise.
+	(vect_double_mask_nunits, vect_transform_loop): Likewise.
+	* tree-vect-slp.c (can_duplicate_and_interleave_p): Likewise.
+	(vect_make_slp_decision, vect_slp_bb_region): Likewise.
+
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* tree-vectorizer.h (vect_double_mask_nunits): Take a vec_info.
 	* tree-vect-loop.c (vect_double_mask_nunits): Likewise.
 	* tree-vect-stmts.c (supportable_narrowing_operation):  Update call
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index f6101f3..d073620 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -1414,7 +1414,7 @@ vect_update_vf_for_slp (loop_vec_info loop_vinfo)
 	dump_printf_loc (MSG_NOTE, vect_location,
 			 "Loop contains SLP and non-SLP stmts\n");
       /* Both the vectorization factor and unroll factor have the form
-	 current_vector_size * X for some rational X, so they must have
+	 loop_vinfo->vector_size * X for some rational X, so they must have
 	 a common multiple.  */
       vectorization_factor
 	= force_common_multiple (vectorization_factor,
@@ -2311,7 +2311,6 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
   auto_vector_sizes vector_sizes;
 
   /* Autodetect first vector size we try.  */
-  current_vector_size = 0;
   targetm.vectorize.autovectorize_vector_sizes (&vector_sizes,
 						loop->simdlen != 0);
   unsigned int next_size = 0;
@@ -2333,7 +2332,7 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
   unsigned n_stmts = 0;
   poly_uint64 autodetected_vector_size = 0;
   opt_loop_vec_info first_loop_vinfo = opt_loop_vec_info::success (NULL);
-  poly_uint64 first_vector_size = 0;
+  poly_uint64 next_vector_size = 0;
   while (1)
     {
       /* Check the CFG characteristics of the loop (nesting, entry/exit).  */
@@ -2347,6 +2346,7 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
 	  gcc_checking_assert (first_loop_vinfo == NULL);
 	  return loop_vinfo;
 	}
+      loop_vinfo->vector_size = next_vector_size;
 
       bool fatal = false;
 
@@ -2365,7 +2365,6 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
 	      if (first_loop_vinfo == NULL)
 		{
 		  first_loop_vinfo = loop_vinfo;
-		  first_vector_size = current_vector_size;
 		  loop->aux = NULL;
 		}
 	      else
@@ -2381,7 +2380,7 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
 	delete loop_vinfo;
 
       if (next_size == 0)
-	autodetected_vector_size = current_vector_size;
+	autodetected_vector_size = loop_vinfo->vector_size;
 
       if (next_size < vector_sizes.length ()
 	  && known_eq (vector_sizes[next_size], autodetected_vector_size))
@@ -2394,17 +2393,16 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
 	}
 
       if (next_size == vector_sizes.length ()
-	  || known_eq (current_vector_size, 0U))
+	  || known_eq (loop_vinfo->vector_size, 0U))
 	{
 	  if (first_loop_vinfo)
 	    {
-	      current_vector_size = first_vector_size;
 	      loop->aux = (loop_vec_info) first_loop_vinfo;
 	      if (dump_enabled_p ())
 		{
 		  dump_printf_loc (MSG_NOTE, vect_location,
 				   "***** Choosing vector size ");
-		  dump_dec (MSG_NOTE, current_vector_size);
+		  dump_dec (MSG_NOTE, first_loop_vinfo->vector_size);
 		  dump_printf (MSG_NOTE, "\n");
 		}
 	      return first_loop_vinfo;
@@ -2414,13 +2412,13 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
 	}
 
       /* Try the next biggest vector size.  */
-      current_vector_size = vector_sizes[next_size++];
+      next_vector_size = vector_sizes[next_size++];
       if (dump_enabled_p ())
 	{
 	  dump_printf_loc (MSG_NOTE, vect_location,
 			   "***** Re-trying analysis with "
 			   "vector size ");
-	  dump_dec (MSG_NOTE, current_vector_size);
+	  dump_dec (MSG_NOTE, next_vector_size);
 	  dump_printf (MSG_NOTE, "\n");
 	}
     }
@@ -7745,19 +7743,19 @@ loop_niters_no_overflow (loop_vec_info loop_vinfo)
 /* Return a mask type with half the number of elements as TYPE.  */
 
 tree
-vect_halve_mask_nunits (vec_info *, tree type)
+vect_halve_mask_nunits (vec_info *vinfo, tree type)
 {
   poly_uint64 nunits = exact_div (TYPE_VECTOR_SUBPARTS (type), 2);
-  return build_truth_vector_type (nunits, current_vector_size);
+  return build_truth_vector_type (nunits, vinfo->vector_size);
 }
 
 /* Return a mask type with twice as many elements as TYPE.  */
 
 tree
-vect_double_mask_nunits (vec_info *, tree type)
+vect_double_mask_nunits (vec_info *vinfo, tree type)
 {
   poly_uint64 nunits = TYPE_VECTOR_SUBPARTS (type) * 2;
-  return build_truth_vector_type (nunits, current_vector_size);
+  return build_truth_vector_type (nunits, vinfo->vector_size);
 }
 
 /* Record that a fully-masked version of LOOP_VINFO would need MASKS to
@@ -8243,7 +8241,7 @@ vect_transform_loop (loop_vec_info loop_vinfo)
 	{
 	  dump_printf_loc (MSG_NOTE, vect_location,
 			   "LOOP EPILOGUE VECTORIZED (VS=");
-	  dump_dec (MSG_NOTE, current_vector_size);
+	  dump_dec (MSG_NOTE, loop_vinfo->vector_size);
 	  dump_printf (MSG_NOTE, ")\n");
 	}
     }
@@ -8295,14 +8293,14 @@ vect_transform_loop (loop_vec_info loop_vinfo)
 
 	  unsigned int ratio;
 	  while (next_size < vector_sizes.length ()
-		 && !(constant_multiple_p (current_vector_size,
+		 && !(constant_multiple_p (loop_vinfo->vector_size,
 					   vector_sizes[next_size], &ratio)
 		      && eiters >= lowest_vf / ratio))
 	    next_size += 1;
 	}
       else
 	while (next_size < vector_sizes.length ()
-	       && maybe_lt (current_vector_size, vector_sizes[next_size]))
+	       && maybe_lt (loop_vinfo->vector_size, vector_sizes[next_size]))
 	  next_size += 1;
 
       if (next_size == vector_sizes.length ())
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index ddb6086..29e68ef 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -233,7 +233,7 @@ vect_get_place_in_interleaving_chain (stmt_vec_info stmt_info,
    (if nonnull).  */
 
 bool
-can_duplicate_and_interleave_p (vec_info *, unsigned int count,
+can_duplicate_and_interleave_p (vec_info *vinfo, unsigned int count,
 				machine_mode elt_mode,
 				unsigned int *nvectors_out,
 				tree *vector_type_out,
@@ -246,7 +246,7 @@ can_duplicate_and_interleave_p (vec_info *, unsigned int count,
     {
       scalar_int_mode int_mode;
       poly_int64 elt_bits = elt_bytes * BITS_PER_UNIT;
-      if (multiple_p (current_vector_size, elt_bytes, &nelts)
+      if (multiple_p (vinfo->vector_size, elt_bytes, &nelts)
 	  && int_mode_for_size (elt_bits, 0).exists (&int_mode))
 	{
 	  tree int_type = build_nonstandard_integer_type
@@ -431,7 +431,7 @@ again:
 	    }
 	  if ((dt == vect_constant_def
 	       || dt == vect_external_def)
-	      && !current_vector_size.is_constant ()
+	      && !vinfo->vector_size.is_constant ()
 	      && (TREE_CODE (type) == BOOLEAN_TYPE
 		  || !can_duplicate_and_interleave_p (vinfo, stmts.length (),
 						      TYPE_MODE (type))))
@@ -2250,7 +2250,7 @@ vect_make_slp_decision (loop_vec_info loop_vinfo)
   FOR_EACH_VEC_ELT (slp_instances, i, instance)
     {
       /* FORNOW: SLP if you can.  */
-      /* All unroll factors have the form current_vector_size * X for some
+      /* All unroll factors have the form vinfo->vector_size * X for some
 	 rational X, so they must have a common multiple.  */
       unrolling_factor
 	= force_common_multiple (unrolling_factor,
@@ -2986,7 +2986,7 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
   auto_vector_sizes vector_sizes;
 
   /* Autodetect first vector size we try.  */
-  current_vector_size = 0;
+  poly_uint64 next_vector_size = 0;
   targetm.vectorize.autovectorize_vector_sizes (&vector_sizes, false);
   unsigned int next_size = 0;
 
@@ -3005,6 +3005,7 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
 	bb_vinfo->shared->save_datarefs ();
       else
 	bb_vinfo->shared->check_datarefs ();
+      bb_vinfo->vector_size = next_vector_size;
 
       if (vect_slp_analyze_bb_1 (bb_vinfo, n_stmts, fatal)
 	  && dbg_cnt (vect_slp))
@@ -3018,7 +3019,7 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
 	  unsigned HOST_WIDE_INT bytes;
 	  if (dump_enabled_p ())
 	    {
-	      if (current_vector_size.is_constant (&bytes))
+	      if (bb_vinfo->vector_size.is_constant (&bytes))
 		dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
 				 "basic block part vectorized using %wu byte "
 				 "vectors\n", bytes);
@@ -3030,10 +3031,11 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
 
 	  vectorized = true;
 	}
-      delete bb_vinfo;
 
       if (next_size == 0)
-	autodetected_vector_size = current_vector_size;
+	autodetected_vector_size = bb_vinfo->vector_size;
+
+      delete bb_vinfo;
 
       if (next_size < vector_sizes.length ()
 	  && known_eq (vector_sizes[next_size], autodetected_vector_size))
@@ -3041,20 +3043,20 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
 
       if (vectorized
 	  || next_size == vector_sizes.length ()
-	  || known_eq (current_vector_size, 0U)
+	  || known_eq (bb_vinfo->vector_size, 0U)
 	  /* If vect_slp_analyze_bb_1 signaled that analysis for all
 	     vector sizes will fail do not bother iterating.  */
 	  || fatal)
 	return vectorized;
 
       /* Try the next biggest vector size.  */
-      current_vector_size = vector_sizes[next_size++];
+      next_vector_size = vector_sizes[next_size++];
       if (dump_enabled_p ())
 	{
 	  dump_printf_loc (MSG_NOTE, vect_location,
 			   "***** Re-trying analysis with "
 			   "vector size ");
-	  dump_dec (MSG_NOTE, current_vector_size);
+	  dump_dec (MSG_NOTE, next_vector_size);
 	  dump_printf (MSG_NOTE, "\n");
 	}
     }
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index c8f1582..d744a84 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -11133,22 +11133,20 @@ get_vectype_for_scalar_type_and_size (tree scalar_type, poly_uint64 size)
   return vectype;
 }
 
-poly_uint64 current_vector_size;
-
 /* Function get_vectype_for_scalar_type.
 
    Returns the vector type corresponding to SCALAR_TYPE as supported
    by the target.  */
 
 tree
-get_vectype_for_scalar_type (vec_info *, tree scalar_type)
+get_vectype_for_scalar_type (vec_info *vinfo, tree scalar_type)
 {
   tree vectype;
   vectype = get_vectype_for_scalar_type_and_size (scalar_type,
-						  current_vector_size);
+						  vinfo->vector_size);
   if (vectype
-      && known_eq (current_vector_size, 0U))
-    current_vector_size = GET_MODE_SIZE (TYPE_MODE (vectype));
+      && known_eq (vinfo->vector_size, 0U))
+    vinfo->vector_size = GET_MODE_SIZE (TYPE_MODE (vectype));
   return vectype;
 }
 
@@ -11166,7 +11164,7 @@ get_mask_type_for_scalar_type (vec_info *vinfo, tree scalar_type)
     return NULL;
 
   return build_truth_vector_type (TYPE_VECTOR_SUBPARTS (vectype),
-				  current_vector_size);
+				  vinfo->vector_size);
 }
 
 /* Function get_same_sized_vectype
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 0c0c018..30dcc44 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -971,7 +971,7 @@ try_vectorize_loop_1 (hash_table<simduid_to_vf> *&simduid_to_vf_htab,
   unsigned HOST_WIDE_INT bytes;
   if (dump_enabled_p ())
     {
-      if (current_vector_size.is_constant (&bytes))
+      if (loop_vinfo->vector_size.is_constant (&bytes))
 	dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
 			 "loop vectorized using %wu byte vectors\n", bytes);
       else
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 67d4894..59dced7 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -326,6 +326,10 @@ public:
   /* Cost data used by the target cost model.  */
   void *target_cost_data;
 
+  /* The vector size for this loop in bytes, or 0 if we haven't picked
+     a size yet.  */
+  poly_uint64 vector_size;
+
 private:
   stmt_vec_info new_stmt_vec_info (gimple *stmt);
   void set_vinfo_for_stmt (gimple *, stmt_vec_info);
@@ -1472,7 +1476,7 @@ vect_get_num_copies (loop_vec_info loop_vinfo, tree vectype)
 static inline void
 vect_update_max_nunits (poly_uint64 *max_nunits, poly_uint64 nunits)
 {
-  /* All unit counts have the form current_vector_size * X for some
+  /* All unit counts have the form vec_info::vector_size * X for some
      rational X, so two unit sizes must have a common multiple.
      Everything is a multiple of the initial value of 1.  */
   *max_nunits = force_common_multiple (*max_nunits, nunits);
@@ -1588,7 +1592,6 @@ extern dump_user_location_t find_loop_location (class loop *);
 extern bool vect_can_advance_ivs_p (loop_vec_info);
 
 /* In tree-vect-stmts.c.  */
-extern poly_uint64 current_vector_size;
 extern tree get_vectype_for_scalar_type (vec_info *, tree);
 extern tree get_vectype_for_scalar_type_and_size (tree, poly_uint64);
 extern tree get_mask_type_for_scalar_type (vec_info *, tree);
-- 
cgit v1.1


From 63bb8fba4b60296c9200fe3e2aa47c536f99c905 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Mon, 21 Oct 2019 06:54:42 +0000
Subject: Fix some fallout for small targets.

	PR testsuite/52641
	* gcc.dg/torture/pr86034.c: Use 32-bit base type for a bitfield of
	width > 16 bits.
	* gcc.dg/torture/pr90972.c [avr]: Add option "-w".
	* gcc.dg/torture/pr87693.c: Same.
	* gcc.dg/torture/pr91178.c: Add dg-require-effective-target size32plus.
	* gcc.dg/torture/pr91178-2.c: Same.
	* gcc.dg/torture/20181024-1.c
	* gcc.dg/torture/pr86554-1.c: Use 32-bit integers.
	* gcc.dg/tree-ssa/pr91091-1.c: Same.

From-SVN: r277236
---
 gcc/testsuite/ChangeLog                   | 15 +++++++++++++++
 gcc/testsuite/gcc.dg/torture/20181024-1.c |  1 +
 gcc/testsuite/gcc.dg/torture/pr86034.c    |  2 +-
 gcc/testsuite/gcc.dg/torture/pr86554-1.c  | 12 ++++++------
 gcc/testsuite/gcc.dg/torture/pr87693.c    |  3 ++-
 gcc/testsuite/gcc.dg/torture/pr90972.c    |  1 +
 gcc/testsuite/gcc.dg/torture/pr91178-2.c  |  1 +
 gcc/testsuite/gcc.dg/torture/pr91178.c    |  1 +
 gcc/testsuite/gcc.dg/tree-ssa/pr91091-1.c |  4 ++--
 9 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 681cee6..9199be8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2019-10-20  Georg-Johann Lay  <avr@gjlay.de>
+
+	Fix some fallout for small targets.
+
+	PR testsuite/52641
+	* gcc.dg/torture/pr86034.c: Use 32-bit base type for a bitfield of
+	width > 16 bits.
+	* gcc.dg/torture/pr90972.c [avr]: Add option "-w".
+	* gcc.dg/torture/pr87693.c: Same.
+	* gcc.dg/torture/pr91178.c: Add dg-require-effective-target size32plus.
+	* gcc.dg/torture/pr91178-2.c: Same.
+	* gcc.dg/torture/20181024-1.c
+	* gcc.dg/torture/pr86554-1.c: Use 32-bit integers.
+	* gcc.dg/tree-ssa/pr91091-1.c: Same.
+
 2019-10-20  Jan Hubicka  <hubicka@ucw.cz>
 
 	* gcc.c-torture/execute/alias-access-path-2.c: New testcase.
diff --git a/gcc/testsuite/gcc.dg/torture/20181024-1.c b/gcc/testsuite/gcc.dg/torture/20181024-1.c
index f2cfe7f..a3cce24 100644
--- a/gcc/testsuite/gcc.dg/torture/20181024-1.c
+++ b/gcc/testsuite/gcc.dg/torture/20181024-1.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-effective-target size32plus } */
 /* { dg-additional-options "-march=core-avx2" { target { x86_64-*-* i?86-*-* } } } */
 
 typedef enum {
diff --git a/gcc/testsuite/gcc.dg/torture/pr86034.c b/gcc/testsuite/gcc.dg/torture/pr86034.c
index 247428c..d83ea39 100644
--- a/gcc/testsuite/gcc.dg/torture/pr86034.c
+++ b/gcc/testsuite/gcc.dg/torture/pr86034.c
@@ -6,7 +6,7 @@
 struct A
 {
   int b;
-  int c:24;
+  __INT32_TYPE__ c:24;
   int d:10;
   int e;
 } f;
diff --git a/gcc/testsuite/gcc.dg/torture/pr86554-1.c b/gcc/testsuite/gcc.dg/torture/pr86554-1.c
index 64f851e..562a187 100644
--- a/gcc/testsuite/gcc.dg/torture/pr86554-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr86554-1.c
@@ -2,25 +2,25 @@
 
 struct foo
 {
-  unsigned x;
+  __UINT32_TYPE__ x;
 };
 typedef struct foo foo;
 
-static inline int zot(foo *f)
+static inline __INT32_TYPE__ zot(foo *f)
 {
   int ret;
 
   if (f->x > 0x7FFFFFFF)
-    ret = (int)(f->x - 0x7FFFFFFF);
+    ret = (__INT32_TYPE__)(f->x - 0x7FFFFFFF);
   else
-    ret = (int)f->x - 0x7FFFFFFF;
+    ret = (__INT32_TYPE__)f->x - 0x7FFFFFFF;
   return ret;
 }
 
 void __attribute__((noinline,noclone)) bar(foo *f)
 {
-  int ret = zot(f);
-  volatile int x = ret;
+  __INT32_TYPE__ ret = zot(f);
+  volatile __INT32_TYPE__ x = ret;
   if (ret < 1)
     __builtin_abort ();
 }
diff --git a/gcc/testsuite/gcc.dg/torture/pr87693.c b/gcc/testsuite/gcc.dg/torture/pr87693.c
index b4ff594..eb6d163d 100644
--- a/gcc/testsuite/gcc.dg/torture/pr87693.c
+++ b/gcc/testsuite/gcc.dg/torture/pr87693.c
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target indirect_jumps } */
-
+/* { dg-additional-options "-w" { target avr-*-* } } */
+   
 void f (void);
 void g (void);
 void h (int a)
diff --git a/gcc/testsuite/gcc.dg/torture/pr90972.c b/gcc/testsuite/gcc.dg/torture/pr90972.c
index 24f99b0..b18ccbd 100644
--- a/gcc/testsuite/gcc.dg/torture/pr90972.c
+++ b/gcc/testsuite/gcc.dg/torture/pr90972.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-additional-options "-mcpu=power8" { target powerpc*-*-* } } */
+/* { dg-additional-options "-w" { target avr-*-* } } */
 
 long f;
 void a();
diff --git a/gcc/testsuite/gcc.dg/torture/pr91178-2.c b/gcc/testsuite/gcc.dg/torture/pr91178-2.c
index 0ebb470..ac5ae0e 100644
--- a/gcc/testsuite/gcc.dg/torture/pr91178-2.c
+++ b/gcc/testsuite/gcc.dg/torture/pr91178-2.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-effective-target size32plus } */
 
 int a[100][70304];
 int b[100];
diff --git a/gcc/testsuite/gcc.dg/torture/pr91178.c b/gcc/testsuite/gcc.dg/torture/pr91178.c
index b7a2dbe..fc72d68 100644
--- a/gcc/testsuite/gcc.dg/torture/pr91178.c
+++ b/gcc/testsuite/gcc.dg/torture/pr91178.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-effective-target size32plus } */
 
 int a;
 extern int f[10][91125];
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr91091-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr91091-1.c
index 2ee75d9..5a6ac1b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr91091-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr91091-1.c
@@ -1,8 +1,8 @@
 /* { dg-do run } */
 /* { dg-options "-O3 -fno-strict-aliasing" } */
 
-struct s { int x; } __attribute__((packed));
-struct t { int x; };
+struct s { __INT32_TYPE__ x; } __attribute__((packed));
+struct t { __INT32_TYPE__ x; };
 
 void __attribute__((noinline,noipa))
 swap(struct s* p, struct t* q)
-- 
cgit v1.1


From 3669c308b0a6d2a47b5201f0abf1d786c02a2271 Mon Sep 17 00:00:00 2001
From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
Date: Mon, 21 Oct 2019 07:31:45 +0000
Subject: re PR tree-optimization/91532 ([SVE] Redundant predicated store in
 gcc.target/aarch64/fmla_2.c)

2019-10-21  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>

	PR tree-optimization/91532
	* gcc.target/aarch64/sve/fmla_2.c: Add dg-scan check for two st1d
	insns.

From-SVN: r277237
---
 gcc/testsuite/ChangeLog                       | 6 ++++++
 gcc/testsuite/gcc.target/aarch64/sve/fmla_2.c | 1 +
 2 files changed, 7 insertions(+)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9199be8..9c33508 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR tree-optimization/91532
+	* gcc.target/aarch64/sve/fmla_2.c: Add dg-scan check for two st1d
+	insns.
+
 2019-10-20  Georg-Johann Lay  <avr@gjlay.de>
 
 	Fix some fallout for small targets.
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/fmla_2.c b/gcc/testsuite/gcc.target/aarch64/sve/fmla_2.c
index 5c04bcd..51925fa 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/fmla_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/fmla_2.c
@@ -17,3 +17,4 @@ f (double *restrict a, double *restrict b, double *restrict c,
 
 /* { dg-final { scan-assembler-times {\tfmla\tz[0-9]+\.d, p[0-7]/m, z[0-9]+\.d, z[0-9]+\.d\n} 2 } } */
 /* { dg-final { scan-assembler-not {\tfmad\t} } } */
+/* { dg-final { scan-assembler-times {\tst1d} 2 } } */
-- 
cgit v1.1


From d2db7f790194ac690beae00f2f7956e3fe865cac Mon Sep 17 00:00:00 2001
From: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date: Mon, 21 Oct 2019 10:12:18 +0000
Subject: [vect] Only change base alignment if more restrictive

This patch makes sure ensure_base_align only changes alignment if the new
alignment is more restrictive.  It already did this if we were dealing with
symbols, but it now does it for all types of declarations.

gcc/ChangeLog:
2019-10-21  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* tree-vect-stmts (ensure_base_align): Only change alignment if new
	alignment is more restrictive.

From-SVN: r277238
---
 gcc/ChangeLog         | 5 +++++
 gcc/tree-vect-stmts.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbde37c..7990725 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	* tree-vect-stmts (ensure_base_align): Only change alignment if new
+	alignment is more restrictive.
+
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-vectorizer.h (vec_info::vector_size): New member variable.
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index d744a84..6c7b9fe 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -6293,7 +6293,7 @@ ensure_base_align (dr_vec_info *dr_info)
 
       if (decl_in_symtab_p (base_decl))
 	symtab_node::get (base_decl)->increase_alignment (align_base_to);
-      else
+      else if (DECL_ALIGN (base_decl) < align_base_to)
 	{
 	  SET_DECL_ALIGN (base_decl, align_base_to);
           DECL_USER_ALIGN (base_decl) = 1;
-- 
cgit v1.1


From c5dc215df17071281c21450fa2d584e1161e4bc2 Mon Sep 17 00:00:00 2001
From: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Date: Mon, 21 Oct 2019 10:52:05 +0000
Subject: [AArch64] Implement __rndr, __rndrrs intrinsics

This patch implements the recently published[1] __rndr and __rndrrs
intrinsics used to access the RNG in Armv8.5-A.
The __rndrrs intrinsics can be used to reseed the generator too.
They are guarded by the __ARM_FEATURE_RNG feature macro.
A quirk with these intrinsics is that they store the random number in
their pointer argument and return a status
code if the generation succeeded.

The instructions themselves write the CC flags indicating the success of
the operation that we can then read with a CSET.
Therefore this implementation makes use of the IGNORE indicator to the
builtin expand machinery to avoid generating
the CSET if its result is unused (the CC reg clobbering effect is still
reflected in the pattern).
I've checked that using unspec_volatile prevents undesirable CSEing of
the instructions.

[1] https://developer.arm.com/docs/101028/latest/data-processing-intrinsics

	* config/aarch64/aarch64.md (UNSPEC_RNDR, UNSPEC_RNDRRS): Define.
	(aarch64_rndr): New define_insn.
	(aarch64_rndrrs): Likewise.
	* config/aarch64/aarch64.h (AARCH64_ISA_RNG): Define.
	(TARGET_RNG): Likewise.
	* config/aarch64/aarch64.c (aarch64_expand_builtin): Use IGNORE
	argument.
	* config/aarch64/aarch64-protos.h (aarch64_general_expand_builtin):
	Add fourth argument in prototype.
	* config/aarch64/aarch64-builtins.c (enum aarch64_builtins):
	Add AARCH64_BUILTIN_RNG_RNDR, AARCH64_BUILTIN_RNG_RNDRRS.
	(aarch64_init_rng_builtins): Define.
	(aarch64_general_init_builtins): Call aarch64_init_rng_builtins.
	(aarch64_expand_rng_builtin): Define.
	(aarch64_general_expand_builtin): Use IGNORE argument, handle
	RNG builtins.
	* config/aarch64/aarch64-c.c (aarch64_update_cpp_builtins): Define
	__ARM_FEATURE_RNG when TARGET_RNG.
	* config/aarch64/arm_acle.h (__rndr, __rndrrs): Define.

	* gcc.target/aarch64/acle/rng_1.c: New test.

From-SVN: r277239
---
 gcc/ChangeLog                                 | 22 +++++++++
 gcc/config/aarch64/aarch64-builtins.c         | 67 ++++++++++++++++++++++++++-
 gcc/config/aarch64/aarch64-c.c                |  1 +
 gcc/config/aarch64/aarch64-protos.h           |  2 +-
 gcc/config/aarch64/aarch64.c                  |  4 +-
 gcc/config/aarch64/aarch64.h                  |  4 ++
 gcc/config/aarch64/aarch64.md                 | 22 +++++++++
 gcc/config/aarch64/arm_acle.h                 | 16 +++++++
 gcc/testsuite/ChangeLog                       |  4 ++
 gcc/testsuite/gcc.target/aarch64/acle/rng_1.c | 53 +++++++++++++++++++++
 10 files changed, 190 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/acle/rng_1.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7990725..b274478 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,25 @@
+2019-10-21  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* config/aarch64/aarch64.md (UNSPEC_RNDR, UNSPEC_RNDRRS): Define.
+	(aarch64_rndr): New define_insn.
+	(aarch64_rndrrs): Likewise.
+	* config/aarch64/aarch64.h (AARCH64_ISA_RNG): Define.
+	(TARGET_RNG): Likewise.
+	* config/aarch64/aarch64.c (aarch64_expand_builtin): Use IGNORE
+	argument.
+	* config/aarch64/aarch64-protos.h (aarch64_general_expand_builtin):
+	Add fourth argument in prototype.
+	* config/aarch64/aarch64-builtins.c (enum aarch64_builtins):
+	Add AARCH64_BUILTIN_RNG_RNDR, AARCH64_BUILTIN_RNG_RNDRRS.
+	(aarch64_init_rng_builtins): Define.
+	(aarch64_general_init_builtins): Call aarch64_init_rng_builtins.
+	(aarch64_expand_rng_builtin): Define.
+	(aarch64_general_expand_builtin): Use IGNORE argument, handle
+	RNG builtins.
+	* config/aarch64/aarch64-c.c (aarch64_update_cpp_builtins): Define
+	__ARM_FEATURE_RNG when TARGET_RNG.
+	* config/aarch64/arm_acle.h (__rndr, __rndrrs): Define.
+
 2019-10-21  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
 	* tree-vect-stmts (ensure_base_align): Only change alignment if new
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index e02ece8..23a0db4 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -445,6 +445,9 @@ enum aarch64_builtins
   AARCH64_TME_BUILTIN_TCOMMIT,
   AARCH64_TME_BUILTIN_TTEST,
   AARCH64_TME_BUILTIN_TCANCEL,
+  /* Armv8.5-a RNG instruction builtins.  */
+  AARCH64_BUILTIN_RNG_RNDR,
+  AARCH64_BUILTIN_RNG_RNDRRS,
   AARCH64_BUILTIN_MAX
 };
 
@@ -1111,7 +1114,25 @@ aarch64_init_tme_builtins (void)
 				   AARCH64_TME_BUILTIN_TCANCEL);
 }
 
+/* Add builtins for Random Number instructions.  */
+
+static void
+aarch64_init_rng_builtins (void)
+{
+  tree unsigned_ptr_type = build_pointer_type (unsigned_intDI_type_node);
+  tree ftype
+    = build_function_type_list (integer_type_node, unsigned_ptr_type, NULL);
+  aarch64_builtin_decls[AARCH64_BUILTIN_RNG_RNDR]
+    = aarch64_general_add_builtin ("__builtin_aarch64_rndr", ftype,
+				   AARCH64_BUILTIN_RNG_RNDR);
+  aarch64_builtin_decls[AARCH64_BUILTIN_RNG_RNDRRS]
+    = aarch64_general_add_builtin ("__builtin_aarch64_rndrrs", ftype,
+				   AARCH64_BUILTIN_RNG_RNDRRS);
+}
+
+
 /* Initialize all builtins in the AARCH64_BUILTIN_GENERAL group.  */
+
 void
 aarch64_general_init_builtins (void)
 {
@@ -1144,6 +1165,7 @@ aarch64_general_init_builtins (void)
 
   aarch64_init_crc32_builtins ();
   aarch64_init_builtin_rsqrt ();
+  aarch64_init_rng_builtins ();
 
   tree ftype_jcvt
     = build_function_type_list (intSI_type_node, double_type_node, NULL);
@@ -1607,10 +1629,48 @@ aarch64_expand_builtin_tme (int fcode, tree exp, rtx target)
     return target;
 }
 
+/* Expand a random number builtin EXP with code FCODE, putting the result
+   int TARGET.  If IGNORE is true the return value is ignored.  */
+
+rtx
+aarch64_expand_rng_builtin (tree exp, rtx target, int fcode, int ignore)
+{
+  rtx pat;
+  enum insn_code icode;
+  if (fcode == AARCH64_BUILTIN_RNG_RNDR)
+    icode = CODE_FOR_aarch64_rndr;
+  else if (fcode == AARCH64_BUILTIN_RNG_RNDRRS)
+    icode = CODE_FOR_aarch64_rndrrs;
+  else
+    gcc_unreachable ();
+
+  rtx rand = gen_reg_rtx (DImode);
+  pat = GEN_FCN (icode) (rand);
+  if (!pat)
+    return NULL_RTX;
+
+  tree arg0 = CALL_EXPR_ARG (exp, 0);
+  rtx res_addr = expand_normal (arg0);
+  res_addr = convert_memory_address (Pmode, res_addr);
+  rtx res_mem = gen_rtx_MEM (DImode, res_addr);
+  emit_insn (pat);
+  emit_move_insn (res_mem, rand);
+  /* If the status result is unused don't generate the CSET code.  */
+  if (ignore)
+    return target;
+
+  rtx cc_reg = gen_rtx_REG (CC_Zmode, CC_REGNUM);
+  rtx cmp_rtx = gen_rtx_fmt_ee (NE, SImode, cc_reg, const0_rtx);
+  emit_insn (gen_aarch64_cstoresi (target, cmp_rtx, cc_reg));
+  return target;
+}
+
 /* Expand an expression EXP that calls built-in function FCODE,
-   with result going to TARGET if that's convenient.  */
+   with result going to TARGET if that's convenient.  IGNORE is true
+   if the result of the builtin is ignored.  */
 rtx
-aarch64_general_expand_builtin (unsigned int fcode, tree exp, rtx target)
+aarch64_general_expand_builtin (unsigned int fcode, tree exp, rtx target,
+				int ignore)
 {
   int icode;
   rtx pat, op0;
@@ -1717,6 +1777,9 @@ aarch64_general_expand_builtin (unsigned int fcode, tree exp, rtx target)
     case AARCH64_SIMD_BUILTIN_FCMLA_LANEQ180_V4HF:
     case AARCH64_SIMD_BUILTIN_FCMLA_LANEQ270_V4HF:
       return aarch64_expand_fcmla_builtin (exp, target, fcode);
+    case AARCH64_BUILTIN_RNG_RNDR:
+    case AARCH64_BUILTIN_RNG_RNDRRS:
+      return aarch64_expand_rng_builtin (exp, target, fcode, ignore);
     }
 
   if (fcode >= AARCH64_SIMD_BUILTIN_BASE && fcode <= AARCH64_SIMD_BUILTIN_MAX)
diff --git a/gcc/config/aarch64/aarch64-c.c b/gcc/config/aarch64/aarch64-c.c
index 137aa18..85b6831 100644
--- a/gcc/config/aarch64/aarch64-c.c
+++ b/gcc/config/aarch64/aarch64-c.c
@@ -160,6 +160,7 @@ aarch64_update_cpp_builtins (cpp_reader *pfile)
 
   aarch64_def_or_undef (TARGET_FRINT, "__ARM_FEATURE_FRINT", pfile);
   aarch64_def_or_undef (TARGET_TME, "__ARM_FEATURE_TME", pfile);
+  aarch64_def_or_undef (TARGET_RNG, "__ARM_FEATURE_RNG", pfile);
 
   /* Not for ACLE, but required to keep "float.h" correct if we switch
      target between implementations that do or do not support ARMv8.2-A
diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
index ab27a12..ca23508 100644
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -659,7 +659,7 @@ const char *aarch64_general_mangle_builtin_type (const_tree);
 void aarch64_general_init_builtins (void);
 tree aarch64_general_fold_builtin (unsigned int, tree, unsigned int, tree *);
 gimple *aarch64_general_gimple_fold_builtin (unsigned int, gcall *);
-rtx aarch64_general_expand_builtin (unsigned int, tree, rtx);
+rtx aarch64_general_expand_builtin (unsigned int, tree, rtx, int);
 tree aarch64_general_builtin_decl (unsigned, bool);
 tree aarch64_general_builtin_rsqrt (unsigned int);
 tree aarch64_builtin_vectorized_function (unsigned int, tree, tree);
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index af74354..2e73f35 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -11737,7 +11737,7 @@ aarch64_gimple_fold_builtin (gimple_stmt_iterator *gsi)
 
 /* Implement TARGET_EXPAND_BUILTIN.  */
 static rtx
-aarch64_expand_builtin (tree exp, rtx target, rtx, machine_mode, int)
+aarch64_expand_builtin (tree exp, rtx target, rtx, machine_mode, int ignore)
 {
   tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
   unsigned int code = DECL_MD_FUNCTION_CODE (fndecl);
@@ -11745,7 +11745,7 @@ aarch64_expand_builtin (tree exp, rtx target, rtx, machine_mode, int)
   switch (code & AARCH64_BUILTIN_CLASS)
     {
     case AARCH64_BUILTIN_GENERAL:
-      return aarch64_general_expand_builtin (subcode, exp, target);
+      return aarch64_general_expand_builtin (subcode, exp, target, ignore);
     }
   gcc_unreachable ();
 }
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index abd14a2..b68594d 100644
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -245,6 +245,7 @@ extern unsigned aarch64_architecture_version;
 #define AARCH64_ISA_SHA3	   (aarch64_isa_flags & AARCH64_FL_SHA3)
 #define AARCH64_ISA_F16FML	   (aarch64_isa_flags & AARCH64_FL_F16FML)
 #define AARCH64_ISA_RCPC8_4	   (aarch64_isa_flags & AARCH64_FL_RCPC8_4)
+#define AARCH64_ISA_RNG		   (aarch64_isa_flags & AARCH64_FL_RNG)
 #define AARCH64_ISA_V8_5	   (aarch64_isa_flags & AARCH64_FL_V8_5)
 #define AARCH64_ISA_TME		   (aarch64_isa_flags & AARCH64_FL_TME)
 
@@ -300,6 +301,9 @@ extern unsigned aarch64_architecture_version;
 /* TME instructions are enabled.  */
 #define TARGET_TME (AARCH64_ISA_TME)
 
+/* Random number instructions from Armv8.5-a.  */
+#define TARGET_RNG (AARCH64_ISA_RNG)
+
 /* Make sure this is always defined so we don't have to check for ifdefs
    but rather use normal ifs.  */
 #ifndef TARGET_FIX_ERR_A53_835769_DEFAULT
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index e7a6930..f127057 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -262,6 +262,8 @@
     UNSPECV_TSTART		; Represent transaction start.
     UNSPECV_TCOMMIT		; Represent transaction commit.
     UNSPECV_TCANCEL		; Represent transaction cancel.
+    UNSPEC_RNDR			; Represent RNDR
+    UNSPEC_RNDRRS		; Represent RNDRRS
   ]
 )
 
@@ -7338,6 +7340,26 @@
   [(set_attr "type" "tme")]
 )
 
+(define_insn "aarch64_rndr"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+	(unspec_volatile:DI [(const_int 0)] UNSPEC_RNDR))
+   (set (reg:CC_Z CC_REGNUM)
+	(unspec_volatile:CC_Z [(const_int 0)] UNSPEC_RNDR))]
+  "TARGET_RNG"
+  "mrs\t%0, RNDR"
+  [(set_attr "type" "mrs")]
+)
+
+(define_insn "aarch64_rndrrs"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+	(unspec_volatile:DI [(const_int 0)] UNSPEC_RNDRRS))
+   (set (reg:CC_Z CC_REGNUM)
+	(unspec_volatile:CC_Z [(const_int 0)] UNSPEC_RNDRRS))]
+  "TARGET_RNG"
+  "mrs\t%0, RNDRRS"
+  [(set_attr "type" "mrs")]
+)
+
 ;; AdvSIMD Stuff
 (include "aarch64-simd.md")
 
diff --git a/gcc/config/aarch64/arm_acle.h b/gcc/config/aarch64/arm_acle.h
index 147dfe0..2284e71 100644
--- a/gcc/config/aarch64/arm_acle.h
+++ b/gcc/config/aarch64/arm_acle.h
@@ -193,6 +193,22 @@ __ttest (void)
 #pragma GCC pop_options
 #endif
 
+#pragma GCC push_options
+#pragma GCC target ("+nothing+rng")
+__extension__ static __inline int __attribute__ ((__always_inline__))
+__rndr (uint64_t *__res)
+{
+  return __builtin_aarch64_rndr (__res);
+}
+
+__extension__ static __inline int __attribute__ ((__always_inline__))
+__rndrrs (uint64_t *__res)
+{
+  return __builtin_aarch64_rndrrs (__res);
+}
+
+#pragma GCC pop_options
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c33508..8fd1fd56 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-21  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/acle/rng_1.c: New test.
+
 2019-10-21  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	PR tree-optimization/91532
diff --git a/gcc/testsuite/gcc.target/aarch64/acle/rng_1.c b/gcc/testsuite/gcc.target/aarch64/acle/rng_1.c
new file mode 100644
index 0000000..1fbdb62
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/acle/rng_1.c
@@ -0,0 +1,53 @@
+/* Test the __rndr ACLE intrinsic.  */
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=armv8.5-a+rng" } */
+
+#include <arm_acle.h>
+
+#ifdef __ARM_FEATURE_RNG
+/* Check that instruction is generated when status result is unused.  */
+uint64_t
+test_rndr_no_stat (void)
+{
+  uint64_t res;
+  __rndr (&res);
+  return res;
+}
+
+/* Check that instruction is generated when random number result
+   is unused.  */
+int
+test_rndr_error_check (void)
+{
+  uint64_t res;
+  int fail = __rndr (&res);
+  if (fail)
+    return 0;
+  return -1;
+}
+
+/* { dg-final { scan-assembler-times "mrs\tx..?, RNDR\n" 2 } } */
+
+/* Check that instruction is generated when status result is unused.  */
+uint64_t
+test_rndrrs_no_stat (void)
+{
+  uint64_t res;
+  __rndrrs (&res);
+  return res;
+}
+
+/* Check that instruction is generated when random number result
+   is unused.  */
+int
+test_rndrrs_error_check (void)
+{
+  uint64_t res;
+  int fail = __rndrrs (&res);
+  if (fail)
+    return 0;
+  return -1;
+}
+
+/* { dg-final { scan-assembler-times "mrs\tx..?, RNDRRS\n" 2 } } */
+#endif
-- 
cgit v1.1


From ae7f3143a3876378d051e64c8e68718f27c41075 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 21 Oct 2019 11:32:25 +0000
Subject: re PR tree-optimization/92161 (ICE in vect_get_vec_def_for_stmt_copy,
 at tree-vect-stmts.c:1687)

2019-10-21  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92161
	* tree-vect-loop.c (vect_analyze_loop_2): Reset stmts def-type
	for reductions.

	* gfortran.dg/pr92161.f: New testcase.

From-SVN: r277240
---
 gcc/ChangeLog                       |  6 ++++++
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/gfortran.dg/pr92161.f | 23 +++++++++++++++++++++++
 gcc/tree-vect-loop.c                | 11 +++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 gcc/testsuite/gfortran.dg/pr92161.f

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b274478..259550f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92161
+	* tree-vect-loop.c (vect_analyze_loop_2): Reset stmts def-type
+	for reductions.
+
 2019-10-21  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/aarch64/aarch64.md (UNSPEC_RNDR, UNSPEC_RNDRRS): Define.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8fd1fd56..d958e64 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92161
+	* gfortran.dg/pr92161.f: New testcase.
+
 2019-10-21  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* gcc.target/aarch64/acle/rng_1.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/pr92161.f b/gcc/testsuite/gfortran.dg/pr92161.f
new file mode 100644
index 0000000..11f1edf
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92161.f
@@ -0,0 +1,23 @@
+! { dg-do compile }
+! { dg-options "-O1 -ftree-loop-vectorize -fno-signed-zeros -fno-trapping-math" }
+! { dg-additional-options "-mvsx" { target { powerpc*-*-* } } }
+      COMPLEX FUNCTION R1 (ZR, CC, EA, U6)
+
+      INTEGER ZR, U6, FZ, J2
+      COMPLEX EA(*), CC
+      DOUBLE PRECISION OS, GA, YU, XT
+
+      OS = DBLE(REAL(CC))
+      GA = DBLE(AIMAG(CC))
+      J2 = 1
+
+      DO 5 FZ = 1, ZR
+        YU = DBLE(REAL(EA(J2)))
+        XT = DBLE(AIMAG(EA(J2)))
+        OS = OS + (YU * 2) - (XT * 2)
+        GA = GA + (YU * 3) + (XT * 3)
+        J2 = J2 + U6
+    5 CONTINUE
+      R1 = CMPLX(REAL(OS), REAL(GA))
+      RETURN
+      END
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index d073620..a7f19ca 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2260,6 +2260,17 @@ again:
 	{
 	  stmt_vec_info stmt_info = loop_vinfo->lookup_stmt (gsi_stmt (si));
 	  STMT_SLP_TYPE (stmt_info) = loop_vect;
+	  if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_reduction_def
+	      || STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def)
+	    {
+	      /* vectorizable_reduction adjusts reduction stmt def-types,
+		 restore them to that of the PHI.  */
+	      STMT_VINFO_DEF_TYPE (STMT_VINFO_REDUC_DEF (stmt_info))
+		= STMT_VINFO_DEF_TYPE (stmt_info);
+	      STMT_VINFO_DEF_TYPE (vect_stmt_to_vectorize
+					(STMT_VINFO_REDUC_DEF (stmt_info)))
+		= STMT_VINFO_DEF_TYPE (stmt_info);
+	    }
 	}
       for (gimple_stmt_iterator si = gsi_start_bb (bb);
 	   !gsi_end_p (si); gsi_next (&si))
-- 
cgit v1.1


From 30c0d1e3cf8b03992e08cfd00ccf1fcb638d3c03 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 21 Oct 2019 11:34:00 +0000
Subject: tree-vectorizer.h (_slp_tree::ops): New member.

2019-10-21  Richard Biener  <rguenther@suse.de>

	* tree-vectorizer.h (_slp_tree::ops): New member.
	(SLP_TREE_SCALAR_OPS): New.
	(vect_get_slp_defs): Adjust prototype.
	* tree-vect-slp.c (vect_free_slp_tree): Release
	SLP_TREE_SCALAR_OPS.
	(vect_create_new_slp_node): Initialize it.  New overload for
	initializing by an operands array.
	(_slp_oprnd_info::ops): New member.
	(vect_create_oprnd_info): Initialize it.
	(vect_free_oprnd_info): Release it.
	(vect_get_and_check_slp_defs): Populate the operands array.
	Do not swap operands in the IL when not necessary.
	(vect_build_slp_tree_2): Build SLP nodes for invariant operands.
	Record SLP_TREE_SCALAR_OPS for all invariant nodes.  Also
	swap operands in the operands array.  Do not swap operands in
	the IL.
	(vect_slp_rearrange_stmts): Re-arrange SLP_TREE_SCALAR_OPS as well.
	(vect_gather_slp_loads): Fix.
	(vect_detect_hybrid_slp_stmts): Likewise.
	(vect_slp_analyze_node_operations_1): Search for a internal
	def child for computing reduction SLP_TREE_NUMBER_OF_VEC_STMTS.
	(vect_slp_analyze_node_operations): Skip ops-only stmts for
	the def-type push/pop dance.
	(vect_get_constant_vectors): Compute number_of_vectors here.
	Use SLP_TREE_SCALAR_OPS and simplify greatly.
	(vect_get_slp_vect_defs): Use gimple_get_lhs also for PHIs.
	(vect_get_slp_defs): Simplify greatly.
	* tree-vect-loop.c (vectorize_fold_left_reduction): Simplify.
	(vect_transform_reduction): Likewise.
	* tree-vect-stmts.c (vect_get_vec_defs): Simplify.
	(vectorizable_call): Likewise.
	(vectorizable_operation): Likewise.
	(vectorizable_load): Likewise.
	(vectorizable_condition): Likewise.
	(vectorizable_comparison): Likewise.

From-SVN: r277241
---
 gcc/ChangeLog         |  38 +++++
 gcc/tree-vect-loop.c  |  15 +-
 gcc/tree-vect-slp.c   | 379 ++++++++++++++++++++------------------------------
 gcc/tree-vect-stmts.c |  49 ++-----
 gcc/tree-vectorizer.h |   5 +-
 5 files changed, 206 insertions(+), 280 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 259550f..4139f7f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,43 @@
 2019-10-21  Richard Biener  <rguenther@suse.de>
 
+	* tree-vectorizer.h (_slp_tree::ops): New member.
+	(SLP_TREE_SCALAR_OPS): New.
+	(vect_get_slp_defs): Adjust prototype.
+	* tree-vect-slp.c (vect_free_slp_tree): Release
+	SLP_TREE_SCALAR_OPS.
+	(vect_create_new_slp_node): Initialize it.  New overload for
+	initializing by an operands array.
+	(_slp_oprnd_info::ops): New member.
+	(vect_create_oprnd_info): Initialize it.
+	(vect_free_oprnd_info): Release it.
+	(vect_get_and_check_slp_defs): Populate the operands array.
+	Do not swap operands in the IL when not necessary.
+	(vect_build_slp_tree_2): Build SLP nodes for invariant operands.
+	Record SLP_TREE_SCALAR_OPS for all invariant nodes.  Also
+	swap operands in the operands array.  Do not swap operands in
+	the IL.
+	(vect_slp_rearrange_stmts): Re-arrange SLP_TREE_SCALAR_OPS as well.
+	(vect_gather_slp_loads): Fix.
+	(vect_detect_hybrid_slp_stmts): Likewise.
+	(vect_slp_analyze_node_operations_1): Search for a internal
+	def child for computing reduction SLP_TREE_NUMBER_OF_VEC_STMTS.
+	(vect_slp_analyze_node_operations): Skip ops-only stmts for
+	the def-type push/pop dance.
+	(vect_get_constant_vectors): Compute number_of_vectors here.
+	Use SLP_TREE_SCALAR_OPS and simplify greatly.
+	(vect_get_slp_vect_defs): Use gimple_get_lhs also for PHIs.
+	(vect_get_slp_defs): Simplify greatly.
+	* tree-vect-loop.c (vectorize_fold_left_reduction): Simplify.
+	(vect_transform_reduction): Likewise.
+	* tree-vect-stmts.c (vect_get_vec_defs): Simplify.
+	(vectorizable_call): Likewise.
+	(vectorizable_operation): Likewise.
+	(vectorizable_load): Likewise.
+	(vectorizable_condition): Likewise.
+	(vectorizable_comparison): Likewise.
+
+2019-10-21  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/92161
 	* tree-vect-loop.c (vect_analyze_loop_2): Reset stmts def-type
 	for reductions.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index a7f19ca..9efb797 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -5312,10 +5312,7 @@ vectorize_fold_left_reduction (stmt_vec_info stmt_info,
   if (slp_node)
     {
       auto_vec<vec<tree> > vec_defs (2);
-      auto_vec<tree> sops(2);
-      sops.quick_push (ops[0]);
-      sops.quick_push (ops[1]);
-      vect_get_slp_defs (sops, slp_node, &vec_defs);
+      vect_get_slp_defs (slp_node, &vec_defs);
       vec_oprnds0.safe_splice (vec_defs[1 - reduc_index]);
       vec_defs[0].release ();
       vec_defs[1].release ();
@@ -6484,16 +6481,8 @@ vect_transform_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	    {
 	      /* Get vec defs for all the operands except the reduction index,
 		 ensuring the ordering of the ops in the vector is kept.  */
-	      auto_vec<tree, 3> slp_ops;
 	      auto_vec<vec<tree>, 3> vec_defs;
-
-	      slp_ops.quick_push (ops[0]);
-	      slp_ops.quick_push (ops[1]);
-	      if (op_type == ternary_op)
-		slp_ops.quick_push (ops[2]);
-
-	      vect_get_slp_defs (slp_ops, slp_node, &vec_defs);
-
+	      vect_get_slp_defs (slp_node, &vec_defs);
 	      vec_oprnds0.safe_splice (vec_defs[0]);
 	      vec_defs[0].release ();
 	      vec_oprnds1.safe_splice (vec_defs[1]);
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 29e68ef..d482aa1 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -79,6 +79,7 @@ vect_free_slp_tree (slp_tree node, bool final_p)
 
   SLP_TREE_CHILDREN (node).release ();
   SLP_TREE_SCALAR_STMTS (node).release ();
+  SLP_TREE_SCALAR_OPS (node).release ();
   SLP_TREE_VEC_STMTS (node).release ();
   SLP_TREE_LOAD_PERMUTATION (node).release ();
 
@@ -122,6 +123,7 @@ vect_create_new_slp_node (vec<stmt_vec_info> scalar_stmts)
 
   node = XNEW (struct _slp_tree);
   SLP_TREE_SCALAR_STMTS (node) = scalar_stmts;
+  SLP_TREE_SCALAR_OPS (node) = vNULL;
   SLP_TREE_VEC_STMTS (node).create (0);
   SLP_TREE_NUMBER_OF_VEC_STMTS (node) = 0;
   SLP_TREE_CHILDREN (node).create (nops);
@@ -138,6 +140,28 @@ vect_create_new_slp_node (vec<stmt_vec_info> scalar_stmts)
   return node;
 }
 
+/* Create an SLP node for OPS.  */
+
+static slp_tree
+vect_create_new_slp_node (vec<tree> ops)
+{
+  slp_tree node;
+
+  node = XNEW (struct _slp_tree);
+  SLP_TREE_SCALAR_STMTS (node) = vNULL;
+  SLP_TREE_SCALAR_OPS (node) = ops;
+  SLP_TREE_VEC_STMTS (node).create (0);
+  SLP_TREE_NUMBER_OF_VEC_STMTS (node) = 0;
+  SLP_TREE_CHILDREN (node) = vNULL;
+  SLP_TREE_LOAD_PERMUTATION (node) = vNULL;
+  SLP_TREE_TWO_OPERATORS (node) = false;
+  SLP_TREE_DEF_TYPE (node) = vect_external_def;
+  node->refcnt = 1;
+  node->max_nunits = 1;
+
+  return node;
+}
+
 
 /* This structure is used in creation of an SLP tree.  Each instance
    corresponds to the same operand in a group of scalar stmts in an SLP
@@ -146,6 +170,8 @@ typedef struct _slp_oprnd_info
 {
   /* Def-stmts for the operands.  */
   vec<stmt_vec_info> def_stmts;
+  /* Operands.  */
+  vec<tree> ops;
   /* Information about the first statement, its vector def-type, type, the
      operand itself in case it's constant, and an indication if it's a pattern
      stmt.  */
@@ -170,6 +196,7 @@ vect_create_oprnd_info (int nops, int group_size)
     {
       oprnd_info = XNEW (struct _slp_oprnd_info);
       oprnd_info->def_stmts.create (group_size);
+      oprnd_info->ops.create (group_size);
       oprnd_info->first_dt = vect_uninitialized_def;
       oprnd_info->first_op_type = NULL_TREE;
       oprnd_info->first_pattern = false;
@@ -192,6 +219,7 @@ vect_free_oprnd_info (vec<slp_oprnd_info> &oprnds_info)
   FOR_EACH_VEC_ELT (oprnds_info, i, oprnd_info)
     {
       oprnd_info->def_stmts.release ();
+      oprnd_info->ops.release ();
       XDELETE (oprnd_info);
     }
 
@@ -449,12 +477,15 @@ again:
 	{
 	case vect_constant_def:
 	case vect_external_def:
+	  oprnd_info->def_stmts.quick_push (NULL);
+	  oprnd_info->ops.quick_push (oprnd);
 	  break;
 
 	case vect_reduction_def:
 	case vect_induction_def:
 	case vect_internal_def:
 	  oprnd_info->def_stmts.quick_push (def_stmt_info);
+	  oprnd_info->ops.quick_push (oprnd);
 	  break;
 
 	default:
@@ -484,6 +515,8 @@ again:
 
       if (first_op_cond)
 	{
+	  /* To get rid of this swapping we have to move the stmt code
+	     to the SLP tree as well (and gather it here per stmt).  */
 	  gassign *stmt = as_a <gassign *> (stmt_info->stmt);
 	  tree cond = gimple_assign_rhs1 (stmt);
 	  enum tree_code code = TREE_CODE (cond);
@@ -508,10 +541,8 @@ again:
 	}
       else
 	{
-	  unsigned int op = commutative_op + first_op_idx;
-	  swap_ssa_operands (stmt_info->stmt,
-			     gimple_op_ptr (stmt_info->stmt, op),
-			     gimple_op_ptr (stmt_info->stmt, op + 1));
+	  /* Commutative ops need not reflect swapping, ops are in
+	     the SLP tree.  */
 	}
       if (dump_enabled_p ())
 	dump_printf_loc (MSG_NOTE, vect_location,
@@ -1221,10 +1252,24 @@ vect_build_slp_tree_2 (vec_info *vinfo,
       unsigned old_tree_size = this_tree_size;
       unsigned int j;
 
+      if (oprnd_info->first_dt == vect_uninitialized_def)
+	{
+	  /* COND_EXPR have one too many eventually if the condition
+	     is a SSA name.  */
+	  gcc_assert (i == 3 && nops == 4);
+	  continue;
+	}
+
       if (oprnd_info->first_dt != vect_internal_def
 	  && oprnd_info->first_dt != vect_reduction_def
 	  && oprnd_info->first_dt != vect_induction_def)
-        continue;
+	{
+	  slp_tree invnode = vect_create_new_slp_node (oprnd_info->ops);
+	  SLP_TREE_DEF_TYPE (invnode) = oprnd_info->first_dt;
+	  oprnd_info->ops = vNULL;
+	  children.safe_push (invnode);
+	  continue;
+	}
 
       if ((child = vect_build_slp_tree (vinfo, oprnd_info->def_stmts,
 					group_size, &this_max_nunits,
@@ -1233,7 +1278,8 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	{
 	  /* If we have all children of child built up from scalars then just
 	     throw that away and build it up this node from scalars.  */
-	  if (!SLP_TREE_CHILDREN (child).is_empty ()
+	  if (is_a <bb_vec_info> (vinfo)
+	      && !SLP_TREE_CHILDREN (child).is_empty ()
 	      /* ???  Rejecting patterns this way doesn't work.  We'd have to
 		 do extra work to cancel the pattern so the uses see the
 		 scalar version.  */
@@ -1258,6 +1304,8 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 				     "scalars instead\n");
 		  oprnd_info->def_stmts = vNULL;
 		  SLP_TREE_DEF_TYPE (child) = vect_external_def;
+		  SLP_TREE_SCALAR_OPS (child) = oprnd_info->ops;
+		  oprnd_info->ops = vNULL;
 		  ++this_tree_size;
 		  children.safe_push (child);
 		  continue;
@@ -1290,7 +1338,9 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	  this_tree_size++;
 	  child = vect_create_new_slp_node (oprnd_info->def_stmts);
 	  SLP_TREE_DEF_TYPE (child) = vect_external_def;
+	  SLP_TREE_SCALAR_OPS (child) = oprnd_info->ops;
 	  children.safe_push (child);
+	  oprnd_info->ops = vNULL;
 	  oprnd_info->def_stmts = vNULL;
 	  continue;
 	}
@@ -1370,6 +1420,8 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	      {
 		std::swap (oprnds_info[0]->def_stmts[j],
 			   oprnds_info[1]->def_stmts[j]);
+		std::swap (oprnds_info[0]->ops[j],
+			   oprnds_info[1]->ops[j]);
 		if (dump_enabled_p ())
 		  dump_printf (MSG_NOTE, "%d ", j);
 	      }
@@ -1382,34 +1434,10 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 					    tem, npermutes,
 					    &this_tree_size, bst_map)) != NULL)
 	    {
-	      /* ... so if successful we can apply the operand swapping
-		 to the GIMPLE IL.  This is necessary because for example
-		 vect_get_slp_defs uses operand indexes and thus expects
-		 canonical operand order.  This is also necessary even
-		 if we end up building the operand from scalars as
-		 we'll continue to process swapped operand two.  */
-	      for (j = 0; j < group_size; ++j)
-		gimple_set_plf (stmts[j]->stmt, GF_PLF_1, false);
-	      for (j = 0; j < group_size; ++j)
-		if (matches[j] == !swap_not_matching)
-		  {
-		    gassign *stmt = as_a <gassign *> (stmts[j]->stmt);
-		    /* Avoid swapping operands twice.  */
-		    if (gimple_plf (stmt, GF_PLF_1))
-		      continue;
-		    swap_ssa_operands (stmt, gimple_assign_rhs1_ptr (stmt),
-				       gimple_assign_rhs2_ptr (stmt));
-		    gimple_set_plf (stmt, GF_PLF_1, true);
-		  }
-	      /* Verify we swap all duplicates or none.  */
-	      if (flag_checking)
-		for (j = 0; j < group_size; ++j)
-		  gcc_assert (gimple_plf (stmts[j]->stmt, GF_PLF_1)
-			      == (matches[j] == !swap_not_matching));
-
 	      /* If we have all children of child built up from scalars then
 		 just throw that away and build it up this node from scalars.  */
-	      if (!SLP_TREE_CHILDREN (child).is_empty ()
+	      if (is_a <bb_vec_info> (vinfo)
+		  && !SLP_TREE_CHILDREN (child).is_empty ()
 		  /* ???  Rejecting patterns this way doesn't work.  We'd have
 		     to do extra work to cancel the pattern so the uses see the
 		     scalar version.  */
@@ -1435,6 +1463,8 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 					 "scalars instead\n");
 		      oprnd_info->def_stmts = vNULL;
 		      SLP_TREE_DEF_TYPE (child) = vect_external_def;
+		      SLP_TREE_SCALAR_OPS (child) = oprnd_info->ops;
+		      oprnd_info->ops = vNULL;
 		      ++this_tree_size;
 		      children.safe_push (child);
 		      continue;
@@ -1577,8 +1607,6 @@ vect_slp_rearrange_stmts (slp_tree node, unsigned int group_size,
                           vec<unsigned> permutation,
 			  hash_set<slp_tree> &visited)
 {
-  stmt_vec_info stmt_info;
-  vec<stmt_vec_info> tmp_stmts;
   unsigned int i;
   slp_tree child;
 
@@ -1588,15 +1616,30 @@ vect_slp_rearrange_stmts (slp_tree node, unsigned int group_size,
   FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
     vect_slp_rearrange_stmts (child, group_size, permutation, visited);
 
-  gcc_assert (group_size == SLP_TREE_SCALAR_STMTS (node).length ());
-  tmp_stmts.create (group_size);
-  tmp_stmts.quick_grow_cleared (group_size);
-
-  FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
-    tmp_stmts[permutation[i]] = stmt_info;
-
-  SLP_TREE_SCALAR_STMTS (node).release ();
-  SLP_TREE_SCALAR_STMTS (node) = tmp_stmts;
+  if (SLP_TREE_SCALAR_STMTS (node).exists ())
+    {
+      gcc_assert (group_size == SLP_TREE_SCALAR_STMTS (node).length ());
+      vec<stmt_vec_info> tmp_stmts;
+      tmp_stmts.create (group_size);
+      tmp_stmts.quick_grow (group_size);
+      stmt_vec_info stmt_info;
+      FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+	tmp_stmts[permutation[i]] = stmt_info;
+      SLP_TREE_SCALAR_STMTS (node).release ();
+      SLP_TREE_SCALAR_STMTS (node) = tmp_stmts;
+    }
+  if (SLP_TREE_SCALAR_OPS (node).exists ())
+    {
+      gcc_assert (group_size == SLP_TREE_SCALAR_OPS (node).length ());
+      vec<tree> tmp_ops;
+      tmp_ops.create (group_size);
+      tmp_ops.quick_grow (group_size);
+      tree op;
+      FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_OPS (node), i, op)
+	tmp_ops[permutation[i]] = op;
+      SLP_TREE_SCALAR_OPS (node).release ();
+      SLP_TREE_SCALAR_OPS (node) = tmp_ops;
+    }
 }
 
 
@@ -1682,9 +1725,10 @@ vect_gather_slp_loads (slp_instance inst, slp_tree node,
 
   if (SLP_TREE_CHILDREN (node).length () == 0)
     {
+      if (SLP_TREE_DEF_TYPE (node) != vect_internal_def)
+	return;
       stmt_vec_info stmt_info = SLP_TREE_SCALAR_STMTS (node)[0];
-      if (SLP_TREE_DEF_TYPE (node) == vect_internal_def
-	  && STMT_VINFO_GROUPED_ACCESS (stmt_info)
+      if (STMT_VINFO_GROUPED_ACCESS (stmt_info)
 	  && DR_IS_READ (STMT_VINFO_DATA_REF (stmt_info)))
 	SLP_INSTANCE_LOADS (inst).safe_push (node);
     }
@@ -2346,7 +2390,8 @@ vect_detect_hybrid_slp_stmts (slp_tree node, unsigned i, slp_vect_type stype,
 
   if (!only_edge)
     FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), j, child)
-      if (SLP_TREE_DEF_TYPE (child) != vect_external_def)
+      if (SLP_TREE_DEF_TYPE (child) != vect_external_def
+	  && SLP_TREE_DEF_TYPE (child) != vect_constant_def)
 	vect_detect_hybrid_slp_stmts (child, i, stype, visited);
 }
 
@@ -2533,8 +2578,15 @@ vect_slp_analyze_node_operations_1 (vec_info *vinfo, slp_tree node,
      VF divided by the number of elements in a vector.  */
   if (!STMT_VINFO_GROUPED_ACCESS (stmt_info)
       && REDUC_GROUP_FIRST_ELEMENT (stmt_info))
-    SLP_TREE_NUMBER_OF_VEC_STMTS (node)
-      = SLP_TREE_NUMBER_OF_VEC_STMTS (SLP_TREE_CHILDREN (node)[0]);
+    {
+      for (unsigned i = 0; i < SLP_TREE_CHILDREN (node).length (); ++i)
+	if (SLP_TREE_DEF_TYPE (SLP_TREE_CHILDREN (node)[i]) == vect_internal_def)
+	  {
+	    SLP_TREE_NUMBER_OF_VEC_STMTS (node)
+	      = SLP_TREE_NUMBER_OF_VEC_STMTS (SLP_TREE_CHILDREN (node)[i]);
+	    break;
+	  }
+    }
   else
     {
       poly_uint64 vf;
@@ -2598,25 +2650,31 @@ vect_slp_analyze_node_operations (vec_info *vinfo, slp_tree node,
   auto_vec<vect_def_type, 4> dt;
   dt.safe_grow (SLP_TREE_CHILDREN (node).length ());
   FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), j, child)
-    dt[j] = STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0]);
+    if (SLP_TREE_SCALAR_STMTS (child).length () != 0)
+      dt[j] = STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0]);
 
   /* Push SLP node def-type to stmt operands.  */
   FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), j, child)
-    if (SLP_TREE_DEF_TYPE (child) != vect_internal_def)
+    if (SLP_TREE_DEF_TYPE (child) != vect_internal_def
+	&& SLP_TREE_SCALAR_STMTS (child).length () != 0)
       STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0])
 	= SLP_TREE_DEF_TYPE (child);
 
   /* Check everything worked out.  */
   bool res = true;
   FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), j, child)
-    if (SLP_TREE_DEF_TYPE (child) != vect_internal_def)
-      {
-	if (STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0])
-	    != SLP_TREE_DEF_TYPE (child))
-	  res = false;
-      }
-    else if (STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0]) != dt[j])
-      res = false;
+      if (SLP_TREE_SCALAR_STMTS (child).length () != 0)
+	{
+	  if (SLP_TREE_DEF_TYPE (child) != vect_internal_def)
+	    {
+	      if (STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0])
+		  != SLP_TREE_DEF_TYPE (child))
+		res = false;
+	    }
+	  else if (STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0])
+		   != dt[j])
+	    res = false;
+	}
   if (!res && dump_enabled_p ())
     dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 		     "not vectorized: same operand with different "
@@ -2628,7 +2686,8 @@ vect_slp_analyze_node_operations (vec_info *vinfo, slp_tree node,
 
   /* Restore def-types.  */
   FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), j, child)
-    STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0]) = dt[j];
+    if (SLP_TREE_SCALAR_STMTS (child).length () != 0)
+      STMT_VINFO_DEF_TYPE (SLP_TREE_SCALAR_STMTS (child)[0]) = dt[j];
 
   return res;
 }
@@ -3279,53 +3338,46 @@ duplicate_and_interleave (vec_info *vinfo, gimple_seq *seq, tree vector_type,
 
 /* For constant and loop invariant defs of SLP_NODE this function returns
    (vector) defs (VEC_OPRNDS) that will be used in the vectorized stmts.
-   OP_NUM determines if we gather defs for operand 0 or operand 1 of the RHS of
-   scalar stmts.  NUMBER_OF_VECTORS is the number of vector defs to create.
-   REDUC_INDEX is the index of the reduction operand in the statements, unless
-   it is -1.  */
+   OP_NODE determines the node for the operand containing the scalar
+   operands.  */
 
 static void
-vect_get_constant_vectors (tree op, slp_tree slp_node,
-                           vec<tree> *vec_oprnds,
-			   unsigned int op_num, unsigned int number_of_vectors)
+vect_get_constant_vectors (slp_tree op_node, slp_tree slp_node,
+                           vec<tree> *vec_oprnds)
 {
-  vec<stmt_vec_info> stmts = SLP_TREE_SCALAR_STMTS (slp_node);
-  stmt_vec_info stmt_vinfo = stmts[0];
+  stmt_vec_info stmt_vinfo = SLP_TREE_SCALAR_STMTS (slp_node)[0];
   vec_info *vinfo = stmt_vinfo->vinfo;
-  gimple *stmt = stmt_vinfo->stmt;
   unsigned HOST_WIDE_INT nunits;
   tree vec_cst;
   unsigned j, number_of_places_left_in_vector;
   tree vector_type;
   tree vop;
-  int group_size = stmts.length ();
+  int group_size = op_node->ops.length ();
   unsigned int vec_num, i;
   unsigned number_of_copies = 1;
-  vec<tree> voprnds;
-  voprnds.create (number_of_vectors);
-  bool constant_p, is_store;
+  bool constant_p;
   tree neutral_op = NULL;
-  enum tree_code code = gimple_expr_code (stmt);
   gimple_seq ctor_seq = NULL;
   auto_vec<tree, 16> permute_results;
 
+  /* ???  SLP analysis should compute the vector type for the
+     constant / invariant and store it in the SLP node.  */
+  tree op = op_node->ops[0];
   /* Check if vector type is a boolean vector.  */
+  tree stmt_vectype = STMT_VINFO_VECTYPE (stmt_vinfo);
   if (VECT_SCALAR_BOOLEAN_TYPE_P (TREE_TYPE (op))
       && vect_mask_constant_operand_p (stmt_vinfo))
     vector_type
-      = build_same_sized_truth_vector_type (STMT_VINFO_VECTYPE (stmt_vinfo));
+      = build_same_sized_truth_vector_type (stmt_vectype);
   else
     vector_type = get_vectype_for_scalar_type (vinfo, TREE_TYPE (op));
 
-  if (STMT_VINFO_DATA_REF (stmt_vinfo))
-    {
-      is_store = true;
-      op = gimple_assign_rhs1 (stmt);
-    }
-  else
-    is_store = false;
-
-  gcc_assert (op);
+  unsigned int number_of_vectors
+    = vect_get_num_vectors (SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node)
+			    * TYPE_VECTOR_SUBPARTS (stmt_vectype),
+			    vector_type);
+  vec_oprnds->create (number_of_vectors);
+  auto_vec<tree> voprnds (number_of_vectors);
 
   /* NUMBER_OF_COPIES is the number of times we need to use the same values in
      created vectors. It is greater than 1 if unrolling is performed.
@@ -3357,56 +3409,8 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
   bool place_after_defs = false;
   for (j = 0; j < number_of_copies; j++)
     {
-      for (i = group_size - 1; stmts.iterate (i, &stmt_vinfo); i--)
+      for (i = group_size - 1; op_node->ops.iterate (i, &op); i--)
         {
-	  stmt = stmt_vinfo->stmt;
-          if (is_store)
-            op = gimple_assign_rhs1 (stmt);
-          else
-	    {
-	      switch (code)
-		{
-		  case COND_EXPR:
-		    {
-		      tree cond = gimple_assign_rhs1 (stmt);
-		      if (TREE_CODE (cond) == SSA_NAME)
-			op = gimple_op (stmt, op_num + 1);
-		      else if (op_num == 0 || op_num == 1)
-			op = TREE_OPERAND (cond, op_num);
-		      else
-			{
-			  if (op_num == 2)
-			    op = gimple_assign_rhs2 (stmt);
-			  else
-			    op = gimple_assign_rhs3 (stmt);
-			}
-		    }
-		    break;
-
-		  case CALL_EXPR:
-		    op = gimple_call_arg (stmt, op_num);
-		    break;
-
-		  case LSHIFT_EXPR:
-		  case RSHIFT_EXPR:
-		  case LROTATE_EXPR:
-		  case RROTATE_EXPR:
-		    op = gimple_op (stmt, op_num + 1);
-		    /* Unlike the other binary operators, shifts/rotates have
-		       the shift count being int, instead of the same type as
-		       the lhs, so make sure the scalar is the right type if
-		       we are dealing with vectors of
-		       long long/long/short/char.  */
-		    if (op_num == 1 && TREE_CODE (op) == INTEGER_CST)
-		      op = fold_convert (TREE_TYPE (vector_type), op);
-		    break;
-
-		  default:
-		    op = gimple_op (stmt, op_num + 1);
-		    break;
-		}
-	    }
-
           /* Create 'vect_ = {op0,op1,...,opn}'.  */
           number_of_places_left_in_vector--;
 	  tree orig_op = op;
@@ -3476,7 +3480,7 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
 		vec_cst = gimple_build_vector (&ctor_seq, &elts);
 	      else
 		{
-		  if (vec_oprnds->is_empty ())
+		  if (permute_results.is_empty ())
 		    duplicate_and_interleave (vinfo, &ctor_seq, vector_type,
 					      elts, number_of_vectors,
 					      permute_results);
@@ -3520,8 +3524,6 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
       vec_oprnds->quick_push (vop);
     }
 
-  voprnds.release ();
-
   /* In case that VF is greater than the unrolling factor needed for the SLP
      group of stmts, NUMBER_OF_VECTORS to be created is greater than
      NUMBER_OF_SCALARS/NUNITS or NUNITS/NUMBER_OF_SCALARS, and hence we have
@@ -3552,25 +3554,17 @@ vect_get_constant_vectors (tree op, slp_tree slp_node,
 static void
 vect_get_slp_vect_defs (slp_tree slp_node, vec<tree> *vec_oprnds)
 {
-  tree vec_oprnd;
   stmt_vec_info vec_def_stmt_info;
   unsigned int i;
 
   gcc_assert (SLP_TREE_VEC_STMTS (slp_node).exists ());
 
   FOR_EACH_VEC_ELT (SLP_TREE_VEC_STMTS (slp_node), i, vec_def_stmt_info)
-    {
-      gcc_assert (vec_def_stmt_info);
-      if (gphi *vec_def_phi = dyn_cast <gphi *> (vec_def_stmt_info->stmt))
-	vec_oprnd = gimple_phi_result (vec_def_phi);
-      else
-	vec_oprnd = gimple_get_lhs (vec_def_stmt_info->stmt);
-      vec_oprnds->quick_push (vec_oprnd);
-    }
+    vec_oprnds->quick_push (gimple_get_lhs (vec_def_stmt_info->stmt));
 }
 
 
-/* Get vectorized definitions for SLP_NODE.
+/* Get N vectorized definitions for SLP_NODE.
    If the scalar definitions are loop invariants or constants, collect them and
    call vect_get_constant_vectors() to create vector stmts.
    Otherwise, the def-stmts must be already vectorized and the vectorized stmts
@@ -3578,91 +3572,26 @@ vect_get_slp_vect_defs (slp_tree slp_node, vec<tree> *vec_oprnds)
    vect_get_slp_vect_defs () to retrieve them.  */
 
 void
-vect_get_slp_defs (vec<tree> ops, slp_tree slp_node,
-		   vec<vec<tree> > *vec_oprnds)
+vect_get_slp_defs (slp_tree slp_node, vec<vec<tree> > *vec_oprnds, unsigned n)
 {
-  int number_of_vects = 0, i;
-  unsigned int child_index = 0;
-  HOST_WIDE_INT lhs_size_unit, rhs_size_unit;
-  slp_tree child = NULL;
-  vec<tree> vec_defs;
-  tree oprnd;
-  bool vectorized_defs;
+  if (n == -1U)
+    n = SLP_TREE_CHILDREN (slp_node).length ();
 
-  stmt_vec_info first_stmt_info = SLP_TREE_SCALAR_STMTS (slp_node)[0];
-  FOR_EACH_VEC_ELT (ops, i, oprnd)
+  for (unsigned i = 0; i < n; ++i)
     {
-      /* For each operand we check if it has vectorized definitions in a child
-	 node or we need to create them (for invariants and constants).  We
-	 check if the LHS of the first stmt of the next child matches OPRND.
-	 If it does, we found the correct child.  Otherwise, we call
-	 vect_get_constant_vectors (), and not advance CHILD_INDEX in order
-	 to check this child node for the next operand.  */
-      vectorized_defs = false;
-      if (SLP_TREE_CHILDREN (slp_node).length () > child_index)
-        {
-          child = SLP_TREE_CHILDREN (slp_node)[child_index];
-
-	  /* We have to check both pattern and original def, if available.  */
-	  if (SLP_TREE_DEF_TYPE (child) == vect_internal_def)
-	    {
-	      stmt_vec_info first_def_info = SLP_TREE_SCALAR_STMTS (child)[0];
-	      stmt_vec_info related = STMT_VINFO_RELATED_STMT (first_def_info);
-	      tree first_def_op;
+      slp_tree child = SLP_TREE_CHILDREN (slp_node)[i];
 
-	      if (gphi *first_def = dyn_cast <gphi *> (first_def_info->stmt))
-		first_def_op = gimple_phi_result (first_def);
-	      else
-		first_def_op = gimple_get_lhs (first_def_info->stmt);
-	      if (operand_equal_p (oprnd, first_def_op, 0)
-		  || (related
-		      && operand_equal_p (oprnd,
-					  gimple_get_lhs (related->stmt), 0)))
-		{
-		  /* The number of vector defs is determined by the number of
-		     vector statements in the node from which we get those
-		     statements.  */
-		  number_of_vects = SLP_TREE_NUMBER_OF_VEC_STMTS (child);
-		  vectorized_defs = true;
-		  child_index++;
-		}
-	    }
-	  else
-	    child_index++;
-        }
+      vec<tree> vec_defs = vNULL;
 
-      if (!vectorized_defs)
-        {
-          if (i == 0)
-            {
-              number_of_vects = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
-              /* Number of vector stmts was calculated according to LHS in
-                 vect_schedule_slp_instance (), fix it by replacing LHS with
-                 RHS, if necessary.  See vect_get_smallest_scalar_type () for
-                 details.  */
-	      vect_get_smallest_scalar_type (first_stmt_info, &lhs_size_unit,
-					     &rhs_size_unit);
-              if (rhs_size_unit != lhs_size_unit)
-                {
-                  number_of_vects *= rhs_size_unit;
-                  number_of_vects /= lhs_size_unit;
-                }
-            }
-        }
-
-      /* Allocate memory for vectorized defs.  */
-      vec_defs = vNULL;
-      vec_defs.create (number_of_vects);
-
-      /* For reduction defs we call vect_get_constant_vectors (), since we are
-         looking for initial loop invariant values.  */
-      if (vectorized_defs)
-        /* The defs are already vectorized.  */
-	vect_get_slp_vect_defs (child, &vec_defs);
+      /* For each operand we check if it has vectorized definitions in a child
+	 node or we need to create them (for invariants and constants).  */
+      if (SLP_TREE_DEF_TYPE (child) == vect_internal_def)
+	{
+	  vec_defs.create (SLP_TREE_NUMBER_OF_VEC_STMTS (child));
+	  vect_get_slp_vect_defs (child, &vec_defs);
+	}
       else
-	/* Build vectors from scalar defs.  */
-	vect_get_constant_vectors (oprnd, slp_node, &vec_defs, i,
-				   number_of_vects);
+	vect_get_constant_vectors (child, slp_node, &vec_defs);
 
       vec_oprnds->quick_push (vec_defs);
     }
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 6c7b9fe..4c5d33c 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -1726,16 +1726,8 @@ vect_get_vec_defs (tree op0, tree op1, stmt_vec_info stmt_info,
 {
   if (slp_node)
     {
-      int nops = (op1 == NULL_TREE) ? 1 : 2;
-      auto_vec<tree> ops (nops);
-      auto_vec<vec<tree> > vec_defs (nops);
-
-      ops.quick_push (op0);
-      if (op1)
-        ops.quick_push (op1);
-
-      vect_get_slp_defs (ops, slp_node, &vec_defs);
-
+      auto_vec<vec<tree> > vec_defs (SLP_TREE_CHILDREN (slp_node).length ());
+      vect_get_slp_defs (slp_node, &vec_defs, op1 ? 2 : 1);
       *vec_oprnds0 = vec_defs[0];
       if (op1)
 	*vec_oprnds1 = vec_defs[1];
@@ -3473,9 +3465,7 @@ vectorizable_call (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	      auto_vec<vec<tree> > vec_defs (nargs);
 	      vec<tree> vec_oprnds0;
 
-	      for (i = 0; i < nargs; i++)
-		vargs[i] = gimple_call_arg (stmt, i);
-	      vect_get_slp_defs (vargs, slp_node, &vec_defs);
+	      vect_get_slp_defs (slp_node, &vec_defs);
 	      vec_oprnds0 = vec_defs[0];
 
 	      /* Arguments are ready.  Create the new vector stmt.  */
@@ -3647,9 +3637,7 @@ vectorizable_call (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	      auto_vec<vec<tree> > vec_defs (nargs);
 	      vec<tree> vec_oprnds0;
 
-	      for (i = 0; i < nargs; i++)
-		vargs.quick_push (gimple_call_arg (stmt, i));
-	      vect_get_slp_defs (vargs, slp_node, &vec_defs);
+	      vect_get_slp_defs (slp_node, &vec_defs);
 	      vec_oprnds0 = vec_defs[0];
 
 	      /* Arguments are ready.  Create the new vector stmt.  */
@@ -6195,12 +6183,8 @@ vectorizable_operation (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	    {
 	      if (slp_node)
 		{
-		  auto_vec<tree> ops(3);
-		  ops.quick_push (op0);
-		  ops.quick_push (op1);
-		  ops.quick_push (op2);
 		  auto_vec<vec<tree> > vec_defs(3);
-		  vect_get_slp_defs (ops, slp_node, &vec_defs);
+		  vect_get_slp_defs (slp_node, &vec_defs);
 		  vec_oprnds0 = vec_defs[0];
 		  vec_oprnds1 = vec_defs[1];
 		  vec_oprnds2 = vec_defs[2];
@@ -9271,10 +9255,8 @@ vectorizable_load (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	    {
 	      if (slp_node)
 		{
-		  auto_vec<tree> ops (1);
 		  auto_vec<vec<tree> > vec_defs (1);
-		  ops.quick_push (mask);
-		  vect_get_slp_defs (ops, slp_node, &vec_defs);
+		  vect_get_slp_defs (slp_node, &vec_defs);
 		  vec_mask = vec_defs[0][0];
 		}
 	      else
@@ -10046,19 +10028,8 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	{
           if (slp_node)
             {
-              auto_vec<tree, 4> ops;
 	      auto_vec<vec<tree>, 4> vec_defs;
-
-	      if (masked)
-		ops.safe_push (cond_expr);
-	      else
-		{
-		  ops.safe_push (cond_expr0);
-		  ops.safe_push (cond_expr1);
-		}
-              ops.safe_push (then_clause);
-              ops.safe_push (else_clause);
-              vect_get_slp_defs (ops, slp_node, &vec_defs);
+              vect_get_slp_defs (slp_node, &vec_defs);
 	      vec_oprnds3 = vec_defs.pop ();
 	      vec_oprnds2 = vec_defs.pop ();
 	      if (!masked)
@@ -10461,12 +10432,8 @@ vectorizable_comparison (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	{
 	  if (slp_node)
 	    {
-	      auto_vec<tree, 2> ops;
 	      auto_vec<vec<tree>, 2> vec_defs;
-
-	      ops.safe_push (rhs1);
-	      ops.safe_push (rhs2);
-	      vect_get_slp_defs (ops, slp_node, &vec_defs);
+	      vect_get_slp_defs (slp_node, &vec_defs);
 	      vec_oprnds1 = vec_defs.pop ();
 	      vec_oprnds0 = vec_defs.pop ();
 	      if (swap_p)
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 59dced7..56be28b 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -120,6 +120,8 @@ struct _slp_tree {
   vec<slp_tree> children;
   /* A group of scalar stmts to be vectorized together.  */
   vec<stmt_vec_info> stmts;
+  /* A group of scalar operands to be vectorized together.  */
+  vec<tree> ops;
   /* Load permutation relative to the stores, NULL if there is no
      permutation.  */
   vec<unsigned> load_permutation;
@@ -171,6 +173,7 @@ public:
 
 #define SLP_TREE_CHILDREN(S)                     (S)->children
 #define SLP_TREE_SCALAR_STMTS(S)                 (S)->stmts
+#define SLP_TREE_SCALAR_OPS(S)                   (S)->ops
 #define SLP_TREE_VEC_STMTS(S)                    (S)->vec_stmts
 #define SLP_TREE_NUMBER_OF_VEC_STMTS(S)          (S)->vec_stmts_size
 #define SLP_TREE_LOAD_PERMUTATION(S)             (S)->load_permutation
@@ -1750,7 +1753,7 @@ extern void vect_schedule_slp (vec_info *);
 extern opt_result vect_analyze_slp (vec_info *, unsigned);
 extern bool vect_make_slp_decision (loop_vec_info);
 extern void vect_detect_hybrid_slp (loop_vec_info);
-extern void vect_get_slp_defs (vec<tree> , slp_tree, vec<vec<tree> > *);
+extern void vect_get_slp_defs (slp_tree, vec<vec<tree> > *, unsigned n = -1U);
 extern bool vect_slp_bb (basic_block);
 extern stmt_vec_info vect_find_last_scalar_stmt_in_slp (slp_tree);
 extern bool is_simple_and_all_uses_invariant (stmt_vec_info, loop_vec_info);
-- 
cgit v1.1


From 53b15ca96116544a7a3ca8bc5f4e1649b74f3d45 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 21 Oct 2019 13:43:19 +0000
Subject: re PR tree-optimization/92162 (ICE in
 vect_create_epilog_for_reduction, at tree-vect-loop.c:4252)

2019-10-21  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92162
	* tree-vect-loop.c (vect_create_epilog_for_reduction): Lookup
	STMT_VINFO_REDUC_IDX in reduc_info.
	* tree-vect-stmts.c (vectorizable_condition): Likewise.

	* gcc.dg/pr92162.c: New testcase.

From-SVN: r277261
---
 gcc/ChangeLog                  |  7 +++++++
 gcc/testsuite/ChangeLog        |  5 +++++
 gcc/testsuite/gcc.dg/pr92162.c | 10 ++++++++++
 gcc/tree-vect-loop.c           |  4 ++--
 gcc/tree-vect-stmts.c          |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/pr92162.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4139f7f..8c20cb8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-21  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/92162
+	* tree-vect-loop.c (vect_create_epilog_for_reduction): Lookup
+	STMT_VINFO_REDUC_IDX in reduc_info.
+	* tree-vect-stmts.c (vectorizable_condition): Likewise.
+
+2019-10-21  Richard Biener  <rguenther@suse.de>
+
 	* tree-vectorizer.h (_slp_tree::ops): New member.
 	(SLP_TREE_SCALAR_OPS): New.
 	(vect_get_slp_defs): Adjust prototype.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d958e64..0259236 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-21  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/92162
+	* gcc.dg/pr92162.c: New testcase.
+
+2019-10-21  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/92161
 	* gfortran.dg/pr92161.f: New testcase.
 
diff --git a/gcc/testsuite/gcc.dg/pr92162.c b/gcc/testsuite/gcc.dg/pr92162.c
new file mode 100644
index 0000000..ed82595
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr92162.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-Ofast" } */
+
+short int s8;
+
+void __attribute__ ((simd))
+gn (void)
+{
+  s8 = 0;
+}
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 9efb797..a4c9f2f 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -4259,9 +4259,9 @@ vect_create_epilog_for_reduction (stmt_vec_info stmt_info,
 	 (CCOMPARE).  The then and else values mirror the main VEC_COND_EXPR:
 	 the reduction phi corresponds to NEW_PHI_TREE and the new values
 	 correspond to INDEX_BEFORE_INCR.  */
-      gcc_assert (STMT_VINFO_REDUC_IDX (stmt_info) >= 1);
+      gcc_assert (STMT_VINFO_REDUC_IDX (reduc_info) >= 1);
       tree index_cond_expr;
-      if (STMT_VINFO_REDUC_IDX (stmt_info) == 2)
+      if (STMT_VINFO_REDUC_IDX (reduc_info) == 2)
 	index_cond_expr = build3 (VEC_COND_EXPR, cr_index_vector_type,
 				  ccompare, indx_before_incr, new_phi_tree);
       else
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 4c5d33c..7f6100e 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -9818,7 +9818,7 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	return false;
       reduc_info = info_for_reduction (stmt_info);
       reduction_type = STMT_VINFO_REDUC_TYPE (reduc_info);
-      reduc_index = STMT_VINFO_REDUC_IDX (stmt_info);
+      reduc_index = STMT_VINFO_REDUC_IDX (reduc_info);
       gcc_assert (reduction_type != EXTRACT_LAST_REDUCTION
 		  || reduc_index != -1);
     }
-- 
cgit v1.1


From f3b3331a4baf8a8595e9383501b617f1638eb2f0 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Mon, 21 Oct 2019 15:52:58 +0000
Subject: [arm] clean up alu+shift patterns

My DImode arithmetic patches introduced a bug on thumb2 where we could
generate a register controlled shift into an ALU operation.  In
fairness the bug was always present, but latent.

As part of cleaning this up (and auditing to ensure I've caught them
all this time) I've gone through all the shift generating patterns in
the MD files and cleaned them up, reducing some duplicate patterns
between the arm and thumb2 descriptions where we can now share the
same pattern.  In some cases we were missing the shift attribute; in
most cases I've eliminated an ugly attribute setting using the fact
that we normally need separate alternatives for shift immediate and
shift reg to simplify the logic.

	* config/arm/iterators.md (t2_binop0): Fix typo in comment.
	* config/arm/arm.md (addsi3_carryin_shift): Simplify selection of the
	type attribute.
	(subsi3_carryin_shift): Separate into register and constant controlled
	alternatives.  Use shift_amount_operand for operand 4.  Set shift
	attribute and simplify type attribute.
	(subsi3_carryin_shift_alt): Likewise.
	(rsbsi3_carryin_shift): Likewise.
	(rsbsi3_carryin_shift_alt): Likewise.
	(andsi_not_shiftsi_si): Enable for TARGET_32BIT.  Separate constant
	and register controlled shifts into distinct alternatives.
	(andsi_not_shiftsi_si_scc_no_reuse): Likewise.
	(andsi_not_shiftsi_si_scc): Likewise.
	(arm_cmpsi_negshiftsi_si): Likewise.
	(not_shiftsi): Remove redundant M constraint from alternative 1.
	(not_shiftsi_compare0): Likewise.
	(arm_cmpsi_insn): Remove redundant alternative 2.
	(cmpsi_shift_swp): Likewise.
	(sub_shiftsi): Likewise.
	(sub_shiftsi_compare0_scratch): Likewise.
	* config/arm/thumb2.md (thumb_andsi_not_shiftsi_si): Delete pattern.
	(thumb2_cmpsi_neg_shiftsi): Likewise.

From-SVN: r277262
---
 gcc/ChangeLog               |  25 +++++++
 gcc/config/arm/arm.md       | 166 +++++++++++++++++++++-----------------------
 gcc/config/arm/iterators.md |   2 +-
 gcc/config/arm/thumb2.md    |  27 -------
 4 files changed, 105 insertions(+), 115 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c20cb8..5012177 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,28 @@
+2019-10-21  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/iterators.md (t2_binop0): Fix typo in comment.
+	* config/arm/arm.md (addsi3_carryin_shift): Simplify selection of the
+	type attribute.
+	(subsi3_carryin_shift): Separate into register and constant controlled
+	alternatives.  Use shift_amount_operand for operand 4.  Set shift
+	attribute and simplify type attribute.
+	(subsi3_carryin_shift_alt): Likewise.
+	(rsbsi3_carryin_shift): Likewise.
+	(rsbsi3_carryin_shift_alt): Likewise.
+	(andsi_not_shiftsi_si): Enable for TARGET_32BIT.  Separate constant
+	and register controlled shifts into distinct alternatives.
+	(andsi_not_shiftsi_si_scc_no_reuse): Likewise.
+	(andsi_not_shiftsi_si_scc): Likewise.
+	(arm_cmpsi_negshiftsi_si): Likewise.
+	(not_shiftsi): Remove redundant M constraint from alternative 1.
+	(not_shiftsi_compare0): Likewise.
+	(arm_cmpsi_insn): Remove redundant alternative 2.
+	(cmpsi_shift_swp): Likewise.
+	(sub_shiftsi): Likewise.
+	(sub_shiftsi_compare0_scratch): Likewise.
+	* config/arm/thumb2.md (thumb_andsi_not_shiftsi_si): Delete pattern.
+	(thumb2_cmpsi_neg_shiftsi): Likewise.
+
 2019-10-21  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92162
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 7ef0c16..039fdd0 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1338,9 +1338,7 @@
    (set_attr "arch" "32,a")
    (set_attr "shift" "3")
    (set_attr "predicable" "yes")
-   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
-		      (const_string "alu_shift_imm")
-		      (const_string "alu_shift_reg")))]
+   (set_attr "type" "alu_shift_imm,alu_shift_reg")]
 )
 
 (define_insn "*addsi3_carryin_clobercc"
@@ -1719,71 +1717,68 @@
 )
 
 (define_insn "*subsi3_carryin_shift"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(minus:SI (minus:SI
-		   (match_operand:SI 1 "s_register_operand" "r")
+		   (match_operand:SI 1 "s_register_operand" "r,r")
 		   (match_operator:SI 2 "shift_operator"
-		    [(match_operand:SI 3 "s_register_operand" "r")
-		     (match_operand:SI 4 "reg_or_int_operand" "rM")]))
+		    [(match_operand:SI 3 "s_register_operand" "r,r")
+		     (match_operand:SI 4 "shift_amount_operand" "M,r")]))
 		  (match_operand:SI 5 "arm_borrow_operation" "")))]
   "TARGET_32BIT"
   "sbc%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "use")
+   (set_attr "arch" "32,a")
+   (set_attr "shift" "3")
    (set_attr "predicable" "yes")
-   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
-				    (const_string "alu_shift_imm")
-				    (const_string "alu_shift_reg")))]
+   (set_attr "type" "alu_shift_imm,alu_shift_reg")]
 )
 
 (define_insn "*subsi3_carryin_shift_alt"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(minus:SI (minus:SI
-		   (match_operand:SI 1 "s_register_operand" "r")
+		   (match_operand:SI 1 "s_register_operand" "r,r")
 		   (match_operand:SI 5 "arm_borrow_operation" ""))
 		  (match_operator:SI 2 "shift_operator"
-		   [(match_operand:SI 3 "s_register_operand" "r")
-		    (match_operand:SI 4 "reg_or_int_operand" "rM")])))]
+		   [(match_operand:SI 3 "s_register_operand" "r,r")
+		    (match_operand:SI 4 "shift_amount_operand" "M,r")])))]
   "TARGET_32BIT"
   "sbc%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "use")
+   (set_attr "arch" "32,a")
+   (set_attr "shift" "3")
    (set_attr "predicable" "yes")
-   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
-				    (const_string "alu_shift_imm")
-				    (const_string "alu_shift_reg")))]
+   (set_attr "type" "alu_shift_imm,alu_shift_reg")]
 )
 
+;; No RSC in Thumb2
 (define_insn "*rsbsi3_carryin_shift"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(minus:SI (minus:SI
 		   (match_operator:SI 2 "shift_operator"
-		    [(match_operand:SI 3 "s_register_operand" "r")
-		     (match_operand:SI 4 "reg_or_int_operand" "rM")])
-		   (match_operand:SI 1 "s_register_operand" "r"))
+		    [(match_operand:SI 3 "s_register_operand" "r,r")
+		     (match_operand:SI 4 "shift_amount_operand" "M,r")])
+		   (match_operand:SI 1 "s_register_operand" "r,r"))
 		  (match_operand:SI 5 "arm_borrow_operation" "")))]
   "TARGET_ARM"
   "rsc%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "use")
    (set_attr "predicable" "yes")
-   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
-		      (const_string "alu_shift_imm")
-		      (const_string "alu_shift_reg")))]
+   (set_attr "type" "alu_shift_imm,alu_shift_reg")]
 )
 
 (define_insn "*rsbsi3_carryin_shift_alt"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(minus:SI (minus:SI
 		   (match_operator:SI 2 "shift_operator"
-		    [(match_operand:SI 3 "s_register_operand" "r")
-		     (match_operand:SI 4 "reg_or_int_operand" "rM")])
+		    [(match_operand:SI 3 "s_register_operand" "r,r")
+		     (match_operand:SI 4 "shift_amount_operand" "M,r")])
 		    (match_operand:SI 5 "arm_borrow_operation" ""))
-		  (match_operand:SI 1 "s_register_operand" "r")))]
+		  (match_operand:SI 1 "s_register_operand" "r,r")))]
   "TARGET_ARM"
   "rsc%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "use")
    (set_attr "predicable" "yes")
-   (set (attr "type") (if_then_else (match_operand 4 "const_int_operand" "")
-		      (const_string "alu_shift_imm")
-		      (const_string "alu_shift_reg")))]
+   (set_attr "type" "alu_shift_imm,alu_shift_reg")]
 )
 
 ; transform ((x << y) - 1) to ~(~(x-1) << y)  Where X is a constant.
@@ -3268,18 +3263,17 @@
 )
 
 (define_insn "andsi_not_shiftsi_si"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
+  [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(and:SI (not:SI (match_operator:SI 4 "shift_operator"
-			 [(match_operand:SI 2 "s_register_operand" "r")
-			  (match_operand:SI 3 "arm_rhs_operand" "rM")]))
-		(match_operand:SI 1 "s_register_operand" "r")))]
-  "TARGET_ARM"
+			 [(match_operand:SI 2 "s_register_operand" "r,r")
+			  (match_operand:SI 3 "shift_amount_operand" "M,r")]))
+		(match_operand:SI 1 "s_register_operand" "r,r")))]
+  "TARGET_32BIT"
   "bic%?\\t%0, %1, %2%S4"
   [(set_attr "predicable" "yes")
    (set_attr "shift" "2")
-   (set (attr "type") (if_then_else (match_operand 3 "const_int_operand" "")
-		      (const_string "logic_shift_imm")
-		      (const_string "logic_shift_reg")))]
+   (set_attr "arch" "32,a")
+   (set_attr "type" "logic_shift_imm,logic_shift_reg")]
 )
 
 ;; Shifted bics pattern used to set up CC status register and not reusing
@@ -3289,19 +3283,18 @@
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
 		(and:SI (not:SI (match_operator:SI 0 "shift_operator"
-			[(match_operand:SI 1 "s_register_operand" "r")
-			 (match_operand:SI 2 "arm_rhs_operand" "rM")]))
-			(match_operand:SI 3 "s_register_operand" "r"))
+			[(match_operand:SI 1 "s_register_operand" "r,r")
+			 (match_operand:SI 2 "shift_amount_operand" "M,r")]))
+			(match_operand:SI 3 "s_register_operand" "r,r"))
 		(const_int 0)))
-   (clobber (match_scratch:SI 4 "=r"))]
-  "TARGET_ARM || (TARGET_THUMB2 && CONST_INT_P (operands[2]))"
+   (clobber (match_scratch:SI 4 "=r,r"))]
+  "TARGET_32BIT"
   "bics%?\\t%4, %3, %1%S0"
   [(set_attr "predicable" "yes")
+   (set_attr "arch" "32,a")
    (set_attr "conds" "set")
    (set_attr "shift" "1")
-   (set (attr "type") (if_then_else (match_operand 2 "const_int_operand" "")
-		      (const_string "logic_shift_imm")
-		      (const_string "logic_shift_reg")))]
+   (set_attr "type" "logic_shift_imm,logic_shift_reg")]
 )
 
 ;; Same as andsi_not_shiftsi_si_scc_no_reuse, but the bics result is also
@@ -3310,23 +3303,22 @@
   [(parallel [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
 		(and:SI (not:SI (match_operator:SI 0 "shift_operator"
-			[(match_operand:SI 1 "s_register_operand" "r")
-			 (match_operand:SI 2 "arm_rhs_operand" "rM")]))
-			(match_operand:SI 3 "s_register_operand" "r"))
+			[(match_operand:SI 1 "s_register_operand" "r,r")
+			 (match_operand:SI 2 "shift_amount_operand" "M,r")]))
+			(match_operand:SI 3 "s_register_operand" "r,r"))
 		(const_int 0)))
-	(set (match_operand:SI 4 "s_register_operand" "=r")
+	(set (match_operand:SI 4 "s_register_operand" "=r,r")
 	     (and:SI (not:SI (match_op_dup 0
 		     [(match_dup 1)
 		      (match_dup 2)]))
 		     (match_dup 3)))])]
-  "TARGET_ARM || (TARGET_THUMB2 && CONST_INT_P (operands[2]))"
+  "TARGET_32BIT"
   "bics%?\\t%4, %3, %1%S0"
   [(set_attr "predicable" "yes")
+   (set_attr "arch" "32,a")
    (set_attr "conds" "set")
    (set_attr "shift" "1")
-   (set (attr "type") (if_then_else (match_operand 2 "const_int_operand" "")
-		      (const_string "logic_shift_imm")
-		      (const_string "logic_shift_reg")))]
+   (set_attr "type" "logic_shift_imm,logic_shift_reg")]
 )
 
 (define_insn "*andsi_notsi_si_compare0"
@@ -4219,7 +4211,7 @@
   [(set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(not:SI (match_operator:SI 3 "shift_operator"
 		 [(match_operand:SI 1 "s_register_operand" "r,r")
-		  (match_operand:SI 2 "shift_amount_operand" "M,rM")])))]
+		  (match_operand:SI 2 "shift_amount_operand" "M,r")])))]
   "TARGET_32BIT"
   "mvn%?\\t%0, %1%S3"
   [(set_attr "predicable" "yes")
@@ -4232,7 +4224,7 @@
 	(compare:CC_NOOV
 	 (not:SI (match_operator:SI 3 "shift_operator"
 		  [(match_operand:SI 1 "s_register_operand" "r,r")
-		   (match_operand:SI 2 "shift_amount_operand" "M,rM")]))
+		   (match_operand:SI 2 "shift_amount_operand" "M,r")]))
 	 (const_int 0)))
    (set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(not:SI (match_op_dup 3 [(match_dup 1) (match_dup 2)])))]
@@ -4248,7 +4240,7 @@
 	(compare:CC_NOOV
 	 (not:SI (match_operator:SI 3 "shift_operator"
 		  [(match_operand:SI 1 "s_register_operand" "r,r")
-		   (match_operand:SI 2 "shift_amount_operand" "M,rM")]))
+		   (match_operand:SI 2 "shift_amount_operand" "M,r")]))
 	 (const_int 0)))
    (clobber (match_scratch:SI 0 "=r,r"))]
   "TARGET_32BIT"
@@ -7197,43 +7189,43 @@
 
 (define_insn "*cmpsi_shiftsi"
   [(set (reg:CC CC_REGNUM)
-	(compare:CC (match_operand:SI   0 "s_register_operand" "r,r,r")
+	(compare:CC (match_operand:SI   0 "s_register_operand" "r,r")
 		    (match_operator:SI  3 "shift_operator"
-		     [(match_operand:SI 1 "s_register_operand" "r,r,r")
-		      (match_operand:SI 2 "shift_amount_operand" "M,r,M")])))]
+		     [(match_operand:SI 1 "s_register_operand" "r,r")
+		      (match_operand:SI 2 "shift_amount_operand" "M,r")])))]
   "TARGET_32BIT"
   "cmp\\t%0, %1%S3"
   [(set_attr "conds" "set")
    (set_attr "shift" "1")
-   (set_attr "arch" "32,a,a")
-   (set_attr "type" "alus_shift_imm,alus_shift_reg,alus_shift_imm")])
+   (set_attr "arch" "32,a")
+   (set_attr "type" "alus_shift_imm,alus_shift_reg")])
 
 (define_insn "*cmpsi_shiftsi_swp"
   [(set (reg:CC_SWP CC_REGNUM)
 	(compare:CC_SWP (match_operator:SI 3 "shift_operator"
-			 [(match_operand:SI 1 "s_register_operand" "r,r,r")
-			  (match_operand:SI 2 "shift_amount_operand" "M,r,M")])
-			(match_operand:SI 0 "s_register_operand" "r,r,r")))]
+			 [(match_operand:SI 1 "s_register_operand" "r,r")
+			  (match_operand:SI 2 "shift_amount_operand" "M,r")])
+			(match_operand:SI 0 "s_register_operand" "r,r")))]
   "TARGET_32BIT"
   "cmp%?\\t%0, %1%S3"
   [(set_attr "conds" "set")
    (set_attr "shift" "1")
-   (set_attr "arch" "32,a,a")
-   (set_attr "type" "alus_shift_imm,alus_shift_reg,alus_shift_imm")])
+   (set_attr "arch" "32,a")
+   (set_attr "type" "alus_shift_imm,alus_shift_reg")])
 
 (define_insn "*arm_cmpsi_negshiftsi_si"
   [(set (reg:CC_Z CC_REGNUM)
 	(compare:CC_Z
 	 (neg:SI (match_operator:SI 1 "shift_operator"
-		    [(match_operand:SI 2 "s_register_operand" "r")
-		     (match_operand:SI 3 "reg_or_int_operand" "rM")]))
-	 (match_operand:SI 0 "s_register_operand" "r")))]
-  "TARGET_ARM"
+		    [(match_operand:SI 2 "s_register_operand" "r,r")
+		     (match_operand:SI 3 "shift_amount_operand" "M,r")]))
+	 (match_operand:SI 0 "s_register_operand" "r,r")))]
+  "TARGET_32BIT"
   "cmn%?\\t%0, %2%S1"
   [(set_attr "conds" "set")
-   (set (attr "type") (if_then_else (match_operand 3 "const_int_operand" "")
-				    (const_string "alus_shift_imm")
-				    (const_string "alus_shift_reg")))
+   (set_attr "arch" "32,a")
+   (set_attr "shift" "2")
+   (set_attr "type" "alus_shift_imm,alus_shift_reg")
    (set_attr "predicable" "yes")]
 )
 
@@ -8945,36 +8937,36 @@
 (define_insn "*sub_shiftsi_compare0"
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
-	 (minus:SI (match_operand:SI 1 "s_register_operand" "r,r,r")
+	 (minus:SI (match_operand:SI 1 "s_register_operand" "r,r")
 		   (match_operator:SI 2 "shift_operator"
-		    [(match_operand:SI 3 "s_register_operand" "r,r,r")
-		     (match_operand:SI 4 "shift_amount_operand" "M,r,M")]))
+		    [(match_operand:SI 3 "s_register_operand" "r,r")
+		     (match_operand:SI 4 "shift_amount_operand" "M,r")]))
 	 (const_int 0)))
-   (set (match_operand:SI 0 "s_register_operand" "=r,r,r")
+   (set (match_operand:SI 0 "s_register_operand" "=r,r")
 	(minus:SI (match_dup 1)
 		  (match_op_dup 2 [(match_dup 3) (match_dup 4)])))]
   "TARGET_32BIT"
   "subs%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "set")
    (set_attr "shift" "3")
-   (set_attr "arch" "32,a,a")
-   (set_attr "type" "alus_shift_imm,alus_shift_reg,alus_shift_imm")])
+   (set_attr "arch" "32,a")
+   (set_attr "type" "alus_shift_imm,alus_shift_reg")])
 
 (define_insn "*sub_shiftsi_compare0_scratch"
   [(set (reg:CC_NOOV CC_REGNUM)
 	(compare:CC_NOOV
-	 (minus:SI (match_operand:SI 1 "s_register_operand" "r,r,r")
+	 (minus:SI (match_operand:SI 1 "s_register_operand" "r,r")
 		   (match_operator:SI 2 "shift_operator"
-		    [(match_operand:SI 3 "s_register_operand" "r,r,r")
-		     (match_operand:SI 4 "shift_amount_operand" "M,r,M")]))
+		    [(match_operand:SI 3 "s_register_operand" "r,r")
+		     (match_operand:SI 4 "shift_amount_operand" "M,r")]))
 	 (const_int 0)))
-   (clobber (match_scratch:SI 0 "=r,r,r"))]
+   (clobber (match_scratch:SI 0 "=r,r"))]
   "TARGET_32BIT"
   "subs%?\\t%0, %1, %3%S2"
   [(set_attr "conds" "set")
    (set_attr "shift" "3")
-   (set_attr "arch" "32,a,a")
-   (set_attr "type" "alus_shift_imm,alus_shift_reg,alus_shift_imm")])
+   (set_attr "arch" "32,a")
+   (set_attr "type" "alus_shift_imm,alus_shift_reg")])
 
 
 (define_insn_and_split "*and_scc"
diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md
index 5f1c833..4eb2033 100644
--- a/gcc/config/arm/iterators.md
+++ b/gcc/config/arm/iterators.md
@@ -265,7 +265,7 @@
 (define_code_iterator FCVT [unsigned_float float])
 
 ;; plus and minus are the only SHIFTABLE_OPS for which Thumb2 allows
-;; a stack pointer opoerand.  The minus operation is a candidate for an rsub
+;; a stack pointer operand.  The minus operation is a candidate for an rsub
 ;; and hence only plus is supported.
 (define_code_attr t2_binop0
   [(plus "rk") (minus "r") (ior "r") (xor "r") (and "r")])
diff --git a/gcc/config/arm/thumb2.md b/gcc/config/arm/thumb2.md
index 8d0b6be..7fce50b 100644
--- a/gcc/config/arm/thumb2.md
+++ b/gcc/config/arm/thumb2.md
@@ -24,20 +24,6 @@
 ;; changes made in armv5t as "thumb2".  These are considered part
 ;; the 16-bit Thumb-1 instruction set.
 
-;; Thumb-2 only allows shift by constant on data processing instructions
-(define_insn "*thumb_andsi_not_shiftsi_si"
-  [(set (match_operand:SI 0 "s_register_operand" "=r")
-	(and:SI (not:SI (match_operator:SI 4 "shift_operator"
-			 [(match_operand:SI 2 "s_register_operand" "r")
-			  (match_operand:SI 3 "const_int_operand" "M")]))
-		(match_operand:SI 1 "s_register_operand" "r")))]
-  "TARGET_THUMB2"
-  "bic%?\\t%0, %1, %2%S4"
-  [(set_attr "predicable" "yes")
-   (set_attr "shift" "2")
-   (set_attr "type" "alu_shift_imm")]
-)
-
 ;; We use the '0' constraint for operand 1 because reload should
 ;; be smart enough to generate an appropriate move for the r/r/r case.
 (define_insn_and_split "*thumb2_smaxsi3"
@@ -333,19 +319,6 @@
   [(set_attr "type" "store_8")]
 )
 
-(define_insn "*thumb2_cmpsi_neg_shiftsi"
-  [(set (reg:CC CC_REGNUM)
-	(compare:CC (match_operand:SI 0 "s_register_operand" "r")
-		    (neg:SI (match_operator:SI 3 "shift_operator"
-			     [(match_operand:SI 1 "s_register_operand" "r")
-			      (match_operand:SI 2 "const_int_operand" "M")]))))]
-  "TARGET_THUMB2"
-  "cmn%?\\t%0, %1%S3"
-  [(set_attr "conds" "set")
-   (set_attr "shift" "1")
-   (set_attr "type" "alus_shift_imm")]
-)
-
 (define_insn_and_split "*thumb2_mov_scc"
   [(set (match_operand:SI 0 "s_register_operand" "=l,r")
 	(match_operator:SI 1 "arm_comparison_operator_mode"
-- 
cgit v1.1


From e011c0100a83030e0cfd230658debbb6c97660a1 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Mon, 21 Oct 2019 18:22:41 +0000
Subject: PR c++/92106 - ICE with structured bindings and -Wreturn-local-addr.

	* typeck.c (maybe_warn_about_returning_address_of_local): Avoid
	recursing on null initializer and return false instead.

	* g++.dg/cpp1z/decomp50.C: New test.

From-SVN: r277264
---
 gcc/cp/ChangeLog                      |  6 +++++
 gcc/cp/typeck.c                       |  6 +++--
 gcc/testsuite/ChangeLog               |  5 ++++
 gcc/testsuite/g++.dg/cpp1z/decomp50.C | 51 +++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1z/decomp50.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 30accc5..29c6bbd 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/92106 - ICE with structured bindings and -Wreturn-local-addr.
+	* typeck.c (maybe_warn_about_returning_address_of_local): Avoid
+	recursing on null initializer and return false instead.
+
 2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>
 
 	Implement p1301 [[nodiscard("should have a reason")]] + p1771 DR
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 83604f5..627dfc2 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -9355,8 +9355,10 @@ maybe_warn_about_returning_address_of_local (tree retval)
 	  tree base = DECL_DECOMP_BASE (whats_returned);
 	  if (TYPE_REF_P (TREE_TYPE (base)))
 	    {
-	      tree init = DECL_INITIAL (base);
-	      return maybe_warn_about_returning_address_of_local (init);
+	      if (tree init = DECL_INITIAL (base))
+		return maybe_warn_about_returning_address_of_local (init);
+	      else
+		return false;
 	    }
 	}
       bool w = false;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0259236..7365a39 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/92106 - ICE with structured bindings and -Wreturn-local-addr.
+	* g++.dg/cpp1z/decomp50.C: New test.
+
 2019-10-21  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92162
diff --git a/gcc/testsuite/g++.dg/cpp1z/decomp50.C b/gcc/testsuite/g++.dg/cpp1z/decomp50.C
new file mode 100644
index 0000000..5400a82
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/decomp50.C
@@ -0,0 +1,51 @@
+// PR c++/92106 - ICE with structured bindings and -Wreturn-local-addr. 
+// { dg-do compile { target c++17 } }
+
+template <typename> struct B;
+template <typename _Tp> struct B<_Tp *> { typedef _Tp& reference; };
+struct C {
+  template <typename _Up> using rebind = _Up *;
+};
+template <typename _Iterator, typename> class D {
+public:
+  typename B<_Iterator>::reference operator*();
+  void operator++();
+};
+
+template <typename _Iterator, typename _Container>
+bool operator!=(D<_Iterator, _Container>, D<_Iterator, _Container>);
+template <typename _Tp> class F {
+public:
+  typedef _Tp value_type;
+};
+
+template <typename _Alloc> struct G {
+  template <typename _Tp> struct H { using type = C::rebind<_Tp>; };
+  using const_pointer = typename H<typename _Alloc::value_type>::type;
+};
+template <typename _Tp, typename _Alloc = F<_Tp>> class I {
+  typedef D<typename G<_Alloc>::const_pointer, int> const_iterator;
+
+public:
+  const_iterator begin();
+  const_iterator end();
+};
+
+struct A {
+  struct J {
+    int name;
+    int value;
+  };
+  I<J> members;
+  template <typename Key> const int *find(Key) {
+    for (const auto &[name, value] : members)
+      // See <https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01107.html>
+      // for why we don't warn here.
+      return &value; // { dg-bogus "address of local variable" }
+    return nullptr;
+  }
+};
+int main() {
+  A a;
+  a.find("");
+}
-- 
cgit v1.1


From afa8c090bf5ee17d89628b4885efad3a7ea62505 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Mon, 21 Oct 2019 18:45:45 +0000
Subject: PR c++/92062 - ODR-use ignored for static member of class template.

has_value_dependent_address wasn't stripping location wrappers so it
gave the wrong answer for "&x" in the static_assert.  That led us to
thinking that the expression isn't instantiation-dependent, and we
skipped static initialization of A<0>::x.

This patch adds stripping so that has_value_dependent_address gives the
same answer as it used to before the location wrappers addition.

	* pt.c (has_value_dependent_address): Strip location wrappers.

	* g++.dg/cpp0x/constexpr-odr1.C: New test.
	* g++.dg/cpp0x/constexpr-odr2.C: New test.

From-SVN: r277266
---
 gcc/cp/ChangeLog                            |  5 +++++
 gcc/cp/pt.c                                 |  2 ++
 gcc/testsuite/ChangeLog                     |  6 ++++++
 gcc/testsuite/g++.dg/cpp0x/constexpr-odr1.C | 19 +++++++++++++++++++
 gcc/testsuite/g++.dg/cpp0x/constexpr-odr2.C | 19 +++++++++++++++++++
 5 files changed, 51 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-odr1.C
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-odr2.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 29c6bbd..f861fb3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-21  Marek Polacek  <polacek@redhat.com>
 
+	PR c++/92062 - ODR-use ignored for static member of class template.
+	* pt.c (has_value_dependent_address): Strip location wrappers.
+
+2019-10-21  Marek Polacek  <polacek@redhat.com>
+
 	PR c++/92106 - ICE with structured bindings and -Wreturn-local-addr.
 	* typeck.c (maybe_warn_about_returning_address_of_local): Avoid
 	recursing on null initializer and return false instead.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7f7f992..e154cac 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6542,6 +6542,8 @@ check_valid_ptrmem_cst_expr (tree type, tree expr,
 static bool
 has_value_dependent_address (tree op)
 {
+  STRIP_ANY_LOCATION_WRAPPER (op);
+
   /* We could use get_inner_reference here, but there's no need;
      this is only relevant for template non-type arguments, which
      can only be expressed as &id-expression.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7365a39..ba280a1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-21  Marek Polacek  <polacek@redhat.com>
 
+	PR c++/92062 - ODR-use ignored for static member of class template.
+	* g++.dg/cpp0x/constexpr-odr1.C: New test.
+	* g++.dg/cpp0x/constexpr-odr2.C: New test.
+
+2019-10-21  Marek Polacek  <polacek@redhat.com>
+
 	PR c++/92106 - ICE with structured bindings and -Wreturn-local-addr.
 	* g++.dg/cpp1z/decomp50.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-odr1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-odr1.C
new file mode 100644
index 0000000..cf3f95f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-odr1.C
@@ -0,0 +1,19 @@
+// PR c++/92062 - ODR-use ignored for static member of class template.
+// { dg-do run { target c++11 } }
+
+template<int> struct A {
+  static const bool x;
+  static_assert(&x, ""); // odr-uses A<...>::x
+};
+
+int g;
+
+template<int I>
+const bool A<I>::x = (g = 42, false);
+
+void f(A<0>) {}        // A<0> must be complete, so is instantiated
+int main()
+{
+  if (g != 42)
+    __builtin_abort ();
+}
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-odr2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-odr2.C
new file mode 100644
index 0000000..0927488
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-odr2.C
@@ -0,0 +1,19 @@
+// PR c++/92062 - ODR-use ignored for static member of class template.
+// { dg-do run { target c++11 } }
+
+template<int> struct A {
+  static const bool x;
+  enum { force_instantiation =! &x}; // odr-uses A<...>::x
+};
+
+int g;
+
+template<int I>
+const bool A<I>::x = (g = 42, false);
+
+void f(A<0>) {}        // A<0> must be complete, so is instantiated
+int main()
+{
+  if (g != 42)
+    __builtin_abort ();
+}
-- 
cgit v1.1


From 5b884e9400741569ee385f0de4590c1730aa600c Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 21 Oct 2019 20:51:43 +0200
Subject: re PR c++/92015 (internal compiler error: in
 cxx_eval_array_reference, at cp/constexpr.c:2568)

	PR c++/92015
	* constexpr.c (cxx_eval_component_reference, cxx_eval_bit_field_ref):
	Use STRIP_ANY_LOCATION_WRAPPER on CONSTRUCTOR elts.

	* g++.dg/cpp0x/constexpr-92015.C: New test.

From-SVN: r277267
---
 gcc/cp/ChangeLog                             | 6 ++++++
 gcc/cp/constexpr.c                           | 6 +++++-
 gcc/testsuite/ChangeLog                      | 5 +++++
 gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C | 7 +++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f861fb3..593510f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/92015
+	* constexpr.c (cxx_eval_component_reference, cxx_eval_bit_field_ref):
+	Use STRIP_ANY_LOCATION_WRAPPER on CONSTRUCTOR elts.
+
 2019-10-21  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/92062 - ODR-use ignored for static member of class template.
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 46d41ec..60d4b9a 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -2887,7 +2887,10 @@ cxx_eval_component_reference (const constexpr_ctx *ctx, tree t,
 	  : field == part)
 	{
 	  if (value)
-	    return value;
+	    {
+	      STRIP_ANY_LOCATION_WRAPPER (value);
+	      return value;
+	    }
 	  else
 	    /* We're in the middle of initializing it.  */
 	    break;
@@ -2977,6 +2980,7 @@ cxx_eval_bit_field_ref (const constexpr_ctx *ctx, tree t,
   FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (whole), i, field, value)
     {
       tree bitpos = bit_position (field);
+      STRIP_ANY_LOCATION_WRAPPER (value);
       if (bitpos == start && DECL_SIZE (field) == TREE_OPERAND (t, 1))
 	return value;
       if (TREE_CODE (TREE_TYPE (field)) == INTEGER_TYPE
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ba280a1..3f4e6c5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/92015
+	* g++.dg/cpp0x/constexpr-92015.C: New test.
+
 2019-10-21  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/92062 - ODR-use ignored for static member of class template.
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C
new file mode 100644
index 0000000..60f288e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-92015.C
@@ -0,0 +1,7 @@
+// PR c++/92015
+// { dg-do compile { target c++11 } }
+
+struct S1 { char c[6] {'h', 'e', 'l', 'l', 'o', 0}; };
+struct S2 { char c[6] = "hello"; };
+static_assert (S1{}.c[0] == 'h', "");
+static_assert (S2{}.c[0] == 'h', "");
-- 
cgit v1.1


From 79cd6c7b905ca9390bc1e7c87c259a5a18cefa81 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 21 Oct 2019 19:29:41 +0000
Subject: parser.c (cp_parser_class_head): Improve error recovery upon extra
 qualification error.

/cp
2019-10-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* parser.c (cp_parser_class_head): Improve error recovery upon
	extra qualification error.

/testsuite
2019-10-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/parse/qualified2.C: Tighten dg-error directive.
	* g++.old-deja/g++.other/decl5.C: Don't expect redundant error.

From-SVN: r277268
---
 gcc/cp/ChangeLog                             | 5 +++++
 gcc/cp/parser.c                              | 8 ++------
 gcc/testsuite/ChangeLog                      | 5 +++++
 gcc/testsuite/g++.dg/parse/qualified2.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.other/decl5.C | 7 +++----
 5 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 593510f..19a687a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* parser.c (cp_parser_class_head): Improve error recovery upon
+	extra qualification error.
+
 2019-10-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/92015
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 450b144..6433f87 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -24178,12 +24178,8 @@ cp_parser_class_head (cp_parser* parser,
 	 ... [or] the definition or explicit instantiation of a
 	 class member of a namespace outside of its namespace.  */
       if (scope == nested_name_specifier)
-	{
-	  permerror (nested_name_specifier_token_start->location,
-		     "extra qualification not allowed");
-	  nested_name_specifier = NULL_TREE;
-	  num_templates = 0;
-	}
+	permerror (nested_name_specifier_token_start->location,
+		   "extra qualification not allowed");
     }
   /* An explicit-specialization must be preceded by "template <>".  If
      it is not, try to recover gracefully.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f4e6c5..5aec5cd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/parse/qualified2.C: Tighten dg-error directive.
+	* g++.old-deja/g++.other/decl5.C: Don't expect redundant error.
+
 2019-10-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/92015
diff --git a/gcc/testsuite/g++.dg/parse/qualified2.C b/gcc/testsuite/g++.dg/parse/qualified2.C
index c582613..ef1bedb 100644
--- a/gcc/testsuite/g++.dg/parse/qualified2.C
+++ b/gcc/testsuite/g++.dg/parse/qualified2.C
@@ -1,4 +1,4 @@
 namespace Glib {
   template <typename> class Value {};
-  template <>         class Glib::Value<int> {}; // { dg-error "" }
+  template <>         class Glib::Value<int> {}; // { dg-error "29:extra qualification" }
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.other/decl5.C b/gcc/testsuite/g++.old-deja/g++.other/decl5.C
index 6d22932..26556aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/decl5.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/decl5.C
@@ -8,11 +8,10 @@
 
 
 struct A {
-  int A::fn();        // { dg-error "extra qualification" } 
-  int A::m;           // { dg-error "extra qualification" } 
+  int A::fn();        // { dg-error "7:extra qualification" } 
+  int A::m;           // { dg-error "7:extra qualification" } 
   struct e;
-  struct A::e {int i;}; // { dg-error "extra qualification" "qual" } 
-  // { dg-error "anonymous struct" "anon" { target *-*-* } .-1 }
+  struct A::e {int i;}; // { dg-error "10:extra qualification" "qual" } 
   struct A::expand {  // { dg-error "qualified name" } 
   int m;
   };
-- 
cgit v1.1


From debf1662d1f0cbe54198119f1a74baf46ad6a41a Mon Sep 17 00:00:00 2001
From: Kamlesh Kumar <kamleshbhalui@gmail.com>
Date: Mon, 21 Oct 2019 20:19:28 +0000
Subject: PR c++/83434 - typeinfo for noexcept function lacks noexcept
 information

2019-10-21  Kamlesh Kumar  <kamleshbhalui@gmail.com>

        * rtti.c (get_tinfo_decl_dynamic): Do not call
        TYPE_MAIN_VARIANT for function.
        (get_typeid): Likewise.

        * g++.dg/rtti/pr83534.C: New Test.

Reviewed-by: Jason Merrill <jason@redhat.com>

Co-Authored-By: Jason Merrill <jason@redhat.com>

From-SVN: r277270
---
 gcc/cp/ChangeLog                    |  8 ++++++++
 gcc/cp/rtti.c                       |  8 ++++----
 gcc/testsuite/g++.dg/rtti/pr83534.C | 13 +++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/rtti/pr83534.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 19a687a..4218901 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-21  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	PR c++/83434 - typeinfo of noexcept function
+	* rtti.c (get_tinfo_decl_dynamic): Do not call
+	TYPE_MAIN_VARIANT for function.
+	(get_typeid): Likewise.
+
 2019-10-21  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* parser.c (cp_parser_class_head): Improve error recovery upon
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index eb1b062..c905799 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -272,11 +272,11 @@ get_tinfo_decl_dynamic (tree exp, tsubst_flags_t complain)
 
   exp = resolve_nondeduced_context (exp, complain);
 
-  /* peel back references, so they match.  */
+  /* Peel back references, so they match.  */
   type = non_reference (unlowered_expr_type (exp));
 
   /* Peel off cv qualifiers.  */
-  type = TYPE_MAIN_VARIANT (type);
+  type = cv_unqualified (type);
 
   /* For UNKNOWN_TYPEs call complete_type_or_else to get diagnostics.  */
   if (CLASS_TYPE_P (type) || type == unknown_type_node
@@ -300,7 +300,7 @@ get_tinfo_decl_dynamic (tree exp, tsubst_flags_t complain)
     }
   else
     /* Otherwise return the type_info for the static type of the expr.  */
-    t = get_tinfo_ptr (TYPE_MAIN_VARIANT (type));
+    t = get_tinfo_ptr (type);
 
   return cp_build_fold_indirect_ref (t);
 }
@@ -518,7 +518,7 @@ get_typeid (tree type, tsubst_flags_t complain)
 
   /* The top-level cv-qualifiers of the lvalue expression or the type-id
      that is the operand of typeid are always ignored.  */
-  type = TYPE_MAIN_VARIANT (type);
+  type = cv_unqualified (type);
 
   /* For UNKNOWN_TYPEs call complete_type_or_else to get diagnostics.  */
   if (CLASS_TYPE_P (type) || type == unknown_type_node
diff --git a/gcc/testsuite/g++.dg/rtti/pr83534.C b/gcc/testsuite/g++.dg/rtti/pr83534.C
new file mode 100644
index 0000000..af5f02e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/rtti/pr83534.C
@@ -0,0 +1,13 @@
+// { dg-options "-std=c++17" }
+// { dg-do run }
+
+#include <typeinfo>
+
+void f1();
+void f2() noexcept;
+int main() {
+  if((typeid(void()) == typeid(void ()noexcept))
+     || (typeid(&f1) == typeid(&f2))
+     || (typeid(f1) == typeid(f2)))
+    __builtin_abort();
+}
-- 
cgit v1.1


From c01d9cfe840a1b9c5e6fa68f5af4fe321263bc7f Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Mon, 21 Oct 2019 20:44:16 +0000
Subject: expr.c (expand_expr_real_2): Don't widen constant op1 when expanding
 widening multiplication.

2019-10-21  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* expr.c (expand_expr_real_2): Don't widen constant op1 when expanding
	widening multiplication.

From-SVN: r277271
---
 gcc/ChangeLog | 5 +++++
 gcc/expr.c    | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5012177..2aa5536 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-21  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* expr.c (expand_expr_real_2): Don't widen constant op1 when expanding
+	widening multiplication.
+
 2019-10-21  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/iterators.md (t2_binop0): Fix typo in comment.
diff --git a/gcc/expr.c b/gcc/expr.c
index b54bf1d..476c686 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -8954,9 +8954,6 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode,
 		     != INTEGER_CST check.  Handle it.  */
 		  if (GET_MODE (op0) == VOIDmode && GET_MODE (op1) == VOIDmode)
 		    goto widen_mult_const;
-		  if (TREE_CODE (treeop1) == INTEGER_CST)
-		    op1 = convert_modes (mode, word_mode, op1,
-					 TYPE_UNSIGNED (TREE_TYPE (treeop1)));
 		  temp = expand_binop (mode, other_optab, op0, op1, target,
 				       unsignedp, OPTAB_LIB_WIDEN);
 		  hipart = gen_highpart (word_mode, temp);
-- 
cgit v1.1


From 0bfdd2d4f97ee20288137f2ef8e510ba531d2b65 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Tue, 22 Oct 2019 00:16:18 +0000
Subject: Daily bump.

From-SVN: r277276
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index f20c6fc..3156713 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191021
+20191022
-- 
cgit v1.1


From d720518f39c7716e3fe21fb4976b5b25d6365d20 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 21 Oct 2019 23:09:41 -0400
Subject: lock-and-run.sh: Check for process existence rather than timeout.

	* lock-and-run.sh: Check for process existence rather than timeout.

Matthias Klose noted that on less powerful targets, a link might take more
than 5 minutes; he mentions a figure of 3 hours for an LTO link.  So this
patch changes the timeout to a check for whether the locking process still
exists.  If the lock exists in an erroneous state (no pid file or can't
signal the pid) for 30 sec, steal it.

From-SVN: r277277
---
 gcc/ChangeLog       |  4 ++++
 gcc/lock-and-run.sh | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2aa5536..5e6c662 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-21  Jason Merrill  <jason@redhat.com>
+
+	* lock-and-run.sh: Check for process existence rather than timeout.
+
 2019-10-21  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* expr.c (expand_expr_real_2): Don't widen constant op1 when expanding
diff --git a/gcc/lock-and-run.sh b/gcc/lock-and-run.sh
index 3a6a84c..22bc436 100644
--- a/gcc/lock-and-run.sh
+++ b/gcc/lock-and-run.sh
@@ -1,33 +1,49 @@
 #! /bin/sh
-# Shell-based mutex using mkdir.
+# Shell-based mutex using mkdir.  This script is used in make to prefer
+# serialized execution to avoid consuming too much RAM.  If reusing it,
+# bear in mind that the lock-breaking logic is not race-free, so disable
+# it in err() if concurrent execution could cause more serious problems.
 
+self=`basename $0`
 lockdir="$1" prog="$2"; shift 2 || exit 1
 
 # Remember when we started trying to acquire the lock.
 count=0
-touch lock-stamp.$$
 
-trap 'rm -r "$lockdir" lock-stamp.$$' 0
+err () {
+    if test -f $lockdir/lock-$1.$$; then
+	echo "$self: *** (PID $$) removing stale $lockdir" >&2
+	rm -rf $lockdir
+	# Possible variant for uses where races are more problematic:
+	#echo "$self: *** (PID $$) giving up, maybe rm -r $lockdir" >&2
+	#exit 42
+    else
+	touch $lockdir/lock-$1.$$
+    fi
+}
 
 until mkdir "$lockdir" 2>/dev/null; do
     # Say something periodically so the user knows what's up.
     if [ `expr $count % 30` = 0 ]; then
-	# Reset if the lock has been renewed.
-	if [ -n "`find \"$lockdir\" -newer lock-stamp.$$`" ]; then
-	    touch lock-stamp.$$
-	    count=1
-	# Steal the lock after 5 minutes.
-	elif [ $count = 300 ]; then
-	    echo removing stale $lockdir >&2
-	    rm -r "$lockdir"
+	# Check for valid lock.
+	if pid=`cat $lockdir/pid 2>/dev/null` && kill -0 $pid 2>/dev/null; then
+	    echo "$self: (PID $$) waiting $count sec to acquire $lockdir from PID $pid" >&2
+	elif test -z "$pid"; then
+	    echo "$self: (PID $$) cannot read $lockdir/pid" >&2
+	    err nopid
 	else
-	    echo waiting to acquire $lockdir >&2
+	    echo "$self: (PID $$) cannot signal $lockdir owner PID $pid" >&2
+	    err dead
 	fi
     fi
     sleep 1
     count=`expr $count + 1`
 done
 
+trap 'rm -rf "$lockdir"' 0
+echo $$ > $lockdir/pidT && mv $lockdir/pidT $lockdir/pid
+echo "$self: (PID $$) acquired $lockdir after $count seconds" >&2
+
 echo $prog "$@"
 $prog "$@"
 
-- 
cgit v1.1


From 8c72657917ad7b9160c36a5b7b240b3389da8eec Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Mon, 21 Oct 2019 23:30:48 -0400
Subject: * lock-and-run.sh: Tweak command order.

From-SVN: r277279
---
 gcc/lock-and-run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/lock-and-run.sh b/gcc/lock-and-run.sh
index 22bc436..a1360ad 100644
--- a/gcc/lock-and-run.sh
+++ b/gcc/lock-and-run.sh
@@ -12,8 +12,9 @@ count=0
 
 err () {
     if test -f $lockdir/lock-$1.$$; then
-	echo "$self: *** (PID $$) removing stale $lockdir" >&2
 	rm -rf $lockdir
+	echo "$self: *** (PID $$) removed stale $lockdir" >&2
+
 	# Possible variant for uses where races are more problematic:
 	#echo "$self: *** (PID $$) giving up, maybe rm -r $lockdir" >&2
 	#exit 42
-- 
cgit v1.1


From 24b54eb2fd9ee616d899683a459756072e3a1c4d Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Tue, 22 Oct 2019 03:40:26 +0000
Subject: [testsuite] Make the Wnonnull independent of system headers.

To avoid the result of this test depending on the implementation of
the system 'string.h', provide prototypes for the two functions used
in the test.

gcc/testsuite/ChangeLog:

2019-10-22  Iain Sandoe  <iain@sandoe.co.uk>

	* gcc.dg/Wnonnull.c: Provide prototypes for strlen and memcpy.
	Use __SIZE_TYPE__ instead of size_t.

From-SVN: r277280
---
 gcc/testsuite/ChangeLog         |  5 +++++
 gcc/testsuite/gcc.dg/Wnonnull.c | 16 +++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5aec5cd..d63c7b5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-22  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* gcc.dg/Wnonnull.c: Provide prototypes for strlen and memcpy.
+	Use __SIZE_TYPE__ instead of size_t.
+
 2019-10-21  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.dg/parse/qualified2.C: Tighten dg-error directive.
diff --git a/gcc/testsuite/gcc.dg/Wnonnull.c b/gcc/testsuite/gcc.dg/Wnonnull.c
index a165baa..0ed06aa 100644
--- a/gcc/testsuite/gcc.dg/Wnonnull.c
+++ b/gcc/testsuite/gcc.dg/Wnonnull.c
@@ -2,16 +2,10 @@
    { dg-do compile }
    { dg-options "-O2 -Wall" } */
 
-#ifndef __APPLE__
-#include <string.h>
-#else
-/* OSX headers do not mark up the nonnull elements yet.  */
-# include <stddef.h>
-extern size_t strlen (const char *__s)
-		      __attribute ((pure)) __attribute ((nonnull (1)));
+extern __SIZE_TYPE__ strlen (const char *__s)
+			     __attribute ((pure)) __attribute ((nonnull (1)));
 extern void *memcpy (void *__restrict __dest, const void *__restrict __src,
-		     size_t __n) __attribute ((nonnull (1, 2)));
-#endif
+		     __SIZE_TYPE__ __n) __attribute ((nonnull (1, 2)));
 
 char buf[100];
 
@@ -23,9 +17,9 @@ struct Test
 
 __attribute ((nonnull (1, 2)))
 inline char*
-my_strcpy (char *restrict dst, const char *restrict src, size_t size)
+my_strcpy (char *restrict dst, const char *restrict src, __SIZE_TYPE__ size)
 {
-  size_t len = strlen (src);        /* { dg-warning "argument 1 null where non-null expected" } */
+  __SIZE_TYPE__ len = strlen (src); /* { dg-warning "argument 1 null where non-null expected" } */
   if (len < size)
     memcpy (dst, src, len + 1);     /* { dg-warning "argument 2 null where non-null expected" } */
   else
-- 
cgit v1.1


From 10bce48f104de56503b17954ed79f019df3252e3 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Tue, 22 Oct 2019 07:47:07 +0000
Subject: [C++] Avoid exposing internal details in aka types

This patch extends r276951 to work for C++ too.

2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>

gcc/cp/
	* cp-tree.h (STF_USER_VISIBLE): New constant.
	(strip_typedefs, strip_typedefs_expr): Take a flags argument.
	* tree.c (strip_typedefs, strip_typedefs_expr): Likewise,
	updating mutual calls accordingly.  When STF_USER_VISIBLE is true,
	only look through typedefs if user_facing_original_type_p.
	* error.c (dump_template_bindings, type_to_string): Pass
	STF_USER_VISIBLE to strip_typedefs.
	(dump_type): Likewise, unless pp_c_flag_gnu_v3 is set.

gcc/testsuite/
	* g++.dg/diagnostic/aka5.h: New test.
	* g++.dg/diagnostic/aka5a.C: Likewise.
	* g++.dg/diagnostic/aka5b.C: Likewise.
	* g++.target/aarch64/diag_aka_1.C: Likewise.

From-SVN: r277281
---
 gcc/cp/ChangeLog                              |  11 +++
 gcc/cp/cp-tree.h                              |  13 ++-
 gcc/cp/error.c                                |  10 +-
 gcc/cp/tree.c                                 |  80 +++++++++-------
 gcc/testsuite/ChangeLog                       |   7 ++
 gcc/testsuite/g++.dg/diagnostic/aka5.h        |  22 +++++
 gcc/testsuite/g++.dg/diagnostic/aka5a.C       | 127 ++++++++++++++++++++++++++
 gcc/testsuite/g++.dg/diagnostic/aka5b.C       | 127 ++++++++++++++++++++++++++
 gcc/testsuite/g++.target/aarch64/diag_aka_1.C |  13 +++
 9 files changed, 372 insertions(+), 38 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/diagnostic/aka5.h
 create mode 100644 gcc/testsuite/g++.dg/diagnostic/aka5a.C
 create mode 100644 gcc/testsuite/g++.dg/diagnostic/aka5b.C
 create mode 100644 gcc/testsuite/g++.target/aarch64/diag_aka_1.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4218901..2b15bf7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* cp-tree.h (STF_USER_VISIBLE): New constant.
+	(strip_typedefs, strip_typedefs_expr): Take a flags argument.
+	* tree.c (strip_typedefs, strip_typedefs_expr): Likewise,
+	updating mutual calls accordingly.  When STF_USER_VISIBLE is true,
+	only look through typedefs if user_facing_original_type_p.
+	* error.c (dump_template_bindings, type_to_string): Pass
+	STF_USER_VISIBLE to strip_typedefs.
+	(dump_type): Likewise, unless pp_c_flag_gnu_v3 is set.
+
 2019-10-21  Kamlesh Kumar  <kamleshbhalui@gmail.com>
 	    Jason Merrill  <jason@redhat.com>
 
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 8c11ac5..e9d5446 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -5722,6 +5722,13 @@ enum auto_deduction_context
 #define TFF_NO_TEMPLATE_BINDINGS		(1 << 13)
 #define TFF_POINTER		                (1 << 14)
 
+/* These constants can be used as bit flags to control strip_typedefs.
+
+   STF_USER_VISIBLE: use heuristics to try to avoid stripping user-facing
+       aliases of internal details.  This is intended for diagnostics,
+       where it should (for example) give more useful "aka" types.  */
+const unsigned int STF_USER_VISIBLE = 1U;
+
 /* Returns the TEMPLATE_DECL associated to a TEMPLATE_TEMPLATE_PARM
    node.  */
 #define TEMPLATE_TEMPLATE_PARM_TEMPLATE_DECL(NODE)	\
@@ -7259,8 +7266,10 @@ extern int zero_init_p				(const_tree);
 extern bool check_abi_tag_redeclaration		(const_tree, const_tree,
 						 const_tree);
 extern bool check_abi_tag_args			(tree, tree);
-extern tree strip_typedefs			(tree, bool * = NULL);
-extern tree strip_typedefs_expr			(tree, bool * = NULL);
+extern tree strip_typedefs			(tree, bool * = NULL,
+						 unsigned int = 0);
+extern tree strip_typedefs_expr			(tree, bool * = NULL,
+						 unsigned int = 0);
 extern tree copy_binfo				(tree, tree, tree,
 						 tree *, int);
 extern int member_p				(const_tree);
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 30166f9..83b8b12 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -410,7 +410,7 @@ dump_template_bindings (cxx_pretty_printer *pp, tree parms, tree args,
       pop_deferring_access_checks ();
       /* Strip typedefs.  We can't just use TFF_CHASE_TYPEDEF because
 	 pp_simple_type_specifier doesn't know about it.  */
-      t = strip_typedefs (t);
+      t = strip_typedefs (t, NULL, STF_USER_VISIBLE);
       dump_type (pp, t, TFF_PLAIN_IDENTIFIER);
     }
 }
@@ -449,7 +449,11 @@ dump_type (cxx_pretty_printer *pp, tree t, int flags)
 	       || DECL_SELF_REFERENCE_P (decl)
 	       || (!flag_pretty_templates
 		   && DECL_LANG_SPECIFIC (decl) && DECL_TEMPLATE_INFO (decl)))
-	t = strip_typedefs (t);
+	{
+	  unsigned int stf_flags = (!(pp->flags & pp_c_flag_gnu_v3)
+				    ? STF_USER_VISIBLE : 0);
+	  t = strip_typedefs (t, NULL, stf_flags);
+	}
       else if (alias_template_specialization_p (t))
 	{
 	  dump_alias_template_specialization (pp, t, flags);
@@ -3205,7 +3209,7 @@ type_to_string (tree typ, int verbose, bool postprocessed, bool *quote,
       && !uses_template_parms (typ))
     {
       int aka_start, aka_len; char *p;
-      tree aka = strip_typedefs (typ);
+      tree aka = strip_typedefs (typ, NULL, STF_USER_VISIBLE);
       if (quote && *quote)
 	pp_end_quote (cxx_pp, show_color);
       pp_string (cxx_pp, " {aka");
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index a004bb1..9d63736 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1431,7 +1431,10 @@ apply_identity_attributes (tree result, tree attribs, bool *remove_attributes)
   return cp_build_type_attribute_variant (result, new_attribs);
 }
 
-/* Builds a qualified variant of T that is not a typedef variant.
+/* Builds a qualified variant of T that is either not a typedef variant
+   (the default behavior) or not a typedef variant of a user-facing type
+   (if FLAGS contains STF_USER_FACING).
+
    E.g. consider the following declarations:
      typedef const int ConstInt;
      typedef ConstInt* PtrConstInt;
@@ -1456,7 +1459,7 @@ apply_identity_attributes (tree result, tree attribs, bool *remove_attributes)
    stripped.  */
 
 tree
-strip_typedefs (tree t, bool *remove_attributes)
+strip_typedefs (tree t, bool *remove_attributes, unsigned int flags)
 {
   tree result = NULL, type = NULL, t0 = NULL;
 
@@ -1471,7 +1474,7 @@ strip_typedefs (tree t, bool *remove_attributes)
       for (; t; t = TREE_CHAIN (t))
 	{
 	  gcc_assert (!TREE_PURPOSE (t));
-	  tree elt = strip_typedefs (TREE_VALUE (t), remove_attributes);
+	  tree elt = strip_typedefs (TREE_VALUE (t), remove_attributes, flags);
 	  if (elt != TREE_VALUE (t))
 	    changed = true;
 	  vec_safe_push (vec, elt);
@@ -1494,28 +1497,29 @@ strip_typedefs (tree t, bool *remove_attributes)
   switch (TREE_CODE (t))
     {
     case POINTER_TYPE:
-      type = strip_typedefs (TREE_TYPE (t), remove_attributes);
+      type = strip_typedefs (TREE_TYPE (t), remove_attributes, flags);
       result = build_pointer_type (type);
       break;
     case REFERENCE_TYPE:
-      type = strip_typedefs (TREE_TYPE (t), remove_attributes);
+      type = strip_typedefs (TREE_TYPE (t), remove_attributes, flags);
       result = cp_build_reference_type (type, TYPE_REF_IS_RVALUE (t));
       break;
     case OFFSET_TYPE:
-      t0 = strip_typedefs (TYPE_OFFSET_BASETYPE (t), remove_attributes);
-      type = strip_typedefs (TREE_TYPE (t), remove_attributes);
+      t0 = strip_typedefs (TYPE_OFFSET_BASETYPE (t), remove_attributes, flags);
+      type = strip_typedefs (TREE_TYPE (t), remove_attributes, flags);
       result = build_offset_type (t0, type);
       break;
     case RECORD_TYPE:
       if (TYPE_PTRMEMFUNC_P (t))
 	{
-	  t0 = strip_typedefs (TYPE_PTRMEMFUNC_FN_TYPE (t), remove_attributes);
+	  t0 = strip_typedefs (TYPE_PTRMEMFUNC_FN_TYPE (t),
+			       remove_attributes, flags);
 	  result = build_ptrmemfunc_type (t0);
 	}
       break;
     case ARRAY_TYPE:
-      type = strip_typedefs (TREE_TYPE (t), remove_attributes);
-      t0  = strip_typedefs (TYPE_DOMAIN (t), remove_attributes);
+      type = strip_typedefs (TREE_TYPE (t), remove_attributes, flags);
+      t0  = strip_typedefs (TYPE_DOMAIN (t), remove_attributes, flags);
       result = build_cplus_array_type (type, t0);
       break;
     case FUNCTION_TYPE:
@@ -1534,7 +1538,7 @@ strip_typedefs (tree t, bool *remove_attributes)
 	    && (TYPE_ATTRIBUTES (t) || TYPE_USER_ALIGN (t)))
 	  is_variant = true;
 
-	type = strip_typedefs (TREE_TYPE (t), remove_attributes);
+	type = strip_typedefs (TREE_TYPE (t), remove_attributes, flags);
 	tree canon_spec = (flag_noexcept_type
 			   ? canonical_eh_spec (TYPE_RAISES_EXCEPTIONS (t))
 			   : NULL_TREE);
@@ -1548,7 +1552,7 @@ strip_typedefs (tree t, bool *remove_attributes)
 	    if (arg_node == void_list_node)
 	      break;
 	    arg_type = strip_typedefs (TREE_VALUE (arg_node),
-				       remove_attributes);
+				       remove_attributes, flags);
 	    gcc_assert (arg_type);
 	    if (arg_type == TREE_VALUE (arg_node) && !changed)
 	      continue;
@@ -1612,9 +1616,10 @@ strip_typedefs (tree t, bool *remove_attributes)
 		tree arg = TREE_VEC_ELT (args, i);
 		tree strip_arg;
 		if (TYPE_P (arg))
-		  strip_arg = strip_typedefs (arg, remove_attributes);
+		  strip_arg = strip_typedefs (arg, remove_attributes, flags);
 		else
-		  strip_arg = strip_typedefs_expr (arg, remove_attributes);
+		  strip_arg = strip_typedefs_expr (arg, remove_attributes,
+						   flags);
 		TREE_VEC_ELT (new_args, i) = strip_arg;
 		if (strip_arg != arg)
 		  changed = true;
@@ -1630,7 +1635,7 @@ strip_typedefs (tree t, bool *remove_attributes)
 	    else
 	      ggc_free (new_args);
 	  }
-	tree ctx = strip_typedefs (TYPE_CONTEXT (t), remove_attributes);
+	tree ctx = strip_typedefs (TYPE_CONTEXT (t), remove_attributes, flags);
 	if (!changed && ctx == TYPE_CONTEXT (t) && !typedef_variant_p (t))
 	  return t;
 	tree name = fullname;
@@ -1643,7 +1648,7 @@ strip_typedefs (tree t, bool *remove_attributes)
       break;
     case DECLTYPE_TYPE:
       result = strip_typedefs_expr (DECLTYPE_TYPE_EXPR (t),
-				    remove_attributes);
+				    remove_attributes, flags);
       if (result == DECLTYPE_TYPE_EXPR (t))
 	result = NULL_TREE;
       else
@@ -1653,7 +1658,8 @@ strip_typedefs (tree t, bool *remove_attributes)
 		   tf_none));
       break;
     case UNDERLYING_TYPE:
-      type = strip_typedefs (UNDERLYING_TYPE_TYPE (t), remove_attributes);
+      type = strip_typedefs (UNDERLYING_TYPE_TYPE (t),
+			     remove_attributes, flags);
       result = finish_underlying_type (type);
       break;
     default:
@@ -1664,15 +1670,18 @@ strip_typedefs (tree t, bool *remove_attributes)
     {
       if (typedef_variant_p (t))
 	{
-	  /* Explicitly get the underlying type, as TYPE_MAIN_VARIANT doesn't
-	     strip typedefs with attributes.  */
-	  result = TYPE_MAIN_VARIANT (DECL_ORIGINAL_TYPE (TYPE_NAME (t)));
-	  result = strip_typedefs (result);
+	  if ((flags & STF_USER_VISIBLE)
+	      && !user_facing_original_type_p (t))
+	    return t;
+	  result = strip_typedefs (DECL_ORIGINAL_TYPE (TYPE_NAME (t)),
+				   remove_attributes, flags);
 	}
       else
 	result = TYPE_MAIN_VARIANT (t);
     }
-  gcc_assert (!typedef_variant_p (result));
+  gcc_assert (!typedef_variant_p (result)
+	      || ((flags & STF_USER_VISIBLE)
+		  && !user_facing_original_type_p (result)));
 
   if (COMPLETE_TYPE_P (result) && !COMPLETE_TYPE_P (t))
   /* If RESULT is complete and T isn't, it's likely the case that T
@@ -1721,7 +1730,7 @@ strip_typedefs (tree t, bool *remove_attributes)
    sizeof(TT) is replaced by sizeof(T).  */
 
 tree
-strip_typedefs_expr (tree t, bool *remove_attributes)
+strip_typedefs_expr (tree t, bool *remove_attributes, unsigned int flags)
 {
   unsigned i,n;
   tree r, type, *ops;
@@ -1738,7 +1747,7 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
   /* Some expressions have type operands, so let's handle types here rather
      than check TYPE_P in multiple places below.  */
   if (TYPE_P (t))
-    return strip_typedefs (t, remove_attributes);
+    return strip_typedefs (t, remove_attributes, flags);
 
   code = TREE_CODE (t);
   switch (code)
@@ -1752,8 +1761,10 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
 
     case TRAIT_EXPR:
       {
-	tree type1 = strip_typedefs (TRAIT_EXPR_TYPE1 (t), remove_attributes);
-	tree type2 = strip_typedefs (TRAIT_EXPR_TYPE2 (t), remove_attributes);
+	tree type1 = strip_typedefs (TRAIT_EXPR_TYPE1 (t),
+				     remove_attributes, flags);
+	tree type2 = strip_typedefs (TRAIT_EXPR_TYPE2 (t),
+				     remove_attributes, flags);
 	if (type1 == TRAIT_EXPR_TYPE1 (t)
 	    && type2 == TRAIT_EXPR_TYPE2 (t))
 	  return t;
@@ -1770,7 +1781,8 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
 	tree it;
 	for (it = t; it; it = TREE_CHAIN (it))
 	  {
-	    tree val = strip_typedefs_expr (TREE_VALUE (it), remove_attributes);
+	    tree val = strip_typedefs_expr (TREE_VALUE (it),
+					    remove_attributes, flags);
 	    vec_safe_push (vec, val);
 	    if (val != TREE_VALUE (it))
 	      changed = true;
@@ -1796,7 +1808,7 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
 	for (i = 0; i < n; ++i)
 	  {
 	    tree op = strip_typedefs_expr (TREE_VEC_ELT (t, i),
-					   remove_attributes);
+					   remove_attributes, flags);
 	    vec->quick_push (op);
 	    if (op != TREE_VEC_ELT (t, i))
 	      changed = true;
@@ -1820,18 +1832,19 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
 	vec<constructor_elt, va_gc> *vec
 	  = vec_safe_copy (CONSTRUCTOR_ELTS (t));
 	n = CONSTRUCTOR_NELTS (t);
-	type = strip_typedefs (TREE_TYPE (t), remove_attributes);
+	type = strip_typedefs (TREE_TYPE (t), remove_attributes, flags);
 	for (i = 0; i < n; ++i)
 	  {
 	    constructor_elt *e = &(*vec)[i];
-	    tree op = strip_typedefs_expr (e->value, remove_attributes);
+	    tree op = strip_typedefs_expr (e->value, remove_attributes, flags);
 	    if (op != e->value)
 	      {
 		changed = true;
 		e->value = op;
 	      }
 	    gcc_checking_assert
-	      (e->index == strip_typedefs_expr (e->index, remove_attributes));
+	      (e->index == strip_typedefs_expr (e->index, remove_attributes,
+						flags));
 	  }
 
 	if (!changed && type == TREE_TYPE (t))
@@ -1875,12 +1888,13 @@ strip_typedefs_expr (tree t, bool *remove_attributes)
     case REINTERPRET_CAST_EXPR:
     case CAST_EXPR:
     case NEW_EXPR:
-      type = strip_typedefs (type, remove_attributes);
+      type = strip_typedefs (type, remove_attributes, flags);
       /* fallthrough */
 
     default:
       for (i = 0; i < n; ++i)
-	ops[i] = strip_typedefs_expr (TREE_OPERAND (t, i), remove_attributes);
+	ops[i] = strip_typedefs_expr (TREE_OPERAND (t, i),
+				      remove_attributes, flags);
       break;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d63c7b5..b0edb29 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* g++.dg/diagnostic/aka5.h: New test.
+	* g++.dg/diagnostic/aka5a.C: Likewise.
+	* g++.dg/diagnostic/aka5b.C: Likewise.
+	* g++.target/aarch64/diag_aka_1.C: Likewise.
+
 2019-10-22  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* gcc.dg/Wnonnull.c: Provide prototypes for strlen and memcpy.
diff --git a/gcc/testsuite/g++.dg/diagnostic/aka5.h b/gcc/testsuite/g++.dg/diagnostic/aka5.h
new file mode 100644
index 0000000..0c7404d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/aka5.h
@@ -0,0 +1,22 @@
+#ifdef IS_SYSTEM_HEADER
+#pragma GCC system_header
+#endif
+
+typedef enum __internal_enum { A, B } user_enum;
+typedef user_enum *user_enum_ptr;
+
+typedef struct __internal_struct { int i; } user_struct;
+typedef user_struct user_struct_copy;
+typedef user_struct *user_struct_ptr;
+
+typedef union __internal_union { int i; } user_union;
+typedef user_union user_union_copy;
+typedef user_union *user_union_ptr;
+
+typedef unsigned int user_vector __attribute__((__vector_size__(16)));
+typedef user_vector user_vector_copy;
+typedef user_vector *user_vector_ptr;
+
+typedef int user_int;
+typedef user_int user_int_copy;
+typedef user_int *user_int_ptr;
diff --git a/gcc/testsuite/g++.dg/diagnostic/aka5a.C b/gcc/testsuite/g++.dg/diagnostic/aka5a.C
new file mode 100644
index 0000000..e9d4c02
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/aka5a.C
@@ -0,0 +1,127 @@
+#define IS_SYSTEM_HEADER
+#include "aka5.h"
+
+typedef user_enum user_enum_copy;
+
+struct s { int i; };
+
+user_enum ue1;
+user_enum_copy ue2;
+user_enum_ptr ue_ptr1;
+user_enum *ue_ptr2;
+const user_enum *const_ue_ptr1;
+const user_enum_copy *const_ue_ptr2;
+volatile user_enum *volatile_ue_ptr1;
+volatile user_enum_copy *volatile_ue_ptr2;
+user_enum (*ue_array_ptr1)[10];
+user_enum_copy (*ue_array_ptr2)[10];
+user_enum (*ue_fn_ptr1) (void);
+void (*ue_fn_ptr2) (user_enum);
+void (*ue_fn_ptr3) (user_enum, ...);
+user_enum_copy (*ue_fn_ptr4) (void);
+void (*ue_fn_ptr5) (user_enum_copy);
+void (*ue_fn_ptr6) (user_enum_copy, ...);
+user_enum (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr1) (void);
+user_enum_copy (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr2) (void);
+
+user_struct us1;
+user_struct_copy us2;
+user_struct_ptr us_ptr1;
+user_struct *us_ptr2;
+const user_struct *const_us_ptr1;
+const user_struct_copy *const_us_ptr2;
+
+user_union uu1;
+user_union_copy uu2;
+user_union_ptr uu_ptr1;
+user_union *uu_ptr2;
+const user_union *const_uu_ptr1;
+const user_union_copy *const_uu_ptr2;
+
+user_vector uv1;
+user_vector_copy uv2;
+user_vector_ptr uv_ptr1;
+user_vector *uv_ptr2;
+const user_vector *const_uv_ptr1;
+const user_vector_copy *const_uv_ptr2;
+
+user_int ui1;
+user_int_copy ui2;
+user_int_ptr ui_ptr1;
+user_int *ui_ptr2;
+const user_int *const_ui_ptr1;
+const user_int_copy *const_ui_ptr2;
+volatile user_int *volatile_ui_ptr1;
+volatile user_int_copy *volatile_ui_ptr2;
+user_int (*ui_array_ptr1)[10];
+user_int_copy (*ui_array_ptr2)[10];
+user_int (*ui_fn_ptr1) (void);
+void (*ui_fn_ptr2) (user_int);
+void (*ui_fn_ptr3) (user_int, ...);
+user_int_copy (*ui_fn_ptr4) (void);
+void (*ui_fn_ptr5) (user_int_copy);
+void (*ui_fn_ptr6) (user_int_copy, ...);
+user_int (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr1) (void);
+user_int_copy (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr2) (void);
+
+void f (s s1)
+{
+  ue1 = s1; // { dg-error {cannot convert 's' to 'user_enum' in assignment} }
+  ue2 = s1; // { dg-error {cannot convert 's' to 'user_enum_copy' {aka 'user_enum'} in assignment} }
+  ue_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_ptr' {aka 'user_enum\*'} in assignment} }
+  ue_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum\*' in assignment} }
+  const_ue_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_enum\*' in assignment} }
+  const_ue_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_enum_copy\*' {aka 'const user_enum\*'} in assignment} }
+  volatile_ue_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_enum\*' in assignment} }
+  volatile_ue_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_enum_copy\*' {aka 'volatile user_enum\*'} in assignment} }
+  ue_array_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum \(\*\)\[10\]' in assignment} }
+  ue_array_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy \(\*\)\[10\]' {aka 'user_enum \(\*\)\[10\]'} in assignment} }
+  ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum \(\*\)\(\)' in assignment} }
+  ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum\)' in assignment} }
+  ue_fn_ptr3 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum, \.\.\.\)' in assignment} }
+  ue_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy \(\*\)\(\)' {aka 'user_enum \(\*\)\(\)'} in assignment} }
+  ue_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(user_enum\)'} in assignment} }
+  ue_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum_copy, \.\.\.\)' {aka 'void \(\*\)\(user_enum, \.\.\.\)'} in assignment} }
+  unsafe_ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' in assignment} }
+  unsafe_ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'user_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+
+  us1 = s1; // { dg-error {no match for 'operator=' in 'us1 = s1' \(operand types are 'user_struct' and 's'\)} }
+  us2 = s1; // { dg-error {no match for 'operator=' in 'us2 = s1' \(operand types are 'user_struct_copy' {aka 'user_struct'} and 's'\)} }
+  us_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_struct_ptr' {aka 'user_struct\*'} in assignment} }
+  us_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_struct\*' in assignment} }
+  const_us_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_struct\*' in assignment} }
+  const_us_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_struct_copy\*' {aka 'const user_struct\*'} in assignment} }
+
+  uu1 = s1; // { dg-error {no match for 'operator=' in 'uu1 = s1' \(operand types are 'user_union' and 's'\)} }
+  uu2 = s1; // { dg-error {no match for 'operator=' in 'uu2 = s1' \(operand types are 'user_union_copy' {aka 'user_union'} and 's'\)} }
+  uu_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_union_ptr' {aka 'user_union\*'} in assignment} }
+  uu_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_union\*' in assignment} }
+  const_uu_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_union\*' in assignment} }
+  const_uu_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_union_copy\*' {aka 'const user_union\*'} in assignment} }
+
+  uv1 = s1; // { dg-error {cannot convert 's' to 'user_vector' in assignment} }
+  uv2 = s1; // { dg-error {cannot convert 's' to 'user_vector_copy' {aka 'user_vector'} in assignment} }
+  uv_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_vector_ptr' {aka 'user_vector\*'} in assignment} }
+  uv_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_vector\*' in assignment} }
+  const_uv_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_vector\*' in assignment} }
+  const_uv_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_vector_copy\*' {aka 'const user_vector\*'} in assignment} }
+
+  ui1 = s1; // { dg-error {cannot convert 's' to 'user_int' {aka 'int'} in assignment} }
+  ui2 = s1; // { dg-error {cannot convert 's' to 'user_int_copy' {aka 'int'} in assignment} }
+  ui_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_ptr' {aka 'int\*'} in assignment} }
+  ui_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_int\*' {aka 'int\*'} in assignment} }
+  const_ui_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_int\*' {aka 'const int\*'} in assignment} }
+  const_ui_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_int_copy\*' {aka 'const int\*'} in assignment} }
+  volatile_ui_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_int\*' {aka 'volatile int\*'} in assignment} }
+  volatile_ui_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_int_copy\*' {aka 'volatile int\*'} in assignment} }
+  ui_array_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} in assignment} }
+  ui_array_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} in assignment} }
+  ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int \(\*\)\(\)' {aka 'int \(\*\)\(\)'} in assignment} }
+  ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int\)' {aka 'void \(\*\)\(int\)'} in assignment} }
+  ui_fn_ptr3 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} in assignment} }
+  ui_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy \(\*\)\(\)' {aka 'int \(\*\)\(\)'} in assignment} }
+  ui_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} in assignment} }
+  ui_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int_copy, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} in assignment} }
+  unsafe_ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+  unsafe_ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+}
diff --git a/gcc/testsuite/g++.dg/diagnostic/aka5b.C b/gcc/testsuite/g++.dg/diagnostic/aka5b.C
new file mode 100644
index 0000000..6942be3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/aka5b.C
@@ -0,0 +1,127 @@
+#include "aka5.h"
+
+typedef user_enum user_enum_copy;
+
+struct s { int i; };
+
+user_enum ue1;
+user_enum_copy ue2;
+user_enum_ptr ue_ptr1;
+user_enum *ue_ptr2;
+const user_enum *const_ue_ptr1;
+const user_enum_copy *const_ue_ptr2;
+volatile user_enum *volatile_ue_ptr1;
+volatile user_enum_copy *volatile_ue_ptr2;
+user_enum (*ue_array_ptr1)[10];
+user_enum_copy (*ue_array_ptr2)[10];
+user_enum (*ue_fn_ptr1) (void);
+void (*ue_fn_ptr2) (user_enum);
+void (*ue_fn_ptr3) (user_enum, ...);
+user_enum_copy (*ue_fn_ptr4) (void);
+void (*ue_fn_ptr5) (user_enum_copy);
+void (*ue_fn_ptr6) (user_enum_copy, ...);
+user_enum (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr1) (void);
+user_enum_copy (*__attribute__((__transaction_unsafe__)) unsafe_ue_fn_ptr2) (void);
+
+user_struct us1;
+user_struct_copy us2;
+user_struct_ptr us_ptr1;
+user_struct *us_ptr2;
+const user_struct *const_us_ptr1;
+const user_struct_copy *const_us_ptr2;
+
+user_union uu1;
+user_union_copy uu2;
+user_union_ptr uu_ptr1;
+user_union *uu_ptr2;
+const user_union *const_uu_ptr1;
+const user_union_copy *const_uu_ptr2;
+
+user_vector uv1;
+user_vector_copy uv2;
+user_vector_ptr uv_ptr1;
+user_vector *uv_ptr2;
+const user_vector *const_uv_ptr1;
+const user_vector_copy *const_uv_ptr2;
+
+user_int ui1;
+user_int_copy ui2;
+user_int_ptr ui_ptr1;
+user_int *ui_ptr2;
+const user_int *const_ui_ptr1;
+const user_int_copy *const_ui_ptr2;
+volatile user_int *volatile_ui_ptr1;
+volatile user_int_copy *volatile_ui_ptr2;
+user_int (*ui_array_ptr1)[10];
+user_int_copy (*ui_array_ptr2)[10];
+user_int (*ui_fn_ptr1) (void);
+void (*ui_fn_ptr2) (user_int);
+void (*ui_fn_ptr3) (user_int, ...);
+user_int_copy (*ui_fn_ptr4) (void);
+void (*ui_fn_ptr5) (user_int_copy);
+void (*ui_fn_ptr6) (user_int_copy, ...);
+user_int (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr1) (void);
+user_int_copy (*__attribute__((__transaction_unsafe__)) unsafe_ui_fn_ptr2) (void);
+
+void f (s s1)
+{
+  ue1 = s1; // { dg-error {cannot convert 's' to 'user_enum' {aka '__internal_enum'} in assignment} }
+  ue2 = s1; // { dg-error {cannot convert 's' to 'user_enum_copy' {aka '__internal_enum'} in assignment} }
+  ue_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_ptr' {aka '__internal_enum\*'} in assignment} }
+  ue_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum\*' {aka '__internal_enum\*'} in assignment} }
+  const_ue_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_enum\*' {aka 'const __internal_enum\*'} in assignment} }
+  const_ue_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_enum_copy\*' {aka 'const __internal_enum\*'} in assignment} }
+  volatile_ue_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_enum\*' {aka 'volatile __internal_enum\*'} in assignment} }
+  volatile_ue_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_enum_copy\*' {aka 'volatile __internal_enum\*'} in assignment} }
+  ue_array_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum \(\*\)\[10\]' {aka '__internal_enum \(\*\)\[10\]'} in assignment} }
+  ue_array_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy \(\*\)\[10\]' {aka '__internal_enum \(\*\)\[10\]'} in assignment} }
+  ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum \(\*\)\(\)' {aka '__internal_enum \(\*\)\(\)'} in assignment} }
+  ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum\)' {aka 'void \(\*\)\(__internal_enum\)'} in assignment} }
+  ue_fn_ptr3 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum, \.\.\.\)' {aka 'void \(\*\)\(__internal_enum, \.\.\.\)'} in assignment} }
+  ue_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy \(\*\)\(\)' {aka '__internal_enum \(\*\)\(\)'} in assignment} }
+  ue_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum_copy\)' {aka 'void \(\*\)\(__internal_enum\)'} in assignment} }
+  ue_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_enum_copy, \.\.\.\)' {aka 'void \(\*\)\(__internal_enum, \.\.\.\)'} in assignment} }
+  unsafe_ue_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka '__internal_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+  unsafe_ue_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_enum_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka '__internal_enum \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+
+  us1 = s1; // { dg-error {no match for 'operator=' in 'us1 = s1' \(operand types are 'user_struct' {aka '__internal_struct'} and 's'\)} }
+  us2 = s1; // { dg-error {no match for 'operator=' in 'us2 = s1' \(operand types are 'user_struct_copy' {aka '__internal_struct'} and 's'\)} }
+  us_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_struct_ptr' {aka '__internal_struct\*'} in assignment} }
+  us_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_struct\*' {aka '__internal_struct\*'} in assignment} }
+  const_us_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_struct\*' {aka 'const __internal_struct\*'} in assignment} }
+  const_us_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_struct_copy\*' {aka 'const __internal_struct\*'} in assignment} }
+
+  uu1 = s1; // { dg-error {no match for 'operator=' in 'uu1 = s1' \(operand types are 'user_union' {aka '__internal_union'} and 's'\)} }
+  uu2 = s1; // { dg-error {no match for 'operator=' in 'uu2 = s1' \(operand types are 'user_union_copy' {aka '__internal_union'} and 's'\)} }
+  uu_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_union_ptr' {aka '__internal_union\*'} in assignment} }
+  uu_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_union\*' {aka '__internal_union\*'} in assignment} }
+  const_uu_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_union\*' {aka 'const __internal_union\*'} in assignment} }
+  const_uu_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_union_copy\*' {aka 'const __internal_union\*'} in assignment} }
+
+  uv1 = s1; // { dg-error {cannot convert 's' to 'user_vector' {aka '__vector\([48]\) unsigned int'} in assignment} }
+  uv2 = s1; // { dg-error {cannot convert 's' to 'user_vector_copy' {aka '__vector\([48]\) unsigned int'} in assignment} }
+  uv_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_vector_ptr' {aka '__vector\([48]\) unsigned int\*'} in assignment} }
+  uv_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_vector\*' {aka '__vector\([48]\) unsigned int\*'} in assignment} }
+  const_uv_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_vector\*' {aka 'const __vector\([48]\) unsigned int\*'} in assignment} }
+  const_uv_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_vector_copy\*' {aka 'const __vector\([48]\) unsigned int\*'} in assignment} }
+
+  ui1 = s1; // { dg-error {cannot convert 's' to 'user_int' {aka 'int'} in assignment} }
+  ui2 = s1; // { dg-error {cannot convert 's' to 'user_int_copy' {aka 'int'} in assignment} }
+  ui_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_ptr' {aka 'int\*'} in assignment} }
+  ui_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_int\*' {aka 'int\*'} in assignment} }
+  const_ui_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'const user_int\*' {aka 'const int\*'} in assignment} }
+  const_ui_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'const user_int_copy\*' {aka 'const int\*'} in assignment} }
+  volatile_ui_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_int\*' {aka 'volatile int\*'} in assignment} }
+  volatile_ui_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'volatile user_int_copy\*' {aka 'volatile int\*'} in assignment} }
+  ui_array_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} in assignment} }
+  ui_array_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy \(\*\)\[10\]' {aka 'int \(\*\)\[10\]'} in assignment} }
+  ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int \(\*\)\(\)' {aka 'int \(\*\)\(\)'} in assignment} }
+  ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int\)' {aka 'void \(\*\)\(int\)'} in assignment} }
+  ui_fn_ptr3 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} in assignment} }
+  ui_fn_ptr4 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy \(\*\)\(\)' {aka 'int \(\*\)\(\)'} in assignment} }
+  ui_fn_ptr5 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int_copy\)' {aka 'void \(\*\)\(int\)'} in assignment} }
+  ui_fn_ptr6 = &s1; // { dg-error {cannot convert 's\*' to 'void \(\*\)\(user_int_copy, \.\.\.\)' {aka 'void \(\*\)\(int, \.\.\.\)'} in assignment} }
+  unsafe_ui_fn_ptr1 = &s1; // { dg-error {cannot convert 's\*' to 'user_int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+  unsafe_ui_fn_ptr2 = &s1; // { dg-error {cannot convert 's\*' to 'user_int_copy \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)' {aka 'int \(__attribute__\(\(transaction_unsafe\)\) \*\)\(\)'} in assignment} }
+}
+
diff --git a/gcc/testsuite/g++.target/aarch64/diag_aka_1.C b/gcc/testsuite/g++.target/aarch64/diag_aka_1.C
new file mode 100644
index 0000000..6b48998
--- /dev/null
+++ b/gcc/testsuite/g++.target/aarch64/diag_aka_1.C
@@ -0,0 +1,13 @@
+#include <arm_neon.h>
+
+typedef int16x4_t myvec;
+
+void f (float x)
+{
+  __Int8x8_t y1 = x; // { dg-error {cannot convert 'float' to '__Int8x8_t' in initialization} }
+  __Int8x8_t *ptr1 = &x; // { dg-error {cannot convert 'float\*' to '__Int8x8_t\*' in initialization} }
+  int8x8_t y2 = x; // { dg-error {cannot convert 'float' to 'int8x8_t' in initialization} }
+  int8x8_t *ptr2 = &x; // { dg-error {cannot convert 'float\*' to 'int8x8_t\*' in initialization} }
+  myvec y3 = x; // { dg-error {cannot convert 'float' to 'myvec' {aka 'int16x4_t'} in initialization} }
+  myvec *ptr3 = &x; // { dg-error {cannot convert 'float\*' to 'myvec\*' {aka 'int16x4_t\*'} in initialization} }
+}
-- 
cgit v1.1


From 87121696fb2ddbec5f33daa359234850f7fd306d Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Tue, 22 Oct 2019 08:43:01 +0000
Subject: Fix use after free in vector_size change

r277235 was a bit too mechanical and ended up introducing use
after free bugs in both loop and SLP vectorisation.

2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-slp.c (vect_slp_bb_region): Check whether
	autodetected_vector_size rather than vector_size is zero.
	* tree-vect-loop.c (vect_analyze_loop): Likewise.
	Set autodetected_vector_size immediately after calling
	vect_analyze_loop_2.  Check for a fatal error before advancing
	next_size.

From-SVN: r277282
---
 gcc/ChangeLog        |  9 +++++++++
 gcc/tree-vect-loop.c | 16 ++++++++--------
 gcc/tree-vect-slp.c  |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e6c662..65baf0c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-vect-slp.c (vect_slp_bb_region): Check whether
+	autodetected_vector_size rather than vector_size is zero.
+	* tree-vect-loop.c (vect_analyze_loop): Likewise.
+	Set autodetected_vector_size immediately after calling
+	vect_analyze_loop_2.  Check for a fatal error before advancing
+	next_size.
+
 2019-10-21  Jason Merrill  <jason@redhat.com>
 
 	* lock-and-run.sh: Check for process existence rather than timeout.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index a4c9f2f..07ddc2e 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2365,6 +2365,9 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
 	LOOP_VINFO_ORIG_LOOP_INFO (loop_vinfo) = orig_loop_vinfo;
 
       opt_result res = vect_analyze_loop_2 (loop_vinfo, fatal, &n_stmts);
+      if (next_size == 0)
+	autodetected_vector_size = loop_vinfo->vector_size;
+
       if (res)
 	{
 	  LOOP_VINFO_VECTORIZABLE_P (loop_vinfo) = 1;
@@ -2390,21 +2393,18 @@ vect_analyze_loop (class loop *loop, loop_vec_info orig_loop_vinfo,
       else
 	delete loop_vinfo;
 
-      if (next_size == 0)
-	autodetected_vector_size = loop_vinfo->vector_size;
-
-      if (next_size < vector_sizes.length ()
-	  && known_eq (vector_sizes[next_size], autodetected_vector_size))
-	next_size += 1;
-
       if (fatal)
 	{
 	  gcc_checking_assert (first_loop_vinfo == NULL);
 	  return opt_loop_vec_info::propagate_failure (res);
 	}
 
+      if (next_size < vector_sizes.length ()
+	  && known_eq (vector_sizes[next_size], autodetected_vector_size))
+	next_size += 1;
+
       if (next_size == vector_sizes.length ()
-	  || known_eq (loop_vinfo->vector_size, 0U))
+	  || known_eq (autodetected_vector_size, 0U))
 	{
 	  if (first_loop_vinfo)
 	    {
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index d482aa1..20ea105 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -3102,7 +3102,7 @@ vect_slp_bb_region (gimple_stmt_iterator region_begin,
 
       if (vectorized
 	  || next_size == vector_sizes.length ()
-	  || known_eq (bb_vinfo->vector_size, 0U)
+	  || known_eq (autodetected_vector_size, 0U)
 	  /* If vect_slp_analyze_bb_1 signaled that analysis for all
 	     vector sizes will fail do not bother iterating.  */
 	  || fatal)
-- 
cgit v1.1


From fc25649ccd251d9a6c2e27ac821276caaea986e4 Mon Sep 17 00:00:00 2001
From: Martin Liska <marxin@gcc.gnu.org>
Date: Tue, 22 Oct 2019 09:29:52 +0000
Subject: Fix PR reference in ChangeLog.

From-SVN: r277283
---
 gcc/cp/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2b15bf7..d09f391 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -12,7 +12,7 @@
 2019-10-21  Kamlesh Kumar  <kamleshbhalui@gmail.com>
 	    Jason Merrill  <jason@redhat.com>
 
-	PR c++/83434 - typeinfo of noexcept function
+	PR c++/83534 - typeinfo of noexcept function
 	* rtti.c (get_tinfo_decl_dynamic): Do not call
 	TYPE_MAIN_VARIANT for function.
 	(get_typeid): Likewise.
-- 
cgit v1.1


From 076222782e4558e0bd22711c6fdcc0faf0882daf Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Tue, 22 Oct 2019 11:58:27 +0200
Subject: Come up with json::integer_number and use it in GCOV.

2019-10-22  Martin Liska  <mliska@suse.cz>

	* diagnostic-format-json.cc (json_from_expanded_location):
	Use json::integer_number.
	* gcov.c (output_intermediate_json_line): Use new
	json::integer_number.
	(output_json_intermediate_file): Likewise.
	* json.cc (number::print): Move to ...
	(float_number::print): ... this.
	(integer_number::print): New.
	(test_writing_numbers): Move to ...
	(test_writing_float_numbers): ... this.
	(test_writing_integer_numbers): New.
	(json_cc_tests): Register test_writing_integer_numbers.
	* json.h (class value): Add forward declaration
	for float_number and integer_number.
	(enum kind): Add JSON_INTEGER and JSON_FLOAT.
	(class number): Move to ...
	(class float_number): ... this.
	(class integer_number): New.
	* optinfo-emit-json.cc (optrecord_json_writer::impl_location_to_json):
	Use json::integer_number.
	(optrecord_json_writer::location_to_json): Likewise.
	(optrecord_json_writer::profile_count_to_json): Likewise.
	(optrecord_json_writer::pass_to_json): Likewise.

From-SVN: r277284
---
 gcc/ChangeLog                 | 26 ++++++++++++++++++++++++++
 gcc/diagnostic-format-json.cc |  4 ++--
 gcc/gcov.c                    | 23 +++++++++++++----------
 gcc/json.cc                   | 41 +++++++++++++++++++++++++++++++++--------
 gcc/json.h                    | 35 ++++++++++++++++++++++++++++-------
 gcc/optinfo-emit-json.cc      | 10 +++++-----
 6 files changed, 107 insertions(+), 32 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65baf0c..09f66d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,29 @@
+2019-10-22  Martin Liska  <mliska@suse.cz>
+
+	* diagnostic-format-json.cc (json_from_expanded_location):
+	Use json::integer_number.
+	* gcov.c (output_intermediate_json_line): Use new
+	json::integer_number.
+	(output_json_intermediate_file): Likewise.
+	* json.cc (number::print): Move to ...
+	(float_number::print): ... this.
+	(integer_number::print): New.
+	(test_writing_numbers): Move to ...
+	(test_writing_float_numbers): ... this.
+	(test_writing_integer_numbers): New.
+	(json_cc_tests): Register test_writing_integer_numbers.
+	* json.h (class value): Add forward declaration
+	for float_number and integer_number.
+	(enum kind): Add JSON_INTEGER and JSON_FLOAT.
+	(class number): Move to ...
+	(class float_number): ... this.
+	(class integer_number): New.
+	* optinfo-emit-json.cc (optrecord_json_writer::impl_location_to_json):
+	Use json::integer_number.
+	(optrecord_json_writer::location_to_json): Likewise.
+	(optrecord_json_writer::profile_count_to_json): Likewise.
+	(optrecord_json_writer::pass_to_json): Likewise.
+
 2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-vect-slp.c (vect_slp_bb_region): Check whether
diff --git a/gcc/diagnostic-format-json.cc b/gcc/diagnostic-format-json.cc
index eb99952..6782ec9 100644
--- a/gcc/diagnostic-format-json.cc
+++ b/gcc/diagnostic-format-json.cc
@@ -48,8 +48,8 @@ json_from_expanded_location (location_t loc)
   json::object *result = new json::object ();
   if (exploc.file)
     result->set ("file", new json::string (exploc.file));
-  result->set ("line", new json::number (exploc.line));
-  result->set ("column", new json::number (exploc.column));
+  result->set ("line", new json::integer_number (exploc.line));
+  result->set ("column", new json::integer_number (exploc.column));
   return result;
 }
 
diff --git a/gcc/gcov.c b/gcc/gcov.c
index f4e65ee..66eac90 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1061,10 +1061,10 @@ output_intermediate_json_line (json::array *object,
     return;
 
   json::object *lineo = new json::object ();
-  lineo->set ("line_number", new json::number (line_num));
+  lineo->set ("line_number", new json::integer_number (line_num));
   if (function_name != NULL)
     lineo->set ("function_name", new json::string (function_name));
-  lineo->set ("count", new json::number (line->count));
+  lineo->set ("count", new json::integer_number (line->count));
   lineo->set ("unexecuted_block",
 	      new json::literal (line->has_unexecuted_block));
 
@@ -1079,7 +1079,7 @@ output_intermediate_json_line (json::array *object,
 	if (!(*it)->is_unconditional && !(*it)->is_call_non_return)
 	  {
 	    json::object *branch = new json::object ();
-	    branch->set ("count", new json::number ((*it)->count));
+	    branch->set ("count", new json::integer_number ((*it)->count));
 	    branch->set ("throw", new json::literal ((*it)->is_throw));
 	    branch->set ("fallthrough",
 			 new json::literal ((*it)->fall_through));
@@ -1138,16 +1138,19 @@ output_json_intermediate_file (json::array *json_files, source_info *src)
       function->set ("name", new json::string ((*it)->m_name));
       function->set ("demangled_name",
 		     new json::string ((*it)->get_demangled_name ()));
-      function->set ("start_line", new json::number ((*it)->start_line));
-      function->set ("start_column", new json::number ((*it)->start_column));
-      function->set ("end_line", new json::number ((*it)->end_line));
-      function->set ("end_column", new json::number ((*it)->end_column));
+      function->set ("start_line",
+		     new json::integer_number ((*it)->start_line));
+      function->set ("start_column",
+		     new json::integer_number ((*it)->start_column));
+      function->set ("end_line", new json::integer_number ((*it)->end_line));
+      function->set ("end_column",
+		     new json::integer_number ((*it)->end_column));
       function->set ("blocks",
-		     new json::number ((*it)->get_block_count ()));
+		     new json::integer_number ((*it)->get_block_count ()));
       function->set ("blocks_executed",
-		     new json::number ((*it)->blocks_executed));
+		     new json::integer_number ((*it)->blocks_executed));
       function->set ("execution_count",
-		     new json::number ((*it)->blocks[0].count));
+		     new json::integer_number ((*it)->blocks[0].count));
 
       functions->append (function);
     }
diff --git a/gcc/json.cc b/gcc/json.cc
index 512e2e5..bec6fc5 100644
--- a/gcc/json.cc
+++ b/gcc/json.cc
@@ -154,18 +154,31 @@ array::append (value *v)
   m_elements.safe_push (v);
 }
 
-/* class json::number, a subclass of json::value, wrapping a double.  */
+/* class json::float_number, a subclass of json::value, wrapping a double.  */
 
-/* Implementation of json::value::print for json::number.  */
+/* Implementation of json::value::print for json::float_number.  */
 
 void
-number::print (pretty_printer *pp) const
+float_number::print (pretty_printer *pp) const
 {
   char tmp[1024];
   snprintf (tmp, sizeof (tmp), "%g", m_value);
   pp_string (pp, tmp);
 }
 
+/* class json::integer_number, a subclass of json::value, wrapping a long.  */
+
+/* Implementation of json::value::print for json::integer_number.  */
+
+void
+integer_number::print (pretty_printer *pp) const
+{
+  char tmp[1024];
+  snprintf (tmp, sizeof (tmp), "%ld", m_value);
+  pp_string (pp, tmp);
+}
+
+
 /* class json::string, a subclass of json::value.  */
 
 /* json::string's ctor.  */
@@ -297,11 +310,22 @@ test_writing_arrays ()
 /* Verify that JSON numbers are written correctly.  */
 
 static void
-test_writing_numbers ()
+test_writing_float_numbers ()
+{
+  assert_print_eq (float_number (0), "0");
+  assert_print_eq (float_number (42), "42");
+  assert_print_eq (float_number (-100), "-100");
+  assert_print_eq (float_number (123456789), "1.23457e+08");
+}
+
+static void
+test_writing_integer_numbers ()
 {
-  assert_print_eq (number (0), "0");
-  assert_print_eq (number (42), "42");
-  assert_print_eq (number (-100), "-100");
+  assert_print_eq (integer_number (0), "0");
+  assert_print_eq (integer_number (42), "42");
+  assert_print_eq (integer_number (-100), "-100");
+  assert_print_eq (integer_number (123456789), "123456789");
+  assert_print_eq (integer_number (-123456789), "-123456789");
 }
 
 /* Verify that JSON strings are written correctly.  */
@@ -337,7 +361,8 @@ json_cc_tests ()
   test_object_get ();
   test_writing_objects ();
   test_writing_arrays ();
-  test_writing_numbers ();
+  test_writing_float_numbers ();
+  test_writing_integer_numbers ();
   test_writing_strings ();
   test_writing_literals ();
 }
diff --git a/gcc/json.h b/gcc/json.h
index d8a690e..316bc8b 100644
--- a/gcc/json.h
+++ b/gcc/json.h
@@ -39,7 +39,8 @@ namespace json
 class value;
   class object;
   class array;
-  class number;
+  class float_number;
+  class integer_number;
   class string;
   class literal;
 
@@ -53,8 +54,11 @@ enum kind
   /* class json::array.  */
   JSON_ARRAY,
 
-  /* class json::number.  */
-  JSON_NUMBER,
+  /* class json::integer_number.  */
+  JSON_INTEGER,
+
+  /* class json::float_number.  */
+  JSON_FLOAT,
 
   /* class json::string.  */
   JSON_STRING,
@@ -114,14 +118,14 @@ class array : public value
   auto_vec<value *> m_elements;
 };
 
-/* Subclass of value for numbers.  */
+/* Subclass of value for floating-point numbers.  */
 
-class number : public value
+class float_number : public value
 {
  public:
-  number (double value) : m_value (value) {}
+  float_number (double value) : m_value (value) {}
 
-  enum kind get_kind () const FINAL OVERRIDE { return JSON_NUMBER; }
+  enum kind get_kind () const FINAL OVERRIDE { return JSON_FLOAT; }
   void print (pretty_printer *pp) const FINAL OVERRIDE;
 
   double get () const { return m_value; }
@@ -130,6 +134,23 @@ class number : public value
   double m_value;
 };
 
+/* Subclass of value for integer-valued numbers.  */
+
+class integer_number : public value
+{
+ public:
+  integer_number (long value) : m_value (value) {}
+
+  enum kind get_kind () const FINAL OVERRIDE { return JSON_INTEGER; }
+  void print (pretty_printer *pp) const FINAL OVERRIDE;
+
+  long get () const { return m_value; }
+
+ private:
+  long m_value;
+};
+
+
 /* Subclass of value for strings.  */
 
 class string : public value
diff --git a/gcc/optinfo-emit-json.cc b/gcc/optinfo-emit-json.cc
index 1cfcdfe..1ca4f14 100644
--- a/gcc/optinfo-emit-json.cc
+++ b/gcc/optinfo-emit-json.cc
@@ -181,7 +181,7 @@ optrecord_json_writer::impl_location_to_json (dump_impl_location_t loc)
 {
   json::object *obj = new json::object ();
   obj->set ("file", new json::string (loc.m_file));
-  obj->set ("line", new json::number (loc.m_line));
+  obj->set ("line", new json::integer_number (loc.m_line));
   if (loc.m_function)
     obj->set ("function", new json::string (loc.m_function));
   return obj;
@@ -196,8 +196,8 @@ optrecord_json_writer::location_to_json (location_t loc)
   expanded_location exploc = expand_location (loc);
   json::object *obj = new json::object ();
   obj->set ("file", new json::string (exploc.file));
-  obj->set ("line", new json::number (exploc.line));
-  obj->set ("column", new json::number (exploc.column));
+  obj->set ("line", new json::integer_number (exploc.line));
+  obj->set ("column", new json::integer_number (exploc.column));
   return obj;
 }
 
@@ -207,7 +207,7 @@ json::object *
 optrecord_json_writer::profile_count_to_json (profile_count count)
 {
   json::object *obj = new json::object ();
-  obj->set ("value", new json::number (count.to_gcov_type ()));
+  obj->set ("value", new json::integer_number (count.to_gcov_type ()));
   obj->set ("quality",
 	    new json::string (profile_quality_as_string (count.quality ())));
   return obj;
@@ -262,7 +262,7 @@ optrecord_json_writer::pass_to_json (opt_pass *pass)
 	  && (pass->optinfo_flags & optgroup->value))
 	optgroups->append (new json::string (optgroup->name));
   }
-  obj->set ("num", new json::number (pass->static_pass_number));
+  obj->set ("num", new json::integer_number (pass->static_pass_number));
   return obj;
 }
 
-- 
cgit v1.1


From 9107d6526b938eba8168025c0d90d06ad3634e69 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 22 Oct 2019 11:51:52 +0000
Subject: re PR tree-optimization/92173 (ICE in optab_for_tree_code, at
 optabs-tree.c:81)

2019-10-22  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92173
	* tree-vect-loop.c (vectorizable_reduction): If
	vect_transform_reduction cannot handle code-generation try without
	the single-def-use-cycle optimization.  Pass optab_vector to
	optab_for_tree_code to get vector shifts as that's what we'd
	generate.

	* gcc.dg/torture/pr92173.c: New testcase.

From-SVN: r277286
---
 gcc/ChangeLog                          |  9 ++++++
 gcc/testsuite/ChangeLog                |  5 ++++
 gcc/testsuite/gcc.dg/torture/pr92173.c | 11 +++++++
 gcc/tree-vect-loop.c                   | 54 +++++++++++++++++++---------------
 4 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/pr92173.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09f66d9..8f0af77 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-22  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92173
+	* tree-vect-loop.c (vectorizable_reduction): If
+	vect_transform_reduction cannot handle code-generation try without
+	the single-def-use-cycle optimization.  Pass optab_vector to
+	optab_for_tree_code to get vector shifts as that's what we'd
+	generate.
+
 2019-10-22  Martin Liska  <mliska@suse.cz>
 
 	* diagnostic-format-json.cc (json_from_expanded_location):
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b0edb29..9827b38 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-22  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92173
+	* gcc.dg/torture/pr92173.c: New testcase.
+
 2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* g++.dg/diagnostic/aka5.h: New test.
diff --git a/gcc/testsuite/gcc.dg/torture/pr92173.c b/gcc/testsuite/gcc.dg/torture/pr92173.c
new file mode 100644
index 0000000..fcb3548
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr92173.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-ftree-vectorize" } */
+
+unsigned int
+yo (unsigned int o0, signed char s1)
+{
+  for (s1 = 0; s1 < 1; s1 -= 2)
+    o0 += o0;
+
+  return o0 + s1;
+}
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 07ddc2e..e22d2dd 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -6240,61 +6240,67 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       && (!STMT_VINFO_IN_PATTERN_P (use_stmt_info)
 	  || !STMT_VINFO_PATTERN_DEF_SEQ (use_stmt_info))
       && vect_stmt_to_vectorize (use_stmt_info) == stmt_info)
-    STMT_VINFO_FORCE_SINGLE_CYCLE (reduc_info) = single_defuse_cycle = true;
+    single_defuse_cycle = true;
 
-  if (single_defuse_cycle
-      || code == DOT_PROD_EXPR
-      || code == WIDEN_SUM_EXPR
-      || code == SAD_EXPR)
+  bool lane_reduc_code_p
+    = (code == DOT_PROD_EXPR || code == WIDEN_SUM_EXPR || code == SAD_EXPR);
+  if (single_defuse_cycle || lane_reduc_code_p)
     {
       gcc_assert (code != COND_EXPR);
 
       /* 4. Supportable by target?  */
+      bool ok = true;
 
       /* 4.1. check support for the operation in the loop  */
-      optab optab = optab_for_tree_code (code, vectype_in, optab_default);
+      optab optab = optab_for_tree_code (code, vectype_in, optab_vector);
       if (!optab)
-        {
-          if (dump_enabled_p ())
+	{
+	  if (dump_enabled_p ())
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			     "no optab.\n");
-
-          return false;
+	  ok = false;
         }
 
       machine_mode vec_mode = TYPE_MODE (vectype_in);
-      if (optab_handler (optab, vec_mode) == CODE_FOR_nothing)
+      if (ok && optab_handler (optab, vec_mode) == CODE_FOR_nothing)
         {
           if (dump_enabled_p ())
             dump_printf (MSG_NOTE, "op not supported by target.\n");
-
 	  if (maybe_ne (GET_MODE_SIZE (vec_mode), UNITS_PER_WORD)
 	      || !vect_worthwhile_without_simd_p (loop_vinfo, code))
-            return false;
-
-          if (dump_enabled_p ())
-	    dump_printf (MSG_NOTE, "proceeding using word mode.\n");
+	    ok = false;
+	  else
+	    if (dump_enabled_p ())
+	      dump_printf (MSG_NOTE, "proceeding using word mode.\n");
         }
 
       /* Worthwhile without SIMD support?  */
-      if (!VECTOR_MODE_P (TYPE_MODE (vectype_in))
+      if (ok
+	  && !VECTOR_MODE_P (TYPE_MODE (vectype_in))
 	  && !vect_worthwhile_without_simd_p (loop_vinfo, code))
         {
           if (dump_enabled_p ())
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
 			     "not worthwhile without SIMD support.\n");
-
-          return false;
+	  ok = false;
         }
+
+      /* lane-reducing operations have to go through vect_transform_reduction.
+         For the other cases try without the single cycle optimization.  */
+      if (!ok)
+	{
+	  if (lane_reduc_code_p)
+	    return false;
+	  else
+	    single_defuse_cycle = false;
+	}
     }
+  STMT_VINFO_FORCE_SINGLE_CYCLE (reduc_info) = single_defuse_cycle;
 
   /* If the reduction stmt is one of the patterns that have lane
      reduction embedded we cannot handle the case of ! single_defuse_cycle.  */
-  if ((ncopies > 1
-       && ! single_defuse_cycle)
-      && (code == DOT_PROD_EXPR
-	  || code == WIDEN_SUM_EXPR
-	  || code == SAD_EXPR))
+  if ((ncopies > 1 && ! single_defuse_cycle)
+      && lane_reduc_code_p)
     {
       if (dump_enabled_p ())
 	dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-- 
cgit v1.1


From 92781ff1da896b2f92b1dcc06953be493371bf21 Mon Sep 17 00:00:00 2001
From: Michael Matz <matz@suse.de>
Date: Tue, 22 Oct 2019 12:25:03 +0000
Subject: re PR middle-end/90796 (GCC: O2 vs O3 output differs on simple test)

Fix PR middle-end/90796

        PR middle-end/90796
        * gimple-loop-jam.c (any_access_function_variant_p): New function.
        (adjust_unroll_factor): Use it to constrain safety, new parameter.
        (tree_loop_unroll_and_jam): Adjust call and profitable unroll factor.

testsuite/
        * gcc.dg/unroll-and-jam.c: Add three invalid and one valid case.

From-SVN: r277287
---
 gcc/ChangeLog                         |  7 +++
 gcc/gimple-loop-jam.c                 | 81 ++++++++++++++++++++++++++++++++---
 gcc/testsuite/ChangeLog               |  5 +++
 gcc/testsuite/gcc.dg/unroll-and-jam.c | 22 ++++++++--
 4 files changed, 104 insertions(+), 11 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f0af77..34ce686 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-22  Michael Matz  <matz@suse.de>
+
+	PR middle-end/90796
+	* gimple-loop-jam.c (any_access_function_variant_p): New function.
+	(adjust_unroll_factor): Use it to constrain safety, new parameter.
+	(tree_loop_unroll_and_jam): Adjust call and profitable unroll factor.
+
 2019-10-22  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92173
diff --git a/gcc/gimple-loop-jam.c b/gcc/gimple-loop-jam.c
index 11153f5..899653b 100644
--- a/gcc/gimple-loop-jam.c
+++ b/gcc/gimple-loop-jam.c
@@ -360,16 +360,33 @@ fuse_loops (class loop *loop)
   rewrite_into_loop_closed_ssa_1 (NULL, 0, SSA_OP_USE, loop);
 }
 
+/* Return true if any of the access functions for dataref A
+   isn't invariant with respect to loop LOOP_NEST.  */
+static bool
+any_access_function_variant_p (const struct data_reference *a,
+			       const class loop *loop_nest)
+{
+  unsigned int i;
+  vec<tree> fns = DR_ACCESS_FNS (a);
+  tree t;
+
+  FOR_EACH_VEC_ELT (fns, i, t)
+    if (!evolution_function_is_invariant_p (t, loop_nest->num))
+      return true;
+
+  return false;
+}
+
 /* Returns true if the distance in DDR can be determined and adjusts
    the unroll factor in *UNROLL to make unrolling valid for that distance.
-   Otherwise return false.
+   Otherwise return false.  DDR is with respect to the outer loop of INNER.
 
    If this data dep can lead to a removed memory reference, increment
    *REMOVED and adjust *PROFIT_UNROLL to be the necessary unroll factor
    for this to happen.  */
 
 static bool
-adjust_unroll_factor (struct data_dependence_relation *ddr,
+adjust_unroll_factor (class loop *inner, struct data_dependence_relation *ddr,
 		      unsigned *unroll, unsigned *profit_unroll,
 		      unsigned *removed)
 {
@@ -392,9 +409,59 @@ adjust_unroll_factor (struct data_dependence_relation *ddr,
 	    gcc_unreachable ();
 	  else if ((unsigned)dist >= *unroll)
 	    ;
-	  else if (lambda_vector_lexico_pos (dist_v + 1, DDR_NB_LOOPS (ddr) - 1)
-		   || (lambda_vector_zerop (dist_v + 1, DDR_NB_LOOPS (ddr) - 1)
-		       && dist > 0))
+	  else if (lambda_vector_zerop (dist_v + 1, DDR_NB_LOOPS (ddr) - 1))
+	    {
+	      /* We have (a,0) with a < N, so this will be transformed into
+	         (0,0) after unrolling by N.  This might potentially be a
+		 problem, if it's not a read-read dependency.  */
+	      if (DR_IS_READ (DDR_A (ddr)) && DR_IS_READ (DDR_B (ddr)))
+		;
+	      else
+		{
+		  /* So, at least one is a write, and we might reduce the
+		     distance vector to (0,0).  This is still no problem
+		     if both data-refs are affine with respect to the inner
+		     loops.  But if one of them is invariant with respect
+		     to an inner loop our reordering implicit in loop fusion
+		     corrupts the program, as our data dependences don't
+		     capture this.  E.g. for:
+		       for (0 <= i < n)
+		         for (0 <= j < m)
+		           a[i][0] = a[i+1][0] + 2;    // (1)
+		           b[i][j] = b[i+1][j] + 2;    // (2)
+		     the distance vector for both statements is (-1,0),
+		     but exchanging the order for (2) is okay, while
+		     for (1) it is not.  To see this, write out the original
+		     accesses (assume m is 2):
+		       a i j original
+		       0 0 0 r a[1][0] b[1][0]
+		       1 0 0 w a[0][0] b[0][0]
+		       2 0 1 r a[1][0] b[1][1]
+		       3 0 1 w a[0][0] b[0][1]
+		       4 1 0 r a[2][0] b[2][0]
+		       5 1 0 w a[1][0] b[1][0]
+		     after unroll-by-2 and fusion the accesses are done in
+		     this order (from column a): 0,1, 4,5, 2,3, i.e. this:
+		       a i j transformed
+		       0 0 0 r a[1][0] b[1][0]
+		       1 0 0 w a[0][0] b[0][0]
+		       4 1 0 r a[2][0] b[2][0]
+		       5 1 0 w a[1][0] b[1][0]
+		       2 0 1 r a[1][0] b[1][1]  
+		       3 0 1 w a[0][0] b[0][1]
+		     Note how access 2 accesses the same element as access 5
+		     for array 'a' but not for array 'b'.  */
+		  if (any_access_function_variant_p (DDR_A (ddr), inner)
+		      && any_access_function_variant_p (DDR_B (ddr), inner))
+		    ;
+		  else
+		    /* And if any dataref of this pair is invariant with
+		       respect to the inner loop, we have no chance than
+		       to reduce the unroll factor.  */
+		    *unroll = dist;
+		}
+	    }
+	  else if (lambda_vector_lexico_pos (dist_v + 1, DDR_NB_LOOPS (ddr) - 1))
 	    ;
 	  else
 	    *unroll = dist;
@@ -486,7 +553,7 @@ tree_loop_unroll_and_jam (void)
 	  /* Now check the distance vector, for determining a sensible
 	     outer unroll factor, and for validity of merging the inner
 	     loop copies.  */
-	  if (!adjust_unroll_factor (ddr, &unroll_factor, &profit_unroll,
+	  if (!adjust_unroll_factor (loop, ddr, &unroll_factor, &profit_unroll,
 				     &removed))
 	    {
 	      /* Couldn't get the distance vector.  For two reads that's
@@ -506,7 +573,7 @@ tree_loop_unroll_and_jam (void)
 	 to ignore all profitability concerns and apply the transformation
 	 always.  */
       if (!PARAM_VALUE (PARAM_UNROLL_JAM_MIN_PERCENT))
-	profit_unroll = 2;
+	profit_unroll = MAX(2, profit_unroll);
       else if (removed * 100 / datarefs.length ()
 	  < (unsigned)PARAM_VALUE (PARAM_UNROLL_JAM_MIN_PERCENT))
 	profit_unroll = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9827b38..9caf607 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-22  Michael Matz  <matz@suse.de>
+
+	PR middle-end/90796
+	* gcc.dg/unroll-and-jam.c: Add three invalid and one valid case.
+
 2019-10-22  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92173
diff --git a/gcc/testsuite/gcc.dg/unroll-and-jam.c b/gcc/testsuite/gcc.dg/unroll-and-jam.c
index 70910d3..bcfe1bd 100644
--- a/gcc/testsuite/gcc.dg/unroll-and-jam.c
+++ b/gcc/testsuite/gcc.dg/unroll-and-jam.c
@@ -31,10 +31,10 @@ void checkb(void)
   //printf("  %d\n", sum);
 }
 
+unsigned i, j;
 #define TEST(name, body, test) \
 static void __attribute__((noinline,noclone)) name (unsigned long n, unsigned long m) \
 { \
-  unsigned long i, j; \
   for (i = 1; i < m; i++) { \
       for (j = 1; j < n; j++) { \
 	  body; \
@@ -58,9 +58,14 @@ TEST(foo3, aa[i+1][j-1]=aa[i][j] * aa[i][j] / 2, checkaa()) //notok, -1,1
 TEST(foo4, aa[i][j] = aa[i-1][j+1] * aa[i-1][j+1] / 2, checkaa()) //notok, -1,1
 TEST(foo5, aa[i][j] = aa[i+1][j+1] * aa[i+1][j+1] / 2, checkaa()) //ok, 1,1
 TEST(foo6, aa[i][j] = aa[i+1][j] * aa[i+1][j] / 2, checkaa()) //ok, -1,0
+TEST(foo61, aa[i][0] = aa[i+1][0] * aa[i+1][0] / 2, checkaa()) //notok, -1,0
+TEST(foo62, aa[i][j/2] = aa[i+1][j/2] * aa[i+1][j/2] / 2, checkaa()) //notok, not affine
+TEST(foo63, aa[i][j%2] = aa[i+1][j%2] * aa[i+1][j%2] / 2, checkaa()) //notok, not affine
 TEST(foo7, aa[i+1][j] = aa[i][j] * aa[i][j] / 2, checkaa()) //ok, 1,0
 TEST(foo9, b[j] = 3*b[j+1] + 1, checkb()) //notok, 0,-1
 TEST(foo10, b[j] = 3*b[j] + 1, checkb()) //ok, 0,0
+extern int f;
+TEST(foo11, f = b[i-1] = 1 + 3* b[i+1], checkb()) //ok, 2,0 but must reduce unroll factor to 2, (it would be incorrect with unroll-by-3, which the profitability would suggest)
 
 /* foo8 should work as well, but currently doesn't because the distance
    vectors we compute are too pessimistic.  We compute
@@ -68,6 +73,7 @@ TEST(foo10, b[j] = 3*b[j] + 1, checkb()) //ok, 0,0
    and the last one causes us to lose.  */
 TEST(foo8, b[j+1] = 3*b[j] + 1, checkb()) //ok, 0,1
 
+int f;
 unsigned int a[1024];
 unsigned int b[1024];
 unsigned int aa[16][1024];
@@ -88,10 +94,12 @@ void init(void)
     printf(" %s\n", #name); \
     init();for(i=0;i<4;i++)name##noopt(32,8); checka = checksum; \
     init();for(i=0;i<4;i++)name(32,8); \
+    if (checka != checksum) fail = 1; \
     printf("%sok %s\n", checka != checksum ? "NOT " : "", #name);
 
 int main()
 {
+  int fail = 0;
   int i;
   unsigned checka;
   RUN(foo1);
@@ -100,12 +108,18 @@ int main()
   RUN(foo4);
   RUN(foo5);
   RUN(foo6);
+  RUN(foo61);
+  RUN(foo62);
+  RUN(foo63);
   RUN(foo7);
   RUN(foo8);
   RUN(foo9);
   RUN(foo10);
-  return 0;
+  RUN(foo11);
+  if (fail)
+    __builtin_abort();
+  return fail;
 }
 
-/* Five loops should be unroll-jammed (actually six, but see above).  */
-/* { dg-final { scan-tree-dump-times "applying unroll and jam" 5 "unrolljam" } } */
+/* Six loops should be unroll-jammed (actually seven, but see above).  */
+/* { dg-final { scan-tree-dump-times "applying unroll and jam" 6 "unrolljam" } } */
-- 
cgit v1.1


From 6c7b0df8029d01e05577668333660d0bc58a3023 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Tue, 22 Oct 2019 13:08:53 +0000
Subject: re PR tree-optimization/92173 (ICE in optab_for_tree_code, at
 optabs-tree.c:81)

2019-10-22  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92173
	* tree-vect-loop.c (vectorizable_reduction): If
	vect_transform_reduction cannot handle code-generation try without
	the single-def-use-cycle optimization.  Pass optab_vector to
	optab_for_tree_code to get vector shifts as that's what we'd
	generate.

	* gcc.dg/torture/pr92173.c: New testcase.

From-SVN: r277288
---
 gcc/ChangeLog                   |  9 +++++++++
 gcc/testsuite/ChangeLog         |  5 +++++
 gcc/testsuite/gcc.dg/vshift-5.c | 44 +++++++++++++++++++++++++++++++++++++++++
 gcc/tree-vect-slp.c             | 28 ++++++++++++++++++++------
 gcc/tree-vect-stmts.c           | 29 ++++++++++++++++++++++++---
 5 files changed, 106 insertions(+), 9 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34ce686..f8cfef7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-22  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92173
+	* tree-vect-loop.c (vectorizable_reduction): If
+	vect_transform_reduction cannot handle code-generation try without
+	the single-def-use-cycle optimization.  Pass optab_vector to
+	optab_for_tree_code to get vector shifts as that's what we'd
+	generate.
+
 2019-10-22  Michael Matz  <matz@suse.de>
 
 	PR middle-end/90796
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9caf607..0581b5f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-22  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92173
+	* gcc.dg/torture/pr92173.c: New testcase.
+
 2019-10-22  Michael Matz  <matz@suse.de>
 
 	PR middle-end/90796
diff --git a/gcc/testsuite/gcc.dg/vshift-5.c b/gcc/testsuite/gcc.dg/vshift-5.c
index daa5f1c..62e6328 100644
--- a/gcc/testsuite/gcc.dg/vshift-5.c
+++ b/gcc/testsuite/gcc.dg/vshift-5.c
@@ -41,6 +41,42 @@ f2 (void)
 }
 
 __attribute__((noinline, noclone)) void
+f2a (int x)
+{
+  long long a0, a1, a2, a3;
+  a0 = a[0];
+  a1 = a[1];
+  a2 = a[2];
+  a3 = a[3];
+  a0 = a0 << x;
+  a1 = a1 << 2;
+  a2 = a2 << 2;
+  a3 = a3 << 2;
+  a[0] = a0;
+  a[1] = a1;
+  a[2] = a2;
+  a[3] = a3;
+}
+
+__attribute__((noinline, noclone)) void
+f2b (int x)
+{
+  long long a0, a1, a2, a3;
+  a0 = a[0];
+  a1 = a[1];
+  a2 = a[2];
+  a3 = a[3];
+  a0 = a0 << 2;
+  a1 = a1 << 2;
+  a2 = a2 << x;
+  a3 = a3 << 2;
+  a[0] = a0;
+  a[1] = a1;
+  a[2] = a2;
+  a[3] = a3;
+}
+
+__attribute__((noinline, noclone)) void
 f3 (int x)
 {
   long long a0, a1, a2, a3;
@@ -77,5 +113,13 @@ main ()
   if (a[0] != (4LL << 7) || a[1] != (3LL << 8)
       || a[2] != (2LL << 9) || a[3] != (1LL << 10))
     abort ();
+  f2a (3);
+  if (a[0] != (4LL << 10) || a[1] != (3LL << 10)
+      || a[2] != (2LL << 11) || a[3] != (1LL << 12))
+    abort ();
+  f2b (3);
+  if (a[0] != (4LL << 12) || a[1] != (3LL << 12)
+      || a[2] != (2LL << 14) || a[3] != (1LL << 14))
+    abort ();
   return 0;
 }
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 20ea105..864db64 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -475,8 +475,11 @@ again:
       /* Check the types of the definitions.  */
       switch (dt)
 	{
-	case vect_constant_def:
 	case vect_external_def:
+	  /* Make sure to demote the overall operand to external.  */
+	  oprnd_info->first_dt = vect_external_def;
+	  /* Fallthru.  */
+	case vect_constant_def:
 	  oprnd_info->def_stmts.quick_push (NULL);
 	  oprnd_info->ops.quick_push (oprnd);
 	  break;
@@ -1504,9 +1507,10 @@ static void
 vect_print_slp_tree (dump_flags_t dump_kind, dump_location_t loc,
 		     slp_tree node, hash_set<slp_tree> &visited)
 {
-  int i;
+  unsigned i;
   stmt_vec_info stmt_info;
   slp_tree child;
+  tree op;
 
   if (visited.add (node))
     return;
@@ -1514,11 +1518,23 @@ vect_print_slp_tree (dump_flags_t dump_kind, dump_location_t loc,
   dump_metadata_t metadata (dump_kind, loc.get_impl_location ());
   dump_user_location_t user_loc = loc.get_user_location ();
   dump_printf_loc (metadata, user_loc, "node%s %p (max_nunits=%u)\n",
-		   SLP_TREE_DEF_TYPE (node) != vect_internal_def
-		   ? " (external)" : "", node,
+		   SLP_TREE_DEF_TYPE (node) == vect_external_def
+		   ? " (external)"
+		   : (SLP_TREE_DEF_TYPE (node) == vect_constant_def
+		      ? " (constant)"
+		      : ""), node,
 		   estimated_poly_value (node->max_nunits));
-  FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
-    dump_printf_loc (metadata, user_loc, "\tstmt %d %G", i, stmt_info->stmt);
+  if (SLP_TREE_SCALAR_STMTS (node).exists ())
+    FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+      dump_printf_loc (metadata, user_loc, "\tstmt %u %G", i, stmt_info->stmt);
+  else
+    {
+      dump_printf_loc (metadata, user_loc, "\t{ ");
+      FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_OPS (node), i, op)
+	dump_printf (metadata, "%T%s ", op,
+		     i < SLP_TREE_SCALAR_OPS (node).length () - 1 ? "," : "");
+      dump_printf (metadata, "}\n");
+    }
   if (SLP_TREE_CHILDREN (node).is_empty ())
     return;
   dump_printf_loc (metadata, user_loc, "\tchildren");
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 7f6100e..a44c3de 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5670,8 +5670,11 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 
       if (!op1_vectype)
 	op1_vectype = get_same_sized_vectype (TREE_TYPE (op1), vectype_out);
-      if (op1_vectype == NULL_TREE
-	  || TYPE_MODE (op1_vectype) != TYPE_MODE (vectype))
+      if ((op1_vectype == NULL_TREE
+	   || TYPE_MODE (op1_vectype) != TYPE_MODE (vectype))
+	  && (!slp_node
+	      || SLP_TREE_DEF_TYPE
+		   (SLP_TREE_CHILDREN (slp_node)[1]) != vect_constant_def))
 	{
 	  if (dump_enabled_p ())
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
@@ -5710,7 +5713,10 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
                  so make sure the scalar is the right type if we are
 		 dealing with vectors of long long/long/short/char.  */
               if (dt[1] == vect_constant_def)
-                op1 = fold_convert (TREE_TYPE (vectype), op1);
+		{
+		  if (!slp_node)
+		    op1 = fold_convert (TREE_TYPE (vectype), op1);
+		}
 	      else if (!useless_type_conversion_p (TREE_TYPE (vectype),
 						   TREE_TYPE (op1)))
 		{
@@ -5821,6 +5827,23 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
                     }
                 }
             }
+	  else if (slp_node
+		   && !useless_type_conversion_p (TREE_TYPE (vectype),
+						  TREE_TYPE (op1)))
+	    {
+	      /* Convert the scalar constant shift amounts in-place.  */
+	      slp_tree shift = SLP_TREE_CHILDREN (slp_node)[1];
+	      gcc_assert (SLP_TREE_DEF_TYPE (shift) == vect_constant_def);
+	      for (unsigned i = 0;
+		   i < SLP_TREE_SCALAR_OPS (shift).length (); ++i)
+		{
+		  SLP_TREE_SCALAR_OPS (shift)[i]
+		    = fold_convert (TREE_TYPE (vectype),
+				    SLP_TREE_SCALAR_OPS (shift)[i]);
+		  gcc_assert ((TREE_CODE (SLP_TREE_SCALAR_OPS (shift)[i])
+			       == INTEGER_CST));
+		}
+	    }
 
           /* vec_oprnd1 is available if operand 1 should be of a scalar-type
              (a special case for certain kind of vector shifts); otherwise,
-- 
cgit v1.1


From b747c183714a5d68da8037d8b705a8bc67f11bac Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Tue, 22 Oct 2019 13:16:42 +0000
Subject: [arm] make arm_carry_operation and arm_borrow_operation duals

Arm_carry_operation and arm_borrow_operation are duals: given that we
have a comparison that returns a result that relies solely in the
carry flag one is the inverse of the other.  So there's no reason for
one to have a CC mode that the other does not have.  This patch
restores that equivalence.

	* config/arm/predicates.md (arm_borrow_operation): Handle CC_ADCmode.

From-SVN: r277289
---
 gcc/ChangeLog                | 4 ++++
 gcc/config/arm/predicates.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f8cfef7..e80bb17 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-22  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/predicates.md (arm_borrow_operation): Handle CC_ADCmode.
+
 2019-10-22  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92173
diff --git a/gcc/config/arm/predicates.md b/gcc/config/arm/predicates.md
index 8a8f10c..267c446 100644
--- a/gcc/config/arm/predicates.md
+++ b/gcc/config/arm/predicates.md
@@ -398,7 +398,7 @@
     machine_mode ccmode = GET_MODE (op0);
     if (ccmode == CC_Cmode)
       return GET_CODE (op) == GEU;
-    else if (ccmode == CCmode || ccmode == CC_RSBmode)
+    else if (ccmode == CCmode || ccmode == CC_RSBmode || ccmode == CC_ADCmode)
       return GET_CODE (op) == LTU;
     return false;
   }
-- 
cgit v1.1


From 2e30cb8395130982b8b28a4eb42814f4da1fb6d2 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Tue, 22 Oct 2019 13:19:15 +0000
Subject: [arm] Match subtraction from carry_operation

On Arm we have both carry and borrow operations, but borrow is
essentially '~carry'.  Of course, with boolean logic ~carry is also
1-carry.

GCC transforms

	(1 - X - LTU (cc, 0))

into

	(GEU (cc, 0) - X)

Now the former matches a real insn in Arm state, using the RSC
instruction with #1 as the immediate, but we currently do not
recognize the canonicalized form.  Nevertheless, given the above
logic, this turns out to be quite straight forward as the original
expression matches arm_borrow_operation and the revised form can be
used with arm_carry_operation.  Since we match this new pattern we
also update rtx_costs to handle it.

	* config/arm/arm.md (rsbsi_carryin_reg): New pattern.
	* config/arm/arm.c (arm_rtx_costs_internal, case MINUS): Handle
	subtraction from a carry operation.

From-SVN: r277290
---
 gcc/ChangeLog         |  6 ++++++
 gcc/config/arm/arm.c  |  7 +++++++
 gcc/config/arm/arm.md | 13 +++++++++++++
 3 files changed, 26 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e80bb17..b1a3367 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-22  Richard Earnshaw  <rearnsha@arm.com>
 
+	* config/arm/arm.md (rsbsi_carryin_reg): New pattern.
+	* config/arm/arm.c (arm_rtx_costs_internal, case MINUS): Handle
+	subtraction from a carry operation.
+
+2019-10-22  Richard Earnshaw  <rearnsha@arm.com>
+
 	* config/arm/predicates.md (arm_borrow_operation): Handle CC_ADCmode.
 
 2019-10-22  Richard Biener  <rguenther@suse.de>
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 5491ad0..5c2c48f 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -10107,6 +10107,13 @@ arm_rtx_costs_internal (rtx x, enum rtx_code code, enum rtx_code outer_code,
 	      *cost += rtx_cost (XEXP (op0, 0), mode, MINUS, 0, speed_p);
 	      return true;
 	    }
+	  /* (Carry_op - reg) can be done as RSC Rd, Rn, #1 on Arm.
+	     Note we do mean ~borrow here.  */
+	  else if (TARGET_ARM && arm_carry_operation (op0, SImode))
+	    {
+	      *cost += rtx_cost (op1, mode, code, 1, speed_p);
+	      return true;
+	    }
 
 	  shift_op = shifter_op_p (op0, &shift_by_reg);
 	  if (shift_op == NULL)
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 039fdd0..ae77cc3 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -1649,6 +1649,19 @@
    (set_attr "type" "adc_reg,adc_imm,alu_shift_imm")]
 )
 
+;; Special canonicalization of the above when operand1 == (const_int 1):
+;; in this case the 'borrow' needs to treated like subtracting from the carry.
+(define_insn "rsbsi_carryin_reg"
+  [(set (match_operand:SI 0 "s_register_operand" "=r")
+	(minus:SI (match_operand:SI 1 "arm_carry_operation" "")
+		  (match_operand:SI 2 "s_register_operand" "r")))]
+  "TARGET_ARM"
+  "rsc%?\\t%0, %2, #1"
+  [(set_attr "conds" "use")
+   (set_attr "predicable" "yes")
+   (set_attr "type" "adc_imm")]
+)
+
 (define_insn "cmpsi3_carryin_<CC_EXTEND>out"
   [(set (reg:<CC_EXTEND> CC_REGNUM)
 	(compare:<CC_EXTEND>
-- 
cgit v1.1


From b09a67eaa107c96203db449af6461f1d35665f57 Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Tue, 22 Oct 2019 16:42:38 +0200
Subject: PR c++/85746: Don't fold __builtin_constant_p prematurely

2019-10-22  Marc Glisse  <marc.glisse@inria.fr>

gcc/cp/
	* constexpr.c (cxx_eval_builtin_function_call): Only set
	force_folding_builtin_constant_p if manifestly_const_eval.

gcc/testsuite/
	* g++.dg/pr85746.C: New file.

From-SVN: r277292
---
 gcc/cp/ChangeLog               |  6 ++++++
 gcc/cp/constexpr.c             |  2 +-
 gcc/testsuite/ChangeLog        |  5 +++++
 gcc/testsuite/g++.dg/pr85746.C | 10 ++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/pr85746.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d09f391..d2b1fe4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-22  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR c++/85746
+	* constexpr.c (cxx_eval_builtin_function_call): Only set
+	force_folding_builtin_constant_p if manifestly_const_eval.
+
 2019-10-22  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* cp-tree.h (STF_USER_VISIBLE): New constant.
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 60d4b9a..2e1b9b7 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1260,7 +1260,7 @@ cxx_eval_builtin_function_call (const constexpr_ctx *ctx, tree t, tree fun,
     }
 
   bool save_ffbcp = force_folding_builtin_constant_p;
-  force_folding_builtin_constant_p = true;
+  force_folding_builtin_constant_p |= ctx->manifestly_const_eval;
   tree save_cur_fn = current_function_decl;
   /* Return name of ctx->call->fundef->decl for __builtin_FUNCTION ().  */
   if (fndecl_built_in_p (fun, BUILT_IN_FUNCTION)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0581b5f..fd27280 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-22  Marc Glisse  <marc.glisse@inria.fr>
+
+	PR c++/85746
+	* g++.dg/pr85746.C: New file.
+
 2019-10-22  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92173
diff --git a/gcc/testsuite/g++.dg/pr85746.C b/gcc/testsuite/g++.dg/pr85746.C
new file mode 100644
index 0000000..25f6795
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr85746.C
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fdump-tree-gimple" } */
+
+int f(int a,int b){
+  // The front-end should not fold this to 0.
+  int c = __builtin_constant_p(a < b);
+  return c;
+}
+
+/* { dg-final { scan-tree-dump "__builtin_constant_p" "gimple" } } */
-- 
cgit v1.1


From 1ee4c3da8668d913419209d484a7cb5a03e7b1fb Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 22 Oct 2019 16:52:52 +0200
Subject: re PR tree-optimization/85887 (Missing DW_TAG_lexical_block PC range)

	PR tree-optimization/85887
	* decl.c (expand_static_init): Drop ECF_LEAF from __cxa_guard_acquire
	and __cxa_guard_release.

From-SVN: r277293
---
 gcc/cp/ChangeLog | 6 ++++++
 gcc/cp/decl.c    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d2b1fe4..3da069f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/85887
+	* decl.c (expand_static_init): Drop ECF_LEAF from __cxa_guard_acquire
+	and __cxa_guard_release.
+
 2019-10-22  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR c++/85746
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 52f1f02..7df4ff9 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8589,14 +8589,14 @@ expand_static_init (tree decl, tree init)
 	      (acquire_name, build_function_type_list (integer_type_node,
 						       TREE_TYPE (guard_addr),
 						       NULL_TREE),
-	       NULL_TREE, ECF_NOTHROW | ECF_LEAF);
+	       NULL_TREE, ECF_NOTHROW);
 	  if (!release_fn || !abort_fn)
 	    vfntype = build_function_type_list (void_type_node,
 						TREE_TYPE (guard_addr),
 						NULL_TREE);
 	  if (!release_fn)
 	    release_fn = push_library_fn (release_name, vfntype, NULL_TREE,
-					   ECF_NOTHROW | ECF_LEAF);
+					  ECF_NOTHROW);
 	  if (!abort_fn)
 	    abort_fn = push_library_fn (abort_name, vfntype, NULL_TREE,
 					ECF_NOTHROW | ECF_LEAF);
-- 
cgit v1.1


From ebb3afe2b98a9a4b1c8cc5fd2745a1037c06d827 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Tue, 22 Oct 2019 18:18:59 +0000
Subject: re PR fortran/92174 (runtime error: index 15 out of bounds for type
 'gfc_expr *[15])

2019-10-22  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/92174
	* decl.c (attr_decl1): Move check for F2018:C822 from here ...
	* array.c (gfc_set_array_spec): ... to here.

From-SVN: r277297
---
 gcc/fortran/ChangeLog |  6 ++++++
 gcc/fortran/array.c   | 14 ++++++++++++++
 gcc/fortran/decl.c    |  9 ---------
 3 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5ba62d2..841aa66 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-22  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/92174
+	* decl.c (attr_decl1): Move check for F2018:C822 from here ...
+	* array.c (gfc_set_array_spec): ... to here. 
+
 2019-10-18  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/69455
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 427110b..f0980dd 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -862,6 +862,10 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc)
 
       sym->as->cotype = as->cotype;
       sym->as->corank = as->corank;
+      /* Check F2018:C822.  */
+      if (sym->as->rank + sym->as->corank > GFC_MAX_DIMENSIONS)
+	goto too_many;
+
       for (i = 0; i < as->corank; i++)
 	{
 	  sym->as->lower[sym->as->rank + i] = as->lower[i];
@@ -880,6 +884,10 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc)
       sym->as->cray_pointee = as->cray_pointee;
       sym->as->cp_was_assumed = as->cp_was_assumed;
 
+      /* Check F2018:C822.  */
+      if (sym->as->rank + sym->as->corank > GFC_MAX_DIMENSIONS)
+	goto too_many;
+
       for (i = 0; i < sym->as->corank; i++)
 	{
 	  sym->as->lower[as->rank + i] = sym->as->lower[i];
@@ -894,6 +902,12 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc)
 
   free (as);
   return true;
+
+too_many:
+
+  gfc_error ("rank + corank of %qs exceeds %d at %C", sym->name,
+	     GFC_MAX_DIMENSIONS);
+  return false;
 }
 
 
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 59e0eac..25a3967 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -8524,15 +8524,6 @@ attr_decl1 (void)
       goto cleanup;
     }
 
-  /* Check F2018:C822.  */
-  if (sym->attr.dimension && sym->attr.codimension
-      && sym->as && sym->as->rank + sym->as->corank > 15)
-    {
-      gfc_error ("rank + corank of %qs exceeds 15 at %C", sym->name);
-      m = MATCH_ERROR;
-      return m;
-    }
-
   if (sym->attr.cray_pointee && sym->as != NULL)
     {
       /* Fix the array spec.  */
-- 
cgit v1.1


From 51940760d7158aeb8d6747c9ee0b784d6869c7ef Mon Sep 17 00:00:00 2001
From: Giuliano Belinassi <giuliano.belinassi@usp.br>
Date: Tue, 22 Oct 2019 19:05:49 +0000
Subject: Fix incorrect merge of conflictant names in `dump_graphviz`

When using lto-dump -callgraph with two or more .o files containing distinct
functions with the same name, dump_graphviz incorrectly merged those functions
into a single node. This patch fixes this issue by calling `dump_name` instead
of `name`, therefore concat'ing the function name with the node's id.

To understeand what was the issue, let's say you have two files:

a.c: static void foo (void) { do_something (); }

b.c: static void foo (void) { do_something_else (); }

These are distinct functions and should be represented as distinct nodes in the
callgraph dump.

2019-10-22  Giuliano Belinassi  <giuliano.belinassi@usp.br>

	* cgraph.c (dump_graphviz): Change name to dump_name

From-SVN: r277299
---
 gcc/ChangeLog | 4 ++++
 gcc/cgraph.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b1a3367..f3450ee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-22  Giuliano Belinassi  <giuliano.belinassi@usp.br>
+
+	* cgraph.c (dump_graphviz): Change name to dump_name
+
 2019-10-22  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/arm.md (rsbsi_carryin_reg): New pattern.
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 8b752d8..671306d 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -2155,7 +2155,7 @@ cgraph_node::dump_graphviz (FILE *f)
     {
       cgraph_node *callee = edge->callee;
 
-      fprintf (f, "\t\"%s\" -> \"%s\"\n", name (), callee->name ());
+      fprintf (f, "\t\"%s\" -> \"%s\"\n", dump_name (), callee->dump_name ());
     }
 }
 
-- 
cgit v1.1


From a4edda8cb663827bc8339ac0964865a4822d125c Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Wed, 23 Oct 2019 00:16:24 +0000
Subject: Daily bump.

From-SVN: r277306
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 3156713..c77090f 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191022
+20191023
-- 
cgit v1.1


From 65a4795fab97a0776c8b44638f0fcf531c98f764 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Wed, 23 Oct 2019 05:39:32 +0000
Subject: [Darwin, PPC] Check for out of range asm values.

There are some cases in which the value for the max skip to a p2align
directive can be negative.  The older assembler just ignores these cases
where newer tools produce an error.  To preserve behaviour, we avoid
emitting out of range values.

gcc/ChangeLog:

2019-10-23  Iain Sandoe  <iain@sandoe.co.uk>

	* config/rs6000/darwin.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Guard
	against out of range max skip or log values.

From-SVN: r277307
---
 gcc/ChangeLog              | 5 +++++
 gcc/config/rs6000/darwin.h | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f3450ee..8ec312d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-23  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/rs6000/darwin.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Guard
+	against out of range max skip or log values.
+
 2019-10-22  Giuliano Belinassi  <giuliano.belinassi@usp.br>
 
 	* cgraph.c (dump_graphviz): Change name to dump_name
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index 1081967..d1a096f 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -329,9 +329,9 @@
 /* This is supported in cctools 465 and later.  The macro test
    above prevents using it in earlier build environments.  */
 #define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP)          \
-  if ((LOG) != 0)                                             \
+  if ((LOG) > 0)                                             \
     {                                                         \
-      if ((MAX_SKIP) == 0)                                    \
+      if ((MAX_SKIP) <= 0)                                    \
         fprintf ((FILE), "\t.p2align %d\n", (LOG));           \
       else                                                    \
         fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \
-- 
cgit v1.1


From f99d62629933adf91e7e0bc1b1ff344ffb68e1a2 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 23 Oct 2019 06:45:03 +0000
Subject: tree-vect-slp.c (vect_build_slp_tree_2): Do not build op from scalars
 in case there's a constant operand in its definition.

2019-10-23  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (vect_build_slp_tree_2): Do not build
	op from scalars in case there's a constant operand in its
	definition.

From-SVN: r277308
---
 gcc/ChangeLog       | 6 ++++++
 gcc/tree-vect-slp.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ec312d..2445523 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-slp.c (vect_build_slp_tree_2): Do not build
+	op from scalars in case there's a constant operand in its
+	definition.
+
 2019-10-23  Iain Sandoe  <iain@sandoe.co.uk>
 
 	* config/rs6000/darwin.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Guard
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 864db64..e1061ed 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -1291,7 +1291,7 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	      slp_tree grandchild;
 
 	      FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (child), j, grandchild)
-		if (SLP_TREE_DEF_TYPE (grandchild) == vect_internal_def)
+		if (SLP_TREE_DEF_TYPE (grandchild) != vect_external_def)
 		  break;
 	      if (!grandchild)
 		{
@@ -1450,7 +1450,7 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 		  slp_tree grandchild;
 
 		  FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (child), j, grandchild)
-		    if (SLP_TREE_DEF_TYPE (grandchild) == vect_internal_def)
+		    if (SLP_TREE_DEF_TYPE (grandchild) != vect_external_def)
 		      break;
 		  if (!grandchild)
 		    {
-- 
cgit v1.1


From ae94bb0ee262e43ee391513210311594abf84e07 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Wed, 23 Oct 2019 10:55:05 +0200
Subject: Do not ICE in IPA inliner.

2019-10-23  Martin Liska  <mliska@suse.cz>

	PR ipa/91969
	* ipa-inline.c (recursive_inlining): Do not print
	when curr->count is not initialized.
2019-10-23  Martin Liska  <mliska@suse.cz>

	PR ipa/91969
	* g++.dg/ipa/pr91969.C: New test.

From-SVN: r277309
---
 gcc/ChangeLog                      |  6 ++++++
 gcc/ipa-inline.c                   |  2 +-
 gcc/testsuite/ChangeLog            |  5 +++++
 gcc/testsuite/g++.dg/ipa/pr91969.C | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/ipa/pr91969.C

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2445523..85cd7a0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/91969
+	* ipa-inline.c (recursive_inlining): Do not print
+	when curr->count is not initialized.
+
 2019-10-23  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-slp.c (vect_build_slp_tree_2): Do not build
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 681801a..ce146e0 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1610,7 +1610,7 @@ recursive_inlining (struct cgraph_edge *edge,
 	{
 	  fprintf (dump_file,
 		   "   Inlining call of depth %i", depth);
-	  if (node->count.nonzero_p ())
+	  if (node->count.nonzero_p () && curr->count.initialized_p ())
 	    {
 	      fprintf (dump_file, " called approx. %.2f times per call",
 		       (double)curr->count.to_gcov_type ()
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd27280..482ff0c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-23  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/91969
+	* g++.dg/ipa/pr91969.C: New test.
+
 2019-10-22  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR c++/85746
diff --git a/gcc/testsuite/g++.dg/ipa/pr91969.C b/gcc/testsuite/g++.dg/ipa/pr91969.C
new file mode 100644
index 0000000..9000672
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr91969.C
@@ -0,0 +1,38 @@
+/* PR ipa/91969 */
+/* { dg-options "-fdump-ipa-inline -O3" } */
+
+enum by
+{
+};
+class A
+{
+public:
+  class B
+  {
+  public:
+    virtual void m_fn2 (by) = 0;
+  };
+  virtual int m_fn1 ();
+  B *cf;
+};
+by a;
+class C : A, A::B
+{
+  void m_fn2 (by);
+};
+void C::m_fn2 (by) { cf->m_fn2 (a); }
+
+struct a
+{
+  virtual ~a ();
+};
+
+struct b
+{
+  virtual void d (...);
+};
+
+struct c : a, b
+{
+  void d (...) {}
+};
-- 
cgit v1.1


From 6bd7e7069504668eb37b2b9c976f4f0942666ef2 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 23 Oct 2019 10:29:36 +0000
Subject: re PR tree-optimization/92179 (r277288 causes ICEs compiling several
 test cases)

2019-10-23  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92179
	* tree-vect-stmts.c (vectorizable_shift): For shift args
	that are all the same remove type restriction in the SLP case.
	Adjust SLP code to handle converting of the shift arg to
	only apply in case the modes are different.

From-SVN: r277310
---
 gcc/ChangeLog         |  8 ++++++++
 gcc/tree-vect-stmts.c | 49 +++++++++++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 20 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85cd7a0..cfc1bdc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92179
+	* tree-vect-stmts.c (vectorizable_shift): For shift args
+	that are all the same remove type restriction in the SLP case.
+	Adjust SLP code to handle converting of the shift arg to
+	only apply in case the modes are different.
+
 2019-10-23  Martin Liska  <mliska@suse.cz>
 
 	PR ipa/91969
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index a44c3de..02b95f51 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5661,6 +5661,7 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
     }
 
   /* Vector shifted by vector.  */
+  bool was_scalar_shift_arg = scalar_shift_arg;
   if (!scalar_shift_arg)
     {
       optab = optab_for_tree_code (code, vectype, optab_vector);
@@ -5720,16 +5721,6 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	      else if (!useless_type_conversion_p (TREE_TYPE (vectype),
 						   TREE_TYPE (op1)))
 		{
-		  if (slp_node
-		      && TYPE_MODE (TREE_TYPE (vectype))
-			 != TYPE_MODE (TREE_TYPE (op1)))
-		    {
-                      if (dump_enabled_p ())
-                        dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-                                         "unusable type for last operand in"
-                                         " vector/vector shift/rotate.\n");
-		      return false;
-		    }
 		  if (vec_stmt && !slp_node)
 		    {
 		      op1 = fold_convert (TREE_TYPE (vectype), op1);
@@ -5831,18 +5822,36 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 		   && !useless_type_conversion_p (TREE_TYPE (vectype),
 						  TREE_TYPE (op1)))
 	    {
-	      /* Convert the scalar constant shift amounts in-place.  */
-	      slp_tree shift = SLP_TREE_CHILDREN (slp_node)[1];
-	      gcc_assert (SLP_TREE_DEF_TYPE (shift) == vect_constant_def);
-	      for (unsigned i = 0;
-		   i < SLP_TREE_SCALAR_OPS (shift).length (); ++i)
+	      if (was_scalar_shift_arg)
 		{
-		  SLP_TREE_SCALAR_OPS (shift)[i]
-		    = fold_convert (TREE_TYPE (vectype),
-				    SLP_TREE_SCALAR_OPS (shift)[i]);
-		  gcc_assert ((TREE_CODE (SLP_TREE_SCALAR_OPS (shift)[i])
-			       == INTEGER_CST));
+		  /* If the argument was the same in all lanes create
+		     the correctly typed vector shift amount directly.  */
+		  op1 = fold_convert (TREE_TYPE (vectype), op1);
+		  op1 = vect_init_vector (stmt_info, op1, TREE_TYPE (vectype),
+					  !loop_vinfo ? gsi : NULL);
+		  vec_oprnd1 = vect_init_vector (stmt_info, op1, vectype,
+						 !loop_vinfo ? gsi : NULL);
+                  vec_oprnds1.create (slp_node->vec_stmts_size);
+		  for (k = 0; k < slp_node->vec_stmts_size; k++)
+		    vec_oprnds1.quick_push (vec_oprnd1);
 		}
+	      else if (dt[1] == vect_constant_def)
+		{
+		  /* Convert the scalar constant shift amounts in-place.  */
+		  slp_tree shift = SLP_TREE_CHILDREN (slp_node)[1];
+		  gcc_assert (SLP_TREE_DEF_TYPE (shift) == vect_constant_def);
+		  for (unsigned i = 0;
+		       i < SLP_TREE_SCALAR_OPS (shift).length (); ++i)
+		    {
+		      SLP_TREE_SCALAR_OPS (shift)[i]
+			  = fold_convert (TREE_TYPE (vectype),
+					  SLP_TREE_SCALAR_OPS (shift)[i]);
+		      gcc_assert ((TREE_CODE (SLP_TREE_SCALAR_OPS (shift)[i])
+				   == INTEGER_CST));
+		    }
+		}
+	      else
+		gcc_assert (TYPE_MODE (op1_vectype) == TYPE_MODE (vectype));
 	    }
 
           /* vec_oprnd1 is available if operand 1 should be of a scalar-type
-- 
cgit v1.1


From d7814449f229cecdee48afe381519a61ea7e3378 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Wed, 23 Oct 2019 10:31:01 +0000
Subject: [AArch64] Don't apply mode_for_int_vector to scalars

aarch64_emit_approx_sqrt handles both vectors and scalars and was using
mode_for_int_vector even for the scalar case.  Although that happened
to work, it isn't how mode_for_int_vector is supposed to be used.

2019-10-23  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/aarch64.c (aarch64_emit_approx_sqrt): Use
	int_mode_for_mode rather than mode_for_int_vector for scalars.

From-SVN: r277311
---
 gcc/ChangeLog                | 5 +++++
 gcc/config/aarch64/aarch64.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cfc1bdc..c2253b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-23  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* config/aarch64/aarch64.c (aarch64_emit_approx_sqrt): Use
+	int_mode_for_mode rather than mode_for_int_vector for scalars.
+
 2019-10-23  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92179
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 2e73f35..e439615 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -11828,7 +11828,9 @@ aarch64_emit_approx_sqrt (rtx dst, rtx src, bool recp)
     /* Caller assumes we cannot fail.  */
     gcc_assert (use_rsqrt_p (mode));
 
-  machine_mode mmsk = mode_for_int_vector (mode).require ();
+  machine_mode mmsk = (VECTOR_MODE_P (mode)
+		       ? mode_for_int_vector (mode).require ()
+		       : int_mode_for_mode (mode).require ());
   rtx xmsk = gen_reg_rtx (mmsk);
   if (!recp)
     /* When calculating the approximate square root, compare the
-- 
cgit v1.1


From 8d509fb6686cf55c8a7ff8297ad9d75a719d8fa6 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Wed, 23 Oct 2019 13:29:10 +0200
Subject: Initialize a field in fibonacci_node.

2019-10-23  Martin Liska  <mliska@suse.cz>

	PR middle-end/81669
	* fibonacci_heap.h (fibonacci_node::fibonacci_node):
	Initialize m_data.

From-SVN: r277313
---
 gcc/ChangeLog        | 6 ++++++
 gcc/fibonacci_heap.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2253b9..958c9ae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  Martin Liska  <mliska@suse.cz>
+
+	PR middle-end/81669
+	* fibonacci_heap.h (fibonacci_node::fibonacci_node):
+	Initialize m_data.
+
 2019-10-23  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/aarch64/aarch64.c (aarch64_emit_approx_sqrt): Use
diff --git a/gcc/fibonacci_heap.h b/gcc/fibonacci_heap.h
index 3bd0a9f..2ff2627 100644
--- a/gcc/fibonacci_heap.h
+++ b/gcc/fibonacci_heap.h
@@ -56,7 +56,7 @@ class fibonacci_node
 public:
   /* Default constructor.  */
   fibonacci_node (): m_parent (NULL), m_child (NULL), m_left (this),
-    m_right (this), m_degree (0), m_mark (0)
+    m_right (this), m_data (NULL), m_degree (0), m_mark (0)
   {
   }
 
-- 
cgit v1.1


From 149a3e4d4e3aacdbfee165f0efea4d6327327265 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Wed, 23 Oct 2019 11:34:48 +0000
Subject: re PR tree-optimization/92131 (incorrect assumption that (ao >= 0) is
 always false)

	PR tree-optimization/92131
	* tree-vrp.c (extract_range_from_plus_minus_expr): If the resulting
	range would be symbolic, drop to varying for any explicit overflow
	in the constant part or if neither range is a singleton.

From-SVN: r277314
---
 gcc/ChangeLog                                    |  7 +++
 gcc/testsuite/ChangeLog                          |  4 ++
 gcc/testsuite/gcc.c-torture/execute/20191023-1.c | 73 ++++++++++++++++++++++++
 gcc/tree-vrp.c                                   | 15 ++---
 4 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/20191023-1.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 958c9ae..3ff5227 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR tree-optimization/92131
+	* tree-vrp.c (extract_range_from_plus_minus_expr): If the resulting
+	range would be symbolic, drop to varying for any explicit overflow
+	in the constant part or if neither range is a singleton.
+
 2019-10-23  Martin Liska  <mliska@suse.cz>
 
 	PR middle-end/81669
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 482ff0c..c578af3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc.c-torture/execute/20191023-1.c: New test.
+
 2019-10-23  Martin Liska  <mliska@suse.cz>
 
 	PR ipa/91969
diff --git a/gcc/testsuite/gcc.c-torture/execute/20191023-1.c b/gcc/testsuite/gcc.c-torture/execute/20191023-1.c
new file mode 100644
index 0000000..3811ebc
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20191023-1.c
@@ -0,0 +1,73 @@
+/* PR tree-optimization/92131 */
+/* Testcase by Armin Rigo <arigo@tunes.org> */
+
+long b, c, d, e, f, i;
+char g, h, j, k;
+int *aa;
+
+static void error (void) __attribute__((noipa));
+static void error (void) { __builtin_abort(); }
+
+static void see_me_here (void) __attribute__((noipa));
+static void see_me_here (void) {}
+
+static void aaa (void) __attribute__((noipa));
+static void aaa (void) {}
+
+static void a (void) __attribute__((noipa));
+static void a (void) {
+  long am, ao;
+  if (aa == 0) {
+    aaa();
+    if (j)
+      goto ay;
+  }
+  return;
+ay:
+  aaa();
+  if (k) {
+    aaa();
+    goto az;
+  }
+  return;
+az:
+  if (i)
+    if (g)
+      if (h)
+        if (e)
+          goto bd;
+  return;
+bd:
+  am = 0;
+  while (am < e) {
+    switch (c) {
+    case 8:
+      goto bh;
+    case 4:
+      return;
+    }
+  bh:
+    if (am >= 0)
+      b = -am;
+    ao = am + b;
+    f = ao & 7;
+    if (f == 0)
+      see_me_here();
+    if (ao >= 0)
+      am++;
+    else
+      error();
+  }
+}
+
+int main (void)
+{
+    j++;
+    k++;
+    i++;
+    g++;
+    h++;
+    e = 1;
+    a();
+    return 0;
+}
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 8d4f16e..ad9be74 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -1652,7 +1652,7 @@ extract_range_from_plus_minus_expr (value_range_base *vr,
   value_range_kind vr0_kind = vr0.kind (), vr1_kind = vr1.kind ();
   tree vr0_min = vr0.min (), vr0_max = vr0.max ();
   tree vr1_min = vr1.min (), vr1_max = vr1.max ();
-  tree min = NULL, max = NULL;
+  tree min = NULL_TREE, max = NULL_TREE;
 
   /* This will normalize things such that calculating
      [0,0] - VR_VARYING is not dropped to varying, but is
@@ -1715,18 +1715,19 @@ extract_range_from_plus_minus_expr (value_range_base *vr,
       combine_bound (code, wmin, min_ovf, expr_type, min_op0, min_op1);
       combine_bound (code, wmax, max_ovf, expr_type, max_op0, max_op1);
 
-      /* If we have overflow for the constant part and the resulting
-	 range will be symbolic, drop to VR_VARYING.  */
-      if (((bool)min_ovf && sym_min_op0 != sym_min_op1)
-	  || ((bool)max_ovf && sym_max_op0 != sym_max_op1))
+      /* If the resulting range will be symbolic, we need to eliminate any
+	 explicit or implicit overflow introduced in the above computation
+	 because compare_values could make an incorrect use of it.  That's
+	 why we require one of the ranges to be a singleton.  */
+      if ((sym_min_op0 != sym_min_op1 || sym_max_op0 != sym_max_op1)
+	  && ((bool)min_ovf || (bool)max_ovf
+	      || (min_op0 != max_op0 && min_op1 != max_op1)))
 	{
 	  vr->set_varying (expr_type);
 	  return;
 	}
 
       /* Adjust the range for possible overflow.  */
-      min = NULL_TREE;
-      max = NULL_TREE;
       set_value_range_with_overflow (kind, min, max, expr_type,
 				     wmin, wmax, min_ovf, max_ovf);
       if (kind == VR_VARYING)
-- 
cgit v1.1


From acfdb9605f32a99dcbddff5753928dee3932b06b Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 23 Oct 2019 14:35:00 +0200
Subject: constexpr.c (cxx_eval_constant_expression): Temporarily change
 input_location to CLEANUP_STMT location.

	* constexpr.c (cxx_eval_constant_expression) <case CLEANUP_STMT>:
	Temporarily change input_location to CLEANUP_STMT location.

	* g++.dg/cpp2a/constexpr-dtor3.C: Expect in 'constexpr' expansion of
	message on the line with variable declaration.
	* g++.dg/ext/constexpr-attr-cleanup1.C: Likewise.

From-SVN: r277320
---
 gcc/cp/ChangeLog                                   |  5 +++++
 gcc/cp/constexpr.c                                 | 22 ++++++++++++++--------
 gcc/testsuite/ChangeLog                            |  6 ++++++
 gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C       |  2 +-
 gcc/testsuite/g++.dg/ext/constexpr-attr-cleanup1.C |  2 +-
 5 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3da069f..4295b0c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* constexpr.c (cxx_eval_constant_expression) <case CLEANUP_STMT>:
+	Temporarily change input_location to CLEANUP_STMT location.
+
 2019-10-22  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/85887
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 2e1b9b7..11a1eaa 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4988,14 +4988,20 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 					  non_constant_p, overflow_p,
 					  jump_target);
 	if (!CLEANUP_EH_ONLY (t) && !*non_constant_p)
-	  /* Also evaluate the cleanup.  If we weren't skipping at the
-	     start of the CLEANUP_BODY, change jump_target temporarily
-	     to &initial_jump_target, so that even a return or break or
-	     continue in the body doesn't skip the cleanup.  */
-	  cxx_eval_constant_expression (ctx, CLEANUP_EXPR (t), true,
-					non_constant_p, overflow_p,
-					jump_target ? &initial_jump_target
-					: NULL);
+	  {
+	    location_t loc = input_location;
+	    if (EXPR_HAS_LOCATION (t))
+	      input_location = EXPR_LOCATION (t);
+	    /* Also evaluate the cleanup.  If we weren't skipping at the
+	       start of the CLEANUP_BODY, change jump_target temporarily
+	       to &initial_jump_target, so that even a return or break or
+	       continue in the body doesn't skip the cleanup.  */
+	    cxx_eval_constant_expression (ctx, CLEANUP_EXPR (t), true,
+					  non_constant_p, overflow_p,
+					  jump_target ? &initial_jump_target
+					  : NULL);
+	    input_location = loc;
+	  }
       }
       break;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c578af3..790ffe4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/cpp2a/constexpr-dtor3.C: Expect in 'constexpr' expansion of
+	message on the line with variable declaration.
+	* g++.dg/ext/constexpr-attr-cleanup1.C: Likewise.
+
 2019-10-23  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc.c-torture/execute/20191023-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C
index dcfa4e6..d946183 100644
--- a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor3.C
@@ -149,7 +149,7 @@ constexpr int x3 = f3 ();
 constexpr int
 f4 ()
 {
-  W7 w13 = 5;
+  W7 w13 = 5;			// { dg-message "in 'constexpr' expansion of" }
   return 0;
 }
 
diff --git a/gcc/testsuite/g++.dg/ext/constexpr-attr-cleanup1.C b/gcc/testsuite/g++.dg/ext/constexpr-attr-cleanup1.C
index 2c4f61a..b6e7c69 100644
--- a/gcc/testsuite/g++.dg/ext/constexpr-attr-cleanup1.C
+++ b/gcc/testsuite/g++.dg/ext/constexpr-attr-cleanup1.C
@@ -15,7 +15,7 @@ cleanup2 (int *x)
 constexpr bool
 foo ()
 {
-  int a __attribute__((cleanup (cleanup))) = 1;
+  int a __attribute__((cleanup (cleanup))) = 1;	// { dg-message "in 'constexpr' expansion of" }
   return true;
 }
 
-- 
cgit v1.1


From d9eabacb0483ac1f730112d551551c258365f02e Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 23 Oct 2019 14:38:03 +0200
Subject: re PR debug/90231 (ivopts causes <optimized away> iterator in the
 loop)

	PR debug/90231
	* tree-ssa-loop-ivopts.c (get_debug_computation_at): New function.
	(remove_unused_ivs): Use it instead of get_computation_at.  When
	choosing best candidate, only consider candidates where
	get_debug_computation_at actually returns non-NULL.

From-SVN: r277321
---
 gcc/ChangeLog              |   8 ++++
 gcc/tree-ssa-loop-ivopts.c | 107 +++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 107 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ff5227..23a7d18 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/90231
+	* tree-ssa-loop-ivopts.c (get_debug_computation_at): New function.
+	(remove_unused_ivs): Use it instead of get_computation_at.  When
+	choosing best candidate, only consider candidates where
+	get_debug_computation_at actually returns non-NULL.
+
 2019-10-23  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR tree-optimization/92131
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 4ab6d6f..74a3ac3 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -4089,6 +4089,94 @@ get_computation_at (class loop *loop, gimple *at,
   return fold_convert (type, aff_combination_to_tree (&aff));
 }
 
+/* Like get_computation_at, but try harder, even if the computation
+   is more expensive.  Intended for debug stmts.  */
+
+static tree
+get_debug_computation_at (class loop *loop, gimple *at,
+			  struct iv_use *use, struct iv_cand *cand)
+{
+  if (tree ret = get_computation_at (loop, at, use, cand))
+    return ret;
+
+  tree ubase = use->iv->base, ustep = use->iv->step;
+  tree cbase = cand->iv->base, cstep = cand->iv->step;
+  tree var;
+  tree utype = TREE_TYPE (ubase), ctype = TREE_TYPE (cbase);
+  widest_int rat;
+
+  /* We must have a precision to express the values of use.  */
+  if (TYPE_PRECISION (utype) >= TYPE_PRECISION (ctype))
+    return NULL_TREE;
+
+  /* Try to handle the case that get_computation_at doesn't,
+     try to express
+     use = ubase + (var - cbase) / ratio.  */
+  if (!constant_multiple_of (cstep, fold_convert (TREE_TYPE (cstep), ustep),
+			     &rat))
+    return NULL_TREE;
+
+  bool neg_p = false;
+  if (wi::neg_p (rat))
+    {
+      if (TYPE_UNSIGNED (ctype))
+	return NULL_TREE;
+      neg_p = true;
+      rat = wi::neg (rat);
+    }
+
+  /* If both IVs can wrap around and CAND doesn't have a power of two step,
+     it is unsafe.  Consider uint16_t CAND with step 9, when wrapping around,
+     the values will be ... 0xfff0, 0xfff9, 2, 11 ... and when use is say
+     uint8_t with step 3, those values divided by 3 cast to uint8_t will be
+     ... 0x50, 0x53, 0, 3 ... rather than expected 0x50, 0x53, 0x56, 0x59.  */
+  if (!use->iv->no_overflow
+      && !cand->iv->no_overflow
+      && !integer_pow2p (cstep))
+    return NULL_TREE;
+
+  int bits = wi::exact_log2 (rat);
+  if (bits == -1)
+    bits = wi::floor_log2 (rat) + 1;
+  if (!cand->iv->no_overflow
+      && TYPE_PRECISION (utype) + bits > TYPE_PRECISION (ctype))
+    return NULL_TREE;
+
+  var = var_at_stmt (loop, cand, at);
+
+  if (POINTER_TYPE_P (ctype))
+    {
+      ctype = unsigned_type_for (ctype);
+      cbase = fold_convert (ctype, cbase);
+      cstep = fold_convert (ctype, cstep);
+      var = fold_convert (ctype, var);
+    }
+
+  ubase = unshare_expr (ubase);
+  cbase = unshare_expr (cbase);
+  if (stmt_after_increment (loop, cand, at))
+    var = fold_build2 (MINUS_EXPR, TREE_TYPE (var), var,
+		       unshare_expr (cstep));
+
+  var = fold_build2 (MINUS_EXPR, TREE_TYPE (var), var, cbase);
+  var = fold_build2 (EXACT_DIV_EXPR, TREE_TYPE (var), var,
+		     wide_int_to_tree (TREE_TYPE (var), rat));
+  if (POINTER_TYPE_P (utype))
+    {
+      var = fold_convert (sizetype, var);
+      if (neg_p)
+	var = fold_build1 (NEGATE_EXPR, sizetype, var);
+      var = fold_build2 (POINTER_PLUS_EXPR, utype, ubase, var);
+    }
+  else
+    {
+      var = fold_convert (utype, var);
+      var = fold_build2 (neg_p ? MINUS_EXPR : PLUS_EXPR, utype,
+			 ubase, var);
+    }
+  return var;
+}
+
 /* Adjust the cost COST for being in loop setup rather than loop body.
    If we're optimizing for space, the loop setup overhead is constant;
    if we're optimizing for speed, amortize it over the per-iteration cost.
@@ -7523,6 +7611,7 @@ remove_unused_ivs (struct ivopts_data *data, bitmap toremove)
 	      struct iv_use dummy_use;
 	      struct iv_cand *best_cand = NULL, *cand;
 	      unsigned i, best_pref = 0, cand_pref;
+	      tree comp = NULL_TREE;
 
 	      memset (&dummy_use, 0, sizeof (dummy_use));
 	      dummy_use.iv = info->iv;
@@ -7543,20 +7632,22 @@ remove_unused_ivs (struct ivopts_data *data, bitmap toremove)
 		    ? 1 : 0;
 		  if (best_cand == NULL || best_pref < cand_pref)
 		    {
-		      best_cand = cand;
-		      best_pref = cand_pref;
+		      tree this_comp
+			= get_debug_computation_at (data->current_loop,
+						    SSA_NAME_DEF_STMT (def),
+						    &dummy_use, cand);
+		      if (this_comp)
+			{
+			  best_cand = cand;
+			  best_pref = cand_pref;
+			  comp = this_comp;
+			}
 		    }
 		}
 
 	      if (!best_cand)
 		continue;
 
-	      tree comp = get_computation_at (data->current_loop,
-					      SSA_NAME_DEF_STMT (def),
-					      &dummy_use, best_cand);
-	      if (!comp)
-		continue;
-
 	      if (count > 1)
 		{
 		  tree vexpr = make_node (DEBUG_EXPR_DECL);
-- 
cgit v1.1


From 82e8e335f917b9ce40801838c06f7945cf88da43 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 23 Oct 2019 12:41:49 +0000
Subject: re PR tree-optimization/65930 (Reduction with sign-change not
 handled)

2019-10-23  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/65930
	* tree-vect-loop.c (check_reduction_path): Allow conversions
	that only change the sign.
	(vectorizable_reduction): Relax latch def stmts we handle further.

	* gcc.dg/vect/vect-reduc-2char-big-array.c: Adjust.
	* gcc.dg/vect/vect-reduc-2char.c: Likewise.
	* gcc.dg/vect/vect-reduc-2short.c: Likewise.
	* gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise.
	* gcc.dg/vect/vect-reduc-pattern-2c.c: Likewise.

From-SVN: r277322
---
 gcc/ChangeLog                                         |  7 +++++++
 gcc/testsuite/ChangeLog                               |  9 +++++++++
 .../gcc.dg/vect/vect-reduc-2char-big-array.c          |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c          |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c        |  8 +-------
 gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c     |  5 +++--
 gcc/tree-vect-loop.c                                  | 19 +++++--------------
 8 files changed, 28 insertions(+), 26 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23a7d18..508207d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/65930
+	* tree-vect-loop.c (check_reduction_path): Allow conversions
+	that only change the sign.
+	(vectorizable_reduction): Relax latch def stmts we handle further.
+
 2019-10-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/90231
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 790ffe4..a9c4413 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/65930
+	* gcc.dg/vect/vect-reduc-2char-big-array.c: Adjust.
+	* gcc.dg/vect/vect-reduc-2char.c: Likewise.
+	* gcc.dg/vect/vect-reduc-2short.c: Likewise.
+	* gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise.
+	* gcc.dg/vect/vect-reduc-pattern-2c.c: Likewise.
+
 2019-10-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* g++.dg/cpp2a/constexpr-dtor3.C: Expect in 'constexpr' expansion of
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
index e246ae7..c40f862 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
@@ -62,4 +62,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
index 5f0551e..dd30455 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
@@ -46,4 +46,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
index 02c2bee..1a2d8d0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
@@ -45,4 +45,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
index b036ad5..c0ee5dc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
@@ -12,12 +12,6 @@ signed char Y[N] __attribute__ ((__aligned__(__BIGGEST_ALIGNMENT__)));
 
 /* char->short->short dot product.
    The dot-product pattern should be detected.
-   The reduction is currently not vectorized becaus of the signed->unsigned->signed
-   casts, since this patch:
-
-     2005-12-26  Kazu Hirata  <kazu@codesourcery.com>
-                                                                                                
-        PR tree-optimization/25125
 
    When the dot-product is detected, the loop should be vectorized on vect_sdot_qi 
    targets (targets that support dot-product of signed char).  
@@ -60,5 +54,5 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" } } */
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
index 8190622..71df574 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
@@ -21,6 +21,8 @@ foo ()
      2005-12-26  Kazu Hirata  <kazu@codesourcery.com>
                                                                                 
         PR tree-optimization/25125
+
+     but we still handle the reduction.
    */
 
   for (i = 0; i < N; i++)
@@ -43,5 +45,4 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_qi_to_hi } } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index e22d2dd..b66f211 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -2695,7 +2695,11 @@ pop:
 	  if (gimple_assign_rhs2 (use_stmt) == op)
 	    neg = ! neg;
 	}
-      if (*code == ERROR_MARK)
+      if (CONVERT_EXPR_CODE_P (use_code)
+	  && tree_nop_conversion_p (TREE_TYPE (gimple_assign_lhs (use_stmt)),
+				    TREE_TYPE (gimple_assign_rhs1 (use_stmt))))
+	;
+      else if (*code == ERROR_MARK)
 	*code = use_code;
       else if (use_code != *code)
 	{
@@ -5692,19 +5696,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
         which is defined by the loop-header-phi.  */
 
   gassign *stmt = as_a <gassign *> (stmt_info->stmt);
-  switch (get_gimple_rhs_class (gimple_assign_rhs_code (stmt)))
-    {
-    case GIMPLE_BINARY_RHS:
-    case GIMPLE_TERNARY_RHS:
-      break;
-
-    case GIMPLE_UNARY_RHS:
-    case GIMPLE_SINGLE_RHS:
-      return false;
-
-    default:
-      gcc_unreachable ();
-    }
   enum tree_code code = gimple_assign_rhs_code (stmt);
   int op_type = TREE_CODE_LENGTH (code);
 
-- 
cgit v1.1


From 07c9f0961d540e2cb63eb2326e673b13d1df4a26 Mon Sep 17 00:00:00 2001
From: Andrew Sutton <asutton@lock3software.com>
Date: Wed, 23 Oct 2019 13:05:32 +0000
Subject: Fix a bug with type constraints in constructors.

gcc/cp/
	* parser.c (cp_parser_constructor_declarator_p): Pass an empty
	decl-specifier-seq to make sure we parse type constraints as part
	of a type-specifier.

gcc/testsuite/
	* g++.dg/cpp2a/concepts5.C: New test.

From-SVN: r277323
---
 gcc/cp/ChangeLog                       |  6 ++++++
 gcc/cp/parser.c                        | 12 ++++++++++--
 gcc/testsuite/ChangeLog                |  4 ++++
 gcc/testsuite/g++.dg/cpp2a/concepts5.C | 24 ++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts5.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4295b0c..d151812 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -126,6 +126,12 @@
 	* decl.c (cxx_maybe_build_cleanup): When clearing location of cleanup,
 	if cleanup is a nop, clear location of its operand too.
 
+2019-10-15  Andrew Sutton  <asutton@lock3software.com>
+
+	* parser.c (cp_parser_constructor_declarator_p): Pass an empty
+	decl-specifier-seq to make sure we parse type constraints as part
+	of a type-specifier.
+
 2019-10-15  Nathan Sidwell  <nathan@acm.org>
 
 	* class.c (build_clones): Break out of clone_function_decl.  Just
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 6433f87..c597adb 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -28336,11 +28336,19 @@ cp_parser_constructor_declarator_p (cp_parser *parser, cp_parser_flags flags,
 	     looking for the type-specifier.  It is actually a function named
 	     `T::fn' that takes one parameter (of type `int') and returns a
 	     value of type `S'.  Constructors can be friends, but they must
-	     use a qualified name.  */
+	     use a qualified name.
+
+	     Parse with an empty set of declaration specifiers since we're
+	     trying to match a decl-specifier-seq of the first parameter.  
+	     This must be non-null so that cp_parser_simple_type_specifier
+	     will recognize a constrained placeholder type such as:
+	     'C<int> auto' where C is a type concept.  */
+	  cp_decl_specifier_seq ctor_specs;
+	  clear_decl_specs (&ctor_specs);
 	  cp_parser_type_specifier (parser,
 				    (friend_p ? CP_PARSER_FLAGS_NONE
 				     : (flags & ~CP_PARSER_FLAGS_OPTIONAL)),
-				    /*decl_specs=*/NULL,
+				    /*decl_specs=*/&ctor_specs,
 				    /*is_declarator=*/true,
 				    /*declares_class_or_enum=*/NULL,
 				    /*is_cv_qualifier=*/NULL);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a9c4413..2fd237b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -344,6 +344,10 @@
 	* gcc.dg/ipa/pr91089.c: Add sub-test for range analysis.
 	* g++.dg/tree-ssa/ivopts-3.C: Force a function to be noinline.
 
+2019-10-15  Andrew Sutton  <asutton@lock3software.com>
+
+	* g++.dg/cpp2a/concepts5.C: New test.
+
 2019-10-15  Andrew Pinski  <apinski@marvell.com>
 
 	* gcc.c-torture/compile/20191015-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts5.C b/gcc/testsuite/g++.dg/cpp2a/concepts5.C
new file mode 100644
index 0000000..24ac2aa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/concepts5.C
@@ -0,0 +1,24 @@
+// { dg-do compile { target c++2a } }
+
+
+template <typename T, typename U>
+concept same_as = __is_same_as(T, U);
+
+template<typename T>
+concept character = same_as<T, char>;
+
+struct T
+{
+  constexpr T(same_as<int> auto const x) : val(0) { }
+
+  constexpr T(character auto const x) : val(1) { }
+
+  int val;
+};
+
+void test()
+{
+  static_assert(T(0).val == 0);
+  static_assert(T('a').val == 1);
+}
+
-- 
cgit v1.1


From 2ccbd21ded6eae4e099ccb1b5952dd3337875087 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Wed, 23 Oct 2019 16:45:24 +0200
Subject: re PR ipa/92074 (26% performance regression on Spec2017
 548.exchange2_r)

	PR ipa/92074
	* params.def (inline-heuristics-hint-percent): Set to 600.

From-SVN: r277333
---
 gcc/ChangeLog  | 5 +++++
 gcc/params.def | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 508207d..ad2cb01d4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/92074
+	* params.def (inline-heuristics-hint-percent): Set to 600.
+
 2019-10-23  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/65930
diff --git a/gcc/params.def b/gcc/params.def
index 322c37f..7928f6f 100644
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -105,7 +105,7 @@ DEFPARAM (PARAM_MAX_INLINE_INSNS_SMALL,
 DEFPARAM (PARAM_INLINE_HEURISTICS_HINT_PERCENT,
 	  "inline-heuristics-hint-percent",
 	  "The scale (in percents) applied to inline-insns-single and auto limits when heuristics hints that inlining is very profitable with -O3 and -Ofast.",
-	  1600, 100, 1000000)
+	  600, 100, 1000000)
 
 DEFPARAM (PARAM_INLINE_HEURISTICS_HINT_PERCENT_O2,
 	  "inline-heuristics-hint-percent-O2",
-- 
cgit v1.1


From 0744333e5acfc814c5de9df479f40df1bf31e19d Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Wed, 23 Oct 2019 16:55:44 +0000
Subject: msp430-protos.h (msp430_has_hwmult): New.

2019-10-23  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430-protos.h (msp430_has_hwmult): New.
	* config/msp430/msp430.c (msp430_no_hwmult): Remove.
	(msp430_has_hwmult): New.
	(msp430_output_labelref):
	s/msp430_hwmult_type != MSP430_HWMULT_NONE/msp430_has_hwmult ()/
	* config/msp430/msp430.md (mulhisi3): Likewise.
	(umulhisi3): Likewise.
	(mulsidi3): Likewise.
	(umulsidi3): Likewise.

From-SVN: r277341
---
 gcc/ChangeLog                     | 12 ++++++++++++
 gcc/config/msp430/msp430-protos.h |  1 +
 gcc/config/msp430/msp430.c        | 22 ++++++++++++----------
 gcc/config/msp430/msp430.md       |  8 ++++----
 4 files changed, 29 insertions(+), 14 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ad2cb01d4..7dc6885 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-23  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* config/msp430/msp430-protos.h (msp430_has_hwmult): New.
+	* config/msp430/msp430.c (msp430_no_hwmult): Remove.
+	(msp430_has_hwmult): New.
+	(msp430_output_labelref):
+	s/msp430_hwmult_type != MSP430_HWMULT_NONE/msp430_has_hwmult ()/
+	* config/msp430/msp430.md (mulhisi3): Likewise.
+	(umulhisi3): Likewise.
+	(mulsidi3): Likewise.
+	(umulsidi3): Likewise.
+
 2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR ipa/92074
diff --git a/gcc/config/msp430/msp430-protos.h b/gcc/config/msp430/msp430-protos.h
index 37ca482..98470ef 100644
--- a/gcc/config/msp430/msp430-protos.h
+++ b/gcc/config/msp430/msp430-protos.h
@@ -48,6 +48,7 @@ int msp430_split_addsi (rtx *);
 void    msp430_start_function (FILE *, const char *, tree);
 rtx	msp430_subreg (machine_mode, rtx, machine_mode, int);
 bool    msp430_use_f5_series_hwmult (void);
+bool	msp430_has_hwmult (void);
 bool msp430_op_not_in_high_mem (rtx op);
 
 #endif /* GCC_MSP430_PROTOS_H */
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 3102939..cd39433 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -3097,20 +3097,22 @@ use_32bit_hwmult (void)
 /* Returns true if the current MCU does not have a
    hardware multiplier of any kind.  */
 
-static bool
-msp430_no_hwmult (void)
+bool
+msp430_has_hwmult (void)
 {
   static const char * cached_match = NULL;
   static bool cached_result;
 
   if (msp430_hwmult_type == MSP430_HWMULT_NONE)
-    return true;
+    return false;
 
+  /* TRUE for any other explicit hwmult specified.  */
   if (msp430_hwmult_type != MSP430_HWMULT_AUTO)
-    return false;
+    return true;
 
+  /* Now handle -mhwmult=auto.  */
   if (target_mcu == NULL)
-    return true;
+    return false;
 
   if (target_mcu == cached_match)
     return cached_result;
@@ -3119,11 +3121,11 @@ msp430_no_hwmult (void)
 
   msp430_extract_mcu_data (target_mcu);
   if (extracted_mcu_data.name != NULL)
-    return cached_result = extracted_mcu_data.hwmpy == 0;
+    return cached_result = extracted_mcu_data.hwmpy != 0;
 
   /* If we do not recognise the MCU name, we assume that it does not support
      any kind of hardware multiply - this is the safest assumption to make.  */
-  return cached_result = true;
+  return cached_result = false;
 }
 
 /* This function does the same as the default, but it will replace GCC
@@ -3143,13 +3145,13 @@ msp430_output_labelref (FILE *file, const char *name)
 
   /* If we have been given a specific MCU name then we may be
      able to make use of its hardware multiply capabilities.  */
-  if (msp430_hwmult_type != MSP430_HWMULT_NONE)
+  if (msp430_has_hwmult ())
     {
       if (strcmp ("__mspabi_mpyi", name) == 0)
 	{
 	  if (msp430_use_f5_series_hwmult ())
 	    name = "__mulhi2_f5";
-	  else if (! msp430_no_hwmult ())
+	  else
 	    name = "__mulhi2";
 	}
       else if (strcmp ("__mspabi_mpyl", name) == 0)
@@ -3158,7 +3160,7 @@ msp430_output_labelref (FILE *file, const char *name)
 	    name = "__mulsi2_f5";
 	  else if (use_32bit_hwmult ())
 	    name = "__mulsi2_hw32";
-	  else if (! msp430_no_hwmult ())
+	  else
 	    name = "__mulsi2";
 	}
     }
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index da4abe9..e5ba445 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -1642,7 +1642,7 @@
   [(set (match_operand:SI                          0 "register_operand" "=r")
 	(mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand" "%0"))
 		 (sign_extend:SI (match_operand:HI 2 "register_operand" "r"))))]
-  "optimize > 2 && msp430_hwmult_type != MSP430_HWMULT_NONE"
+  "optimize > 2 && msp430_has_hwmult ()"
   "*
     if (msp430_use_f5_series_hwmult ())
       return \"PUSH.W sr { DINT { NOP { MOV.W %1, &0x04C2 { MOV.W %2, &0x04C8 { MOV.W &0x04CA, %L0 { MOV.W &0x04CC, %H0 { POP.W sr\";
@@ -1655,7 +1655,7 @@
   [(set (match_operand:SI                          0 "register_operand" "=r")
 	(mult:SI (zero_extend:SI (match_operand:HI 1 "register_operand" "%0"))
 		 (zero_extend:SI (match_operand:HI 2 "register_operand" "r"))))]
-  "optimize > 2 && msp430_hwmult_type != MSP430_HWMULT_NONE"
+  "optimize > 2 && msp430_has_hwmult ()"
   "*
     if (msp430_use_f5_series_hwmult ())
       return \"PUSH.W sr { DINT { NOP { MOV.W %1, &0x04C0 { MOV.W %2, &0x04C8 { MOV.W &0x04CA, %L0 { MOV.W &0x04CC, %H0 { POP.W sr\";
@@ -1668,7 +1668,7 @@
   [(set (match_operand:DI                          0 "register_operand" "=r")
 	(mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "%0"))
 		 (sign_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
-  "optimize > 2 && msp430_hwmult_type != MSP430_HWMULT_NONE"
+  "optimize > 2 && msp430_has_hwmult ()"
   "*
     if (msp430_use_f5_series_hwmult ())
       return \"PUSH.W sr { DINT { NOP { MOV.W %L1, &0x04D4 { MOV.W %H1, &0x04D6 { MOV.W %L2, &0x04E0 { MOV.W %H2, &0x04E2 { MOV.W &0x04E4, %A0 { MOV.W &0x04E6, %B0 { MOV.W &0x04E8, %C0 { MOV.W &0x04EA, %D0 { POP.W sr\";
@@ -1681,7 +1681,7 @@
   [(set (match_operand:DI                          0 "register_operand" "=r")
 	(mult:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "%0"))
 		 (zero_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
-  "optimize > 2 && msp430_hwmult_type != MSP430_HWMULT_NONE"
+  "optimize > 2 && msp430_has_hwmult ()"
   "*
     if (msp430_use_f5_series_hwmult ())
       return \"PUSH.W sr { DINT { NOP { MOV.W %L1, &0x04D0 { MOV.W %H1, &0x04D2 { MOV.W %L2, &0x04E0 { MOV.W %H2, &0x04E2 { MOV.W &0x04E4, %A0 { MOV.W &0x04E6, %B0 { MOV.W &0x04E8, %C0 { MOV.W &0x04EA, %D0 { POP.W sr\";
-- 
cgit v1.1


From 9fdaaf77726f041c05b1e5cba428526c7cc69ad7 Mon Sep 17 00:00:00 2001
From: Qing Zhao <qing.zhao@oracle.com>
Date: Wed, 23 Oct 2019 18:12:39 +0000
Subject: re PR gcov-profile/91971 (Profile directory concatenated with object
 file path)

2019-10-23  qing zhao  <qing.zhao@oracle.com>

	PR gcov-profile/91971
	* coverage.c (coverage_init): Mangle the full path of filename when
	filename is a absolute path.

From-SVN: r277344
---
 gcc/ChangeLog  | 6 ++++++
 gcc/coverage.c | 8 ++++++++
 2 files changed, 14 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7dc6885..e1a4213 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  qing zhao  <qing.zhao@oracle.com>
+
+	PR gcov-profile/91971
+	* coverage.c (coverage_init): Mangle the full path of filename when
+	filename is a absolute path.
+
 2019-10-23  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* config/msp430/msp430-protos.h (msp430_has_hwmult): New.
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 0d5138f..bcba61c 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -1229,6 +1229,14 @@ coverage_init (const char *filename)
       else
 	profile_data_prefix = getpwd ();
     }
+  else
+    {
+      /* when filename is a absolute path, we also need to mangle the full
+      path of filename to prevent the profiling data being stored into a
+      different path than that specified by profile_data_prefix.  */
+      filename = mangle_path (filename);
+      len = strlen (filename);
+    }
 
   if (profile_data_prefix)
     prefix_len = strlen (profile_data_prefix);
-- 
cgit v1.1


From b5b6485f1cc54f21713b5b03c5d63d56839ca458 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Wed, 23 Oct 2019 20:18:31 +0200
Subject: ipa-reference.h (ipa_reference_var_uid): Move offline.

	* ipa-reference.h (ipa_reference_var_uid): Move offline.
	* ipa-reference.c (reference_vars_map_t): new type.
	(ipa_reference_vars_map, ipa_reference_vars_uids): New static vars.
	(ipa_reference_var_uid): Implement.
	(varpool_node_hooks): New static var.
	(varpool_removal_hook): New function.
	(is_improper): Do not check bitmap for id==-1
	(get_static_name): Update.
	(ipa_init): Initialize new datastructures.
	(analyze_function): Do not recompute ids.
	(propagate): Free reference_vars_to_consider.
	(stream_out_bitmap): Update.
	(ipa_reference_read_optimization_summary): Update.

From-SVN: r277345
---
 gcc/ChangeLog       |  16 +++++++
 gcc/ipa-reference.c | 117 ++++++++++++++++++++++++++++++++++++++--------------
 gcc/ipa-reference.h |   7 +---
 3 files changed, 104 insertions(+), 36 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1a4213..4cd0fda 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-reference.h (ipa_reference_var_uid): Move offline.
+	* ipa-reference.c (reference_vars_map_t): new type.
+	(ipa_reference_vars_map, ipa_reference_vars_uids): New static vars.
+	(ipa_reference_var_uid): Implement.
+	(varpool_node_hooks): New static var.
+	(varpool_removal_hook): New function.
+	(is_improper): Do not check bitmap for id==-1
+	(get_static_name): Update.
+	(ipa_init): Initialize new datastructures.
+	(analyze_function): Do not recompute ids.
+	(propagate): Free reference_vars_to_consider.
+	(stream_out_bitmap): Update.
+	(ipa_reference_read_optimization_summary): Update.
+
 2019-10-23  qing zhao  <qing.zhao@oracle.com>
 
 	PR gcov-profile/91971
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 977eb2d..1e35438 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -93,9 +93,11 @@ typedef struct ipa_reference_vars_info_d *ipa_reference_vars_info_t;
 
 /* This map contains all of the static variables that are
    being considered by the compilation level alias analysis.  */
-typedef hash_map<int_hash <unsigned int, -1U>, tree>
-	 reference_vars_to_consider_t;
-static reference_vars_to_consider_t *reference_vars_to_consider;
+typedef hash_map<tree, int> reference_vars_map_t;
+static reference_vars_map_t *ipa_reference_vars_map;
+static int ipa_reference_vars_uids;
+static vec<tree> *reference_vars_to_consider;
+varpool_node_hook_list *varpool_node_hooks;
 
 /* Set of all interesting module statics.  A bit is set for every module
    static we are considering.  This is added to the local info when asm
@@ -137,6 +139,31 @@ public:
 
 static ipa_ref_opt_summary_t *ipa_ref_opt_sum_summaries = NULL;
 
+/* Return ID used by ipa-reference bitmaps.  -1 if failed.  */
+int
+ipa_reference_var_uid (tree t)
+{
+  if (!ipa_reference_vars_map)
+    return -1;
+  int *id = ipa_reference_vars_map->get
+    (symtab_node::get (t)->ultimate_alias_target (NULL)->decl);
+  if (!id)
+    return -1;
+  return *id;
+}
+
+/* Return ID used by ipa-reference bitmaps.  Create new entry if
+   T is not in map.  Set EXISTED accordinly  */
+int
+ipa_reference_var_get_or_insert_uid (tree t, bool *existed)
+{
+  int &id = ipa_reference_vars_map->get_or_insert
+    (symtab_node::get (t)->ultimate_alias_target (NULL)->decl, existed);
+  if (!*existed)
+    id = ipa_reference_vars_uids++;
+  return id;
+}
+
 /* Return the ipa_reference_vars structure starting from the cgraph NODE.  */
 static inline ipa_reference_vars_info_t
 get_reference_vars_info (struct cgraph_node *node)
@@ -257,7 +284,9 @@ is_improper (symtab_node *n, void *v ATTRIBUTE_UNUSED)
 static inline bool
 is_proper_for_analysis (tree t)
 {
-  if (bitmap_bit_p (ignore_module_statics, ipa_reference_var_uid (t)))
+  int id = ipa_reference_var_uid (t);
+
+  if (id != -1 && bitmap_bit_p (ignore_module_statics, id))
     return false;
 
   if (symtab_node::get (t)
@@ -273,7 +302,7 @@ is_proper_for_analysis (tree t)
 static const char *
 get_static_name (int index)
 {
-  return fndecl_name (*reference_vars_to_consider->get (index));
+  return fndecl_name ((*reference_vars_to_consider)[index]);
 }
 
 /* Dump a set of static vars to FILE.  */
@@ -402,6 +431,16 @@ propagate_bits (ipa_reference_global_vars_info_t x_global, struct cgraph_node *x
     }
 }
 
+/* Delete NODE from map.  */
+
+static void
+varpool_removal_hook (varpool_node *node, void *)
+{
+  int *id = ipa_reference_vars_map->get (node->decl)
+  if (id)
+    ipa_reference_vars_map->remove (*id);
+}
+
 static bool ipa_init_p = false;
 
 /* The init routine for analyzing global static variable usage.  See
@@ -414,8 +453,19 @@ ipa_init (void)
 
   ipa_init_p = true;
 
-  if (dump_file)
-    reference_vars_to_consider = new reference_vars_to_consider_t(251);
+  vec_alloc (reference_vars_to_consider, 10);
+
+
+  if (ipa_ref_opt_sum_summaries != NULL)
+    {
+      delete ipa_ref_opt_sum_summaries;
+      ipa_ref_opt_sum_summaries = NULL;
+      delete ipa_reference_vars_map;
+    }
+  ipa_reference_vars_map = new reference_vars_map_t(257);
+  varpool_node_hooks
+	 = symtab->add_varpool_removal_hook (varpool_removal_hook, NULL);
+  ipa_reference_vars_uids = 0;
 
   bitmap_obstack_initialize (&local_info_obstack);
   bitmap_obstack_initialize (&optimization_summary_obstack);
@@ -424,12 +474,6 @@ ipa_init (void)
 
   if (ipa_ref_var_info_summaries == NULL)
     ipa_ref_var_info_summaries = new ipa_ref_var_info_summary_t (symtab);
-
-  if (ipa_ref_opt_sum_summaries != NULL)
-    {
-      delete ipa_ref_opt_sum_summaries;
-      ipa_ref_opt_sum_summaries = NULL;
-    }
 }
 
 
@@ -464,6 +508,8 @@ analyze_function (struct cgraph_node *fn)
   local = init_function_info (fn);
   for (i = 0; fn->iterate_reference (i, ref); i++)
     {
+      int id;
+      bool existed;
       if (!is_a <varpool_node *> (ref->referred))
 	continue;
       var = ref->referred->decl;
@@ -471,22 +517,22 @@ analyze_function (struct cgraph_node *fn)
 	continue;
       /* This is a variable we care about.  Check if we have seen it
 	 before, and if not add it the set of variables we care about.  */
-      if (all_module_statics
-	  && bitmap_set_bit (all_module_statics, ipa_reference_var_uid (var)))
+      id = ipa_reference_var_get_or_insert_uid (var, &existed);
+      if (!existed)
 	{
+	  bitmap_set_bit (all_module_statics, id);
 	  if (dump_file)
-	    reference_vars_to_consider->put (ipa_reference_var_uid (var),
-						var);
+	    reference_vars_to_consider->safe_push (var);
 	}
       switch (ref->use)
 	{
 	case IPA_REF_LOAD:
-          bitmap_set_bit (local->statics_read, ipa_reference_var_uid (var));
+          bitmap_set_bit (local->statics_read, id);
 	  break;
 	case IPA_REF_STORE:
 	  if (ref->cannot_lead_to_return ())
 	    break;
-          bitmap_set_bit (local->statics_written, ipa_reference_var_uid (var));
+          bitmap_set_bit (local->statics_written, id);
 	  break;
 	case IPA_REF_ADDR:
 	  break;
@@ -896,7 +942,7 @@ propagate (void)
     }
 
   if (dump_file)
-    delete reference_vars_to_consider;
+    vec_free (reference_vars_to_consider);
   reference_vars_to_consider = NULL;
   return remove_p ? TODO_remove_functions : 0;
 }
@@ -966,7 +1012,7 @@ stream_out_bitmap (struct lto_simple_output_block *ob,
     return;
   EXECUTE_IF_AND_IN_BITMAP (bits, ltrans_statics, 0, index, bi)
     {
-      tree decl = *reference_vars_to_consider->get (index);
+      tree decl = (*reference_vars_to_consider) [index];
       lto_output_var_decl_index (ob->decl_state, ob->main_stream, decl);
     }
 }
@@ -984,22 +1030,23 @@ ipa_reference_write_optimization_summary (void)
   auto_bitmap ltrans_statics;
   int i;
 
-  reference_vars_to_consider = new reference_vars_to_consider_t (251);
+  vec_alloc (reference_vars_to_consider, ipa_reference_vars_uids);
+  reference_vars_to_consider->safe_grow (ipa_reference_vars_uids);
 
   /* See what variables we are interested in.  */
   for (i = 0; i < lto_symtab_encoder_size (encoder); i++)
     {
       symtab_node *snode = lto_symtab_encoder_deref (encoder, i);
       varpool_node *vnode = dyn_cast <varpool_node *> (snode);
+      int id;
+
       if (vnode
-	  && bitmap_bit_p (all_module_statics,
-			    ipa_reference_var_uid (vnode->decl))
+	  && (id = ipa_reference_var_uid (vnode->decl)) != -1
 	  && referenced_from_this_partition_p (vnode, encoder))
 	{
 	  tree decl = vnode->decl;
-	  bitmap_set_bit (ltrans_statics, ipa_reference_var_uid (decl));
-	  reference_vars_to_consider->put
-		 (ipa_reference_var_uid (decl), decl);
+	  bitmap_set_bit (ltrans_statics, id);
+	  (*reference_vars_to_consider)[id] = decl;
 	  ltrans_statics_bitcount ++;
 	}
     }
@@ -1055,8 +1102,12 @@ ipa_reference_read_optimization_summary (void)
   unsigned int j = 0;
   bitmap_obstack_initialize (&optimization_summary_obstack);
 
-  if (ipa_ref_opt_sum_summaries == NULL)
-    ipa_ref_opt_sum_summaries = new ipa_ref_opt_summary_t (symtab);
+  gcc_checking_assert (ipa_ref_opt_sum_summaries == NULL);
+  ipa_ref_opt_sum_summaries = new ipa_ref_opt_summary_t (symtab);
+  ipa_reference_vars_map = new reference_vars_map_t(257);
+  varpool_node_hooks
+	 = symtab->add_varpool_removal_hook (varpool_removal_hook, NULL);
+  ipa_reference_vars_uids = 0;
 
   all_module_statics = BITMAP_ALLOC (&optimization_summary_obstack);
 
@@ -1083,8 +1134,11 @@ ipa_reference_read_optimization_summary (void)
 	      unsigned int var_index = streamer_read_uhwi (ib);
 	      tree v_decl = lto_file_decl_data_get_var_decl (file_data,
 							     var_index);
+	      bool existed;
 	      bitmap_set_bit (all_module_statics,
-			      ipa_reference_var_uid (v_decl));
+			      ipa_reference_var_get_or_insert_uid
+				 (v_decl, &existed));
+	      gcc_checking_assert (!existed);
 	      if (dump_file)
 		fprintf (dump_file, " %s", fndecl_name (v_decl));
 	    }
@@ -1235,6 +1289,9 @@ ipa_reference_c_finalize (void)
     {
       delete ipa_ref_opt_sum_summaries;
       ipa_ref_opt_sum_summaries = NULL;
+      delete ipa_reference_vars_map;
+      ipa_reference_vars_map = NULL;
+      symtab->remove_varpool_removal_hook (varpool_node_hooks)
     }
 
   if (ipa_init_p)
diff --git a/gcc/ipa-reference.h b/gcc/ipa-reference.h
index 3be02fb..6563db6 100644
--- a/gcc/ipa-reference.h
+++ b/gcc/ipa-reference.h
@@ -25,12 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 bitmap ipa_reference_get_not_read_global (struct cgraph_node *fn);
 bitmap ipa_reference_get_not_written_global (struct cgraph_node *fn);
 void ipa_reference_c_finalize (void);
-
-inline int
-ipa_reference_var_uid (tree t)
-{
-  return DECL_UID (symtab_node::get (t)->ultimate_alias_target (NULL)->decl);
-}
+int ipa_reference_var_uid (tree t);
 
 #endif  /* GCC_IPA_REFERENCE_H  */
 
-- 
cgit v1.1


From ebad2eeed903f7c9cf6c55d37be8af8c84f1cf32 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Wed, 23 Oct 2019 20:22:40 +0200
Subject: lto-streamer-out.c (output_constructor): Push CTORS_OUT timevar.

	* lto-streamer-out.c (output_constructor): Push CTORS_OUT timevar.
	(cmp_symbol_files): New.
	(lto_output): Copy sections in file order.
	* lto-streamer.h (lto_file_decl_data): Add field order.
	* lto-common.c (lto_file_finalize): Add order attribute.
	(lto_create_files_from_ids): Pass order.
	(lto_file_read): UPdate call of lto_create_files_from_ids.

From-SVN: r277346
---
 gcc/ChangeLog          |   7 ++++
 gcc/lto-streamer-out.c | 109 ++++++++++++++++++++++++++++++-------------------
 gcc/lto-streamer.h     |   3 ++
 gcc/lto/ChangeLog      |   6 +++
 gcc/lto/lto-common.c   |  11 +++--
 5 files changed, 91 insertions(+), 45 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4cd0fda..d68bc8a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
 
+	* lto-streamer-out.c (output_constructor): Push CTORS_OUT timevar.
+	(cmp_symbol_files): New.
+	(lto_output): Copy sections in file order.
+	* lto-streamer.h (lto_file_decl_data): Add field order.
+
+2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
+
 	* ipa-reference.h (ipa_reference_var_uid): Move offline.
 	* ipa-reference.c (reference_vars_map_t): new type.
 	(ipa_reference_vars_map, ipa_reference_vars_uids): New static vars.
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 87c9e92..2c71292 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -2228,6 +2228,7 @@ output_constructor (struct varpool_node *node)
     fprintf (streamer_dump_file, "\nStreaming constructor of %s\n",
 	     node->name ());
 
+  timevar_push (TV_IPA_LTO_CTORS_OUT);
   ob = create_output_block (LTO_section_function_body);
 
   clear_line_info (ob);
@@ -2247,6 +2248,7 @@ output_constructor (struct varpool_node *node)
   if (streamer_dump_file)
     fprintf (streamer_dump_file, "Finished streaming %s\n",
 	     node->name ());
+  timevar_pop (TV_IPA_LTO_CTORS_OUT);
 }
 
 
@@ -2427,6 +2429,30 @@ produce_lto_section ()
   destroy_output_block (ob);
 }
 
+/* Compare symbols to get them sorted by filename (to optimize streaming)  */
+
+static int
+cmp_symbol_files (const void *pn1, const void *pn2)
+{
+  const symtab_node *n1 = *(const symtab_node * const *)pn1;
+  const symtab_node *n2 = *(const symtab_node * const *)pn2;
+
+  int file_order1 = n1->lto_file_data ? n1->lto_file_data->order : -1;
+  int file_order2 = n2->lto_file_data ? n2->lto_file_data->order : -1;
+
+  /* Order files same way as they appeared in the command line to reduce
+     seeking while copying sections.  */
+  if (file_order1 != file_order2)
+    return file_order1 - file_order2;
+
+  /* Order within static library.  */
+  if (n1->lto_file_data && n1->lto_file_data->id != n2->lto_file_data->id)
+    return n1->lto_file_data->id - n2->lto_file_data->id;
+
+  /* And finaly order by the definition order.  */
+  return n1->order - n2->order;
+}
+
 /* Main entry point from the pass manager.  */
 
 void
@@ -2435,8 +2461,9 @@ lto_output (void)
   struct lto_out_decl_state *decl_state;
   bitmap output = NULL;
   bitmap_obstack output_obstack;
-  int i, n_nodes;
+  unsigned int i, n_nodes;
   lto_symtab_encoder_t encoder = lto_get_out_decl_state ()->symtab_node_encoder;
+  auto_vec<symtab_node *> symbols_to_copy;
 
   prune_offload_funcs ();
 
@@ -2452,32 +2479,17 @@ lto_output (void)
   produce_lto_section ();
 
   n_nodes = lto_symtab_encoder_size (encoder);
-  /* Process only the functions with bodies.  */
+  /* Prepare vector of functions to output and then sort it to optimize
+     section copying.  */
   for (i = 0; i < n_nodes; i++)
     {
       symtab_node *snode = lto_symtab_encoder_deref (encoder, i);
+      if (snode->alias)
+	continue;
       if (cgraph_node *node = dyn_cast <cgraph_node *> (snode))
 	{
-	  if (lto_symtab_encoder_encode_body_p (encoder, node)
-	      && !node->alias)
-	    {
-	      if (flag_checking)
-		gcc_assert (bitmap_set_bit (output, DECL_UID (node->decl)));
-	      decl_state = lto_new_out_decl_state ();
-	      lto_push_out_decl_state (decl_state);
-	      if (gimple_has_body_p (node->decl)
-		  || (!flag_wpa
-		      && flag_incremental_link != INCREMENTAL_LINK_LTO)
-		  /* Thunks have no body but they may be synthetized
-		     at WPA time.  */
-		  || DECL_ARGUMENTS (node->decl))
-		output_function (node);
-	      else
-		copy_function_or_variable (node);
-	      gcc_assert (lto_get_out_decl_state () == decl_state);
-	      lto_pop_out_decl_state ();
-	      lto_record_function_out_decl_state (node->decl, decl_state);
-	    }
+	  if (lto_symtab_encoder_encode_body_p (encoder, node))
+	    symbols_to_copy.safe_push (node);
 	}
       else if (varpool_node *node = dyn_cast <varpool_node *> (snode))
 	{
@@ -2487,27 +2499,42 @@ lto_output (void)
 	  if (ctor && !in_lto_p)
 	    walk_tree (&ctor, wrap_refs, NULL, NULL);
 	  if (get_symbol_initial_value (encoder, node->decl) == error_mark_node
-	      && lto_symtab_encoder_encode_initializer_p (encoder, node)
-	      && !node->alias)
-	    {
-	      timevar_push (TV_IPA_LTO_CTORS_OUT);
-	      if (flag_checking)
-		gcc_assert (bitmap_set_bit (output, DECL_UID (node->decl)));
-	      decl_state = lto_new_out_decl_state ();
-	      lto_push_out_decl_state (decl_state);
-	      if (DECL_INITIAL (node->decl) != error_mark_node
-		  || (!flag_wpa
-		      && flag_incremental_link != INCREMENTAL_LINK_LTO))
-		output_constructor (node);
-	      else
-		copy_function_or_variable (node);
-	      gcc_assert (lto_get_out_decl_state () == decl_state);
-	      lto_pop_out_decl_state ();
-	      lto_record_function_out_decl_state (node->decl, decl_state);
-	      timevar_pop (TV_IPA_LTO_CTORS_OUT);
-	    }
+	      && lto_symtab_encoder_encode_initializer_p (encoder, node))
+	    symbols_to_copy.safe_push (node);
 	}
     }
+  symbols_to_copy.qsort (cmp_symbol_files);
+  for (i = 0; i < symbols_to_copy.length (); i++)
+    {
+      symtab_node *snode = symbols_to_copy[i];
+      cgraph_node *cnode;
+      varpool_node *vnode;
+
+      if (flag_checking)
+	gcc_assert (bitmap_set_bit (output, DECL_UID (snode->decl)));
+
+      decl_state = lto_new_out_decl_state ();
+      lto_push_out_decl_state (decl_state);
+
+      if ((cnode = dyn_cast <cgraph_node *> (snode))
+	  && (gimple_has_body_p (cnode->decl)
+	      || (!flag_wpa
+		  && flag_incremental_link != INCREMENTAL_LINK_LTO)
+	      /* Thunks have no body but they may be synthetized
+		 at WPA time.  */
+	      || DECL_ARGUMENTS (cnode->decl)))
+	output_function (cnode);
+      else if ((vnode = dyn_cast <varpool_node *> (snode))
+	       && (DECL_INITIAL (vnode->decl) != error_mark_node
+		   || (!flag_wpa
+		       && flag_incremental_link != INCREMENTAL_LINK_LTO)))
+	output_constructor (vnode);
+      else
+	copy_function_or_variable (snode);
+      gcc_assert (lto_get_out_decl_state () == decl_state);
+      lto_pop_out_decl_state ();
+      lto_record_function_out_decl_state (snode->decl, decl_state);
+    }
 
   /* Emit the callgraph after emitting function bodies.  This needs to
      be done now to make sure that all the statements in every function
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 9f787c4..3e4308a 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -603,6 +603,9 @@ struct GTY(()) lto_file_decl_data
   /* Linked list used temporarily in reader */
   struct lto_file_decl_data *next;
 
+  /* Order in which the file appears on the command line.  */
+  int order;
+
   /* Sub ID for merged objects. */
   unsigned HOST_WIDE_INT id;
 
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index bb4e57e..49c77e0 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
+
+	* lto-common.c (lto_file_finalize): Add order attribute.
+	(lto_create_files_from_ids): Pass order.
+	(lto_file_read): UPdate call of lto_create_files_from_ids.
+
 2019-10-12  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto-common.c (read_cgraph_and_symbols): Grow ggc memory use after
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 967f228..cdfc7b0 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -2177,7 +2177,8 @@ create_subid_section_table (struct lto_section_slot *ls, splay_tree file_ids,
 /* Read declarations and other initializations for a FILE_DATA.  */
 
 static void
-lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
+lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file,
+		   int order)
 {
   const char *data;
   size_t len;
@@ -2195,6 +2196,7 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
 
   file_data->renaming_hash_table = lto_create_renaming_table ();
   file_data->file_name = file->filename;
+  file_data->order = order;
 #ifdef ACCEL_COMPILER
   lto_input_mode_table (file_data);
 #else
@@ -2231,9 +2233,9 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
 
 static int
 lto_create_files_from_ids (lto_file *file, struct lto_file_decl_data *file_data,
-			   int *count)
+			   int *count, int order)
 {
-  lto_file_finalize (file_data, file);
+  lto_file_finalize (file_data, file, order);
   if (symtab->dump_file)
     fprintf (symtab->dump_file,
 	     "Creating file %s with sub id " HOST_WIDE_INT_PRINT_HEX "\n",
@@ -2285,9 +2287,10 @@ lto_file_read (lto_file *file, FILE *resolution_file, int *count)
   lto_resolution_read (file_ids, resolution_file, file);
 
   /* Finalize each lto file for each submodule in the merged object.  */
+  int order = 0;
   for (file_data = file_list.first; file_data != NULL;
        file_data = file_data->next)
-    lto_create_files_from_ids (file, file_data, count);
+    lto_create_files_from_ids (file, file_data, count, order++);
 
   splay_tree_delete (file_ids);
   htab_delete (section_hash_table);
-- 
cgit v1.1


From 45012be1f5c7e6039e594bab41ebb94d89a9aca0 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Wed, 23 Oct 2019 21:03:42 +0200
Subject: ipa-reference.c (varpool_removal_hook, [...]): Fix previous patch.

	* ipa-reference.c (varpool_removal_hook, ipa_reference_c_finalize): Fix
	previous patch.

From-SVN: r277347
---
 gcc/ChangeLog       | 5 +++++
 gcc/ipa-reference.c | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d68bc8a..d6c0c9e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
 
+	* ipa-reference.c (varpool_removal_hook, ipa_reference_c_finalize): Fix
+	previous patch.
+
+2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
+
 	* lto-streamer-out.c (output_constructor): Push CTORS_OUT timevar.
 	(cmp_symbol_files): New.
 	(lto_output): Copy sections in file order.
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 1e35438..87d583f 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -436,9 +436,7 @@ propagate_bits (ipa_reference_global_vars_info_t x_global, struct cgraph_node *x
 static void
 varpool_removal_hook (varpool_node *node, void *)
 {
-  int *id = ipa_reference_vars_map->get (node->decl)
-  if (id)
-    ipa_reference_vars_map->remove (*id);
+  ipa_reference_vars_map->remove (node->decl);
 }
 
 static bool ipa_init_p = false;
@@ -1291,7 +1289,7 @@ ipa_reference_c_finalize (void)
       ipa_ref_opt_sum_summaries = NULL;
       delete ipa_reference_vars_map;
       ipa_reference_vars_map = NULL;
-      symtab->remove_varpool_removal_hook (varpool_node_hooks)
+      symtab->remove_varpool_removal_hook (varpool_node_hooks);
     }
 
   if (ipa_init_p)
-- 
cgit v1.1


From 7c1bc95a48ba184da800007a5eb123f8ca81c509 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Wed, 23 Oct 2019 22:01:25 +0200
Subject: lto-streamer-out.c (cmp_symbol_files): Watch for overflow.

	* lto-streamer-out.c (cmp_symbol_files): Watch for overflow.

From-SVN: r277348
---
 gcc/ChangeLog          | 4 ++++
 gcc/lto-streamer-out.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d6c0c9e..b975798 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
 
+	* lto-streamer-out.c (cmp_symbol_files): Watch for overflow.
+
+2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
+
 	* ipa-reference.c (varpool_removal_hook, ipa_reference_c_finalize): Fix
 	previous patch.
 
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 2c71292..3ecaddd 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -2447,7 +2447,12 @@ cmp_symbol_files (const void *pn1, const void *pn2)
 
   /* Order within static library.  */
   if (n1->lto_file_data && n1->lto_file_data->id != n2->lto_file_data->id)
-    return n1->lto_file_data->id - n2->lto_file_data->id;
+    {
+      if (n1->lto_file_data->id > n2->lto_file_data->id)
+	return 1;
+      if (n1->lto_file_data->id < n2->lto_file_data->id)
+	return -1;
+    }
 
   /* And finaly order by the definition order.  */
   return n1->order - n2->order;
-- 
cgit v1.1


From cbb28ef1534b13373bc38533c9e05035fe84894b Mon Sep 17 00:00:00 2001
From: Michael Meissner <meissner@linux.ibm.com>
Date: Wed, 23 Oct 2019 20:09:27 +0000
Subject: Reformat some code; Add support for generating PLWA with offsets
 whose bottom 2 bits are non-zero.

2019-10-23  Michael Meissner  <meissner@linux.ibm.com>

	* config/rs6000/rs6000.md (mov<mode>_64bit_dm): Reformat.
	(movtd_64bit_nodm): Reformat.
	(mov<mode>_32bit): Reformat.
	(mov<mode>_softfloat): Reformat.
	(FMOVE128_GPR splitter): Reformat.
	(DIFD splitter): Reformat.
	(TI2 splitter): Reformat.
	* config/rs6000/predicates.md (lwa_operand): If the bottom two
	bits of the offset for the memory address are non-zero, use PLWA
	if prefixed instructions are available.

From-SVN: r277349
---
 gcc/ChangeLog                   | 13 +++++++++++++
 gcc/config/rs6000/predicates.md |  8 ++++++++
 gcc/config/rs6000/rs6000.md     | 35 ++++++++++++++++++++++++++++-------
 3 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b975798..b3f874b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-23  Michael Meissner  <meissner@linux.ibm.com>
+
+	* config/rs6000/rs6000.md (mov<mode>_64bit_dm): Reformat.
+	(movtd_64bit_nodm): Reformat.
+	(mov<mode>_32bit): Reformat.
+	(mov<mode>_softfloat): Reformat.
+	(FMOVE128_GPR splitter): Reformat.
+	(DIFD splitter): Reformat.
+	(TI2 splitter): Reformat.
+	* config/rs6000/predicates.md (lwa_operand): If the bottom two
+	bits of the offset for the memory address are non-zero, use PLWA
+	if prefixed instructions are available.
+
 2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto-streamer-out.c (cmp_symbol_files): Watch for overflow.
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 345d9c3..5ef505b 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -932,6 +932,14 @@
     return false;
 
   addr = XEXP (inner, 0);
+
+  /* The LWA instruction uses the DS-form instruction format which requires
+     that the bottom two bits of the offset must be 0.  The prefixed PLWA does
+     not have this restriction.  While the actual load from memory is 32-bits,
+     we pass in DImode here to test for using a DS instruction.  */
+  if (address_is_prefixed (addr, DImode, NON_PREFIXED_DS))
+    return true;
+
   if (GET_CODE (addr) == PRE_INC
       || GET_CODE (addr) == PRE_DEC
       || (GET_CODE (addr) == PRE_MODIFY
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index d0cca1e..60b8b8c 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -7761,7 +7761,10 @@
   "#"
   "&& reload_completed"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; }
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+}
   [(set_attr "length" "8")
    (set_attr "isa" "*,*,*,*,*,*,*,*,p8v,p8v")])
 
@@ -7774,7 +7777,10 @@
   "#"
   "&& reload_completed"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; }
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+}
   [(set_attr "length" "8,8,8,12,12,8")])
 
 (define_insn_and_split "*mov<mode>_32bit"
@@ -7789,7 +7795,10 @@
   "#"
   "&& reload_completed"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; }
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+}
   [(set_attr "length" "8,8,8,8,20,20,16")])
 
 (define_insn_and_split "*mov<mode>_softfloat"
@@ -7801,7 +7810,10 @@
   "#"
   "&& reload_completed"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; }
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+}
   [(set_attr_alternative "length"
        [(if_then_else (match_test "TARGET_POWERPC64")
 	    (const_string "8")
@@ -8593,7 +8605,10 @@
        || (!vsx_register_operand (operands[0], <MODE>mode)
            && !vsx_register_operand (operands[1], <MODE>mode)))"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+})
 
 ;; Move SFmode to a VSX from a GPR register.  Because scalar floating point
 ;; type is stored internally as double precision in the VSX registers, we have
@@ -8783,7 +8798,10 @@
    && gpr_or_gpr_p (operands[0], operands[1])
    && !direct_move_p (operands[0], operands[1])"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+})
 
 ;;              GPR store  GPR load   GPR move   GPR li     GPR lis     GPR #
 ;;              FPR store  FPR load   FPR move   AVX store  AVX store   AVX load
@@ -9009,7 +9027,10 @@
    && !direct_move_p (operands[0], operands[1])
    && !quad_load_store_p (operands[0], operands[1])"
   [(pc)]
-{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+})
 
 (define_expand "setmemsi"
   [(parallel [(set (match_operand:BLK 0 "")
-- 
cgit v1.1


From 0998d2fd59e7a5eb3a3566c57625702bbdc6a05f Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 23 Oct 2019 16:41:26 -0400
Subject: Implement P1286R2, Contra CWG1778

The C++11 requirement that an explicit exception-specification on a
defaulted function match the implicit one was found to be problematic for
std::atomic.  This paper, adopted in February, simply removes that
requirement: if an explicitly defaulted function has a different
exception-specification, that now works just like a user-written function:
either it isn't noexcept when it could be, or it is noexcept and will call
terminate if an exception is thrown.

	* method.c (defaulted_late_check): Don't check explicit
	exception-specification on defaulted function.
	(after_nsdmi_defaulted_late_checks): Remove.
	* parser.h (struct cp_unparsed_functions_entry): Remove classes.
	* parser.c (unparsed_classes): Remove.
	(push_unparsed_function_queues, cp_parser_class_specifier_1):
	Adjust.

From-SVN: r277351
---
 gcc/cp/ChangeLog                         | 11 +++++
 gcc/cp/method.c                          | 69 +++-----------------------------
 gcc/cp/parser.c                          | 14 +------
 gcc/cp/parser.h                          |  4 --
 gcc/testsuite/g++.dg/DRs/dr1778.C        |  7 ++++
 gcc/testsuite/g++.dg/cpp0x/defaulted23.C |  4 +-
 gcc/testsuite/g++.dg/cpp0x/defaulted43.C | 10 ++---
 7 files changed, 32 insertions(+), 87 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/DRs/dr1778.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d151812..f587f15 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-23  Jason Merrill  <jason@redhat.com>
+
+	Implement P1286R2, Contra CWG1778
+	* method.c (defaulted_late_check): Don't check explicit
+	exception-specification on defaulted function.
+	(after_nsdmi_defaulted_late_checks): Remove.
+	* parser.h (struct cp_unparsed_functions_entry): Remove classes.
+	* parser.c (unparsed_classes): Remove.
+	(push_unparsed_function_queues, cp_parser_class_specifier_1):
+	Adjust.
+
 2019-10-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* constexpr.c (cxx_eval_constant_expression) <case CLEANUP_STMT>:
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 73a0114..b613e5d 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -2204,40 +2204,12 @@ defaulted_late_check (tree fn)
       return;
     }
 
-  /* 8.4.2/2: An explicitly-defaulted function (...) may have an explicit
-     exception-specification only if it is compatible (15.4) with the 
-     exception-specification on the implicit declaration.  If a function
-     is explicitly defaulted on its first declaration, (...) it is
-     implicitly considered to have the same exception-specification as if
-     it had been implicitly declared.  */
-  maybe_instantiate_noexcept (fn);
-  tree fn_spec = TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn));
-  if (!fn_spec)
-    {
-      if (DECL_DEFAULTED_IN_CLASS_P (fn))
-	TREE_TYPE (fn) = build_exception_variant (TREE_TYPE (fn), eh_spec);
-    }
-  else if (UNEVALUATED_NOEXCEPT_SPEC_P (fn_spec))
-    /* Equivalent to the implicit spec.  */;
-  else if (DECL_DEFAULTED_IN_CLASS_P (fn)
-	   && !CLASSTYPE_TEMPLATE_INSTANTIATION (ctx))
-    /* We can't compare an explicit exception-specification on a
-       constructor defaulted in the class body to the implicit
-       exception-specification until after we've parsed any NSDMI; see
-       after_nsdmi_defaulted_late_checks.  */;
-  else
-    {
-      tree eh_spec = get_defaulted_eh_spec (fn);
-      if (!comp_except_specs (fn_spec, eh_spec, ce_normal))
-	{
-	  if (DECL_DEFAULTED_IN_CLASS_P (fn))
-	    DECL_DELETED_FN (fn) = true;
-	  else
-	    error ("function %q+D defaulted on its redeclaration "
-		   "with an exception-specification that differs from "
-		   "the implicit exception-specification %qX", fn, eh_spec);
-	}
-    }
+  /* If a function is explicitly defaulted on its first declaration without an
+     exception-specification, it is implicitly considered to have the same
+     exception-specification as if it had been implicitly declared.  */
+  if (!TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn))
+      && DECL_DEFAULTED_IN_CLASS_P (fn))
+    TREE_TYPE (fn) = build_exception_variant (TREE_TYPE (fn), eh_spec);
 
   if (DECL_DEFAULTED_IN_CLASS_P (fn)
       && DECL_DECLARED_CONSTEXPR_P (implicit_fn))
@@ -2264,35 +2236,6 @@ defaulted_late_check (tree fn)
     }
 }
 
-/* OK, we've parsed the NSDMI for class T, now we can check any explicit
-   exception-specifications on functions defaulted in the class body.  */
-
-void
-after_nsdmi_defaulted_late_checks (tree t)
-{
-  if (uses_template_parms (t))
-    return;
-  if (t == error_mark_node)
-    return;
-  for (tree fn = TYPE_FIELDS (t); fn; fn = DECL_CHAIN (fn))
-    if (!DECL_ARTIFICIAL (fn)
-	&& DECL_DECLARES_FUNCTION_P (fn)
-	&& DECL_DEFAULTED_IN_CLASS_P (fn))
-      {
-	tree fn_spec = TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn));
-	if (UNEVALUATED_NOEXCEPT_SPEC_P (fn_spec))
-	  continue;
-
-	tree eh_spec = get_defaulted_eh_spec (fn);
-	if (eh_spec == error_mark_node)
-	  continue;
-
-	if (!comp_except_specs (TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)),
-				eh_spec, ce_normal))
-	  DECL_DELETED_FN (fn) = true;
-      }
-}
-
 /* Returns true iff FN can be explicitly defaulted, and gives any
    errors if defaulting FN is ill-formed.  */
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c597adb..3857fe4 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -2005,16 +2005,13 @@ cp_parser_context_new (cp_parser_context* next)
   parser->unparsed_queues->last ().funs_with_definitions
 #define unparsed_nsdmis \
   parser->unparsed_queues->last ().nsdmis
-#define unparsed_classes \
-  parser->unparsed_queues->last ().classes
 #define unparsed_noexcepts \
   parser->unparsed_queues->last ().noexcepts
 
 static void
 push_unparsed_function_queues (cp_parser *parser)
 {
-  cp_unparsed_functions_entry e = { NULL, make_tree_vector (), NULL, NULL,
-				    NULL };
+  cp_unparsed_functions_entry e = { NULL, make_tree_vector (), NULL, NULL };
   vec_safe_push (parser->unparsed_queues, e);
 }
 
@@ -23754,7 +23751,6 @@ cp_parser_class_specifier_1 (cp_parser* parser)
 	     error recovery (c++/71169, c++/71832).  */
 	  vec_safe_truncate (unparsed_funs_with_default_args, 0);
 	  vec_safe_truncate (unparsed_nsdmis, 0);
-	  vec_safe_truncate (unparsed_classes, 0);
 	  vec_safe_truncate (unparsed_funs_with_definitions, 0);
 	}
 
@@ -23809,12 +23805,6 @@ cp_parser_class_specifier_1 (cp_parser* parser)
       if (pushed_scope)
 	pop_scope (pushed_scope);
 
-      /* Now do some post-NSDMI bookkeeping.  */
-      FOR_EACH_VEC_SAFE_ELT (unparsed_classes, ix, class_type)
-	after_nsdmi_defaulted_late_checks (class_type);
-      vec_safe_truncate (unparsed_classes, 0);
-      after_nsdmi_defaulted_late_checks (type);
-
       /* If there are noexcept-specifiers that have not yet been processed,
 	 take care of them now.  */
       class_type = NULL_TREE;
@@ -23885,8 +23875,6 @@ cp_parser_class_specifier_1 (cp_parser* parser)
 	  cp_parser_late_parsing_for_member (parser, decl);
       vec_safe_truncate (unparsed_funs_with_definitions, 0);
     }
-  else
-    vec_safe_push (unparsed_classes, type);
 
   /* Put back any saved access checks.  */
   pop_deferring_access_checks ();
diff --git a/gcc/cp/parser.h b/gcc/cp/parser.h
index 91b5916..2004982 100644
--- a/gcc/cp/parser.h
+++ b/gcc/cp/parser.h
@@ -163,10 +163,6 @@ struct GTY(()) cp_unparsed_functions_entry {
      FIELD_DECLs appear in this list in declaration order.  */
   vec<tree, va_gc> *nsdmis;
 
-  /* Nested classes go in this vector, so that we can do some final
-     processing after parsing any NSDMIs.  */
-  vec<tree, va_gc> *classes;
-
   /* Functions with noexcept-specifiers that require post-processing.  */
   vec<tree, va_gc> *noexcepts;
 };
diff --git a/gcc/testsuite/g++.dg/DRs/dr1778.C b/gcc/testsuite/g++.dg/DRs/dr1778.C
new file mode 100644
index 0000000..8db937f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/DRs/dr1778.C
@@ -0,0 +1,7 @@
+// P1286R2: Contra CWG1778
+// { dg-do compile { target c++11 } }
+
+struct T { T(); T(T &&) noexcept(false); };
+struct U { T t; U(); U(U &&) noexcept = default; };
+U u1;
+U u2 = static_cast<U&&>(u1);      // OK, calls std::terminate if T::T(T&&) throws
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted23.C b/gcc/testsuite/g++.dg/cpp0x/defaulted23.C
index dfbdd2f..2384863 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted23.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted23.C
@@ -10,10 +10,10 @@ A a;
 
 struct B
 {
-  B() throw (int) = default; // { dg-message "exception-specification" "" { target { ! c++17 } } }
+  B() throw (int) = default;
 };				// { dg-error "dynamic exception specification" "" { target c++17 } .-1 }
 				// { dg-warning "deprecated" "" { target { ! c++17 } } .-2 }
-B b;				// { dg-error "deleted" "" { target { ! c++17 } } }
+B b;
 
 struct C
 {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted43.C b/gcc/testsuite/g++.dg/cpp0x/defaulted43.C
index f2846fe..1fe7818 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted43.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted43.C
@@ -17,8 +17,8 @@ struct A
   T t;
 };
 
-A::A() noexcept = default;   // { dg-error "defaulted" }
-A::~A() noexcept = default;  // { dg-error "defaulted" }
+A::A() noexcept = default;
+A::~A() noexcept = default;
 
 struct U
 {
@@ -51,10 +51,10 @@ V v;
 
 struct C
 {
-  C() noexcept = default;	// { dg-message "exception-specification" }
-  ~C() noexcept = default;	// { dg-message "exception-specification" }
+  C() noexcept = default;
+  ~C() noexcept = default;
 
   V v;
 };
 
-C c;				// { dg-error "deleted" }
+C c;
-- 
cgit v1.1


From ca06b86c2fda0d21f44f047983528a9723cb6fea Mon Sep 17 00:00:00 2001
From: Michael Meissner <meissner@linux.ibm.com>
Date: Wed, 23 Oct 2019 20:53:08 +0000
Subject: Rework how prefixed instruction length is calculated.

2019-10-23  Michael Meissner  <meissner@linux.ibm.com>

	* config/rs6000/rs6000-protos.h (rs6000_adjust_insn_length): New
	declaration.
	* config/rs6000/rs6000.c (rs6000_insn_cost): Use num_insns insn
	attribute if it exists, rather than the insn size.  If we use the
	insn size, adjust the size to remove the extra size that prefixed
	instructions take.
	(rs6000_adjust_insn_length): New function.
	* config/rs6000/rs6000.h (ADJUST_INSN_LENGTH): New target hook to
	update the instruction sized if prefixed instructions are used.
	* config/rs6000/rs6000.md (prefixed_length attribute): Delete.
	(non_prefixed_length attribute): Delete.
	(num_insns attribute): New insn attribute to return the number of
	instructions.
	(max_prefixed_insns attribute): New insn attribute to return the
	maximum number of prefixed instructions in an insn.
	(length attribute): Do not adjust for prefix instructions here,
	punt to ADJUST_INSN_LENGTH.
	(mov<mode>_64bit): Set max_prefixed_insns and num_insns.
	(movtd_64bit_nodm): Set max_prefixed_insns and num_insns.
	(mov<mode>_ppc64): Set max_prefixed_insns and num_insns.
	* config/rs6000/vsx.md: (vsx_mov<mode>_64bit): Set
	max_prefixed_insns and num_insns.

From-SVN: r277352
---
 gcc/ChangeLog                     | 23 ++++++++++++++++++
 gcc/config/rs6000/rs6000-protos.h |  1 +
 gcc/config/rs6000/rs6000.c        | 51 ++++++++++++++++++++++++++++++++++++++-
 gcc/config/rs6000/rs6000.h        | 16 +++++++++---
 gcc/config/rs6000/rs6000.md       | 43 ++++++++++++++++++++-------------
 gcc/config/rs6000/vsx.md          |  8 ++++++
 6 files changed, 121 insertions(+), 21 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b3f874b..0c81a10 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,28 @@
 2019-10-23  Michael Meissner  <meissner@linux.ibm.com>
 
+	* config/rs6000/rs6000-protos.h (rs6000_adjust_insn_length): New
+	declaration.
+	* config/rs6000/rs6000.c (rs6000_insn_cost): Use num_insns insn
+	attribute if it exists, rather than the insn size.  If we use the
+	insn size, adjust the size to remove the extra size that prefixed
+	instructions take.
+	(rs6000_adjust_insn_length): New function.
+	* config/rs6000/rs6000.h (ADJUST_INSN_LENGTH): New target hook to
+	update the instruction sized if prefixed instructions are used.
+	* config/rs6000/rs6000.md (prefixed_length attribute): Delete.
+	(non_prefixed_length attribute): Delete.
+	(num_insns attribute): New insn attribute to return the number of
+	instructions.
+	(max_prefixed_insns attribute): New insn attribute to return the
+	maximum number of prefixed instructions in an insn.
+	(length attribute): Do not adjust for prefix instructions here,
+	punt to ADJUST_INSN_LENGTH.
+	(mov<mode>_64bit): Set max_prefixed_insns and num_insns.
+	(movtd_64bit_nodm): Set max_prefixed_insns and num_insns.
+	(mov<mode>_ppc64): Set max_prefixed_insns and num_insns.
+	* config/rs6000/vsx.md: (vsx_mov<mode>_64bit): Set
+	max_prefixed_insns and num_insns.
+
 	* config/rs6000/rs6000.md (mov<mode>_64bit_dm): Reformat.
 	(movtd_64bit_nodm): Reformat.
 	(mov<mode>_32bit): Reformat.
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 08dd88c..6b27d73 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -194,6 +194,7 @@ extern bool prefixed_store_p (rtx_insn *);
 extern bool prefixed_paddi_p (rtx_insn *);
 extern void rs6000_asm_output_opcode (FILE *);
 extern void rs6000_final_prescan_insn (rtx_insn *, rtx [], int);
+extern int rs6000_adjust_insn_length (rtx_insn *, int);
 
 /* Return true if the address can be used for a prefixed load, store, or add
    immediate instructions that cannot be used with a non-prefixed instruction.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 5876714..1399221 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -21076,14 +21076,32 @@ rs6000_insn_cost (rtx_insn *insn, bool speed)
   if (recog_memoized (insn) < 0)
     return 0;
 
+  /* If we are optimizing for size, just use the length.  */
   if (!speed)
     return get_attr_length (insn);
 
+  /* Use the cost if provided.  */
   int cost = get_attr_cost (insn);
   if (cost > 0)
     return cost;
 
-  int n = get_attr_length (insn) / 4;
+  /* If the insn tells us how many insns there are, use that.  Otherwise use
+     the length/4.  Adjust the insn length to remove the extra size that
+     prefixed instructions take.  */
+  int n = get_attr_num_insns (insn);
+  if (n == 0)
+    {
+      int length = get_attr_length (insn);
+      if (get_attr_prefixed (insn) == PREFIXED_YES)
+	{
+	  int adjust = 0;
+	  ADJUST_INSN_LENGTH (insn, adjust);
+	  length -= adjust;
+	}
+
+      n = length / 4;
+    }
+
   enum attr_type type = get_attr_type (insn);
 
   switch (type)
@@ -25087,6 +25105,37 @@ rs6000_asm_output_opcode (FILE *stream)
   return;
 }
 
+/* Adjust the length of an INSN.  LENGTH is the currently-computed length and
+   should be adjusted to reflect any required changes.  This macro is used when
+   there is some systematic length adjustment required that would be difficult
+   to express in the length attribute.
+
+   In the PowerPC, we use this to adjust the length of an instruction if one or
+   more prefixed instructions are generated, using the attribute
+   num_prefixed_insns.  A prefixed instruction is 8 bytes instead of 4, but the
+   hardware requires that a prefied instruciton does not cross a 64-byte
+   boundary.  This means the compiler has to assume the length of the first
+   prefixed instruction is 12 bytes instead of 8 bytes.  Since the length is
+   already set for the non-prefixed instruction, we just need to udpate for the
+   difference.  */
+
+int
+rs6000_adjust_insn_length (rtx_insn *insn, int length)
+{
+  if (TARGET_PREFIXED_ADDR && NONJUMP_INSN_P (insn))
+    {
+      rtx pattern = PATTERN (insn);
+      if (GET_CODE (pattern) != USE && GET_CODE (pattern) != CLOBBER
+	  && get_attr_prefixed (insn) == PREFIXED_YES)
+	{
+	  int num_prefixed = get_attr_max_prefixed_insns (insn);
+	  length += 4 * (num_prefixed + 1);
+	}
+    }
+
+  return length;
+}
+
 
 #ifdef HAVE_GAS_HIDDEN
 # define USE_HIDDEN_LINKONCE 1
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 27373c5..a4ad3f8 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1847,9 +1847,19 @@ extern scalar_int_mode rs6000_pmode;
 /* Adjust the length of an INSN.  LENGTH is the currently-computed length and
    should be adjusted to reflect any required changes.  This macro is used when
    there is some systematic length adjustment required that would be difficult
-   to express in the length attribute.  */
-
-/* #define ADJUST_INSN_LENGTH(X,LENGTH) */
+   to express in the length attribute.
+
+   In the PowerPC, we use this to adjust the length of an instruction if one or
+   more prefixed instructions are generated, using the attribute
+   num_prefixed_insns.  A prefixed instruction is 8 bytes instead of 4, but the
+   hardware requires that a prefied instruciton does not cross a 64-byte
+   boundary.  This means the compiler has to assume the length of the first
+   prefixed instruction is 12 bytes instead of 8 bytes.  Since the length is
+   already set for the non-prefixed instruction, we just need to udpate for the
+   difference.  */
+
+#define ADJUST_INSN_LENGTH(INSN,LENGTH)					\
+  (LENGTH) = rs6000_adjust_insn_length ((INSN), (LENGTH))
 
 /* Given a comparison code (EQ, NE, etc.) and the first operand of a
    COMPARE, return the mode to be used for the comparison.  For
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 60b8b8c..a3c909f 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -285,20 +285,24 @@
 
 	(const_string "no")))
 
-;; Length in bytes of instructions that use prefixed addressing and length in
-;; bytes of instructions that does not use prefixed addressing.  This allows
-;; both lengths to be defined as constants, and the length attribute can pick
-;; the size as appropriate.
-(define_attr "prefixed_length" "" (const_int 12))
-(define_attr "non_prefixed_length" "" (const_int 4))
-
-;; Length of the instruction (in bytes).  Prefixed insns are 8 bytes, but the
-;; assembler might issue need to issue a NOP so that the prefixed instruction
-;; does not cross a cache boundary, which makes them possibly 12 bytes.
-(define_attr "length" ""
-  (if_then_else (eq_attr "prefixed" "yes")
-		(attr "prefixed_length")
-		(attr "non_prefixed_length")))
+;; Return the number of real hardware instructions in a combined insn.  If it
+;; is 0, just use the length / 4.
+(define_attr "num_insns" "" (const_int 0))
+
+;; If an insn is prefixed, return the maximum number of prefixed instructions
+;; in the insn.  The macro ADJUST_INSN_LENGTH uses this number to adjust the
+;; insn length.
+(define_attr "max_prefixed_insns" "" (const_int 1))
+
+;; Length of the instruction (in bytes).  This length does not consider the
+;; length for prefixed instructions.  The macro ADJUST_INSN_LENGTH will adjust
+;; the length if there are prefixed instructions.
+;;
+;; While it might be tempting to use num_insns to calculate the length, it can
+;; be problematical unless all insn lengths are adjusted to use num_insns
+;; (i.e. if num_insns is 0, it will get the length, which in turn will get
+;; num_insns and recurse).
+(define_attr "length" "" (const_int 4))
 
 ;; Processor type -- this attribute must exactly match the processor_type
 ;; enumeration in rs6000-opts.h.
@@ -7766,7 +7770,9 @@
   DONE;
 }
   [(set_attr "length" "8")
-   (set_attr "isa" "*,*,*,*,*,*,*,*,p8v,p8v")])
+   (set_attr "isa" "*,*,*,*,*,*,*,*,p8v,p8v")
+   (set_attr "max_prefixed_insns" "2")
+   (set_attr "num_insns" "2")])
 
 (define_insn_and_split "*movtd_64bit_nodm"
   [(set (match_operand:TD 0 "nonimmediate_operand" "=m,d,d,Y,r,r")
@@ -7781,7 +7787,9 @@
   rs6000_split_multireg_move (operands[0], operands[1]);
   DONE;
 }
-  [(set_attr "length" "8,8,8,12,12,8")])
+  [(set_attr "length" "8,8,8,12,12,8")
+   (set_attr "max_prefixed_insns" "2")
+   (set_attr "num_insns" "2,2,2,3,3,2")])
 
 (define_insn_and_split "*mov<mode>_32bit"
   [(set (match_operand:FMOVE128_FPR 0 "nonimmediate_operand" "=m,d,d,d,Y,r,r")
@@ -8990,7 +8998,8 @@
   return rs6000_output_move_128bit (operands);
 }
   [(set_attr "type" "store,store,load,load,*,*")
-   (set_attr "length" "8")])
+   (set_attr "length" "8")
+   (set_attr "max_prefixed_insns" "2")])
 
 (define_split
   [(set (match_operand:TI2 0 "int_reg_operand")
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 3cc1277..a0b2e7b 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -1149,6 +1149,14 @@
                "vecstore,  vecload,   vecsimple, mffgpr,    mftgpr,    load,
                 store,     load,      store,     *,         vecsimple, vecsimple,
                 vecsimple, *,         *,         vecstore,  vecload")
+   (set_attr "num_insns"
+               "*,         *,         *,         2,         *,         2,
+                2,         2,         2,         2,         *,         *,
+                *,         5,         2,         *,         *")
+   (set_attr "max_prefixed_insns"
+               "*,         *,         *,         *,         *,         2,
+                2,         2,         2,         2,         *,         *,
+                *,         *,         *,         *,         *")
    (set_attr "length"
                "*,         *,         *,         8,         *,         8,
                 8,         8,         8,         8,         *,         *,
-- 
cgit v1.1


From e288c49dd07f5d202c7577e65b7ae5ea861d5ee0 Mon Sep 17 00:00:00 2001
From: "Steven G. Kargl" <kargl@gcc.gnu.org>
Date: Wed, 23 Oct 2019 23:29:25 +0000
Subject: 2019-10-23  Steven G. Kargl  <kargl@gcc.gnu.org>

	dump-parse-tree.c (show_expr): Add dumping of BT_BOZ constants.

From-SVN: r277358
---
 gcc/fortran/ChangeLog         |  4 ++++
 gcc/fortran/dump-parse-tree.c | 10 ++++++++++
 2 files changed, 14 insertions(+)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 841aa66..5bb04d7 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-23  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	dump-parse-tree.c (show_expr): Add dumping of BT_BOZ constants.
+
 2019-10-22  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/92174
diff --git a/gcc/fortran/dump-parse-tree.c b/gcc/fortran/dump-parse-tree.c
index 9d7b26f..9d7aad1 100644
--- a/gcc/fortran/dump-parse-tree.c
+++ b/gcc/fortran/dump-parse-tree.c
@@ -559,6 +559,16 @@ show_expr (gfc_expr *p)
 	  fputc (')', dumpfile);
 	  break;
 
+	case BT_BOZ:
+	  if (p->boz.rdx == 2)
+	    fputs ("b'", dumpfile);
+	  else if (p->boz.rdx == 8)
+	    fputs ("o'", dumpfile);
+	  else
+	    fputs ("z'", dumpfile);
+	  fprintf (dumpfile, "%s'", p->boz.str);
+	  break;
+
 	case BT_HOLLERITH:
 	  fprintf (dumpfile, HOST_WIDE_INT_PRINT_DEC "H",
 		   p->representation.length);
-- 
cgit v1.1


From 15e0f08619b5ce34790e5acc1978d73ad74903dc Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Thu, 24 Oct 2019 00:16:17 +0000
Subject: Daily bump.

From-SVN: r277362
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index c77090f..c364933 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191023
+20191024
-- 
cgit v1.1


From 61d5466b6db685ff3b484ffdd3ae57198a4dd123 Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje.gcc@gmail.com>
Date: Thu, 24 Oct 2019 00:49:02 +0000
Subject: pr70010.c: Add -Wno-psabi.

        * gcc.target/powerpc/pr70010.c: Add -Wno-psabi.
        * gcc.target/powerpc/pr70010-[12].c: Require LTO.
        * gcc.target/powerpc/pr91275.c: Add -mcpu=power8.

From-SVN: r277363
---
 gcc/testsuite/ChangeLog                      | 6 ++++++
 gcc/testsuite/gcc.target/powerpc/pr70010-1.c | 1 +
 gcc/testsuite/gcc.target/powerpc/pr70010-2.c | 1 +
 gcc/testsuite/gcc.target/powerpc/pr70010.c   | 2 +-
 gcc/testsuite/gcc.target/powerpc/pr91275.c   | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2fd237b..b3d44fa 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  David Edelsohn  <dje.gcc@gmail.com>
+
+	* gcc.target/powerpc/pr70010.c: Add -Wno-psabi.
+	* gcc.target/powerpc/pr70010-[12].c: Require LTO.
+	* gcc.target/powerpc/pr91275.c: Add -mcpu=power8.
+
 2019-10-23  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/65930
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-1.c b/gcc/testsuite/gcc.target/powerpc/pr70010-1.c
index 78870db..4b3abb7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70010-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-1.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -flto -mvsx" } */
+/* { dg-require-effective-target lto } */
 
 vector int c, a, b;
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-2.c b/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
index 4c09b21..0c04c53 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -flto -mno-vsx" } */
+/* { dg-require-effective-target lto } */
 
 vector int c, a, b;
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010.c b/gcc/testsuite/gcc.target/powerpc/pr70010.c
index 257ac29..0632358 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70010.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -finline-functions" } */
+/* { dg-options "-O2 -finline-functions -Wno-psabi" } */
 /* { dg-final { scan-assembler {\mbl vadd_no_vsx\M} } } */
 
 typedef int vec_t __attribute__((vector_size(16)));
diff --git a/gcc/testsuite/gcc.target/powerpc/pr91275.c b/gcc/testsuite/gcc.target/powerpc/pr91275.c
index cd46115..bcceec1 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr91275.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr91275.c
@@ -1,7 +1,7 @@
 /* Test that we generate vpmsumd correctly without a swap error.  */
 
 /* { dg-do run { target { p8vector_hw } } } */
-/* { dg-options "-O2 -std=gnu11" } */
+/* { dg-options "-O2 -std=gnu11 -mcpu=power8" } */
 
 #include <altivec.h>
 
-- 
cgit v1.1


From 5a7c45058271ab8a41462a483e696e0f2480b91a Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 24 Oct 2019 00:59:57 +0000
Subject: [C++ PATCH] 'std' identifier not needed

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01707.html
	* cp-tree.c (CPTI_STD_IDENTIFIER): Delete.
	(std_identifier): Delete.
	(DECL_NAME_SPACE_STD_P): Compare against std_node.
	* decl.c (initialize_predefined_identifiers): 'std' is not needed.
	(cxx_init_decl_processing): Adjust creation of ::std.  Use
	{push,pop}_nested_namespace.
	(cxx_builtin_function): Use {push,pop}_nested_namespace.
	* except.c (init_exception_processing): Likewise.
	* rtti.c (init_rtti_processing): Likewise.

From-SVN: r277365
---
 gcc/cp/ChangeLog | 12 ++++++++++++
 gcc/cp/cp-tree.h |  6 +-----
 gcc/cp/decl.c    | 15 +++++++--------
 gcc/cp/except.c  |  4 ++--
 gcc/cp/rtti.c    |  4 ++--
 5 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f587f15..dcf192a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-23  Nathan Sidwell  <nathan@acm.org>
+
+	* cp-tree.c (CPTI_STD_IDENTIFIER): Delete.
+	(std_identifier): Delete.
+	(DECL_NAME_SPACE_STD_P): Compare against std_node.
+	* decl.c (initialize_predefined_identifiers): 'std' is not needed.
+	(cxx_init_decl_processing): Adjust creation of ::std.  Use
+	{push,pop}_nested_namespace.
+	(cxx_builtin_function): Use {push,pop}_nested_namespace.
+	* except.c (init_exception_processing): Likewise.
+	* rtti.c (init_rtti_processing): Likewise.
+
 2019-10-23  Jason Merrill  <jason@redhat.com>
 
 	Implement P1286R2, Contra CWG1778
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index e9d5446..e307ac8 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -149,7 +149,6 @@ enum cp_tree_index
     CPTI_PFN_IDENTIFIER,
     CPTI_VPTR_IDENTIFIER,
     CPTI_GLOBAL_IDENTIFIER,
-    CPTI_STD_IDENTIFIER,
     CPTI_ANON_IDENTIFIER,
     CPTI_AUTO_IDENTIFIER,
     CPTI_DECLTYPE_AUTO_IDENTIFIER,
@@ -289,7 +288,6 @@ extern GTY(()) tree cp_global_trees[CPTI_MAX];
 #define vptr_identifier			cp_global_trees[CPTI_VPTR_IDENTIFIER]
 /* The name of the ::, std & anon namespaces.  */
 #define global_identifier		cp_global_trees[CPTI_GLOBAL_IDENTIFIER]
-#define std_identifier			cp_global_trees[CPTI_STD_IDENTIFIER]
 #define anon_identifier			cp_global_trees[CPTI_ANON_IDENTIFIER]
 /* auto and declspec(auto) identifiers.  */
 #define auto_identifier			cp_global_trees[CPTI_AUTO_IDENTIFIER]
@@ -3335,9 +3333,7 @@ struct GTY(()) lang_decl {
 
 /* Nonzero if NODE is the std namespace.  */
 #define DECL_NAMESPACE_STD_P(NODE)			\
-  (TREE_CODE (NODE) == NAMESPACE_DECL			\
-   && CP_DECL_CONTEXT (NODE) == global_namespace	\
-   && DECL_NAME (NODE) == std_identifier)
+  ((NODE) == std_node)
 
 /* In a TREE_LIST in an attribute list, indicates that the attribute
    must be applied at instantiation time.  */
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7df4ff9..5d51442 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4178,7 +4178,6 @@ initialize_predefined_identifiers (void)
     {"_vptr", &vptr_identifier, cik_normal},
     {"__vtt_parm", &vtt_parm_identifier, cik_normal},
     {"::", &global_identifier, cik_normal},
-    {"std", &std_identifier, cik_normal},
       /* The demangler expects anonymous namespaces to be called
 	 something starting with '_GLOBAL__N_'.  It no longer needs
 	 to be unique to the TU.  */
@@ -4262,7 +4261,7 @@ cxx_init_decl_processing (void)
   current_lang_name = lang_name_c;
 
   /* Create the `std' namespace.  */
-  push_namespace (std_identifier);
+  push_namespace (get_identifier ("std"));
   std_node = current_namespace;
   pop_namespace ();
 
@@ -4392,14 +4391,14 @@ cxx_init_decl_processing (void)
 	tree bad_alloc_type_node;
 	tree bad_alloc_decl;
 
-	push_namespace (std_identifier);
+	push_nested_namespace (std_node);
 	bad_alloc_id = get_identifier ("bad_alloc");
 	bad_alloc_type_node = make_class_type (RECORD_TYPE);
 	TYPE_CONTEXT (bad_alloc_type_node) = current_namespace;
 	bad_alloc_decl
 	  = create_implicit_typedef (bad_alloc_id, bad_alloc_type_node);
 	DECL_CONTEXT (bad_alloc_decl) = current_namespace;
-	pop_namespace ();
+	pop_nested_namespace (std_node);
 
 	new_eh_spec
 	  = add_exception_specifier (NULL_TREE, bad_alloc_type_node, -1);
@@ -4451,11 +4450,11 @@ cxx_init_decl_processing (void)
 
     if (aligned_new_threshold)
       {
-	push_namespace (std_identifier);
+	push_nested_namespace (std_node);
 	tree align_id = get_identifier ("align_val_t");
 	align_type_node = start_enum (align_id, NULL_TREE, size_type_node,
 				      NULL_TREE, /*scoped*/true, NULL);
-	pop_namespace ();
+	pop_nested_namespace (std_node);
 
 	/* operator new (size_t, align_val_t); */
 	newtype = build_function_type_list (ptr_type_node, size_type_node,
@@ -4663,10 +4662,10 @@ cxx_builtin_function (tree decl)
     {
       tree std_decl = copy_decl (decl);
 
-      push_namespace (std_identifier);
+      push_nested_namespace (std_node);
       DECL_CONTEXT (std_decl) = FROB_CONTEXT (std_node);
       pushdecl (std_decl);
-      pop_namespace ();
+      pop_nested_namespace (std_node);
     }
 
   DECL_CONTEXT (decl) = FROB_CONTEXT (current_namespace);
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 1f87c5a..025262c 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -51,14 +51,14 @@ init_exception_processing (void)
   tree tmp;
 
   /* void std::terminate (); */
-  push_namespace (std_identifier);
+  push_nested_namespace (std_node);
   tmp = build_function_type_list (void_type_node, NULL_TREE);
   terminate_fn = build_cp_library_fn_ptr ("terminate", tmp,
 					   ECF_NOTHROW | ECF_NORETURN
 					   | ECF_COLD);
   gcc_checking_assert (TREE_THIS_VOLATILE (terminate_fn)
 		       && TREE_NOTHROW (terminate_fn));
-  pop_namespace ();
+  pop_nested_namespace (std_node);
 
   /* void __cxa_call_unexpected(void *); */
   tmp = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE);
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index c905799..b3d579f 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -168,10 +168,10 @@ init_rtti_processing (void)
 {
   tree type_info_type;
 
-  push_namespace (std_identifier);
+  push_nested_namespace (std_node);
   type_info_type = xref_tag (class_type, get_identifier ("type_info"),
 			     /*tag_scope=*/ts_current, false);
-  pop_namespace ();
+  pop_nested_namespace (std_node);
   const_type_info_type_node
     = cp_build_qualified_type (type_info_type, TYPE_QUAL_CONST);
   type_info_ptr_type = build_pointer_type (const_type_info_type_node);
-- 
cgit v1.1


From 0214d31a48f867b9b00134cea7223d35ed7865aa Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 24 Oct 2019 06:19:01 +0000
Subject: tree-vect-slp.c (vect_analyze_slp): When reduction group SLP
 discovery fails try to handle the reduction as part of...

2019-10-24  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (vect_analyze_slp): When reduction group
	SLP discovery fails try to handle the reduction as part
	of SLP reduction discovery.

	* gcc.dg/vect/slp-reduc-9.c: New testcase.

From-SVN: r277366
---
 gcc/ChangeLog                           |  6 ++++++
 gcc/testsuite/ChangeLog                 |  4 ++++
 gcc/testsuite/gcc.dg/vect/slp-reduc-9.c | 25 +++++++++++++++++++++++++
 gcc/tree-vect-slp.c                     |  4 ++++
 4 files changed, 39 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/vect/slp-reduc-9.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c81a10..9296d5d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-slp.c (vect_analyze_slp): When reduction group
+	SLP discovery fails try to handle the reduction as part
+	of SLP reduction discovery.
+
 2019-10-23  Michael Meissner  <meissner@linux.ibm.com>
 
 	* config/rs6000/rs6000-protos.h (rs6000_adjust_insn_length): New
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b3d44fa..a752086 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/slp-reduc-9.c: New testcase.
+
 2019-10-23  David Edelsohn  <dje.gcc@gmail.com>
 
 	* gcc.target/powerpc/pr70010.c: Add -Wno-psabi.
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-9.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-9.c
new file mode 100644
index 0000000..bee642e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-9.c
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int_mult } */
+
+int
+bar (int *x, int a, int b, int n)
+{
+  x = __builtin_assume_aligned (x, __BIGGEST_ALIGNMENT__);
+  int sum1 = 0;
+  int sum2 = 0;
+  for (int i = 0; i < n; ++i)
+    {
+      /* Reduction chain vectorization fails here because of the
+         different operations but we can still vectorize both
+	 reductions as SLP reductions, saving IVs.  */
+      sum1 += x[2*i] - a;
+      sum1 += x[2*i+1] * b;
+      sum2 += x[2*i] - b;
+      sum2 += x[2*i+1] * a;
+    }
+  return sum1 + sum2;
+}
+
+/* { dg-final { scan-tree-dump "Loop contains only SLP stmts" "vect" } } */
+/* { dg-final { scan-tree-dump "vectorizing stmts using SLP" "vect" } } */
+/* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index e1061ed..0af5119 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -2271,14 +2271,18 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size)
 	      {
 		/* Dissolve reduction chain group.  */
 		stmt_vec_info vinfo = first_element;
+		stmt_vec_info last = NULL;
 		while (vinfo)
 		  {
 		    stmt_vec_info next = REDUC_GROUP_NEXT_ELEMENT (vinfo);
 		    REDUC_GROUP_FIRST_ELEMENT (vinfo) = NULL;
 		    REDUC_GROUP_NEXT_ELEMENT (vinfo) = NULL;
+		    last = vinfo;
 		    vinfo = next;
 		  }
 		STMT_VINFO_DEF_TYPE (first_element) = vect_internal_def;
+		/* It can be still vectorized as part of an SLP reduction.  */
+		loop_vinfo->reductions.safe_push (last);
 	      }
 	}
 
-- 
cgit v1.1


From d136595df77f75bc6e5132e26f09cad031f38c71 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 24 Oct 2019 10:49:02 +0200
Subject: Fix another UBSAN in Fortran coarray.

2019-10-24  Martin Liska  <mliska@suse.cz>

	PR fortran/92174
	* array.c (gfc_resolve_array_spec): Break the loop
	for out of bounds index.
	* resolve.c (is_non_constant_shape_array): Likewise.

From-SVN: r277367
---
 gcc/fortran/ChangeLog | 7 +++++++
 gcc/fortran/array.c   | 3 +++
 gcc/fortran/resolve.c | 3 +++
 3 files changed, 13 insertions(+)

(limited to 'gcc')

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5bb04d7..4e39102 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-24  Martin Liska  <mliska@suse.cz>
+
+	PR fortran/92174
+	* array.c (gfc_resolve_array_spec): Break the loop
+	for out of bounds index.
+	* resolve.c (is_non_constant_shape_array): Likewise.
+
 2019-10-23  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	dump-parse-tree.c (show_expr): Add dumping of BT_BOZ constants.
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index f0980dd..36223d2 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -410,6 +410,9 @@ gfc_resolve_array_spec (gfc_array_spec *as, int check_constant)
 
   for (i = 0; i < as->rank + as->corank; i++)
     {
+      if (i == GFC_MAX_DIMENSIONS)
+	return false;
+
       e = as->lower[i];
       if (!resolve_array_bound (e, check_constant))
 	return false;
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 93f2d0a..5deeb4f 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12266,6 +12266,9 @@ is_non_constant_shape_array (gfc_symbol *sym)
 	 simplification now.  */
       for (i = 0; i < sym->as->rank + sym->as->corank; i++)
 	{
+	  if (i == GFC_MAX_DIMENSIONS)
+	    break;
+
 	  e = sym->as->lower[i];
 	  if (e && (!resolve_index_expr(e)
 		    || !gfc_is_constant_expr (e)))
-- 
cgit v1.1


From 8f4f98f617c117919ccf0abc324eb2e431e8e0b0 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Thu, 24 Oct 2019 09:00:41 +0000
Subject: S/390: Use UNSPEC_GET_TP for thread pointer loads

gcc/ChangeLog:

2019-10-24  Ilya Leoshkevich  <iii@linux.ibm.com>

	* config/s390/s390.c (s390_get_thread_pointer): Use
	gen_get_thread_pointer.
	(s390_expand_split_stack_prologue): Likewise.
	* config/s390/s390.md (UNSPEC_GET_TP): New UNSPEC.
	(*get_tp_31): New 31-bit splitter for UNSPEC_GET_TP.
	(*get_tp_64): New 64-bit splitter for UNSPEC_GET_TP.
	(get_thread_pointer<mode>): Use UNSPEC_GET_TP, use
	parameterized name.

gcc/testsuite/ChangeLog:

2019-10-24  Ilya Leoshkevich  <iii@linux.ibm.com>

	* gcc.target/s390/load-thread-pointer-once-2.c: New test.

From-SVN: r277368
---
 gcc/ChangeLog                                      | 11 +++++++
 gcc/config/s390/s390.c                             |  5 +--
 gcc/config/s390/s390.md                            | 38 +++++++++++++++-------
 gcc/testsuite/ChangeLog                            |  4 +++
 .../gcc.target/s390/load-thread-pointer-once-2.c   | 14 ++++++++
 5 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/s390/load-thread-pointer-once-2.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9296d5d..e0c4c17 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-24  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* config/s390/s390.c (s390_get_thread_pointer): Use
+	gen_get_thread_pointer.
+	(s390_expand_split_stack_prologue): Likewise.
+	* config/s390/s390.md (UNSPEC_GET_TP): New UNSPEC.
+	(*get_tp_31): New 31-bit splitter for UNSPEC_GET_TP.
+	(*get_tp_64): New 64-bit splitter for UNSPEC_GET_TP.
+	(get_thread_pointer<mode>): Use UNSPEC_GET_TP, use
+	parameterized name.
+
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-slp.c (vect_analyze_slp): When reduction group
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 9fed7d3..151b80d 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -5106,7 +5106,8 @@ s390_get_thread_pointer (void)
 {
   rtx tp = gen_reg_rtx (Pmode);
 
-  emit_move_insn (tp, gen_rtx_REG (Pmode, TP_REGNUM));
+  emit_insn (gen_get_thread_pointer (Pmode, tp));
+
   mark_reg_pointer (tp, BITS_PER_WORD);
 
   return tp;
@@ -11711,7 +11712,7 @@ s390_expand_split_stack_prologue (void)
       /* Get thread pointer.  r1 is the only register we can always destroy - r0
 	 could contain a static chain (and cannot be used to address memory
 	 anyway), r2-r6 can contain parameters, and r6-r15 are callee-saved.  */
-      emit_move_insn (r1, gen_rtx_REG (Pmode, TP_REGNUM));
+      emit_insn (gen_get_thread_pointer (Pmode, r1));
       /* Aim at __private_ss.  */
       guard = gen_rtx_MEM (Pmode, plus_constant (Pmode, r1, psso));
 
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 1e6439d..e3881d0 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -105,6 +105,7 @@
    ; TLS support
    UNSPEC_TLSLDM_NTPOFF
    UNSPEC_TLS_LOAD
+   UNSPEC_GET_TP
 
    ; String Functions
    UNSPEC_SRST
@@ -1860,23 +1861,35 @@
                               *,*,yes")
 ])
 
-; Splitters for loading/storing TLS pointers from/to %a0:DI.
-; Do this only during split2, which runs after reload. At the point when split1
-; runs, some of %a0:DI occurrences might be nested inside other rtxes and thus
-; not matched. As a result, only some occurrences will be split, which will
-; prevent CSE. At the point when split2 runs, reload will have ensured that no
-; nested references exist.
+; Splitters for loading TLS pointer from UNSPEC_GET_TP.
+; UNSPEC_GET_TP is used instead of %a0:P, since the latter is a hard register,
+; and those are not handled by Partial Redundancy Elimination (gcse.c), which
+; results in generation of redundant thread pointer loads.
 
-(define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-        (match_operand:DI 1 "register_operand" ""))]
-  "TARGET_ZARCH && ACCESS_REG_P (operands[1]) && reload_completed"
+(define_insn_and_split "*get_tp_31"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(unspec:SI [(match_operand:SI 1 "register_operand" "t")]
+		   UNSPEC_GET_TP))]
+  ""
+  "#"
+  "&& reload_completed"
+  [(set (match_dup 0) (match_dup 1))])
+
+(define_insn_and_split "*get_tp_64"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+	(unspec:DI [(match_operand:DI 1 "register_operand" "t")]
+		   UNSPEC_GET_TP))]
+  "TARGET_ZARCH"
+  "#"
+  "&& reload_completed"
   [(set (match_dup 2) (match_dup 3))
    (set (match_dup 0) (ashift:DI (match_dup 0) (const_int 32)))
    (set (strict_low_part (match_dup 2)) (match_dup 4))]
   "operands[2] = gen_lowpart (SImode, operands[0]);
    s390_split_access_reg (operands[1], &operands[4], &operands[3]);")
 
+; Splitters for storing TLS pointer to %a0:DI.
+
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
         (match_operand:DI 1 "register_operand" ""))]
@@ -10520,8 +10533,9 @@
 ;;- Thread-local storage support.
 ;;
 
-(define_expand "get_thread_pointer<mode>"
-  [(set (match_operand:P 0 "nonimmediate_operand" "") (reg:P TP_REGNUM))]
+(define_expand "@get_thread_pointer<mode>"
+  [(set (match_operand:P 0 "nonimmediate_operand" "")
+	(unspec:P [(reg:P TP_REGNUM)] UNSPEC_GET_TP))]
   ""
   "")
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a752086..337002b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* gcc.target/s390/load-thread-pointer-once-2.c: New test.
+
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	* gcc.dg/vect/slp-reduc-9.c: New testcase.
diff --git a/gcc/testsuite/gcc.target/s390/load-thread-pointer-once-2.c b/gcc/testsuite/gcc.target/s390/load-thread-pointer-once-2.c
new file mode 100644
index 0000000..36b1ed8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/load-thread-pointer-once-2.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+extern void c(void *);
+
+void a(void)
+{
+  void *b = __builtin_thread_pointer();
+  if (b)
+    c(b);
+}
+
+/* { dg-final { scan-assembler-times {\n\tear\t} 2 { target { lp64 } } } } */
+/* { dg-final { scan-assembler-times {\n\tear\t} 1 { target { ! lp64 } } } } */
-- 
cgit v1.1


From 0caece2c6b3fe5d48104db170e72cf3660f825db Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 24 Oct 2019 09:59:24 +0000
Subject: re PR tree-optimization/65930 (Reduction with sign-change not
 handled)

2019-10-24  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/65930
	* gcc.dg/vect/vect-reduc-2char-big-array.c: Adjust again.
	* gcc.dg/vect/vect-reduc-2char.c: Likewise.
	* gcc.dg/vect/vect-reduc-2short.c: Likewise.
	* gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise.
	* gcc.dg/vect/vect-reduc-pattern-2c.c: Likewise.

From-SVN: r277372
---
 gcc/testsuite/ChangeLog                                | 9 +++++++++
 gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c | 2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c           | 2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c          | 2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c         | 2 +-
 gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c      | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 337002b..8b77c22 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/65930
+	* gcc.dg/vect/vect-reduc-2char-big-array.c: Adjust again.
+	* gcc.dg/vect/vect-reduc-2char.c: Likewise.
+	* gcc.dg/vect/vect-reduc-2short.c: Likewise.
+	* gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise.
+	* gcc.dg/vect/vect-reduc-pattern-2c.c: Likewise.
+
 2019-10-24  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* gcc.target/s390/load-thread-pointer-once-2.c: New test.
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
index c40f862..f54bddb 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
@@ -62,4 +62,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { target { ! vect_no_int_min_max } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
index dd30455..edbc74c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
@@ -46,4 +46,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { target { ! vect_no_int_min_max } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
index 1a2d8d0..40b5a34 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
@@ -45,4 +45,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { target { ! vect_no_int_min_max } } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
index c0ee5dc..b55cf6f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
@@ -54,5 +54,5 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" } } */
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_qi_to_hi } } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
index 71df574..926b203 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
@@ -45,4 +45,4 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_sum_qi_to_hi } } } } */
-- 
cgit v1.1


From 3574e5df1f2a483b992b272ec57080472c24f0cb Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 24 Oct 2019 10:23:52 +0000
Subject: re PR tree-optimization/65930 (Reduction with sign-change not
 handled)

2019-10-24  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/65930
	* gcc.dg/vect/vect-reduc-2short.c: Fix typo.

From-SVN: r277373
---
 gcc/testsuite/ChangeLog                       | 5 +++++
 gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8b77c22..1497563 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/65930
+	* gcc.dg/vect/vect-reduc-2short.c: Fix typo.
+
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/65930
 	* gcc.dg/vect/vect-reduc-2char-big-array.c: Adjust again.
 	* gcc.dg/vect/vect-reduc-2char.c: Likewise.
 	* gcc.dg/vect/vect-reduc-2short.c: Likewise.
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
index 40b5a34..0e78a3d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
@@ -45,4 +45,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { target { ! vect_no_int_min_max } } } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { target { ! vect_no_int_min_max } } } } */
-- 
cgit v1.1


From ee80f0c6ba50ebf0300fb0cfe1079a1321295749 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 24 Oct 2019 11:23:54 +0000
Subject: re PR tree-optimization/92203 (ICE in eliminate_stmt, at
 tree-ssa-sccvn.c:5492)

2019-10-24  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92203
	* treee-ssa-sccvn.c (eliminate_dom_walker::eliminate_stmt):
	Skip eliminating conversion stmts inserted by insertion.

	* gcc.dg/torture/pr92203.c: New testcase.

From-SVN: r277374
---
 gcc/ChangeLog                          |  6 ++++++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gcc.dg/torture/pr92203.c | 37 ++++++++++++++++++++++++++++++++++
 gcc/tree-ssa-sccvn.c                   |  9 +++++++--
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/pr92203.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0c4c17..4873330 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92203
+	* treee-ssa-sccvn.c (eliminate_dom_walker::eliminate_stmt):
+	Skip eliminating conversion stmts inserted by insertion.
+
 2019-10-24  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* config/s390/s390.c (s390_get_thread_pointer): Use
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1497563..5a1cd91 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/92203
+	* gcc.dg/torture/pr92203.c: New testcase.
+
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/65930
 	* gcc.dg/vect/vect-reduc-2short.c: Fix typo.
 
diff --git a/gcc/testsuite/gcc.dg/torture/pr92203.c b/gcc/testsuite/gcc.dg/torture/pr92203.c
new file mode 100644
index 0000000..c752969
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr92203.c
@@ -0,0 +1,37 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-Wno-div-by-zero" } */
+
+unsigned long int rr;
+
+void
+cw (int z9)
+{
+  int m5;
+  unsigned long int vz = 0;
+  long int *na;
+
+  if (z9 == 0)
+    rr = 0;
+  else
+    {
+      na = (long int *) &m5;
+      for (*na = 0; *na < 1; ++*na)
+	{
+	  na = (long int *) &vz;
+	  rr /= 0;
+	}
+    }
+
+  m5 = rr / 5;
+  ++vz;
+  if (vz != 0)
+    while (z9 < 1)
+      {
+	if (m5 >= 0)
+	  rr += m5;
+
+	na = (long int *) &rr;
+	if (*na >= 0)
+	  rr = 0;
+      }
+}
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 57331ab..3872168 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -5459,8 +5459,13 @@ eliminate_dom_walker::eliminate_stmt (basic_block b, gimple_stmt_iterator *gsi)
 
 	  /* If this is an assignment from our leader (which
 	     happens in the case the value-number is a constant)
-	     then there is nothing to do.  */
-	  if (gimple_assign_single_p (stmt)
+	     then there is nothing to do.  Likewise if we run into
+	     inserted code that needed a conversion because of
+	     our type-agnostic value-numbering of loads.  */
+	  if ((gimple_assign_single_p (stmt)
+	       || (is_gimple_assign (stmt)
+		   && (CONVERT_EXPR_CODE_P (gimple_assign_rhs_code (stmt))
+		       || gimple_assign_rhs_code (stmt) == VIEW_CONVERT_EXPR)))
 	      && sprime == gimple_assign_rhs1 (stmt))
 	    return;
 
-- 
cgit v1.1


From e227594789d909fbad56f6036910938678738f92 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 24 Oct 2019 12:11:27 +0000
Subject: re PR tree-optimization/92205 (ICE in vect_get_vec_def_for_stmt_copy,
 at tree-vect-stmts.c:1688 since r277322)

2019-10-24  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92205
	* tree-vect-loop.c (vectorizable_reduction): Restrict
	search for alternate vectype_in to lane-reducing patterns
	we support.

	* gcc.dg/vect/pr92205.c: New testcase.

From-SVN: r277375
---
 gcc/ChangeLog                       |  7 +++++++
 gcc/testsuite/ChangeLog             |  5 +++++
 gcc/testsuite/gcc.dg/vect/pr92205.c | 13 +++++++++++++
 gcc/tree-vect-loop.c                | 10 ++++++----
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/vect/pr92205.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4873330..d09b72d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/92205
+	* tree-vect-loop.c (vectorizable_reduction): Restrict
+	search for alternate vectype_in to lane-reducing patterns
+	we support.
+
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/92203
 	* treee-ssa-sccvn.c (eliminate_dom_walker::eliminate_stmt):
 	Skip eliminating conversion stmts inserted by insertion.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a1cd91..2742e10 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/92205
+	* gcc.dg/vect/pr92205.c: New testcase.
+
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
 	PR tree-optimization/92203
 	* gcc.dg/torture/pr92203.c: New testcase.
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr92205.c b/gcc/testsuite/gcc.dg/vect/pr92205.c
new file mode 100644
index 0000000..ea06660
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr92205.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int } */
+
+int b(int n, unsigned char *a)
+{
+  int d = 0;
+  a = __builtin_assume_aligned (a, __BIGGEST_ALIGNMENT__);
+  for (int c = 0; c < n; ++c)
+    d |= a[c];
+  return d;
+}
+
+/* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" { target { vect_unpack && { ! vect_no_bitwise } } } } } */
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index b66f211..9c5ce47 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -5697,6 +5697,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 
   gassign *stmt = as_a <gassign *> (stmt_info->stmt);
   enum tree_code code = gimple_assign_rhs_code (stmt);
+  bool lane_reduc_code_p
+    = (code == DOT_PROD_EXPR || code == WIDEN_SUM_EXPR || code == SAD_EXPR);
   int op_type = TREE_CODE_LENGTH (code);
 
   scalar_dest = gimple_assign_lhs (stmt);
@@ -5749,8 +5751,10 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
 	return false;
 
       /* To properly compute ncopies we are interested in the widest
-	 input type in case we're looking at a widening accumulation.  */
-      if (tem
+	 non-reduction input type in case we're looking at a widening
+	 accumulation that we later handle in vect_transform_reduction.  */
+      if (lane_reduc_code_p
+	  && tem
 	  && (!vectype_in
 	      || (GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (vectype_in)))
 		  < GET_MODE_SIZE (SCALAR_TYPE_MODE (TREE_TYPE (tem))))))
@@ -6233,8 +6237,6 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       && vect_stmt_to_vectorize (use_stmt_info) == stmt_info)
     single_defuse_cycle = true;
 
-  bool lane_reduc_code_p
-    = (code == DOT_PROD_EXPR || code == WIDEN_SUM_EXPR || code == SAD_EXPR);
   if (single_defuse_cycle || lane_reduc_code_p)
     {
       gcc_assert (code != COND_EXPR);
-- 
cgit v1.1


From d8e4dc54a615a1c6d268ecae70bcf8e85054aa7e Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Thu, 24 Oct 2019 13:34:54 +0000
Subject: MSP430: Tweaks to generation of 430X instructions

gcc/ChangeLog:

2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/constraints.md: Allow post_inc for "Ya" constraint.
	* config/msp430/msp430.md (430x_shift_left): Use RLAM when the constant
	shift amount is between 1 and 4.
	(430x_arithmetic_shift_right): Use RRAM when the constant shift amount
	is between 1 and 4.

gcc/testsuite/ChangeLog:

2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* gcc.target/msp430/emulate-slli.c: Skip for -mcpu=msp430.
	Add shift by a constant 5 bits.
	Update scan-assembler directives.
	* gcc.target/msp430/emulate-srai.c: Likewise.
	* gcc.target/msp430/emulate-srli.c: Skip for -mcpu=msp430.

From-SVN: r277394
---
 gcc/ChangeLog                                  |  8 ++++++++
 gcc/config/msp430/constraints.md               |  1 +
 gcc/config/msp430/msp430.md                    | 12 ++++++++----
 gcc/testsuite/ChangeLog                        |  8 ++++++++
 gcc/testsuite/gcc.target/msp430/emulate-slli.c |  6 +++++-
 gcc/testsuite/gcc.target/msp430/emulate-srai.c |  6 +++++-
 gcc/testsuite/gcc.target/msp430/emulate-srli.c |  1 +
 7 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d09b72d..eb0a2f9b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* config/msp430/constraints.md: Allow post_inc for "Ya" constraint.
+	* config/msp430/msp430.md (430x_shift_left): Use RLAM when the constant
+	shift amount is between 1 and 4.
+	(430x_arithmetic_shift_right): Use RRAM when the constant shift amount
+	is between 1 and 4.
+
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92205
diff --git a/gcc/config/msp430/constraints.md b/gcc/config/msp430/constraints.md
index d01bcf9..49fc769 100644
--- a/gcc/config/msp430/constraints.md
+++ b/gcc/config/msp430/constraints.md
@@ -82,6 +82,7 @@
 		  (match_test ("CONST_INT_P (XEXP (XEXP (op, 0), 1))"))
 		  (match_test ("IN_RANGE (INTVAL (XEXP (XEXP (op, 0), 1)), HOST_WIDE_INT_M1U << 15, (1 << 15)-1)"))))
 	(match_code "reg" "0")
+	(match_code "post_inc" "0")
 	)))
 
 (define_constraint "Yc"
diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md
index e5ba445..ed4c370 100644
--- a/gcc/config/msp430/msp430.md
+++ b/gcc/config/msp430/msp430.md
@@ -875,8 +875,10 @@
 		   (match_operand    2 "immediate_operand" "n")))]
   "msp430x"
   "*
-  if (INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 16)
-    return \"rpt\t%2 { rlax.w\t%0\";
+  if (INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 5)
+    return \"RLAM.W\t%2, %0\";
+  else if (INTVAL (operands[2]) >= 5 && INTVAL (operands[2]) < 16)
+    return \"RPT\t%2 { RLAX.W\t%0\";
   return \"# nop left shift\";
   "
 )
@@ -960,8 +962,10 @@
 		     (match_operand    2 "immediate_operand" "n")))]
   "msp430x"
   "*
-  if (INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 16)
-    return \"rpt\t%2 { rrax.w\t%0\";
+  if (INTVAL (operands[2]) > 0 && INTVAL (operands[2]) < 5)
+    return \"RRAM.W\t%2, %0\";
+  else if (INTVAL (operands[2]) >= 5 && INTVAL (operands[2]) < 16)
+    return \"RPT\t%2 { RRAX.W\t%0\";
   return \"# nop arith right shift\";
   "
 )
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2742e10..ee43703 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/emulate-slli.c: Skip for -mcpu=msp430.
+	Add shift by a constant 5 bits.
+	Update scan-assembler directives.
+	* gcc.target/msp430/emulate-srai.c: Likewise.
+	* gcc.target/msp430/emulate-srli.c: Skip for -mcpu=msp430.
+
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92205
diff --git a/gcc/testsuite/gcc.target/msp430/emulate-slli.c b/gcc/testsuite/gcc.target/msp430/emulate-slli.c
index 0ed09d5..1c8459c 100644
--- a/gcc/testsuite/gcc.target/msp430/emulate-slli.c
+++ b/gcc/testsuite/gcc.target/msp430/emulate-slli.c
@@ -1,15 +1,19 @@
 /* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" } { "" } } */
 /* { dg-options "-Os" } */
 /* { dg-final { scan-assembler-not "mspabi_slli" } } */
-/* { dg-final { scan-assembler "rlax" } } */
+/* { dg-final { scan-assembler "RLAM.W\t#4" } } */
+/* { dg-final { scan-assembler "RPT\t#5 \{ RLAX.W" } } */
 
 /* Ensure that HImode shifts with source operand in memory are emulated with a
    rotate instructions.  */
 
 int a;
+int b;
 
 void
 foo (void)
 {
   a = a << 4;
+  b = b << 5;
 }
diff --git a/gcc/testsuite/gcc.target/msp430/emulate-srai.c b/gcc/testsuite/gcc.target/msp430/emulate-srai.c
index 6629171..f3f6dae 100644
--- a/gcc/testsuite/gcc.target/msp430/emulate-srai.c
+++ b/gcc/testsuite/gcc.target/msp430/emulate-srai.c
@@ -1,15 +1,19 @@
 /* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" } { "" } } */
 /* { dg-options "-Os" } */
 /* { dg-final { scan-assembler-not "mspabi_srai" } } */
-/* { dg-final { scan-assembler "rrax" } } */
+/* { dg-final { scan-assembler "RRAM.W\t#4" } } */
+/* { dg-final { scan-assembler "RPT\t#5 \{ RRAX.W" } } */
 
 /* Ensure that HImode shifts with source operand in memory are emulated with a
    rotate instructions.  */
 
 int a;
+int b;
 
 void
 foo (void)
 {
   a = a >> 4;
+  b = b >> 5;
 }
diff --git a/gcc/testsuite/gcc.target/msp430/emulate-srli.c b/gcc/testsuite/gcc.target/msp430/emulate-srli.c
index c10f30b..f870d13 100644
--- a/gcc/testsuite/gcc.target/msp430/emulate-srli.c
+++ b/gcc/testsuite/gcc.target/msp430/emulate-srli.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" } { "" } } */
 /* { dg-options "-Os" } */
 /* { dg-final { scan-assembler-not "mspabi_srli" } } */
 /* { dg-final { scan-assembler "rrum" } } */
-- 
cgit v1.1


From 39a6e72a9e0889180783c2e8810042503b511b11 Mon Sep 17 00:00:00 2001
From: Jozef Lawrynowicz <jozef.l@mittosystems.com>
Date: Thu, 24 Oct 2019 13:36:52 +0000
Subject: MSP430: Remove unused msp430_hard_regno_nregs_*_padding functions

2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config/msp430/msp430.c (msp430_hard_regno_nregs_has_padding): Remove
	and add comment.
	(msp430_hard_regno_nregs_with_padding): Remove.

From-SVN: r277395
---
 gcc/ChangeLog              |  6 ++++++
 gcc/config/msp430/msp430.c | 25 +++----------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb0a2f9b..7b433bf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
+	* config/msp430/msp430.c (msp430_hard_regno_nregs_has_padding): Remove
+	and add comment.
+	(msp430_hard_regno_nregs_with_padding): Remove.
+
+2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
 	* config/msp430/constraints.md: Allow post_inc for "Ya" constraint.
 	* config/msp430/msp430.md (430x_shift_left): Use RLAM when the constant
 	shift amount is between 1 and 4.
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index cd39433..fe1fcc0 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -332,28 +332,9 @@ msp430_hard_regno_nregs (unsigned int, machine_mode mode)
 	  / UNITS_PER_WORD);
 }
 
-/* Implements HARD_REGNO_NREGS_HAS_PADDING.  */
-int
-msp430_hard_regno_nregs_has_padding (int regno ATTRIBUTE_UNUSED,
-				     machine_mode mode)
-{
-  if (mode == PSImode && msp430x)
-    return 1;
-  return ((GET_MODE_SIZE (mode) + UNITS_PER_WORD - 1)
-	  / UNITS_PER_WORD);
-}
-
-/* Implements HARD_REGNO_NREGS_WITH_PADDING.  */
-int
-msp430_hard_regno_nregs_with_padding (int regno ATTRIBUTE_UNUSED,
-				      machine_mode mode)
-{
-  if (mode == PSImode)
-    return 2;
-  if (mode == CPSImode)
-    return 4;
-  return msp430_hard_regno_nregs (regno, mode);
-}
+/* subreg_get_info correctly handles PSImode registers, so defining
+   HARD_REGNO_NREGS_HAS_PADDING and HARD_REGNO_NREGS_WITH_PADDING
+   has no effect.  */
 
 #undef TARGET_HARD_REGNO_MODE_OK
 #define TARGET_HARD_REGNO_MODE_OK msp430_hard_regno_mode_ok
-- 
cgit v1.1


From abebffc609506176f8ba3f64533e15ece49446c0 Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Thu, 24 Oct 2019 16:19:40 +0200
Subject: ipa-reference.c (ipa_reference_optimization_summary_d): Rename
 statics_not_read and statics_not_written to statics_read and...

	* ipa-reference.c (ipa_reference_optimization_summary_d): Rename
	statics_not_read and statics_not_written to statics_read and
	statics_written respectively.
	(no_module_statics): New static var.
	(ipa_reference_get_not_read_global): Rename to ...
	(ipa_reference_get_read_global): ... this.
	(ipa_reference_get_not_written_global): Rename to ...
	(ipa_reference_get_written_global): ... this.
	(dump_static_vars_set_to_file): Dump no_module_statics.
	(copy_static_var_set): Add for propagation parameter.
	(ipa_init): Initialize no_module_statics.
	(ipa_ref_opt_summary_t::duplicate): Update.
	(ipa_ref_opt_summary_t::remove): Update.
	(propagate): Update.
	(write_node_summary_p): Look correctly for bitmap differences.
	(ipa_reference_write_optimization_summary): Update.
	(ipa_reference_read_optimization_summary): Update.
	* ipa-reference.h
	(ipa_reference_get_not_read_global): Rename to ...
	(ipa_reference_get_read_global): ... this.
	(ipa_reference_get_not_written_global): Rename to ...
	(ipa_reference_get_written_global): ... this.
	* tree-ssa-alias.c (ref_maybe_used_by_call_p_1): Update.
	(call_may_clobber_ref_p_1): Update.

From-SVN: r277403
---
 gcc/ChangeLog        |  27 ++++++++
 gcc/ipa-reference.c  | 189 ++++++++++++++++++++++++++++++---------------------
 gcc/ipa-reference.h  |   4 +-
 gcc/tree-ssa-alias.c |  16 +++--
 4 files changed, 151 insertions(+), 85 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b433bf..ae2f20e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-reference.c (ipa_reference_optimization_summary_d): Rename
+	statics_not_read and statics_not_written to statics_read and
+	statics_written respectively.
+	(no_module_statics): New static var.
+	(ipa_reference_get_not_read_global): Rename to ...
+	(ipa_reference_get_read_global): ... this.
+	(ipa_reference_get_not_written_global): Rename to ...
+	(ipa_reference_get_written_global): ... this.
+	(dump_static_vars_set_to_file): Dump no_module_statics.
+	(copy_static_var_set): Add for propagation parameter.
+	(ipa_init): Initialize no_module_statics.
+	(ipa_ref_opt_summary_t::duplicate): Update.
+	(ipa_ref_opt_summary_t::remove): Update.
+	(propagate): Update.
+	(write_node_summary_p): Look correctly for bitmap differences.
+	(ipa_reference_write_optimization_summary): Update.
+	(ipa_reference_read_optimization_summary): Update.
+	* ipa-reference.h
+	(ipa_reference_get_not_read_global): Rename to ...
+	(ipa_reference_get_read_global): ... this.
+	(ipa_reference_get_not_written_global): Rename to ...
+	(ipa_reference_get_written_global): ... this.
+	* tree-ssa-alias.c (ref_maybe_used_by_call_p_1): Update.
+	(call_may_clobber_ref_p_1): Update.
+
 2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* config/msp430/msp430.c (msp430_hard_regno_nregs_has_padding): Remove
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 87d583f..06c1225 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -74,8 +74,8 @@ struct ipa_reference_global_vars_info_d
 
 struct ipa_reference_optimization_summary_d
 {
-  bitmap statics_not_read;
-  bitmap statics_not_written;
+  bitmap statics_read;
+  bitmap statics_written;
 };
 
 typedef ipa_reference_local_vars_info_d *ipa_reference_local_vars_info_t;
@@ -103,6 +103,8 @@ varpool_node_hook_list *varpool_node_hooks;
    static we are considering.  This is added to the local info when asm
    code is found that clobbers all memory.  */
 static bitmap all_module_statics;
+/* Zero bitmap.  */
+static bitmap no_module_statics;
 /* Set of all statics that should be ignored because they are touched by
    -fno-ipa-reference code.  */
 static bitmap ignore_module_statics;
@@ -193,7 +195,7 @@ get_reference_optimization_summary (struct cgraph_node *node)
    NULL if no data is available.  */
 
 bitmap
-ipa_reference_get_not_read_global (struct cgraph_node *fn)
+ipa_reference_get_read_global (struct cgraph_node *fn)
 {
   if (!opt_for_fn (current_function_decl, flag_ipa_reference))
     return NULL;
@@ -208,10 +210,10 @@ ipa_reference_get_not_read_global (struct cgraph_node *fn)
 	  || (avail == AVAIL_INTERPOSABLE
 	      && flags_from_decl_or_type (fn->decl) & ECF_LEAF))
       && opt_for_fn (fn2->decl, flag_ipa_reference))
-    return info->statics_not_read;
+    return info->statics_read;
   else if (avail == AVAIL_NOT_AVAILABLE
 	   && flags_from_decl_or_type (fn->decl) & ECF_LEAF)
-    return all_module_statics;
+    return no_module_statics;
   else
     return NULL;
 }
@@ -222,7 +224,7 @@ ipa_reference_get_not_read_global (struct cgraph_node *fn)
    call.  Returns NULL if no data is available.  */
 
 bitmap
-ipa_reference_get_not_written_global (struct cgraph_node *fn)
+ipa_reference_get_written_global (struct cgraph_node *fn)
 {
   if (!opt_for_fn (current_function_decl, flag_ipa_reference))
     return NULL;
@@ -237,10 +239,10 @@ ipa_reference_get_not_written_global (struct cgraph_node *fn)
 	  || (avail == AVAIL_INTERPOSABLE
 	      && flags_from_decl_or_type (fn->decl) & ECF_LEAF))
       && opt_for_fn (fn2->decl, flag_ipa_reference))
-    return info->statics_not_written;
+    return info->statics_written;
   else if (avail == AVAIL_NOT_AVAILABLE
 	   && flags_from_decl_or_type (fn->decl) & ECF_LEAF)
-    return all_module_statics;
+    return no_module_statics;
   else
     return NULL;
 }
@@ -315,6 +317,8 @@ dump_static_vars_set_to_file (FILE *f, bitmap set)
     return;
   else if (set == all_module_statics)
     fprintf (f, "ALL");
+  else if (set == no_module_statics)
+    fprintf (f, "NO");
   else
     EXECUTE_IF_SET_IN_BITMAP (set, 0, index, bi)
       {
@@ -358,10 +362,12 @@ union_static_var_sets (bitmap &x, bitmap y)
    But if SET is NULL or the maximum set, return that instead.  */
 
 static bitmap
-copy_static_var_set (bitmap set)
+copy_static_var_set (bitmap set, bool for_propagation)
 {
   if (set == NULL || set == all_module_statics)
     return set;
+  if (!for_propagation && set == no_module_statics)
+    return set;
   bitmap_obstack *o = set->obstack;
   gcc_checking_assert (o);
   bitmap copy = BITMAP_ALLOC (o);
@@ -468,6 +474,7 @@ ipa_init (void)
   bitmap_obstack_initialize (&local_info_obstack);
   bitmap_obstack_initialize (&optimization_summary_obstack);
   all_module_statics = BITMAP_ALLOC (&optimization_summary_obstack);
+  no_module_statics = BITMAP_ALLOC (&optimization_summary_obstack);
   ignore_module_statics = BITMAP_ALLOC (&optimization_summary_obstack);
 
   if (ipa_ref_var_info_summaries == NULL)
@@ -552,10 +559,10 @@ ipa_ref_opt_summary_t::duplicate (cgraph_node *, cgraph_node *,
 				  ipa_reference_optimization_summary_d
 				  *dst_ginfo)
 {
-  dst_ginfo->statics_not_read =
-    copy_static_var_set (ginfo->statics_not_read);
-  dst_ginfo->statics_not_written =
-    copy_static_var_set (ginfo->statics_not_written);
+  dst_ginfo->statics_read =
+    copy_static_var_set (ginfo->statics_read, false);
+  dst_ginfo->statics_written =
+    copy_static_var_set (ginfo->statics_written, false);
 }
 
 /* Called when node is removed.  */
@@ -564,13 +571,15 @@ void
 ipa_ref_opt_summary_t::remove (cgraph_node *,
 			       ipa_reference_optimization_summary_d *ginfo)
 {
-  if (ginfo->statics_not_read
-      && ginfo->statics_not_read != all_module_statics)
-    BITMAP_FREE (ginfo->statics_not_read);
-
-  if (ginfo->statics_not_written
-      && ginfo->statics_not_written != all_module_statics)
-    BITMAP_FREE (ginfo->statics_not_written);
+  if (ginfo->statics_read
+      && ginfo->statics_read != all_module_statics
+      && ginfo->statics_read != no_module_statics)
+    BITMAP_FREE (ginfo->statics_read);
+
+  if (ginfo->statics_written
+      && ginfo->statics_written != all_module_statics
+      && ginfo->statics_written != no_module_statics)
+    BITMAP_FREE (ginfo->statics_written);
 }
 
 /* Analyze each function in the cgraph to see which global or statics
@@ -802,11 +811,12 @@ propagate (void)
       if (read_all)
 	node_g->statics_read = all_module_statics;
       else
-	node_g->statics_read = copy_static_var_set (node_l->statics_read);
+	node_g->statics_read = copy_static_var_set (node_l->statics_read, true);
       if (write_all)
 	node_g->statics_written = all_module_statics;
       else
-	node_g->statics_written = copy_static_var_set (node_l->statics_written);
+	node_g->statics_written
+	  = copy_static_var_set (node_l->statics_written, true);
 
       /* Merge the sets of this cycle with all sets of callees reached
          from this cycle.  */
@@ -890,12 +900,26 @@ propagate (void)
       ipa_reference_vars_info_t node_info;
       ipa_reference_global_vars_info_t node_g;
 
+      /* No need to produce summaries for inline clones.  */
+      if (node->global.inlined_to)
+	continue;
+
       node_info = get_reference_vars_info (node);
-      if (!node->alias && opt_for_fn (node->decl, flag_ipa_reference)
-	  && (node->get_availability () > AVAIL_INTERPOSABLE
-	      || (flags_from_decl_or_type (node->decl) & ECF_LEAF)))
+      if (!node->alias && opt_for_fn (node->decl, flag_ipa_reference))
 	{
 	  node_g = &node_info->global;
+	  bool read_all = 
+		(node_g->statics_read == all_module_statics
+		 || bitmap_equal_p (node_g->statics_read, all_module_statics));
+	  bool written_all = 
+		(node_g->statics_written == all_module_statics
+		 || bitmap_equal_p (node_g->statics_written,
+				    all_module_statics));
+
+	  /* There is no need to produce summary if we collected nothing
+	     useful.  */
+	  if (read_all && written_all)
+	    continue;
 
 	  ipa_reference_optimization_summary_d *opt
 	    = ipa_ref_opt_sum_summaries->get_create (node);
@@ -903,27 +927,25 @@ propagate (void)
 	  /* Create the complimentary sets.  */
 
 	  if (bitmap_empty_p (node_g->statics_read))
-	    opt->statics_not_read = all_module_statics;
+	    opt->statics_read = no_module_statics;
+	  else if (read_all)
+	    opt->statics_read = all_module_statics;
 	  else
 	    {
-	      opt->statics_not_read
+	      opt->statics_read
 		 = BITMAP_ALLOC (&optimization_summary_obstack);
-	      if (node_g->statics_read != all_module_statics)
-		bitmap_and_compl (opt->statics_not_read,
-				  all_module_statics,
-				  node_g->statics_read);
+	      bitmap_copy (opt->statics_read, node_g->statics_read);
 	    }
 
 	  if (bitmap_empty_p (node_g->statics_written))
-	    opt->statics_not_written = all_module_statics;
+	    opt->statics_written = no_module_statics;
+	  else if (written_all)
+	    opt->statics_written = all_module_statics;
 	  else
 	    {
-	      opt->statics_not_written
+	      opt->statics_written
 	        = BITMAP_ALLOC (&optimization_summary_obstack);
-	      if (node_g->statics_written != all_module_statics)
-		bitmap_and_compl (opt->statics_not_written,
-				  all_module_statics,
-				  node_g->statics_written);
+	      bitmap_copy (opt->statics_written, node_g->statics_written);
 	    }
 	}
    }
@@ -958,9 +980,7 @@ write_node_summary_p (struct cgraph_node *node,
   if (!node->definition || node->global.inlined_to)
     return false;
   info = get_reference_optimization_summary (node);
-  if (!info
-      || (bitmap_empty_p (info->statics_not_read)
-	  && bitmap_empty_p (info->statics_not_written)))
+  if (!info)
     return false;
 
   /* See if we want to encode it.
@@ -973,11 +993,17 @@ write_node_summary_p (struct cgraph_node *node,
       && !referenced_from_this_partition_p (node, encoder))
     return false;
 
-  /* See if the info has non-empty intersections with vars we want to encode.  */
-  if (!bitmap_intersect_p (info->statics_not_read, ltrans_statics)
-      && !bitmap_intersect_p (info->statics_not_written, ltrans_statics))
-    return false;
-  return true;
+  /* See if the info has non-empty intersections with vars we want to
+     encode.  */
+  bitmap_iterator bi;
+  unsigned int i;
+  EXECUTE_IF_AND_COMPL_IN_BITMAP (ltrans_statics, info->statics_read, 0,
+				  i, bi)
+    return true;
+  EXECUTE_IF_AND_COMPL_IN_BITMAP (ltrans_statics, info->statics_written, 0,
+				  i, bi)
+    return true;
+  return false;
 }
 
 /* Stream out BITS&LTRANS_STATICS as list of decls to OB.
@@ -1079,9 +1105,9 @@ ipa_reference_write_optimization_summary (void)
 	    node_ref = lto_symtab_encoder_encode (encoder, snode);
 	    streamer_write_uhwi_stream (ob->main_stream, node_ref);
 
-	    stream_out_bitmap (ob, info->statics_not_read, ltrans_statics,
+	    stream_out_bitmap (ob, info->statics_read, ltrans_statics,
 			       ltrans_statics_bitcount);
-	    stream_out_bitmap (ob, info->statics_not_written, ltrans_statics,
+	    stream_out_bitmap (ob, info->statics_written, ltrans_statics,
 			       ltrans_statics_bitcount);
 	  }
       }
@@ -1108,6 +1134,7 @@ ipa_reference_read_optimization_summary (void)
   ipa_reference_vars_uids = 0;
 
   all_module_statics = BITMAP_ALLOC (&optimization_summary_obstack);
+  no_module_statics = BITMAP_ALLOC (&optimization_summary_obstack);
 
   while ((file_data = file_data_vec[j++]))
     {
@@ -1156,57 +1183,65 @@ ipa_reference_read_optimization_summary (void)
 	      ipa_reference_optimization_summary_d *info
 		= ipa_ref_opt_sum_summaries->get_create (node);
 
-	      info->statics_not_read = BITMAP_ALLOC
-		(&optimization_summary_obstack);
-	      info->statics_not_written = BITMAP_ALLOC
-		(&optimization_summary_obstack);
 	      if (dump_file)
 		fprintf (dump_file,
-			 "\nFunction name:%s:\n  static not read:",
+			 "\nFunction name:%s:\n  static read:",
 			 node->dump_asm_name ());
 
-	      /* Set the statics not read.  */
+	      /* Set the statics read.  */
 	      v_count = streamer_read_hwi (ib);
 	      if (v_count == -1)
 		{
-		  info->statics_not_read = all_module_statics;
+		  info->statics_read = all_module_statics;
 		  if (dump_file)
 		    fprintf (dump_file, " all module statics");
 		}
+	      else if (v_count == 0)
+		info->statics_read = no_module_statics;
 	      else
-		for (j = 0; j < (unsigned int)v_count; j++)
-		  {
-		    unsigned int var_index = streamer_read_uhwi (ib);
-		    tree v_decl = lto_file_decl_data_get_var_decl (file_data,
-								   var_index);
-		    bitmap_set_bit (info->statics_not_read,
-				    ipa_reference_var_uid (v_decl));
-		    if (dump_file)
-		      fprintf (dump_file, " %s", fndecl_name (v_decl));
-		  }
+		{
+		  info->statics_read = BITMAP_ALLOC
+		    (&optimization_summary_obstack);
+		  for (j = 0; j < (unsigned int)v_count; j++)
+		    {
+		      unsigned int var_index = streamer_read_uhwi (ib);
+		      tree v_decl = lto_file_decl_data_get_var_decl (file_data,
+								     var_index);
+		      bitmap_set_bit (info->statics_read,
+				      ipa_reference_var_uid (v_decl));
+		      if (dump_file)
+			fprintf (dump_file, " %s", fndecl_name (v_decl));
+		    }
+		}
 
 	      if (dump_file)
 		fprintf (dump_file,
-			 "\n  static not written:");
-	      /* Set the statics not written.  */
+			 "\n  static written:");
+	      /* Set the statics written.  */
 	      v_count = streamer_read_hwi (ib);
 	      if (v_count == -1)
 		{
-		  info->statics_not_written = all_module_statics;
+		  info->statics_written = all_module_statics;
 		  if (dump_file)
 		    fprintf (dump_file, " all module statics");
 		}
+	      else if (v_count == 0)
+		info->statics_written = no_module_statics;
 	      else
-		for (j = 0; j < (unsigned int)v_count; j++)
-		  {
-		    unsigned int var_index = streamer_read_uhwi (ib);
-		    tree v_decl = lto_file_decl_data_get_var_decl (file_data,
-								   var_index);
-		    bitmap_set_bit (info->statics_not_written,
-				    ipa_reference_var_uid (v_decl));
-		    if (dump_file)
-		      fprintf (dump_file, " %s", fndecl_name (v_decl));
-		  }
+		{
+		  info->statics_written = BITMAP_ALLOC
+		    (&optimization_summary_obstack);
+		  for (j = 0; j < (unsigned int)v_count; j++)
+		    {
+		      unsigned int var_index = streamer_read_uhwi (ib);
+		      tree v_decl = lto_file_decl_data_get_var_decl (file_data,
+								     var_index);
+		      bitmap_set_bit (info->statics_written,
+				      ipa_reference_var_uid (v_decl));
+		      if (dump_file)
+			fprintf (dump_file, " %s", fndecl_name (v_decl));
+		    }
+		}
 	      if (dump_file)
 		fprintf (dump_file, "\n");
 	    }
diff --git a/gcc/ipa-reference.h b/gcc/ipa-reference.h
index 6563db6..c7de073 100644
--- a/gcc/ipa-reference.h
+++ b/gcc/ipa-reference.h
@@ -22,8 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 #define GCC_IPA_REFERENCE_H
 
 /* In ipa-reference.c  */
-bitmap ipa_reference_get_not_read_global (struct cgraph_node *fn);
-bitmap ipa_reference_get_not_written_global (struct cgraph_node *fn);
+bitmap ipa_reference_get_read_global (struct cgraph_node *fn);
+bitmap ipa_reference_get_written_global (struct cgraph_node *fn);
 void ipa_reference_c_finalize (void);
 int ipa_reference_var_uid (tree t);
 
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 4cfe3e2..8c63e3b 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -2529,14 +2529,16 @@ ref_maybe_used_by_call_p_1 (gcall *call, ao_ref *ref, bool tbaa_p)
   if (callee != NULL_TREE && VAR_P (base) && TREE_STATIC (base))
     {
       struct cgraph_node *node = cgraph_node::get (callee);
-      bitmap not_read;
+      bitmap read;
+      int id;
 
       /* FIXME: Callee can be an OMP builtin that does not have a call graph
 	 node yet.  We should enforce that there are nodes for all decls in the
 	 IL and remove this check instead.  */
       if (node
-	  && (not_read = ipa_reference_get_not_read_global (node))
-	  && bitmap_bit_p (not_read, ipa_reference_var_uid (base)))
+	  && (id = ipa_reference_var_uid (base)) != -1
+	  && (read = ipa_reference_get_read_global (node))
+	  && !bitmap_bit_p (read, id))
 	goto process_args;
     }
 
@@ -2924,11 +2926,13 @@ call_may_clobber_ref_p_1 (gcall *call, ao_ref *ref)
   if (callee != NULL_TREE && VAR_P (base) && TREE_STATIC (base))
     {
       struct cgraph_node *node = cgraph_node::get (callee);
-      bitmap not_written;
+      bitmap written;
+      int id;
 
       if (node
-	  && (not_written = ipa_reference_get_not_written_global (node))
-	  && bitmap_bit_p (not_written, ipa_reference_var_uid (base)))
+	  && (id = ipa_reference_var_uid (base)) != -1
+	  && (written = ipa_reference_get_written_global (node))
+	  && !bitmap_bit_p (written, id))
 	return false;
     }
 
-- 
cgit v1.1


From 4352288a3df915575a2b820f702242908740106f Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Thu, 24 Oct 2019 15:01:45 +0000
Subject: tree-vect-slp.c (vect_get_and_check_slp_defs): For reduction chains
 try harder with operand swapping and instead of putting a...

2019-10-24  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (vect_get_and_check_slp_defs): For reduction
	chains try harder with operand swapping and instead of
	putting a shifted chain into the reduction operands put
	a repetition of the final reduction op there as if we'd
	reassociate the expression.

	* gcc.dg/vect/slp-reduc-10a.c: New testcase.
	* gcc.dg/vect/slp-reduc-10b.c: Likewise.
	* gcc.dg/vect/slp-reduc-10c.c: Likewise.
	* gcc.dg/vect/slp-reduc-10d.c: Likewise.
	* gcc.dg/vect/slp-reduc-10e.c: Likewise.

From-SVN: r277406
---
 gcc/ChangeLog                             |  8 +++
 gcc/testsuite/ChangeLog                   |  8 +++
 gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c | 82 +++++++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c | 82 +++++++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c | 82 +++++++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c | 82 +++++++++++++++++++++++++++++++
 gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c | 82 +++++++++++++++++++++++++++++++
 gcc/tree-vect-slp.c                       | 51 ++++++++++++++-----
 8 files changed, 464 insertions(+), 13 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c
 create mode 100644 gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c
 create mode 100644 gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c
 create mode 100644 gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c
 create mode 100644 gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae2f20e..f63370b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-slp.c (vect_get_and_check_slp_defs): For reduction
+	chains try harder with operand swapping and instead of
+	putting a shifted chain into the reduction operands put
+	a repetition of the final reduction op there as if we'd
+	reassociate the expression.
+
 2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-reference.c (ipa_reference_optimization_summary_d): Rename
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee43703..329f244 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-24  Richard Biener  <rguenther@suse.de>
+
+	* gcc.dg/vect/slp-reduc-10a.c: New testcase.
+	* gcc.dg/vect/slp-reduc-10b.c: Likewise.
+	* gcc.dg/vect/slp-reduc-10c.c: Likewise.
+	* gcc.dg/vect/slp-reduc-10d.c: Likewise.
+	* gcc.dg/vect/slp-reduc-10e.c: Likewise.
+
 2019-10-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* gcc.target/msp430/emulate-slli.c: Skip for -mcpu=msp430.
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c
new file mode 100644
index 0000000..d3c2c2d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10a.c
@@ -0,0 +1,82 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fgimple" } */
+
+int __GIMPLE (ssa,guessed_local(118111600),startwith("dce3"))
+foo (int * x, int n)
+{
+  int i;
+  int sum;
+  int _1;
+  long unsigned int _2;
+  long unsigned int _3;
+  int * _4;
+  int _5;
+  __SIZETYPE__ _7;
+  __SIZETYPE__ _8;
+  int * _9;
+  int _10;
+  __SIZETYPE__ _11;
+  __SIZETYPE__ _12;
+  int * _13;
+  int _14;
+  __SIZETYPE__ _15;
+  __SIZETYPE__ _16;
+  int * _17;
+  int _18;
+
+  __BB(2,guessed_local(118111600)):
+  if (n_21(D) > 0)
+    goto __BB5(guessed(119453778));
+  else
+    goto __BB7(guessed(14763950));
+
+  __BB(5,guessed_local(105119324)):
+  goto __BB3(precise(134217728));
+
+  __BB(3,loop_header(1),guessed_local(955630224)):
+  sum_30 = __PHI (__BB5: 0, __BB6: sum_27);
+  i_32 = __PHI (__BB5: 0, __BB6: i_28);
+  _1 = i_32 * 4;
+  _2 = (long unsigned int) _1;
+  _3 = _2 * 4ul;
+  _4 = x_23(D) + _3;
+  _5 = __MEM <int> (_4);
+  sum_24 = _5 + sum_30;
+  _7 = _2 + 1ul;
+  _8 = _7 * 4ul;
+  _9 = x_23(D) + _8;
+  _10 = __MEM <int> (_9);
+  sum_25 = _10 + sum_24;
+  _11 = _2 + 2ul;
+  _12 = _11 * 4ul;
+  _13 = x_23(D) + _12;
+  _14 = __MEM <int> (_13);
+  sum_26 = _14 + sum_25;
+  _15 = _2 + 3ul;
+  _16 = _15 * 4ul;
+  _17 = x_23(D) + _16;
+  _18 = __MEM <int> (_17);
+  sum_27 = _18 + sum_26;
+  i_28 = i_32 + 1;
+  if (n_21(D) > i_28)
+    goto __BB6(guessed(119453778));
+  else
+    goto __BB8(guessed(14763950));
+
+  __BB(8,guessed_local(105119324)):
+  goto __BB4(precise(134217728));
+
+  __BB(6,guessed_local(850510900)):
+  goto __BB3(precise(134217728));
+
+  __BB(7,guessed_local(12992276)):
+  goto __BB4(precise(134217728));
+
+  __BB(4,guessed_local(118111601)):
+  sum_31 = __PHI (__BB7: 0, __BB8: sum_27);
+  return sum_31;
+
+}
+
+/* { dg-final { scan-tree-dump "Decided to SLP 1 instances" "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c
new file mode 100644
index 0000000..6a0d55d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10b.c
@@ -0,0 +1,82 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fgimple" } */
+
+int __GIMPLE (ssa,guessed_local(118111600),startwith("dce3"))
+foo (int * x, int n)
+{
+  int i;
+  int sum;
+  int _1;
+  long unsigned int _2;
+  long unsigned int _3;
+  int * _4;
+  int _5;
+  __SIZETYPE__ _7;
+  __SIZETYPE__ _8;
+  int * _9;
+  int _100;
+  __SIZETYPE__ _11;
+  __SIZETYPE__ _12;
+  int * _13;
+  int _14;
+  __SIZETYPE__ _15;
+  __SIZETYPE__ _16;
+  int * _17;
+  int _18;
+
+  __BB(2,guessed_local(118111600)):
+  if (n_21(D) > 0)
+    goto __BB5(guessed(119453778));
+  else
+    goto __BB7(guessed(14763950));
+
+  __BB(5,guessed_local(105119324)):
+  goto __BB3(precise(134217728));
+
+  __BB(3,loop_header(1),guessed_local(955630224)):
+  sum_30 = __PHI (__BB5: 0, __BB6: sum_27);
+  i_32 = __PHI (__BB5: 0, __BB6: i_28);
+  _1 = i_32 * 4;
+  _2 = (long unsigned int) _1;
+  _3 = _2 * 4ul;
+  _4 = x_23(D) + _3;
+  _5 = __MEM <int> (_4);
+  sum_24 = _5 + sum_30;
+  _7 = _2 + 1ul;
+  _8 = _7 * 4ul;
+  _9 = x_23(D) + _8;
+  _100 = __MEM <int> (_9);
+  sum_25 = sum_24 + _100;
+  _11 = _2 + 2ul;
+  _12 = _11 * 4ul;
+  _13 = x_23(D) + _12;
+  _14 = __MEM <int> (_13);
+  sum_26 = _14 + sum_25;
+  _15 = _2 + 3ul;
+  _16 = _15 * 4ul;
+  _17 = x_23(D) + _16;
+  _18 = __MEM <int> (_17);
+  sum_27 = _18 + sum_26;
+  i_28 = i_32 + 1;
+  if (n_21(D) > i_28)
+    goto __BB6(guessed(119453778));
+  else
+    goto __BB8(guessed(14763950));
+
+  __BB(8,guessed_local(105119324)):
+  goto __BB4(precise(134217728));
+
+  __BB(6,guessed_local(850510900)):
+  goto __BB3(precise(134217728));
+
+  __BB(7,guessed_local(12992276)):
+  goto __BB4(precise(134217728));
+
+  __BB(4,guessed_local(118111601)):
+  sum_31 = __PHI (__BB7: 0, __BB8: sum_27);
+  return sum_31;
+
+}
+
+/* { dg-final { scan-tree-dump "Decided to SLP 1 instances" "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c
new file mode 100644
index 0000000..20df262
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10c.c
@@ -0,0 +1,82 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fgimple" } */
+
+int __GIMPLE (ssa,guessed_local(118111600),startwith("dce3"))
+foo (int * x, int n)
+{
+  int i;
+  int sum;
+  int _1;
+  long unsigned int _2;
+  long unsigned int _3;
+  int * _4;
+  int _5;
+  __SIZETYPE__ _7;
+  __SIZETYPE__ _8;
+  int * _9;
+  int _10;
+  __SIZETYPE__ _11;
+  __SIZETYPE__ _12;
+  int * _13;
+  int _100;
+  __SIZETYPE__ _15;
+  __SIZETYPE__ _16;
+  int * _17;
+  int _18;
+
+  __BB(2,guessed_local(118111600)):
+  if (n_21(D) > 0)
+    goto __BB5(guessed(119453778));
+  else
+    goto __BB7(guessed(14763950));
+
+  __BB(5,guessed_local(105119324)):
+  goto __BB3(precise(134217728));
+
+  __BB(3,loop_header(1),guessed_local(955630224)):
+  sum_30 = __PHI (__BB5: 0, __BB6: sum_27);
+  i_32 = __PHI (__BB5: 0, __BB6: i_28);
+  _1 = i_32 * 4;
+  _2 = (long unsigned int) _1;
+  _3 = _2 * 4ul;
+  _4 = x_23(D) + _3;
+  _5 = __MEM <int> (_4);
+  sum_24 = _5 + sum_30;
+  _7 = _2 + 1ul;
+  _8 = _7 * 4ul;
+  _9 = x_23(D) + _8;
+  _10 = __MEM <int> (_9);
+  sum_25 = _10 + sum_24;
+  _11 = _2 + 2ul;
+  _12 = _11 * 4ul;
+  _13 = x_23(D) + _12;
+  _100 = __MEM <int> (_13);
+  sum_26 = sum_25 + _100;
+  _15 = _2 + 3ul;
+  _16 = _15 * 4ul;
+  _17 = x_23(D) + _16;
+  _18 = __MEM <int> (_17);
+  sum_27 = _18 + sum_26;
+  i_28 = i_32 + 1;
+  if (n_21(D) > i_28)
+    goto __BB6(guessed(119453778));
+  else
+    goto __BB8(guessed(14763950));
+
+  __BB(8,guessed_local(105119324)):
+  goto __BB4(precise(134217728));
+
+  __BB(6,guessed_local(850510900)):
+  goto __BB3(precise(134217728));
+
+  __BB(7,guessed_local(12992276)):
+  goto __BB4(precise(134217728));
+
+  __BB(4,guessed_local(118111601)):
+  sum_31 = __PHI (__BB7: 0, __BB8: sum_27);
+  return sum_31;
+
+}
+
+/* { dg-final { scan-tree-dump "Decided to SLP 1 instances" "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c
new file mode 100644
index 0000000..8a512d5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10d.c
@@ -0,0 +1,82 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fgimple" } */
+
+int __GIMPLE (ssa,guessed_local(118111600),startwith("dce3"))
+foo (int * x, int n)
+{
+  int i;
+  int sum;
+  int _1;
+  long unsigned int _2;
+  long unsigned int _3;
+  int * _4;
+  int _5;
+  __SIZETYPE__ _7;
+  __SIZETYPE__ _8;
+  int * _9;
+  int _10;
+  __SIZETYPE__ _11;
+  __SIZETYPE__ _12;
+  int * _13;
+  int _14;
+  __SIZETYPE__ _15;
+  __SIZETYPE__ _16;
+  int * _17;
+  int _100;
+
+  __BB(2,guessed_local(118111600)):
+  if (n_21(D) > 0)
+    goto __BB5(guessed(119453778));
+  else
+    goto __BB7(guessed(14763950));
+
+  __BB(5,guessed_local(105119324)):
+  goto __BB3(precise(134217728));
+
+  __BB(3,loop_header(1),guessed_local(955630224)):
+  sum_30 = __PHI (__BB5: 0, __BB6: sum_27);
+  i_32 = __PHI (__BB5: 0, __BB6: i_28);
+  _1 = i_32 * 4;
+  _2 = (long unsigned int) _1;
+  _3 = _2 * 4ul;
+  _4 = x_23(D) + _3;
+  _5 = __MEM <int> (_4);
+  sum_24 = _5 + sum_30;
+  _7 = _2 + 1ul;
+  _8 = _7 * 4ul;
+  _9 = x_23(D) + _8;
+  _10 = __MEM <int> (_9);
+  sum_25 = _10 + sum_24;
+  _11 = _2 + 2ul;
+  _12 = _11 * 4ul;
+  _13 = x_23(D) + _12;
+  _14 = __MEM <int> (_13);
+  sum_26 = _14 + sum_25;
+  _15 = _2 + 3ul;
+  _16 = _15 * 4ul;
+  _17 = x_23(D) + _16;
+  _100 = __MEM <int> (_17);
+  sum_27 = sum_26 + _100;
+  i_28 = i_32 + 1;
+  if (n_21(D) > i_28)
+    goto __BB6(guessed(119453778));
+  else
+    goto __BB8(guessed(14763950));
+
+  __BB(8,guessed_local(105119324)):
+  goto __BB4(precise(134217728));
+
+  __BB(6,guessed_local(850510900)):
+  goto __BB3(precise(134217728));
+
+  __BB(7,guessed_local(12992276)):
+  goto __BB4(precise(134217728));
+
+  __BB(4,guessed_local(118111601)):
+  sum_31 = __PHI (__BB7: 0, __BB8: sum_27);
+  return sum_31;
+
+}
+
+/* { dg-final { scan-tree-dump "Decided to SLP 1 instances" "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c
new file mode 100644
index 0000000..268ec9d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-10e.c
@@ -0,0 +1,82 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fgimple" } */
+
+int __GIMPLE (ssa,guessed_local(118111600),startwith("dce3"))
+foo (int * x, int n)
+{
+  int i;
+  int sum;
+  int _1;
+  long unsigned int _2;
+  long unsigned int _3;
+  int * _4;
+  int _100;
+  __SIZETYPE__ _7;
+  __SIZETYPE__ _8;
+  int * _9;
+  int _10;
+  __SIZETYPE__ _11;
+  __SIZETYPE__ _12;
+  int * _13;
+  int _14;
+  __SIZETYPE__ _15;
+  __SIZETYPE__ _16;
+  int * _17;
+  int _18;
+
+  __BB(2,guessed_local(118111600)):
+  if (n_21(D) > 0)
+    goto __BB5(guessed(119453778));
+  else
+    goto __BB7(guessed(14763950));
+
+  __BB(5,guessed_local(105119324)):
+  goto __BB3(precise(134217728));
+
+  __BB(3,loop_header(1),guessed_local(955630224)):
+  sum_30 = __PHI (__BB5: 0, __BB6: sum_27);
+  i_32 = __PHI (__BB5: 0, __BB6: i_28);
+  _1 = i_32 * 4;
+  _2 = (long unsigned int) _1;
+  _3 = _2 * 4ul;
+  _4 = x_23(D) + _3;
+  _100 = __MEM <int> (_4);
+  sum_24 = sum_30 + _100;
+  _7 = _2 + 1ul;
+  _8 = _7 * 4ul;
+  _9 = x_23(D) + _8;
+  _10 = __MEM <int> (_9);
+  sum_25 = _10 + sum_24;
+  _11 = _2 + 2ul;
+  _12 = _11 * 4ul;
+  _13 = x_23(D) + _12;
+  _14 = __MEM <int> (_13);
+  sum_26 = _14 + sum_25;
+  _15 = _2 + 3ul;
+  _16 = _15 * 4ul;
+  _17 = x_23(D) + _16;
+  _18 = __MEM <int> (_17);
+  sum_27 = _18 + sum_26;
+  i_28 = i_32 + 1;
+  if (n_21(D) > i_28)
+    goto __BB6(guessed(119453778));
+  else
+    goto __BB8(guessed(14763950));
+
+  __BB(8,guessed_local(105119324)):
+  goto __BB4(precise(134217728));
+
+  __BB(6,guessed_local(850510900)):
+  goto __BB3(precise(134217728));
+
+  __BB(7,guessed_local(12992276)):
+  goto __BB4(precise(134217728));
+
+  __BB(4,guessed_local(118111601)):
+  sum_31 = __PHI (__BB7: 0, __BB8: sum_27);
+  return sum_31;
+
+}
+
+/* { dg-final { scan-tree-dump "Decided to SLP 1 instances" "vect" } } */
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 0af5119..3db08fa 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -433,20 +433,35 @@ again:
 	     the def-stmt/s of the first stmt.  Allow different definition
 	     types for reduction chains: the first stmt must be a
 	     vect_reduction_def (a phi node), and the rest
-	     vect_internal_def.  */
+	     end in the reduction chain.  */
 	  tree type = TREE_TYPE (oprnd);
 	  if ((oprnd_info->first_dt != dt
 	       && !(oprnd_info->first_dt == vect_reduction_def
-		    && dt == vect_internal_def)
+		    && !STMT_VINFO_DATA_REF (stmt_info)
+		    && REDUC_GROUP_FIRST_ELEMENT (stmt_info)
+		    && def_stmt_info
+		    && !STMT_VINFO_DATA_REF (def_stmt_info)
+		    && (REDUC_GROUP_FIRST_ELEMENT (def_stmt_info)
+			== REDUC_GROUP_FIRST_ELEMENT (stmt_info)))
 	       && !((oprnd_info->first_dt == vect_external_def
 		     || oprnd_info->first_dt == vect_constant_def)
 		    && (dt == vect_external_def
 			|| dt == vect_constant_def)))
-	      || !types_compatible_p (oprnd_info->first_op_type, type))
+	      || !types_compatible_p (oprnd_info->first_op_type, type)
+	      || (!STMT_VINFO_DATA_REF (stmt_info)
+		  && REDUC_GROUP_FIRST_ELEMENT (stmt_info)
+		  && ((!def_stmt_info
+		       || STMT_VINFO_DATA_REF (def_stmt_info)
+		       || (REDUC_GROUP_FIRST_ELEMENT (def_stmt_info)
+			   != REDUC_GROUP_FIRST_ELEMENT (stmt_info)))
+		      != (oprnd_info->first_dt != vect_reduction_def))))
 	    {
 	      /* Try swapping operands if we got a mismatch.  */
 	      if (i == commutative_op && !swapped)
 		{
+		  if (dump_enabled_p ())
+		    dump_printf_loc (MSG_NOTE, vect_location,
+				     "trying swapped operands\n");
 		  swapped = true;
 		  goto again;
 		}
@@ -484,9 +499,26 @@ again:
 	  oprnd_info->ops.quick_push (oprnd);
 	  break;
 
+	case vect_internal_def:
 	case vect_reduction_def:
+	  if (oprnd_info->first_dt == vect_reduction_def
+	      && !STMT_VINFO_DATA_REF (stmt_info)
+	      && REDUC_GROUP_FIRST_ELEMENT (stmt_info)
+	      && !STMT_VINFO_DATA_REF (def_stmt_info)
+	      && (REDUC_GROUP_FIRST_ELEMENT (def_stmt_info)
+		  == REDUC_GROUP_FIRST_ELEMENT (stmt_info)))
+	    {
+	      /* For a SLP reduction chain we want to duplicate the
+	         reduction to each of the chain members.  That gets
+		 us a sane SLP graph (still the stmts are not 100%
+		 correct wrt the initial values).  */
+	      gcc_assert (!first);
+	      oprnd_info->def_stmts.quick_push (oprnd_info->def_stmts[0]);
+	      oprnd_info->ops.quick_push (oprnd_info->ops[0]);
+	      break;
+	    }
+	  /* Fallthru.  */
 	case vect_induction_def:
-	case vect_internal_def:
 	  oprnd_info->def_stmts.quick_push (def_stmt_info);
 	  oprnd_info->ops.quick_push (oprnd);
 	  break;
@@ -1182,15 +1214,8 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	  /* Else def types have to match.  */
 	  stmt_vec_info other_info;
 	  FOR_EACH_VEC_ELT (stmts, i, other_info)
-	    {
-	      /* But for reduction chains only check on the first stmt.  */
-	      if (!STMT_VINFO_DATA_REF (other_info)
-		  && REDUC_GROUP_FIRST_ELEMENT (other_info)
-		  && REDUC_GROUP_FIRST_ELEMENT (other_info) != stmt_info)
-		continue;
-	      if (STMT_VINFO_DEF_TYPE (other_info) != def_type)
-		return NULL;
-	    }
+	    if (STMT_VINFO_DEF_TYPE (other_info) != def_type)
+	      return NULL;
 	}
       else
 	return NULL;
-- 
cgit v1.1


From 79c05c2bc49b4880ec4789d4078178e27821f268 Mon Sep 17 00:00:00 2001
From: Andrew Sutton <asutton@lock3software.com>
Date: Thu, 24 Oct 2019 15:03:49 +0000
Subject: Finish moving constraint and logic functionality of out pt.c.

Also, reimplement and re-enable subsumption caching.

gcc/cp/
	* config-lang.in (gtfiles): Add logic.cc.
	* constraint.cc (atomic_constraints_identical_p): Add assertions.
	(hash_atomic_constraint): Likewise.
	(constraints_equivalent_p): New.
	(inchash::add_constraint): New.
	(iterative_hash_constraint): New.
	(decl_constraints): Moved from pt.c.
	(get_constraints): Likewise.
	(set_constraints): Likewise.
	(remove_constraints): Likewise.
	* cp-tree.h (CONSTR_P): New.
	(init_constraint_processing): Remove.
	(constraints_equivalent_p, iterative_hash_constraint): Declare.
	* decl.c (cxx_init_decl_processing): Don't initialize constraints.
	* logic.cc (subsumption_entry): Moved from pt.c.
	(subsumption_hasher): Likewise.
	(subsumption_cache): Likewise.
	(lookup_subsumption): Likewise.
	(save_subsumption): Likewise.
	(subsumes_constraints_nonnull): Use subsumption cache.
	* pt.c: Move aforementioned declarations out of this file.
	(init_constraint_processing): Remove.

From-SVN: r277407
---
 gcc/cp/ChangeLog      |  28 +++++++++
 gcc/cp/config-lang.in |   2 +-
 gcc/cp/constraint.cc  | 128 ++++++++++++++++++++++++++++++++++++++++
 gcc/cp/cp-tree.h      |  11 +++-
 gcc/cp/decl.c         |   3 -
 gcc/cp/logic.cc       |  83 ++++++++++++++++++++++++--
 gcc/cp/pt.c           | 157 --------------------------------------------------
 7 files changed, 244 insertions(+), 168 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dcf192a..1917b8c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -151,6 +151,34 @@
 
 2019-10-15  Andrew Sutton  <asutton@lock3software.com>
 
+	Finish moving constraint and logic functionality of out pt.c.
+	Reimplement and re-enable subsumption caching.
+
+	* config-lang.in (gtfiles): Add logic.cc.
+	* constraint.cc (atomic_constraints_identical_p): Add assertions.
+	(hash_atomic_constraint): Likewise.
+	(constraints_equivalent_p): New.
+	(inchash::add_constraint): New.
+	(iterative_hash_constraint): New.
+	(decl_constraints): Moved from pt.c.
+	(get_constraints): Likewise.
+	(set_constraints): Likewise.
+	(remove_constraints): Likewise.
+	* cp-tree.h (CONSTR_P): New.
+	(init_constraint_processing): Remove.
+	(constraints_equivalent_p, iterative_hash_constraint): Declare.
+	* decl.c (cxx_init_decl_processing): Don't initialize constraints.
+	* logic.cc (subsumption_entry): Moved from pt.c.
+	(subsumption_hasher): Likewise.
+	(subsumption_cache): Likewise.
+	(lookup_subsumption): Likewise.
+	(save_subsumption): Likewise.
+	(subsumes_constraints_nonnull): Use subsumption cache.
+	* pt.c: Move aforementioned declarations out of this file.
+	(init_constraint_processing): Remove.
+
+2019-10-15  Andrew Sutton  <asutton@lock3software.com>
+
 	* parser.c (cp_parser_constructor_declarator_p): Pass an empty
 	decl-specifier-seq to make sure we parse type constraints as part
 	of a type-specifier.
diff --git a/gcc/cp/config-lang.in b/gcc/cp/config-lang.in
index adfe1b2..0176866 100644
--- a/gcc/cp/config-lang.in
+++ b/gcc/cp/config-lang.in
@@ -46,7 +46,7 @@ gtfiles="\
 \$(srcdir)/cp/except.c \
 \$(srcdir)/cp/friend.c \
 \$(srcdir)/cp/init.c \
-\$(srcdir)/cp/lambda.c \$(srcdir)/cp/lex.c \
+\$(srcdir)/cp/lambda.c \$(srcdir)/cp/lex.c \$(srcdir)/cp/logic.cc \
 \$(srcdir)/cp/mangle.c \$(srcdir)/cp/method.c \
 \$(srcdir)/cp/name-lookup.c \
 \$(srcdir)/cp/parser.c \$(srcdir)/cp/pt.c \
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index db4a818..b8a2645 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -905,6 +905,9 @@ normalize_constraint_expression (tree expr, bool diag = false)
 bool
 atomic_constraints_identical_p (tree t1, tree t2)
 {
+  gcc_assert (TREE_CODE (t1) == ATOMIC_CONSTR);
+  gcc_assert (TREE_CODE (t2) == ATOMIC_CONSTR);
+
   if (ATOMIC_CONSTR_EXPR (t1) != ATOMIC_CONSTR_EXPR (t2))
     return false;
 
@@ -914,9 +917,44 @@ atomic_constraints_identical_p (tree t1, tree t2)
   return true;
 }
 
+/* True if T1 and T2 are equivalent, meaning they have the same syntactic
+   structure and all corresponding constraints are identical.  */
+
+bool
+constraints_equivalent_p (tree t1, tree t2)
+{
+  gcc_assert (CONSTR_P (t1));
+  gcc_assert (CONSTR_P (t2));
+
+  if (TREE_CODE (t1) != TREE_CODE (t2))
+    return false;
+
+  switch (TREE_CODE (t1))
+  {
+  case CONJ_CONSTR:
+  case DISJ_CONSTR:
+    if (!constraints_equivalent_p (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0)))
+      return false;
+    if (!constraints_equivalent_p (TREE_OPERAND (t1, 1), TREE_OPERAND (t2, 1)))
+      return false;
+    break;
+  case ATOMIC_CONSTR:
+    if (!atomic_constraints_identical_p(t1, t2))
+      return false;
+    break;
+  default:
+    gcc_unreachable ();
+  }
+  return true;
+}
+
+/* Compute the hash value for T.  */
+
 hashval_t
 hash_atomic_constraint (tree t)
 {
+  gcc_assert (TREE_CODE (t) == ATOMIC_CONSTR);
+
   /* Hash the identity of the expression.  */
   hashval_t val = htab_hash_pointer (ATOMIC_CONSTR_EXPR (t));
 
@@ -931,6 +969,41 @@ hash_atomic_constraint (tree t)
   return val;
 }
 
+namespace inchash
+{
+
+static void
+add_constraint (tree t, hash& h)
+{
+  h.add_int(TREE_CODE (t));
+  switch (TREE_CODE (t))
+  {
+  case CONJ_CONSTR:
+  case DISJ_CONSTR:
+    add_constraint (TREE_OPERAND (t, 0), h);
+    add_constraint (TREE_OPERAND (t, 1), h);
+    break;
+  case ATOMIC_CONSTR:
+    h.merge_hash (hash_atomic_constraint (t));
+    break;
+  default:
+    gcc_unreachable ();
+  }
+}
+
+}
+
+/* Computes a hash code for the constraint T.  */
+
+hashval_t
+iterative_hash_constraint (tree t, hashval_t val)
+{
+  gcc_assert (CONSTR_P (t));
+  inchash::hash h (val);
+  inchash::add_constraint (t, h);
+  return h.end ();
+}
+
 // -------------------------------------------------------------------------- //
 // Constraint Semantic Processing
 //
@@ -1017,6 +1090,61 @@ build_constraints (tree tr, tree dr)
   return (tree)ci;
 }
 
+/* A mapping from declarations to constraint information.  */
+
+static GTY ((cache)) tree_cache_map *decl_constraints;
+
+/* Returns the template constraints of declaration T. If T is not
+   constrained, return NULL_TREE. Note that T must be non-null. */
+
+tree
+get_constraints (tree t)
+{
+  if (!flag_concepts)
+    return NULL_TREE;
+  if (!decl_constraints)
+    return NULL_TREE;
+
+  gcc_assert (DECL_P (t));
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+  tree* found = decl_constraints->get (t);
+  if (found)
+    return *found;
+  else
+    return NULL_TREE;
+}
+
+/* Associate the given constraint information CI with the declaration
+   T. If T is a template, then the constraints are associated with
+   its underlying declaration. Don't build associations if CI is
+   NULL_TREE.  */
+
+void
+set_constraints (tree t, tree ci)
+{
+  if (!ci)
+    return;
+  gcc_assert (t && flag_concepts);
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+  bool found = hash_map_safe_put<hm_ggc> (decl_constraints, t, ci);
+  gcc_assert (!found);
+}
+
+/* Remove the associated constraints of the declaration T.  */
+
+void
+remove_constraints (tree t)
+{
+  gcc_assert (DECL_P (t));
+  if (TREE_CODE (t) == TEMPLATE_DECL)
+    t = DECL_TEMPLATE_RESULT (t);
+
+  if (decl_constraints)
+    decl_constraints->remove (t);
+}
+
 /* Returns the template-head requires clause for the template
    declaration T or NULL_TREE if none.  */
 
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index e307ac8..7e0c41c 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1551,6 +1551,12 @@ check_constraint_info (tree t)
 #define PLACEHOLDER_TYPE_CONSTRAINTS(NODE) \
   DECL_SIZE_UNIT (TYPE_NAME (NODE))
 
+/* True if NODE is a constraint.  */
+#define CONSTR_P(NODE)                  \
+  (TREE_CODE (NODE) == ATOMIC_CONSTR    \
+   || TREE_CODE (NODE) == CONJ_CONSTR   \
+   || TREE_CODE (NODE) == DISJ_CONSTR)
+
 /* Valid for any normalized constraint.  */
 #define CONSTR_CHECK(NODE) \
   TREE_CHECK3 (NODE, ATOMIC_CONSTR, CONJ_CONSTR, DISJ_CONSTR)
@@ -7693,7 +7699,6 @@ struct diagnosing_failed_constraint
 
 /* in constraint.cc */
 
-extern void init_constraint_processing		();
 extern cp_expr finish_constraint_or_expr	(location_t, cp_expr, cp_expr);
 extern cp_expr finish_constraint_and_expr	(location_t, cp_expr, cp_expr);
 extern cp_expr finish_constraint_primary_expr	(cp_expr);
@@ -7761,8 +7766,10 @@ extern bool subsumes_constraints                (tree, tree);
 extern bool strictly_subsumes			(tree, tree, tree);
 extern bool weakly_subsumes			(tree, tree, tree);
 extern int more_constrained                     (tree, tree);
+extern bool constraints_equivalent_p            (tree, tree);
 extern bool atomic_constraints_identical_p	(tree, tree);
-extern hashval_t hash_atomic_constraint		(tree);
+extern hashval_t iterative_hash_constraint      (tree, hashval_t);
+extern hashval_t hash_atomic_constraint         (tree);
 extern void diagnose_constraints                (location_t, tree, tree);
 
 /* in logic.cc */
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 5d51442..6c90b1d 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4409,9 +4409,6 @@ cxx_init_decl_processing (void)
     /* Ensure attribs.c is initialized.  */
     init_attributes ();
 
-    /* Ensure constraint.cc is initialized. */
-    init_constraint_processing ();
-
     extvisattr = build_tree_list (get_identifier ("externally_visible"),
 				  NULL_TREE);
     newattrs = tree_cons (get_identifier ("alloc_size"),
diff --git a/gcc/cp/logic.cc b/gcc/cp/logic.cc
index 2d4abaf..ee68b54 100644
--- a/gcc/cp/logic.cc
+++ b/gcc/cp/logic.cc
@@ -780,6 +780,73 @@ diagnose_constraint_size (tree t)
   return false;
 }
 
+/* Key/value pair for caching subsumption results. This associates a pair of
+   constraints with a boolean value indicating the result.  */
+
+struct GTY((for_user)) subsumption_entry
+{
+  tree lhs;
+  tree rhs;
+  bool result;
+};
+
+/* Hashing function and equality for constraint entries.  */
+
+struct subsumption_hasher : ggc_ptr_hash<subsumption_entry>
+{
+  static hashval_t hash (subsumption_entry *e)
+  {
+    hashval_t val = 0;
+    val = iterative_hash_constraint (e->lhs, val);
+    val = iterative_hash_constraint (e->rhs, val);
+    return val;
+  }
+
+  static bool equal (subsumption_entry *e1, subsumption_entry *e2)
+  {
+    if (!constraints_equivalent_p (e1->lhs, e2->lhs))
+      return false;
+    if (!constraints_equivalent_p (e1->rhs, e2->rhs))
+      return false;
+    return true;
+  }
+};
+
+/* Caches the results of subsumes_non_null(t1, t1).  */
+
+static GTY ((deletable)) hash_table<subsumption_hasher> *subsumption_cache;
+
+/* Search for a previously cached subsumption result. */
+
+static bool*
+lookup_subsumption (tree t1, tree t2)
+{
+  if (!subsumption_cache)
+    return NULL;
+  subsumption_entry elt = { t1, t2, false };
+  subsumption_entry* found = subsumption_cache->find (&elt);
+  if (found)
+    return &found->result;
+  else
+    return 0;
+}
+
+/* Save a subsumption result. */
+
+static bool
+save_subsumption (tree t1, tree t2, bool result)
+{
+  if (!subsumption_cache)
+    subsumption_cache = hash_table<subsumption_hasher>::create_ggc(31);
+  subsumption_entry elt = {t1, t2, result};
+  subsumption_entry** slot = subsumption_cache->find_slot (&elt, INSERT);
+  subsumption_entry* entry = ggc_alloc<subsumption_entry> ();
+  *entry = elt;
+  *slot = entry;
+  return result;
+}
+
+
 /* Returns true if the LEFT constraint subsume the RIGHT constraints.
    This is done by deriving a proof of the conclusions on the RIGHT
    from the assumptions on the LEFT assumptions.  */
@@ -789,6 +856,9 @@ subsumes_constraints_nonnull (tree lhs, tree rhs)
 {
   auto_timevar time (TV_CONSTRAINT_SUB);
 
+  if (bool *b = lookup_subsumption(lhs, rhs))
+    return *b;
+
   int n1 = dnf_size (lhs);
   int n2 = cnf_size (rhs);
 
@@ -803,19 +873,20 @@ subsumes_constraints_nonnull (tree lhs, tree rhs)
     }
 
   /* Decompose the smaller of the two formulas, and recursively
-     check the implication using the larger.  Note that for
-     constraints that are largely comprised of conjunctions the
-     it will usually be the case that n1 <= n2. */
+     check for implication of the larger.  */
+  bool result;
   if (n1 <= n2)
     {
       formula dnf = decompose_antecedents (lhs);
-      return derive_proofs (dnf, rhs, left);
+      result = derive_proofs (dnf, rhs, left);
     }
   else
     {
       formula cnf = decompose_consequents (rhs);
-      return derive_proofs (cnf, lhs, right);
+      result = derive_proofs (cnf, lhs, right);
     }
+
+  return save_subsumption (lhs, rhs, result);
 }
 
 /* Returns true if the LEFT constraints subsume the RIGHT
@@ -832,3 +903,5 @@ subsumes (tree lhs, tree rhs)
     return true;
   return subsumes_constraints_nonnull (lhs, rhs);
 }
+
+#include "gt-cp-logic.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e154cac..095bc32 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -28483,163 +28483,6 @@ convert_generic_types_to_packs (tree parm, int start_idx, int end_idx)
   return tsubst (parm, replacement, tf_none, NULL_TREE);
 }
 
-/* A mapping from declarations to constraint information. Note that
-   both templates and their underlying declarations are mapped to the
-   same constraint information.
-
-   FIXME: This is defined in pt.c because garbage collection
-   code is not being generated for constraint.cc. */
-
-static GTY ((cache)) tree_cache_map *decl_constraints;
-
-/* Returns the template constraints of declaration T. If T is not
-   constrained, return NULL_TREE. Note that T must be non-null. */
-
-tree
-get_constraints (tree t)
-{
-  if (!flag_concepts)
-    return NULL_TREE;
-  if (!decl_constraints)
-    return NULL_TREE;
-
-  gcc_assert (DECL_P (t));
-  if (TREE_CODE (t) == TEMPLATE_DECL)
-    t = DECL_TEMPLATE_RESULT (t);
-  tree* found = decl_constraints->get (t);
-  if (found)
-    return *found;
-  else
-    return NULL_TREE;
-}
-
-/* Associate the given constraint information CI with the declaration
-   T. If T is a template, then the constraints are associated with
-   its underlying declaration. Don't build associations if CI is
-   NULL_TREE.  */
-
-void
-set_constraints (tree t, tree ci)
-{
-  if (!ci)
-    return;
-  gcc_assert (t && flag_concepts);
-  if (TREE_CODE (t) == TEMPLATE_DECL)
-    t = DECL_TEMPLATE_RESULT (t);
-  bool found = hash_map_safe_put<hm_ggc> (decl_constraints, t, ci);
-  gcc_assert (!found);
-}
-
-/* Remove the associated constraints of the declaration T.  */
-
-void
-remove_constraints (tree t)
-{
-  gcc_assert (DECL_P (t));
-  if (TREE_CODE (t) == TEMPLATE_DECL)
-    t = DECL_TEMPLATE_RESULT (t);
-
-  if (decl_constraints)
-    decl_constraints->remove (t);
-}
-
-static hashval_t
-hash_subsumption_args (tree t1, tree t2)
-{
-  gcc_assert (TREE_CODE (t1) == CHECK_CONSTR);
-  gcc_assert (TREE_CODE (t2) == CHECK_CONSTR);
-  int val = 0;
-  val = iterative_hash_object (CHECK_CONSTR_CONCEPT (t1), val);
-  val = iterative_hash_template_arg (CHECK_CONSTR_ARGS (t1), val);
-  val = iterative_hash_object (CHECK_CONSTR_CONCEPT (t2), val);
-  val = iterative_hash_template_arg (CHECK_CONSTR_ARGS (t2), val);
-  return val;
-}
-
-/* Compare the constraints of two subsumption entries.  The LEFT1 and
-   LEFT2 arguments comprise the first subsumption pair and the RIGHT1
-   and RIGHT2 arguments comprise the second. These are all CHECK_CONSTRs. */
-
-static bool
-comp_subsumption_args (tree left1, tree left2, tree right1, tree right2)
-{
-  if (CHECK_CONSTR_CONCEPT (left1) == CHECK_CONSTR_CONCEPT (right1))
-    if (CHECK_CONSTR_CONCEPT (left2) == CHECK_CONSTR_CONCEPT (right2))
-      if (comp_template_args (CHECK_CONSTR_ARGS (left1),
-                             CHECK_CONSTR_ARGS (right1)))
-        return comp_template_args (CHECK_CONSTR_ARGS (left2),
-                                  CHECK_CONSTR_ARGS (right2));
-  return false;
-}
-
-/* Key/value pair for learning and memoizing subsumption results. This
-   associates a pair of check constraints (including arguments) with
-   a boolean value indicating the result.  */
-
-struct GTY((for_user)) subsumption_entry
-{
-  tree t1;
-  tree t2;
-  bool result;
-};
-
-/* Hashing function and equality for constraint entries.  */
-
-struct subsumption_hasher : ggc_ptr_hash<subsumption_entry>
-{
-  static hashval_t hash (subsumption_entry *e)
-  {
-    return hash_subsumption_args (e->t1, e->t2);
-  }
-
-  static bool equal (subsumption_entry *e1, subsumption_entry *e2)
-  {
-    ++comparing_specializations;
-    bool eq = comp_subsumption_args(e1->t1, e1->t2, e2->t1, e2->t2);
-    --comparing_specializations;
-    return eq;
-  }
-};
-
-static GTY (()) hash_table<subsumption_hasher> *subsumption_table;
-
-/* Search for a previously cached subsumption result. */
-
-bool*
-lookup_subsumption_result (tree t1, tree t2)
-{
-  subsumption_entry elt = { t1, t2, false };
-  subsumption_entry* found = subsumption_table->find (&elt);
-  if (found)
-    return &found->result;
-  else
-    return 0;
-}
-
-/* Save a subsumption result. */
-
-bool
-save_subsumption_result (tree t1, tree t2, bool result)
-{
-  subsumption_entry elt = {t1, t2, result};
-  subsumption_entry** slot = subsumption_table->find_slot (&elt, INSERT);
-  subsumption_entry* entry = ggc_alloc<subsumption_entry> ();
-  *entry = elt;
-  *slot = entry;
-  return result;
-}
-
-/* Set up the hash table for constraint association. */
-
-void
-init_constraint_processing (void)
-{
-  if (!flag_concepts)
-    return;
-
-  subsumption_table = hash_table<subsumption_hasher>::create_ggc(37);
-}
-
 GTY(()) tree current_failed_constraint;
 
 /* __integer_pack(N) in a pack expansion expands to a sequence of numbers from
-- 
cgit v1.1


From 315d42482cf3b94aa723fababf54a815fd0dfc1f Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 24 Oct 2019 17:08:30 +0200
Subject: Make gt_pch_nx unreachable in symbol-summary classes.

2019-10-24  Martin Liska  <mliska@suse.cz>

	* symbol-summary.h (gt_pch_nx): Mark all functions
	with gcc_unreachable as we do not expect to be called.

From-SVN: r277408
---
 gcc/ChangeLog        |  5 +++++
 gcc/symbol-summary.h | 43 +++++++++++++++++--------------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f63370b..977b592 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-24  Martin Liska  <mliska@suse.cz>
+
+	* symbol-summary.h (gt_pch_nx): Mark all functions
+	with gcc_unreachable as we do not expect to be called.
+
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-slp.c (vect_get_and_check_slp_defs): For reduction
diff --git a/gcc/symbol-summary.h b/gcc/symbol-summary.h
index e90d448..7f2e721 100644
--- a/gcc/symbol-summary.h
+++ b/gcc/symbol-summary.h
@@ -295,19 +295,16 @@ gt_ggc_mx(function_summary<T *>* const &summary)
 
 template <typename T>
 void
-gt_pch_nx(function_summary<T *>* const &summary)
+gt_pch_nx (function_summary<T *> *const &)
 {
-  gcc_checking_assert (summary->m_ggc);
-  gt_pch_nx (&summary->m_map);
+  gcc_unreachable ();
 }
 
 template <typename T>
 void
-gt_pch_nx(function_summary<T *>* const& summary, gt_pointer_operator op,
-	  void *cookie)
+gt_pch_nx (function_summary<T *> *const &, gt_pointer_operator, void *)
 {
-  gcc_checking_assert (summary->m_ggc);
-  gt_pch_nx (&summary->m_map, op, cookie);
+  gcc_unreachable ();
 }
 
 /* Help template from std c++11.  */
@@ -538,18 +535,17 @@ gt_ggc_mx (fast_function_summary<T *, va_gc>* const &summary)
 
 template <typename T>
 void
-gt_pch_nx (fast_function_summary<T *, va_gc>* const &summary)
+gt_pch_nx (fast_function_summary<T *, va_gc> *const &)
 {
-  gt_pch_nx (summary->m_vector);
+  gcc_unreachable ();
 }
 
 template <typename T>
 void
-gt_pch_nx (fast_function_summary<T *, va_gc>* const& summary,
-	   gt_pointer_operator op,
-	   void *cookie)
+gt_pch_nx (fast_function_summary<T *, va_gc> *const &, gt_pointer_operator,
+	   void *)
 {
-  gt_pch_nx (summary->m_vector, op, cookie);
+  gcc_unreachable ();
 }
 
 /* Base class for call_summary and fast_call_summary classes.  */
@@ -784,19 +780,16 @@ gt_ggc_mx(call_summary<T *>* const &summary)
 
 template <typename T>
 void
-gt_pch_nx(call_summary<T *>* const &summary)
+gt_pch_nx (call_summary<T *> *const &)
 {
-  gcc_checking_assert (summary->m_ggc);
-  gt_pch_nx (&summary->m_map);
+  gcc_unreachable ();
 }
 
 template <typename T>
 void
-gt_pch_nx(call_summary<T *>* const& summary, gt_pointer_operator op,
-	  void *cookie)
+gt_pch_nx (call_summary<T *> *const &, gt_pointer_operator, void *)
 {
-  gcc_checking_assert (summary->m_ggc);
-  gt_pch_nx (&summary->m_map, op, cookie);
+  gcc_unreachable ();
 }
 
 /* We want to pass just pointer types as argument for fast_call_summary
@@ -994,18 +987,16 @@ gt_ggc_mx (fast_call_summary<T *, va_gc>* const &summary)
 
 template <typename T>
 void
-gt_pch_nx (fast_call_summary<T *, va_gc>* const &summary)
+gt_pch_nx (fast_call_summary<T *, va_gc> *const &)
 {
-  gt_pch_nx (&summary->m_vector);
+  gcc_unreachable ();
 }
 
 template <typename T>
 void
-gt_pch_nx (fast_call_summary<T *, va_gc>* const& summary,
-	   gt_pointer_operator op,
-	   void *cookie)
+gt_pch_nx (fast_call_summary<T *, va_gc> *const &, gt_pointer_operator, void *)
 {
-  gt_pch_nx (&summary->m_vector, op, cookie);
+  gcc_unreachable ();
 }
 
 #endif  /* GCC_SYMBOL_SUMMARY_H  */
-- 
cgit v1.1


From bf037872d3cd0928bea72335dc7a138a0b2fb43c Mon Sep 17 00:00:00 2001
From: Andreas Krebbel <krebbel@linux.ibm.com>
Date: Thu, 24 Oct 2019 15:26:05 +0000
Subject: ipa-sra-19.c: Avoid unprototyped function

Power and IBM Z require a function prototype if a vector argument is
passed.  Complete the prototype of k to prevent errors from being
triggered on these platforms

gcc/testsuite/ChangeLog:

2019-10-24  Andreas Krebbel  <krebbel@linux.ibm.com>

	* gcc.dg/ipa/ipa-sra-19.c: Remove dg-skip-if. Add argument type to
	prototype of k.

From-SVN: r277409
---
 gcc/testsuite/ChangeLog               | 5 +++++
 gcc/testsuite/gcc.dg/ipa/ipa-sra-19.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 329f244..e999a47 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-24  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+	* gcc.dg/ipa/ipa-sra-19.c: Remove dg-skip-if. Add argument type to
+	prototype of k.
+
 2019-10-24  Richard Biener  <rguenther@suse.de>
 
 	* gcc.dg/vect/slp-reduc-10a.c: New testcase.
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-19.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-19.c
index d219411..6186d89 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-19.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-19.c
@@ -1,11 +1,10 @@
 /* { dg-do compile } */
 /* { dg-options "-O2"  } */
-/* { dg-skip-if "" { powerpc*-*-* } } */
 
 typedef int __attribute__((__vector_size__(16))) vectype;
 
 vectype dk();
-vectype k();
+vectype k(vectype);
 
 int b;
 vectype *j;
-- 
cgit v1.1


From 84d2160d5d1d2fb7bcba2402d20cbfb570b34dbd Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 24 Oct 2019 16:03:26 +0000
Subject: [dump] small source cleanup

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01760.html
	* dumpfile.c (dump_begin): Reorder decls to use RAII.

From-SVN: r277415
---
 gcc/ChangeLog  |  4 ++++
 gcc/dumpfile.c | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 977b592..fb00aa6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Nathan Sidwell  <nathan@acm.org>
+
+	* dumpfile.c (dump_begin): Reorder decls to use RAII.
+
 2019-10-24  Martin Liska  <mliska@suse.cz>
 
 	* symbol-summary.h (gt_pch_nx): Mark all functions
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 5263d3a..7ea8f85 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -1532,21 +1532,17 @@ FILE *
 gcc::dump_manager::
 dump_begin (int phase, dump_flags_t *flag_ptr, int part)
 {
-  char *name;
-  struct dump_file_info *dfi;
-  FILE *stream;
-
   if (phase == TDI_none || !dump_phase_enabled_p (phase))
     return NULL;
 
-  name = get_dump_file_name (phase, part);
+  char *name = get_dump_file_name (phase, part);
   if (!name)
     return NULL;
-  dfi = get_dump_file_info (phase);
+  struct dump_file_info *dfi = get_dump_file_info (phase);
 
   /* We do not support re-opening of dump files with parts.  This would require
      tracking pstate per part of the dump file.  */
-  stream = dump_open (name, part != -1 || dfi->pstate < 0);
+  FILE *stream = dump_open (name, part != -1 || dfi->pstate < 0);
   if (stream)
     dfi->pstate = 1;
   free (name);
-- 
cgit v1.1


From bdf1426df754be0e2fbf4a1b0f8e09e9bcb45c26 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 24 Oct 2019 16:11:42 +0000
Subject: [C++ PATCH] Template parm index fix

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg01761.html
	* pt.c (reduce_template_parm_level): Attach the new TPI to the new
	DECL.
	(convert_generic_types_to_packs): Pass the copied type to
	reduce_template_parm_level.

From-SVN: r277416
---
 gcc/cp/ChangeLog |  7 +++++++
 gcc/cp/pt.c      | 35 +++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1917b8c..d28eea3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-24  Nathan Sidwell  <nathan@acm.org>
+
+	* pt.c (reduce_template_parm_level): Attach the new TPI to the new
+	DECL.
+	(convert_generic_types_to_packs): Pass the copied type to
+	reduce_templatE_parm_level.
+
 2019-10-23  Nathan Sidwell  <nathan@acm.org>
 
 	* cp-tree.c (CPTI_STD_IDENTIFIER): Delete.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 095bc32..c5675dd 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4429,33 +4429,40 @@ reduce_template_parm_level (tree index, tree type, int levels, tree args,
       || !same_type_p (type, TREE_TYPE (TEMPLATE_PARM_DESCENDANTS (index))))
     {
       tree orig_decl = TEMPLATE_PARM_DECL (index);
-      tree decl, t;
 
-      decl = build_decl (DECL_SOURCE_LOCATION (orig_decl),
-			 TREE_CODE (orig_decl), DECL_NAME (orig_decl), type);
+      tree decl = build_decl (DECL_SOURCE_LOCATION (orig_decl),
+			      TREE_CODE (orig_decl), DECL_NAME (orig_decl),
+			      type);
       TREE_CONSTANT (decl) = TREE_CONSTANT (orig_decl);
       TREE_READONLY (decl) = TREE_READONLY (orig_decl);
       DECL_ARTIFICIAL (decl) = 1;
       SET_DECL_TEMPLATE_PARM_P (decl);
 
-      t = build_template_parm_index (TEMPLATE_PARM_IDX (index),
-				     TEMPLATE_PARM_LEVEL (index) - levels,
-				     TEMPLATE_PARM_ORIG_LEVEL (index),
-				     decl, type);
-      TEMPLATE_PARM_DESCENDANTS (index) = t;
-      TEMPLATE_PARM_PARAMETER_PACK (t)
+      tree tpi = build_template_parm_index (TEMPLATE_PARM_IDX (index),
+					    TEMPLATE_PARM_LEVEL (index) - levels,
+					    TEMPLATE_PARM_ORIG_LEVEL (index),
+					    decl, type);
+      TEMPLATE_PARM_DESCENDANTS (index) = tpi;
+      TEMPLATE_PARM_PARAMETER_PACK (tpi)
 	= TEMPLATE_PARM_PARAMETER_PACK (index);
 
 	/* Template template parameters need this.  */
+      tree inner = decl;
       if (TREE_CODE (decl) == TEMPLATE_DECL)
 	{
-	  DECL_TEMPLATE_RESULT (decl)
-	    = build_decl (DECL_SOURCE_LOCATION (decl),
-			  TYPE_DECL, DECL_NAME (decl), type);
-	  DECL_ARTIFICIAL (DECL_TEMPLATE_RESULT (decl)) = true;
+	  inner = build_decl (DECL_SOURCE_LOCATION (decl),
+			      TYPE_DECL, DECL_NAME (decl), type);
+	  DECL_TEMPLATE_RESULT (decl) = inner;
+	  DECL_ARTIFICIAL (inner) = true;
 	  DECL_TEMPLATE_PARMS (decl) = tsubst_template_parms
 	    (DECL_TEMPLATE_PARMS (orig_decl), args, complain);
 	}
+
+      /* Attach the TPI to the decl.  */
+      if (TREE_CODE (inner) == TYPE_DECL)
+	TEMPLATE_TYPE_PARM_INDEX (type) = tpi;
+      else
+	DECL_INITIAL (decl) = tpi;
     }
 
   return TEMPLATE_PARM_DESCENDANTS (index);
@@ -28440,7 +28447,7 @@ convert_generic_types_to_packs (tree parm, int start_idx, int end_idx)
       tree t = copy_type (o);
       TEMPLATE_TYPE_PARM_INDEX (t)
 	= reduce_template_parm_level (TEMPLATE_TYPE_PARM_INDEX (o),
-				      o, 0, 0, tf_none);
+				      t, 0, 0, tf_none);
       TREE_TYPE (TEMPLATE_TYPE_DECL (t)) = t;
       TYPE_STUB_DECL (t) = TYPE_NAME (t) = TEMPLATE_TYPE_DECL (t);
       TYPE_MAIN_VARIANT (t) = t;
-- 
cgit v1.1


From 1c95aee0a3e154a9583a7f2cfe987ef84344157c Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Thu, 24 Oct 2019 17:22:27 +0000
Subject: Add missing space to diagnostic in reshape_init_r.

	* decl.c (reshape_init_r): Add missing space.

From-SVN: r277419
---
 gcc/cp/ChangeLog | 4 ++++
 gcc/cp/decl.c    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d28eea3..3590418 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Marek Polacek  <polacek@redhat.com>
+
+	* decl.c (reshape_init_r): Add missing space.
+
 2019-10-24  Nathan Sidwell  <nathan@acm.org>
 
 	* pt.c (reduce_template_parm_level): Attach the new TPI to the new
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6c90b1d..827534c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6239,7 +6239,7 @@ reshape_init_r (tree type, reshape_iter *d, bool first_initializer_p,
 			       (CONSTRUCTOR_ELT (stripped_init,0)->value))))
 		{
 		  if (complain & tf_error)
-		    error ("too many braces around scalar initializer"
+		    error ("too many braces around scalar initializer "
 		           "for type %qT", type);
 		  init = error_mark_node;
 		}
-- 
cgit v1.1


From 90a158075a6b4e26c2e1204c71aa7f49548c5bd7 Mon Sep 17 00:00:00 2001
From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Thu, 24 Oct 2019 20:22:33 +0200
Subject: rs6000: Implement [u]avg<mode>3_ceil

We already had those in fact, just under other names.  Use the standard
names so that the vectorizer can use it.


	* config/rs6000/altivec.md (altivec_vavgu<VI_char>): Rename to...
	(uavg<mode>3_ceil): ... This.
	(altivec_vavgs<VI_char>): Rename to...
	(avg<mode>3_ceil): ... This.
	* config/rs6000/rs6000-builtin.def (VAVGUB, VAVGSB, VAVGUH, VAVGSH,
	VAVGUW, VAVGSW): Adjust.

From-SVN: r277421
---
 gcc/ChangeLog                        |  9 +++++++++
 gcc/config/rs6000/altivec.md         |  4 ++--
 gcc/config/rs6000/rs6000-builtin.def | 12 ++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb00aa6..6494251 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-24  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* config/rs6000/altivec.md (altivec_vavgu<VI_char>): Rename to...
+	(uavg<mode>3_ceil): ... This.
+	(altivec_vavgs<VI_char>): Rename to...
+	(avg<mode>3_ceil): ... This.
+	* config/rs6000/rs6000-builtin.def (VAVGUB, VAVGSB, VAVGUH, VAVGSH,
+	VAVGUW, VAVGSW): Adjust.
+
 2019-10-24  Nathan Sidwell  <nathan@acm.org>
 
 	* dumpfile.c (dump_begin): Reorder decls to use RAII.
diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md
index dc34528..daa91a4 100644
--- a/gcc/config/rs6000/altivec.md
+++ b/gcc/config/rs6000/altivec.md
@@ -560,7 +560,7 @@
   [(set_attr "type" "vecsimple")])
 
 ;;
-(define_insn "altivec_vavgu<VI_char>"
+(define_insn "uavg<mode>3_ceil"
   [(set (match_operand:VI 0 "register_operand" "=v")
         (unspec:VI [(match_operand:VI 1 "register_operand" "v")
                     (match_operand:VI 2 "register_operand" "v")]
@@ -569,7 +569,7 @@
   "vavgu<VI_char> %0,%1,%2"
   [(set_attr "type" "vecsimple")])
 
-(define_insn "altivec_vavgs<VI_char>"
+(define_insn "avg<mode>3_ceil"
   [(set (match_operand:VI 0 "register_operand" "=v")
         (unspec:VI [(match_operand:VI 1 "register_operand" "v")
                     (match_operand:VI 2 "register_operand" "v")]
diff --git a/gcc/config/rs6000/rs6000-builtin.def b/gcc/config/rs6000/rs6000-builtin.def
index 4d4f3b3..0feee7c 100644
--- a/gcc/config/rs6000/rs6000-builtin.def
+++ b/gcc/config/rs6000/rs6000-builtin.def
@@ -1002,12 +1002,12 @@ BU_ALTIVEC_2 (VADDUWS,	      "vadduws",	CONST,	altivec_vadduws)
 BU_ALTIVEC_2 (VADDSWS,	      "vaddsws",	CONST,	altivec_vaddsws)
 BU_ALTIVEC_2 (VAND,	      "vand",		CONST,	andv4si3)
 BU_ALTIVEC_2 (VANDC,	      "vandc",		CONST,	andcv4si3)
-BU_ALTIVEC_2 (VAVGUB,	      "vavgub",		CONST,	altivec_vavgub)
-BU_ALTIVEC_2 (VAVGSB,	      "vavgsb",		CONST,	altivec_vavgsb)
-BU_ALTIVEC_2 (VAVGUH,	      "vavguh",		CONST,	altivec_vavguh)
-BU_ALTIVEC_2 (VAVGSH,	      "vavgsh",		CONST,	altivec_vavgsh)
-BU_ALTIVEC_2 (VAVGUW,	      "vavguw",		CONST,	altivec_vavguw)
-BU_ALTIVEC_2 (VAVGSW,	      "vavgsw",		CONST,	altivec_vavgsw)
+BU_ALTIVEC_2 (VAVGUB,	      "vavgub",		CONST,	uavgv16qi3_ceil)
+BU_ALTIVEC_2 (VAVGSB,	      "vavgsb",		CONST,	avgv16qi3_ceil)
+BU_ALTIVEC_2 (VAVGUH,	      "vavguh",		CONST,	uavgv8hi3_ceil)
+BU_ALTIVEC_2 (VAVGSH,	      "vavgsh",		CONST,	avgv8hi3_ceil)
+BU_ALTIVEC_2 (VAVGUW,	      "vavguw",		CONST,	uavgv4si3_ceil)
+BU_ALTIVEC_2 (VAVGSW,	      "vavgsw",		CONST,	avgv4si3_ceil)
 BU_ALTIVEC_2 (VCFUX,	      "vcfux",		CONST,	altivec_vcfux)
 BU_ALTIVEC_2 (VCFSX,	      "vcfsx",		CONST,	altivec_vcfsx)
 BU_ALTIVEC_2 (VCMPBFP,	      "vcmpbfp",	CONST,	altivec_vcmpbfp)
-- 
cgit v1.1


From f658ad3002a0afc8aa86d5646ee704921d969ebe Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Fri, 25 Oct 2019 00:19:09 +0200
Subject: cgraphunit.c (symbol_table::process_new_functions): Call
 ipa_free_size_summary.

	* cgraphunit.c (symbol_table::process_new_functions): Call
	ipa_free_size_summary.
	* ipa-cp.c (ipcp_cloning_candidate_p): Update.
	(devirtualization_time_bonus): Update.
	(ipcp_propagate_stage): Update.
	* ipa-fnsummary.c (ipa_size_summaries): New.
	(ipa_fn_summary_alloc): Alloc size summary.
	(dump_ipa_call_summary): Update.
	(ipa_dump_fn_summary): Update.
	(analyze_function_body): Update.
	(compute_fn_summary): Likewise.
	(ipa_get_stack_frame_offset): New function.
	(inline_update_callee_summaries): Do not update frame offsets.
	(ipa_merge_fn_summary_after_inlining): Update frame offsets here;
	remove call and function summary.
	(ipa_update_overall_fn_summary): Update.
	(inline_read_section): Update.
	(ipa_fn_summary_write): Update.
	(ipa_free_fn_summary): Do not remove summaries.
	(ipa_free_size_summary): New.
	(release summary pass): Also run at WPA.
	* ipa-fnsummary.h (ipa_size_summary): Declare.
	(ipa_fn_summary): Remove size, self_size, stack_frame_offset,
	estimated_self_stack_size.
	(ipa_size_summary_t): New type.
	(ipa_size_summaries): Declare.
	(ipa_free_size_summary): Declare.
	(ipa_get_stack_frame_offset): Declare.
	* ipa-icf.c (sem_function::merge): Update.
	* ipa-inline-analysis.c (estimate_size_after_inlining): Update.
	(estimate_growth): Update.
	(growth_likely_positive): Update.
	(clone_inlined_nodes): Update.
	(inline_call): Update.
	* ipa-inline.c (caller_growth_limits): Update.
	(edge_badness): Update.
	(recursive_inlining): Update.
	(inline_small_functions): Update.
	(inline_to_all_callers_1): Update.
	* ipa-prop.h (ipa_edge_args_sum_t): Update comment.
	* lto-partition.c (add_symbol_to_partition_1): Update.
	(undo_parittion): Update.

From-SVN: r277424
---
 gcc/ChangeLog              |  43 +++++++++++++
 gcc/cgraphunit.c           |   5 +-
 gcc/ipa-cp.c               |  11 ++--
 gcc/ipa-fnsummary.c        | 151 +++++++++++++++++++++++++++------------------
 gcc/ipa-fnsummary.h        |  63 ++++++++++++++-----
 gcc/ipa-icf.c              |   4 +-
 gcc/ipa-inline-analysis.c  |   9 +--
 gcc/ipa-inline-transform.c |   8 +--
 gcc/ipa-inline.c           |  55 +++++++++--------
 gcc/ipa-prop.h             |   2 +-
 gcc/lto/ChangeLog          |   5 ++
 gcc/lto/lto-partition.c    |   6 +-
 gcc/lto/lto.c              |   4 +-
 13 files changed, 243 insertions(+), 123 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6494251..a4b3250 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,46 @@
+2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
+
+	* cgraphunit.c (symbol_table::process_new_functions): Call
+	ipa_free_size_summary.
+	* ipa-cp.c (ipcp_cloning_candidate_p): Update.
+	(devirtualization_time_bonus): Update.
+	(ipcp_propagate_stage): Update.
+	* ipa-fnsummary.c (ipa_size_summaries): New.
+	(ipa_fn_summary_alloc): Alloc size summary.
+	(dump_ipa_call_summary): Update.
+	(ipa_dump_fn_summary): Update.
+	(analyze_function_body): Update.
+	(compute_fn_summary): Likewise.
+	(ipa_get_stack_frame_offset): New function.
+	(inline_update_callee_summaries): Do not update frame offsets.
+	(ipa_merge_fn_summary_after_inlining): Update frame offsets here;
+	remove call and function summary.
+	(ipa_update_overall_fn_summary): Update.
+	(inline_read_section): Update.
+	(ipa_fn_summary_write): Update.
+	(ipa_free_fn_summary): Do not remove summaries.
+	(ipa_free_size_summary): New.
+	(release summary pass): Also run at WPA.
+	* ipa-fnsummary.h (ipa_size_summary): Declare.
+	(ipa_fn_summary): Remove size, self_size, stack_frame_offset,
+	estimated_self_stack_size.
+	(ipa_size_summary_t): New type.
+	(ipa_size_summaries): Declare.
+	(ipa_free_size_summary): Declare.
+	(ipa_get_stack_frame_offset): Declare.
+	* ipa-icf.c (sem_function::merge): Update.
+	* ipa-inline-analysis.c (estimate_size_after_inlining): Update.
+	(estimate_growth): Update.
+	(growth_likely_positive): Update.
+	(clone_inlined_nodes): Update.
+	(inline_call): Update.
+	* ipa-inline.c (caller_growth_limits): Update.
+	(edge_badness): Update.
+	(recursive_inlining): Update.
+	(inline_small_functions): Update.
+	(inline_to_all_callers_1): Update.
+	* ipa-prop.h (ipa_edge_args_sum_t): Update comment.
+
 2019-10-24  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* config/rs6000/altivec.md (altivec_vavgu<VI_char>): Rename to...
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index cb08efe..3f751fa 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -340,7 +340,10 @@ symbol_table::process_new_functions (void)
 		 and splitting.  This is redundant for functions added late.
 		 Just throw away whatever it did.  */
 	      if (!summaried_computed)
-		ipa_free_fn_summary ();
+		{
+		  ipa_free_fn_summary ();
+		  ipa_free_size_summary ();
+		}
 	    }
 	  else if (ipa_fn_summaries != NULL)
 	    compute_fn_summary (node, true);
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 045072e..f5852dc 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -731,7 +731,7 @@ ipcp_cloning_candidate_p (struct cgraph_node *node)
   init_caller_stats (&stats);
   node->call_for_symbol_thunks_and_aliases (gather_caller_stats, &stats, false);
 
-  if (ipa_fn_summaries->get (node)->self_size < stats.n_calls)
+  if (ipa_size_summaries->get (node)->self_size < stats.n_calls)
     {
       if (dump_file)
 	fprintf (dump_file, "Considering %s for cloning; code might shrink.\n",
@@ -2629,13 +2629,14 @@ devirtualization_time_bonus (struct cgraph_node *node,
       if (!isummary->inlinable)
 	continue;
 
+      int size = ipa_size_summaries->get (callee)->size;
       /* FIXME: The values below need re-considering and perhaps also
 	 integrating into the cost metrics, at lest in some very basic way.  */
-      if (isummary->size <= MAX_INLINE_INSNS_AUTO / 4)
+      if (size <= MAX_INLINE_INSNS_AUTO / 4)
 	res += 31 / ((int)speculative + 1);
-      else if (isummary->size <= MAX_INLINE_INSNS_AUTO / 2)
+      else if (size <= MAX_INLINE_INSNS_AUTO / 2)
 	res += 15 / ((int)speculative + 1);
-      else if (isummary->size <= MAX_INLINE_INSNS_AUTO
+      else if (size <= MAX_INLINE_INSNS_AUTO
 	       || DECL_DECLARED_INLINE_P (callee->decl))
 	res += 7 / ((int)speculative + 1);
     }
@@ -3334,7 +3335,7 @@ ipcp_propagate_stage (class ipa_topo_info *topo)
 				   ipa_get_param_count (info));
 	initialize_node_lattices (node);
       }
-    ipa_fn_summary *s = ipa_fn_summaries->get (node);
+    ipa_size_summary *s = ipa_size_summaries->get (node);
     if (node->definition && !node->alias && s != NULL)
       overall_size += s->self_size;
     max_count = max_count.max (node->count.ipa ());
diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index 40a9e0f..d6b6319 100644
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -86,6 +86,7 @@ along with GCC; see the file COPYING3.  If not see
 
 /* Summaries.  */
 fast_function_summary <ipa_fn_summary *, va_gc> *ipa_fn_summaries;
+fast_function_summary <ipa_size_summary *, va_heap> *ipa_size_summaries;
 fast_call_summary <ipa_call_summary *, va_heap> *ipa_call_summaries;
 
 /* Edge predicates goes here.  */
@@ -552,6 +553,8 @@ ipa_fn_summary_alloc (void)
 {
   gcc_checking_assert (!ipa_fn_summaries);
   ipa_fn_summaries = ipa_fn_summary_t::create_ggc (symtab);
+  ipa_size_summaries = new fast_function_summary <ipa_size_summary *, va_heap>
+							 (symtab);
   ipa_call_summaries = new ipa_call_summary_t (symtab);
 }
 
@@ -791,9 +794,10 @@ dump_ipa_call_summary (FILE *f, int indent, struct cgraph_node *node,
 	       es->call_stmt_size, es->call_stmt_time);
 
       ipa_fn_summary *s = ipa_fn_summaries->get (callee);
+      ipa_size_summary *ss = ipa_size_summaries->get (callee);
       if (s != NULL)
-	fprintf (f, "callee size:%2i stack:%2i",
-		 (int) (s->size / ipa_fn_summary::size_scale),
+	fprintf (f, " callee size:%2i stack:%2i",
+		 (int) (ss->size / ipa_fn_summary::size_scale),
 		 (int) s->estimated_stack_size);
 
       if (es->predicate)
@@ -817,13 +821,11 @@ dump_ipa_call_summary (FILE *f, int indent, struct cgraph_node *node,
 	  }
       if (!edge->inline_failed)
 	{
-	  ipa_fn_summary *s = ipa_fn_summaries->get (callee);
-	  fprintf (f, "%*sStack frame offset %i, callee self size %i,"
-		   " callee size %i\n",
+	  ipa_size_summary *ss = ipa_size_summaries->get (callee);
+	  fprintf (f, "%*sStack frame offset %i, callee self size %i\n",
 		   indent + 2, "",
-		   (int) s->stack_frame_offset,
-		   (int) s->estimated_self_stack_size,
-		   (int) s->estimated_stack_size);
+		   (int) ipa_get_stack_frame_offset (callee),
+		   (int) ss->estimated_self_stack_size);
 	  dump_ipa_call_summary (f, indent + 2, callee, info);
 	}
     }
@@ -853,6 +855,7 @@ ipa_dump_fn_summary (FILE *f, struct cgraph_node *node)
   if (node->definition)
     {
       class ipa_fn_summary *s = ipa_fn_summaries->get (node);
+      class ipa_size_summary *ss = ipa_size_summaries->get (node);
       if (s != NULL)
 	{
 	  size_time_entry *e;
@@ -865,11 +868,11 @@ ipa_dump_fn_summary (FILE *f, struct cgraph_node *node)
 	  if (s->fp_expressions)
 	    fprintf (f, " fp_expression");
 	  fprintf (f, "\n  global time:     %f\n", s->time.to_double ());
-	  fprintf (f, "  self size:       %i\n", s->self_size);
-	  fprintf (f, "  global size:     %i\n", s->size);
+	  fprintf (f, "  self size:       %i\n", ss->self_size);
+	  fprintf (f, "  global size:     %i\n", ss->size);
 	  fprintf (f, "  min size:       %i\n", s->min_size);
 	  fprintf (f, "  self stack:      %i\n",
-		   (int) s->estimated_self_stack_size);
+		   (int) ss->estimated_self_stack_size);
 	  fprintf (f, "  global stack:    %i\n", (int) s->estimated_stack_size);
 	  if (s->growth)
 	    fprintf (f, "  estimated growth:%i\n", (int) s->growth);
@@ -2655,8 +2658,9 @@ analyze_function_body (struct cgraph_node *node, bool early)
 	}
     }
   ipa_fn_summary *s = ipa_fn_summaries->get (node);
+  ipa_size_summary *ss = ipa_size_summaries->get (node);
   s->time = time;
-  s->self_size = size;
+  ss->self_size = size;
   nonconstant_names.release ();
   ipa_release_body_info (&fbi);
   if (opt_for_fn (node->decl, optimize))
@@ -2684,7 +2688,6 @@ compute_fn_summary (struct cgraph_node *node, bool early)
 {
   HOST_WIDE_INT self_stack_size;
   struct cgraph_edge *e;
-  class ipa_fn_summary *info;
 
   gcc_assert (!node->global.inlined_to);
 
@@ -2694,14 +2697,14 @@ compute_fn_summary (struct cgraph_node *node, bool early)
   /* Create a new ipa_fn_summary.  */
   ((ipa_fn_summary_t *)ipa_fn_summaries)->remove_callees (node);
   ipa_fn_summaries->remove (node);
-  info = ipa_fn_summaries->get_create (node);
+  class ipa_fn_summary *info = ipa_fn_summaries->get_create (node);
+  class ipa_size_summary *size_info = ipa_size_summaries->get_create (node);
 
   /* Estimate the stack size for the function if we're optimizing.  */
   self_stack_size = optimize && !node->thunk.thunk_p
 		    ? estimated_stack_frame_size (node) : 0;
-  info->estimated_self_stack_size = self_stack_size;
+  size_info->estimated_self_stack_size = self_stack_size;
   info->estimated_stack_size = self_stack_size;
-  info->stack_frame_offset = 0;
 
   if (node->thunk.thunk_p)
     {
@@ -2719,7 +2722,7 @@ compute_fn_summary (struct cgraph_node *node, bool early)
       t = predicate::not_inlined ();
       info->account_size_time (2 * ipa_fn_summary::size_scale, 0, t, t);
       ipa_update_overall_fn_summary (node);
-      info->self_size = info->size;
+      size_info->self_size = size_info->size;
       if (stdarg_p (TREE_TYPE (node->decl)))
 	{
 	  info->inlinable = false;
@@ -2775,16 +2778,15 @@ compute_fn_summary (struct cgraph_node *node, bool early)
   node->calls_comdat_local = (e != NULL);
 
   /* Inlining characteristics are maintained by the cgraph_mark_inline.  */
-  info->size = info->self_size;
-  info->stack_frame_offset = 0;
-  info->estimated_stack_size = info->estimated_self_stack_size;
+  size_info->size = size_info->self_size;
+  info->estimated_stack_size = size_info->estimated_self_stack_size;
 
   /* Code above should compute exactly the same result as
      ipa_update_overall_fn_summary but because computation happens in
      different order the roundoff errors result in slight changes.  */
   ipa_update_overall_fn_summary (node);
   /* In LTO mode we may have speculative edges set.  */
-  gcc_assert (in_lto_p || info->size == info->self_size);
+  gcc_assert (in_lto_p || size_info->size == size_info->self_size);
 }
 
 
@@ -3104,6 +3106,26 @@ estimate_ipcp_clone_size_and_time (struct cgraph_node *node,
 			       ret_nonspec_time, hints, vNULL);
 }
 
+/* Return stack frame offset where frame of NODE is supposed to start inside
+   of the function it is inlined to.
+   Return 0 for functions that are not inlined.  */
+
+HOST_WIDE_INT
+ipa_get_stack_frame_offset (struct cgraph_node *node)
+{
+  HOST_WIDE_INT offset = 0;
+  if (!node->global.inlined_to)
+    return 0;
+  node = node->callers->caller;
+  while (true)
+    {
+      offset += ipa_size_summaries->get (node)->estimated_self_stack_size;
+      if (!node->global.inlined_to)
+	return offset;
+      node = node->callers->caller;
+    }
+}
+
 
 /* Update summary information of inline clones after inlining.
    Compute peak stack usage.  */
@@ -3112,19 +3134,7 @@ static void
 inline_update_callee_summaries (struct cgraph_node *node, int depth)
 {
   struct cgraph_edge *e;
-  ipa_fn_summary *callee_info = ipa_fn_summaries->get (node);
-  ipa_fn_summary *caller_info = ipa_fn_summaries->get (node->callers->caller);
-  HOST_WIDE_INT peak;
-
-  callee_info->stack_frame_offset
-    = caller_info->stack_frame_offset
-    + caller_info->estimated_self_stack_size;
-  peak = callee_info->stack_frame_offset
-    + callee_info->estimated_self_stack_size;
-
-  ipa_fn_summary *s = ipa_fn_summaries->get (node->global.inlined_to);
-  if (s->estimated_stack_size < peak)
-    s->estimated_stack_size = peak;
+
   ipa_propagate_frequency (node);
   for (e = node->callees; e; e = e->next_callee)
     {
@@ -3284,11 +3294,10 @@ ipa_merge_fn_summary_after_inlining (struct cgraph_edge *edge)
   class ipa_fn_summary *info = ipa_fn_summaries->get (to);
   clause_t clause = 0;	/* not_inline is known to be false.  */
   size_time_entry *e;
-  vec<int> operand_map = vNULL;
-  vec<int> offset_map = vNULL;
+  auto_vec<int, 8> operand_map;
+  auto_vec<int, 8> offset_map;
   int i;
   predicate toplev_predicate;
-  predicate true_p = true;
   class ipa_call_summary *es = ipa_call_summaries->get (edge);
 
   if (es->predicate)
@@ -3375,39 +3384,43 @@ ipa_merge_fn_summary_after_inlining (struct cgraph_edge *edge)
 			&callee_info->loop_stride,
 			operand_map, offset_map, clause, &toplev_predicate);
 
-  ipa_call_summary *s = ipa_call_summaries->get (edge);
-  inline_update_callee_summaries (edge->callee, s->loop_depth);
+  HOST_WIDE_INT stack_frame_offset = ipa_get_stack_frame_offset (edge->callee);
+  HOST_WIDE_INT peak = stack_frame_offset + callee_info->estimated_stack_size;
 
-  /* We do not maintain predicates of inlined edges, free it.  */
-  edge_set_predicate (edge, &true_p);
-  /* Similarly remove param summaries.  */
-  es->param.release ();
-  operand_map.release ();
-  offset_map.release ();
+  if (info->estimated_stack_size < peak)
+    info->estimated_stack_size = peak;
+
+  inline_update_callee_summaries (edge->callee, es->loop_depth);
+
+  /* Free summaries that are not maintained for inline clones/edges.  */
+  ipa_call_summaries->remove (edge);
+  ipa_fn_summaries->remove (edge->callee);
 }
 
-/* For performance reasons ipa_merge_fn_summary_after_inlining is not updating overall size
-   and time.  Recompute it.  */
+/* For performance reasons ipa_merge_fn_summary_after_inlining is not updating
+   overall size and time.  Recompute it.  */
 
 void
 ipa_update_overall_fn_summary (struct cgraph_node *node)
 {
   class ipa_fn_summary *info = ipa_fn_summaries->get_create (node);
+  class ipa_size_summary *size_info = ipa_size_summaries->get_create (node);
   size_time_entry *e;
   int i;
 
-  info->size = 0;
+  size_info->size = 0;
   info->time = 0;
   for (i = 0; vec_safe_iterate (info->size_time_table, i, &e); i++)
     {
-      info->size += e->size;
+      size_info->size += e->size;
       info->time += e->time;
     }
-  estimate_calls_size_and_time (node, &info->size, &info->min_size,
+  estimate_calls_size_and_time (node, &size_info->size, &info->min_size,
 				&info->time, NULL,
 				~(clause_t) (1 << predicate::false_condition),
 				vNULL, vNULL, vNULL);
-  info->size = (info->size + ipa_fn_summary::size_scale / 2) / ipa_fn_summary::size_scale;
+  size_info->size = (size_info->size + ipa_fn_summary::size_scale / 2)
+		    / ipa_fn_summary::size_scale;
 }
 
 
@@ -3558,6 +3571,7 @@ inline_read_section (struct lto_file_decl_data *file_data, const char *data,
       unsigned int index;
       struct cgraph_node *node;
       class ipa_fn_summary *info;
+      class ipa_size_summary *size_info;
       lto_symtab_encoder_t encoder;
       struct bitpack_d bp;
       struct cgraph_edge *e;
@@ -3568,6 +3582,8 @@ inline_read_section (struct lto_file_decl_data *file_data, const char *data,
       node = dyn_cast<cgraph_node *> (lto_symtab_encoder_deref (encoder,
 								index));
       info = node->prevailing_p () ? ipa_fn_summaries->get_create (node) : NULL;
+      size_info = node->prevailing_p ()
+		  ? ipa_size_summaries->get_create (node) : NULL;
 
       int stack_size = streamer_read_uhwi (&ib);
       int size = streamer_read_uhwi (&ib);
@@ -3576,8 +3592,8 @@ inline_read_section (struct lto_file_decl_data *file_data, const char *data,
       if (info)
 	{
 	  info->estimated_stack_size
-	    = info->estimated_self_stack_size = stack_size;
-	  info->size = info->self_size = size;
+	    = size_info->estimated_self_stack_size = stack_size;
+	  size_info->size = size_info->self_size = size;
 	  info->time = time;
 	}
 
@@ -3768,6 +3784,7 @@ ipa_fn_summary_write (void)
       if (cnode && cnode->definition && !cnode->alias)
 	{
 	  class ipa_fn_summary *info = ipa_fn_summaries->get (cnode);
+	  class ipa_size_summary *size_info = ipa_size_summaries->get (cnode);
 	  struct bitpack_d bp;
 	  struct cgraph_edge *edge;
 	  int i;
@@ -3775,8 +3792,8 @@ ipa_fn_summary_write (void)
 	  struct condition *c;
 
 	  streamer_write_uhwi (ob, lto_symtab_encoder_encode (encoder, cnode));
-	  streamer_write_hwi (ob, info->estimated_self_stack_size);
-	  streamer_write_hwi (ob, info->self_size);
+	  streamer_write_hwi (ob, size_info->estimated_self_stack_size);
+	  streamer_write_hwi (ob, size_info->self_size);
 	  info->time.stream_out (ob);
 	  bp = bitpack_create (ob->main_stream);
 	  bp_pack_value (&bp, info->inlinable, 1);
@@ -3846,23 +3863,33 @@ ipa_fn_summary_write (void)
 }
 
 
-/* Release inline summary.  */
+/* Release function summary.  */
 
 void
 ipa_free_fn_summary (void)
 {
-  struct cgraph_node *node;
   if (!ipa_call_summaries)
     return;
-  FOR_EACH_DEFINED_FUNCTION (node)
-    if (!node->alias)
-      ipa_fn_summaries->remove (node);
   ipa_fn_summaries->release ();
   ipa_fn_summaries = NULL;
   ipa_call_summaries->release ();
   delete ipa_call_summaries;
   ipa_call_summaries = NULL;
   edge_predicate_pool.release ();
+  /* During IPA this is one of largest datastructures to release.  */
+  if (flag_wpa)
+    ggc_trim ();
+}
+
+/* Release function summary.  */
+
+void
+ipa_free_size_summary (void)
+{
+  if (!ipa_size_summaries)
+    return;
+  ipa_size_summaries->release ();
+  ipa_size_summaries = NULL;
 }
 
 namespace {
@@ -3937,10 +3964,12 @@ public:
       gcc_assert (n == 0);
       small_p = param;
     }
-  virtual bool gate (function *) { return small_p || !flag_wpa; }
+  virtual bool gate (function *) { return true; }
   virtual unsigned int execute (function *)
     {
       ipa_free_fn_summary ();
+      if (!flag_wpa)
+	ipa_free_size_summary ();
       return 0;
     }
 
diff --git a/gcc/ipa-fnsummary.h b/gcc/ipa-fnsummary.h
index 173d3f2..f645730 100644
--- a/gcc/ipa-fnsummary.h
+++ b/gcc/ipa-fnsummary.h
@@ -82,6 +82,30 @@ public:
   sreal GTY((skip)) time;
 };
 
+/* Summary about function and stack frame sizes.  We keep this info 
+   for inline clones and also for WPA streaming. For this reason this is not
+   part of ipa_fn_summary which exists only for offline functions.  */
+class ipa_size_summary
+{
+public:
+  /* Estimated stack frame consumption by the function.  */
+  HOST_WIDE_INT estimated_self_stack_size;
+  /* Size of the function body.  */
+  int self_size;
+  /* Estimated size of the function after inlining.  */
+  int size;
+
+  ipa_size_summary ()
+  : estimated_self_stack_size (0), self_size (0), size (0)
+  {
+  }
+  /* Copy constructor.  */
+  ipa_size_summary (const ipa_size_summary &s)
+  : estimated_self_stack_size (0), self_size (s.self_size), size (s.size)
+  {
+  }
+};
+
 /* Function inlining information.  */
 class GTY(()) ipa_fn_summary
 {
@@ -89,10 +113,10 @@ public:
   /* Keep all field empty so summary dumping works during its computation.
      This is useful for debugging.  */
   ipa_fn_summary ()
-    : estimated_self_stack_size (0), self_size (0), min_size (0),
+    : min_size (0),
       inlinable (false), single_caller (false),
       fp_expressions (false), estimated_stack_size (false),
-      stack_frame_offset (false), time (0), size (0), conds (NULL),
+      time (0), conds (NULL),
       size_time_table (NULL), loop_iterations (NULL), loop_stride (NULL),
       growth (0), scc_no (0)
   {
@@ -100,13 +124,11 @@ public:
 
   /* Copy constructor.  */
   ipa_fn_summary (const ipa_fn_summary &s)
-    : estimated_self_stack_size (s.estimated_self_stack_size),
-    self_size (s.self_size), min_size (s.min_size),
+    : min_size (s.min_size),
     inlinable (s.inlinable), single_caller (s.single_caller),
     fp_expressions (s.fp_expressions),
     estimated_stack_size (s.estimated_stack_size),
-    stack_frame_offset (s.stack_frame_offset), time (s.time), size (s.size),
-    conds (s.conds), size_time_table (s.size_time_table),
+    time (s.time), conds (s.conds), size_time_table (s.size_time_table),
     loop_iterations (s.loop_iterations), loop_stride (s.loop_stride),
     growth (s.growth), scc_no (s.scc_no)
   {}
@@ -116,10 +138,6 @@ public:
 
   /* Information about the function body itself.  */
 
-  /* Estimated stack frame consumption by the function.  */
-  HOST_WIDE_INT estimated_self_stack_size;
-  /* Size of the function body.  */
-  int self_size;
   /* Minimal size increase after inlining.  */
   int min_size;
 
@@ -137,11 +155,8 @@ public:
 
   /* Estimated stack frame consumption by the function.  */
   HOST_WIDE_INT estimated_stack_size;
-  /* Expected offset of the stack frame of function.  */
-  HOST_WIDE_INT stack_frame_offset;
-  /* Estimated size of the function after inlining.  */
+  /* Estimated runtime of function after inlining.  */
   sreal GTY((skip)) time;
-  int size;
 
   /* Conditional size/time information.  The summaries are being
      merged during inlining.  */
@@ -201,6 +216,24 @@ public:
 extern GTY(()) fast_function_summary <ipa_fn_summary *, va_gc>
   *ipa_fn_summaries;
 
+class ipa_size_summary_t:
+  public fast_function_summary <ipa_size_summary *, va_gc>
+{
+public:
+  ipa_size_summary_t (symbol_table *symtab):
+    fast_function_summary <ipa_size_summary *, va_gc> (symtab) {}
+
+  static ipa_size_summary_t *create_ggc (symbol_table *symtab)
+  {
+    class ipa_size_summary_t *summary = new (ggc_alloc <ipa_size_summary_t> ())
+      ipa_size_summary_t (symtab);
+    summary->disable_insertion_hook ();
+    return summary;
+  }
+};
+extern fast_function_summary <ipa_size_summary *, va_heap>
+  *ipa_size_summaries;
+
 /* Information kept about callgraph edges.  */
 class ipa_call_summary
 {
@@ -256,6 +289,7 @@ void ipa_dump_fn_summaries (FILE *f);
 void ipa_dump_fn_summary (FILE *f, struct cgraph_node *node);
 void ipa_dump_hints (FILE *f, ipa_hints);
 void ipa_free_fn_summary (void);
+void ipa_free_size_summary (void);
 void inline_analyze_function (struct cgraph_node *node);
 void estimate_ipcp_clone_size_and_time (struct cgraph_node *,
 					vec<tree>,
@@ -289,5 +323,6 @@ void estimate_node_size_and_time (struct cgraph_node *node,
 				  inline_param_summary);
 
 void ipa_fnsummary_c_finalize (void);
+HOST_WIDE_INT ipa_get_stack_frame_offset (struct cgraph_node *node);
 
 #endif /* GCC_IPA_FNSUMMARY_H */
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 8bf0f7c..bcfed2b 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -1142,8 +1142,8 @@ sem_function::merge (sem_item *alias_item)
 			 "cannot create wrapper of stdarg function.\n");
 	}
       else if (ipa_fn_summaries
-	       && ipa_fn_summaries->get (alias) != NULL
-	       && ipa_fn_summaries->get (alias)->self_size <= 2)
+	       && ipa_size_summaries->get (alias) != NULL
+	       && ipa_size_summaries->get (alias)->self_size <= 2)
 	{
 	  if (dump_enabled_p ())
 	    dump_printf (MSG_MISSED_OPTIMIZATION, "Wrapper creation is not "
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index a66af27..8b572a4 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -161,7 +161,8 @@ do_estimate_edge_time (struct cgraph_edge *edge)
   /* When caching, update the cache entry.  */
   if (edge_growth_cache != NULL)
     {
-      ipa_fn_summaries->get_create (edge->callee)->min_size = min_size;
+      ipa_fn_summaries->get (edge->callee->function_symbol ())->min_size
+	 = min_size;
       edge_growth_cache_entry *entry
 	= edge_growth_cache->get_create (edge);
       entry->time = time;
@@ -265,7 +266,7 @@ estimate_size_after_inlining (struct cgraph_node *node,
 			      struct cgraph_edge *edge)
 {
   class ipa_call_summary *es = ipa_call_summaries->get (edge);
-  ipa_fn_summary *s = ipa_fn_summaries->get (node);
+  ipa_size_summary *s = ipa_size_summaries->get (node);
   if (!es->predicate || *es->predicate != false)
     {
       int size = s->size + estimate_edge_growth (edge);
@@ -321,7 +322,7 @@ int
 estimate_growth (struct cgraph_node *node)
 {
   struct growth_data d = { node, false, false, 0 };
-  class ipa_fn_summary *info = ipa_fn_summaries->get (node);
+  class ipa_size_summary *info = ipa_size_summaries->get (node);
 
   node->call_for_symbol_and_aliases (do_estimate_growth_1, &d, true);
 
@@ -396,7 +397,7 @@ growth_likely_positive (struct cgraph_node *node,
       || node->address_taken)
     return true;
 
-  max_callers = ipa_fn_summaries->get (node)->size * 4 / edge_growth + 2;
+  max_callers = ipa_size_summaries->get (node)->size * 4 / edge_growth + 2;
 
   for (e = node->callers; e; e = e->next_caller)
     {
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index d229960..14e684e 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -200,7 +200,7 @@ clone_inlined_nodes (struct cgraph_edge *e, bool duplicate,
 	    {
 	      gcc_assert (!e->callee->alias);
 	      if (overall_size)
-		*overall_size -= ipa_fn_summaries->get (e->callee)->size;
+		*overall_size -= ipa_size_summaries->get (e->callee)->size;
 	      nfunctions_inlined++;
 	    }
 	  duplicate = false;
@@ -478,7 +478,7 @@ inline_call (struct cgraph_edge *e, bool update_original,
 
   gcc_assert (curr->callee->global.inlined_to == to);
 
-  old_size = ipa_fn_summaries->get (to)->size;
+  old_size = ipa_size_summaries->get (to)->size;
   ipa_merge_fn_summary_after_inlining (e);
   if (e->in_polymorphic_cdtor)
     mark_all_inlined_calls_cdtor (e->callee);
@@ -492,8 +492,8 @@ inline_call (struct cgraph_edge *e, bool update_original,
        work for further inlining into this function.  Before inlining
        the function we inlined to again we expect the caller to update
        the overall summary.  */
-    ipa_fn_summaries->get (to)->size += estimated_growth;
-  new_size = ipa_fn_summaries->get (to)->size;
+    ipa_size_summaries->get (to)->size += estimated_growth;
+  new_size = ipa_size_summaries->get (to)->size;
 
   if (callee->calls_comdat_local)
     to->calls_comdat_local = true;
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index ce146e0..a7ef7fa 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -150,8 +150,7 @@ caller_growth_limits (struct cgraph_edge *e)
   int newsize;
   int limit = 0;
   HOST_WIDE_INT stack_size_limit = 0, inlined_stack;
-  ipa_fn_summary *info, *what_info;
-  ipa_fn_summary *outer_info = ipa_fn_summaries->get (to);
+  ipa_size_summary *outer_info = ipa_size_summaries->get (to);
 
   /* Look for function e->caller is inlined to.  While doing
      so work out the largest function body on the way.  As
@@ -163,28 +162,29 @@ caller_growth_limits (struct cgraph_edge *e)
      too much in order to prevent compiler from exploding".  */
   while (true)
     {
-      info = ipa_fn_summaries->get (to);
-      if (limit < info->self_size)
-	limit = info->self_size;
-      if (stack_size_limit < info->estimated_self_stack_size)
-	stack_size_limit = info->estimated_self_stack_size;
+      ipa_size_summary *size_info = ipa_size_summaries->get (to);
+      if (limit < size_info->self_size)
+	limit = size_info->self_size;
+      if (stack_size_limit < size_info->estimated_self_stack_size)
+	stack_size_limit = size_info->estimated_self_stack_size;
       if (to->global.inlined_to)
         to = to->callers->caller;
       else
 	break;
     }
 
-  what_info = ipa_fn_summaries->get (what);
+  ipa_fn_summary *what_info = ipa_fn_summaries->get (what);
+  ipa_size_summary *what_size_info = ipa_size_summaries->get (what);
 
-  if (limit < what_info->self_size)
-    limit = what_info->self_size;
+  if (limit < what_size_info->self_size)
+    limit = what_size_info->self_size;
 
   limit += limit * PARAM_VALUE (PARAM_LARGE_FUNCTION_GROWTH) / 100;
 
   /* Check the size after inlining against the function limits.  But allow
      the function to shrink if it went over the limits by forced inlining.  */
   newsize = estimate_size_after_inlining (to, e);
-  if (newsize >= info->size
+  if (newsize >= ipa_size_summaries->get (what)->size
       && newsize > PARAM_VALUE (PARAM_LARGE_FUNCTION_INSNS)
       && newsize > limit)
     {
@@ -203,7 +203,7 @@ caller_growth_limits (struct cgraph_edge *e)
   stack_size_limit += ((gcov_type)stack_size_limit
 		       * PARAM_VALUE (PARAM_STACK_FRAME_GROWTH) / 100);
 
-  inlined_stack = (outer_info->stack_frame_offset
+  inlined_stack = (ipa_get_stack_frame_offset (to)
 		   + outer_info->estimated_self_stack_size
 		   + what_info->estimated_stack_size);
   /* Check new stack consumption with stack consumption at the place
@@ -213,7 +213,7 @@ caller_growth_limits (struct cgraph_edge *e)
 	 inline call, we can inline, too.
 	 This bit overoptimistically assume that we are good at stack
 	 packing.  */
-      && inlined_stack > info->estimated_stack_size
+      && inlined_stack > ipa_fn_summaries->get (to)->estimated_stack_size
       && inlined_stack > PARAM_VALUE (PARAM_LARGE_STACK_FRAME))
     {
       e->inline_failed = CIF_LARGE_STACK_FRAME_GROWTH_LIMIT;
@@ -1115,7 +1115,7 @@ edge_badness (struct cgraph_edge *edge, bool dump)
   gcc_checking_assert ((edge_time * 100
 			- callee_info->time * 101).to_int () <= 0
 			|| callee->count.ipa ().initialized_p ());
-  gcc_checking_assert (growth <= callee_info->size);
+  gcc_checking_assert (growth <= ipa_size_summaries->get (callee)->size);
 
   if (dump)
     {
@@ -1219,7 +1219,7 @@ edge_badness (struct cgraph_edge *edge, bool dump)
 	     and it is not called once.  */
 	  if (!caller_info->single_caller && overall_growth < caller_growth
 	      && caller_info->inlinable
-	      && caller_info->size
+	      && ipa_size_summaries->get (caller)->size
 		 < (DECL_DECLARED_INLINE_P (caller->decl)
 		    ? inline_insns_single (caller, false)
 		    : inline_insns_auto (caller, false)))
@@ -1243,7 +1243,7 @@ edge_badness (struct cgraph_edge *edge, bool dump)
 	    overall_growth += 256 * 256 - 256;
 	  denominator *= overall_growth;
         }
-      denominator *= ipa_fn_summaries->get (caller)->size + growth;
+      denominator *= ipa_size_summaries->get (caller)->size + growth;
 
       badness = - numerator / denominator;
 
@@ -1646,8 +1646,8 @@ recursive_inlining (struct cgraph_edge *edge,
     dump_printf_loc (MSG_NOTE, edge->call_stmt,
 		     "\n   Inlined %i times, "
 		     "body grown from size %i to %i, time %f to %f\n", n,
-		     ipa_fn_summaries->get (master_clone)->size,
-		     ipa_fn_summaries->get (node)->size,
+		     ipa_size_summaries->get (master_clone)->size,
+		     ipa_size_summaries->get (node)->size,
 		     ipa_fn_summaries->get (master_clone)->time.to_double (),
 		     ipa_fn_summaries->get (node)->time.to_double ());
 
@@ -1871,7 +1871,7 @@ inline_small_functions (void)
 	    /* Do not account external functions, they will be optimized out
 	       if not inlined.  Also only count the non-cold portion of program.  */
 	    if (inline_account_function_p (node))
-	      initial_size += info->size;
+	      initial_size += ipa_size_summaries->get (node)->size;
 	    info->growth = estimate_growth (node);
 
 	    int num_calls = 0;
@@ -1887,7 +1887,8 @@ inline_small_functions (void)
 		     n2 = ((struct ipa_dfs_info *) n2->aux)->next_cycle)
 		  if (opt_for_fn (n2->decl, optimize))
 		    {
-		      ipa_fn_summary *info2 = ipa_fn_summaries->get (n2);
+		      ipa_fn_summary *info2 = ipa_fn_summaries->get
+			 (n2->global.inlined_to ? n2->global.inlined_to : n2);
 		      if (info2->scc_no)
 			break;
 		      info2->scc_no = id;
@@ -2048,7 +2049,7 @@ inline_small_functions (void)
 	  fprintf (dump_file,
 		   "\nConsidering %s with %i size\n",
 		   callee->dump_name (),
-		   ipa_fn_summaries->get (callee)->size);
+		   ipa_size_summaries->get (callee)->size);
 	  fprintf (dump_file,
 		   " to be inlined into %s in %s:%i\n"
 		   " Estimated badness is %f, frequency %.2f.\n",
@@ -2174,7 +2175,7 @@ inline_small_functions (void)
 
       if (dump_enabled_p ())
 	{
-	  ipa_fn_summary *s = ipa_fn_summaries->get (edge->caller);
+	  ipa_fn_summary *s = ipa_fn_summaries->get (where);
 
 	  /* dump_printf can't handle %+i.  */
 	  char buf_net_change[100];
@@ -2185,7 +2186,9 @@ inline_small_functions (void)
 			   " Inlined %C into %C which now has time %f and "
 			   "size %i, net change of %s.\n",
 			   edge->callee, edge->caller,
-			   s->time.to_double (), s->size, buf_net_change);
+			   s->time.to_double (),
+			   ipa_size_summaries->get (edge->caller)->size,
+			   buf_net_change);
 	}
       if (min_size > overall_size)
 	{
@@ -2322,11 +2325,11 @@ inline_to_all_callers_1 (struct cgraph_node *node, void *data,
 	  fprintf (dump_file,
 		   "\nInlining %s size %i.\n",
 		   ultimate->name (),
-		   ipa_fn_summaries->get (ultimate)->size);
+		   ipa_size_summaries->get (ultimate)->size);
 	  fprintf (dump_file,
 		   " Called once from %s %i insns.\n",
 		   node->callers->caller->name (),
-		   ipa_fn_summaries->get (node->callers->caller)->size);
+		   ipa_size_summaries->get (node->callers->caller)->size);
 	}
 
       /* Remember which callers we inlined to, delaying updating the
@@ -2337,7 +2340,7 @@ inline_to_all_callers_1 (struct cgraph_node *node, void *data,
 	fprintf (dump_file,
 		 " Inlined into %s which now has %i size\n",
 		 caller->name (),
-		 ipa_fn_summaries->get (caller)->size);
+		 ipa_size_summaries->get (caller)->size);
       if (!(*num_calls)--)
 	{
 	  if (dump_file)
diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h
index eb3397a..24a69c1 100644
--- a/gcc/ipa-prop.h
+++ b/gcc/ipa-prop.h
@@ -641,7 +641,7 @@ class GTY((user)) ipa_edge_args_sum_t : public call_summary <ipa_edge_args *>
   ipa_edge_args_sum_t (symbol_table *table, bool ggc)
     : call_summary<ipa_edge_args *> (table, ggc) { }
 
-  /* Hook that is called by summary when an edge is duplicated.  */
+  /* Hook that is called by summary when an edge is removed.  */
   virtual void remove (cgraph_edge *cs, ipa_edge_args *args);
   /* Hook that is called by summary when an edge is duplicated.  */
   virtual void duplicate (cgraph_edge *src,
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 49c77e0..5d26f6a 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
+
+	* lto-partition.c (add_symbol_to_partition_1): Update.
+	(undo_parittion): Update.
+
 2019-10-23  Jan Hubicka  <hubicka@ucw.cz>
 
 	* lto-common.c (lto_file_finalize): Add order attribute.
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 6972e6e..1492833 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -171,7 +171,7 @@ add_symbol_to_partition_1 (ltrans_partition part, symtab_node *node)
     {
       struct cgraph_edge *e;
       if (!node->alias && c == SYMBOL_PARTITION)
-	part->insns += ipa_fn_summaries->get (cnode)->size;
+	part->insns += ipa_size_summaries->get (cnode)->size;
 
       /* Add all inline clones and callees that are duplicated.  */
       for (e = cnode->callees; e; e = e->next_callee)
@@ -291,7 +291,7 @@ undo_partition (ltrans_partition partition, unsigned int n_nodes)
 
       if (!node->alias && (cnode = dyn_cast <cgraph_node *> (node))
           && node->get_partitioning_class () == SYMBOL_PARTITION)
-	partition->insns -= ipa_fn_summaries->get (cnode)->size;
+	partition->insns -= ipa_size_summaries->get (cnode)->size;
       lto_symtab_encoder_delete_node (partition->encoder, node);
       node->aux = (void *)((size_t)node->aux - 1);
     }
@@ -528,7 +528,7 @@ lto_balanced_map (int n_lto_partitions, int max_partition_size)
 	else
 	  order.safe_push (node);
 	if (!node->alias)
-	  total_size += ipa_fn_summaries->get (node)->size;
+	  total_size += ipa_size_summaries->get (node)->size;
       }
 
   original_total_size = total_size;
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 4f404ec..9b8c327 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -498,9 +498,9 @@ do_whole_program_analysis (void)
   else
     gcc_unreachable ();
 
-  /* Inline summaries are needed for balanced partitioning.  Free them now so
+  /* Size summaries are needed for balanced partitioning.  Free them now so
      the memory can be used for streamer caches.  */
-  ipa_free_fn_summary ();
+  ipa_free_size_summary ();
 
   /* AUX pointers are used by partitioning code to bookkeep number of
      partitions symbol is in.  This is no longer needed.  */
-- 
cgit v1.1


From ea3628bdeb9a5411aaa1aa567fa6bc005057482f Mon Sep 17 00:00:00 2001
From: Jan Hubicka <hubicka@ucw.cz>
Date: Fri, 25 Oct 2019 00:24:42 +0200
Subject: symbols-summary.h (fast_function_summary<T *, [...]): Free m_vector.

	* symbols-summary.h (fast_function_summary<T *, V>::release,
	fast_call_summary<T *, V>::release): Free m_vector.

From-SVN: r277425
---
 gcc/ChangeLog        | 5 +++++
 gcc/symbol-summary.h | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4b3250..3fac6ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
 
+	* symbols-summary.h (fast_function_summary<T *, V>::release,
+	fast_call_summary<T *, V>::release): Free m_vector.
+
+2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
+
 	* cgraphunit.c (symbol_table::process_new_functions): Call
 	ipa_free_size_summary.
 	* ipa-cp.c (ipcp_cloning_candidate_p): Update.
diff --git a/gcc/symbol-summary.h b/gcc/symbol-summary.h
index 7f2e721..a0bacad 100644
--- a/gcc/symbol-summary.h
+++ b/gcc/symbol-summary.h
@@ -458,6 +458,8 @@ fast_function_summary<T *, V>::release ()
     if ((*m_vector)[i] != NULL)
       this->release ((*m_vector)[i]);
 
+  vec_free (m_vector);
+ 
   this->m_released = true;
 }
 
@@ -919,6 +921,8 @@ fast_call_summary<T *, V>::release ()
     if ((*m_vector)[i] != NULL)
       this->release ((*m_vector)[i]);
 
+  vec_free (m_vector);
+
   this->m_released = true;
 }
 
-- 
cgit v1.1


From f8cb8bcde13df2f2b1a996567c849ec512eec210 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 25 Oct 2019 00:27:10 +0200
Subject: arc.c (hwloop_optimize): Add missing space in string literal.

	* config/arc/arc.c (hwloop_optimize): Add missing space in string
	literal.
	* config/rx/rx.c (rx_print_operand): Likewise.
	* tree-vect-data-refs.c (vect_analyze_data_refs): Likewise.
	* tree-ssa-loop-ch.c (should_duplicate_loop_header_p): Likewise.
	* ipa-sra.c (create_parameter_descriptors, process_scan_results):
	Likewise.
	* genemit.c (emit_c_code): Likewise.
	* plugin.c (try_init_one_plugin): Likewise.  Formatting fix.
cp/
	* call.c (convert_arg_to_ellipsis): Add missing space in string
	literal.

From-SVN: r277426
---
 gcc/ChangeLog             | 12 ++++++++++++
 gcc/config/arc/arc.c      |  6 +++---
 gcc/config/rx/rx.c        |  2 +-
 gcc/cp/ChangeLog          |  5 +++++
 gcc/cp/call.c             |  2 +-
 gcc/genemit.c             |  2 +-
 gcc/ipa-sra.c             |  8 ++++----
 gcc/plugin.c              |  6 +++---
 gcc/tree-ssa-loop-ch.c    |  2 +-
 gcc/tree-vect-data-refs.c |  2 +-
 10 files changed, 32 insertions(+), 15 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3fac6ba..9d19975 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2019-10-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/arc/arc.c (hwloop_optimize): Add missing space in string
+	literal.
+	* config/rx/rx.c (rx_print_operand): Likewise.
+	* tree-vect-data-refs.c (vect_analyze_data_refs): Likewise.
+	* tree-ssa-loop-ch.c (should_duplicate_loop_header_p): Likewise.
+	* ipa-sra.c (create_parameter_descriptors, process_scan_results):
+	Likewise.
+	* genemit.c (emit_c_code): Likewise.
+	* plugin.c (try_init_one_plugin): Likewise.  Formatting fix.
+
 2019-10-24  Jan Hubicka  <hubicka@ucw.cz>
 
 	* symbols-summary.h (fast_function_summary<T *, V>::release,
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 0b5d3fd..138c84e 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -8001,7 +8001,7 @@ hwloop_optimize (hwloop_info loop)
 	  return false;
 	}
       if (dump_file)
-	fprintf (dump_file, ";; loop %d has a control like last insn;"
+	fprintf (dump_file, ";; loop %d has a control like last insn; "
 		 "add a nop\n",
 		 loop->loop_no);
 
@@ -8011,7 +8011,7 @@ hwloop_optimize (hwloop_info loop)
   if (LABEL_P (last_insn))
     {
       if (dump_file)
-	fprintf (dump_file, ";; loop %d has a label as last insn;"
+	fprintf (dump_file, ";; loop %d has a label as last insn; "
 		 "add a nop\n",
 		 loop->loop_no);
       last_insn = emit_insn_after (gen_nopv (), last_insn);
@@ -8038,7 +8038,7 @@ hwloop_optimize (hwloop_info loop)
   if (entry_edge == NULL)
     {
       if (dump_file)
-	fprintf (dump_file, ";; loop %d has no fallthru edge jumping"
+	fprintf (dump_file, ";; loop %d has no fallthru edge jumping "
 		 "into the loop\n",
 		 loop->loop_no);
       return false;
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index c7ce19c..931205c 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -649,7 +649,7 @@ rx_print_operand (FILE * file, rtx op, int letter)
 	case CTRLREG_INTB:  fprintf (file, "intb"); break;
 	default:
 	  warning (0, "unrecognized control register number: %d"
-		   "- using %<psw%>", (int) INTVAL (op));
+		   " - using %<psw%>", (int) INTVAL (op));
 	  fprintf (file, "psw");
 	  break;
 	}
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3590418..33420f1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* call.c (convert_arg_to_ellipsis): Add missing space in string
+	literal.
+
 2019-10-24  Marek Polacek  <polacek@redhat.com>
 
 	* decl.c (reshape_init_r): Add missing space.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 55d2aba..cbd1fe8 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7590,7 +7590,7 @@ convert_arg_to_ellipsis (tree arg, tsubst_flags_t complain)
 	      && TYPE_MODE (TREE_TYPE (prom)) != TYPE_MODE (arg_type)
 	      && (complain & tf_warning))
 	    warning_at (loc, OPT_Wabi, "scoped enum %qT passed through %<...%>"
-			"as %qT before %<-fabi-version=6%>, %qT after",
+			" as %qT before %<-fabi-version=6%>, %qT after",
 			arg_type,
 			TREE_TYPE (prom), ENUM_UNDERLYING_TYPE (arg_type));
 	  if (!abi_version_at_least (6))
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 73ed323..d590f8d 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -305,7 +305,7 @@ emit_c_code (const char *code, bool can_fail_p, const char *name)
   else
     printf ("#define FAIL _Pragma (\"GCC error \\\"%s cannot FAIL\\\"\")"
 	    " (void)0\n", name);
-  printf ("#define DONE return (_val = get_insns (),"
+  printf ("#define DONE return (_val = get_insns (), "
 	  "end_sequence (), _val)\n");
 
   rtx_reader_ptr->print_md_ptr_loc (code);
diff --git a/gcc/ipa-sra.c b/gcc/ipa-sra.c
index 50dee69..836db40 100644
--- a/gcc/ipa-sra.c
+++ b/gcc/ipa-sra.c
@@ -1137,8 +1137,8 @@ create_parameter_descriptors (cgraph_node *node,
 	      && TYPE_NONALIASED_COMPONENT (type))
 	    {
 	      if (dump_file && (dump_flags & TDF_DETAILS))
-		fprintf (dump_file, " not a candidate, reference to a"
-			 "nonaliased component array\n");
+		fprintf (dump_file, " not a candidate, reference to "
+			 "a nonaliased component array\n");
 	      continue;
 	    }
 	  if (!is_gimple_reg (parm))
@@ -2284,8 +2284,8 @@ process_scan_results (cgraph_node *node, struct function *fun,
       if (nonarg_acc_size > param_size_limit
 	  || (!desc->by_ref && nonarg_acc_size == param_size_limit))
 	{
-	  disqualify_split_candidate (desc, "Would result into a too big set of"
-				      "replacements.");
+	  disqualify_split_candidate (desc, "Would result into a too big set "
+				      "of replacements.");
 	}
       else
 	{
diff --git a/gcc/plugin.c b/gcc/plugin.c
index a9d3171e..8ea08ab 100644
--- a/gcc/plugin.c
+++ b/gcc/plugin.c
@@ -712,10 +712,10 @@ try_init_one_plugin (struct plugin_name_args *plugin)
   if (dlsym (dl_handle, str_license) == NULL)
     fatal_error (input_location,
 		 "plugin %s is not licensed under a GPL-compatible license"
-		 "%s", plugin->full_name, dlerror ());
+		 " %s", plugin->full_name, dlerror ());
 
-  PTR_UNION_AS_VOID_PTR (plugin_init_union) =
-      dlsym (dl_handle, str_plugin_init_func_name);
+  PTR_UNION_AS_VOID_PTR (plugin_init_union)
+    = dlsym (dl_handle, str_plugin_init_func_name);
   plugin_init = PTR_UNION_AS_CAST_PTR (plugin_init_union);
 
   if ((err = dlerror ()) != NULL)
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index d92d7c8..5a30a29 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -199,7 +199,7 @@ should_duplicate_loop_header_p (basic_block header, class loop *loop,
       if (dump_file && (dump_flags & TDF_DETAILS))
 	fprintf (dump_file,
 		 "  Not duplicating bb %i: condition based on non-IV loop"
-		 "variant.\n", header->index);
+		 " variant.\n", header->index);
       return false;
     }
 
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 987dc0e..9dd18d2 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -4282,7 +4282,7 @@ vect_analyze_data_refs (vec_info *vinfo, poly_uint64 *min_vf, bool *fatal)
 	{
 	  if (nested_in_vect_loop_p (loop, stmt_info))
 	    return opt_result::failure_at (stmt_info->stmt,
-					   "not vectorized:"
+					   "not vectorized: "
 					   "not suitable for strided load %G",
 					   stmt_info->stmt);
 	  STMT_VINFO_STRIDED_P (stmt_info) = true;
-- 
cgit v1.1


From 135df52cc3f1ef90092ab02a01c4dabc7fd0ed18 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 25 Oct 2019 00:29:09 +0200
Subject: gimplify.h (omp_construct_selector_matches): Declare.

	* gimplify.h (omp_construct_selector_matches): Declare.
	* gimplify.c (struct gimplify_omp_ctx): Add code member.
	(gimplify_call_expr): Call omp_resolve_declare_variant and remap
	called function if needed for flag_openmp.
	(gimplify_scan_omp_clauses): Set ctx->code.
	(omp_construct_selector_matches): New function.
	* omp-general.h (omp_constructor_traits_to_codes,
	omp_context_selector_matches, omp_resolve_declare_variant): Declare.
	* omp-general.c (omp_constructor_traits_to_codes,
	omp_context_selector_matches, omp_resolve_declare_variant): New
	functions.
c-family/
	* c-common.h (c_omp_context_selector_matches): Remove.
	* c-omp.c (c_omp_context_selector_matches): Remove.
	* c-attribs.c (c_common_attribute_table): Add
	"omp declare target {host,nohost,block}" attributes.
c/
	* c-parser.c (c_finish_omp_declare_variant): Use
	omp_context_selector_matches instead of
	c_omp_context_selector_matches.
	* c-decl.c (c_decl_attributes): Add "omp declare target block"
	attribute in between declare target and end declare target
	pragmas.
cp/
	* decl2.c (cplus_decl_attributes): Add "omp declare target block"
	attribute in between declare target and end declare target
	pragmas.
testsuite/
	* c-c++-common/gomp/declare-variant-8.c: New test.

From-SVN: r277427
---
 gcc/ChangeLog                                      |  12 +
 gcc/c-family/ChangeLog                             |   7 +
 gcc/c-family/c-attribs.c                           |   6 +
 gcc/c-family/c-common.h                            |   1 -
 gcc/c-family/c-omp.c                               | 188 -------------
 gcc/c/ChangeLog                                    |   9 +
 gcc/c/c-decl.c                                     |   8 +-
 gcc/c/c-parser.c                                   |   2 +-
 gcc/cp/ChangeLog                                   |   4 +
 gcc/cp/decl2.c                                     |   8 +-
 gcc/gimplify.c                                     | 102 +++++++
 gcc/gimplify.h                                     |   2 +
 gcc/omp-general.c                                  | 298 +++++++++++++++++++++
 gcc/omp-general.h                                  |   3 +
 gcc/testsuite/ChangeLog                            |   4 +
 .../c-c++-common/gomp/declare-variant-8.c          | 125 +++++++++
 16 files changed, 585 insertions(+), 194 deletions(-)
 create mode 100644 gcc/testsuite/c-c++-common/gomp/declare-variant-8.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d19975..4d9e470 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,17 @@
 2019-10-24  Jakub Jelinek  <jakub@redhat.com>
 
+	* gimplify.h (omp_construct_selector_matches): Declare.
+	* gimplify.c (struct gimplify_omp_ctx): Add code member.
+	(gimplify_call_expr): Call omp_resolve_declare_variant and remap
+	called function if needed for flag_openmp.
+	(gimplify_scan_omp_clauses): Set ctx->code.
+	(omp_construct_selector_matches): New function.
+	* omp-general.h (omp_constructor_traits_to_codes,
+	omp_context_selector_matches, omp_resolve_declare_variant): Declare.
+	* omp-general.c (omp_constructor_traits_to_codes,
+	omp_context_selector_matches, omp_resolve_declare_variant): New
+	functions.
+
 	* config/arc/arc.c (hwloop_optimize): Add missing space in string
 	literal.
 	* config/rx/rx.c (rx_print_operand): Likewise.
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index aeae149..3b3d574 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-common.h (c_omp_context_selector_matches): Remove.
+	* c-omp.c (c_omp_context_selector_matches): Remove.
+	* c-attribs.c (c_common_attribute_table): Add
+	"omp declare target {host,nohost,block}" attributes.
+
 2019-10-17  JeanHeyd Meneide  <phdofthehouse@gmail.com>
 
 	* c-lex.c (c_common_has_attribute): Update nodiscard value.
diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c
index ea273f8..1c9f285 100644
--- a/gcc/c-family/c-attribs.c
+++ b/gcc/c-family/c-attribs.c
@@ -456,6 +456,12 @@ const struct attribute_spec c_common_attribute_table[] =
 			      handle_omp_declare_target_attribute, NULL },
   { "omp declare target implicit", 0, 0, true, false, false, false,
 			      handle_omp_declare_target_attribute, NULL },
+  { "omp declare target host", 0, 0, true, false, false, false,
+			      handle_omp_declare_target_attribute, NULL },
+  { "omp declare target nohost", 0, 0, true, false, false, false,
+			      handle_omp_declare_target_attribute, NULL },
+  { "omp declare target block", 0, 0, true, false, false, false,
+			      handle_omp_declare_target_attribute, NULL },
   { "alloc_align",	      1, 1, false, true, true, false,
 			      handle_alloc_align_attribute,
 	                      attr_alloc_exclusions },
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 3bc021b..7077183 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1193,7 +1193,6 @@ extern enum omp_clause_default_kind c_omp_predetermined_sharing (tree);
 extern tree c_omp_check_context_selector (location_t, tree);
 extern tree c_omp_get_context_selector (tree, const char *, const char *);
 extern void c_omp_mark_declare_variant (location_t, tree, tree);
-extern int c_omp_context_selector_matches (tree);
 
 /* Return next tree in the chain for chain_next walking of tree nodes.  */
 static inline tree
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 3398188..4f5a6ed 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -34,9 +34,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "memmodel.h"
 #include "attribs.h"
 #include "gimplify.h"
-#include "cgraph.h"
-#include "symbol-summary.h"
-#include "hsa-common.h"
 
 
 /* Complete a #pragma oacc wait construct.  LOC is the location of
@@ -2388,188 +2385,3 @@ c_omp_mark_declare_variant (location_t loc, tree variant, tree construct)
     error_at (loc, "%qD used as a variant with incompatible %<constructor%> "
 		   "selector sets", variant);
 }
-
-/* Return 1 if context selector matches the current OpenMP context, 0
-   if it does not and -1 if it is unknown and need to be determined later.
-   Some properties can be checked right away during parsing (this routine),
-   others need to wait until the whole TU is parsed, others need to wait until
-   IPA, others until vectorization.  */
-
-int
-c_omp_context_selector_matches (tree ctx)
-{
-  int ret = 1;
-  for (tree t1 = ctx; t1; t1 = TREE_CHAIN (t1))
-    {
-      char set = IDENTIFIER_POINTER (TREE_PURPOSE (t1))[0];
-      if (set == 'c')
-	{
-	  /* For now, ignore the construct set.  While something can be
-	     determined already during parsing, we don't know until end of TU
-	     whether additional constructs aren't added through declare variant
-	     unless "omp declare variant variant" attribute exists already
-	     (so in most of the cases), and we'd need to maintain set of
-	     surrounding OpenMP constructs, which is better handled during
-	     gimplification.  */
-	  ret = -1;
-	  continue;
-	}
-      for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
-	{
-	  const char *sel = IDENTIFIER_POINTER (TREE_PURPOSE (t2));
-	  switch (*sel)
-	    {
-	    case 'v':
-	      if (set == 'i' && !strcmp (sel, "vendor"))
-		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
-		  {
-		    const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
-		    if (!strcmp (prop, " score") || !strcmp (prop, "gnu"))
-		      continue;
-		    return 0;
-		  }
-	      break;
-	    case 'e':
-	      if (set == 'i' && !strcmp (sel, "extension"))
-		/* We don't support any extensions right now.  */
-		return 0;
-	      break;
-	    case 'a':
-	      if (set == 'i' && !strcmp (sel, "atomic_default_mem_order"))
-		{
-		  enum omp_memory_order omo
-		    = ((enum omp_memory_order)
-		       (omp_requires_mask
-			& OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER));
-		  if (omo == OMP_MEMORY_ORDER_UNSPECIFIED)
-		    {
-		      /* We don't know yet, until end of TU.  */
-		      ret = -1;
-		      break;
-		    }
-		  tree t3 = TREE_VALUE (t2);
-		  const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
-		  if (!strcmp (prop, " score"))
-		    {
-		      t3 = TREE_CHAIN (t3);
-		      prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
-		    }
-		  if (!strcmp (prop, "relaxed")
-		      && omo != OMP_MEMORY_ORDER_RELAXED)
-		    return 0;
-		  else if (!strcmp (prop, "seq_cst")
-			   && omo != OMP_MEMORY_ORDER_SEQ_CST)
-		    return 0;
-		  else if (!strcmp (prop, "acq_rel")
-			   && omo != OMP_MEMORY_ORDER_ACQ_REL)
-		    return 0;
-		}
-	      if (set == 'd' && !strcmp (sel, "arch"))
-		/* For now, need a target hook.  */
-		ret = -1;
-	      break;
-	    case 'u':
-	      if (set == 'i' && !strcmp (sel, "unified_address"))
-		{
-		  if ((omp_requires_mask & OMP_REQUIRES_UNIFIED_ADDRESS) == 0)
-		    ret = -1;
-		  break;
-		}
-	      if (set == 'i' && !strcmp (sel, "unified_shared_memory"))
-		{
-		  if ((omp_requires_mask
-		       & OMP_REQUIRES_UNIFIED_SHARED_MEMORY) == 0)
-		    ret = -1;
-		  break;
-		}
-	      break;
-	    case 'd':
-	      if (set == 'i' && !strcmp (sel, "dynamic_allocators"))
-		{
-		  if ((omp_requires_mask
-		       & OMP_REQUIRES_DYNAMIC_ALLOCATORS) == 0)
-		    ret = -1;
-		  break;
-		}
-	      break;
-	    case 'r':
-	      if (set == 'i' && !strcmp (sel, "reverse_offload"))
-		{
-		  if ((omp_requires_mask & OMP_REQUIRES_REVERSE_OFFLOAD) == 0)
-		    ret = -1;
-		  break;
-		}
-	      break;
-	    case 'k':
-	      if (set == 'd' && !strcmp (sel, "kind"))
-		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
-		  {
-		    const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
-		    if (!strcmp (prop, "any"))
-		      continue;
-		    if (!strcmp (prop, "fpga"))
-		      return 0;	/* Right now GCC doesn't support any fpgas.  */
-		    if (!strcmp (prop, "host"))
-		      {
-			if (ENABLE_OFFLOADING || hsa_gen_requested_p ())
-			  ret = -1;
-			continue;
-		      }
-		    if (!strcmp (prop, "nohost"))
-		      {
-			if (ENABLE_OFFLOADING || hsa_gen_requested_p ())
-			  ret = -1;
-			else
-			  return 0;
-			continue;
-		      }
-		    if (!strcmp (prop, "cpu") || !strcmp (prop, "gpu"))
-		      {
-			bool maybe_gpu = false;
-			if (hsa_gen_requested_p ())
-			  maybe_gpu = true;
-			else if (ENABLE_OFFLOADING)
-			  for (const char *c = getenv ("OFFLOAD_TARGET_NAMES");
-			       c; )
-			    {
-			      if (!strncmp (c, "nvptx", strlen ("nvptx"))
-				  || !strncmp (c, "amdgcn", strlen ("amdgcn")))
-				{
-				  maybe_gpu = true;
-				  break;
-				}
-			      else if ((c = strchr (c, ',')))
-				c++;
-			    }
-			if (!maybe_gpu)
-			  {
-			    if (prop[0] == 'g')
-			      return 0;
-			  }
-			else
-			  ret = -1;
-			continue;
-		      }
-		    /* Any other kind doesn't match.  */
-		    return 0;
-		  }
-	      break;
-	    case 'i':
-	      if (set == 'd' && !strcmp (sel, "isa"))
-		/* For now, need a target hook.  */
-		ret = -1;
-	      break;
-	    case 'c':
-	      if (set == 'u' && !strcmp (sel, "condition"))
-		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
-		  if (TREE_PURPOSE (t3) == NULL_TREE
-		      && integer_zerop (TREE_VALUE (t3)))
-		    return 0;
-	      break;
-	    default:
-	      break;
-	    }
-	}
-    }
-  return ret;
-}
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 0cf32f6..e8518f2 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-parser.c (c_finish_omp_declare_variant): Use
+	omp_context_selector_matches instead of
+	c_omp_context_selector_matches.
+	* c-decl.c (c_decl_attributes): Add "omp declare target block"
+	attribute in between declare target and end declare target
+	pragmas.
+
 2019-10-15  Joseph Myers  <joseph@codesourcery.com>
 
 	* c-parser.c (c_parser_attribute_any_word): Rename to
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index f67033b..c6c4a4d 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -4832,8 +4832,12 @@ c_decl_attributes (tree *node, tree attributes, int flags)
 	attributes = tree_cons (get_identifier ("omp declare target implicit"),
 				NULL_TREE, attributes);
       else
-	attributes = tree_cons (get_identifier ("omp declare target"),
-				NULL_TREE, attributes);
+	{
+	  attributes = tree_cons (get_identifier ("omp declare target"),
+				  NULL_TREE, attributes);
+	  attributes = tree_cons (get_identifier ("omp declare target block"),
+				  NULL_TREE, attributes);
+	}
     }
 
   /* Look up the current declaration with all the attributes merged
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 7618a46..9589cc6 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -19489,7 +19489,7 @@ c_finish_omp_declare_variant (c_parser *parser, tree fndecl, tree parms)
 	  C_DECL_USED (variant) = 1;
 	  tree construct = c_omp_get_context_selector (ctx, "construct", NULL);
 	  c_omp_mark_declare_variant (match_loc, variant, construct);
-	  if (c_omp_context_selector_matches (ctx))
+	  if (omp_context_selector_matches (ctx))
 	    {
 	      tree attr
 		= tree_cons (get_identifier ("omp declare variant base"),
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 33420f1..78bbfb5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2019-10-24  Jakub Jelinek  <jakub@redhat.com>
 
+	* decl2.c (cplus_decl_attributes): Add "omp declare target block"
+	attribute in between declare target and end declare target
+	pragmas.
+
 	* call.c (convert_arg_to_ellipsis): Add missing space in string
 	literal.
 
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 6d5e973..cff11ba 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1555,8 +1555,12 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags)
 	attributes = tree_cons (get_identifier ("omp declare target implicit"),
 				NULL_TREE, attributes);
       else
-	attributes = tree_cons (get_identifier ("omp declare target"),
-				NULL_TREE, attributes);
+	{
+	  attributes = tree_cons (get_identifier ("omp declare target"),
+				  NULL_TREE, attributes);
+	  attributes = tree_cons (get_identifier ("omp declare target block"),
+				  NULL_TREE, attributes);
+	}
     }
 
   if (processing_template_decl)
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 914bb8e..05ae2f1 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -219,6 +219,7 @@ struct gimplify_omp_ctx
   location_t location;
   enum omp_clause_default_kind default_kind;
   enum omp_region_type region_type;
+  enum tree_code code;
   bool combined_loop;
   bool distribute;
   bool target_firstprivatize_array_bases;
@@ -3385,6 +3386,13 @@ gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value)
   /* Remember the original function pointer type.  */
   fnptrtype = TREE_TYPE (CALL_EXPR_FN (*expr_p));
 
+  if (flag_openmp && fndecl)
+    {
+      tree variant = omp_resolve_declare_variant (fndecl);
+      if (variant != fndecl)
+	CALL_EXPR_FN (*expr_p) = build1 (ADDR_EXPR, fnptrtype, variant);
+    }
+
   /* There is a sequence point before the call, so any side effects in
      the calling expression must occur before the actual call.  Force
      gimplify_expr to use an internal post queue.  */
@@ -8137,6 +8145,7 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
   int nowait = -1;
 
   ctx = new_omp_context (region_type);
+  ctx->code = code;
   outer_ctx = ctx->outer_context;
   if (code == OMP_TARGET)
     {
@@ -10324,6 +10333,99 @@ gimplify_adjust_omp_clauses (gimple_seq *pre_p, gimple_seq body, tree *list_p,
   delete_omp_context (ctx);
 }
 
+/* Return 0 if CONSTRUCTS selectors don't match the OpenMP context,
+   -1 if unknown yet (simd is involved, won't be known until vectorization)
+   and positive number if they do, the number is then the number of constructs
+   in the OpenMP context.  */
+
+HOST_WIDE_INT
+omp_construct_selector_matches (enum tree_code *constructs, int nconstructs)
+{
+  int matched = 0, cnt = 0;
+  bool simd_seen = false;
+  for (struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp; ctx;)
+    {
+      if (((ctx->region_type & ORT_PARALLEL) && ctx->code == OMP_PARALLEL)
+	  || ((ctx->region_type & (ORT_TARGET | ORT_IMPLICIT_TARGET | ORT_ACC))
+	      == ORT_TARGET && ctx->code == OMP_TARGET)
+	  || ((ctx->region_type & ORT_TEAMS) && ctx->code == OMP_TEAMS)
+	  || (ctx->region_type == ORT_WORKSHARE && ctx->code == OMP_FOR)
+	  || (ctx->region_type == ORT_SIMD
+	      && ctx->code == OMP_SIMD
+	      && !omp_find_clause (ctx->clauses, OMP_CLAUSE_BIND)))
+	{
+	  ++cnt;
+	  if (matched < nconstructs && ctx->code == constructs[matched])
+	    {
+	      if (ctx->code == OMP_SIMD)
+		{
+		  if (matched)
+		    return 0;
+		  simd_seen = true;
+		}
+	      ++matched;
+	    }
+	  if (ctx->code == OMP_TARGET)
+	    return matched < nconstructs ? 0 : simd_seen ? -1 : cnt;
+	}
+      else if (ctx->region_type == ORT_WORKSHARE
+	       && ctx->code == OMP_LOOP
+	       && ctx->outer_context
+	       && ctx->outer_context->region_type == ORT_COMBINED_PARALLEL
+	       && ctx->outer_context->outer_context
+	       && ctx->outer_context->outer_context->code == OMP_LOOP
+	       && ctx->outer_context->outer_context->distribute)
+	ctx = ctx->outer_context->outer_context;
+      ctx = ctx->outer_context;
+    }
+  if (cnt == 0
+      && constructs[0] == OMP_SIMD
+      && lookup_attribute ("omp declare simd",
+			   DECL_ATTRIBUTES (current_function_decl)))
+    {
+      /* Declare simd is a maybe case, it is supposed to be added only to the
+	 omp-simd-clone.c added clones and not to the base function.  */
+      gcc_assert (matched == 0);
+      ++cnt;
+      simd_seen = true;
+      if (++matched == nconstructs)
+	return -1;
+    }
+  if (tree attr = lookup_attribute ("omp declare variant variant",
+				    DECL_ATTRIBUTES (current_function_decl)))
+    {
+      enum tree_code variant_constructs[5];
+      int variant_nconstructs
+	= omp_constructor_traits_to_codes (TREE_VALUE (attr),
+					   variant_constructs);
+      for (int i = 0; i < variant_nconstructs; i++)
+	{
+	  ++cnt;
+	  if (matched < nconstructs
+	      && variant_constructs[i] == constructs[matched])
+	    {
+	      if (variant_constructs[i] == OMP_SIMD)
+		{
+		  if (matched)
+		    return 0;
+		  simd_seen = true;
+		}
+	      ++matched;
+	    }
+	}
+    }
+  if (lookup_attribute ("omp declare target block",
+			DECL_ATTRIBUTES (current_function_decl)))
+    {
+      ++cnt;
+      if (matched < nconstructs && constructs[matched] == OMP_TARGET)
+	++matched;
+    }
+  if (matched == nconstructs)
+    return simd_seen ? -1 : cnt;
+  return 0;
+}
+
 /* Gimplify OACC_CACHE.  */
 
 static void
diff --git a/gcc/gimplify.h b/gcc/gimplify.h
index 6c997a7..601b82b 100644
--- a/gcc/gimplify.h
+++ b/gcc/gimplify.h
@@ -75,6 +75,8 @@ extern void omp_firstprivatize_variable (struct gimplify_omp_ctx *, tree);
 extern enum gimplify_status gimplify_expr (tree *, gimple_seq *, gimple_seq *,
 					   bool (*) (tree), fallback_t);
 
+HOST_WIDE_INT omp_construct_selector_matches (enum tree_code *, int);
+
 extern void gimplify_type_sizes (tree, gimple_seq *);
 extern void gimplify_one_sizepos (tree *, gimple_seq *);
 extern gbind *gimplify_body (tree, bool);
diff --git a/gcc/omp-general.c b/gcc/omp-general.c
index 1a78a70..9397b19 100644
--- a/gcc/omp-general.c
+++ b/gcc/omp-general.c
@@ -35,6 +35,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "omp-general.h"
 #include "stringpool.h"
 #include "attribs.h"
+#include "gimplify.h"
+#include "cgraph.h"
+#include "symbol-summary.h"
+#include "hsa-common.h"
+#include "tree-pass.h"
 
 enum omp_requires omp_requires_mask;
 
@@ -538,6 +543,299 @@ omp_max_simt_vf (void)
   return 0;
 }
 
+/* Store the construct selectors as tree codes from last to first,
+   return their number.  */
+
+int
+omp_constructor_traits_to_codes (tree ctx, enum tree_code *constructs)
+{
+  int nconstructs = list_length (ctx);
+  int i = nconstructs - 1;
+  for (tree t2 = ctx; t2; t2 = TREE_CHAIN (t2), i--)
+    {
+      const char *sel = IDENTIFIER_POINTER (TREE_PURPOSE (t2));
+      if (!strcmp (sel, "target"))
+	constructs[i] = OMP_TARGET;
+      else if (!strcmp (sel, "teams"))
+	constructs[i] = OMP_TEAMS;
+      else if (!strcmp (sel, "parallel"))
+	constructs[i] = OMP_PARALLEL;
+      else if (!strcmp (sel, "for") || !strcmp (sel, "do"))
+	constructs[i] = OMP_FOR;
+      else if (!strcmp (sel, "simd"))
+	constructs[i] = OMP_SIMD;
+      else
+	gcc_unreachable ();
+    }
+  gcc_assert (i == -1);
+  return nconstructs;
+}
+
+/* Return 1 if context selector matches the current OpenMP context, 0
+   if it does not and -1 if it is unknown and need to be determined later.
+   Some properties can be checked right away during parsing (this routine),
+   others need to wait until the whole TU is parsed, others need to wait until
+   IPA, others until vectorization.  */
+
+int
+omp_context_selector_matches (tree ctx)
+{
+  int ret = 1;
+  for (tree t1 = ctx; t1; t1 = TREE_CHAIN (t1))
+    {
+      char set = IDENTIFIER_POINTER (TREE_PURPOSE (t1))[0];
+      if (set == 'c')
+	{
+	  /* For now, ignore the construct set.  While something can be
+	     determined already during parsing, we don't know until end of TU
+	     whether additional constructs aren't added through declare variant
+	     unless "omp declare variant variant" attribute exists already
+	     (so in most of the cases), and we'd need to maintain set of
+	     surrounding OpenMP constructs, which is better handled during
+	     gimplification.  */
+	  if (symtab->state == PARSING
+	      || (cfun->curr_properties & PROP_gimple_any) != 0)
+	    {
+	      ret = -1;
+	      continue;
+	    }
+
+	  enum tree_code constructs[5];
+	  int nconstructs
+	    = omp_constructor_traits_to_codes (TREE_VALUE (t1), constructs);
+	  HOST_WIDE_INT r
+	    = omp_construct_selector_matches (constructs, nconstructs);
+	  if (r == 0)
+	    return 0;
+	  if (r == -1)
+	    ret = -1;
+	  continue;
+	}
+      for (tree t2 = TREE_VALUE (t1); t2; t2 = TREE_CHAIN (t2))
+	{
+	  const char *sel = IDENTIFIER_POINTER (TREE_PURPOSE (t2));
+	  switch (*sel)
+	    {
+	    case 'v':
+	      if (set == 'i' && !strcmp (sel, "vendor"))
+		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
+		  {
+		    const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		    if (!strcmp (prop, " score") || !strcmp (prop, "gnu"))
+		      continue;
+		    return 0;
+		  }
+	      break;
+	    case 'e':
+	      if (set == 'i' && !strcmp (sel, "extension"))
+		/* We don't support any extensions right now.  */
+		return 0;
+	      break;
+	    case 'a':
+	      if (set == 'i' && !strcmp (sel, "atomic_default_mem_order"))
+		{
+		  enum omp_memory_order omo
+		    = ((enum omp_memory_order)
+		       (omp_requires_mask
+			& OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER));
+		  if (omo == OMP_MEMORY_ORDER_UNSPECIFIED)
+		    {
+		      /* We don't know yet, until end of TU.  */
+		      if (symtab->state == PARSING)
+			{
+			  ret = -1;
+			  break;
+			}
+		      else
+			omo = OMP_MEMORY_ORDER_RELAXED;
+		    }
+		  tree t3 = TREE_VALUE (t2);
+		  const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		  if (!strcmp (prop, " score"))
+		    {
+		      t3 = TREE_CHAIN (t3);
+		      prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		    }
+		  if (!strcmp (prop, "relaxed")
+		      && omo != OMP_MEMORY_ORDER_RELAXED)
+		    return 0;
+		  else if (!strcmp (prop, "seq_cst")
+			   && omo != OMP_MEMORY_ORDER_SEQ_CST)
+		    return 0;
+		  else if (!strcmp (prop, "acq_rel")
+			   && omo != OMP_MEMORY_ORDER_ACQ_REL)
+		    return 0;
+		}
+	      if (set == 'd' && !strcmp (sel, "arch"))
+		/* For now, need a target hook.  */
+		ret = -1;
+	      break;
+	    case 'u':
+	      if (set == 'i' && !strcmp (sel, "unified_address"))
+		{
+		  if ((omp_requires_mask & OMP_REQUIRES_UNIFIED_ADDRESS) == 0)
+		    {
+		      if (symtab->state == PARSING)
+			ret = -1;
+		      else
+			return 0;
+		    }
+		  break;
+		}
+	      if (set == 'i' && !strcmp (sel, "unified_shared_memory"))
+		{
+		  if ((omp_requires_mask
+		       & OMP_REQUIRES_UNIFIED_SHARED_MEMORY) == 0)
+		    {
+		      if (symtab->state == PARSING)
+			ret = -1;
+		      else
+			return 0;
+		    }
+		  break;
+		}
+	      break;
+	    case 'd':
+	      if (set == 'i' && !strcmp (sel, "dynamic_allocators"))
+		{
+		  if ((omp_requires_mask
+		       & OMP_REQUIRES_DYNAMIC_ALLOCATORS) == 0)
+		    {
+		      if (symtab->state == PARSING)
+			ret = -1;
+		      else
+			return 0;
+		    }
+		  break;
+		}
+	      break;
+	    case 'r':
+	      if (set == 'i' && !strcmp (sel, "reverse_offload"))
+		{
+		  if ((omp_requires_mask & OMP_REQUIRES_REVERSE_OFFLOAD) == 0)
+		    {
+		      if (symtab->state == PARSING)
+			ret = -1;
+		      else
+			return 0;
+		    }
+		  break;
+		}
+	      break;
+	    case 'k':
+	      if (set == 'd' && !strcmp (sel, "kind"))
+		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
+		  {
+		    const char *prop = IDENTIFIER_POINTER (TREE_PURPOSE (t3));
+		    if (!strcmp (prop, "any"))
+		      continue;
+		    if (!strcmp (prop, "fpga"))
+		      return 0;	/* Right now GCC doesn't support any fpgas.  */
+		    if (!strcmp (prop, "host"))
+		      {
+			if (ENABLE_OFFLOADING || hsa_gen_requested_p ())
+			  ret = -1;
+			continue;
+		      }
+		    if (!strcmp (prop, "nohost"))
+		      {
+			if (ENABLE_OFFLOADING || hsa_gen_requested_p ())
+			  ret = -1;
+			else
+			  return 0;
+			continue;
+		      }
+		    if (!strcmp (prop, "cpu") || !strcmp (prop, "gpu"))
+		      {
+			bool maybe_gpu = false;
+			if (hsa_gen_requested_p ())
+			  maybe_gpu = true;
+			else if (ENABLE_OFFLOADING)
+			  for (const char *c = getenv ("OFFLOAD_TARGET_NAMES");
+			       c; )
+			    {
+			      if (!strncmp (c, "nvptx", strlen ("nvptx"))
+				  || !strncmp (c, "amdgcn", strlen ("amdgcn")))
+				{
+				  maybe_gpu = true;
+				  break;
+				}
+			      else if ((c = strchr (c, ',')))
+				c++;
+			    }
+			if (!maybe_gpu)
+			  {
+			    if (prop[0] == 'g')
+			      return 0;
+			  }
+			else
+			  ret = -1;
+			continue;
+		      }
+		    /* Any other kind doesn't match.  */
+		    return 0;
+		  }
+	      break;
+	    case 'i':
+	      if (set == 'd' && !strcmp (sel, "isa"))
+		/* For now, need a target hook.  */
+		ret = -1;
+	      break;
+	    case 'c':
+	      if (set == 'u' && !strcmp (sel, "condition"))
+		for (tree t3 = TREE_VALUE (t2); t3; t3 = TREE_CHAIN (t3))
+		  if (TREE_PURPOSE (t3) == NULL_TREE)
+		    {
+		      if (integer_zerop (TREE_VALUE (t3)))
+			return 0;
+		      if (integer_nonzerop (TREE_VALUE (t3)))
+			break;
+		      ret = -1;
+		    }
+	      break;
+	    default:
+	      break;
+	    }
+	}
+    }
+  return ret;
+}
+
+/* Try to resolve declare variant, return the variant decl if it should
+   be used instead of base, or base otherwise.  */
+
+tree
+omp_resolve_declare_variant (tree base)
+{
+  tree variant = NULL_TREE;
+  for (tree attr = DECL_ATTRIBUTES (base); attr; attr = TREE_CHAIN (attr))
+    {
+      attr = lookup_attribute ("omp declare variant base", attr);
+      if (attr == NULL_TREE)
+	break;
+      switch (omp_context_selector_matches (TREE_VALUE (TREE_VALUE (attr))))
+	{
+	case 0:
+	  /* No match, ignore.  */
+	  break;
+	case -1:
+	  /* Needs to be deferred.  */
+	  return base;
+	default:
+	  /* FIXME: Scoring not implemented yet, so just resolve it
+	     if there is a single variant only.  */
+	  if (variant)
+	    return base;
+	  if (TREE_CODE (TREE_PURPOSE (TREE_VALUE (attr))) == FUNCTION_DECL)
+	    variant = TREE_PURPOSE (TREE_VALUE (attr));
+	  else
+	    return base;
+	}
+    }
+  return variant ? variant : base;
+}
+
+
 /* Encode an oacc launch argument.  This matches the GOMP_LAUNCH_PACK
    macro on gomp-constants.h.  We do not check for overflow.  */
 
diff --git a/gcc/omp-general.h b/gcc/omp-general.h
index 7cd1d21..c0c294d 100644
--- a/gcc/omp-general.h
+++ b/gcc/omp-general.h
@@ -84,6 +84,9 @@ extern void omp_extract_for_data (gomp_for *for_stmt, struct omp_for_data *fd,
 extern gimple *omp_build_barrier (tree lhs);
 extern poly_uint64 omp_max_vf (void);
 extern int omp_max_simt_vf (void);
+extern int omp_constructor_traits_to_codes (tree, enum tree_code *);
+extern int omp_context_selector_matches (tree);
+extern tree omp_resolve_declare_variant (tree);
 extern tree oacc_launch_pack (unsigned code, tree device, unsigned op);
 extern tree oacc_replace_fn_attrib_attr (tree attribs, tree dims);
 extern void oacc_replace_fn_attrib (tree fn, tree dims);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e999a47..8e652ab 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/declare-variant-8.c: New test.
+
 2019-10-24  Andreas Krebbel  <krebbel@linux.ibm.com>
 
 	* gcc.dg/ipa/ipa-sra-19.c: Remove dg-skip-if. Add argument type to
diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-8.c b/gcc/testsuite/c-c++-common/gomp/declare-variant-8.c
new file mode 100644
index 0000000..792e56c
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-8.c
@@ -0,0 +1,125 @@
+/* { dg-do compile { target c } } */
+/* { dg-additional-options "-fdump-tree-gimple" } */
+
+void f01 (void);
+#pragma omp declare variant (f01) match (user={condition(6 == 7)},implementation={vendor(gnu)})
+void f02 (void);
+void f03 (void);
+#pragma omp declare variant (f03) match (user={condition(6 == 6)},implementation={atomic_default_mem_order(seq_cst)})
+void f04 (void);
+void f05 (void);
+#pragma omp declare variant (f05) match (user={condition(1)},implementation={atomic_default_mem_order(relaxed)})
+void f06 (void);
+#pragma omp requires atomic_default_mem_order(seq_cst)
+void f07 (void);
+#pragma omp declare variant (f07) match (construct={parallel,for},device={kind(any)})
+void f08 (void);
+void f09 (void);
+#pragma omp declare variant (f09) match (construct={parallel,for},implementation={vendor(gnu)})
+void f10 (void);
+void f11 (void);
+#pragma omp declare variant (f11) match (construct={parallel,for})
+void f12 (void);
+void f13 (void);
+#pragma omp declare variant (f13) match (construct={parallel,for})
+void f14 (void);
+#pragma omp declare target to (f13, f14)
+void f15 (void);
+#pragma omp declare variant (f15) match (implementation={vendor(llvm)})
+void f16 (void);
+void f17 (void);
+#pragma omp declare variant (f17) match (construct={target,parallel})
+void f18 (void);
+void f19 (void);
+#pragma omp declare variant (f19) match (construct={target,parallel})
+void f20 (void);
+void f21 (void);
+#pragma omp declare variant (f21) match (construct={teams,parallel})
+void f22 (void);
+void f23 (void);
+#pragma omp declare variant (f23) match (construct={teams,parallel,for})
+void f24 (void);
+void f25 (void);
+#pragma omp declare variant (f25) match (construct={teams,parallel})
+void f26 (void);
+void f27 (void);
+#pragma omp declare variant (f27) match (construct={teams,parallel,for})
+void f28 (void);
+void f29 (void);
+#pragma omp declare variant (f29) match (implementation={vendor(gnu)})
+void f30 (void);
+void f31 (void);
+#pragma omp declare variant (f31) match (construct={teams,parallel,for})
+void f32 (void);
+
+void
+test1 (void)
+{
+  int i;
+  f02 ();	/* { dg-final { scan-tree-dump-times "f02 \\\(\\\);" 1 "gimple" } } */
+  f04 ();	/* { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" } } */
+  f06 ();	/* { dg-final { scan-tree-dump-times "f06 \\\(\\\);" 1 "gimple" } } */
+  #pragma omp parallel
+  #pragma omp for
+  for (i = 0; i < 1; i++)
+    f08 ();	/* { dg-final { scan-tree-dump-times "f07 \\\(\\\);" 1 "gimple" } } */
+  #pragma omp parallel for
+  for (i = 0; i < 1; i++)
+    f10 ();	/* { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" } } */
+  #pragma omp for
+  for (i = 0; i < 1; i++)
+    #pragma omp parallel
+    f12 ();	/* { dg-final { scan-tree-dump-times "f12 \\\(\\\);" 1 "gimple" } } */
+  #pragma omp parallel
+  #pragma omp target
+  #pragma omp for
+  for (i = 0; i < 1; i++)
+    f14 ();	/* { dg-final { scan-tree-dump-times "f14 \\\(\\\);" 1 "gimple" } } */
+  f16 ();	/* { dg-final { scan-tree-dump-times "f16 \\\(\\\);" 1 "gimple" } } */
+}
+
+#pragma omp declare target
+void
+test2 (void)
+{
+  #pragma omp parallel
+  f18 ();	/* { dg-final { scan-tree-dump-times "f17 \\\(\\\);" 1 "gimple" } } */
+}
+#pragma omp end declare target
+
+void test3 (void);
+#pragma omp declare target to (test3)
+
+void
+test3 (void)
+{
+  #pragma omp parallel
+  f20 ();	/* { dg-final { scan-tree-dump-times "f20 \\\(\\\);" 1 "gimple" } } */
+}
+
+void
+f21 (void)
+{
+  int i;
+  #pragma omp for
+  for (i = 0; i < 1; i++)
+    f24 ();	/* { dg-final { scan-tree-dump-times "f23 \\\(\\\);" 1 "gimple" } } */
+}
+
+void
+f26 (void)
+{
+  int i;
+  #pragma omp for
+  for (i = 0; i < 1; i++)
+    f28 ();	/* { dg-final { scan-tree-dump-times "f28 \\\(\\\);" 1 "gimple" } } */
+}
+
+void
+f29 (void)
+{
+  int i;
+  #pragma omp for
+  for (i = 0; i < 1; i++)
+    f32 ();	/* { dg-final { scan-tree-dump-times "f32 \\\(\\\);" 1 "gimple" } } */
+}
-- 
cgit v1.1


From 6bdddc9f5cde9d397406f20bf2e8b7be79230dc2 Mon Sep 17 00:00:00 2001
From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Fri, 25 Oct 2019 00:17:12 +0000
Subject: Daily bump.

From-SVN: r277433
---
 gcc/DATESTAMP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index c364933..d8fb690 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20191024
+20191025
-- 
cgit v1.1


From ea133b14f48ed5730748a7e02e322fb07ccc2d85 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Fri, 25 Oct 2019 08:08:44 +0000
Subject: tree-vect-loop.c (vectorizable_reduction): Verify
 STMT_VINFO_REDUC_IDX on the to be vectorized stmts is set up correctly.

2019-10-25  Richard Biener  <rguenther@suse.de>

	* tree-vect-loop.c (vectorizable_reduction): Verify
	STMT_VINFO_REDUC_IDX on the to be vectorized stmts is set up
	correctly.
	* tree-vect-patterns.c (vect_mark_pattern_stmts): Transfer
	STMT_VINFO_REDUC_IDX from the original stmts to the pattern
	stmts.

From-SVN: r277437
---
 gcc/ChangeLog            |  9 +++++++++
 gcc/tree-vect-loop.c     | 14 ++++++++++++-
 gcc/tree-vect-patterns.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d9e470..bb64e93 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-25  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-loop.c (vectorizable_reduction): Verify
+	STMT_VINFO_REDUC_IDX on the to be vectorized stmts is set up
+	correctly.
+	* tree-vect-patterns.c (vect_mark_pattern_stmts): Transfer
+	STMT_VINFO_REDUC_IDX from the original stmts to the pattern
+	stmts.
+
 2019-10-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* gimplify.h (omp_construct_selector_matches): Declare.
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 9c5ce47..d0fd7bdb 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -5719,7 +5719,19 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   /* PHIs should not participate in patterns.  */
   gcc_assert (!STMT_VINFO_RELATED_STMT (phi_info));
   gphi *reduc_def_phi = as_a <gphi *> (phi_info->stmt);
-  tree reduc_def = PHI_RESULT (reduc_def_phi);
+
+  /* Verify following REDUC_IDX from the latch def leads us back to the PHI.  */
+  tree reduc_def = PHI_ARG_DEF_FROM_EDGE (reduc_def_phi,
+					  loop_latch_edge (loop));
+  while (reduc_def != PHI_RESULT (reduc_def_phi))
+    {
+      stmt_vec_info def = loop_vinfo->lookup_def (reduc_def);
+      def = vect_stmt_to_vectorize (def);
+      gcc_assert (STMT_VINFO_REDUC_IDX (def) != -1);
+      reduc_def = gimple_op (def->stmt, 1 + STMT_VINFO_REDUC_IDX (def));
+    }
+
+  reduc_def = PHI_RESULT (reduc_def_phi);
   int reduc_index = -1;
   for (i = 0; i < op_type; i++)
     {
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index b497ec9..31e9e2a 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -5075,6 +5075,7 @@ static inline void
 vect_mark_pattern_stmts (stmt_vec_info orig_stmt_info, gimple *pattern_stmt,
                          tree pattern_vectype)
 {
+  stmt_vec_info orig_stmt_info_saved = orig_stmt_info;
   gimple *def_seq = STMT_VINFO_PATTERN_DEF_SEQ (orig_stmt_info);
 
   gimple *orig_pattern_stmt = NULL;
@@ -5134,6 +5135,57 @@ vect_mark_pattern_stmts (stmt_vec_info orig_stmt_info, gimple *pattern_stmt,
     }
   else
     vect_set_pattern_stmt (pattern_stmt, orig_stmt_info, pattern_vectype);
+
+  /* Transfer reduction path info to the pattern.  */
+  if (STMT_VINFO_REDUC_IDX (orig_stmt_info_saved) != -1)
+    {
+      vec_info *vinfo = orig_stmt_info_saved->vinfo;
+      tree lookfor = gimple_op (orig_stmt_info_saved->stmt,
+				1 + STMT_VINFO_REDUC_IDX (orig_stmt_info));
+      /* Search the pattern def sequence and the main pattern stmt.  Note
+         we may have inserted all into a containing pattern def sequence
+	 so the following is a bit awkward.  */
+      gimple_stmt_iterator si;
+      gimple *s;
+      if (def_seq)
+	{
+	  si = gsi_start (def_seq);
+	  s = gsi_stmt (si);
+	  gsi_next (&si);
+	}
+      else
+	{
+	  si = gsi_none ();
+	  s = pattern_stmt;
+	}
+      do
+	{
+	  bool found = false;
+	  for (unsigned i = 1; i < gimple_num_ops (s); ++i)
+	    if (gimple_op (s, i) == lookfor)
+	      {
+		STMT_VINFO_REDUC_IDX (vinfo->lookup_stmt (s)) = i - 1;
+		lookfor = gimple_get_lhs (s);
+		found = true;
+		break;
+	      }
+	  if (found && s == pattern_stmt)
+	    break;
+	  if (s == pattern_stmt)
+	    gcc_unreachable ();
+	  if (gsi_end_p (si))
+	    s = pattern_stmt;
+	  else
+	    {
+	      s = gsi_stmt (si);
+	      if (s == pattern_stmt)
+		/* Found the end inside a bigger pattern def seq.  */
+		si = gsi_none ();
+	      else
+		gsi_next (&si);
+	    }
+	} while (1);
+    }
 }
 
 /* Function vect_pattern_recog_1
-- 
cgit v1.1


From 89d0345ad7b8d84045813972ee60557a6b511c57 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Fri, 25 Oct 2019 08:22:13 +0000
Subject: Fix reductions for fully-masked loops

Now that vectorizable_operation vectorises most loop stmts involved
in a reduction, it needs to be aware of reductions in fully-masked loops.
The LOOP_VINFO_CAN_FULLY_MASK_P parts of vectorizable_reduction now only
apply to cases that use vect_transform_reduction.

This new way of doing things is definitely an improvement for SVE though,
since it means we can lift the old restriction of not using fully-masked
loops for reduction chains.

2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-loop.c (vectorizable_reduction): Restrict the
	LOOP_VINFO_CAN_FULLY_MASK_P handling to cases that will be
	handled by vect_transform_reduction.  Allow fully-masked loops
	to be used with reduction chains.
	* tree-vect-stmts.c (vectorizable_operation): Handle reduction
	operations in fully-masked loops.
	(vectorizable_condition): Reject EXTRACT_LAST_REDUCTION
	operations in fully-masked loops.

gcc/testsuite/
	* gcc.dg/vect/pr65947-1.c: No longer expect doubled dump lines
	for FOLD_EXTRACT_LAST reductions.
	* gcc.dg/vect/pr65947-2.c: Likewise.
	* gcc.dg/vect/pr65947-3.c: Likewise.
	* gcc.dg/vect/pr65947-4.c: Likewise.
	* gcc.dg/vect/pr65947-5.c: Likewise.
	* gcc.dg/vect/pr65947-6.c: Likewise.
	* gcc.dg/vect/pr65947-9.c: Likewise.
	* gcc.dg/vect/pr65947-10.c: Likewise.
	* gcc.dg/vect/pr65947-12.c: Likewise.
	* gcc.dg/vect/pr65947-13.c: Likewise.
	* gcc.dg/vect/pr65947-14.c: Likewise.
	* gcc.dg/vect/pr80631-1.c: Likewise.
	* gcc.dg/vect/pr80631-2.c: Likewise.
	* gcc.dg/vect/vect-cond-reduc-3.c: Likewise.
	* gcc.dg/vect/vect-cond-reduc-4.c: Likewise.

From-SVN: r277438
---
 gcc/ChangeLog                                 | 11 ++++
 gcc/testsuite/ChangeLog                       | 19 ++++++
 gcc/testsuite/gcc.dg/vect/pr65947-1.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-10.c        |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-12.c        |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-13.c        |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-14.c        |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-2.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-3.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-4.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-5.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-6.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr65947-9.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr80631-1.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/pr80631-2.c         |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c |  2 +-
 gcc/tree-vect-loop.c                          | 51 ++++++---------
 gcc/tree-vect-stmts.c                         | 93 ++++++++++++++++++++++-----
 19 files changed, 144 insertions(+), 60 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb64e93..89448b1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-vect-loop.c (vectorizable_reduction): Restrict the
+	LOOP_VINFO_CAN_FULLY_MASK_P handling to cases that will be
+	handled by vect_transform_reduction.  Allow fully-masked loops
+	to be used with reduction chains.
+	* tree-vect-stmts.c (vectorizable_operation): Handle reduction
+	operations in fully-masked loops.
+	(vectorizable_condition): Reject EXTRACT_LAST_REDUCTION
+	operations in fully-masked loops.
+
 2019-10-25  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-loop.c (vectorizable_reduction): Verify
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8e652ab..4a98f6c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.dg/vect/pr65947-1.c: No longer expect doubled dump lines
+	for FOLD_EXTRACT_LAST reductions.
+	* gcc.dg/vect/pr65947-2.c: Likewise.
+	* gcc.dg/vect/pr65947-3.c: Likewise.
+	* gcc.dg/vect/pr65947-4.c: Likewise.
+	* gcc.dg/vect/pr65947-5.c: Likewise.
+	* gcc.dg/vect/pr65947-6.c: Likewise.
+	* gcc.dg/vect/pr65947-9.c: Likewise.
+	* gcc.dg/vect/pr65947-10.c: Likewise.
+	* gcc.dg/vect/pr65947-12.c: Likewise.
+	* gcc.dg/vect/pr65947-13.c: Likewise.
+	* gcc.dg/vect/pr65947-14.c: Likewise.
+	* gcc.dg/vect/pr80631-1.c: Likewise.
+	* gcc.dg/vect/pr80631-2.c: Likewise.
+	* gcc.dg/vect/vect-cond-reduc-3.c: Likewise.
+	* gcc.dg/vect/vect-cond-reduc-4.c: Likewise.
+
 2019-10-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-c++-common/gomp/declare-variant-8.c: New test.
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-1.c b/gcc/testsuite/gcc.dg/vect/pr65947-1.c
index b81baed..8ebc385 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-1.c
@@ -41,5 +41,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-10.c b/gcc/testsuite/gcc.dg/vect/pr65947-10.c
index f37aeca..e4a1d94 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-10.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-10.c
@@ -42,6 +42,6 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-12.c b/gcc/testsuite/gcc.dg/vect/pr65947-12.c
index b84fd41..a47f414 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-12.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-12.c
@@ -42,5 +42,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-13.c b/gcc/testsuite/gcc.dg/vect/pr65947-13.c
index 4ad5262..b0755c0 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-13.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-13.c
@@ -42,4 +42,4 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { xfail vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-14.c b/gcc/testsuite/gcc.dg/vect/pr65947-14.c
index d0194f2..c0df587 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-14.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-14.c
@@ -41,5 +41,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-2.c b/gcc/testsuite/gcc.dg/vect/pr65947-2.c
index 18d33c4..58ba5f7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-2.c
@@ -42,5 +42,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-3.c b/gcc/testsuite/gcc.dg/vect/pr65947-3.c
index 427abdb..6b4077e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-3.c
@@ -52,5 +52,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-4.c b/gcc/testsuite/gcc.dg/vect/pr65947-4.c
index 4055710..99f9765 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-4.c
@@ -41,6 +41,6 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-5.c b/gcc/testsuite/gcc.dg/vect/pr65947-5.c
index c91b648..4e3f765 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-5.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-5.c
@@ -53,5 +53,5 @@ main (void)
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 1 "vect" { target { ! vect_fold_extract_last } } } } */
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump "loop size is greater than data size" "vect" { xfail vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-6.c b/gcc/testsuite/gcc.dg/vect/pr65947-6.c
index b072c8d..dde96d7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-6.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-6.c
@@ -41,5 +41,5 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65947-9.c b/gcc/testsuite/gcc.dg/vect/pr65947-9.c
index e43e0e4..1f29530 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65947-9.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65947-9.c
@@ -48,5 +48,5 @@ main ()
 /* { dg-final { scan-tree-dump-not "LOOP VECTORIZED" "vect" { target { ! vect_fold_extract_last } } } } */
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 1 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump "loop size is greater than data size" "vect" { target { ! vect_fold_extract_last } } } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 1 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-not "condition expression based on integer induction." "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr80631-1.c b/gcc/testsuite/gcc.dg/vect/pr80631-1.c
index b531fe6..f430deb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr80631-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr80631-1.c
@@ -72,5 +72,5 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 5 "vect" { target vect_condition } } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 10 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 5 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 5 "vect" { target { { ! vect_fold_extract_last } && vect_condition } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr80631-2.c b/gcc/testsuite/gcc.dg/vect/pr80631-2.c
index 07f1a72..ca786f6 100644
--- a/gcc/testsuite/gcc.dg/vect/pr80631-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr80631-2.c
@@ -73,4 +73,4 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 5 "vect" { target vect_condition } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 5 "vect" { target vect_condition xfail vect_fold_extract_last } } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 10 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 5 "vect" { target vect_fold_extract_last } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c
index a5b3849..de9921c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-3.c
@@ -40,6 +40,6 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c
index 6b6d17f..543504f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-4.c
@@ -40,6 +40,6 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 4 "vect" { target vect_fold_extract_last } } } */
+/* { dg-final { scan-tree-dump-times "optimizing condition reduction with FOLD_EXTRACT_LAST" 2 "vect" { target vect_fold_extract_last } } } */
 /* { dg-final { scan-tree-dump-times "condition expression based on integer induction." 2 "vect" { target { ! vect_fold_extract_last } } } } */
 
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index d0fd7bdb..3b58cee 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -6319,38 +6319,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
   else
     vec_num = 1;
 
-  internal_fn cond_fn = get_conditional_internal_fn (code);
-  vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
-  bool mask_by_cond_expr = use_mask_by_cond_expr_p (code, cond_fn, vectype_in);
-
   vect_model_reduction_cost (stmt_info, reduc_fn, reduction_type, ncopies,
 			     cost_vec);
-  if (loop_vinfo && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo))
-    {
-      if (reduction_type != FOLD_LEFT_REDUCTION
-	  && !mask_by_cond_expr
-	  && (cond_fn == IFN_LAST
-	      || !direct_internal_fn_supported_p (cond_fn, vectype_in,
-						  OPTIMIZE_FOR_SPEED)))
-	{
-	  if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "can't use a fully-masked loop because no"
-			     " conditional operation is available.\n");
-	  LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo) = false;
-	}
-      else if (reduc_index == -1)
-	{
-	  if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "can't use a fully-masked loop for chained"
-			     " reductions.\n");
-	  LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo) = false;
-	}
-      else
-	vect_record_loop_mask (loop_vinfo, masks, ncopies * vec_num,
-			       vectype_in, NULL);
-    }
   if (dump_enabled_p ()
       && reduction_type == FOLD_LEFT_REDUCTION)
     dump_printf_loc (MSG_NOTE, vect_location,
@@ -6367,6 +6337,27 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node,
       STMT_VINFO_DEF_TYPE (stmt_info) = vect_internal_def;
       STMT_VINFO_DEF_TYPE (vect_orig_stmt (stmt_info)) = vect_internal_def;
     }
+  else if (loop_vinfo && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo))
+    {
+      vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
+      internal_fn cond_fn = get_conditional_internal_fn (code);
+
+      if (reduction_type != FOLD_LEFT_REDUCTION
+	  && !use_mask_by_cond_expr_p (code, cond_fn, vectype_in)
+	  && (cond_fn == IFN_LAST
+	      || !direct_internal_fn_supported_p (cond_fn, vectype_in,
+						  OPTIMIZE_FOR_SPEED)))
+	{
+	  if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "can't use a fully-masked loop because no"
+			     " conditional operation is available.\n");
+	  LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo) = false;
+	}
+      else
+	vect_record_loop_mask (loop_vinfo, masks, ncopies * vec_num,
+			       vectype_in, NULL);
+    }
   return true;
 }
 
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 02b95f51..19ac82f 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5929,7 +5929,7 @@ vectorizable_operation (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
   poly_uint64 nunits_in;
   poly_uint64 nunits_out;
   tree vectype_out;
-  int ncopies;
+  int ncopies, vec_num;
   int j, i;
   vec<tree> vec_oprnds0 = vNULL;
   vec<tree> vec_oprnds1 = vNULL;
@@ -6066,9 +6066,15 @@ vectorizable_operation (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
      vectorized stmts for each SLP node.  Hence, NCOPIES is always 1 in
      case of SLP.  */
   if (slp_node)
-    ncopies = 1;
+    {
+      ncopies = 1;
+      vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
+    }
   else
-    ncopies = vect_get_num_copies (loop_vinfo, vectype);
+    {
+      ncopies = vect_get_num_copies (loop_vinfo, vectype);
+      vec_num = 1;
+    }
 
   gcc_assert (ncopies >= 1);
 
@@ -6121,8 +6127,34 @@ vectorizable_operation (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
       return false;
     }
 
+  int reduc_idx = STMT_VINFO_REDUC_IDX (stmt_info);
+  vec_loop_masks *masks = (loop_vinfo ? &LOOP_VINFO_MASKS (loop_vinfo) : NULL);
+  internal_fn cond_fn = get_conditional_internal_fn (code);
+
   if (!vec_stmt) /* transformation not required.  */
     {
+      /* If this operation is part of a reduction, a fully-masked loop
+	 should only change the active lanes of the reduction chain,
+	 keeping the inactive lanes as-is.  */
+      if (loop_vinfo
+	  && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo)
+	  && reduc_idx >= 0)
+	{
+	  if (cond_fn == IFN_LAST
+	      || !direct_internal_fn_supported_p (cond_fn, vectype,
+						  OPTIMIZE_FOR_SPEED))
+	    {
+	      if (dump_enabled_p ())
+		dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+				 "can't use a fully-masked loop because no"
+				 " conditional operation is available.\n");
+	      LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo) = false;
+	    }
+	  else
+	    vect_record_loop_mask (loop_vinfo, masks, ncopies * vec_num,
+				   vectype, NULL);
+	}
+
       STMT_VINFO_TYPE (stmt_info) = op_vec_info_type;
       DUMP_VECT_SCOPE ("vectorizable_operation");
       vect_model_simple_cost (stmt_info, ncopies, dt, ndts, slp_node, cost_vec);
@@ -6135,6 +6167,8 @@ vectorizable_operation (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
     dump_printf_loc (MSG_NOTE, vect_location,
                      "transform binary/unary operation.\n");
 
+  bool masked_loop_p = loop_vinfo && LOOP_VINFO_FULLY_MASKED_P (loop_vinfo);
+
   /* POINTER_DIFF_EXPR has pointer arguments which are vectorized as
      vectors with unsigned elements, but the result is signed.  So, we
      need to compute the MINUS_EXPR into vectype temporary and
@@ -6252,22 +6286,41 @@ vectorizable_operation (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 		  ? vec_oprnds1[i] : NULL_TREE);
 	  vop2 = ((op_type == ternary_op)
 		  ? vec_oprnds2[i] : NULL_TREE);
-	  gassign *new_stmt = gimple_build_assign (vec_dest, code,
-						   vop0, vop1, vop2);
-	  new_temp = make_ssa_name (vec_dest, new_stmt);
-	  gimple_assign_set_lhs (new_stmt, new_temp);
-	  new_stmt_info
-	    = vect_finish_stmt_generation (stmt_info, new_stmt, gsi);
-	  if (vec_cvt_dest)
+	  if (masked_loop_p && reduc_idx >= 0)
 	    {
-	      new_temp = build1 (VIEW_CONVERT_EXPR, vectype_out, new_temp);
-	      gassign *new_stmt
-		= gimple_build_assign (vec_cvt_dest, VIEW_CONVERT_EXPR,
-				       new_temp);
-	      new_temp = make_ssa_name (vec_cvt_dest, new_stmt);
+	      /* Perform the operation on active elements only and take
+		 inactive elements from the reduction chain input.  */
+	      gcc_assert (!vop2);
+	      vop2 = reduc_idx == 1 ? vop1 : vop0;
+	      tree mask = vect_get_loop_mask (gsi, masks, vec_num * ncopies,
+					      vectype, i * ncopies + j);
+	      gcall *call = gimple_build_call_internal (cond_fn, 4, mask,
+							vop0, vop1, vop2);
+	      new_temp = make_ssa_name (vec_dest, call);
+	      gimple_call_set_lhs (call, new_temp);
+	      gimple_call_set_nothrow (call, true);
+	      new_stmt_info
+		= vect_finish_stmt_generation (stmt_info, call, gsi);
+	    }
+	  else
+	    {
+	      gassign *new_stmt = gimple_build_assign (vec_dest, code,
+						       vop0, vop1, vop2);
+	      new_temp = make_ssa_name (vec_dest, new_stmt);
 	      gimple_assign_set_lhs (new_stmt, new_temp);
 	      new_stmt_info
 		= vect_finish_stmt_generation (stmt_info, new_stmt, gsi);
+	      if (vec_cvt_dest)
+		{
+		  new_temp = build1 (VIEW_CONVERT_EXPR, vectype_out, new_temp);
+		  gassign *new_stmt
+		    = gimple_build_assign (vec_cvt_dest, VIEW_CONVERT_EXPR,
+					   new_temp);
+		  new_temp = make_ssa_name (vec_cvt_dest, new_stmt);
+		  gimple_assign_set_lhs (new_stmt, new_temp);
+		  new_stmt_info
+		    = vect_finish_stmt_generation (stmt_info, new_stmt, gsi);
+		}
 	    }
           if (slp_node)
 	    SLP_TREE_VEC_STMTS (slp_node).quick_push (new_stmt_info);
@@ -9997,6 +10050,16 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 		return false;
 	    }
 	}
+      if (loop_vinfo
+	  && LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo)
+	  && reduction_type == EXTRACT_LAST_REDUCTION)
+	{
+	  if (dump_enabled_p ())
+	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+			     "can't yet use a fully-masked loop for"
+			     " EXTRACT_LAST_REDUCTION.\n");
+	  LOOP_VINFO_CAN_FULLY_MASK_P (loop_vinfo) = false;
+	}
       if (expand_vec_cond_expr_p (vectype, comp_vectype,
 				     cond_code))
 	{
-- 
cgit v1.1


From f88b78ae374f143cca63a56b1eecf8d426045f4e Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 25 Oct 2019 11:13:12 +0200
Subject: Fix typo in dump_tree_statistics.

2019-10-25  Martin Liska  <mliska@suse.cz>

	* tree.c (dump_tree_statistics): Use sorted index 'j' and not 'i'.

From-SVN: r277440
---
 gcc/ChangeLog | 4 ++++
 gcc/tree.c    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 89448b1..3601030 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-25  Martin Liska  <mliska@suse.cz>
+
+	* tree.c (dump_tree_statistics): Use sorted index 'j' and not 'i'.
+
 2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-vect-loop.c (vectorizable_reduction): Restrict the
diff --git a/gcc/tree.c b/gcc/tree.c
index 2bee1d2..23fe5bf 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -9673,7 +9673,7 @@ dump_tree_statistics (void)
 	  {
 	    unsigned j = indices[i];
 	    fprintf (stderr, "%-20s %6" PRIu64 "%c %9" PRIu64 "%c\n",
-		     tree_node_kind_names[i], SIZE_AMOUNT (tree_node_counts[j]),
+		     tree_node_kind_names[j], SIZE_AMOUNT (tree_node_counts[j]),
 		     SIZE_AMOUNT (tree_node_sizes[j]));
 	    total_nodes += tree_node_counts[j];
 	    total_bytes += tree_node_sizes[j];
-- 
cgit v1.1


From 7815eaa869b450be391b128c588f125fc646926e Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Fri, 25 Oct 2019 09:13:55 +0000
Subject: Update SVE tests for recent XPASSes

Recent target-independent patches mean that several SVE tests
now produce the code that we'd originally wanted them to produce.
Really nice to see :-)

This patch therefore updates the expected baseline, so that hopefully
we don't regress from this point in future.

2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>

gcc/testsuite/
	* gcc.target/aarch64/sve/loop_add_5.c: Remove XFAILs for tests
	that now pass.
	* gcc.target/aarch64/sve/reduc_1.c: Likewise.
	* gcc.target/aarch64/sve/reduc_2.c: Likewise.
	* gcc.target/aarch64/sve/reduc_5.c: Likewise.
	* gcc.target/aarch64/sve/reduc_8.c: Likewise.
	* gcc.target/aarch64/sve/slp_13.c: Likewise.
	* gcc.target/aarch64/sve/slp_5.c: Likewise.  Update expected
	WHILELO counts.
	* gcc.target/aarch64/sve/slp_7.c: Likewise.

From-SVN: r277441
---
 gcc/testsuite/ChangeLog                           | 13 +++++++++++++
 gcc/testsuite/gcc.target/aarch64/sve/loop_add_5.c | 14 +++++++-------
 gcc/testsuite/gcc.target/aarch64/sve/reduc_1.c    |  8 ++++----
 gcc/testsuite/gcc.target/aarch64/sve/reduc_2.c    |  4 ++--
 gcc/testsuite/gcc.target/aarch64/sve/reduc_5.c    | 10 +++-------
 gcc/testsuite/gcc.target/aarch64/sve/reduc_8.c    |  3 +--
 gcc/testsuite/gcc.target/aarch64/sve/slp_13.c     | 11 +++++------
 gcc/testsuite/gcc.target/aarch64/sve/slp_5.c      | 22 ++++++----------------
 gcc/testsuite/gcc.target/aarch64/sve/slp_7.c      | 20 ++++++--------------
 9 files changed, 47 insertions(+), 58 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4a98f6c..dfb2186 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,18 @@
 2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* gcc.target/aarch64/sve/loop_add_5.c: Remove XFAILs for tests
+	that now pass.
+	* gcc.target/aarch64/sve/reduc_1.c: Likewise.
+	* gcc.target/aarch64/sve/reduc_2.c: Likewise.
+	* gcc.target/aarch64/sve/reduc_5.c: Likewise.
+	* gcc.target/aarch64/sve/reduc_8.c: Likewise.
+	* gcc.target/aarch64/sve/slp_13.c: Likewise.
+	* gcc.target/aarch64/sve/slp_5.c: Likewise.  Update expected
+	WHILELO counts.
+	* gcc.target/aarch64/sve/slp_7.c: Likewise.
+
+2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* gcc.dg/vect/pr65947-1.c: No longer expect doubled dump lines
 	for FOLD_EXTRACT_LAST reductions.
 	* gcc.dg/vect/pr65947-2.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/loop_add_5.c b/gcc/testsuite/gcc.target/aarch64/sve/loop_add_5.c
index cffacc0..a08af7d 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/loop_add_5.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/loop_add_5.c
@@ -3,11 +3,11 @@
 
 #include "loop_add_4.c"
 
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #-16\n} 1 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #-15\n} 1 { xfail *-*-* }  } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #-16\n} 1 } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #-15\n} 1 } } */
 /* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #1\n} 1 } } */
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #15\n} 1 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, w[0-9]+\n} 3 { xfail *-*-* }  } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, #15\n} 1 } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.b, w[0-9]+, w[0-9]+\n} 3 } } */
 /* { dg-final { scan-assembler-times {\tld1b\tz[0-9]+\.b, p[0-7]+/z, \[x[0-9]+, x[0-9]+\]} 8 } } */
 /* { dg-final { scan-assembler-times {\tst1b\tz[0-9]+\.b, p[0-7]+, \[x[0-9]+, x[0-9]+\]} 8 } } */
 
@@ -16,11 +16,11 @@
 /* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.b, z[0-9]+\.b, #} 6 } } */
 /* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.b, z[0-9]+\.b, z[0-9]+\.b\n} 8 } } */
 
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, #-16\n} 1 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, #-15\n} 1 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, #-16\n} 1 } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, #-15\n} 1 } } */
 /* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, #1\n} 1 } } */
 /* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, #15\n} 1 } } */
-/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, w[0-9]+\n} 3 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tindex\tz[0-9]+\.h, w[0-9]+, w[0-9]+\n} 3 } } */
 /* { dg-final { scan-assembler-times {\tld1h\tz[0-9]+\.h, p[0-7]+/z, \[x[0-9]+, x[0-9]+, lsl 1\]} 8 } } */
 /* { dg-final { scan-assembler-times {\tst1h\tz[0-9]+\.h, p[0-7]+, \[x[0-9]+, x[0-9]+, lsl 1\]} 8 } } */
 
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/reduc_1.c b/gcc/testsuite/gcc.target/aarch64/sve/reduc_1.c
index a258344..f152d04 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/reduc_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/reduc_1.c
@@ -105,8 +105,8 @@ reduc_##NAME##_##TYPE (TYPE *a, int n)		\
 
 TEST_BITWISE (DEF_REDUC_BITWISE)
 
-/* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.b, p[0-7]/m, z[0-9]+\.b, z[0-9]+\.b\n} 1 } } */
-/* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.h, p[0-7]/m, z[0-9]+\.h, z[0-9]+\.h\n} 1 } } */
+/* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.b, p[0-7]/m, z[0-9]+\.b, z[0-9]+\.b\n} 2 } } */
+/* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.h, p[0-7]/m, z[0-9]+\.h, z[0-9]+\.h\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.s, p[0-7]/m, z[0-9]+\.s, z[0-9]+\.s\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tadd\tz[0-9]+\.d, p[0-7]/m, z[0-9]+\.d, z[0-9]+\.d\n} 2 } } */
 
@@ -157,8 +157,8 @@ TEST_BITWISE (DEF_REDUC_BITWISE)
 /* { dg-final { scan-assembler-times {\teor\tz[0-9]+\.s, p[0-7]/m, z[0-9]+\.s, z[0-9]+\.s\n} 2 } } */
 /* { dg-final { scan-assembler-times {\teor\tz[0-9]+\.d, p[0-7]/m, z[0-9]+\.d, z[0-9]+\.d\n} 2 } } */
 
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b\n} 1 } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h\n} 1 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b\n} 2 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.s\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.d\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\th[0-9]+, p[0-7], z[0-9]+\.h\n} 1 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/reduc_2.c b/gcc/testsuite/gcc.target/aarch64/sve/reduc_2.c
index 376a453..0640cba 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/reduc_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/reduc_2.c
@@ -116,8 +116,8 @@ reduc_##NAME##TYPE (TYPE (*restrict a)[NUM_ELEMS(TYPE)],	\
 
 TEST_BITWISE (DEF_REDUC_BITWISE)
 
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b\n} 1 } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h\n} 1 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b\n} 2 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.s\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.d\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\th[0-9]+, p[0-7], z[0-9]+\.h\n} 1 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/reduc_5.c b/gcc/testsuite/gcc.target/aarch64/sve/reduc_5.c
index ff53594..cced4ad 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/reduc_5.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/reduc_5.c
@@ -23,16 +23,12 @@ REDUC (uint64_t)
 REDUC (float)
 REDUC (double)
 
-/* XFAILed until we support sub-int reductions for signed types.  */
-/* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.b, p[0-7]/m} 2 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.h, p[0-7]/m} 2 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.b, p[0-7]/m} 1 } } */
-/* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.h, p[0-7]/m} 1 } } */
+/* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.b, p[0-7]/m} 2 } } */
+/* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.h, p[0-7]/m} 2 } } */
 /* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.s, p[0-7]/m} 2 } } */
 /* { dg-final { scan-assembler-times {\tsub\tz[0-9]+\.d, p[0-7]/m} 2 } } */
 /* { dg-final { scan-assembler-times {\tfsub\tz[0-9]+\.s, p[0-7]/m} 1 } } */
 /* { dg-final { scan-assembler-times {\tfsub\tz[0-9]+\.d, p[0-7]/m} 1 } } */
 
-/* XFAILed until we support sub-int reductions for signed types.  */
-/* { dg-final { scan-assembler-times {\tsub\t} 8 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tsub\t} 8 } } */
 /* { dg-final { scan-assembler-times {\tfsub\t} 2 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/reduc_8.c b/gcc/testsuite/gcc.target/aarch64/sve/reduc_8.c
index 3913b88..dec4c87 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/reduc_8.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/reduc_8.c
@@ -15,6 +15,5 @@ reduc (int *restrict a, int *restrict b, int *restrict c)
 }
 
 /* { dg-final { scan-assembler-times {\tcmpne\tp[0-9]+\.s, } 1 } } */
-/* We ought to use the CMPNE result for the SEL too.  */
-/* { dg-final { scan-assembler-not {\tcmpeq\tp[0-9]+\.s, } { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not {\tcmpeq\tp[0-9]+\.s, } } } */
 /* { dg-final { scan-assembler-times {\tsel\tz[0-9]+\.s, } 1 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/slp_13.c b/gcc/testsuite/gcc.target/aarch64/sve/slp_13.c
index 0b2a7ad..37b5f11 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/slp_13.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/slp_13.c
@@ -32,7 +32,6 @@ vec_slp_##TYPE (TYPE *restrict a, int n)			\
 
 TEST_ALL (VEC_PERM)
 
-/* ??? We don't treat the int8_t and int16_t loops as reductions.  */
 /* ??? We don't treat the uint loops as SLP.  */
 /* The loop should be fully-masked.  */
 /* { dg-final { scan-assembler-times {\tld1b\t} 2 { xfail *-*-* } } } */
@@ -41,15 +40,15 @@ TEST_ALL (VEC_PERM)
 /* { dg-final { scan-assembler-times {\tld1w\t} 2 } } */
 /* { dg-final { scan-assembler-times {\tld1d\t} 3 { xfail *-*-* } } } */
 /* { dg-final { scan-assembler-times {\tld1d\t} 2 } } */
-/* { dg-final { scan-assembler-not {\tldr} { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-not {\tldr} } } */
 
-/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.b} 4 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.h} 6 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.b} 4 } } */
+/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.h} 6 } } */
 /* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.s} 6 } } */
 /* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.d} 6 } } */
 
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b\n} 2 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h\n} 2 { xfail *-*-* } } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b\n} 2 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.s\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.d\n} 2 } } */
 /* { dg-final { scan-assembler-times {\tfadda\th[0-9]+, p[0-7], h[0-9]+, z[0-9]+\.h\n} 1 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/slp_5.c b/gcc/testsuite/gcc.target/aarch64/sve/slp_5.c
index b75edc69e..6a199d0 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/slp_5.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/slp_5.c
@@ -33,34 +33,24 @@ vec_slp_##TYPE (TYPE *restrict a, TYPE *restrict b, int n)	\
 
 TEST_ALL (VEC_PERM)
 
-/* ??? We don't think it's worth using SLP for the 64-bit loops and fall
-   back to the less efficient non-SLP implementation instead.  */
-/* ??? At present we don't treat the int8_t and int16_t loops as
-   reductions.  */
-/* { dg-final { scan-assembler-times {\tld1b\t} 2 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tld1h\t} 3 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tld1b\t} 1 } } */
-/* { dg-final { scan-assembler-times {\tld1h\t} 2 } } */
+/* { dg-final { scan-assembler-times {\tld1b\t} 2 } } */
+/* { dg-final { scan-assembler-times {\tld1h\t} 3 } } */
 /* { dg-final { scan-assembler-times {\tld1w\t} 3 } } */
 /* { dg-final { scan-assembler-times {\tld1d\t} 3 } } */
 /* { dg-final { scan-assembler-not {\tld2b\t} } } */
 /* { dg-final { scan-assembler-not {\tld2h\t} } } */
 /* { dg-final { scan-assembler-not {\tld2w\t} } } */
 /* { dg-final { scan-assembler-not {\tld2d\t} } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b} 4 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h} 4 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b} 2 } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h} 2 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b} 4 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h} 4 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.s} 4 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.d} 4 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\th[0-9]+, p[0-7], z[0-9]+\.h} 2 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\ts[0-9]+, p[0-7], z[0-9]+\.s} 2 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\td[0-9]+, p[0-7], z[0-9]+\.d} 2 } } */
 
-/* Should be 4 and 6 respectively, if we used reductions for int8_t and
-   int16_t.  */
-/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.b} 2 } } */
-/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.h} 4 } } */
+/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.b} 4 } } */
+/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.h} 6 } } */
 /* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.s} 6 } } */
 /* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.d} 6 } } */
 
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/slp_7.c b/gcc/testsuite/gcc.target/aarch64/sve/slp_7.c
index 9e6aa8c..dbc32a4 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/slp_7.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/slp_7.c
@@ -43,32 +43,24 @@ TEST_ALL (VEC_PERM)
    results might be greater than the number of elements in the vector.
    Otherwise we have two loads per loop, one for the initial vector
    and one for the loop body.  */
-/* ??? At present we don't treat the int8_t and int16_t loops as
-   reductions.  */
-/* { dg-final { scan-assembler-times {\tld1b\t} 2 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tld1h\t} 3 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tld1b\t} 1 } } */
-/* { dg-final { scan-assembler-times {\tld1h\t} 2 } } */
+/* { dg-final { scan-assembler-times {\tld1b\t} 2 } } */
+/* { dg-final { scan-assembler-times {\tld1h\t} 3 } } */
 /* { dg-final { scan-assembler-times {\tld1w\t} 3 } } */
 /* { dg-final { scan-assembler-times {\tld4d\t} 3 } } */
 /* { dg-final { scan-assembler-not {\tld4b\t} } } */
 /* { dg-final { scan-assembler-not {\tld4h\t} } } */
 /* { dg-final { scan-assembler-not {\tld4w\t} } } */
 /* { dg-final { scan-assembler-not {\tld1d\t} } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b} 8 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h} 8 { xfail *-*-* } } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b} 4 } } */
-/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h} 4 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.b} 8 } } */
+/* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.h} 8 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.s} 8 } } */
 /* { dg-final { scan-assembler-times {\tuaddv\td[0-9]+, p[0-7], z[0-9]+\.d} 8 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\th[0-9]+, p[0-7], z[0-9]+\.h} 4 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\ts[0-9]+, p[0-7], z[0-9]+\.s} 4 } } */
 /* { dg-final { scan-assembler-times {\tfaddv\td[0-9]+, p[0-7], z[0-9]+\.d} 4 } } */
 
-/* Should be 4 and 6 respectively, if we used reductions for int8_t and
-   int16_t.  */
-/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.b} 2 } } */
-/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.h} 4 } } */
+/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.b} 4 } } */
+/* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.h} 6 } } */
 /* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.s} 6 } } */
 /* { dg-final { scan-assembler-times {\twhilelo\tp[0-7]\.d} 6 } } */
 
-- 
cgit v1.1


From bafe6f6a45e804efbf801ab2a8b4065934d11078 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard.sandiford@arm.com>
Date: Fri, 25 Oct 2019 09:16:59 +0000
Subject: Fix failure in gcc.target/sve/reduc_strict_3.c

Unwanted unrolling meant that we had more single-precision FADDAs
than expected.

2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>

gcc/testsuite/
	* gcc.target/aarch64/sve/reduc_strict_3.c (double_reduc1): Prevent
	the loop from being unrolled.

From-SVN: r277442
---
 gcc/testsuite/ChangeLog                               | 5 +++++
 gcc/testsuite/gcc.target/aarch64/sve/reduc_strict_3.c | 1 +
 2 files changed, 6 insertions(+)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dfb2186..9397ff3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* gcc.target/aarch64/sve/reduc_strict_3.c (double_reduc1): Prevent
+	the loop from being unrolled.
+
+2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* gcc.target/aarch64/sve/loop_add_5.c: Remove XFAILs for tests
 	that now pass.
 	* gcc.target/aarch64/sve/reduc_1.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/reduc_strict_3.c b/gcc/testsuite/gcc.target/aarch64/sve/reduc_strict_3.c
index a718e9d..a815c93 100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/reduc_strict_3.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/reduc_strict_3.c
@@ -82,6 +82,7 @@ double_reduc1 (float (*restrict i)[16])
 {
   float l = 0;
 
+#pragma GCC unroll 0
   for (int a = 0; a < 8; a++)
     for (int b = 0; b < 8; b++)
       l += i[b][a];
-- 
cgit v1.1


From 77100812a3bf4c693cb24c65be54ea367f17a246 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Fri, 25 Oct 2019 12:25:52 +0000
Subject: tree-vect-slp.c (vect_get_and_check_slp_defs): Only fail swapping if
 we actually have to modify the IL on a shared stmt.

2019-10-25  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (vect_get_and_check_slp_defs): Only fail
	swapping if we actually have to modify the IL on a shared stmt.
	(vect_build_slp_tree_2): Never fail swapping on shared stmts
	because we no longer modify the IL.

From-SVN: r277446
---
 gcc/ChangeLog       |  7 +++++++
 gcc/tree-vect-slp.c | 44 +++++++++++---------------------------------
 2 files changed, 18 insertions(+), 33 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3601030..8762756 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-25  Richard Biener  <rguenther@suse.de>
+
+	* tree-vect-slp.c (vect_get_and_check_slp_defs): Only fail
+	swapping if we actually have to modify the IL on a shared stmt.
+	(vect_build_slp_tree_2): Never fail swapping on shared stmts
+	because we no longer modify the IL.
+
 2019-10-25  Martin Liska  <mliska@suse.cz>
 
 	* tree.c (dump_tree_statistics): Use sorted index 'j' and not 'i'.
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 3db08fa..f367595 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -537,19 +537,19 @@ again:
   /* Swap operands.  */
   if (swapped)
     {
-      /* If there are already uses of this stmt in a SLP instance then
-         we've committed to the operand order and can't swap it.  */
-      if (STMT_VINFO_NUM_SLP_USES (stmt_info) != 0)
-	{
-	  if (dump_enabled_p ())
-	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-			     "Build SLP failed: cannot swap operands of "
-			     "shared stmt %G", stmt_info->stmt);
-	  return -1;
-	}
-
       if (first_op_cond)
 	{
+	  /* If there are already uses of this stmt in a SLP instance then
+	     we've committed to the operand order and can't swap it.  */
+	  if (STMT_VINFO_NUM_SLP_USES (stmt_info) != 0)
+	    {
+	      if (dump_enabled_p ())
+		dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
+				 "Build SLP failed: cannot swap operands of "
+				 "shared stmt %G", stmt_info->stmt);
+	      return -1;
+	    }
+
 	  /* To get rid of this swapping we have to move the stmt code
 	     to the SLP tree as well (and gather it here per stmt).  */
 	  gassign *stmt = as_a <gassign *> (stmt_info->stmt);
@@ -1413,28 +1413,6 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 		      swap_not_matching = false;
 		      break;
 		    }
-		  /* Verify if we can safely swap or if we committed to a
-		     specific operand order already.
-		     ???  Instead of modifying GIMPLE stmts here we could
-		     record whether we want to swap operands in the SLP
-		     node and temporarily do that when processing it
-		     (or wrap operand accessors in a helper).  */
-		  else if (swap[j] != 0
-			   || STMT_VINFO_NUM_SLP_USES (stmt_info))
-		    {
-		      if (!swap_not_matching)
-			{
-			  if (dump_enabled_p ())
-			    dump_printf_loc (MSG_MISSED_OPTIMIZATION,
-					     vect_location,
-					     "Build SLP failed: cannot swap "
-					     "operands of shared stmt %G",
-					     stmts[j]->stmt);
-			  goto fail;
-			}
-		      swap_not_matching = false;
-		      break;
-		    }
 		}
 	    }
 	  while (j != group_size);
-- 
cgit v1.1


From 7098ab48b08782af5016dc8ac6d10215994447a4 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Fri, 25 Oct 2019 13:03:56 +0000
Subject: re PR tree-optimization/92222 (ice in useless_type_conversion_p, at
 gimple-expr.c:86)

2019-10-25  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92222
	* tree-vect-slp.c (_slp_oprnd_info::first_pattern): Remove.
	(_slp_oprnd_info::second_pattern): Likewise.
	(_slp_oprnd_info::any_pattern): New.
	(vect_create_oprnd_info): Adjust.
	(vect_get_and_check_slp_defs): Compute whether any stmt is
	in a pattern.
	(vect_build_slp_tree_2): Avoid building up a node from scalars
	if any of the operand defs, not just the first, is in a pattern.

	* gcc.dg/torture/pr92222.c: New testcase.

From-SVN: r277448
---
 gcc/ChangeLog                          | 12 ++++++++++++
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gcc.dg/torture/pr92222.c | 17 +++++++++++++++++
 gcc/tree-vect-slp.c                    | 20 ++++++++------------
 4 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/torture/pr92222.c

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8762756..cef0a3f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,17 @@
 2019-10-25  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/92222
+	* tree-vect-slp.c (_slp_oprnd_info::first_pattern): Remove.
+	(_slp_oprnd_info::second_pattern): Likewise.
+	(_slp_oprnd_info::any_pattern): New.
+	(vect_create_oprnd_info): Adjust.
+	(vect_get_and_check_slp_defs): Compute whether any stmt is
+	in a pattern.
+	(vect_build_slp_tree_2): Avoid building up a node from scalars
+	if any of the operand defs, not just the first, is in a pattern.
+
+2019-10-25  Richard Biener  <rguenther@suse.de>
+
 	* tree-vect-slp.c (vect_get_and_check_slp_defs): Only fail
 	swapping if we actually have to modify the IL on a shared stmt.
 	(vect_build_slp_tree_2): Never fail swapping on shared stmts
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9397ff3..4e0fedd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92222
+	* gcc.dg/torture/pr92222.c: New testcase.
+
 2019-10-25  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* gcc.target/aarch64/sve/reduc_strict_3.c (double_reduc1): Prevent
diff --git a/gcc/testsuite/gcc.dg/torture/pr92222.c b/gcc/testsuite/gcc.dg/torture/pr92222.c
new file mode 100644
index 0000000..f48010d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr92222.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-ftree-vectorize" } */
+
+unsigned char *a;
+int b;
+void f();
+void c()
+{
+  char *d;
+  int e;
+  for (; b; b++) {
+      e = 7;
+      for (; e >= 0; e--)
+	*d++ = a[b] & 1 << e ? '1' : '0';
+  }
+  f();
+}
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index f367595..e32731b 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -177,8 +177,7 @@ typedef struct _slp_oprnd_info
      stmt.  */
   tree first_op_type;
   enum vect_def_type first_dt;
-  bool first_pattern;
-  bool second_pattern;
+  bool any_pattern;
 } *slp_oprnd_info;
 
 
@@ -199,8 +198,7 @@ vect_create_oprnd_info (int nops, int group_size)
       oprnd_info->ops.create (group_size);
       oprnd_info->first_dt = vect_uninitialized_def;
       oprnd_info->first_op_type = NULL_TREE;
-      oprnd_info->first_pattern = false;
-      oprnd_info->second_pattern = false;
+      oprnd_info->any_pattern = false;
       oprnds_info.quick_push (oprnd_info);
     }
 
@@ -339,13 +337,11 @@ vect_get_and_check_slp_defs (vec_info *vinfo, unsigned char *swap,
   tree oprnd;
   unsigned int i, number_of_oprnds;
   enum vect_def_type dt = vect_uninitialized_def;
-  bool pattern = false;
   slp_oprnd_info oprnd_info;
   int first_op_idx = 1;
   unsigned int commutative_op = -1U;
   bool first_op_cond = false;
   bool first = stmt_num == 0;
-  bool second = stmt_num == 1;
 
   if (gcall *stmt = dyn_cast <gcall *> (stmt_info->stmt))
     {
@@ -418,13 +414,12 @@ again:
 	  return -1;
 	}
 
-      if (second)
-	oprnd_info->second_pattern = pattern;
+      if (def_stmt_info && is_pattern_stmt_p (def_stmt_info))
+	oprnd_info->any_pattern = true;
 
       if (first)
 	{
 	  oprnd_info->first_dt = dt;
-	  oprnd_info->first_pattern = pattern;
 	  oprnd_info->first_op_type = TREE_TYPE (oprnd);
 	}
       else
@@ -1311,7 +1306,7 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	      /* ???  Rejecting patterns this way doesn't work.  We'd have to
 		 do extra work to cancel the pattern so the uses see the
 		 scalar version.  */
-	      && !is_pattern_stmt_p (SLP_TREE_SCALAR_STMTS (child)[0]))
+	      && !oprnd_info->any_pattern)
 	    {
 	      slp_tree grandchild;
 
@@ -1358,7 +1353,8 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 	  /* ???  Rejecting patterns this way doesn't work.  We'd have to
 	     do extra work to cancel the pattern so the uses see the
 	     scalar version.  */
-	  && !is_pattern_stmt_p (stmt_info))
+	  && !is_pattern_stmt_p (stmt_info)
+	  && !oprnd_info->any_pattern)
 	{
 	  if (dump_enabled_p ())
 	    dump_printf_loc (MSG_NOTE, vect_location,
@@ -1447,7 +1443,7 @@ vect_build_slp_tree_2 (vec_info *vinfo,
 		  /* ???  Rejecting patterns this way doesn't work.  We'd have
 		     to do extra work to cancel the pattern so the uses see the
 		     scalar version.  */
-		  && !is_pattern_stmt_p (SLP_TREE_SCALAR_STMTS (child)[0]))
+		  && !oprnd_info->any_pattern)
 		{
 		  unsigned int j;
 		  slp_tree grandchild;
-- 
cgit v1.1


From 643c11a1f7407d694031b12d86fd6fc0fd5e9d10 Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje.gcc@gmail.com>
Date: Fri, 25 Oct 2019 14:03:11 +0000
Subject: pr70100.c: Add -mvsx.

        * gcc.target/powerpc/pr70100.c: Add -mvsx.
        Allow AIX ABI function name.

From-SVN: r277450
---
 gcc/testsuite/ChangeLog                    | 5 +++++
 gcc/testsuite/gcc.target/powerpc/pr70010.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4e0fedd..0b25ce9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-25  David Edelsohn  <dje.gcc@gmail.com>
+
+	* gcc.target/powerpc/pr70100.c: Add -mvsx.
+	Allow AIX ABI function name.
+
 2019-10-25  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92222
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010.c b/gcc/testsuite/gcc.target/powerpc/pr70010.c
index 0632358..679034f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70010.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -finline-functions -Wno-psabi" } */
-/* { dg-final { scan-assembler {\mbl vadd_no_vsx\M} } } */
+/* { dg-options "-O2 -finline-functions -Wno-psabi -mvsx" } */
+/* { dg-final { scan-assembler {\mbl \.?vadd_no_vsx\M} } } */
 
 typedef int vec_t __attribute__((vector_size(16)));
 
-- 
cgit v1.1


From ec0846134e08ed5f645db858385b385227ae5026 Mon Sep 17 00:00:00 2001
From: Cesar Philippidis <cesar@codesourcery.com>
Date: Fri, 25 Oct 2019 07:28:40 -0700
Subject: =?UTF-8?q?[Fortran]=20OpenACC=20=E2=80=93=20permit=20common=20blo?=
 =?UTF-8?q?cks=20in=20some=20clauses?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
	    Tobias Burnus  <tobias@codesourcery.com>

	gcc/fortran/
	* openmp.c (gfc_match_omp_map_clause): Add and pass allow_commons
	argument.
	(gfc_match_omp_clauses): Update calls to permit common blocks for
	OpenACC's copy/copyin/copyout, create/delete, host,
	pcopy/pcopy_in/pcopy_out, present_or_copy, present_or_copy_in,
	present_or_copy_out, present_or_create and self.

	gcc/
	* gimplify.c (oacc_default_clause): Privatize fortran common blocks.
	(omp_notice_variable): Defer the expansion of DECL_VALUE_EXPR for
	common block decls.

	gcc/testsuite/
	* gfortran.dg/goacc/common-block-1.f90: New test.
	* gfortran.dg/goacc/common-block-2.f90: New test.
	* gfortran.dg/goacc/common-block-3.f90: New test.

	libgomp/
	* testsuite/libgomp.oacc-fortran/common-block-1.f90: New test.
	* testsuite/libgomp.oacc-fortran/common-block-2.f90: New test.
	* testsuite/libgomp.oacc-fortran/common-block-3.f90: New test.

Reviewed-by: Thomas Schwinge <thomas@codesourcery.com>

Co-Authored-By: Tobias Burnus <tobias@codesourcery.com>

From-SVN: r277451
---
 gcc/ChangeLog                                      |  7 ++
 gcc/fortran/ChangeLog                              | 10 +++
 gcc/fortran/openmp.c                               | 41 ++++++------
 gcc/gimplify.c                                     | 51 ++++++++++++---
 gcc/testsuite/ChangeLog                            |  7 ++
 gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 | 74 ++++++++++++++++++++++
 gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 | 53 ++++++++++++++++
 gcc/testsuite/gfortran.dg/goacc/common-block-3.f90 | 39 ++++++++++++
 8 files changed, 254 insertions(+), 28 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/goacc/common-block-1.f90
 create mode 100644 gcc/testsuite/gfortran.dg/goacc/common-block-2.f90
 create mode 100644 gcc/testsuite/gfortran.dg/goacc/common-block-3.f90

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cef0a3f..1da576b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
+	    Tobias Burnus  <tobias@codesourcery.com>
+
+	* gimplify.c (oacc_default_clause): Privatize fortran common blocks.
+	(omp_notice_variable): Defer the expansion of DECL_VALUE_EXPR for
+	common block decls.
+
 2019-10-25  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/92222
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4e39102..d14d190 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
+	    Tobias Burnus  <tobias@codesourcery.com>
+
+	* openmp.c (gfc_match_omp_map_clause): Add and pass allow_commons
+	argument.
+	(gfc_match_omp_clauses): Update calls to permit common blocks for
+	OpenACC's copy/copyin/copyout, create/delete, host,
+	pcopy/pcopy_in/pcopy_out, present_or_copy, present_or_copy_in,
+	present_or_copy_out, present_or_create and self.
+
 2019-10-24  Martin Liska  <mliska@suse.cz>
 
 	PR fortran/92174
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 5c91fcd..ca34278 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -926,10 +926,11 @@ omp_inv_mask::omp_inv_mask (const omp_mask &m) : omp_mask (m)
    mapping.  */
 
 static bool
-gfc_match_omp_map_clause (gfc_omp_namelist **list, gfc_omp_map_op map_op)
+gfc_match_omp_map_clause (gfc_omp_namelist **list, gfc_omp_map_op map_op,
+			  bool allow_common)
 {
   gfc_omp_namelist **head = NULL;
-  if (gfc_match_omp_variable_list ("", list, false, NULL, &head, true)
+  if (gfc_match_omp_variable_list ("", list, allow_common, NULL, &head, true)
       == MATCH_YES)
     {
       gfc_omp_namelist *n;
@@ -1051,7 +1052,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_COPY)
 	      && gfc_match ("copy ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_TOFROM))
+					   OMP_MAP_TOFROM, true))
 	    continue;
 	  if (mask & OMP_CLAUSE_COPYIN)
 	    {
@@ -1059,7 +1060,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 		{
 		  if (gfc_match ("copyin ( ") == MATCH_YES
 		      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-						   OMP_MAP_TO))
+						   OMP_MAP_TO, true))
 		    continue;
 		}
 	      else if (gfc_match_omp_variable_list ("copyin (",
@@ -1070,7 +1071,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_COPYOUT)
 	      && gfc_match ("copyout ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FROM))
+					   OMP_MAP_FROM, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_COPYPRIVATE)
 	      && gfc_match_omp_variable_list ("copyprivate (",
@@ -1080,7 +1081,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_CREATE)
 	      && gfc_match ("create ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_ALLOC))
+					   OMP_MAP_ALLOC, true))
 	    continue;
 	  break;
 	case 'd':
@@ -1116,7 +1117,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_DELETE)
 	      && gfc_match ("delete ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_RELEASE))
+					   OMP_MAP_RELEASE, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_DEPEND)
 	      && gfc_match ("depend ( ") == MATCH_YES)
@@ -1168,12 +1169,12 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	      && openacc
 	      && gfc_match ("device ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FORCE_TO))
+					   OMP_MAP_FORCE_TO, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_DEVICEPTR)
 	      && gfc_match ("deviceptr ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FORCE_DEVICEPTR))
+					   OMP_MAP_FORCE_DEVICEPTR, false))
 	    continue;
 	  if ((mask & OMP_CLAUSE_DEVICE_RESIDENT)
 	      && gfc_match_omp_variable_list
@@ -1251,7 +1252,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_HOST_SELF)
 	      && gfc_match ("host ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FORCE_FROM))
+					   OMP_MAP_FORCE_FROM, true))
 	    continue;
 	  break;
 	case 'i':
@@ -1523,47 +1524,47 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_COPY)
 	      && gfc_match ("pcopy ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_TOFROM))
+					   OMP_MAP_TOFROM, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_COPYIN)
 	      && gfc_match ("pcopyin ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_TO))
+					   OMP_MAP_TO, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_COPYOUT)
 	      && gfc_match ("pcopyout ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FROM))
+					   OMP_MAP_FROM, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_CREATE)
 	      && gfc_match ("pcreate ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_ALLOC))
+					   OMP_MAP_ALLOC, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_PRESENT)
 	      && gfc_match ("present ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FORCE_PRESENT))
+					   OMP_MAP_FORCE_PRESENT, false))
 	    continue;
 	  if ((mask & OMP_CLAUSE_COPY)
 	      && gfc_match ("present_or_copy ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_TOFROM))
+					   OMP_MAP_TOFROM, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_COPYIN)
 	      && gfc_match ("present_or_copyin ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_TO))
+					   OMP_MAP_TO, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_COPYOUT)
 	      && gfc_match ("present_or_copyout ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FROM))
+					   OMP_MAP_FROM, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_CREATE)
 	      && gfc_match ("present_or_create ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_ALLOC))
+					   OMP_MAP_ALLOC, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_PRIORITY)
 	      && c->priority == NULL
@@ -1781,7 +1782,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	  if ((mask & OMP_CLAUSE_HOST_SELF)
 	      && gfc_match ("self ( ") == MATCH_YES
 	      && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-					   OMP_MAP_FORCE_FROM))
+					   OMP_MAP_FORCE_FROM, true))
 	    continue;
 	  if ((mask & OMP_CLAUSE_SEQ)
 	      && !c->seq
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 05ae2f1..fdf6b69 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -7227,15 +7227,28 @@ oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
 {
   const char *rkind;
   bool on_device = false;
+  bool is_private = false;
   bool declared = is_oacc_declared (decl);
   tree type = TREE_TYPE (decl);
 
   if (lang_hooks.decls.omp_privatize_by_reference (decl))
     type = TREE_TYPE (type);
 
+  /* For Fortran COMMON blocks, only used variables in those blocks are
+     transfered and remapped.  The block itself will have a private clause to
+     avoid transfering the data twice.
+     The hook evaluates to false by default.  For a variable in Fortran's COMMON
+     or EQUIVALENCE block, returns 'true' (as we have shared=false) - as only
+     the variables in such a COMMON/EQUIVALENCE block shall be privatized not
+     the whole block.  For C++ and Fortran, it can also be true under certain
+     other conditions, if DECL_HAS_VALUE_EXPR.  */
+  if (RECORD_OR_UNION_TYPE_P (type))
+    is_private = lang_hooks.decls.omp_disregard_value_expr (decl, false);
+
   if ((ctx->region_type & (ORT_ACC_PARALLEL | ORT_ACC_KERNELS)) != 0
       && is_global_var (decl)
-      && device_resident_p (decl))
+      && device_resident_p (decl)
+      && !is_private)
     {
       on_device = true;
       flags |= GOVD_MAP_TO_ONLY;
@@ -7246,7 +7259,9 @@ oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
     case ORT_ACC_KERNELS:
       rkind = "kernels";
 
-      if (AGGREGATE_TYPE_P (type))
+      if (is_private)
+	flags |= GOVD_FIRSTPRIVATE;
+      else if (AGGREGATE_TYPE_P (type))
 	{
 	  /* Aggregates default to 'present_or_copy', or 'present'.  */
 	  if (ctx->default_kind != OMP_CLAUSE_DEFAULT_PRESENT)
@@ -7263,7 +7278,9 @@ oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
     case ORT_ACC_PARALLEL:
       rkind = "parallel";
 
-      if (on_device || declared)
+      if (is_private)
+	flags |= GOVD_FIRSTPRIVATE;
+      else if (on_device || declared)
 	flags |= GOVD_MAP;
       else if (AGGREGATE_TYPE_P (type))
 	{
@@ -7327,10 +7344,18 @@ omp_notice_variable (struct gimplify_omp_ctx *ctx, tree decl, bool in_code)
 
       if (DECL_HAS_VALUE_EXPR_P (decl))
 	{
-	  tree value = get_base_address (DECL_VALUE_EXPR (decl));
+	  if (ctx->region_type & ORT_ACC)
+	    /* For OpenACC, defer expansion of value to avoid transfering
+	       privatized common block data instead of im-/explicitly transfered
+	       variables which are in common blocks.  */
+	    ;
+	  else
+	    {
+	      tree value = get_base_address (DECL_VALUE_EXPR (decl));
 
-	  if (value && DECL_P (value) && DECL_THREAD_LOCAL_P (value))
-	    return omp_notice_threadprivate_variable (ctx, decl, value);
+	      if (value && DECL_P (value) && DECL_THREAD_LOCAL_P (value))
+		return omp_notice_threadprivate_variable (ctx, decl, value);
+	    }
 	}
 
       if (gimplify_omp_ctxp->outer_context == NULL
@@ -7361,7 +7386,13 @@ omp_notice_variable (struct gimplify_omp_ctx *ctx, tree decl, bool in_code)
   n = splay_tree_lookup (ctx->variables, (splay_tree_key)decl);
   if ((ctx->region_type & ORT_TARGET) != 0)
     {
-      ret = lang_hooks.decls.omp_disregard_value_expr (decl, true);
+      if (ctx->region_type & ORT_ACC)
+	/* For OpenACC, as remarked above, defer expansion.  */
+	shared = false;
+      else
+	shared = true;
+
+      ret = lang_hooks.decls.omp_disregard_value_expr (decl, shared);
       if (n == NULL)
 	{
 	  unsigned nflags = flags;
@@ -7528,7 +7559,11 @@ omp_notice_variable (struct gimplify_omp_ctx *ctx, tree decl, bool in_code)
 	}
     }
 
-  shared = ((flags | n->value) & GOVD_SHARED) != 0;
+  if (ctx->region_type & ORT_ACC)
+    /* For OpenACC, as remarked above, defer expansion.  */
+    shared = false;
+  else
+    shared = ((flags | n->value) & GOVD_SHARED) != 0;
   ret = lang_hooks.decls.omp_disregard_value_expr (decl, shared);
 
   /* If nothing changed, there's nothing left to do.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0b25ce9..ddf575b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
+	    Tobias Burnus  <tobias@codesourcery.com>
+
+	* gfortran.dg/goacc/common-block-1.f90: New test.
+	* gfortran.dg/goacc/common-block-2.f90: New test.
+	* gfortran.dg/goacc/common-block-3.f90: New test.
+
 2019-10-25  David Edelsohn  <dje.gcc@gmail.com>
 
 	* gcc.target/powerpc/pr70100.c: Add -mvsx.
diff --git a/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90 b/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90
new file mode 100644
index 0000000..ea43752
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/common-block-1.f90
@@ -0,0 +1,74 @@
+! Test data clauses involving common blocks and common block data.
+! Specifically, validates early matching errors.
+
+subroutine subtest
+  implicit none
+  integer, parameter :: n = 10
+  integer a(n), b(n), c, d(n), e
+  real*4 x(n), y(n), z, w(n), v
+  common /blockA/ a, c, x
+  common /blockB/ b, y, z
+  !$acc declare link(/blockA/, /blockB/, e, v)
+end subroutine subtest
+
+program test
+  implicit none
+  integer, parameter :: n = 10
+  integer a(n), b(n), c, d(n), e
+  real*4 x(n), y(n), z, w(n), v
+  common /blockA/ a, c, x
+  common /blockB/ b, y, z
+
+  !$acc declare link(/blockA/, /blockB/, e, v)
+
+  !$acc data copy(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data copyin(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data copyout(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data create(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data copyout(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data pcopy(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data pcopyin(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data pcopyout(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data pcreate(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc data pcopyout(/blockA/, /blockB/, e, v)
+  !$acc end data
+
+  !$acc parallel private(/blockA/, /blockB/, e, v)
+  !$acc end parallel
+
+  !$acc parallel firstprivate(/blockA/, /blockB/, e, v)
+  !$acc update device(/blockA/)
+  !$acc update self(/blockB/, v)
+  !$acc update host(/blockA/, e, /blockB/)
+  !$acc end parallel
+
+  !$acc enter data pcopyin(/blockA/, /blockB/, e, v)
+  !$acc exit data delete(/blockA/, /blockB/, e, v)
+
+
+  ! No /block/ permitted in present and deviceptr:
+
+  !$acc data present(/blockA/, /blockB/, e, v) ! { dg-error "Syntax error in OpenMP variable list" }
+  !$acc end data ! { dg-error "Unexpected ..ACC END DATA statement" }
+
+  !$acc data deviceptr(/blockA/, /blockB/, e, v) ! { dg-error "Syntax error in OpenMP variable list" }
+  !$acc end data ! { dg-error "Unexpected ..ACC END DATA statement" }
+end program test
diff --git a/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90 b/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90
new file mode 100644
index 0000000..1ba9450
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/common-block-2.f90
@@ -0,0 +1,53 @@
+! Test data clauses involving common blocks and common block data.
+! Specifically, resolver errors such as duplicate data clauses.
+
+program test
+  implicit none
+  integer, parameter :: n = 10
+  integer a(n), b(n), c, d(n), e
+  real*4 x(n), y(n), z, w(n), v
+  common /blockA/ a, c, x
+  common /blockB/ b, y, z
+
+  !$acc data copy(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data copyin(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data copyout(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data create(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data copyout(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data pcopy(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data pcopyin(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data pcopyout(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data pcreate(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc data pcopyout(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end data
+
+  !$acc parallel private(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc end parallel
+
+  !$acc parallel firstprivate(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+  !$acc update device(b, /blockA/, x) ! { dg-error "Symbol .x. present on multiple clauses" }
+  !$acc update self(z, /blockB/, v) ! { dg-error "Symbol .z. present on multiple clauses" }
+  !$acc update host(/blockA/, c) ! { dg-error "Symbol .c. present on multiple clauses" }
+  !$acc end parallel
+
+  !$acc enter data copyin(/blockB/, e, v, a, c, y) ! { dg-error "Symbol .y. present on multiple clauses" }
+  !$acc exit data delete(/blockA/, /blockB/, e, v, a) ! { dg-error "Symbol .a. present on multiple clauses" }
+end program test
diff --git a/gcc/testsuite/gfortran.dg/goacc/common-block-3.f90 b/gcc/testsuite/gfortran.dg/goacc/common-block-3.f90
new file mode 100644
index 0000000..9032d93
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/common-block-3.f90
@@ -0,0 +1,39 @@
+! { dg-options "-fopenacc -fdump-tree-omplower" }
+
+module consts
+  integer, parameter :: n = 100
+end module consts
+
+program main
+  use consts
+  implicit none
+
+  integer :: i, j
+  real ::  a(n) = 0, b(n) = 0, c, d
+  real ::  x(n) = 0, y(n), z
+  common /BLOCK/ a, b, c, j, d
+  common /KERNELS_BLOCK/ x, y, z
+
+  c = 1.0
+  !$acc parallel loop copy(/BLOCK/)
+  do i = 1, n
+     a(i) = b(i) + c
+  end do
+  !$acc kernels
+  do i = 1, n
+     x(i) = y(i) + c
+  end do
+  !$acc end kernels
+end program main
+
+! { dg-final { scan-tree-dump-times "omp target oacc_parallel .*map\\(tofrom:a \\\[len: 400\\\]\\)" 1 "omplower" } }
+! { dg-final { scan-tree-dump-times "omp target oacc_parallel .*map\\(tofrom:b \\\[len: 400\\\]\\\)" 1 "omplower" } }
+! { dg-final { scan-tree-dump-times "omp target oacc_parallel .*map\\(tofrom:c \\\[len: 4\\\]\\)" 1 "omplower" } }
+
+! { dg-final { scan-tree-dump-times "omp target oacc_kernels .*map\\(force_tofrom:i \\\[len: 4\\\]\\)" 1 "omplower" } }
+! { dg-final { scan-tree-dump-times "omp target oacc_kernels .*map\\(tofrom:x \\\[len: 400\\\]\\)" 1 "omplower" } }
+! { dg-final { scan-tree-dump-times "omp target oacc_kernels .*map\\(tofrom:y \\\[len: 400\\\]\\\)" 1 "omplower" } }
+! { dg-final { scan-tree-dump-times "omp target oacc_kernels .*map\\(force_tofrom:c \\\[len: 4\\\]\\)" 1 "omplower" } }
+
+! { dg-final { scan-tree-dump-not "map\\(.*:block\\)" "omplower" } }
+! { dg-final { scan-tree-dump-not "map\\(.*:kernels_block\\)" "omplower" } }
-- 
cgit v1.1


From 2cd6630fc0218580f29e87ea418d9e435d062412 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Fri, 25 Oct 2019 15:13:23 +0000
Subject: re PR target/85969 (avr/gen-avr-mmcu-specs.c:56: unused function ?)

	PR target/85969
	* config/avr/gen-avr-mmcu-specs.c (str_prefix_p): Remove unused
	static function.

From-SVN: r277455
---
 gcc/ChangeLog                       | 6 ++++++
 gcc/config/avr/gen-avr-mmcu-specs.c | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1da576b..555cf54 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-18  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR target/85969
+	* config/avr/gen-avr-mmcu-specs.c (str_prefix_p): Remove unused
+	static function.
+
 2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
 	    Tobias Burnus  <tobias@codesourcery.com>
 
diff --git a/gcc/config/avr/gen-avr-mmcu-specs.c b/gcc/config/avr/gen-avr-mmcu-specs.c
index de861f4..b0a3870 100644
--- a/gcc/config/avr/gen-avr-mmcu-specs.c
+++ b/gcc/config/avr/gen-avr-mmcu-specs.c
@@ -50,14 +50,6 @@
 #define SPECFILE_USAGE_URL                              \
   "https://gcc.gnu.org/gcc-5/changes.html"
 
-/* Return true iff STR starts with PREFIX.  */
-
-static bool
-str_prefix_p (const char *str, const char *prefix)
-{
-  return strncmp (str, prefix, strlen (prefix)) == 0;
-}
-
 
 static const char header[] =
   "#\n"
-- 
cgit v1.1


From 9bdc2a8f06cef54650798fcb4c343e4415fd5992 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Fri, 25 Oct 2019 19:11:58 +0000
Subject: PR c++/91581 - ICE in exception-specification of defaulted ctor.

	* g++.dg/cpp0x/noexcept55.C: New test.

From-SVN: r277462
---
 gcc/testsuite/ChangeLog                 | 5 +++++
 gcc/testsuite/g++.dg/cpp0x/noexcept55.C | 8 ++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept55.C

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ddf575b..38ac851 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-25  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91581 - ICE in exception-specification of defaulted ctor.
+	* g++.dg/cpp0x/noexcept55.C: New test.
+
 2019-10-25  Cesar Philippidis <cesar@codesourcery.com>
 	    Tobias Burnus  <tobias@codesourcery.com>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept55.C b/gcc/testsuite/g++.dg/cpp0x/noexcept55.C
new file mode 100644
index 0000000..f46320d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept55.C
@@ -0,0 +1,8 @@
+// PR c++/91581 - ICE in exception-specification of defaulted ctor.
+// { dg-do compile { target c++11 } }
+
+struct A {
+    A() noexcept(sizeof(A)) = default;
+};
+
+A a;
-- 
cgit v1.1