diff options
author | James Y Knight <jyknight@google.com> | 2020-05-15 23:43:30 -0400 |
---|---|---|
committer | James Y Knight <jyknight@google.com> | 2020-07-01 12:51:50 -0400 |
commit | 4b0aa5724feaa89a9538dcab97e018110b0e4bc3 (patch) | |
tree | f6523c3c1909c3189112569059189e639d9ea720 /llvm/lib/CodeGen/MachineBasicBlock.cpp | |
parent | 78c69a00a4cff786e0ef13c895d0db309d6b3f42 (diff) | |
download | llvm-4b0aa5724feaa89a9538dcab97e018110b0e4bc3.zip llvm-4b0aa5724feaa89a9538dcab97e018110b0e4bc3.tar.gz llvm-4b0aa5724feaa89a9538dcab97e018110b0e4bc3.tar.bz2 |
Change the INLINEASM_BR MachineInstr to be a non-terminating instruction.
Before this instruction supported output values, it fit fairly
naturally as a terminator. However, being a terminator while also
supporting outputs causes some trouble, as the physreg->vreg COPY
operations cannot be in the same block.
Modeling it as a non-terminator allows it to be handled the same way
as invoke is handled already.
Most of the changes here were created by auditing all the existing
users of MachineBasicBlock::isEHPad() and
MachineBasicBlock::hasEHPadSuccessor(), and adding calls to
isInlineAsmBrIndirectTarget or mayHaveInlineAsmBr, as appropriate.
Reviewed By: nickdesaulniers, void
Differential Revision: https://reviews.llvm.org/D79794
Diffstat (limited to 'llvm/lib/CodeGen/MachineBasicBlock.cpp')
-rw-r--r-- | llvm/lib/CodeGen/MachineBasicBlock.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp index e848741..2d4b604 100644 --- a/llvm/lib/CodeGen/MachineBasicBlock.cpp +++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp @@ -277,8 +277,16 @@ LLVM_DUMP_METHOD void MachineBasicBlock::dump() const { } #endif +bool MachineBasicBlock::mayHaveInlineAsmBr() const { + for (const MachineBasicBlock *Succ : successors()) { + if (Succ->isInlineAsmBrIndirectTarget()) + return true; + } + return false; +} + bool MachineBasicBlock::isLegalToHoistInto() const { - if (isReturnBlock() || hasEHPadSuccessor()) + if (isReturnBlock() || hasEHPadSuccessor() || mayHaveInlineAsmBr()) return false; return true; } @@ -1132,7 +1140,7 @@ bool MachineBasicBlock::canSplitCriticalEdge( // Splitting the critical edge to a callbr's indirect block isn't advised. // Don't do it in this generic function. - if (isInlineAsmBrIndirectTarget(Succ)) + if (Succ->isInlineAsmBrIndirectTarget()) return false; const MachineFunction *MF = getParent(); |