1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index ffcf8d4609..5abca99896 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -493,7 +493,7 @@ Sema::TryImplicitConversion(Expr* From, QualType ToType,
       ICS.setBad();
       ICS.Bad.init(BadConversionSequence::suppressed_user, From, ToType);
     }
-  } else if (UserDefResult == OR_Ambiguous) {
+  } else if (UserDefResult == OR_Ambiguous && !SuppressUserConversions) {
     ICS.setAmbiguous();
     ICS.Ambiguous.setFromType(From->getType());
     ICS.Ambiguous.setToType(ToType);