From cc0b718aaa35bfb2a9ca5dd59078ae7e54dbc4bb Mon Sep 17 00:00:00 2001
From: Olivia Crain <olivia@olivia.dev>
Date: Thu, 15 Oct 2020 08:40:40 -0500
Subject: [PATCH] Mark inout asm! operands as used in liveness pass

---
 compiler/rustc_passes/src/liveness.rs        |  2 +-
 src/test/ui/liveness/liveness-issue-77915.rs | 36 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/liveness/liveness-issue-77915.rs

diff --git a/compiler/rustc_passes/src/liveness.rs b/compiler/rustc_passes/src/liveness.rs
index ae810b9e79a5..7288015e1702 100644
--- a/compiler/rustc_passes/src/liveness.rs
+++ b/compiler/rustc_passes/src/liveness.rs
@@ -1174,7 +1174,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
                             }
                         }
                         hir::InlineAsmOperand::InOut { expr, .. } => {
-                            succ = self.write_place(expr, succ, ACC_READ | ACC_WRITE);
+                            succ = self.write_place(expr, succ, ACC_READ | ACC_WRITE | ACC_USE);
                         }
                         hir::InlineAsmOperand::SplitInOut { out_expr, .. } => {
                             if let Some(expr) = out_expr {
diff --git a/src/test/ui/liveness/liveness-issue-77915.rs b/src/test/ui/liveness/liveness-issue-77915.rs
new file mode 100644
index 000000000000..300e4ad8b010
--- /dev/null
+++ b/src/test/ui/liveness/liveness-issue-77915.rs
@@ -0,0 +1,36 @@
+// Ensure inout asm! operands are marked as used by the liveness pass
+
+// only-x86_64
+// check-pass
+
+#![feature(asm)]
+#![allow(dead_code)]
+#![deny(unused_variables)]
+
+// Tests the single variable inout case
+unsafe fn rep_movsb(mut dest: *mut u8, mut src: *const u8, mut n: usize) -> *mut u8 {
+    while n != 0 {
+        asm!(
+            "rep movsb",
+            inout("rcx") n,
+            inout("rsi") src,
+            inout("rdi") dest,
+        );
+    }
+    dest
+}
+
+// Tests the split inout case
+unsafe fn rep_movsb2(mut dest: *mut u8, mut src: *const u8, mut n: usize) -> *mut u8 {
+    while n != 0 {
+        asm!(
+            "rep movsb",
+            inout("rcx") n,
+            inout("rsi") src => src,
+            inout("rdi") dest,
+        );
+    }
+    dest
+}
+
+fn main() {}