ASSERT/PRODUCT usage on s390 is complicated but on the other hand for PPC the code is pretty much self explanatory & intuitive to understand. I suggest that We do the same for s390x as well. Other than that I'm planning to guard assert statements with ASSERT to align s390-arch code a bit with PPC.