From: Andreas Arnez <arnez@linux.ibm.com>
Date: Tue, 11 Feb 2020 17:02:38 +0000 (+0100)
Subject: s390x: Activate "grail"
X-Git-Tag: VALGRIND_3_16_0~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd627dc127a6767c497f027de6eab634815f7861;p=thirdparty%2Fvalgrind.git

s390x: Activate "grail"

Now that the known problems with activating "grail" on s390x have been
fixed, there is no need to disable it for s390x guests any more.  Remove
the appropriate check in "guest_generic_bb_to_IR.c".
---

diff --git a/VEX/priv/guest_generic_bb_to_IR.c b/VEX/priv/guest_generic_bb_to_IR.c
index 7bc7b6dbba..5932eb8043 100644
--- a/VEX/priv/guest_generic_bb_to_IR.c
+++ b/VEX/priv/guest_generic_bb_to_IR.c
@@ -1449,11 +1449,6 @@ IRSB* bb_to_IR (
       // hope of identifying and recovering, an "A && B" condition spread across
       // two basic blocks.
       if (irsb_be.tag == Be_Cond
-          /* sewardj 2019Nov30: Alas, chasing cond branches on s390 causes
-             Memcheck to crash, for as-yet unknown reasons.  It also exposes
-             some unhandled Iex_ITE cases in the s390x instruction selector.
-             For now, disable. */
-          && arch_guest != VexArchS390X
           /* sewardj 2019Dec14: It also causes crashing on MIPS, even for
              --tool=none. */
           && arch_guest != VexArchMIPS64 && arch_guest != VexArchMIPS32)