diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0294-semantics.c-validate_constexpr_fundecl-Check-DECL_TE.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0294-semantics.c-validate_constexpr_fundecl-Check-DECL_TE.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0294-semantics.c-validate_constexpr_fundecl-Check-DECL_TE.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0294-semantics.c-validate_constexpr_fundecl-Check-DECL_TE.patch new file mode 100644 index 0000000000..1ab94454a6 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0294-semantics.c-validate_constexpr_fundecl-Check-DECL_TE.patch @@ -0,0 +1,42 @@ +From d633704af54cbca1991f0d2c7fc75ffadfc95cdc Mon Sep 17 00:00:00 2001 +From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri, 20 May 2011 19:02:33 +0000 +Subject: [PATCH] * semantics.c (validate_constexpr_fundecl): Check DECL_TEMPLATE_INFO + rather than DECL_TEMPLATE_INSTANTIATION. + (cxx_eval_call_expression): Likewise. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@173974 138bc75d-0d04-0410-961f-82ee72b054a4 + +index d019728..6083376 100644 +--- a/gcc/cp/semantics.c ++++ b/gcc/cp/semantics.c +@@ -5465,7 +5465,7 @@ validate_constexpr_fundecl (tree fun) + /* We already checked the original function. */ + return fun; + +- if (!is_valid_constexpr_fn (fun, !DECL_TEMPLATE_INSTANTIATION (fun))) ++ if (!is_valid_constexpr_fn (fun, !DECL_TEMPLATE_INFO (fun))) + { + DECL_DECLARED_CONSTEXPR_P (fun) = false; + return NULL; +@@ -5689,7 +5689,7 @@ register_constexpr_fundef (tree fun, tree body) + if (!potential_rvalue_constant_expression (body)) + { + DECL_DECLARED_CONSTEXPR_P (fun) = false; +- if (!DECL_TEMPLATE_INSTANTIATION (fun)) ++ if (!DECL_TEMPLATE_INFO (fun)) + require_potential_rvalue_constant_expression (body); + return NULL; + } +@@ -6033,7 +6033,7 @@ cxx_eval_call_expression (const constexpr_call *old_call, tree t, + if (!allow_non_constant) + { + error_at (loc, "%qD is not a constexpr function", fun); +- if (DECL_TEMPLATE_INSTANTIATION (fun) ++ if (DECL_TEMPLATE_INFO (fun) + && DECL_DECLARED_CONSTEXPR_P (DECL_TEMPLATE_RESULT + (DECL_TI_TEMPLATE (fun)))) + is_valid_constexpr_fn (fun, true); +-- +1.7.0.4 + |