Fix handling of the GNU "t ? : f" extension to the conditional

operator in C++, and verify that template instantiation for the
condition operator does the right thing.

llvm-svn: 72127

2 files changed, 12 insertions, 12 deletions

diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index 6bafdf278d8..2df76a29048 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -828,16 +828,16 @@ Expr::isLvalueResult Expr::isLvalueInternal(ASTContext &Ctx) const {
     // casts should be wrapped by ImplicitCastExprs. There's just the special
     // case involving throws to work out.
     const ConditionalOperator *Cond = cast<ConditionalOperator>(this);
-    Expr *LHS = Cond->getLHS();
-    Expr *RHS = Cond->getRHS();
+    Expr *True = Cond->getTrueExpr();
+    Expr *False = Cond->getFalseExpr();
     // C++0x 5.16p2
     //   If either the second or the third operand has type (cv) void, [...]
     //   the result [...] is an rvalue.
-    if (LHS->getType()->isVoidType() || RHS->getType()->isVoidType())
+    if (True->getType()->isVoidType() || False->getType()->isVoidType())
       return LV_InvalidExpression;
 
     // Both sides must be lvalues for the result to be an lvalue.
-    if (LHS->isLvalue(Ctx) != LV_Valid || RHS->isLvalue(Ctx) != LV_Valid)
+    if (True->isLvalue(Ctx) != LV_Valid || False->isLvalue(Ctx) != LV_Valid)
       return LV_InvalidExpression;
 
     // That's it.
diff --git a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
index 9dda383342c..2589e301e0d 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -427,13 +427,13 @@ TemplateExprInstantiator::VisitConditionalOperator(ConditionalOperator *E) {
   if (Cond.isInvalid())
     return SemaRef.ExprError();
 
-  // FIXME: use getLHS() and cope with NULLness
-  Sema::OwningExprResult True = Visit(E->getTrueExpr());
-  if (True.isInvalid())
+  Sema::OwningExprResult LHS = SemaRef.InstantiateExpr(E->getLHS(), 
+                                                       TemplateArgs);
+  if (LHS.isInvalid())
     return SemaRef.ExprError();
 
-  Sema::OwningExprResult False = Visit(E->getFalseExpr());
-  if (False.isInvalid())
+  Sema::OwningExprResult RHS = Visit(E->getRHS());
+  if (RHS.isInvalid())
     return SemaRef.ExprError();
 
   if (!E->isTypeDependent()) { 
@@ -442,15 +442,15 @@ TemplateExprInstantiator::VisitConditionalOperator(ConditionalOperator *E) {
     // Instead, we just build the new conditional operator call expression.
     return SemaRef.Owned(new (SemaRef.Context) ConditionalOperator(
                                                            Cond.takeAs<Expr>(),
-                                                           True.takeAs<Expr>(), 
-                                                           False.takeAs<Expr>(),
+                                                           LHS.takeAs<Expr>(), 
+                                                           RHS.takeAs<Expr>(),
                                                            E->getType()));
   }
 
 
   return SemaRef.ActOnConditionalOp(/*FIXME*/E->getCond()->getLocEnd(),
                                     /*FIXME*/E->getFalseExpr()->getLocStart(),
-                                    move(Cond), move(True), move(False));
+                                    move(Cond), move(LHS), move(RHS));
 }
 
 Sema::OwningExprResult