diff --git a/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp b/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp
index 34aafc928e91..0408cbb70734 100644
--- a/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp
@@ -1015,10 +1015,9 @@ bool HexagonInstrInfo::expandPostRAPseudo(MachineBasicBlock::iterator MI)
       unsigned NewOpc = Is128B ? Hexagon::V6_vL32b_ai_128B
                                : Hexagon::V6_vL32b_ai;
       int32_t Off = MI->getOperand(2).getImm();
-      int32_t Idx = Off;
       BuildMI(MBB, MI, DL, get(NewOpc), DstReg)
         .addOperand(MI->getOperand(1))
-        .addImm(Idx)
+        .addImm(Off)
         .setMemRefs(MI->memoperands_begin(), MI->memoperands_end());
       MBB.erase(MI);
       return true;
@@ -1029,10 +1028,9 @@ bool HexagonInstrInfo::expandPostRAPseudo(MachineBasicBlock::iterator MI)
       unsigned NewOpc = Is128B ? Hexagon::V6_vS32b_ai_128B
                                : Hexagon::V6_vS32b_ai;
       int32_t Off = MI->getOperand(1).getImm();
-      int32_t Idx = Is128B ? (Off >> 7) : (Off >> 6);
       BuildMI(MBB, MI, DL, get(NewOpc))
         .addOperand(MI->getOperand(0))
-        .addImm(Idx)
+        .addImm(Off)
         .addOperand(MI->getOperand(2))
         .setMemRefs(MI->memoperands_begin(), MI->memoperands_end());
       MBB.erase(MI);