From 12d0e3aa63ba77172a9d824294d2509ff78f2342 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Tue, 31 Oct 2017 13:09:09 -0400
Subject: [PATCH] constexpr.c, pt.c: Adjust comments.

	* constexpr.c, pt.c: Adjust comments.

	* g++.dg/cpp1y/lambda-generic-69078-1.C: Remove #include.

From-SVN: r254272
---
 gcc/cp/constexpr.c                                  | 3 +--
 gcc/cp/pt.c                                         | 4 ++--
 gcc/testsuite/g++.dg/cpp1y/lambda-generic-69078-1.C | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 5919282..483f731 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1269,8 +1269,7 @@ cxx_bind_parameters_in_call (const constexpr_ctx *ctx, tree t,
 	{
 	  x = ctx->object;
 	  /* We don't use cp_build_addr_expr here because we don't want to
-	     capture the object argument until we've chosen a non-static member
-	     function.  */
+	     capture the object argument during constexpr evaluation.  */
 	  x = build_address (x);
 	}
       bool lval = false;
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8b89ca9..326be33 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5564,7 +5564,7 @@ push_template_decl_real (tree decl, bool is_friend)
 	  (TI_ARGS (tinfo),
 	   TI_ARGS (get_template_info (DECL_TEMPLATE_RESULT (tmpl)))))
 	{
-	  error ("template arguments to %qD do not match original"
+	  error ("template arguments to %qD do not match original "
 		 "template %qD", decl, DECL_TEMPLATE_RESULT (tmpl));
 	  if (!uses_template_parms (TI_ARGS (tinfo)))
 	    inform (input_location, "use %<template<>%> for"
@@ -12195,7 +12195,7 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain,
 	 We also deal with the peculiar case:
 
 	 template <class T> struct S {
-	 template <class U> friend void f();
+	   template <class U> friend void f();
 	 };
 	 template <class U> void f() {}
 	 template S<int>;
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-69078-1.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-69078-1.C
index dc045c7..3f10f82 100644
--- a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-69078-1.C
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-69078-1.C
@@ -2,8 +2,6 @@
 // { dg-do run { target c++14 } }
 // { dg-options "-Wall" }
 
-#include <cassert>
-
 struct Class {
     Class(void (*_param)()) : data(_param) {}
     void (*data)();
@@ -15,7 +13,7 @@ void funUser(void (*test)(int)) {
 
 void user(Class& c, int i) {
     (void)i;
-    assert (c.data);
+    if (!c.data) __builtin_abort();
 }
 
 void probe() {}
-- 
2.7.4