summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGExprAgg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib/CodeGen/CGExprAgg.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprAgg.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 8bda0f3e36e..2e7e8686169 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -184,19 +184,12 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) {
LValue::MakeAddr(CastPtr, 0));
return;
}
- if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) {
- if (const CXXFunctionalCastExpr *CXXFExpr =
- dyn_cast<CXXFunctionalCastExpr>(E))
- CGF.EmitCXXFunctionalCastExpr(CXXFExpr);
- else
- if (isa<CStyleCastExpr>(E))
- Visit(E->getSubExpr());
- return;
- }
// FIXME: Remove the CK_Unknown check here.
assert((E->getCastKind() == CastExpr::CK_NoOp ||
- E->getCastKind() == CastExpr::CK_Unknown) &&
+ E->getCastKind() == CastExpr::CK_Unknown ||
+ E->getCastKind() == CastExpr::CK_UserDefinedConversion ||
+ E->getCastKind() == CastExpr::CK_ConstructorConversion) &&
"Only no-op casts allowed!");
assert(CGF.getContext().hasSameUnqualifiedType(E->getSubExpr()->getType(),
E->getType()) &&
OpenPOWER on IntegriCloud