Merge pull request #1938 from dcci/thewrong

apple-llvm-split-commit: 2922cb7f96e3d2f2e50cd4515a25c5def4335888
apple-llvm-split-dir: lldb/

Author: swift-ci

lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp

@@ -972,15 +972,6 @@ uint64_t DWARFDebugInfoEntry::GetAttributeValueAsUnsigned(
   return fail_value;
 }
 
-lldb::LanguageType DWARFDebugInfoEntry::GetLanguageAttributeValue(
-    SymbolFileDWARF *dwarf2Data, const DWARFUnit *cu) const {
-  const uint64_t language = GetAttributeValueAsUnsigned(
-      dwarf2Data, cu, DW_AT_language, lldb::eLanguageTypeUnknown);
-  if (language == llvm::dwarf::DW_LANG_Swift)
-    return lldb::eLanguageTypeSwift;
-  return (lldb::LanguageType)language;
-}
-
 //----------------------------------------------------------------------
 // GetAttributeValueAsSigned
 //

lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h

@@ -104,10 +104,6 @@ class DWARFDebugInfoEntry {
       const dw_attr_t attr, uint64_t fail_value,
       bool check_specification_or_abstract_origin = false) const;
 
-  lldb::LanguageType
-  GetLanguageAttributeValue(SymbolFileDWARF *dwarf2Data,
-                            const DWARFUnit *cu) const;
-
   uint64_t GetAttributeValueAsReference(
       SymbolFileDWARF *dwarf2Data, const DWARFUnit *cu,
       const dw_attr_t attr, uint64_t fail_value,

lldb/source/Symbol/ClangASTContext.cpp

@@ -324,7 +324,7 @@ typedef lldb_private::ThreadSafeDenseMap<clang::ASTContext *, ClangASTContext *>
 
 static ClangASTMap &GetASTMap() {
   static ClangASTMap *g_map_ptr = nullptr;
-  static std::once_flag g_once_flag;
+  static llvm::once_flag g_once_flag;
   llvm::call_once(g_once_flag, []() {
     g_map_ptr = new ClangASTMap(); // leaked on purpose to avoid spins
   });
@@ -1081,7 +1081,7 @@ ClangASTContext::GetBasicTypeEnumeration(ConstString name) {
   if (name) {
     typedef UniqueCStringMap<lldb::BasicType> TypeNameToBasicTypeMap;
     static TypeNameToBasicTypeMap g_type_map;
-    static std::once_flag g_once_flag;
+    static llvm::once_flag g_once_flag;
     llvm::call_once(g_once_flag, []() {
       // "void"
       g_type_map.Append(ConstString("void"), eBasicTypeVoid);