[cfe-commits] r113326 - in /cfe/trunk: lib/AST/Type.cpp lib/Sema/SemaExprCXX.cpp test/SemaCXX/type-traits-incomplete.cpp test/SemaCXX/type-traits.cpp
Howard Hinnant
hhinnant at apple.com
Tue Sep 7 17:57:35 PDT 2010
Much thanks Sebastian!
-Howard
On Sep 7, 2010, at 8:48 PM, Sebastian Redl wrote:
> Author: cornedbee
> Date: Tue Sep 7 19:48:43 2010
> New Revision: 113326
>
> URL: http://llvm.org/viewvc/llvm-project?rev=113326&view=rev
> Log:
> Allow (cv) void and incomplete arrays to be passed to the type traits.
>
> Fixes PR8110, and thus PR8109, PR8097, and parts of PR8101, PR8105 and PR8107. Only a few traits have tests for incomplete arrays, since I'm not yet clear what the result for them should be; Howards wants to file a DR to change the standard.
>
> Modified:
> cfe/trunk/lib/AST/Type.cpp
> cfe/trunk/lib/Sema/SemaExprCXX.cpp
> cfe/trunk/test/SemaCXX/type-traits-incomplete.cpp
> cfe/trunk/test/SemaCXX/type-traits.cpp
>
> Modified: cfe/trunk/lib/AST/Type.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Type.cpp?rev=113326&r1=113325&r2=113326&view=diff
> ==============================================================================
> --- cfe/trunk/lib/AST/Type.cpp (original)
> +++ cfe/trunk/lib/AST/Type.cpp Tue Sep 7 19:48:43 2010
> @@ -678,7 +678,11 @@
> /// isPODType - Return true if this is a plain-old-data type (C++ 3.9p10)
> bool Type::isPODType() const {
> // The compiler shouldn't query this for incomplete types, but the user might.
> - // We return false for that case.
> + // We return false for that case. Except for incomplete arrays of PODs, which
> + // are PODs according to the standard.
> + if (isIncompleteArrayType() &&
> + cast<ArrayType>(CanonicalType)->getElementType()->isPODType())
> + return true;
> if (isIncompleteType())
> return false;
>
> @@ -687,7 +691,7 @@
> default: return false;
> case VariableArray:
> case ConstantArray:
> - // IncompleteArray is caught by isIncompleteType() above.
> + // IncompleteArray is handled above.
> return cast<ArrayType>(CanonicalType)->getElementType()->isPODType();
>
> case Builtin:
>
> Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=113326&r1=113325&r2=113326&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Tue Sep 7 19:48:43 2010
> @@ -1956,9 +1956,13 @@
>
> // According to http://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html
> // all traits except __is_class, __is_enum and __is_union require a the type
> - // to be complete.
> + // to be complete, an array of unknown bound, or void.
> if (OTT != UTT_IsClass && OTT != UTT_IsEnum && OTT != UTT_IsUnion) {
> - if (RequireCompleteType(KWLoc, T,
> + QualType E = T;
> + if (T->isIncompleteArrayType())
> + E = Context.getAsArrayType(T)->getElementType();
> + if (!T->isVoidType() &&
> + RequireCompleteType(KWLoc, E,
> diag::err_incomplete_type_used_in_type_trait_expr))
> return ExprError();
> }
>
> Modified: cfe/trunk/test/SemaCXX/type-traits-incomplete.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/type-traits-incomplete.cpp?rev=113326&r1=113325&r2=113326&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/type-traits-incomplete.cpp (original)
> +++ cfe/trunk/test/SemaCXX/type-traits-incomplete.cpp Tue Sep 7 19:48:43 2010
> @@ -1,7 +1,8 @@
> // RUN: %clang_cc1 -fsyntax-only -verify %s
>
> -struct S; // expected-note{{forward declaration of 'S'}}
> +struct S; // expected-note 2 {{forward declaration of 'S'}}
>
> void f() {
> __is_pod(S); // expected-error{{incomplete type 'S' used in type trait expression}}
> + __is_pod(S[]); // expected-error{{incomplete type 'S' used in type trait expression}}
> }
>
> Modified: cfe/trunk/test/SemaCXX/type-traits.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/type-traits.cpp?rev=113326&r1=113325&r2=113326&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/type-traits.cpp (original)
> +++ cfe/trunk/test/SemaCXX/type-traits.cpp Tue Sep 7 19:48:43 2010
> @@ -11,6 +11,7 @@
> typedef Empty EmptyAr[10];
> typedef int Int;
> typedef Int IntAr[10];
> +typedef Int IntArNB[];
> class Statics { static int priv; static NonPOD np; };
> union EmptyUnion {};
> union Union { int i; float f; };
> @@ -20,6 +21,7 @@
> struct HasAssign { void operator =(int); };
>
> // Not PODs
> +typedef const void cvoid;
> struct Derives : POD {};
> struct DerivesEmpty : Empty {};
> struct HasCons { HasCons(int); };
> @@ -32,6 +34,7 @@
> struct HasVirt { virtual void Virt() {}; };
> typedef Derives NonPODAr[10];
> typedef HasVirt VirtAr[10];
> +typedef HasCons NonPODArNB[];
> union NonPODUnion { int i; Derives n; };
>
> struct HasNoThrowCopyAssign {
> @@ -80,6 +83,7 @@
> int t11[T(__is_pod(HasOp))];
> int t12[T(__is_pod(HasConv))];
> int t13[T(__is_pod(HasAssign))];
> + int t14[T(__is_pod(IntArNB))];
>
> int t21[F(__is_pod(Derives))];
> int t22[F(__is_pod(HasCons))];
> @@ -92,6 +96,9 @@
> int t29[F(__is_pod(HasVirt))];
> int t30[F(__is_pod(NonPODAr))];
> int t31[F(__is_pod(DerivesEmpty))];
> + int t32[F(__is_pod(void))];
> + int t33[F(__is_pod(cvoid))];
> + int t34[F(__is_pod(NonPODArNB))];
> // int t32[F(__is_pod(NonPODUnion))];
> }
>
> @@ -122,6 +129,8 @@
> int t25[F(__is_empty(HasRef))];
> int t26[F(__is_empty(HasVirt))];
> int t27[F(__is_empty(BitOnly))];
> + int t28[F(__is_empty(void))];
> + int t29[F(__is_empty(IntArNB))];
> // int t27[F(__is_empty(DerivesVirt))];
> }
>
> @@ -139,6 +148,8 @@
> int t14[F(__is_class(IntAr))];
> int t15[F(__is_class(NonPODAr))];
> int t16[F(__is_class(Union))];
> + int t17[F(__is_class(cvoid))];
> + int t18[F(__is_class(IntArNB))];
> }
>
> typedef Union UnionAr[10];
> @@ -154,6 +165,8 @@
> int t13[F(__is_union(Int))];
> int t14[F(__is_union(IntAr))];
> int t15[F(__is_union(UnionAr))];
> + int t16[F(__is_union(cvoid))];
> + int t17[F(__is_union(IntArNB))];
> }
>
> typedef Enum EnumType;
> @@ -170,6 +183,8 @@
> int t15[F(__is_enum(UnionAr))];
> int t16[F(__is_enum(Derives))];
> int t17[F(__is_enum(ClassType))];
> + int t18[F(__is_enum(cvoid))];
> + int t19[F(__is_enum(IntArNB))];
> }
>
> typedef HasVirt Polymorph;
> @@ -188,6 +203,8 @@
> int t16[F(__is_polymorphic(Derives))];
> int t17[F(__is_polymorphic(ClassType))];
> int t18[F(__is_polymorphic(Enum))];
> + int t19[F(__is_polymorphic(cvoid))];
> + int t20[F(__is_polymorphic(IntArNB))];
> }
>
> typedef Int& IntRef;
> @@ -217,6 +234,8 @@
> int t16[T(__has_trivial_constructor(const Int))];
> int t17[T(__has_trivial_constructor(NonPODAr))];
> int t18[F(__has_trivial_constructor(VirtAr))];
> + int t19[F(__has_trivial_constructor(void))];
> + int t20[F(__has_trivial_constructor(cvoid))];
> }
>
> void has_trivial_copy_constructor() {
> @@ -238,6 +257,8 @@
> int t16[T(__has_trivial_copy(const Int))];
> int t17[F(__has_trivial_copy(NonPODAr))];
> int t18[F(__has_trivial_copy(VirtAr))];
> + int t19[F(__has_trivial_copy(void))];
> + int t20[F(__has_trivial_copy(cvoid))];
> }
>
> void has_trivial_copy_assignment() {
> @@ -259,6 +280,8 @@
> int t16[F(__has_trivial_assign(const Int))];
> int t17[F(__has_trivial_assign(NonPODAr))];
> int t18[F(__has_trivial_assign(VirtAr))];
> + int t19[F(__has_trivial_assign(void))];
> + int t20[F(__has_trivial_assign(cvoid))];
> }
>
> void has_trivial_destructor() {
> @@ -280,14 +303,16 @@
> int t16[T(__has_trivial_destructor(const Int))];
> int t17[T(__has_trivial_destructor(NonPODAr))];
> int t18[T(__has_trivial_destructor(VirtAr))];
> + int t19[F(__has_trivial_destructor(void))];
> + int t20[F(__has_trivial_destructor(cvoid))];
> }
>
> struct A { ~A() {} };
> template<typename> struct B : A { };
>
> void f() {
> - int t01[T(!__has_trivial_destructor(A))];
> - int t02[T(!__has_trivial_destructor(B<int>))];
> + int t01[F(__has_trivial_destructor(A))];
> + int t02[F(__has_trivial_destructor(B<int>))];
> }
>
> void has_nothrow_assign() {
> @@ -309,10 +334,11 @@
> int t16[F(__has_nothrow_assign(const Int))];
> int t17[F(__has_nothrow_assign(NonPODAr))];
> int t18[F(__has_nothrow_assign(VirtAr))];
> -
> int t19[T(__has_nothrow_assign(HasNoThrowCopyAssign))];
> int t20[F(__has_nothrow_assign(HasMultipleCopyAssign))];
> int t21[T(__has_nothrow_assign(HasMultipleNoThrowCopyAssign))];
> + int t22[F(__has_nothrow_assign(void))];
> + int t23[F(__has_nothrow_assign(cvoid))];
> }
>
> void has_nothrow_copy() {
> @@ -338,6 +364,8 @@
> int t19[T(__has_nothrow_copy(HasNoThrowCopy))];
> int t20[F(__has_nothrow_copy(HasMultipleCopy))];
> int t21[T(__has_nothrow_copy(HasMultipleNoThrowCopy))];
> + int t22[F(__has_nothrow_copy(void))];
> + int t23[F(__has_nothrow_copy(cvoid))];
> }
>
> void has_nothrow_constructor() {
> @@ -362,6 +390,8 @@
>
> int t19[T(__has_nothrow_constructor(HasNoThrowConstructor))];
> int t20[F(__has_nothrow_constructor(HasNoThrowConstructorWithArgs))];
> + int t21[F(__has_nothrow_constructor(void))];
> + int t22[F(__has_nothrow_constructor(cvoid))];
> }
>
> void has_virtual_destructor() {
> @@ -387,4 +417,6 @@
> int t19[T(__has_virtual_destructor(HasVirtDest))];
> int t20[T(__has_virtual_destructor(DerivedVirtDest))];
> int t21[F(__has_virtual_destructor(VirtDestAr))];
> + int t22[F(__has_virtual_destructor(void))];
> + int t23[F(__has_virtual_destructor(cvoid))];
> }
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list