Format strings: suggest %lld instead of %qd and %Ld with -Wformat-non-iso.

As a corollary to the previous commit, even when an extension is
available, we can still offer a fixit to the standard modifier.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163453 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 11 deletions

diff --git a/lib/Analysis/FormatString.cpp b/lib/Analysis/FormatString.cpp
index 45c722a5d5..c6ba6fab07 100644
--- a/lib/Analysis/FormatString.cpp
+++ b/lib/Analysis/FormatString.cpp
@@ -723,21 +723,13 @@ bool FormatSpecifier::hasStandardLengthConversionCombination() const {
 
 llvm::Optional<LengthModifier>
 FormatSpecifier::getCorrectedLengthModifier() const {
-  if (LM.getKind() == LengthModifier::AsLongDouble) {
-    switch (CS.getKind()) {
-    case ConversionSpecifier::dArg:
-    case ConversionSpecifier::iArg:
-    case ConversionSpecifier::oArg:
-    case ConversionSpecifier::uArg:
-    case ConversionSpecifier::xArg:
-    case ConversionSpecifier::XArg: {
+  if (CS.isAnyIntArg() || CS.getKind() == ConversionSpecifier::nArg) {
+    if (LM.getKind() == LengthModifier::AsLongDouble ||
+        LM.getKind() == LengthModifier::AsQuad) {
       LengthModifier FixedLM(LM);
       FixedLM.setKind(LengthModifier::AsLongLong);
       return FixedLM;
     }
-    default:
-      break;
-    }
   }
 
   return llvm::Optional<LengthModifier>();