summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen
diff options
context:
space:
mode:
authorDaniel Sanders <daniel_l_sanders@apple.com>2018-04-30 17:20:01 +0000
committerDaniel Sanders <daniel_l_sanders@apple.com>2018-04-30 17:20:01 +0000
commit2de9d4ad5dade13f9f21337fc20af21fd84715f3 (patch)
tree0a8e1dd7562b9eecd414fc1ba53389c091b7ea5c /llvm/lib/CodeGen
parent4bbcb5ab044f252bf4e9b075de0c78c321e0eb81 (diff)
downloadbcm5719-llvm-2de9d4ad5dade13f9f21337fc20af21fd84715f3.tar.gz
bcm5719-llvm-2de9d4ad5dade13f9f21337fc20af21fd84715f3.zip
Fix infinite loop after r331115
There are two separate fixes here: * The lowering code for non-extending loads should report UnableToLegalize instead of emitting the same instruction. * The target should not be requesting lowering of non-extending loads. llvm-svn: 331201
Diffstat (limited to 'llvm/lib/CodeGen')
-rw-r--r--llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
index e4e5e0c6022..b1e7943462c 100644
--- a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
@@ -1042,6 +1042,10 @@ LegalizerHelper::lower(MachineInstr &MI, unsigned TypeIdx, LLT Ty) {
auto &MMO = **MI.memoperands_begin();
if (DstTy.getSizeInBits() == MMO.getSize() /* in bytes */ * 8) {
+ // In the case of G_LOAD, this was a non-extending load already and we're
+ // about to lower to the same instruction.
+ if (MI.getOpcode() == TargetOpcode::G_LOAD)
+ return UnableToLegalize;
MIRBuilder.buildLoad(DstReg, PtrReg, MMO);
MI.eraseFromParent();
return Legalized;
OpenPOWER on IntegriCloud