[Lldb-commits] [lldb] r328176 - [SymbolFilePDB] Run clang-format; NFC

Aaron Smith via lldb-commits lldb-commits at lists.llvm.org
Wed Mar 21 20:44:51 PDT 2018


Author: asmith
Date: Wed Mar 21 20:44:51 2018
New Revision: 328176

URL: http://llvm.org/viewvc/llvm-project?rev=328176&view=rev
Log:
[SymbolFilePDB] Run clang-format; NFC

Modified:
    lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp
    lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.h
    lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
    lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h

Modified: lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp?rev=328176&r1=328175&r2=328176&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp Wed Mar 21 20:44:51 2018
@@ -93,15 +93,17 @@ lldb::Encoding TranslateEnumEncoding(PDB
   return lldb::eEncodingSint;
 }
 
-CompilerType GetBuiltinTypeForPDBEncodingAndBitSize(
-    ClangASTContext &clang_ast, const PDBSymbolTypeBuiltin &pdb_type,
-    Encoding encoding, uint32_t width) {
+CompilerType
+GetBuiltinTypeForPDBEncodingAndBitSize(ClangASTContext &clang_ast,
+                                       const PDBSymbolTypeBuiltin &pdb_type,
+                                       Encoding encoding, uint32_t width) {
   auto *ast = clang_ast.getASTContext();
   if (!ast)
     return CompilerType();
 
   switch (pdb_type.getBuiltinType()) {
-  default: break;
+  default:
+    break;
   case PDB_BuiltinType::None:
     return CompilerType();
   case PDB_BuiltinType::Void:
@@ -129,10 +131,10 @@ CompilerType GetBuiltinTypeForPDBEncodin
   case PDB_BuiltinType::Char32:
     return CompilerType(ast, ast->Char32Ty);
   case PDB_BuiltinType::Float:
-    // Note: types `long double` and `double` have same bit size in MSVC and there
-    // is no information in the PDB to distinguish them. So when falling back
-    // to default search, the compiler type of `long double` will be represented by
-    // the one generated for `double`.
+    // Note: types `long double` and `double` have same bit size in MSVC and
+    // there is no information in the PDB to distinguish them. So when falling
+    // back to default search, the compiler type of `long double` will be
+    // represented by the one generated for `double`.
     break;
   }
   // If there is no match on PDB_BuiltinType, fall back to default search
@@ -144,7 +146,8 @@ ConstString GetPDBBuiltinTypeName(const
                                   CompilerType &compiler_type) {
   PDB_BuiltinType kind = pdb_type.getBuiltinType();
   switch (kind) {
-  default: break;
+  default:
+    break;
   case PDB_BuiltinType::Currency:
     return ConstString("CURRENCY");
   case PDB_BuiltinType::Date:
@@ -189,13 +192,13 @@ bool GetDeclarationForSymbol(const PDBSy
   if (!src_file_up)
     return false;
 
-  FileSpec spec(src_file_up->getFileName(), /*resolve_path*/false);
+  FileSpec spec(src_file_up->getFileName(), /*resolve_path*/ false);
   decl.SetFile(spec);
   decl.SetColumn(first_line_up->getColumnNumber());
   decl.SetLine(first_line_up->getLineNumber());
   return true;
 }
-}
+} // namespace
 
 PDBASTParser::PDBASTParser(lldb_private::ClangASTContext &ast) : m_ast(ast) {}
 
@@ -255,11 +258,11 @@ lldb::TypeSP PDBASTParser::CreateLLDBTyp
     CompilerType builtin_type;
     if (bytes > 0)
       builtin_type = GetBuiltinTypeForPDBEncodingAndBitSize(
-           m_ast, *underlying_type_up, encoding, bytes * 8);
+          m_ast, *underlying_type_up, encoding, bytes * 8);
     else
       builtin_type = m_ast.GetBasicType(eBasicTypeInt);
-    // FIXME: PDB does not have information about scoped enumeration (Enum Class).
-    // Set it false for now.
+    // FIXME: PDB does not have information about scoped enumeration (Enum
+    // Class). Set it false for now.
     bool isScoped = false;
 
     CompilerType ast_enum = m_ast.CreateEnumerationType(
@@ -316,8 +319,8 @@ lldb::TypeSP PDBASTParser::CreateLLDBTyp
       // Function type is named.
       name = pdb_func->getName();
     } else if (auto pdb_func_sig =
-              llvm::dyn_cast<PDBSymbolTypeFunctionSig>(&type)) {
-      func_sig = const_cast<PDBSymbolTypeFunctionSig*>(pdb_func_sig);
+                   llvm::dyn_cast<PDBSymbolTypeFunctionSig>(&type)) {
+      func_sig = const_cast<PDBSymbolTypeFunctionSig *>(pdb_func_sig);
     } else
       llvm_unreachable("Unexpected PDB symbol!");
 
@@ -357,9 +360,9 @@ lldb::TypeSP PDBASTParser::CreateLLDBTyp
       type_quals |= clang::Qualifiers::Const;
     if (func_sig->isVolatileType())
       type_quals |= clang::Qualifiers::Volatile;
-    CompilerType func_sig_ast_type = m_ast.CreateFunctionType(
-        return_ast_type, arg_list.data(), arg_list.size(), is_variadic,
-        type_quals);
+    CompilerType func_sig_ast_type =
+        m_ast.CreateFunctionType(return_ast_type, arg_list.data(),
+                                 arg_list.size(), is_variadic, type_quals);
 
     GetDeclarationForSymbol(type, decl);
     return std::make_shared<lldb_private::Type>(
@@ -392,8 +395,8 @@ lldb::TypeSP PDBASTParser::CreateLLDBTyp
         return nullptr;
       }
     }
-    CompilerType array_ast_type =
-        m_ast.CreateArrayType(element_ast_type, num_elements, /*is_gnu_vector*/false);
+    CompilerType array_ast_type = m_ast.CreateArrayType(
+        element_ast_type, num_elements, /*is_gnu_vector*/ false);
     TypeSP type_sp = std::make_shared<lldb_private::Type>(
         array_type->getSymIndexId(), m_ast.GetSymbolFile(), ConstString(),
         bytes, nullptr, LLDB_INVALID_UID, lldb_private::Type::eEncodingIsUID,
@@ -422,9 +425,9 @@ lldb::TypeSP PDBASTParser::CreateLLDBTyp
     auto type_name = GetPDBBuiltinTypeName(*builtin_type, builtin_ast_type);
 
     return std::make_shared<lldb_private::Type>(
-        builtin_type->getSymIndexId(), m_ast.GetSymbolFile(), type_name,
-        bytes, nullptr, LLDB_INVALID_UID, lldb_private::Type::eEncodingIsUID,
-        decl, builtin_ast_type, lldb_private::Type::eResolveStateFull);
+        builtin_type->getSymIndexId(), m_ast.GetSymbolFile(), type_name, bytes,
+        nullptr, LLDB_INVALID_UID, lldb_private::Type::eEncodingIsUID, decl,
+        builtin_ast_type, lldb_private::Type::eResolveStateFull);
   } break;
   case PDB_SymType::PointerType: {
     auto *pointer_type = llvm::dyn_cast<PDBSymbolTypePointer>(&type);
@@ -458,7 +461,8 @@ lldb::TypeSP PDBASTParser::CreateLLDBTyp
         lldb_private::Type::eEncodingIsUID, decl, pointer_ast_type,
         lldb_private::Type::eResolveStateFull);
   } break;
-  default: break;
+  default:
+    break;
   }
   return nullptr;
 }

Modified: lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.h?rev=328176&r1=328175&r2=328176&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/PDB/PDBASTParser.h Wed Mar 21 20:44:51 2018
@@ -19,20 +19,20 @@ class CharUnits;
 class CXXRecordDecl;
 class FieldDecl;
 class RecordDecl;
-}
+} // namespace clang
 
 namespace lldb_private {
 class ClangASTContext;
 class CompilerType;
-}
+} // namespace lldb_private
 
 namespace llvm {
 namespace pdb {
 class PDBSymbol;
 class PDBSymbolData;
 class PDBSymbolTypeBuiltin;
-}
-}
+} // namespace pdb
+} // namespace llvm
 
 class PDBASTParser {
 public:
@@ -49,4 +49,4 @@ private:
   lldb_private::ClangASTImporter m_ast_importer;
 };
 
-#endif // SymbolFileDWARF_DWARFASTParserClang_h_
+#endif // LLDB_PLUGINS_SYMBOLFILE_PDB_PDBASTPARSER_H

Modified: lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp?rev=328176&r1=328175&r2=328176&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp Wed Mar 21 20:44:51 2018
@@ -69,7 +69,7 @@ bool ShouldAddLine(uint32_t requested_li
   return ((requested_line == 0 || actual_line == requested_line) &&
           addr_length > 0);
 }
-}
+} // namespace
 
 void SymbolFilePDB::Initialize() {
   PluginManager::RegisterPlugin(GetPluginNameStatic(),
@@ -123,8 +123,7 @@ uint32_t SymbolFilePDB::CalculateAbiliti
       if (!symfile)
         return 0;
       error = loadDataForPDB(PDB_ReaderType::DIA,
-                             llvm::StringRef(symfile.GetPath()),
-                             m_session_up);
+                             llvm::StringRef(symfile.GetPath()), m_session_up);
       if (error) {
         llvm::consumeError(std::move(error));
         return 0;
@@ -145,13 +144,14 @@ uint32_t SymbolFilePDB::CalculateAbiliti
     case PDB_TableType::Symbols:
       // This table represents a store of symbols with types listed in
       // PDBSym_Type
-      abilities |= (CompileUnits | Functions | Blocks |
-                    GlobalVariables | LocalVariables | VariableTypes);
+      abilities |= (CompileUnits | Functions | Blocks | GlobalVariables |
+                    LocalVariables | VariableTypes);
       break;
     case PDB_TableType::LineNumbers:
       abilities |= LineTables;
       break;
-    default: break;
+    default:
+      break;
     }
   }
   return abilities;
@@ -159,8 +159,7 @@ uint32_t SymbolFilePDB::CalculateAbiliti
 
 void SymbolFilePDB::InitializeObject() {
   lldb::addr_t obj_load_address = m_obj_file->GetFileOffset();
-  lldbassert(obj_load_address &&
-             obj_load_address != LLDB_INVALID_ADDRESS);
+  lldbassert(obj_load_address && obj_load_address != LLDB_INVALID_ADDRESS);
   m_session_up->setLoadAddress(obj_load_address);
   if (!m_global_scope_up)
     m_global_scope_up = m_session_up->getGlobalScope();
@@ -205,8 +204,7 @@ uint32_t SymbolFilePDB::GetNumCompileUni
 }
 
 void SymbolFilePDB::GetCompileUnitIndex(
-    const llvm::pdb::PDBSymbolCompiland &pdb_compiland,
-    uint32_t &index) {
+    const llvm::pdb::PDBSymbolCompiland &pdb_compiland, uint32_t &index) {
   auto results_up = m_global_scope_up->findAllChildren<PDBSymbolCompiland>();
   if (!results_up)
     return;
@@ -261,10 +259,8 @@ SymbolFilePDB::ParseCompileUnitLanguage(
   return TranslateLanguage(details->getLanguage());
 }
 
-lldb_private::Function *
-SymbolFilePDB::ParseCompileUnitFunctionForPDBFunc(
-    const PDBSymbolFunc &pdb_func,
-    const lldb_private::SymbolContext &sc) {
+lldb_private::Function *SymbolFilePDB::ParseCompileUnitFunctionForPDBFunc(
+    const PDBSymbolFunc &pdb_func, const lldb_private::SymbolContext &sc) {
   lldbassert(sc.comp_unit && sc.module_sp.get());
 
   auto file_vm_addr = pdb_func.getVirtualAddress();
@@ -272,13 +268,12 @@ SymbolFilePDB::ParseCompileUnitFunctionF
     return nullptr;
 
   auto func_length = pdb_func.getLength();
-  AddressRange func_range = AddressRange(file_vm_addr,
-                                         func_length,
-                                         sc.module_sp->GetSectionList());
+  AddressRange func_range =
+      AddressRange(file_vm_addr, func_length, sc.module_sp->GetSectionList());
   if (!func_range.GetBaseAddress().IsValid())
     return nullptr;
 
-  lldb_private::Type* func_type = ResolveTypeUID(pdb_func.getSymIndexId());
+  lldb_private::Type *func_type = ResolveTypeUID(pdb_func.getSymIndexId());
   if (!func_type)
     return nullptr;
 
@@ -286,12 +281,9 @@ SymbolFilePDB::ParseCompileUnitFunctionF
 
   Mangled mangled = GetMangledForPDBFunc(pdb_func);
 
-  FunctionSP func_sp = std::make_shared<Function>(sc.comp_unit,
-                                                  pdb_func.getSymIndexId(),
-                                                  func_type_uid,
-                                                  mangled,
-                                                  func_type,
-                                                  func_range);
+  FunctionSP func_sp =
+      std::make_shared<Function>(sc.comp_unit, pdb_func.getSymIndexId(),
+                                 func_type_uid, mangled, func_type, func_range);
 
   sc.comp_unit->AddFunction(func_sp);
   return func_sp.get();
@@ -363,12 +355,10 @@ bool SymbolFilePDB::ParseImportedModules
   return false;
 }
 
-static size_t
-ParseFunctionBlocksForPDBSymbol(const lldb_private::SymbolContext &sc,
-                                uint64_t func_file_vm_addr,
-                                const llvm::pdb::PDBSymbol *pdb_symbol,
-                                lldb_private::Block *parent_block,
-                                bool is_top_parent) {
+static size_t ParseFunctionBlocksForPDBSymbol(
+    const lldb_private::SymbolContext &sc, uint64_t func_file_vm_addr,
+    const llvm::pdb::PDBSymbol *pdb_symbol, lldb_private::Block *parent_block,
+    bool is_top_parent) {
   assert(pdb_symbol && parent_block);
 
   size_t num_added = 0;
@@ -397,9 +387,8 @@ ParseFunctionBlocksForPDBSymbol(const ll
     } else
       llvm_unreachable("Unexpected PDB symbol!");
 
-    block->AddRange(
-        Block::Range(raw_sym.getVirtualAddress() - func_file_vm_addr,
-                     raw_sym.getLength()));
+    block->AddRange(Block::Range(
+        raw_sym.getVirtualAddress() - func_file_vm_addr, raw_sym.getLength()));
     block->FinalizeRanges();
     ++num_added;
 
@@ -407,12 +396,12 @@ ParseFunctionBlocksForPDBSymbol(const ll
     if (!results_up)
       break;
     while (auto symbol_up = results_up->getNext()) {
-      num_added += ParseFunctionBlocksForPDBSymbol(sc, func_file_vm_addr,
-                                                   symbol_up.get(),
-                                                   block, false);
+      num_added += ParseFunctionBlocksForPDBSymbol(
+          sc, func_file_vm_addr, symbol_up.get(), block, false);
     }
   } break;
-  default: break;
+  default:
+    break;
   }
   return num_added;
 }
@@ -444,8 +433,8 @@ size_t SymbolFilePDB::ParseTypes(const l
 
   auto ParseTypesByTagFn = [&num_added, this](const PDBSymbol &raw_sym) {
     std::unique_ptr<IPDBEnumSymbols> results;
-    PDB_SymType tags_to_search[] = { PDB_SymType::Enum, PDB_SymType::Typedef,
-        PDB_SymType::UDT };
+    PDB_SymType tags_to_search[] = {PDB_SymType::Enum, PDB_SymType::Typedef,
+                                    PDB_SymType::UDT};
     for (auto tag : tags_to_search) {
       results = raw_sym.findAllChildren(tag);
       if (!results || results->getChildCount() == 0)
@@ -471,8 +460,8 @@ size_t SymbolFilePDB::ParseTypes(const l
   };
 
   if (sc.function) {
-    auto pdb_func =
-        m_session_up->getConcreteSymbolById<PDBSymbolFunc>(sc.function->GetID());
+    auto pdb_func = m_session_up->getConcreteSymbolById<PDBSymbolFunc>(
+        sc.function->GetID());
     if (!pdb_func)
       return 0;
     ParseTypesByTagFn(*pdb_func);
@@ -691,9 +680,8 @@ uint32_t SymbolFilePDB::ResolveSymbolCon
             if (file_vm_addr == LLDB_INVALID_ADDRESS)
               continue;
 
-            auto symbol_up =
-                m_session_up->findSymbolByAddress(file_vm_addr,
-                                                  PDB_SymType::Function);
+            auto symbol_up = m_session_up->findSymbolByAddress(
+                file_vm_addr, PDB_SymType::Function);
             if (symbol_up) {
               auto func_uid = symbol_up->getSymIndexId();
               sc.function = sc.comp_unit->FindFunctionByUID(func_uid).get();
@@ -756,8 +744,7 @@ bool SymbolFilePDB::ResolveFunction(cons
 
 bool SymbolFilePDB::ResolveFunction(uint32_t uid, bool include_inlines,
                                     lldb_private::SymbolContextList &sc_list) {
-  auto pdb_func_up =
-      m_session_up->getConcreteSymbolById<PDBSymbolFunc>(uid);
+  auto pdb_func_up = m_session_up->getConcreteSymbolById<PDBSymbolFunc>(uid);
   if (!pdb_func_up && !(include_inlines && pdb_func_up->hasInlineAttribute()))
     return false;
   return ResolveFunction(*pdb_func_up, include_inlines, sc_list);
@@ -840,7 +827,7 @@ void SymbolFilePDB::CacheFunctionNames()
   }
 
   if (auto results_up =
-      m_global_scope_up->findAllChildren<PDBSymbolPublicSymbol>()) {
+          m_global_scope_up->findAllChildren<PDBSymbolPublicSymbol>()) {
     while (auto pub_sym_up = results_up->getNext()) {
       if (!pub_sym_up->isFunction())
         continue;
@@ -891,9 +878,8 @@ uint32_t SymbolFilePDB::FindFunctions(
     CacheFunctionNames();
 
     std::set<uint32_t> resolved_ids;
-    auto ResolveFn = [include_inlines, &name, &sc_list, &resolved_ids, this] (
-        UniqueCStringMap<uint32_t> &Names)
-    {
+    auto ResolveFn = [include_inlines, &name, &sc_list, &resolved_ids,
+                      this](UniqueCStringMap<uint32_t> &Names) {
       std::vector<uint32_t> ids;
       if (Names.GetValues(name, ids)) {
         for (auto id : ids) {
@@ -930,9 +916,8 @@ SymbolFilePDB::FindFunctions(const lldb_
   CacheFunctionNames();
 
   std::set<uint32_t> resolved_ids;
-  auto ResolveFn = [&regex, include_inlines, &sc_list, &resolved_ids, this] (
-      UniqueCStringMap<uint32_t> &Names)
-  {
+  auto ResolveFn = [&regex, include_inlines, &sc_list, &resolved_ids,
+                    this](UniqueCStringMap<uint32_t> &Names) {
     std::vector<uint32_t> ids;
     if (Names.GetValues(regex, ids)) {
       for (auto id : ids) {
@@ -973,14 +958,13 @@ uint32_t SymbolFilePDB::FindTypes(
 
   // There is an assumption 'name' is not a regex
   FindTypesByName(name_str, max_matches, types);
-   
+
   return types.GetSize();
 }
 
-void
-SymbolFilePDB::FindTypesByRegex(const lldb_private::RegularExpression &regex,
-                                uint32_t max_matches,
-                                lldb_private::TypeMap &types) {
+void SymbolFilePDB::FindTypesByRegex(
+    const lldb_private::RegularExpression &regex, uint32_t max_matches,
+    lldb_private::TypeMap &types) {
   // When searching by regex, we need to go out of our way to limit the search
   // space as much as possible since this searches EVERYTHING in the PDB,
   // manually doing regex comparisons.  PDB library isn't optimized for regex
@@ -1006,7 +990,7 @@ SymbolFilePDB::FindTypesByRegex(const ll
       if (auto enum_type = llvm::dyn_cast<PDBSymbolTypeEnum>(result.get()))
         type_name = enum_type->getName();
       else if (auto typedef_type =
-               llvm::dyn_cast<PDBSymbolTypeTypedef>(result.get()))
+                   llvm::dyn_cast<PDBSymbolTypeTypedef>(result.get()))
         type_name = typedef_type->getName();
       else if (auto class_type = llvm::dyn_cast<PDBSymbolTypeUDT>(result.get()))
         type_name = class_type->getName();
@@ -1083,10 +1067,9 @@ lldb_private::TypeList *SymbolFilePDB::G
   return m_obj_file->GetModule()->GetTypeList();
 }
 
-void
-SymbolFilePDB::GetTypesForPDBSymbol(const llvm::pdb::PDBSymbol &pdb_symbol,
-                                    uint32_t type_mask,
-                                    TypeCollection &type_collection) {
+void SymbolFilePDB::GetTypesForPDBSymbol(const llvm::pdb::PDBSymbol &pdb_symbol,
+                                         uint32_t type_mask,
+                                         TypeCollection &type_collection) {
   bool can_parse = false;
   switch (pdb_symbol.getSymTag()) {
   case PDB_SymType::ArrayType:
@@ -1113,10 +1096,11 @@ SymbolFilePDB::GetTypesForPDBSymbol(cons
     auto *udt = llvm::dyn_cast<PDBSymbolTypeUDT>(&pdb_symbol);
     assert(udt);
     can_parse = (udt->getUdtKind() != PDB_UdtType::Interface &&
-        ((type_mask & (eTypeClassClass | eTypeClassStruct |
-                       eTypeClassUnion)) != 0));
+                 ((type_mask & (eTypeClassClass | eTypeClassStruct |
+                                eTypeClassUnion)) != 0));
   } break;
-  default:break;
+  default:
+    break;
   }
 
   if (can_parse) {
@@ -1138,8 +1122,8 @@ size_t SymbolFilePDB::GetTypes(lldb_priv
                                lldb_private::TypeList &type_list) {
   TypeCollection type_collection;
   uint32_t old_size = type_list.GetSize();
-  CompileUnit *cu = sc_scope ?
-      sc_scope->CalculateSymbolContextCompileUnit() : nullptr;
+  CompileUnit *cu =
+      sc_scope ? sc_scope->CalculateSymbolContextCompileUnit() : nullptr;
   if (cu) {
     auto compiland_up = GetPDBCompilandByUID(cu->GetID());
     if (!compiland_up)
@@ -1191,8 +1175,8 @@ const IPDBSession &SymbolFilePDB::GetPDB
   return *m_session_up;
 }
 
-lldb::CompUnitSP
-SymbolFilePDB::ParseCompileUnitForUID(uint32_t id, uint32_t index) {
+lldb::CompUnitSP SymbolFilePDB::ParseCompileUnitForUID(uint32_t id,
+                                                       uint32_t index) {
   auto found_cu = m_comp_units.find(id);
   if (found_cu != m_comp_units.end())
     return found_cu->second;
@@ -1218,8 +1202,8 @@ SymbolFilePDB::ParseCompileUnitForUID(ui
   // Don't support optimized code for now, DebugInfoPDB does not return this
   // information.
   LazyBool optimized = eLazyBoolNo;
-  auto cu_sp = std::make_shared<CompileUnit>(
-      m_obj_file->GetModule(), nullptr, path.c_str(), id, lang, optimized);
+  auto cu_sp = std::make_shared<CompileUnit>(m_obj_file->GetModule(), nullptr,
+                                             path.c_str(), id, lang, optimized);
 
   if (!cu_sp)
     return CompUnitSP();
@@ -1228,8 +1212,8 @@ SymbolFilePDB::ParseCompileUnitForUID(ui
   if (index == UINT32_MAX)
     GetCompileUnitIndex(*compiland_up, index);
   lldbassert(index != UINT32_MAX);
-  m_obj_file->GetModule()->GetSymbolVendor()->SetCompileUnitAtIndex(
-      index, cu_sp);
+  m_obj_file->GetModule()->GetSymbolVendor()->SetCompileUnitAtIndex(index,
+                                                                    cu_sp);
   return cu_sp;
 }
 
@@ -1389,16 +1373,16 @@ SymbolFilePDB::GetMangledForPDBFunc(cons
   // For static functions, they don't have undecorated names and aren't exposed
   // in Public Symbols either.
   if (!func_undecorated_name.empty()) {
-    auto result_up =
-        m_global_scope_up->findChildren(PDB_SymType::PublicSymbol,
-                                        func_undecorated_name,
-                                        PDB_NameSearchFlags::NS_UndecoratedName);
+    auto result_up = m_global_scope_up->findChildren(
+        PDB_SymType::PublicSymbol, func_undecorated_name,
+        PDB_NameSearchFlags::NS_UndecoratedName);
     if (result_up) {
       while (auto symbol_up = result_up->getNext()) {
         // For a public symbol, it is unique.
         lldbassert(result_up->getChildCount() == 1);
         if (auto *pdb_public_sym =
-            llvm::dyn_cast_or_null<PDBSymbolPublicSymbol>(symbol_up.get())) {
+                llvm::dyn_cast_or_null<PDBSymbolPublicSymbol>(
+                    symbol_up.get())) {
           if (pdb_public_sym->isFunction()) {
             func_decorated_name = pdb_public_sym->getName();
             break;

Modified: lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h?rev=328176&r1=328175&r2=328176&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h Wed Mar 21 20:44:51 2018
@@ -143,8 +143,7 @@ public:
                    bool append, lldb_private::TypeMap &types) override;
 
   void FindTypesByRegex(const lldb_private::RegularExpression &regex,
-                        uint32_t max_matches,
-                        lldb_private::TypeMap &types);
+                        uint32_t max_matches, lldb_private::TypeMap &types);
 
   lldb_private::TypeList *GetTypeList() override;
 
@@ -169,8 +168,8 @@ public:
   const llvm::pdb::IPDBSession &GetPDBSession() const;
 
 private:
-  lldb::CompUnitSP
-  ParseCompileUnitForUID(uint32_t id, uint32_t index = UINT32_MAX);
+  lldb::CompUnitSP ParseCompileUnitForUID(uint32_t id,
+                                          uint32_t index = UINT32_MAX);
 
   bool ParseCompileUnitLineTable(const lldb_private::SymbolContext &sc,
                                  uint32_t match_line);
@@ -185,15 +184,15 @@ private:
   lldb::CompUnitSP
   GetCompileUnitContainsAddress(const lldb_private::Address &so_addr);
 
-  typedef std::vector<lldb_private::Type*> TypeCollection;
+  typedef std::vector<lldb_private::Type *> TypeCollection;
 
-  void
-  GetTypesForPDBSymbol(const llvm::pdb::PDBSymbol &pdb_symbol,
-                       uint32_t type_mask, TypeCollection &type_collection);
-
-  lldb_private::Function* ParseCompileUnitFunctionForPDBFunc(
-      const llvm::pdb::PDBSymbolFunc &pdb_func,
-      const lldb_private::SymbolContext &sc);
+  void GetTypesForPDBSymbol(const llvm::pdb::PDBSymbol &pdb_symbol,
+                            uint32_t type_mask,
+                            TypeCollection &type_collection);
+
+  lldb_private::Function *
+  ParseCompileUnitFunctionForPDBFunc(const llvm::pdb::PDBSymbolFunc &pdb_func,
+                                     const lldb_private::SymbolContext &sc);
 
   void GetCompileUnitIndex(const llvm::pdb::PDBSymbolCompiland &pdb_compiland,
                            uint32_t &index);




More information about the lldb-commits mailing list