diff options
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateExpr.cpp | 34 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-expr-4.cpp | 26 |
2 files changed, 59 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp index 55be2c2c8f..2a1ee886b5 100644 --- a/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -82,7 +82,7 @@ namespace { OwningExprResult VisitCXXThisExpr(CXXThisExpr *E); OwningExprResult VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr *E); OwningExprResult VisitCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr *E); - // FIXME: CXXTypeIdExpr + OwningExprResult VisitCXXTypeidExpr(CXXTypeidExpr *E); OwningExprResult VisitCXXThrowExpr(CXXThrowExpr *E); // FIXME: CXXDefaultArgExpr OwningExprResult VisitCXXConstructExpr(CXXConstructExpr *E); @@ -813,6 +813,38 @@ TemplateExprInstantiator::VisitCXXThisExpr(CXXThisExpr *E) { } Sema::OwningExprResult +TemplateExprInstantiator::VisitCXXTypeidExpr(CXXTypeidExpr *E) { + if (E->isTypeOperand()) { + QualType T = SemaRef.InstantiateType(E->getTypeOperand(), + TemplateArgs, + /*FIXME*/E->getSourceRange().getBegin(), + DeclarationName()); + if (T.isNull()) + return SemaRef.ExprError(); + + return SemaRef.ActOnCXXTypeid(E->getSourceRange().getBegin(), + /*FIXME*/E->getSourceRange().getBegin(), + true, T.getAsOpaquePtr(), + E->getSourceRange().getEnd()); + } + + OwningExprResult Operand = Visit(E->getExprOperand()); + if (Operand.isInvalid()) + return SemaRef.ExprError(); + + OwningExprResult Result + = SemaRef.ActOnCXXTypeid(E->getSourceRange().getBegin(), + /*FIXME*/E->getSourceRange().getBegin(), + false, Operand.get(), + E->getSourceRange().getEnd()); + if (Result.isInvalid()) + return SemaRef.ExprError(); + + Operand.release(); // FIXME: since ActOnCXXTypeid silently took ownership + return move(Result); +} + +Sema::OwningExprResult TemplateExprInstantiator::VisitCXXThrowExpr(CXXThrowExpr *E) { OwningExprResult SubExpr(SemaRef, (void *)0); if (E->getSubExpr()) { diff --git a/test/SemaTemplate/instantiate-expr-4.cpp b/test/SemaTemplate/instantiate-expr-4.cpp index 6ef0f83add..1511c7aaf8 100644 --- a/test/SemaTemplate/instantiate-expr-4.cpp +++ b/test/SemaTemplate/instantiate-expr-4.cpp @@ -113,3 +113,29 @@ template struct Throw1<int>; template struct Throw1<int*>; template struct Throw1<Incomplete*>; // expected-note{{instantiation}} +// --------------------------------------------------------------------- +// typeid expressions +// --------------------------------------------------------------------- + +// FIXME: This should really include <typeinfo>, but we don't have that yet. +namespace std { + class type_info; +} + +template<typename T> +struct TypeId0 { + const std::type_info &f(T* ptr) { + if (ptr) + return typeid(ptr); + else + return typeid(T); + } +}; + +struct Abstract { + virtual void f() = 0; +}; + +template struct TypeId0<int>; +template struct TypeId0<Incomplete>; +template struct TypeId0<Abstract>; |