1 files changed, 8 insertions, 4 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index 21f3e00ac0..011257b749 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -579,10 +579,14 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest,
     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);