From 6770dea704681cdb5a8fd1b82c39084924ca3018 Mon Sep 17 00:00:00 2001
From: Charles Davis <cdavis@mines.edu>
Date: Mon, 28 May 2012 16:53:33 +0000
Subject: [PATCH] Fix mangling of integral template arguments between 1 and 10.
 Add a test case for this. Reported by Timur Iskhodzhanov.

llvm-svn: 157583
---
 clang/lib/AST/MicrosoftMangle.cpp             | 4 ++--
 clang/test/CodeGenCXX/mangle-ms-templates.cpp | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp
index feb1fa308338..753b8174fb2e 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -309,8 +309,8 @@ void MicrosoftCXXNameMangler::mangleNumber(const llvm::APSInt &Value) {
     return;
   }
   if (Value.uge(1) && Value.ule(10))
-    (Value-llvm::APSInt(llvm::APInt(Value.getBitWidth(), 1, Value.isSigned()))).print(Out,
-                                                                                   false);
+    (Value-llvm::APSInt(llvm::APInt(Value.getBitWidth(), 1, Value.isSigned()),
+                        Value.isUnsigned())).print(Out, false);
   else {
     // We have to build up the encoding in reverse order, so it will come
     // out right when we write it out.
diff --git a/clang/test/CodeGenCXX/mangle-ms-templates.cpp b/clang/test/CodeGenCXX/mangle-ms-templates.cpp
index b8138727a5ac..0a011b327e0e 100644
--- a/clang/test/CodeGenCXX/mangle-ms-templates.cpp
+++ b/clang/test/CodeGenCXX/mangle-ms-templates.cpp
@@ -38,6 +38,9 @@ void template_mangling() {
   BoolTemplate<true> _true;
 // CHECK: call {{.*}} @"\01??0?$BoolTemplate@$00@@QAE@XZ"
 
+  IntTemplate<5> five;
+// CHECK: call {{.*}} @"\01??0?$IntTemplate@$04@@QAE@XZ"
+
   IntTemplate<11> eleven;
 // CHECK: call {{.*}} @"\01??0?$IntTemplate@$0L@@@QAE@XZ"