Index: bolt/lib/Passes/RegReAssign.cpp
===================================================================
--- bolt/lib/Passes/RegReAssign.cpp
+++ bolt/lib/Passes/RegReAssign.cpp
@@ -178,6 +178,7 @@
         if (CannotUseREX) {
           RegScore[RegEC] =
               std::numeric_limits<decltype(RegScore)::value_type>::min();
+          RegScore[BC.MIB->getAliasSized(Reg, 1)] = RegScore[RegEC];
           continue;
         }
 
@@ -185,6 +186,7 @@
         if (BC.MIB->isUpper8BitReg(Reg) && ClassicCSR.test(Reg)) {
           RegScore[RegEC] =
               std::numeric_limits<decltype(RegScore)::value_type>::min();
+          RegScore[BC.MIB->getAliasSized(Reg, 1)] = RegScore[RegEC];
           continue;
         }
 
Index: bolt/test/X86/reg-reassign-no-swap-bl.s
===================================================================
--- /dev/null
+++ bolt/test/X86/reg-reassign-no-swap-bl.s
@@ -0,0 +1,54 @@
+# This test case is used to reproduce an issue found in the mongod database.
+# In function rankRegisters, if there is a BH Reg in the basic block, then the BL Reg
+# also cannot be swap.
+
+# REQUIRES: system-linux
+
+# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
+# RUN: link_fdata %s %t.o %t.fdata
+# RUN: %clang -no-pie %t.o -o %t.exe -Wl,-q
+# RUN: llvm-bolt %t.exe -o %t.out -data=%t.fdata --reg-reassign | FileCheck %s
+# RUN: %t.out
+
+# CHECK: Reg Reassignment Pass: no changes were made
+  .text
+  .globl  main                            # -- Begin function main
+  .p2align  4, 0x90
+  .type  main,@function
+  .type  main.cold,@function
+main.cold:
+.L1:
+  mov    $0x2,  %bh
+  jmp     .L3
+main:                                   # @main
+  .cfi_startproc
+# %bb.0:                                # %entry
+  pushq  %rax
+  pushq   %r12
+  pushq   %rbx
+  .cfi_def_cfa_offset 16
+  mov     $0x1,   %r12
+  shr     $0x14,  %r12
+  add     $0x14,  %r12
+  mov     $0x11,  %rbx
+.L2:
+  mov    $0x1,  %bh
+  mov    $0x1,  %bl
+  add    $0x1,   %r12
+  jmp     .L1
+.L3:
+  cmp     $0x201,  %rbx
+  jne     0x0
+  xorl    %eax, %eax
+  popq    %rcx
+  popq    %rbx
+  popq    %r12
+  .cfi_def_cfa_offset 8
+  retq
+# FDATA: 1 main.cold/1 2 1 main 0 0 100
+# FDATA: 1 main 2b 1 main 31 0 100
+# FDATA: 1 main 22 1 main.cold/1 0 0 100
+
+.Lfunc_end0:
+  .size  main, .Lfunc_end0-main
+  .cfi_endproc