From: Florian Krohm <florian@eich-krohm.de>
Date: Mon, 24 Nov 2014 22:30:49 +0000 (+0000)
Subject: Change the testcase to not depend on the type of 'this' in the output.
X-Git-Tag: svn/VALGRIND_3_11_0~803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e3e486d3ef73ca8da82b5b6df87d8db1c17c2e;p=thirdparty%2Fvalgrind.git

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.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14780
---

diff --git a/memcheck/tests/demangle.cpp b/memcheck/tests/demangle.cpp
index 6fb2b988ac..ff15fe12c3 100644
--- a/memcheck/tests/demangle.cpp
+++ b/memcheck/tests/demangle.cpp
@@ -16,7 +16,7 @@ class magic {
 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);
   }
 };
 
diff --git a/memcheck/tests/demangle.stderr.exp b/memcheck/tests/demangle.stderr.exp
index b79c638ae1..2124517f1a 100644
--- a/memcheck/tests/demangle.stderr.exp
+++ b/memcheck/tests/demangle.stderr.exp
@@ -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)