Use the instantiated expressions to build the ConditionalOperator. This addresses the second part of review feedback.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67259 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 427946a..4341fc9 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -843,15 +843,11 @@
// Since our original expression was not type-dependent, we do not
// perform lookup again at instantiation time (C++ [temp.dep]p1).
// Instead, we just build the new conditional operator call expression.
- Cond.release();
- True.release();
- False.release();
- // FIXME: Don't reuse the parts here. We need to instantiate them.
return SemaRef.Owned(new (SemaRef.Context) ConditionalOperator(
- E->getCond(),
- E->getTrueExpr(),
- E->getFalseExpr(),
- E->getType()));
+ Cond.takeAs<Expr>(),
+ True.takeAs<Expr>(),
+ False.takeAs<Expr>(),
+ E->getType()));
}