From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tschwinge@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1643)
 id E02983895FD5; Wed,  8 Jun 2022 12:45:19 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E02983895FD5
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] Fix match tests on 32bit systems
X-Act-Checkin: gcc
X-Git-Author: Philip Herron <philip.herron@embecosm.com>
X-Git-Refname: refs/heads/devel/rust/master
X-Git-Oldrev: 140f6a698b4d7157e6a33cd7b41c27b39ecbf76e
X-Git-Newrev: dd213da6a3bd0587dc1e85a94674f935360ee5af
Message-Id: <20220608124519.E02983895FD5@sourceware.org>
Date: Wed,  8 Jun 2022 12:45:19 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2022 12:45:20 -0000

https://gcc.gnu.org/g:dd213da6a3bd0587dc1e85a94674f935360ee5af

commit dd213da6a3bd0587dc1e85a94674f935360ee5af
Author: Philip Herron <philip.herron@embecosm.com>
Date:   Mon May 9 12:02:22 2022 +0000

    Fix match tests on 32bit systems
    
    Printing i64's on 32bit systems requires the proper format specifier
    this amends these testcases to 32bit integers so %i works as expected.
    I was able to use gdb to verify that these values are computed properly
    from the structure.

Diff:
---
 gcc/testsuite/rust/execute/torture/match1.rs | 2 +-
 gcc/testsuite/rust/execute/torture/match3.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/rust/execute/torture/match1.rs b/gcc/testsuite/rust/execute/torture/match1.rs
index 2393b157324..e5af512f15d 100644
--- a/gcc/testsuite/rust/execute/torture/match1.rs
+++ b/gcc/testsuite/rust/execute/torture/match1.rs
@@ -7,7 +7,7 @@ enum Foo {
     A,
     B,
     C(char),
-    D { x: i64, y: i64 },
+    D { x: i32, y: i32 },
 }
 
 fn inspect(f: Foo) {
diff --git a/gcc/testsuite/rust/execute/torture/match3.rs b/gcc/testsuite/rust/execute/torture/match3.rs
index 3d1fa0cc5e8..8cded3044df 100644
--- a/gcc/testsuite/rust/execute/torture/match3.rs
+++ b/gcc/testsuite/rust/execute/torture/match3.rs
@@ -7,7 +7,7 @@ enum Foo {
     A,
     B,
     C(char),
-    D { x: i64, y: i64 },
+    D { x: i32, y: i32 },
 }
 
 fn inspect(f: Foo) {