summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen
diff options
context:
space:
mode:
authorMikael Holmen <mikael.holmen@ericsson.com>2017-05-10 06:33:43 +0000
committerMikael Holmen <mikael.holmen@ericsson.com>2017-05-10 06:33:43 +0000
commitaf14a21e5016bb67d895f050762a0006fca7cd0a (patch)
tree206d798e26cfd2da356ae2157f294438c496b111 /llvm/lib/CodeGen
parent0f7ce83018195e0ed78ccfd866267e8f8eabcf73 (diff)
downloadbcm5719-llvm-af14a21e5016bb67d895f050762a0006fca7cd0a.tar.gz
bcm5719-llvm-af14a21e5016bb67d895f050762a0006fca7cd0a.zip
[UnreachableBlockElim] Check return value of constrainRegClass().
Summary: MachineRegisterInfo::constrainRegClass() can fail if two register classes don't have a common subclass or if the register class doesn't contain enough registers. Check the return value before trying to remove Phi nodes, and if we can't constrain, we output a COPY instead of simply replacing registers. Reviewers: kparzysz, david2050, wmi Reviewed By: kparzysz Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D32999 llvm-svn: 302622
Diffstat (limited to 'llvm/lib/CodeGen')
-rw-r--r--llvm/lib/CodeGen/UnreachableBlockElim.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/UnreachableBlockElim.cpp b/llvm/lib/CodeGen/UnreachableBlockElim.cpp
index f085132b6a9..407fd9b162e 100644
--- a/llvm/lib/CodeGen/UnreachableBlockElim.cpp
+++ b/llvm/lib/CodeGen/UnreachableBlockElim.cpp
@@ -206,11 +206,12 @@ bool UnreachableMachineBlockElim::runOnMachineFunction(MachineFunction &F) {
if (InputReg != OutputReg) {
MachineRegisterInfo &MRI = F.getRegInfo();
unsigned InputSub = Input.getSubReg();
- if (InputSub == 0) {
- MRI.constrainRegClass(InputReg, MRI.getRegClass(OutputReg));
+ if (InputSub == 0 &&
+ MRI.constrainRegClass(InputReg, MRI.getRegClass(OutputReg))) {
MRI.replaceRegWith(OutputReg, InputReg);
} else {
- // The input register to the PHI has a subregister:
+ // The input register to the PHI has a subregister or it can't be
+ // constrained to the proper register class:
// insert a COPY instead of simply replacing the output
// with the input.
const TargetInstrInfo *TII = F.getSubtarget().getInstrInfo();
OpenPOWER on IntegriCloud