From 9d45e0e0b4593b824917bfae71e5161973eb7a11 Mon Sep 17 00:00:00 2001
From: Vin Singh <theshampoofactory@gmail.com>
Date: Wed, 8 Dec 2021 12:01:13 +0000
Subject: Revert #26494 regression

---
 src/test/codegen/array-equality.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/test/codegen/array-equality.rs')

diff --git a/src/test/codegen/array-equality.rs b/src/test/codegen/array-equality.rs
index fefc232b490..c6b57ee5429 100644
--- a/src/test/codegen/array-equality.rs
+++ b/src/test/codegen/array-equality.rs
@@ -1,5 +1,6 @@
 // compile-flags: -O
 // only-x86_64
+// ignore-test will need to be rewritten if pull accepted
 
 #![crate_type = "lib"]
 
-- 
cgit 1.4.1-3-g733a5


From 8e985376d43f94dd7e00cd58d5a13778be3be918 Mon Sep 17 00:00:00 2001
From: Scott McMurray <scottmcm@users.noreply.github.com>
Date: Fri, 10 Dec 2021 01:53:13 -0800
Subject: Redo the array-equality codegen tests for the different threshold

---
 src/test/codegen/array-equality.rs | 41 ++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

(limited to 'src/test/codegen/array-equality.rs')

diff --git a/src/test/codegen/array-equality.rs b/src/test/codegen/array-equality.rs
index c6b57ee5429..8dce004b54a 100644
--- a/src/test/codegen/array-equality.rs
+++ b/src/test/codegen/array-equality.rs
@@ -1,25 +1,24 @@
 // compile-flags: -O
 // only-x86_64
-// ignore-test will need to be rewritten if pull accepted
 
 #![crate_type = "lib"]
 
 // CHECK-LABEL: @array_eq_value
 #[no_mangle]
-pub fn array_eq_value(a: [u16; 6], b: [u16; 6]) -> bool {
+pub fn array_eq_value(a: [u16; 3], b: [u16; 3]) -> bool {
     // CHECK-NEXT: start:
-    // CHECK-NEXT: %2 = icmp eq i96 %0, %1
+    // CHECK-NEXT: %2 = icmp eq i48 %0, %1
     // CHECK-NEXT: ret i1 %2
     a == b
 }
 
 // CHECK-LABEL: @array_eq_ref
 #[no_mangle]
-pub fn array_eq_ref(a: &[u16; 6], b: &[u16; 6]) -> bool {
+pub fn array_eq_ref(a: &[u16; 3], b: &[u16; 3]) -> bool {
     // CHECK: start:
-    // CHECK: load i96, i96* %{{.+}}, align 2
-    // CHECK: load i96, i96* %{{.+}}, align 2
-    // CHECK: icmp eq i96
+    // CHECK: load i48, i48* %{{.+}}, align 2
+    // CHECK: load i48, i48* %{{.+}}, align 2
+    // CHECK: icmp eq i48
     // CHECK-NEXT: ret
     a == b
 }
@@ -48,11 +47,33 @@ pub fn array_eq_long(a: &[u16; 1234], b: &[u16; 1234]) -> bool {
     a == b
 }
 
-// CHECK-LABEL: @array_eq_zero(i128 %0)
+// CHECK-LABEL: @array_eq_zero_short(i48
 #[no_mangle]
-pub fn array_eq_zero(x: [u16; 8]) -> bool {
+pub fn array_eq_zero_short(x: [u16; 3]) -> bool {
     // CHECK-NEXT: start:
-    // CHECK-NEXT: %[[EQ:.+]] = icmp eq i128 %0, 0
+    // CHECK-NEXT: %[[EQ:.+]] = icmp eq i48 %0, 0
+    // CHECK-NEXT: ret i1 %[[EQ]]
+    x == [0; 3]
+}
+
+// CHECK-LABEL: @array_eq_zero_mid([8 x i16]*
+#[no_mangle]
+pub fn array_eq_zero_mid(x: [u16; 8]) -> bool {
+    // CHECK-NEXT: start:
+    // CHECK-NEXT: bitcast
+    // CHECK-NEXT: %[[LOAD:.+]] = load i128,
+    // CHECK-NEXT: %[[EQ:.+]] = icmp eq i128 %[[LOAD]], 0
     // CHECK-NEXT: ret i1 %[[EQ]]
     x == [0; 8]
 }
+
+// CHECK-LABEL: @array_eq_zero_long([1234 x i16]*
+#[no_mangle]
+pub fn array_eq_zero_long(x: [u16; 1234]) -> bool {
+    // CHECK-NEXT: start:
+    // CHECK-NOT: alloca
+    // CHECK: %[[CMP:.+]] = tail call i32 @{{bcmp|memcmp}}(
+    // CHECK-NEXT: %[[EQ:.+]] = icmp eq i32 %[[CMP]], 0
+    // CHECK-NEXT: ret i1 %[[EQ]]
+    x == [0; 1234]
+}
-- 
cgit 1.4.1-3-g733a5