commit 357b6fd3e5db431068f4922293de2b7fc346fcd4
author Douglas Gregor <dgregor@apple.com> Fri Dec 18 05:19:44 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Dec 18 05:19:44 2009 +0000
tree 8c02ed266a122121e3bd00bdfee3ac88ec38a52e
parent e1314a64b803bfffe98bd43f9131e512fd7191dd

Address some of Anders comments

llvm-svn: 91670

clang/lib/CodeGen/CGCXX.cpp

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 21f3e00..011257b 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -579,10 +579,14 @@
     const Expr *Arg = E->getArg(0);
 
     if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Arg)) {
-      if (isa<CXXBindTemporaryExpr>(ICE->getSubExpr()))
-        Arg = cast<CXXBindTemporaryExpr>(ICE->getSubExpr())->getSubExpr();
-    } else if (const CXXBindTemporaryExpr *BindExpr = 
-                  dyn_cast<CXXBindTemporaryExpr>(Arg))
+      assert((ICE->getCastKind() == CastExpr::CK_NoOp ||
+              ICE->getCastKind() == CastExpr::CK_ConstructorConversion) &&
+             "Unknown implicit cast kind in constructor elision");
+      Arg = ICE->getSubExpr();
+    }
+
+    if (const CXXBindTemporaryExpr *BindExpr = 
+           dyn_cast<CXXBindTemporaryExpr>(Arg))
       Arg = BindExpr->getSubExpr();
 
     EmitAggExpr(Arg, Dest, false);