From 8a5a3a87a093b7b327d3409080d65a3a7ab098e7 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <kparzysz@codeaurora.org>
Date: Wed, 11 Oct 2017 16:15:31 +0000
Subject: [PATCH] [Hexagon] Handle non-immediate operands to A2_addi in
 getIncrementValue

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315472 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/Hexagon/HexagonInstrInfo.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Target/Hexagon/HexagonInstrInfo.cpp b/lib/Target/Hexagon/HexagonInstrInfo.cpp
index 5e2cfbd531a..f668372ce00 100644
--- a/lib/Target/Hexagon/HexagonInstrInfo.cpp
+++ b/lib/Target/Hexagon/HexagonInstrInfo.cpp
@@ -1659,10 +1659,12 @@ bool HexagonInstrInfo::getIncrementValue(const MachineInstr &MI,
       Value = OffsetOp.getImm();
       return true;
     }
-  }
-  if (MI.getOpcode() == Hexagon::A2_addi) {
-    Value = MI.getOperand(2).getImm();
-    return true;
+  } else if (MI.getOpcode() == Hexagon::A2_addi) {
+    const MachineOperand &AddOp = MI.getOperand(2);
+    if (AddOp.isImm()) {
+      Value = AddOp.getImm();
+      return true;
+    }
   }
 
   return false;
-- 
2.49.0