From f3fbd1c0586ff6ec7895991e6c28f61a503c36a8 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 23 Jul 2016 20:50:09 +0000 Subject: Vendor import of lldb release_39 branch r276489: https://llvm.org/svn/llvm-project/lldb/branches/release_39@276489 --- source/Plugins/ObjectFile/JIT/Makefile | 14 -------------- source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 source/Plugins/ObjectFile/JIT/Makefile (limited to 'source/Plugins/ObjectFile/JIT') diff --git a/source/Plugins/ObjectFile/JIT/Makefile b/source/Plugins/ObjectFile/JIT/Makefile deleted file mode 100644 index 2af3521777a1..000000000000 --- a/source/Plugins/ObjectFile/JIT/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -##===- source/Plugins/ObjectFile/JIT/Makefile --------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LLDB_LEVEL := ../../../.. -LIBRARYNAME := lldbPluginObjectFileJIT -BUILD_ARCHIVE = 1 - -include $(LLDB_LEVEL)/Makefile diff --git a/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp b/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp index 3103ed8fb8fe..e3d838333711 100644 --- a/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp +++ b/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp @@ -158,11 +158,11 @@ ObjectFileJIT::GetSymtab() ModuleSP module_sp(GetModule()); if (module_sp) { - lldb_private::Mutex::Locker locker(module_sp->GetMutex()); + std::lock_guard guard(module_sp->GetMutex()); if (m_symtab_ap.get() == NULL) { m_symtab_ap.reset(new Symtab(this)); - Mutex::Locker symtab_locker (m_symtab_ap->GetMutex()); + std::lock_guard symtab_guard(m_symtab_ap->GetMutex()); ObjectFileJITDelegateSP delegate_sp (m_delegate_wp.lock()); if (delegate_sp) delegate_sp->PopulateSymtab(this, *m_symtab_ap); @@ -200,7 +200,7 @@ ObjectFileJIT::Dump (Stream *s) ModuleSP module_sp(GetModule()); if (module_sp) { - lldb_private::Mutex::Locker locker(module_sp->GetMutex()); + std::lock_guard guard(module_sp->GetMutex()); s->Printf("%p: ", static_cast(this)); s->Indent(); s->PutCString("ObjectFileJIT"); -- cgit v1.2.3