Provide -Wuninitialized-experimental fixits

for floats, and also check if 'nil' is declared
when suggesting it for initializing ObjC pointers.

llvm-svn: 124004

1 files changed, 10 insertions, 3 deletions

diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp
index 91f95a762ac..38284f66273 100644
--- a/clang/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp
@@ -421,12 +421,19 @@ public:
 
       // Suggest possible initialization (if any).
       const char *initialization = 0;
-      QualType vdTy = vd->getType();
+      QualType vdTy = vd->getType().getCanonicalType();
       
       if (vdTy->getAs<ObjCObjectPointerType>()) {
-        initialization = " = nil";
+        // Check if 'nil' is defined.
+        if (S.PP.getMacroInfo(&S.getASTContext().Idents.get("nil")))
+          initialization = " = nil";
+        else
+          initialization = " = 0";
       }
-      else if (vdTy->getAs<PointerType>()) {
+      else if (vdTy->isRealFloatingType()) {
+        initialization = " = 0.0";
+      }
+      else if (vdTy->isScalarType()) {
         initialization = " = 0";
       }