about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-12-05 12:55:36 +0000
committerbors <bors@rust-lang.org>2022-12-05 12:55:36 +0000
commit552b63c1619498f1a17fd482f4bb87815d8fdc48 (patch)
tree3463b86894affc4a8aee0f10ac9dcfbe0cdc4de1 /src/test/codegen
parentfaec28970f86f52ca37e0e8cec0a447ba2f1393b (diff)
parent7481ba7746fc5f5b82aaff0fe20cbf55c48d8fd9 (diff)
downloadrust-552b63c1619498f1a17fd482f4bb87815d8fdc48.tar.gz
rust-552b63c1619498f1a17fd482f4bb87815d8fdc48.zip
Auto merge of #2715 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/enum-match.rs7
-rw-r--r--src/test/codegen/naked-nocoverage.rs19
2 files changed, 21 insertions, 5 deletions
diff --git a/src/test/codegen/enum-match.rs b/src/test/codegen/enum-match.rs
index efab189fd7b..44f1b408d21 100644
--- a/src/test/codegen/enum-match.rs
+++ b/src/test/codegen/enum-match.rs
@@ -34,11 +34,8 @@ pub enum Enum1 {
 
 // CHECK: define i8 @match1{{.*}}
 // CHECK-NEXT: start:
-// CHECK-NEXT: %1 = icmp ugt i8 %0, 1
-// CHECK-NEXT: %2 = zext i8 %0 to i64
-// CHECK-NEXT: %3 = add nsw i64 %2, -1
-// CHECK-NEXT: %_2 = select i1 %1, i64 %3, i64 0
-// CHECK-NEXT: switch i64 %_2, label {{.*}} [
+// CHECK-NEXT: %1 = {{.*}}call i8 @llvm.usub.sat.i8(i8 %0, i8 1)
+// CHECK-NEXT: switch i8 %1, label {{.*}} [
 #[no_mangle]
 pub fn match1(e: Enum1) -> u8 {
     use Enum1::*;
diff --git a/src/test/codegen/naked-nocoverage.rs b/src/test/codegen/naked-nocoverage.rs
new file mode 100644
index 00000000000..91a6260bf2a
--- /dev/null
+++ b/src/test/codegen/naked-nocoverage.rs
@@ -0,0 +1,19 @@
+// Checks that naked functions are not instrumented by -Cinstrument-coverage.
+// Regression test for issue #105170.
+//
+// needs-asm-support
+// needs-profiler-support
+// compile-flags: -Cinstrument-coverage
+#![crate_type = "lib"]
+#![feature(naked_functions)]
+use std::arch::asm;
+
+#[naked]
+#[no_mangle]
+pub unsafe extern "C" fn f() {
+    // CHECK:       define void @f()
+    // CHECK-NEXT:  start:
+    // CHECK-NEXT:    call void asm
+    // CHECK-NEXT:    unreachable
+    asm!("", options(noreturn));
+}