diff --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -1370,12 +1370,12 @@
       STI);
   OutStreamer->emitInstruction(MCInstBuilder(X86::SHR64ri)
                                    .addReg(X86::R8)
-                                   .addReg(X86::NoRegister)
+                                   .addReg(X86::R8)
                                    .addImm(MappingScale),
                                STI);
   if (OrShadowOffset) {
     OutStreamer->emitInstruction(MCInstBuilder(X86::OR64ri32)
-                                     .addReg(X86::NoRegister)
+                                     .addReg(X86::R8)
                                      .addReg(X86::R8)
                                      .addImm(ShadowBase),
                                  STI);