diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a720103fb85..a4288334fb1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2008-01-22 Jakub Jelinek + PR c++/34914 + * c-common.c (handle_vector_size_attribute): Only allow + integral, scalar float and fixed point types. Handle OFFSET_TYPE + the same way as pointer, array etc. types. + * tree.c (reconstruct_complex_type): Handle OFFSET_TYPE. + PR c++/34917 * tree.c (build_type_attribute_qual_variant): Call build_qualified_type if attributes are equal, but quals are not. diff --git a/gcc/c-common.c b/gcc/c-common.c index 4e5d24c6fd2..1ba5c785c79 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -6031,15 +6031,16 @@ handle_vector_size_attribute (tree *node, tree name, tree args, while (POINTER_TYPE_P (type) || TREE_CODE (type) == FUNCTION_TYPE || TREE_CODE (type) == METHOD_TYPE - || TREE_CODE (type) == ARRAY_TYPE) + || TREE_CODE (type) == ARRAY_TYPE + || TREE_CODE (type) == OFFSET_TYPE) type = TREE_TYPE (type); /* Get the mode of the type being modified. */ orig_mode = TYPE_MODE (type); - if (TREE_CODE (type) == RECORD_TYPE - || TREE_CODE (type) == UNION_TYPE - || TREE_CODE (type) == VECTOR_TYPE + if ((!INTEGRAL_TYPE_P (type) + && !SCALAR_FLOAT_TYPE_P (type) + && !FIXED_POINT_TYPE_P (type)) || (!SCALAR_FLOAT_MODE_P (orig_mode) && GET_MODE_CLASS (orig_mode) != MODE_INT && !ALL_SCALAR_FIXED_POINT_MODE_P (orig_mode)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7447d479e03..aae550a79a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2008-01-22 Jakub Jelinek + PR c++/34914 + * g++.dg/ext/vector10.C: New test. + PR c++/34918 * g++.dg/other/error23.C: New test. diff --git a/gcc/testsuite/g++.dg/ext/vector10.C b/gcc/testsuite/g++.dg/ext/vector10.C new file mode 100644 index 00000000000..46ea244c56c --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/vector10.C @@ -0,0 +1,11 @@ +// PR c++/34914 +// { dg-do compile } + +struct A { int __attribute ((vector_size (8))) x; }; + +void +foo () +{ + __attribute ((vector_size (8))) int A::*p; + p == 0; +} diff --git a/gcc/tree.c b/gcc/tree.c index b6b3eef26e1..f61e24bac09 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -7631,6 +7631,11 @@ reconstruct_complex_type (tree type, tree bottom) inner, TREE_CHAIN (TYPE_ARG_TYPES (type))); } + else if (TREE_CODE (type) == OFFSET_TYPE) + { + inner = reconstruct_complex_type (TREE_TYPE (type), bottom); + outer = build_offset_type (TYPE_OFFSET_BASETYPE (type), inner); + } else return bottom;