diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 20 | ||||
| -rw-r--r-- | clang/test/SemaCXX/type-traits-incomplete.cpp | 7 |
3 files changed, 23 insertions, 7 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index b1a73d05a45..32f2d519583 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1549,6 +1549,9 @@ def ext_typecheck_expression_not_constant_but_accepted : Extension< def warn_unused_expr : Warning<"expression result unused">, InGroup<UnusedValue>; +def err_incomplete_type_used_in_type_trait_expr : Error< + "incomplete type %0 used in type trait expression">; + // inline asm. def err_asm_wide_character : Error<"wide string is invalid in 'asm'">; def err_asm_invalid_lvalue_in_output : Error<"invalid lvalue in asm output">; diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 7afa5941dad..b6c2d0521fe 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1023,17 +1023,23 @@ Sema::OwningExprResult Sema::ActOnUnaryTypeTrait(UnaryTypeTrait OTT, SourceLocation LParen, TypeTy *Ty, SourceLocation RParen) { - // FIXME: Some of the type traits have requirements. Interestingly, only the - // __is_base_of requirement is explicitly stated to be diagnosed. Indeed, G++ - // accepts __is_pod(Incomplete) without complaints, and claims that the type - // is indeed a POD. + QualType T = QualType::getFromOpaquePtr(Ty); + + // 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. + if (OTT != UTT_IsClass && OTT != UTT_IsEnum && OTT != UTT_IsUnion) { + if (RequireCompleteType(KWLoc, T, + diag::err_incomplete_type_used_in_type_trait_expr, + SourceRange(), SourceRange(), T)) + return ExprError(); + } // There is no point in eagerly computing the value. The traits are designed // to be used from type trait templates, so Ty will be a template parameter // 99% of the time. - return Owned(new (Context) UnaryTypeTraitExpr(KWLoc, OTT, - QualType::getFromOpaquePtr(Ty), - RParen, Context.BoolTy)); + return Owned(new (Context) UnaryTypeTraitExpr(KWLoc, OTT, T, + RParen, Context.BoolTy)); } QualType Sema::CheckPointerToMemberOperands( diff --git a/clang/test/SemaCXX/type-traits-incomplete.cpp b/clang/test/SemaCXX/type-traits-incomplete.cpp new file mode 100644 index 00000000000..ac8ec452b93 --- /dev/null +++ b/clang/test/SemaCXX/type-traits-incomplete.cpp @@ -0,0 +1,7 @@ +// RUN: clang-cc -fsyntax-only -verify %s + +struct S; // expected-note{{forward declaration of 'struct S'}} + +void f() { + __is_pod(S); // expected-error{{incomplete type 'struct S' used in type trait expression}} +} |
