diff options
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index cdda6ab32ff..061ac8d2c33 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -228,12 +228,15 @@ Sema::ActOnCXXTypeConstructExpr(SourceRange TypeRange, TypeTy *TypeRep, if (CheckCastTypes(TypeRange, Ty, Exprs[0], Kind, ConversionDecl, /*functional-style*/true)) return ExprError(); - exprs.release(); - return Owned(new (Context) CXXFunctionalCastExpr(Ty.getNonReferenceType(), + // We done't build this AST for X(i) where we are constructing an object. + if (!ConversionDecl || !isa<CXXConstructorDecl>(ConversionDecl)) { + exprs.release(); + return Owned(new (Context) CXXFunctionalCastExpr(Ty.getNonReferenceType(), Ty, TyBeginLoc, CastExpr::CK_UserDefinedConversion, Exprs[0], ConversionDecl, RParenLoc)); + } } if (const RecordType *RT = Ty->getAs<RecordType>()) { |