commit 087edcfb1d6dcb500675cac1636dca2219cb2b75
author Gabor Greif <ggreif@gmail.com> Wed Mar 18 00:55:04 2009 +0000
committer Gabor Greif <ggreif@gmail.com> Wed Mar 18 00:55:04 2009 +0000
tree acf4629ed29259912b90c3ffe3e484080db8c1d2
parent ca5e77fefc4ac06aa787d7e777957ba6b7a03c60

instantiate ?: expressions

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

lib/Sema/SemaTemplateInstantiate.cpp

diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index cdb7f08..a943d4e 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -615,6 +615,7 @@
     OwningExprResult VisitUnaryOperator(UnaryOperator *E);
     OwningExprResult VisitBinaryOperator(BinaryOperator *E);
     OwningExprResult VisitCXXOperatorCallExpr(CXXOperatorCallExpr *E);
+    OwningExprResult VisitConditionalOperator(ConditionalOperator *E);
     OwningExprResult VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E);
     OwningExprResult VisitCXXTemporaryObjectExpr(CXXTemporaryObjectExpr *E);
     OwningExprResult VisitImplicitCastExpr(ImplicitCastExpr *E);
@@ -823,6 +824,34 @@
   return move(Result);  
 }
 
+Sema::OwningExprResult
+TemplateExprInstantiator::VisitConditionalOperator(ConditionalOperator *E) {
+  Sema::OwningExprResult Cond = Visit(E->getCond());
+  if (Cond.isInvalid())
+    return SemaRef.ExprError();
+
+  // FIXME: use getLHS() and cope with NULLness
+  Sema::OwningExprResult True = Visit(E->getTrueExpr());
+  if (True.isInvalid())
+    return SemaRef.ExprError();
+
+  Sema::OwningExprResult False = Visit(E->getFalseExpr());
+  if (False.isInvalid())
+    return SemaRef.ExprError();
+
+  Sema::OwningExprResult Result
+    = SemaRef.ActOnConditionalOp(E->getCond()->getLocEnd(),
+                                 E->getFalseExpr()->getLocStart(),
+                                 move(Cond), move(True), move(False));
+  if (Result.isInvalid())
+    return SemaRef.ExprError();
+
+/*  Cond.release();
+  True.release();
+  False.release();*/
+  return move(Result);
+}
+
 Sema::OwningExprResult 
 TemplateExprInstantiator::VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E) {
   bool isSizeOf = E->isSizeOf();
@@ -832,7 +861,7 @@
     if (T->isDependentType()) {
       T = SemaRef.InstantiateType(T, TemplateArgs, NumTemplateArgs,
                                   /*FIXME*/E->getOperatorLoc(),
-                                  &SemaRef.PP.getIdentifierTable().get("sizeof"));
+                                &SemaRef.PP.getIdentifierTable().get("sizeof"));
       if (T.isNull())
         return SemaRef.ExprError();
     }