[PATCH] D51829: [MachineInstr] In addRegisterKilled and addRegisterDead, don't remove operands from inline assembly instructions if they have an associated flag operand.

[Phabricator via Phabricator via llvm-commits]

This revision was not accepted when it landed; it landed in state "Needs Revision".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL342176: [MachineInstr] In addRegisterKilled and addRegisterDead, don't remove operands… (authored by ctopper, committed by ).

Repository:
  rL LLVM

https://reviews.llvm.org/D51829

Files:
  llvm/trunk/lib/CodeGen/MachineInstr.cpp
  llvm/trunk/test/CodeGen/X86/ms-inline-asm-redundant-clobber.ll


Index: llvm/trunk/test/CodeGen/X86/ms-inline-asm-redundant-clobber.ll
===================================================================
--- llvm/trunk/test/CodeGen/X86/ms-inline-asm-redundant-clobber.ll
+++ llvm/trunk/test/CodeGen/X86/ms-inline-asm-redundant-clobber.ll
@@ -0,0 +1,24 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu | FileCheck %s
+
+; This used to crash due to Live Variable analysis removing the redundant eax
+; and edx clobbers, but not removing the inline asm flag operands that proceed
+; them.
+
+ at test_mem = dso_local global [16 x i8] c"UUUUUUUUUUUUUUUU", align 16
+
+; Function Attrs: nounwind uwtable
+define dso_local void @foo() local_unnamed_addr {
+; CHECK-LABEL: foo:
+; CHECK:       # %bb.0: # %entry
+; CHECK-NEXT:    #APP
+; CHECK:         clc
+; CHECK-NEXT:    cmpxchg8b {{.*}}(%rip)
+; CHECK-NEXT:    cmpxchg16b {{.*}}(%rip)
+; CHECK-NEXT:    clc
+; CHECK:         #NO_APP
+; CHECK-NEXT:    retq
+entry:
+  tail call void asm sideeffect inteldialect "clc\0A\09cmpxchg8b $0\0A\09cmpxchg16b $1\0A\09clc", "=*m,=*m,~{eax},~{edx},~{flags},~{rax},~{rdx},~{dirflag},~{fpsr},~{flags}"([16 x i8]* nonnull @test_mem, [16 x i8]* nonnull @test_mem) #1
+  ret void
+}
Index: llvm/trunk/lib/CodeGen/MachineInstr.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/MachineInstr.cpp
+++ llvm/trunk/lib/CodeGen/MachineInstr.cpp
@@ -1766,7 +1766,8 @@
   // Trim unneeded kill operands.
   while (!DeadOps.empty()) {
     unsigned OpIdx = DeadOps.back();
-    if (getOperand(OpIdx).isImplicit())
+    if (getOperand(OpIdx).isImplicit() &&
+        (!isInlineAsm() || findInlineAsmFlagIdx(OpIdx) < 0))
       RemoveOperand(OpIdx);
     else
       getOperand(OpIdx).setIsKill(false);
@@ -1830,7 +1831,8 @@
   // Trim unneeded dead operands.
   while (!DeadOps.empty()) {
     unsigned OpIdx = DeadOps.back();
-    if (getOperand(OpIdx).isImplicit())
+    if (getOperand(OpIdx).isImplicit() &&
+        (!isInlineAsm() || findInlineAsmFlagIdx(OpIdx) < 0))
       RemoveOperand(OpIdx);
     else
       getOperand(OpIdx).setIsDead(false);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51829.165374.patch
Type: text/x-patch
Size: 2188 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180913/c9e66d4f/attachment.bin>