1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 3408ff7087..c4fd39be6c 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -1096,7 +1096,7 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
       else
         assert(0 && "Unknown conversion function kind!");
       // Whatch out for elipsis conversion.
-      if (!BeforeToType.isNull()) {
+      if (!ICS.UserDefined.EllipsisConversion) {
         if (PerformImplicitConversion(From, BeforeToType, 
                                       ICS.UserDefined.Before, "converting"))
           return true;