Merge remote-tracking branch 'origin/main' into addmainunit3
authorJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 4 Jan 2021 11:42:50 +0000 (12:42 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 4 Jan 2021 11:42:50 +0000 (12:42 +0100)
1  2 
lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/source/Symbol/CompileUnit.cpp

@@@ -842,10 -827,9 +840,9 @@@ XcodeSDK SymbolFileDWARF::ParseXcodeSDK
  }
  
  size_t SymbolFileDWARF::ParseFunctions(CompileUnit &comp_unit) {
-   static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
-   Timer scoped_timer(func_cat, "SymbolFileDWARF::ParseFunctions");
+   LLDB_SCOPED_TIMER();
    std::lock_guard<std::recursive_mutex> guard(GetModuleMutex());
 -  DWARFUnit *dwarf_cu = GetDWARFCompileUnit(&comp_unit);
 +  DWARFCompileUnit *dwarf_cu = GetDWARFCompileUnit(&comp_unit);
    if (!dwarf_cu)
      return 0;
  
Simple merge