RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-19 23:23:38 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

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

Browse Source 
INLINEASM instructions use extra operands to carry flags. If a register operand is removed without removing the flag operand, then the flags will no longer make sense.

This patch fixes this by preventing the removal when a flag operand is present.

The included test case was generated by MS inline assembly. Longer term maybe we should fix the inline assembly parsing to not generate redundant operands.

Differential Revision: https://reviews.llvm.org/D51829

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342176 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper
2018-09-13 20:51:27 +00:00
parent 28e4a69190
commit ee5f4639a8
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/CodeGen/MachineInstr.cpp
+4 -2
View File
@@ -1766,7 +1766,8 @@ bool MachineInstr::addRegisterKilled(unsigned IncomingReg,
// 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 @@ bool MachineInstr::addRegisterDead(unsigned Reg,
// 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);
test/CodeGen/X86/ms-inline-asm-redundant-clobber.ll
+24
View File
@@ -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.
@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
}