1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Sema/SemaCXXCast.cpp b/lib/Sema/SemaCXXCast.cpp
index 2dee71308b..66767ad1ba 100644
--- a/lib/Sema/SemaCXXCast.cpp
+++ b/lib/Sema/SemaCXXCast.cpp
@@ -789,6 +789,10 @@ TryStaticImplicitCast(Sema &Self, Expr *SrcExpr, QualType DestType,
   // check for ambiguity or access.
   ImplicitConversionSequence ICS = Self.TryImplicitConversion(
     SrcExpr, DestType);
+  if (ICS.ConversionKind  == ImplicitConversionSequence::UserDefinedConversion)
+    if (CXXConversionDecl *CV = 
+          dyn_cast<CXXConversionDecl>(ICS.UserDefined.ConversionFunction))
+      ConversionDecl = CV;
   return ICS.ConversionKind == ImplicitConversionSequence::BadConversion ?
     TC_NotApplicable : TC_Success;
 }