[test-suite] r230715 - Adjusted mangling tests to conform to r229644/bug22621 and r230512/bug22584

[Sunil Srivastava]

Author: ssrivastava
Date: Thu Feb 26 18:57:08 2015
New Revision: 230715

URL: http://llvm.org/viewvc/llvm-project?rev=230715&view=rev
Log:
Adjusted mangling tests to conform to r229644/bug22621 and r230512/bug22584

Modified:
    test-suite/trunk/ABI-Testsuite/test/mangling/c++11s.xpp
    test-suite/trunk/ABI-Testsuite/test/mangling/expressions.xpp

Modified: test-suite/trunk/ABI-Testsuite/test/mangling/c++11s.xpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/ABI-Testsuite/test/mangling/c%2B%2B11s.xpp?rev=230715&r1=230714&r2=230715&view=diff
==============================================================================
--- test-suite/trunk/ABI-Testsuite/test/mangling/c++11s.xpp (original)
+++ test-suite/trunk/ABI-Testsuite/test/mangling/c++11s.xpp Thu Feb 26 18:57:08 2015
@@ -8,10 +8,10 @@
 // CHECK-DAG: _Z3fooc
 void foo(char) {}
 template <void (&)(char)> struct CB {};
-// CHECK-DAG: _Z3bar2CBILZ3foocEE
+// CHECK-DAG: _Z3bar2CBIL_Z3foocEE
 void bar(CB<foo> cb) {}
 
-// CHECK-DAG: _Z4test3CB2ILZ7IsEmptyEE
+// CHECK-DAG: _Z4test3CB2IL_Z7IsEmptyEE
 extern "C" bool IsEmpty(char *);
 template<bool (&)(char *)> struct CB2 {};
 void test(CB2<IsEmpty> cb) {}
@@ -26,7 +26,7 @@ struct Q1 {int x; } q1;
 template<class T> auto iii(T p)->decltype(p.x + Q::x);
 template<> auto iii(Q1 p)->decltype(p.x + Q::x) { return 0; }
 
-// CHECK-DAG: _Z3kkkI2S4EDTadsrT_miES1_
+// CHECK-DAG: _Z3kkkI2S4EDTadsrT_onmiES1_
 struct S4 {
     S4 operator-(S4 rhs) { return rhs; }
 };

Modified: test-suite/trunk/ABI-Testsuite/test/mangling/expressions.xpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/ABI-Testsuite/test/mangling/expressions.xpp?rev=230715&r1=230714&r2=230715&view=diff
==============================================================================
--- test-suite/trunk/ABI-Testsuite/test/mangling/expressions.xpp (original)
+++ test-suite/trunk/ABI-Testsuite/test/mangling/expressions.xpp Thu Feb 26 18:57:08 2015
@@ -226,7 +226,7 @@ template <> void rt<int>(int* p, void* p
 
 // unresolved operator-function-id
 // The operator can be encoded using the "on" operator function-id mangling e.g. "DTclonplfp_fp_EE".
-// CHECK-DAG: _Z1gI2S4EDTclplfp_fp_EET_
+// CHECK-DAG: _Z1gI2S4EDTclonplfp_fp_EET_
 struct S4 {
     S4(int a) {}
 };