1 files changed, 21 insertions, 18 deletions
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
index f147f479e90..980d4852b6e 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
@@ -170,38 +170,41 @@ private:
   size_t FindTypesByName(llvm::StringRef name, uint32_t max_matches,
                          TypeMap &types);
 
-  lldb::TypeSP CreateModifierType(PdbSymUid type_uid,
+  lldb::TypeSP CreateModifierType(PdbTypeSymId type_id,
                                   const llvm::codeview::ModifierRecord &mr);
-  lldb::TypeSP CreatePointerType(PdbSymUid type_uid,
+  lldb::TypeSP CreatePointerType(PdbTypeSymId type_id,
                                  const llvm::codeview::PointerRecord &pr);
   lldb::TypeSP CreateSimpleType(llvm::codeview::TypeIndex ti);
-  lldb::TypeSP CreateTagType(PdbSymUid type_uid,
+  lldb::TypeSP CreateTagType(PdbTypeSymId type_id,
                              const llvm::codeview::ClassRecord &cr);
-  lldb::TypeSP CreateTagType(PdbSymUid type_uid,
+  lldb::TypeSP CreateTagType(PdbTypeSymId type_id,
                              const llvm::codeview::EnumRecord &er);
-  lldb::TypeSP CreateTagType(PdbSymUid type_uid,
+  lldb::TypeSP CreateTagType(PdbTypeSymId type_id,
                              const llvm::codeview::UnionRecord &ur);
-  lldb::TypeSP CreateArrayType(PdbSymUid type_uid,
+  lldb::TypeSP CreateArrayType(PdbTypeSymId type_id,
                                const llvm::codeview::ArrayRecord &ar);
-  lldb::TypeSP CreateProcedureType(PdbSymUid type_uid,
+  lldb::TypeSP CreateProcedureType(PdbTypeSymId type_id,
                                    const llvm::codeview::ProcedureRecord &pr);
-  lldb::TypeSP CreateClassStructUnion(
-      PdbSymUid type_uid, const llvm::codeview::TagRecord &record, size_t size,
-      clang::TagTypeKind ttk, clang::MSInheritanceAttr::Spelling inheritance);
+  lldb::TypeSP
+  CreateClassStructUnion(PdbTypeSymId type_id,
+                         const llvm::codeview::TagRecord &record, size_t size,
+                         clang::TagTypeKind ttk,
+                         clang::MSInheritanceAttr::Spelling inheritance);
 
-  lldb::FunctionSP GetOrCreateFunction(PdbSymUid func_uid,
+  lldb::FunctionSP GetOrCreateFunction(PdbCompilandSymId func_id,
                                        const SymbolContext &sc);
   lldb::CompUnitSP GetOrCreateCompileUnit(const CompilandIndexItem &cci);
-  lldb::TypeSP GetOrCreateType(PdbSymUid type_uid);
+  lldb::TypeSP GetOrCreateType(PdbTypeSymId type_id);
   lldb::TypeSP GetOrCreateType(llvm::codeview::TypeIndex ti);
-  lldb::VariableSP GetOrCreateGlobalVariable(PdbSymUid var_uid);
+  lldb::VariableSP GetOrCreateGlobalVariable(PdbGlobalSymId var_id);
 
-  lldb::FunctionSP CreateFunction(PdbSymUid func_uid, const SymbolContext &sc);
+  lldb::FunctionSP CreateFunction(PdbCompilandSymId func_id,
+                                  const SymbolContext &sc);
   lldb::CompUnitSP CreateCompileUnit(const CompilandIndexItem &cci);
-  lldb::TypeSP CreateType(PdbSymUid type_uid);
-  lldb::TypeSP CreateAndCacheType(PdbSymUid type_uid);
-  lldb::VariableSP CreateGlobalVariable(PdbSymUid var_uid);
-  lldb::VariableSP CreateConstantSymbol(PdbSymUid var_uid,
+  lldb::TypeSP CreateType(PdbTypeSymId type_id);
+  lldb::TypeSP CreateAndCacheType(PdbTypeSymId type_id);
+  lldb::VariableSP CreateGlobalVariable(PdbGlobalSymId var_id);
+  lldb::VariableSP CreateConstantSymbol(PdbGlobalSymId var_id,
                                         const llvm::codeview::CVSymbol &cvs);
 
   llvm::BumpPtrAllocator m_allocator;