* tree.h (TYPE_FINAL_P, DECL_FINAL_P): New macros.
(tree_decl_with_vis): Add FINAL field.
* cp-tree.h (struct lang_type_class): Free is_final bit.
(CLASSTYPE_FINAL): Define using TYPE_FINAL_P.
(DECL_FINAL_P): Remove.
* pt.c (instantiate_class_template_1): Guard that CLASSTYPE_FINAL
is called on CLASS_TYPE_P.
From-SVN: r201975
+2013-08-23 Jan Hubicka <jh@suse.cz>
+
+ * tree.h (TYPE_FINAL_P, DECL_FINAL_P): New macros.
+ (tree_decl_with_vis): Add FINAL field.
+
2013-08-23 Jeff Law <law@redhat.com>
* tree-ssa-pre.c (do_regular_insertion): Include the expression in
+2013-08-23 Jan Hubicka <jh@suse.cz>
+
+ * cp-tree.h (struct lang_type_class): Free is_final bit.
+ (CLASSTYPE_FINAL): Define using TYPE_FINAL_P.
+ (DECL_FINAL_P): Remove.
+ * pt.c (instantiate_class_template_1): Guard that CLASSTYPE_FINAL
+ is called on CLASS_TYPE_P.
+
2013-08-25 Gabriel Dos Reis <gdr@integrable-solutions.net>
* cxx-pretty-print.c (M_): Remove.
unsigned has_complex_move_ctor : 1;
unsigned has_complex_move_assign : 1;
unsigned has_constexpr_ctor : 1;
- unsigned is_final : 1;
/* When adding a flag here, consider whether or not it ought to
apply to a template instance if it applies to the template. If
/* There are some bits left to fill out a 32-bit word. Keep track
of this by updating the size of this bitfield whenever you add or
remove a flag. */
- unsigned dummy : 2;
+ unsigned dummy : 3;
tree primary_base;
vec<tree_pair_s, va_gc> *vcall_indices;
/* Nonzero means that NODE (a class type) is final */
#define CLASSTYPE_FINAL(NODE) \
- (LANG_TYPE_CLASS_CHECK (NODE)->is_final)
+ TYPE_FINAL_P (NODE)
/* Nonzero means that this _CLASSTYPE node overloads operator=(X&). */
an override virt-specifier */
#define DECL_OVERRIDE_P(NODE) (TREE_LANG_FLAG_0 (NODE))
-/* True (in a FUNCTION_DECL) if NODE is a function declared with
- a final virt-specifier */
-#define DECL_FINAL_P(NODE) (TREE_LANG_FLAG_1 (NODE))
-
/* The thunks associated with NODE, a FUNCTION_DECL. */
#define DECL_THUNKS(NODE) \
(DECL_VIRTUAL_P (NODE) ? LANG_DECL_FN_CHECK (NODE)->context : NULL_TREE)
/* Adjust visibility for template arguments. */
determine_visibility (TYPE_MAIN_DECL (type));
}
- CLASSTYPE_FINAL (type) = CLASSTYPE_FINAL (pattern);
+ if (CLASS_TYPE_P (type))
+ CLASSTYPE_FINAL (type) = CLASSTYPE_FINAL (pattern);
pbinfo = TYPE_BINFO (pattern);
DECL_NONLOCAL_FRAME in
VAR_DECL
+
+ TYPE_FINAL_P in
+ RECORD_TYPE, UNION_TYPE and QUAL_UNION_TYPE
*/
struct GTY(()) tree_typed {
#define TYPE_CONTAINS_PLACEHOLDER_INTERNAL(NODE) \
(TYPE_CHECK (NODE)->type_common.contains_placeholder_bits)
+/* Nonzero if RECORD_TYPE represents a final derivation of class. */
+#define TYPE_FINAL_P(NODE) \
+ (RECORD_OR_UNION_CHECK (NODE)->base.default_def_flag)
+
/* The debug output functions use the symtab union field to store
information specific to the debugging format. The different debug
output hooks store different types in the union field. These three
unsigned init_priority_p : 1;
/* Used by C++ only. Might become a generic decl flag. */
unsigned shadowed_for_var_p : 1;
- /* 14 unused bits. */
+ /* Belong to FUNCTION_DECL exclusively. */
+ unsigned final : 1;
+ /* 13 unused bits. */
};
extern tree decl_debug_expr_lookup (tree);
#define DECL_FUNCTION_VERSIONED(NODE)\
(FUNCTION_DECL_CHECK (NODE)->function_decl.versioned_function)
+/* In FUNCTION_DECL that represent an virtual method this is set when
+ the method is final. */
+#define DECL_FINAL_P(NODE)\
+ (FUNCTION_DECL_CHECK (NODE)->decl_with_vis.final)
+
/* FUNCTION_DECL inherits from DECL_NON_COMMON because of the use of the
arguments/result/saved_tree fields by front ends. It was either inherit
FUNCTION_DECL from non_common, or inherit non_common from FUNCTION_DECL,