Template instantiation for C++ "typeid" expressions.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72218 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 33 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()) {