From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 10 Nov 2015 08:27:32 +0000 (+0100)
Subject: Use --vex-iropt-precise-memory-exns=yes for valgrind < 3.8.0
X-Git-Tag: php-7.0.1RC1~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccf8b54b89afdf380a2219fab0ac73d199faa54b;p=php

Use --vex-iropt-precise-memory-exns=yes for valgrind < 3.8.0
---

diff --git a/run-tests.php b/run-tests.php
index f3d4a27b15..a607f1cda2 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1877,11 +1877,13 @@ TEST $file
 		$env['ZEND_DONT_UNLOAD_MODULES'] = 1;
 
 		/* --vex-iropt-register-updates=allregs-at-mem-access is necessary for phpdbg watchpoint tests */
-		if (version_compare($valgrind_version, '3.3.0', '>=')) {
+		if (version_compare($valgrind_version, '3.8.0', '>=')) {
 			/* valgrind 3.3.0+ doesn't have --log-file-exactly option */
 			$cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-register-updates=allregs-at-mem-access --log-file=$memcheck_filename $cmd";
+		} elseif (version_compare($valgrind_version, '3.3.0', '>=')) {
+			$cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-precise-memory-exns=yes --log-file=$memcheck_filename $cmd";
 		} else {
-			$cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-register-updates=allregs-at-mem-access --log-file-exactly=$memcheck_filename $cmd";
+			$cmd = "valgrind -q --tool=memcheck --trace-children=yes --vex-iropt-precise-memory-exns=yes --log-file-exactly=$memcheck_filename $cmd";
 		}
 
 	} else {