commit a2fb9bcd1917a54e21b079c889f5660bf97723bf
author Anders Carlsson <andersca@mac.com> Thu Sep 17 04:02:31 2009 +0000
committer Anders Carlsson <andersca@mac.com> Thu Sep 17 04:02:31 2009 +0000
tree b9e62db3855d57f45f8e24c94beabf5d5f201f84
parent df0e62d0a16c75c168f776eebab38cee6cfcfd6f

Substitute unscoped template names.

llvm-svn: 82119

clang/test/CodeGenCXX/function-template-specialization.cpp

diff --git a/clang/test/CodeGenCXX/function-template-specialization.cpp b/clang/test/CodeGenCXX/function-template-specialization.cpp
index 8dbaf2f..677be4c 100644
--- a/clang/test/CodeGenCXX/function-template-specialization.cpp
+++ b/clang/test/CodeGenCXX/function-template-specialization.cpp
@@ -8,12 +8,10 @@
 }
 
 void test(int *iptr, float *fptr, int diff) {
-  // FIXME: should be "_Z4nextIiiEPT_S1_RKT0_"
-  // CHECK: _Z4nextIiiEPT_S0_RKT0_
+  // CHECK: _Z4nextIiiEPT_S1_RKT0_
   iptr = next(iptr, diff);
-  // FIXME: should be "_Z4nextIfiEPT_S1_RKT0_"
-  // CHECK: _Z4nextIfiEPT_S0_RKT0_
-  
+
+  // CHECK: _Z4nextIfiEPT_S1_RKT0_
   fptr = next(fptr, diff);
 }
 
@@ -22,7 +20,7 @@
 
 void test2(int *iptr, double *dptr, int diff) {
   iptr = next(iptr, diff);
-  // FIXME: should be "_Z4nextIdiEPT_S1_RKT0_"
-  // CHECK: _Z4nextIiiEPT_S0_RKT0_
+
+  // CHECK: _Z4nextIdiEPT_S1_RKT0_
   dptr = next(dptr, diff);
 }

clang/test/CodeGenCXX/mangle.cpp

diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp
index a4c223e..65ef008 100644
--- a/clang/test/CodeGenCXX/mangle.cpp
+++ b/clang/test/CodeGenCXX/mangle.cpp
@@ -88,9 +88,14 @@
 // CHECK: define void @_Z1fi
 void f(const int) { }
 
-// CHECK: define linkonce_odr void @_Z2tfIidEvT0_T_
-template<typename T, typename U> void tf(U u, T t) { }
+template<typename T, typename U> void ft1(U u, T t) { }
+
+template<typename T> void ft2(T t, void (*)(T), void (*)(T)) { }
 
 void g() {
-  tf<int, double>(1, 0);
+  // CHECK: @_Z3ft1IidEvT0_T_
+  ft1<int, double>(1, 0);
+  
+  // CHECK: @_Z3ft2IcEvT_PFvS0_ES2_
+  ft2<char>(1, 0, 0);
 }