From 8dcc466886f856e602086c54533eeaf203fd48e8 Mon Sep 17 00:00:00 2001
From: Ted Kremenek <kremenek@apple.com>
Date: Mon, 25 Apr 2011 22:32:59 +0000
Subject: When generating printf fixits, preserve the original formating for
 unsigned integers (e.g., 'x', 'o').

llvm-svn: 130164
---
 clang/lib/Analysis/PrintfFormatString.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Analysis/PrintfFormatString.cpp')

diff --git a/clang/lib/Analysis/PrintfFormatString.cpp b/clang/lib/Analysis/PrintfFormatString.cpp
index db9f7f2c834..19a9134c049 100644
--- a/clang/lib/Analysis/PrintfFormatString.cpp
+++ b/clang/lib/Analysis/PrintfFormatString.cpp
@@ -441,7 +441,9 @@ bool PrintfSpecifier::fixType(QualType QT) {
     HasAlternativeForm = 0;
   }
   else if (QT->isUnsignedIntegerType()) {
-    CS.setKind(ConversionSpecifier::uArg);
+    // Preserve the original formatting, e.g. 'X', 'o'.
+    if (!cast<PrintfConversionSpecifier>(CS).isUIntArg())
+      CS.setKind(ConversionSpecifier::uArg);
     HasAlternativeForm = 0;
     HasPlusPrefix = 0;
   }
-- 
cgit v1.2.3