aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2023-11-16 15:01:16 +0000
committerMikael Urankar <mikael@FreeBSD.org>2023-12-08 15:02:25 +0000
commitc926bbff4b173303ba73fef4d582ad0a392274a2 (patch)
tree2957d2783ce99e58bc027c8a786d8c4ce14c2bb4
parent0fd27d9f4ac728b0bae91639f3da879c4800a367 (diff)
downloadports-c926bbff4b173303ba73fef4d582ad0a392274a2.tar.gz
ports-c926bbff4b173303ba73fef4d582ad0a392274a2.zip
lang/rust: Update to 1.74.1
Announce: https://blog.rust-lang.org/2023/12/07/Rust-1.74.0.html https://blog.rust-lang.org/2023/11/16/Rust-1.74.1.html ChangeLog: https://github.com/rust-lang/rust/releases/tag/1.74.0 https://github.com/rust-lang/rust/releases/tag/1.74.1 PR: 275243 Tested by: mikael,pkubaj
Diffstat
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/bsd.gecko.mk2
-rw-r--r--lang/rust-bootstrap/Makefile2
-rw-r--r--lang/rust-bootstrap/distinfo6
-rw-r--r--lang/rust/Makefile6
-rw-r--r--lang/rust/distinfo106
-rw-r--r--lang/rust/files/patch-bug11684534
7 files changed, 60 insertions, 98 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index 18db16f996cd..a82badd3464f 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
CARGO_BUILDDEP?= yes
. if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.73.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.74.0:lang/${RUST_DEFAULT}
. elif ${CARGO_BUILDDEP:tl} == "any-version"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
. endif
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index edde78933267..8cee3eb40db4 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -74,7 +74,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD}
BUNDLE_LIBS= yes
BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \
- ${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT} \
+ ${RUST_DEFAULT}>=1.74.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci
diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
index d61b6e1b93f2..eb36cc56a058 100644
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@@ -2,7 +2,7 @@
# to upload them to ~/public_distfiles on freefall in preparation
# for the next lang/rust update.
PORTNAME= rust
-PORTVERSION= 1.73.0
+PORTVERSION= 1.74.0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/
PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-
diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo
index 8cae2863fbb6..a48712dba104 100644
--- a/lang/rust-bootstrap/distinfo
+++ b/lang/rust-bootstrap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696426328
-SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
-SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536
+TIMESTAMP = 1700146847
+SHA256 (rust/rustc-1.74.0-src.tar.xz) = 23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187
+SIZE (rust/rustc-1.74.0-src.tar.xz) = 155975536
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 0ac1edc1be37..d035127d644b 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rust
-PORTVERSION?= 1.73.0
+PORTVERSION?= 1.74.1
PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/:src \
@@ -69,8 +69,8 @@ WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
_RUST_TARGETS+=wasm32-unknown-unknown
# See WRKSRC/src/stage0.json for the date and version values
-BOOTSTRAPS_DATE?= 2023-08-24
-RUST_BOOTSTRAP_VERSION?= 1.72.0
+BOOTSTRAPS_DATE?= 2023-10-05
+RUST_BOOTSTRAP_VERSION?= 1.73.0
CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 42e0f64c458d..64374eccc626 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,55 +1,51 @@
-TIMESTAMP = 1697357059
-SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
-SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536
-SHA256 (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = f87def3751c86536dc8c2a1ac493d2832bdfb791a31a4782d5f6d47ae384cd5b
-SIZE (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = 54855264
-SHA256 (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 6712823eccc77234fe914992f26c37e72e050c85dc78d81f8bcfd5a6c0177779
-SIZE (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 26185760
-SHA256 (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 957c3061c2d4c9bb03c74c059cdba16da5d8c1ba28ce671d762552e67fe02390
-SIZE (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 8065312
-SHA256 (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 7e913d82625e1fa9daaf89948d657944685be4bc3b5e136a312f9dc4230d72f2
-SIZE (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 46396244
-SHA256 (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = b4982586d84b8d419943083d28f3b3f3992eec99b13dbd7c0a5a8e63bfe3415f
-SIZE (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = 26854796
-SHA256 (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 0fd521fb5bf0e3a58210eeb242a22f24f92a94b886905f4b895bc36782a7dd78
-SIZE (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 8866252
-SHA256 (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = cd8dfc34e5901dd2845835c7c7978f6a5725e15a3925eaba551b49e104355d4b
-SIZE (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = 55045532
-SHA256 (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 519b61de0c56b11f5403a31f5198d93b2109ce7e9777df4899943c97c95c8ee0
-SIZE (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 25630140
-SHA256 (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 90287dcb755268a67c5959c36d21270d04685ee55878d0314998272b32738dc1
-SIZE (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 7944012
-SHA256 (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 103910d967b01ad2a27a886bfca8b64842be9a2b044074f58f56c6cccd2270fe
-SIZE (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 61326204
-SHA256 (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 1747a9d544c759b8fab05a172f90c5eabde9be4b370d564177487be56549ae52
-SIZE (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 26697152
-SHA256 (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = eaed4aef4ad1341ebf990fdd264fb639635bc4840221074534af74e443f45f51
-SIZE (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = 9249016
-SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 43f44d1fd8194921b391d5c46c30163e42742073015dcc713c34ff35a0067bb5
-SIZE (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 60208348
-SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = de731b713a68c6db6e2bf05a02b8fdee0969cdb80dda756c41956d9a00a3194c
-SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = 24553168
-SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = d266f36de042cad9dd310febad76cf8d11ac1f188e2ce751b95841d7724ae4c8
-SIZE (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = 9247480
-SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 333d82f18d75b3fcf9ee7afc578bd0ee09a1a1c1f8f9308d0b1c4f9159ca4d2f
-SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 58536072
-SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = d371b600719dc4f500d6a453d64fc713fba0a188ad6c02c72fe25e2e413468a8
-SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 24770180
-SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = ba4b5d2df913151e70b7d406c49163915b640f7ab6a4360ce0132e5cfa5ad891
-SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 8793828
-SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 44eb1bf540f146fb8fafa7585639b08592f0934e81cc95ae4bfdd7d8662da0ad
-SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 60191980
-SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 656950dca59bf303e40263f92694242ec62d992f08a224c600765254e6a20acc
-SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 24904632
-SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = a2d11bb9a49f91e3da992fd4d8b141d7221c218a7b2e07af4d1bb486ba95253f
-SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 9067788
-SHA256 (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = a0b184b96203a4bd99c78ff61f228f843a6bfbdb6a7c690f1424e55a78c44e41
-SIZE (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 70320872
-SHA256 (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24904a553337220e8b50caaec5fe0309c3ef40c58b57102e2b9ee9131c3b981c
-SIZE (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24923728
-SHA256 (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 52ef515ce550b58954cc71a19696e8bdeee24037273458d4115259725343bd40
-SIZE (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 11394328
-SHA256 (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 5a6b67dfc1218ea953421816834ffe3aa8ac1fc078dfaea4ebab121460ca5211
-SIZE (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 2007
-SHA256 (rust/6ddf9128b2b55f9def80af57f7353d2521527c6a.patch) = 6eaaaf6714c496b610712aa9ecbe1a1614e042323ec872fbf31a0a74c9020f29
-SIZE (rust/6ddf9128b2b55f9def80af57f7353d2521527c6a.patch) = 1278
+TIMESTAMP = 1701965605
+SHA256 (rust/rustc-1.74.1-src.tar.xz) = b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e
+SIZE (rust/rustc-1.74.1-src.tar.xz) = 155968724
+SHA256 (rust/2023-10-05/rustc-1.73.0-aarch64-unknown-freebsd.tar.xz) = 0d9056ba935490d870becfdc46ec451d2218a052c4a51fc8d17efbecf91c3189
+SIZE (rust/2023-10-05/rustc-1.73.0-aarch64-unknown-freebsd.tar.xz) = 57026992
+SHA256 (rust/2023-10-05/rust-std-1.73.0-aarch64-unknown-freebsd.tar.xz) = c4fd3e440d9942d70363260a85e96adfde68ba1205268a7cefc9051c6e7d75b7
+SIZE (rust/2023-10-05/rust-std-1.73.0-aarch64-unknown-freebsd.tar.xz) = 26034952
+SHA256 (rust/2023-10-05/cargo-1.73.0-aarch64-unknown-freebsd.tar.xz) = 0f406952f9b655c79bc8ac795d340cb2e9f64937e9b4cf00792d6f4d5d814b55
+SIZE (rust/2023-10-05/cargo-1.73.0-aarch64-unknown-freebsd.tar.xz) = 7962080
+SHA256 (rust/2023-10-05/rustc-1.73.0-x86_64-unknown-freebsd.tar.xz) = 6ef8e221cf0eece69ea96d78d66a405d828329954a517c9eb52a55127b1ed693
+SIZE (rust/2023-10-05/rustc-1.73.0-x86_64-unknown-freebsd.tar.xz) = 45990144
+SHA256 (rust/2023-10-05/rust-std-1.73.0-x86_64-unknown-freebsd.tar.xz) = 80c37ead26b67bd1c0cfc0de6de4afb654245bb71dc26563f777a20e341d22b8
+SIZE (rust/2023-10-05/rust-std-1.73.0-x86_64-unknown-freebsd.tar.xz) = 26683900
+SHA256 (rust/2023-10-05/cargo-1.73.0-x86_64-unknown-freebsd.tar.xz) = bed55ae43071493fcb54e4b01db28937fe1423044f2f4db3f44b2e1f0ceaddde
+SIZE (rust/2023-10-05/cargo-1.73.0-x86_64-unknown-freebsd.tar.xz) = 8780376
+SHA256 (rust/2023-10-05/rustc-1.73.0-armv7-unknown-freebsd.tar.xz) = fa0bf88e1e564ac1f90f7c5ee9c5b6d6376b5da17692a6f1e4a66254bc6b7845
+SIZE (rust/2023-10-05/rustc-1.73.0-armv7-unknown-freebsd.tar.xz) = 56991736
+SHA256 (rust/2023-10-05/rust-std-1.73.0-armv7-unknown-freebsd.tar.xz) = 8c548fc69dc3a153927ffb9a6e2c07ae3bba4bc1b6ec22facfba02319acba5dd
+SIZE (rust/2023-10-05/rust-std-1.73.0-armv7-unknown-freebsd.tar.xz) = 25389272
+SHA256 (rust/2023-10-05/cargo-1.73.0-armv7-unknown-freebsd.tar.xz) = 5fb9a4202a2ba7e906939f13cf980bfc5ad8a6cb1ea753109825b93b9c8218d4
+SIZE (rust/2023-10-05/cargo-1.73.0-armv7-unknown-freebsd.tar.xz) = 7874284
+SHA256 (rust/2023-10-05/rustc-1.73.0-i686-unknown-freebsd.tar.xz) = 6ffe6f274d40278ed612326d2256753a9c946efe95784f9b45161d5b7140889c
+SIZE (rust/2023-10-05/rustc-1.73.0-i686-unknown-freebsd.tar.xz) = 63833040
+SHA256 (rust/2023-10-05/rust-std-1.73.0-i686-unknown-freebsd.tar.xz) = 4e955c639f12e3a21c14e2cedb2c1a2e66d6a6af21628b0801d6127d94524b45
+SIZE (rust/2023-10-05/rust-std-1.73.0-i686-unknown-freebsd.tar.xz) = 26548660
+SHA256 (rust/2023-10-05/cargo-1.73.0-i686-unknown-freebsd.tar.xz) = 865c042454bfdaea8aab6c6ccaceed69b92bcac31d23a54b0a3d31afc40db14b
+SIZE (rust/2023-10-05/cargo-1.73.0-i686-unknown-freebsd.tar.xz) = 9110520
+SHA256 (rust/2023-10-05/rustc-1.73.0-powerpc-unknown-freebsd.tar.xz) = 917a37b4a5a3f0a683b2ed37091e55a78cf3808df043a40cbfcbfc63546e329b
+SIZE (rust/2023-10-05/rustc-1.73.0-powerpc-unknown-freebsd.tar.xz) = 63186932
+SHA256 (rust/2023-10-05/rust-std-1.73.0-powerpc-unknown-freebsd.tar.xz) = d6e6946d291a4af061d3a65aee6fa3dda9fbba8ef0cb253e73a61f52474d75c2
+SIZE (rust/2023-10-05/rust-std-1.73.0-powerpc-unknown-freebsd.tar.xz) = 24405696
+SHA256 (rust/2023-10-05/cargo-1.73.0-powerpc-unknown-freebsd.tar.xz) = debb0eeaf22d4c7039395921a19359a6ed540c9acd461c3c4bb61e0b498c0ae8
+SIZE (rust/2023-10-05/cargo-1.73.0-powerpc-unknown-freebsd.tar.xz) = 9012108
+SHA256 (rust/2023-10-05/rustc-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 947ec0947529a223acf3a692a77bf529539708c991ba4798b0527a05b9524d95
+SIZE (rust/2023-10-05/rustc-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 60934332
+SHA256 (rust/2023-10-05/rust-std-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 682f2b8f780c778a5f3786beff82f2be78024cec9d267ba285267972cbcce2b7
+SIZE (rust/2023-10-05/rust-std-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 24440160
+SHA256 (rust/2023-10-05/cargo-1.73.0-powerpc64-unknown-freebsd.tar.xz) = ac66a7206e369ad9c4d7f4b515983b905d55133a3cd006766405832b00bce3af
+SIZE (rust/2023-10-05/cargo-1.73.0-powerpc64-unknown-freebsd.tar.xz) = 8622704
+SHA256 (rust/2023-10-05/rustc-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 77d4dc0d889df6f7d2126b4fd9cd25b859b3879e55d55ac24947b42e59d2924b
+SIZE (rust/2023-10-05/rustc-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 62706356
+SHA256 (rust/2023-10-05/rust-std-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = a2351e3023ce34d439009ec2d2f9eae04f64e184ad62b04b1fa8bcfdc70f9d07
+SIZE (rust/2023-10-05/rust-std-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 24539480
+SHA256 (rust/2023-10-05/cargo-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 853085474edd0dbcfb2bc8b79564217595b162dc87c97322e20370f4ce462167
+SIZE (rust/2023-10-05/cargo-1.73.0-powerpc64le-unknown-freebsd.tar.xz) = 8845024
+SHA256 (rust/2023-10-05/rustc-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = a79a9691e1a26e627a4ef963e94b08eecf4f91ff5d63329aa76a6f9add9d2bfc
+SIZE (rust/2023-10-05/rustc-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 72704312
+SHA256 (rust/2023-10-05/rust-std-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = a85c4670d5d9c4d0ccfe2dbf366f227597c65c2b88fdb11a36991345cbe5e194
+SIZE (rust/2023-10-05/rust-std-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 24553484
+SHA256 (rust/2023-10-05/cargo-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 5d35edc0a333903844be52075020aedfe5de06ec1af96d35ff327536a25bc6c6
+SIZE (rust/2023-10-05/cargo-1.73.0-riscv64gc-unknown-freebsd.tar.xz) = 11004428
diff --git a/lang/rust/files/patch-bug116845 b/lang/rust/files/patch-bug116845
deleted file mode 100644
index a8ed00dfa805..000000000000
--- a/lang/rust/files/patch-bug116845
+++ /dev/null
@@ -1,34 +0,0 @@
-From 491a91e8eea27fab4d8123cbfbb01bf1cf251b9c Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Thu, 12 Oct 2023 09:32:17 +0200
-Subject: [PATCH] [PowerPC] Use zext instead of anyext in custom and combine
- (#68784)
-
-This custom combine currently converts `and(anyext(x),c)` into
-`anyext(and(x,c))`. This is not correct, because the original expression
-guaranteed that the high bits are zero, while the new one sets them to
-undef.
-
-Emit `zext(and(x,c))` instead.
-
-Fixes https://github.com/llvm/llvm-project/issues/68783.
-
-(cherry picked from commit 127ed9ae266ead58aa525f74f4c86841f6674793)
----
- llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 2 +-
- llvm/test/CodeGen/PowerPC/and-extend-combine.ll | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
-index 3ed0a261eb769a1..d4d2da55160e552 100644
---- src/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
-+++ src/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -15527,7 +15527,7 @@ SDValue PPCTargetLowering::PerformDAGCombine(SDNode *N,
- break;
- SDValue ConstOp = DAG.getConstant(Imm, dl, MVT::i32);
- SDValue NarrowAnd = DAG.getNode(ISD::AND, dl, MVT::i32, NarrowOp, ConstOp);
-- return DAG.getAnyExtOrTrunc(NarrowAnd, dl, N->getValueType(0));
-+ return DAG.getZExtOrTrunc(NarrowAnd, dl, N->getValueType(0));
- }
- case ISD::SHL:
- return combineSHL(N, DCI);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 07:38:26 +0000