Various small fixes.

	* lambda.c (build_lambda_object): Check for error_mark_node.
	* pt.c (make_pack_expansion): Set PACK_EXPANSION_LOCAL_P on the type
	pack as well.
	(tsubst_decl) [FUNCTION_DECL]: Set DECL_CONTEXT on the parameters.
	(tsubst) [TEMPLATE_PARM_INDEX]: Check for error_mark_node.

From-SVN: r251428

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a60f2ad9679ef959220076b9f1a8e2e2509ff2d2..08a8ac8c1b79ab684e5e69e40a19f6209d8a4be2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2017-08-23  Jason Merrill  <jason@redhat.com>
+
+       * lambda.c (build_lambda_object): Check for error_mark_node.
+       * pt.c (make_pack_expansion): Set PACK_EXPANSION_LOCAL_P on the type
+       pack as well.
+       (tsubst_decl) [FUNCTION_DECL]: Set DECL_CONTEXT on the parameters.
+       (tsubst) [TEMPLATE_PARM_INDEX]: Check for error_mark_node.
+
 2017-08-29  Jason Merrill  <jason@redhat.com>
 
        PR c++/80767 - unnecessary instantiation of generic lambda

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 8cfc5a455c1958210e447dc1ff3430c10b85cd35..daeec9dedbcdc9970da9f4ca42ba82fb7c9df0c6 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1458,7 +1458,8 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
     {
       if (!ctx->quiet)
        {
-         error_at (loc, "call to non-constexpr function %qD", fun);
+         if (!lambda_static_thunk_p (fun))
+           error_at (loc, "call to non-constexpr function %qD", fun);
          explain_invalid_constexpr_fn (fun);
        }
       *non_constant_p = true;

diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 14ff6c2ae43c0e941fd106da46408a281c203108..337b9ee3c6218f50e1595877bc742ed2e5ba5219 100644 (file)
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -59,7 +59,7 @@ build_lambda_object (tree lambda_expr)
   tree node, expr, type;
   location_t saved_loc;
 
-  if (processing_template_decl)
+  if (processing_template_decl || lambda_expr == error_mark_node)
     return lambda_expr;
 
   /* Make sure any error messages refer to the lambda-introducer.  */

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 416d17b5d18e4dfce7ad35b8e18ebc45c7bd3553..aaae06d96c7250d3216e80183d9bdca841c0aa7a 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3773,6 +3773,7 @@ make_pack_expansion (tree arg)
       purpose = cxx_make_type (TYPE_PACK_EXPANSION);
       SET_PACK_EXPANSION_PATTERN (purpose, TREE_PURPOSE (arg));
       PACK_EXPANSION_PARAMETER_PACKS (purpose) = parameter_packs;
+      PACK_EXPANSION_LOCAL_P (purpose) = at_function_scope_p ();
 
       /* Just use structural equality for these TYPE_PACK_EXPANSIONS;
         they will rarely be compared to anything.  */
@@ -9535,6 +9536,7 @@ static inline bool
 neglectable_inst_p (tree d)
 {
   return (DECL_P (d)
+         && !undeduced_auto_decl (d)
          && !(TREE_CODE (d) == FUNCTION_DECL ? DECL_DECLARED_CONSTEXPR_P (d)
               : decl_maybe_constant_var_p (d)));
 }
@@ -12413,6 +12415,8 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
 
        DECL_ARGUMENTS (r) = tsubst (DECL_ARGUMENTS (t), args,
                                     complain, t);
+       for (tree parm = DECL_ARGUMENTS (r); parm; parm = DECL_CHAIN (parm))
+         DECL_CONTEXT (parm) = r;
        DECL_RESULT (r) = NULL_TREE;
 
        TREE_STATIC (r) = 0;
@@ -13786,6 +13790,8 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
               couldn't do it earlier because it might be an auto parameter,
               and we wouldn't need to if we had an argument.  */
            type = tsubst (type, args, complain, in_decl);
+           if (type == error_mark_node)
+             return error_mark_node;
            r = reduce_template_parm_level (t, type, levels, args, complain);
            break;