diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 645830b4886a..773dd46ac467 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -4949,7 +4949,8 @@ static QualType getPreferredTypeOfBinaryRHS(Sema &S, Expr *LHS,
   case tok::arrowstar:
     return QualType();
   default:
-    assert(false && "unhandled binary op");
+    // FIXME(ibiryukov): handle the missing op, re-add the assertion.
+    // assert(false && "unhandled binary op");
     return QualType();
   }
 }