diff options
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateExpr.cpp | 19 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-expr-4.cpp | 11 |
2 files changed, 29 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp index 2a1ee886b5..8cd60edb67 100644 --- a/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -90,7 +90,7 @@ namespace { OwningExprResult VisitCXXZeroInitValueExpr(CXXZeroInitValueExpr *E); OwningExprResult VisitCXXNewExpr(CXXNewExpr *E); OwningExprResult VisitCXXDeleteExpr(CXXDeleteExpr *E); - // FIXME: UnaryTypeTraitExpr + OwningExprResult VisitUnaryTypeTraitExpr(UnaryTypeTraitExpr *E); // FIXME: QualifiedDeclRefExpr OwningExprResult VisitCXXExprWithTemporaries(CXXExprWithTemporaries *E); OwningExprResult VisitCXXUnresolvedConstructExpr( @@ -992,6 +992,23 @@ TemplateExprInstantiator::VisitCXXDeleteExpr(CXXDeleteExpr *E) { } Sema::OwningExprResult +TemplateExprInstantiator::VisitUnaryTypeTraitExpr(UnaryTypeTraitExpr *E) { + QualType T = SemaRef.InstantiateType(E->getQueriedType(), TemplateArgs, + /*FIXME*/E->getSourceRange().getBegin(), + DeclarationName()); + if (T.isNull()) + return SemaRef.ExprError(); + + SourceLocation FakeLParenLoc + = SemaRef.PP.getLocForEndOfToken(E->getSourceRange().getBegin()); + return SemaRef.ActOnUnaryTypeTrait(E->getTrait(), + E->getSourceRange().getBegin(), + /*FIXME*/FakeLParenLoc, + T.getAsOpaquePtr(), + E->getSourceRange().getEnd()); +} + +Sema::OwningExprResult TemplateExprInstantiator::VisitCXXExprWithTemporaries( CXXExprWithTemporaries *E) { OwningExprResult SubExpr = Visit(E->getSubExpr()); diff --git a/test/SemaTemplate/instantiate-expr-4.cpp b/test/SemaTemplate/instantiate-expr-4.cpp index 1511c7aaf8..5c32d8c197 100644 --- a/test/SemaTemplate/instantiate-expr-4.cpp +++ b/test/SemaTemplate/instantiate-expr-4.cpp @@ -139,3 +139,14 @@ struct Abstract { template struct TypeId0<int>; template struct TypeId0<Incomplete>; template struct TypeId0<Abstract>; + +// --------------------------------------------------------------------- +// type traits +// --------------------------------------------------------------------- +template<typename T> +struct is_pod { + static const bool value = __is_pod(T); +}; + +static const int is_pod0[is_pod<X>::value? -1 : 1]; +static const int is_pod1[is_pod<Y>::value? 1 : -1]; |