[Valgrind-developers] Valgrind: r14780 - in /trunk/memcheck/tests: demangle.cpp demangle.stderr.exp

[<sv...@va...>]

Author: florian
Date: Mon Nov 24 22:30:49 2014
New Revision: 14780

Log:
Change the testcase to not depend on the type of 'this' in the output.
GCC 4.9.2 and GCC 4.8.x have different opinions about that variable's type.

Modified:
    trunk/memcheck/tests/demangle.cpp
    trunk/memcheck/tests/demangle.stderr.exp

Modified: trunk/memcheck/tests/demangle.cpp
==============================================================================
--- trunk/memcheck/tests/demangle.cpp (original)
+++ trunk/memcheck/tests/demangle.cpp Mon Nov 24 22:30:49 2014
@@ -16,7 +16,7 @@
 public:
   T xyzzy(T *p)
   {
-    return (new abc::def<int,typeof(this)>)->xyzzy(p, 0);
+    return (new abc::def<int,typeof(*this)>)->xyzzy(p, 0);
   }
 };
 

Modified: trunk/memcheck/tests/demangle.stderr.exp
==============================================================================
--- trunk/memcheck/tests/demangle.stderr.exp (original)
+++ trunk/memcheck/tests/demangle.stderr.exp Mon Nov 24 22:30:49 2014
@@ -1,6 +1,6 @@
 
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: abc::def<int, magic<int>* const>::xyzzy(int*, magic<int>* const*) (demangle.cpp:9)
+   at 0x........: abc::def<int, magic<int> >::xyzzy(int*, magic<int>*) (demangle.cpp:9)
    by 0x........: magic<int>::xyzzy(int*) (demangle.cpp:19)
    by 0x........: main (demangle.cpp:27)