diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.cpp b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.cpp
index a894dfe6143c..7b2d64de230f 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.cpp
@@ -238,7 +238,7 @@ uint32_t RegisterInfos_x86_64_with_base_shared::g_invalidate_st7_64[] = {
 RegInfo &GetRegInfoShared(llvm::Triple::ArchType arch_type, bool with_base) {
   static std::once_flag once_flag_x86, once_flag_x86_64,
       once_flag_x86_64_with_base;
-  static RegInfo reg_info_x86, reg_info_x86_64, reg_info_x86_64_with_base;
+  static RegInfo reg_info_x86, reg_info_x86_64, reg_info_x86_64_with_base, reg_info_invalid;
 
   switch (arch_type) {
   case llvm::Triple::x86:
@@ -314,7 +314,7 @@ RegInfo &GetRegInfoShared(llvm::Triple::ArchType arch_type, bool with_base) {
     }
   default:
     assert(false && "Unhandled target architecture.");
-    break;
+    return reg_info_invalid;
   }
 }