From: Florian Krohm <flo2030@eich-krohm.de>
Date: Sun, 28 Jun 2026 08:15:15 +0000 (+0000)
Subject: s390: Remove invalid asserts in s390_amode_bx...
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e26da05f5d8bfeb385ea5b874e80942af9f800;p=thirdparty%2Fvalgrind.git

s390: Remove invalid asserts in s390_amode_bx...

Amodes are constructed before registers are allocated. This means
that registers passed in to the amode constructors are typically
virtual and thusly have a 0 register number. So these asserts would fire.
This has not surfaced yet because currently no BX12 and BX20 amodes
are being constructed.
Constructing BX12 and BX20 amodes wouldn't be a bad thing. So I'm
not removing those functions.
---

diff --git a/VEX/priv/host_s390_defs.c b/VEX/priv/host_s390_defs.c
index e2440095c..e39898760 100644
--- a/VEX/priv/host_s390_defs.c
+++ b/VEX/priv/host_s390_defs.c
@@ -217,8 +217,6 @@ s390_amode_bx12(Int d, HReg b, HReg x)
    s390_amode *am = LibVEX_Alloc_inline(sizeof(s390_amode));
 
    vassert(fits_unsigned_12bit(d));
-   vassert(hregNumber(b) != 0);
-   vassert(hregNumber(x) != 0);
 
    am->tag = S390_AMODE_BX12;
    am->d = d;
@@ -236,8 +234,6 @@ s390_amode_bx20(Int d, HReg b, HReg x)
    s390_amode *am = LibVEX_Alloc_inline(sizeof(s390_amode));
 
    vassert(fits_signed_20bit(d));
-   vassert(hregNumber(b) != 0);
-   vassert(hregNumber(x) != 0);
 
    am->tag = S390_AMODE_BX20;
    am->d = d;