2 files changed, 14 insertions, 1 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index e8c24ab0a71..9428b218e54 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -14,6 +14,7 @@
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringExtras.h"
 #include <vector>
 #include <map>
 #include <cstring>
@@ -279,6 +280,18 @@ FormatDiagnostic(llvm::SmallVectorImpl<char> &OutStr) const {
         OutStr.append(S, S + strlen(S));
         break;
       }
+      case DiagnosticInfo::ak_sint: {
+        // FIXME: Optimize
+        std::string S = llvm::itostr(getArgSInt(StrNo));
+        OutStr.append(S.begin(), S.end());
+        break;
+      }
+      case DiagnosticInfo::ak_uint: {
+        // FIXME: Optimize
+        std::string S = llvm::utostr_32(getArgUInt(StrNo));
+        OutStr.append(S.begin(), S.end());
+        break;
+      }
       }
       DiagStr += 2;
     }
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 40f70fb3cc1..d83ba8561bd 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -328,7 +328,7 @@ static void HandleNonNullAttr(Decl *d, const AttributeList &Attr, Sema &S) {
         
     if (x < 1 || x > NumArgs) {
       S.Diag(Attr.getLoc(), diag::err_attribute_argument_out_of_bounds)
-       << "nonnull" << llvm::utostr_32(I.getArgNum()) << Ex->getSourceRange();
+       << "nonnull" << I.getArgNum() << Ex->getSourceRange();
       return;
     }