[gcc(refs/vendors/riscv/heads/gcc-14-with-riscv-opts)] [target/116104] Fix test guarding UINTVAL to extract shift count

[Jeff Law via Gcc-cvs]

https://gcc.gnu.org/g:6ca3dabccff3d3cb8ea1a67be38373eebca521c4

commit 6ca3dabccff3d3cb8ea1a67be38373eebca521c4
Author: Jeff Law <j...@ventanamicro.com>
Date:   Mon Jul 29 16:17:25 2024 -0600

    [target/116104] Fix test guarding UINTVAL to extract shift count
    
    Minor oversight in the ext-dce bits.  If the shift count is a constant 
vector,
    then we shouldn't be extracting values with [U]INTVAL.  We guarded that test
    with CONSTANT_P, when it should have been CONSTANT_INT_P.
    
    Shows up on gcn, but I wouldn't be terribly surprised if it could be 
triggered
    elsewhere.
    
    Verified the testcase compiles on gcn.  Haven't done a libgcc build for gcn
    though.  Also verified x86 bootstraps and regression tests cleanly.
    
    Pushing to the trunk.
    
            PR target/116104
    gcc/
            * ext-dce.cc (carry_backpropagate): Fix test guarding UINTVAL
            extraction of shift count.
    
    (cherry picked from commit 5ab9a351247a551c47b0ab9d8e8b907223e7faf6)

Diff:
---
 gcc/ext-dce.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/ext-dce.cc b/gcc/ext-dce.cc
index 2e371fefba0..86d7f950e35 100644
--- a/gcc/ext-dce.cc
+++ b/gcc/ext-dce.cc
@@ -493,7 +493,7 @@ carry_backpropagate (unsigned HOST_WIDE_INT mask, enum 
rtx_code code, rtx x)
     /* We propagate for the shifted operand, but not the shift
        count.  The count is handled specially.  */
     case ASHIFT:
-      if (CONSTANT_P (XEXP (x, 1))
+      if (CONST_INT_P (XEXP (x, 1))
          && known_lt (UINTVAL (XEXP (x, 1)), GET_MODE_BITSIZE (mode)))
        return mask >> INTVAL (XEXP (x, 1));
       return (2ULL << floor_log2 (mask)) - 1;