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

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 59192829d7125641643408ffe3dc4c2fbf407fba..483f731a49ae33f21ab1c353fb008337ef1fe9ac 100644 (file)
--- 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 8b89ca9054345e2776a4480e0c9c7a833d3b1f0e..326be334d3b4f79a3dbcccda89df9efd85fc0687 100644 (file)
--- 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 dc045c7206567d2e82d503e67d9e52e406fe57f1..3f10f82672d2febce2f1881676e19f073a357afe 100644 (file)
--- 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() {}