diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-01-07 09:40:28 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-01-07 09:40:28 +0000 |
| commit | 1f872df76202fbf8ffef70c688246847b80cbedb (patch) | |
| tree | 73fefc4bdfec92bfe670fbd49f73b7271f440fde | |
| parent | a0cbe71e87398b958cc88f5e3a7529cb9e1fd137 (diff) | |
| download | gcc-1f872df76202fbf8ffef70c688246847b80cbedb.zip gcc-1f872df76202fbf8ffef70c688246847b80cbedb.tar.gz gcc-1f872df76202fbf8ffef70c688246847b80cbedb.tar.bz2 | |
semantics.c (trait_expr_value, [...]): Implement the letter of 20.11.6 about Base and Derived naming the same class...
/cp
2014-01-07 Paolo Carlini <paolo.carlini@oracle.com>
* semantics.c (trait_expr_value, [CPTK_IS_BASE_OF]): Implement
the letter of 20.11.6 about Base and Derived naming the same
class type modulo cv-qualifiers.
/testsuite
2014-01-07 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/ext/is_base_of_incomplete-2.C: New.
From-SVN: r206386
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/is_base_of_incomplete-2.C | 5 |
4 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 99657a9..b31014f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-01-07 Paolo Carlini <paolo.carlini@oracle.com> + + * semantics.c (trait_expr_value, [CPTK_IS_BASE_OF]): Implement + the letter of 20.11.6 about Base and Derived naming the same + class type modulo cv-qualifiers. + 2014-01-06 Adam Butcher <adam@jessamine.co.uk> PR c++/59635 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 0bb64c7..9f87887 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -7106,7 +7106,8 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_BASE_OF: return (NON_UNION_CLASS_TYPE_P (type1) && NON_UNION_CLASS_TYPE_P (type2) - && DERIVED_FROM_P (type1, type2)); + && (same_type_ignoring_top_level_qualifiers_p (type1, type2) + || DERIVED_FROM_P (type1, type2))); case CPTK_IS_CLASS: return (NON_UNION_CLASS_TYPE_P (type1)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1ad3731..a8910bb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-01-07 Paolo Carlini <paolo.carlini@oracle.com> + + * g++.dg/ext/is_base_of_incomplete-2.C: New. + 2014-01-07 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/58668 diff --git a/gcc/testsuite/g++.dg/ext/is_base_of_incomplete-2.C b/gcc/testsuite/g++.dg/ext/is_base_of_incomplete-2.C new file mode 100644 index 0000000..5486258 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/is_base_of_incomplete-2.C @@ -0,0 +1,5 @@ +struct T; + +int check1[__is_base_of(T, T) ? 1 : -1]; +int check2[__is_base_of(T, const T) ? 1 : -1]; +int check3[__is_base_of(volatile T, T) ? 1 : -1]; |