View | Details | Raw Unified | Return to bug 274499 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/firefox/files/patch-rust-1.73.0 (-2 / +83 lines)
Added Link Here
0
- 
1
From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
2
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
3
Date: Mon, 10 Jul 2023 09:46:53 +0000
4
Subject: [PATCH] Stop using old-style `simd_shuffle`
5
6
---
7
 src/codegen/llvm.rs | 20 +++++++-------------
8
 1 file changed, 7 insertions(+), 13 deletions(-)
9
10
diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
11
index b4c09849..bb482fac 100644
12
--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
13
+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
14
@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
15
 #[allow(unused_imports)] // FIXME: spurious warning?
16
 use crate::sealed::Simd;
17
 
18
-// Shuffle intrinsics: expanded in users' crates, therefore public.
19
 extern "platform-intrinsic" {
20
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
21
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
22
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
23
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
24
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
25
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
26
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
27
 }
28
 
29
 #[allow(clippy::missing_safety_doc)]
30
@@ -22,7 +16,7 @@ where
31
     T: Simd,
32
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
33
 {
34
-    simd_shuffle2(x, y, IDX)
35
+    simd_shuffle(x, y, IDX)
36
 }
37
 
38
 #[allow(clippy::missing_safety_doc)]
39
@@ -32,7 +26,7 @@ where
40
     T: Simd,
41
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
42
 {
43
-    simd_shuffle4(x, y, IDX)
44
+    simd_shuffle(x, y, IDX)
45
 }
46
 
47
 #[allow(clippy::missing_safety_doc)]
48
@@ -42,7 +36,7 @@ where
49
     T: Simd,
50
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
51
 {
52
-    simd_shuffle8(x, y, IDX)
53
+    simd_shuffle(x, y, IDX)
54
 }
55
 
56
 #[allow(clippy::missing_safety_doc)]
57
@@ -52,7 +46,7 @@ where
58
     T: Simd,
59
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
60
 {
61
-    simd_shuffle16(x, y, IDX)
62
+    simd_shuffle(x, y, IDX)
63
 }
64
 
65
 #[allow(clippy::missing_safety_doc)]
66
@@ -62,7 +56,7 @@ where
67
     T: Simd,
68
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
69
 {
70
-    simd_shuffle32(x, y, IDX)
71
+    simd_shuffle(x, y, IDX)
72
 }
73
 
74
 #[allow(clippy::missing_safety_doc)]
75
@@ -72,7 +66,7 @@ where
76
     T: Simd,
77
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
78
 {
79
-    simd_shuffle64(x, y, IDX)
80
+    simd_shuffle(x, y, IDX)
81
 }
82
 
83
 extern "platform-intrinsic" {
1
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
84
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
2
  |
85
  |
3
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
86
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4
--
5
www/tor-browser/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++
87
www/tor-browser/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++
6
1 file changed, 83 insertions(+)
88
1 file changed, 83 insertions(+)
7
create mode 100644 www/tor-browser/files/patch-rust-1.73.0
89
create mode 100644 www/tor-browser/files/patch-rust-1.73.0
(-)b/www/tor-browser/files/patch-rust-1.73.0 (-2 / +83 lines)
Added Link Here
0
- 
1
From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
2
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
3
Date: Mon, 10 Jul 2023 09:46:53 +0000
4
Subject: [PATCH] Stop using old-style `simd_shuffle`
5
6
---
7
 src/codegen/llvm.rs | 20 +++++++-------------
8
 1 file changed, 7 insertions(+), 13 deletions(-)
9
10
diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
11
index b4c09849..bb482fac 100644
12
--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
13
+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
14
@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
15
 #[allow(unused_imports)] // FIXME: spurious warning?
16
 use crate::sealed::Simd;
17
 
18
-// Shuffle intrinsics: expanded in users' crates, therefore public.
19
 extern "platform-intrinsic" {
20
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
21
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
22
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
23
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
24
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
25
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
26
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
27
 }
28
 
29
 #[allow(clippy::missing_safety_doc)]
30
@@ -22,7 +16,7 @@ where
31
     T: Simd,
32
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
33
 {
34
-    simd_shuffle2(x, y, IDX)
35
+    simd_shuffle(x, y, IDX)
36
 }
37
 
38
 #[allow(clippy::missing_safety_doc)]
39
@@ -32,7 +26,7 @@ where
40
     T: Simd,
41
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
42
 {
43
-    simd_shuffle4(x, y, IDX)
44
+    simd_shuffle(x, y, IDX)
45
 }
46
 
47
 #[allow(clippy::missing_safety_doc)]
48
@@ -42,7 +36,7 @@ where
49
     T: Simd,
50
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
51
 {
52
-    simd_shuffle8(x, y, IDX)
53
+    simd_shuffle(x, y, IDX)
54
 }
55
 
56
 #[allow(clippy::missing_safety_doc)]
57
@@ -52,7 +46,7 @@ where
58
     T: Simd,
59
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
60
 {
61
-    simd_shuffle16(x, y, IDX)
62
+    simd_shuffle(x, y, IDX)
63
 }
64
 
65
 #[allow(clippy::missing_safety_doc)]
66
@@ -62,7 +56,7 @@ where
67
     T: Simd,
68
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
69
 {
70
-    simd_shuffle32(x, y, IDX)
71
+    simd_shuffle(x, y, IDX)
72
 }
73
 
74
 #[allow(clippy::missing_safety_doc)]
75
@@ -72,7 +66,7 @@ where
76
     T: Simd,
77
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
78
 {
79
-    simd_shuffle64(x, y, IDX)
80
+    simd_shuffle(x, y, IDX)
81
 }
82
 
83
 extern "platform-intrinsic" {
1
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
84
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
2
  |
85
  |
3
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
86
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4
--
5
www/librewolf/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++
87
www/librewolf/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++
6
1 file changed, 83 insertions(+)
88
1 file changed, 83 insertions(+)
7
create mode 100644 www/librewolf/files/patch-rust-1.73.0
89
create mode 100644 www/librewolf/files/patch-rust-1.73.0
(-)b/www/librewolf/files/patch-rust-1.73.0 (-1 / +83 lines)
Added Link Here
0
- 
1
From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
2
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
3
Date: Mon, 10 Jul 2023 09:46:53 +0000
4
Subject: [PATCH] Stop using old-style `simd_shuffle`
5
6
---
7
 src/codegen/llvm.rs | 20 +++++++-------------
8
 1 file changed, 7 insertions(+), 13 deletions(-)
9
10
diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
11
index b4c09849..bb482fac 100644
12
--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
13
+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
14
@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
15
 #[allow(unused_imports)] // FIXME: spurious warning?
16
 use crate::sealed::Simd;
17
 
18
-// Shuffle intrinsics: expanded in users' crates, therefore public.
19
 extern "platform-intrinsic" {
20
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
21
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
22
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
23
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
24
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
25
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
26
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
27
 }
28
 
29
 #[allow(clippy::missing_safety_doc)]
30
@@ -22,7 +16,7 @@ where
31
     T: Simd,
32
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
33
 {
34
-    simd_shuffle2(x, y, IDX)
35
+    simd_shuffle(x, y, IDX)
36
 }
37
 
38
 #[allow(clippy::missing_safety_doc)]
39
@@ -32,7 +26,7 @@ where
40
     T: Simd,
41
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
42
 {
43
-    simd_shuffle4(x, y, IDX)
44
+    simd_shuffle(x, y, IDX)
45
 }
46
 
47
 #[allow(clippy::missing_safety_doc)]
48
@@ -42,7 +36,7 @@ where
49
     T: Simd,
50
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
51
 {
52
-    simd_shuffle8(x, y, IDX)
53
+    simd_shuffle(x, y, IDX)
54
 }
55
 
56
 #[allow(clippy::missing_safety_doc)]
57
@@ -52,7 +46,7 @@ where
58
     T: Simd,
59
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
60
 {
61
-    simd_shuffle16(x, y, IDX)
62
+    simd_shuffle(x, y, IDX)
63
 }
64
 
65
 #[allow(clippy::missing_safety_doc)]
66
@@ -62,7 +56,7 @@ where
67
     T: Simd,
68
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
69
 {
70
-    simd_shuffle32(x, y, IDX)
71
+    simd_shuffle(x, y, IDX)
72
 }
73
 
74
 #[allow(clippy::missing_safety_doc)]
75
@@ -72,7 +66,7 @@ where
76
     T: Simd,
77
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
78
 {
79
-    simd_shuffle64(x, y, IDX)
80
+    simd_shuffle(x, y, IDX)
81
 }
82
 
83
 extern "platform-intrinsic" {

Return to bug 274499