Index: source/Plugins/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpression.cpp =================================================================== --- source/Plugins/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpression.cpp +++ source/Plugins/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpression.cpp @@ -25,8 +25,14 @@ static uint32_t ResolveLLDBRegisterNum(llvm::StringRef reg_name, llvm::Triple::ArchType arch_type) { // lookup register name to get lldb register number + llvm::codeview::CPUType Cpu; + if (arch_type == llvm::Triple::ArchType::aarch64) { + Cpu = llvm::codeview::CPUType::ARM64; + } else { + Cpu = llvm::codeview::CPUType::X64; + } llvm::ArrayRef> register_names = - llvm::codeview::getRegisterNames(); + llvm::codeview::getRegisterNames(Cpu); auto it = llvm::find_if( register_names, [®_name](const llvm::EnumEntry ®ister_entry) {