diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -13865,7 +13865,8 @@
     }
   }
 
-  DiagnoseNullConversion(S, E, T, CC);
+  if (S.getLangOpts().CPlusPlus)
+    DiagnoseNullConversion(S, E, T, CC);
 
   S.DiscardMisalignedMemberAddress(Target, E);