llvm
diff --git a/‎bolt/lib/Passes/ValidateMemRefs.cpp‎
Lines changed: 4 additions & 4 deletions b/‎bolt/lib/Passes/ValidateMemRefs.cpp‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎bolt/test/X86/jt-symbol-disambiguation-4.s‎
Lines changed: 0 additions & 60 deletions b/‎bolt/test/X86/jt-symbol-disambiguation-4.s‎
Lines changed: 0 additions & 60 deletions
@@ -29,7 +29,8 @@ bool ValidateMemRefs::checkAndFixJTReference(BinaryFunction &BF, MCInst &Inst,
   if (!BD)
     return false;
 
-  JumpTable *JT = BC.getJumpTableContainingAddress(BD->getAddress());
+  const uint64_t TargetAddress = BD->getAddress() + Offset;
+  JumpTable *JT = BC.getJumpTableContainingAddress(TargetAddress);
   if (!JT)
     return false;
 
@@ -42,9 +43,8 @@ bool ValidateMemRefs::checkAndFixJTReference(BinaryFunction &BF, MCInst &Inst,
   // the jump table label with a regular rodata reference. Get a
   // non-JT reference by fetching the symbol 1 byte before the JT
   // label.
-  MCSymbol *NewSym = BC.getOrCreateGlobalSymbol(BD->getAddress() - 1, "DATAat");
-  BC.MIB->setOperandToSymbolRef(Inst, OperandNum, NewSym, Offset + 1, &*BC.Ctx,
-                                0);
+  MCSymbol *NewSym = BC.getOrCreateGlobalSymbol(TargetAddress - 1, "DATAat");
+  BC.MIB->setOperandToSymbolRef(Inst, OperandNum, NewSym, 1, &*BC.Ctx, 0);
   LLVM_DEBUG(dbgs() << "BOLT-DEBUG: replaced reference @" << BF.getPrintName()
                     << " from " << BD->getName() << " to " << NewSym->getName()
                     << " + 1\n");