commit 31976591dee494994f2546c72c23e1e35a9c1555
author Fariborz Jahanian <fjahanian@apple.com> Sat Aug 29 19:15:16 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat Aug 29 19:15:16 2009 +0000
tree 61bdb0e43f2bdddcdeccb99e4ac0fadb59a2772a
parent d933a0198f3ccce9c73bf2951625315b911d37bf

Patch for code gen. for c-style cast which ends in
using class's conversion functions [12.3.2-p2]


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80433 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprAgg.cpp

diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index 002c774..4155738 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -178,8 +178,12 @@
     return;
   }
   if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) {
-    CXXFunctionalCastExpr *CXXFExpr = cast<CXXFunctionalCastExpr>(E);
-    CGF.EmitCXXFunctionalCastExpr(CXXFExpr);
+    if (const CXXFunctionalCastExpr *CXXFExpr = 
+          dyn_cast<CXXFunctionalCastExpr>(E))
+      CGF.EmitCXXFunctionalCastExpr(CXXFExpr);
+    else 
+      if (isa<CStyleCastExpr>(E))
+        Visit(E->getSubExpr());
     return;
   }