pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lldb-git: Fix SymbolFileDWARF.cpp build with llvm::call_once



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jan 30 17:41:13 2017 +0100
Changeset:	51e2b0f6f39c776bf22a10e2666bb1e62c5301fa

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp

Log Message:
lldb-git: Fix SymbolFileDWARF.cpp build with llvm::call_once

Lambda dances.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=51e2b0f6f39c776bf22a10e2666bb1e62c5301fa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-git/distinfo                                         |  2 +-
 ...ch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 26826d3..babf044 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -42,7 +42,7 @@ SHA1 (patch-source_Plugins_Process_mach-core_ProcessMachCore.cpp) = 6a77fa5f1b0b
 SHA1 (patch-source_Plugins_Process_minidump_ProcessMinidump.cpp) = d277611578b8f990c8bf306805a5f21fa043a64f
 SHA1 (patch-source_Plugins_ScriptInterpreter_None_ScriptInterpreterNone.cpp) = 3b80822049658b4afb624da85832ff731e2de8de
 SHA1 (patch-source_Plugins_ScriptInterpreter_Python_ScriptInterpreterPython.cpp) = 62b4bdaa1058471cea30cbdb891f03963b656b1c
-SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = 7aeca2a02a2dc390c876f3f545cec7e620a65c95
+SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp) = d577c4819d22d1d537558612cbd86250da7de426
 SHA1 (patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.h) = f9c0ca5b65adff958e63696121668cb415880e6a
 SHA1 (patch-source_Symbol_ClangASTContext.cpp) = b82b171651e2e508485d23d892a89bceac71b808
 SHA1 (patch-source_Symbol_GoASTContext.cpp) = 0f6f9a00c69c9a131b778727e478a9054440e325
diff --git a/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp b/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
index 1669f49..a295022 100644
--- a/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
+++ b/lldb-git/patches/patch-source_Plugins_SymbolFile_DWARF_SymbolFileDWARF.cpp
@@ -10,16 +10,25 @@ $NetBSD$
  
  #include "lldb/Core/ArchSpec.h"
  #include "lldb/Core/Module.h"
-@@ -553,7 +554,8 @@ uint32_t SymbolFileDWARF::CalculateAbili
+@@ -87,6 +88,7 @@
+ 
+ using namespace lldb;
+ using namespace lldb_private;
++using namespace llvm;
+ 
+ // static inline bool
+ // child_requires_parent_class_union_or_struct_to_be_completed (dw_tag_t tag)
+@@ -553,8 +555,8 @@ uint32_t SymbolFileDWARF::CalculateAbili
  const DWARFDataExtractor &
  SymbolFileDWARF::GetCachedSectionData(lldb::SectionType sect_type,
                                        DWARFDataSegment &data_segment) {
 -  std::call_once(data_segment.m_flag, &SymbolFileDWARF::LoadSectionData, this,
+-                 sect_type, std::ref(data_segment.m_data));
 +  LLVM_DEFINE_ONCE_FLAG(m_flag);
-+  llvm::call_once(m_flag, &SymbolFileDWARF::LoadSectionData, this,
-                  sect_type, std::ref(data_segment.m_data));
++  llvm::call_once(m_flag,  [this, sect_type, &data_segment]{ this->LoadSectionData(sect_type, std::ref(data_segment.m_data));});
    return data_segment.m_data;
  }
+ 
 @@ -1630,13 +1632,13 @@ SymbolFileDWARF::GlobalVariableMap &Symb
                VariableSP var_sp = globals_sp->GetVariableAtIndex(g);
                if (var_sp && !var_sp->GetLocationIsConstantValueData()) {


Home | Main Index | Thread Index | Old Index