diff options
Diffstat (limited to 'meta-oe/recipes-devtools/gcc/gcc-4.6/gcc-4_6-branch-backports/0293-semantics.c-register_constexpr_fundef-Add-to-hash-ta.patch')
-rw-r--r-- | meta-oe/recipes-devtools/gcc/gcc-4.6/gcc-4_6-branch-backports/0293-semantics.c-register_constexpr_fundef-Add-to-hash-ta.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/gcc-4_6-branch-backports/0293-semantics.c-register_constexpr_fundef-Add-to-hash-ta.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/gcc-4_6-branch-backports/0293-semantics.c-register_constexpr_fundef-Add-to-hash-ta.patch deleted file mode 100644 index f9562dd09a..0000000000 --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/gcc-4_6-branch-backports/0293-semantics.c-register_constexpr_fundef-Add-to-hash-ta.patch +++ /dev/null @@ -1,81 +0,0 @@ -From cde341fe28d4f20956c917ac3f63f5be8d41a246 Mon Sep 17 00:00:00 2001 -From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Fri, 20 May 2011 19:02:26 +0000 -Subject: [PATCH] * semantics.c (register_constexpr_fundef): Add to hash table here. - (validate_constexpr_fundecl): Not here. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@173973 138bc75d-0d04-0410-961f-82ee72b054a4 - -index 48b37cf..d019728 100644 ---- a/gcc/cp/semantics.c -+++ b/gcc/cp/semantics.c -@@ -5459,9 +5459,6 @@ is_valid_constexpr_fn (tree fun, bool complain) - tree - validate_constexpr_fundecl (tree fun) - { -- constexpr_fundef entry; -- constexpr_fundef **slot; -- - if (processing_template_decl || !DECL_DECLARED_CONSTEXPR_P (fun)) - return NULL; - else if (DECL_CLONED_FUNCTION_P (fun)) -@@ -5474,21 +5471,6 @@ validate_constexpr_fundecl (tree fun) - return NULL; - } - -- /* Create the constexpr function table if necessary. */ -- if (constexpr_fundef_table == NULL) -- constexpr_fundef_table = htab_create_ggc (101, -- constexpr_fundef_hash, -- constexpr_fundef_equal, -- ggc_free); -- entry.decl = fun; -- entry.body = NULL; -- slot = (constexpr_fundef **) -- htab_find_slot (constexpr_fundef_table, &entry, INSERT); -- if (*slot == NULL) -- { -- *slot = ggc_alloc_constexpr_fundef (); -- **slot = entry; -- } - return fun; - } - -@@ -5679,8 +5661,8 @@ build_constexpr_constructor_member_initializers (tree type, tree body) - tree - register_constexpr_fundef (tree fun, tree body) - { -- constexpr_fundef *fundef = retrieve_constexpr_fundef (fun); -- gcc_assert (fundef != NULL && fundef->body == NULL); -+ constexpr_fundef entry; -+ constexpr_fundef **slot; - - if (DECL_CONSTRUCTOR_P (fun)) - body = build_constexpr_constructor_member_initializers -@@ -5711,7 +5693,22 @@ register_constexpr_fundef (tree fun, tree body) - require_potential_rvalue_constant_expression (body); - return NULL; - } -- fundef->body = body; -+ -+ /* Create the constexpr function table if necessary. */ -+ if (constexpr_fundef_table == NULL) -+ constexpr_fundef_table = htab_create_ggc (101, -+ constexpr_fundef_hash, -+ constexpr_fundef_equal, -+ ggc_free); -+ entry.decl = fun; -+ entry.body = body; -+ slot = (constexpr_fundef **) -+ htab_find_slot (constexpr_fundef_table, &entry, INSERT); -+ -+ gcc_assert (*slot == NULL); -+ *slot = ggc_alloc_constexpr_fundef (); -+ **slot = entry; -+ - return fun; - } - --- -1.7.0.4 - |