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
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 24442c3..400d45f 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1173,8 +1173,13 @@
/// noop aggregate casts, and cast from scalar to union.
LValue CodeGenFunction::EmitCastLValue(const CastExpr *E) {
if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) {
- const CXXFunctionalCastExpr *CXXFExpr = cast<CXXFunctionalCastExpr>(E);
- return LValue::MakeAddr(EmitCXXFunctionalCastExpr(CXXFExpr).getScalarVal(), 0);
+ if (const CXXFunctionalCastExpr *CXXFExpr =
+ dyn_cast<CXXFunctionalCastExpr>(E))
+ return LValue::MakeAddr(
+ EmitCXXFunctionalCastExpr(CXXFExpr).getScalarVal(), 0);
+ assert(isa<CStyleCastExpr>(E) &&
+ "EmitCastLValue - Expected CStyleCastExpr");
+ return EmitLValue(E->getSubExpr());
}
// If this is an aggregate-to-aggregate cast, just use the input's address as
@@ -1188,10 +1193,6 @@
if (ICE->isLvalueCast())
return EmitLValue(E->getSubExpr());
- // FIXME: Implement this properly!
- if (E->getCastKind() == CastExpr::CK_UserDefinedConversion)
- return EmitUnsupportedLValue(E, "user-defined conversion");
-
// Otherwise, we must have a cast from scalar to union.
assert(E->getCastKind() == CastExpr::CK_ToUnion &&
"Expected scalar-to-union cast");