[lld] r234167 - [Mips] Guard modification of register usage masks by mutex

[Simon Atanasyan]

Author: atanasyan
Date: Mon Apr  6 11:07:19 2015
New Revision: 234167

URL: http://llvm.org/viewvc/llvm-project?rev=234167&view=rev
Log:
[Mips] Guard modification of register usage masks by mutex

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp?rev=234167&r1=234166&r2=234167&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp Mon Apr  6 11:07:19 2015
@@ -48,6 +48,7 @@ std::error_code MipsLinkingContext::merg
 }
 
 void MipsLinkingContext::mergeReginfoMask(const MipsReginfo &info) {
+  std::lock_guard<std::mutex> lock(_maskMutex);
   if (_reginfoMask.hasValue())
     _reginfoMask->merge(info);
   else

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h?rev=234167&r1=234166&r2=234167&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h Mon Apr  6 11:07:19 2015
@@ -12,6 +12,7 @@
 #include "MipsELFFlagsMerger.h"
 #include "MipsReginfo.h"
 #include "lld/ReaderWriter/ELFLinkingContext.h"
+#include <mutex>
 
 namespace lld {
 namespace elf {
@@ -67,6 +68,7 @@ public:
 
 private:
   MipsELFFlagsMerger _flagsMerger;
+  std::mutex _maskMutex;
   llvm::Optional<MipsReginfo> _reginfoMask;
 };