[cfe-commits] r67226 - /cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp

[Gabor Greif]

Author: ggreif
Date: Wed Mar 18 15:12:58 2009
New Revision: 67226

URL: http://llvm.org/viewvc/llvm-project?rev=67226&view=rev
Log:
incorporate review comment (about the optimization when we have a non-typedependent expression)

Modified:
    cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp?rev=67226&r1=67225&r2=67226&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp Wed Mar 18 15:12:58 2009
@@ -839,8 +839,24 @@
   if (False.isInvalid())
     return SemaRef.ExprError();
 
-  return SemaRef.ActOnConditionalOp(E->getCond()->getLocEnd(),
-                                    E->getFalseExpr()->getLocStart(),
+  if (!E->isTypeDependent()) { 
+    // 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()));
+  }
+
+
+  return SemaRef.ActOnConditionalOp(/*FIXME*/E->getCond()->getLocEnd(),
+                                    /*FIXME*/E->getFalseExpr()->getLocStart(),
                                     move(Cond), move(True), move(False));
 }