1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp
index 51b04a72f1..6c074188b3 100644
--- a/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/lib/Sema/AnalysisBasedWarnings.cpp
@@ -508,8 +508,10 @@ static void SuggestInitializationFixit(Sema &S, const VarDecl *VD) {
   else if (VariableTy->isEnumeralType())
     return;
   else if (VariableTy->isPointerType() || VariableTy->isMemberPointerType()) {
+    if (S.Context.getLangOptions().CPlusPlus0x)
+      initialization = " = nullptr";
     // Check if 'NULL' is defined.
-    if (S.PP.getMacroInfo(&S.getASTContext().Idents.get("NULL")))
+    else if (S.PP.getMacroInfo(&S.getASTContext().Idents.get("NULL")))
       initialization = " = NULL";
     else
       initialization = " = 0";