aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2016-10-06 23:17:44 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2016-10-06 23:17:44 +0200
commit342cfb3e736afcc7397b4199a4c96fb602f5d68b (patch)
tree929fde67393ba802b4a3a959513ec79e9a076407 /gcc/cp
parent480570898d36d1d8e29d2adb35bc7eb46b876092 (diff)
downloadgcc-342cfb3e736afcc7397b4199a4c96fb602f5d68b.zip
gcc-342cfb3e736afcc7397b4199a4c96fb602f5d68b.tar.gz
gcc-342cfb3e736afcc7397b4199a4c96fb602f5d68b.tar.bz2
Implement P0258R2 - helper for C++17 std::has_unique_object_representations trait c-family/
Implement P0258R2 - helper for C++17 std::has_unique_object_representations trait c-family/ * c-common.h (enum rid): Add RID_HAS_UNIQUE_OBJ_REPRESENTATIONS. * c-common.c (c_common_reswords): Add __has_unique_object_representations. cp/ * cp-tree.h (enum cp_trait_kind): Add CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS. (struct lang_type_class): Add unique_obj_representations and unique_obj_representations_set bitfields. (CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS, CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS_SET): Define. (type_has_unique_obj_representations): Declare. * parser.c (cp_parser_primary_expression): Handle RID_HAS_UNIQUE_OBJ_REPRESENTATIONS. (cp_parser_trait_expr): Likewise. Formatting fix. * semantics.c (trait_expr_value, finish_trait_expr): Handle CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS. * tree.c (type_has_unique_obj_representations): New function. (record_has_unique_obj_representations): New function. * cxx-pretty-print.c (pp_cxx_trait_expression): Handle CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS. testsuite/ * g++.dg/cpp1z/has-unique-obj-representations1.C: New test. * g++.dg/cpp1z/has-unique-obj-representations2.C: New test. From-SVN: r240843
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog21
-rw-r--r--gcc/cp/cp-tree.h16
-rw-r--r--gcc/cp/cxx-pretty-print.c3
-rw-r--r--gcc/cp/parser.c6
-rw-r--r--gcc/cp/semantics.c4
-rw-r--r--gcc/cp/tree.c144
6 files changed, 192 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7bd7db6..008d646 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,24 @@
+2016-10-06 Jakub Jelinek <jakub@redhat.com>
+
+ Implement P0258R2 - helper for C++17
+ std::has_unique_object_representations trait
+ * cp-tree.h (enum cp_trait_kind): Add
+ CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS.
+ (struct lang_type_class): Add unique_obj_representations
+ and unique_obj_representations_set bitfields.
+ (CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS,
+ CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS_SET): Define.
+ (type_has_unique_obj_representations): Declare.
+ * parser.c (cp_parser_primary_expression): Handle
+ RID_HAS_UNIQUE_OBJ_REPRESENTATIONS.
+ (cp_parser_trait_expr): Likewise. Formatting fix.
+ * semantics.c (trait_expr_value, finish_trait_expr): Handle
+ CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS.
+ * tree.c (type_has_unique_obj_representations): New function.
+ (record_has_unique_obj_representations): New function.
+ * cxx-pretty-print.c (pp_cxx_trait_expression): Handle
+ CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS.
+
2016-10-05 Jason Merrill <jason@redhat.com>
Implement P0135R1, Guaranteed copy elision.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 92e4017..49cbdf2 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -723,6 +723,7 @@ enum cp_trait_kind
CPTK_HAS_TRIVIAL_CONSTRUCTOR,
CPTK_HAS_TRIVIAL_COPY,
CPTK_HAS_TRIVIAL_DESTRUCTOR,
+ CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS,
CPTK_HAS_VIRTUAL_DESTRUCTOR,
CPTK_IS_ABSTRACT,
CPTK_IS_BASE_OF,
@@ -1713,6 +1714,8 @@ struct GTY(()) lang_type_class {
unsigned has_complex_move_ctor : 1;
unsigned has_complex_move_assign : 1;
unsigned has_constexpr_ctor : 1;
+ unsigned unique_obj_representations : 1;
+ unsigned unique_obj_representations_set : 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
@@ -1721,7 +1724,7 @@ struct GTY(()) lang_type_class {
/* 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 : 4;
+ unsigned dummy : 2;
tree primary_base;
vec<tree_pair_s, va_gc> *vcall_indices;
@@ -2010,6 +2013,16 @@ struct GTY(()) lang_type {
#define CLASSTYPE_NON_STD_LAYOUT(NODE) \
(LANG_TYPE_CLASS_CHECK (NODE)->non_std_layout)
+/* Nonzero means that this class type does have unique object
+ representations. */
+#define CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS(NODE) \
+ (LANG_TYPE_CLASS_CHECK (NODE)->unique_obj_representations)
+
+/* Nonzero means that this class type has
+ CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS computed. */
+#define CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS_SET(NODE) \
+ (LANG_TYPE_CLASS_CHECK (NODE)->unique_obj_representations_set)
+
/* Nonzero means that this class contains pod types whose default
initialization is not a zero initialization (namely, pointers to
data members). */
@@ -6480,6 +6493,7 @@ extern bool layout_pod_type_p (const_tree);
extern bool std_layout_type_p (const_tree);
extern bool trivial_type_p (const_tree);
extern bool trivially_copyable_p (const_tree);
+extern bool type_has_unique_obj_representations (const_tree);
extern bool scalarish_type_p (const_tree);
extern bool type_has_nontrivial_default_init (const_tree);
extern bool type_has_nontrivial_copy_init (const_tree);
diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index a290c87..68dcf58 100644
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -2561,6 +2561,9 @@ pp_cxx_trait_expression (cxx_pretty_printer *pp, tree t)
case CPTK_HAS_TRIVIAL_DESTRUCTOR:
pp_cxx_ws_string (pp, "__has_trivial_destructor");
break;
+ case CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS:
+ pp_cxx_ws_string (pp, "__has_unique_object_representations");
+ break;
case CPTK_HAS_VIRTUAL_DESTRUCTOR:
pp_cxx_ws_string (pp, "__has_virtual_destructor");
break;
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 60bbf49..c2bd442 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -5110,6 +5110,7 @@ cp_parser_primary_expression (cp_parser *parser,
case RID_HAS_TRIVIAL_CONSTRUCTOR:
case RID_HAS_TRIVIAL_COPY:
case RID_HAS_TRIVIAL_DESTRUCTOR:
+ case RID_HAS_UNIQUE_OBJ_REPRESENTATIONS:
case RID_HAS_VIRTUAL_DESTRUCTOR:
case RID_IS_ABSTRACT:
case RID_IS_BASE_OF:
@@ -9521,6 +9522,9 @@ cp_parser_trait_expr (cp_parser* parser, enum rid keyword)
case RID_HAS_TRIVIAL_DESTRUCTOR:
kind = CPTK_HAS_TRIVIAL_DESTRUCTOR;
break;
+ case RID_HAS_UNIQUE_OBJ_REPRESENTATIONS:
+ kind = CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS;
+ break;
case RID_HAS_VIRTUAL_DESTRUCTOR:
kind = CPTK_HAS_VIRTUAL_DESTRUCTOR;
break;
@@ -9635,7 +9639,7 @@ cp_parser_trait_expr (cp_parser* parser, enum rid keyword)
/* Complete the trait expression, which may mean either processing
the trait expr now or saving it for template instantiation. */
- switch(kind)
+ switch (kind)
{
case CPTK_UNDERLYING_TYPE:
return finish_underlying_type (type1);
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 1b19f60..968f88b 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -9092,6 +9092,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_HAS_VIRTUAL_DESTRUCTOR:
return type_has_virtual_destructor (type1);
+ case CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS:
+ return type_has_unique_obj_representations (type1);
+
case CPTK_IS_ABSTRACT:
return (ABSTRACT_CLASS_TYPE_P (type1));
@@ -9199,6 +9202,7 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2)
case CPTK_HAS_NOTHROW_COPY:
case CPTK_HAS_TRIVIAL_COPY:
case CPTK_HAS_TRIVIAL_DESTRUCTOR:
+ case CPTK_HAS_UNIQUE_OBJ_REPRESENTATIONS:
case CPTK_HAS_VIRTUAL_DESTRUCTOR:
case CPTK_IS_ABSTRACT:
case CPTK_IS_EMPTY:
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index c3853e3..03eef00 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -3575,6 +3575,150 @@ std_layout_type_p (const_tree t)
return scalarish_type_p (t);
}
+static bool record_has_unique_obj_representations (const_tree, const_tree);
+
+/* Returns true iff T satisfies std::has_unique_object_representations<T>,
+ as defined in [meta.unary.prop]. */
+
+bool
+type_has_unique_obj_representations (const_tree t)
+{
+ bool ret;
+
+ t = strip_array_types (CONST_CAST_TREE (t));
+
+ if (!trivially_copyable_p (t))
+ return false;
+
+ if (CLASS_TYPE_P (t) && CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS_SET (t))
+ return CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS (t);
+
+ switch (TREE_CODE (t))
+ {
+ case INTEGER_TYPE:
+ case POINTER_TYPE:
+ case REFERENCE_TYPE:
+ /* If some backend has any paddings in these types, we should add
+ a target hook for this and handle it there. */
+ return true;
+
+ case BOOLEAN_TYPE:
+ /* For bool values other than 0 and 1 should only appear with
+ undefined behavior. */
+ return true;
+
+ case ENUMERAL_TYPE:
+ return type_has_unique_obj_representations (ENUM_UNDERLYING_TYPE (t));
+
+ case REAL_TYPE:
+ /* XFmode certainly contains padding on x86, which the CPU doesn't store
+ when storing long double values, so for that we have to return false.
+ Other kinds of floating point values are questionable due to +.0/-.0
+ and NaNs, let's play safe for now. */
+ return false;
+
+ case FIXED_POINT_TYPE:
+ return false;
+
+ case OFFSET_TYPE:
+ return true;
+
+ case COMPLEX_TYPE:
+ case VECTOR_TYPE:
+ return type_has_unique_obj_representations (TREE_TYPE (t));
+
+ case RECORD_TYPE:
+ ret = record_has_unique_obj_representations (t, TYPE_SIZE (t));
+ if (CLASS_TYPE_P (t))
+ {
+ CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS_SET (t) = 1;
+ CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS (t) = ret;
+ }
+ return ret;
+
+ case UNION_TYPE:
+ ret = true;
+ bool any_fields;
+ any_fields = false;
+ for (tree field = TYPE_FIELDS (t); field; field = DECL_CHAIN (field))
+ if (TREE_CODE (field) == FIELD_DECL)
+ {
+ any_fields = true;
+ if (!type_has_unique_obj_representations (TREE_TYPE (field))
+ || simple_cst_equal (DECL_SIZE (field), TYPE_SIZE (t)) != 1)
+ {
+ ret = false;
+ break;
+ }
+ }
+ if (!any_fields && !integer_zerop (TYPE_SIZE (t)))
+ ret = false;
+ if (CLASS_TYPE_P (t))
+ {
+ CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS_SET (t) = 1;
+ CLASSTYPE_UNIQUE_OBJ_REPRESENTATIONS (t) = ret;
+ }
+ return ret;
+
+ case NULLPTR_TYPE:
+ return false;
+
+ case ERROR_MARK:
+ return false;
+
+ default:
+ gcc_unreachable ();
+ }
+}
+
+/* Helper function for type_has_unique_obj_representations. */
+
+static bool
+record_has_unique_obj_representations (const_tree t, const_tree sz)
+{
+ for (tree field = TYPE_FIELDS (t); field; field = DECL_CHAIN (field))
+ if (TREE_CODE (field) != FIELD_DECL)
+ ;
+ /* For bases, can't use type_has_unique_obj_representations here, as in
+ struct S { int i : 24; S (); };
+ struct T : public S { int j : 8; T (); };
+ S doesn't have unique obj representations, but T does. */
+ else if (DECL_FIELD_IS_BASE (field))
+ {
+ if (!record_has_unique_obj_representations (TREE_TYPE (field),
+ DECL_SIZE (field)))
+ return false;
+ }
+ else if (DECL_C_BIT_FIELD (field))
+ {
+ tree btype = DECL_BIT_FIELD_TYPE (field);
+ if (!type_has_unique_obj_representations (btype))
+ return false;
+ }
+ else if (!type_has_unique_obj_representations (TREE_TYPE (field)))
+ return false;
+
+ offset_int cur = 0;
+ for (tree field = TYPE_FIELDS (t); field; field = DECL_CHAIN (field))
+ if (TREE_CODE (field) == FIELD_DECL)
+ {
+ offset_int fld = wi::to_offset (DECL_FIELD_OFFSET (field));
+ offset_int bitpos = wi::to_offset (DECL_FIELD_BIT_OFFSET (field));
+ fld = fld * BITS_PER_UNIT + bitpos;
+ if (cur != fld)
+ return false;
+ if (DECL_SIZE (field))
+ {
+ offset_int size = wi::to_offset (DECL_SIZE (field));
+ cur += size;
+ }
+ }
+ if (cur != wi::to_offset (sz))
+ return false;
+
+ return true;
+}
+
/* Nonzero iff type T is a class template implicit specialization. */
bool