FreeBSD regtest: clobber R11 for memcheck/tests/leak_cpp_interior

diff --git a/memcheck/tests/leak.h b/memcheck/tests/leak.h
index 6b445032769e47c3ab6eac7993df00b8528dc048..6d3a5f4404f57f2df5f7f75b4ba1bc425219211a 100644 (file)
--- a/memcheck/tests/leak.h
+++ b/memcheck/tests/leak.h
@@ -148,6 +148,11 @@
    do {                                                                      \
       __asm__ __volatile__ ("movl $0, %ecx\n\t"); \
    } while (0)
+#elif defined (__clang__) && defined(VGA_amd64)
+#define CLEAR_CALLER_SAVED_REGS                                              \
+   do {                                                                      \
+      __asm__ __volatile__ ("movq $0, %r11\n\t"); \
+   } while (0)
 #elif defined(__arm__)
 /* 32bit arm */
 #define CLEAR_CALLER_SAVED_REGS                                              \

diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp
index 56c53709d1e0463cf4a2d7aff7c94133eb12388c..abfd0d1c245ee223b93d26431c170353a0089e95 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.cpp
+++ b/memcheck/tests/leak_cpp_interior.cpp
@@ -8,6 +8,7 @@
 #include <string>
 #include <sstream>
 #include "../memcheck.h"
+#include "leak.h"
 // Derived from test provided by Timur Iskhodzhanov (bug 280271)
 
 class MyClass
@@ -132,6 +133,7 @@ void doit(void)
 int main() {
 
    doit();
+   CLEAR_CALLER_SAVED_REGS;
    (void) VALGRIND_MONITOR_COMMAND("v.set log_output");
 
    fprintf(stderr, "VALGRIND_DO_LEAK_CHECK\n");

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp
index ae3ae23b27c5180044f6800bcb85c9871fd04ca6..6b6c5dc8e989bbc9d43a263e9e5ae58e9a4ed4da 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 x bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:119)
-   by 0x........: main (leak_cpp_interior.cpp:134)
+   by 0x........: doit() (leak_cpp_interior.cpp:120)
+   by 0x........: main (leak_cpp_interior.cpp:135)
 
 LEAK SUMMARY:
    definitely lost: x bytes in 1 blocks

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
index 5c85d99176bbb0d77c503b1a2aad490408558d94..02e5968ae2e337731ab4a48800950fb9381d68a1 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 x bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:119)
-   by 0x........: main (leak_cpp_interior.cpp:134)
+   by 0x........: doit() (leak_cpp_interior.cpp:120)
+   by 0x........: main (leak_cpp_interior.cpp:135)
 
 LEAK SUMMARY:
    definitely lost: x bytes in 1 blocks

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-arm b/memcheck/tests/leak_cpp_interior.stderr.exp-arm
index 6f0a81f753d1b4062173c8fc0800792ff8c59b0b..a236c7777f8ee3670cd2c163c3d925154e76b8c2 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-arm
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-arm
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 x bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:119)
-   by 0x........: main (leak_cpp_interior.cpp:134)
+   by 0x........: doit() (leak_cpp_interior.cpp:120)
+   by 0x........: main (leak_cpp_interior.cpp:135)
 
 x bytes in 1 blocks are possibly lost in loss record ... of ...
    by 0x........: doit() (leak_cpp_interior.cpp:109)

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd b/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd
index ac9e462b38832e98d837a02e2db394c6cc3faf17..52ead5fa9a34033e972715375259b0a0693a053d 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 x bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:119)
-   by 0x........: main (leak_cpp_interior.cpp:134)
+   by 0x........: doit() (leak_cpp_interior.cpp:120)
+   by 0x........: main (leak_cpp_interior.cpp:135)
 
 LEAK SUMMARY:
    definitely lost: x bytes in 1 blocks

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd-32bit b/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd-32bit
index 4f1cc7a2d8e726f81104d64a5dbaad8703dfb4ad..a6a654769e2b3d37434e65e033917ef8aeceafbe 100644 (file)
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd-32bit
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-freebsd-32bit
@@ -2,8 +2,8 @@
 valgrind output will go to log
 VALGRIND_DO_LEAK_CHECK
 x bytes in 1 blocks are definitely lost in loss record ... of ...
-   by 0x........: doit() (leak_cpp_interior.cpp:119)
-   by 0x........: main (leak_cpp_interior.cpp:134)
+   by 0x........: doit() (leak_cpp_interior.cpp:120)
+   by 0x........: main (leak_cpp_interior.cpp:135)
 
 LEAK SUMMARY:
    definitely lost: x bytes in 1 blocks