RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-27 13:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reapply r73647 in a non-broken form.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73662 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2009-06-17 23:49:06 +00:00
parent 7c4f7dd43a
commit bf5ec1b9db
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/System/RWMutex.h
View File

@ -79,7 +79,7 @@ namespace llvm
/// @}
};
/// ScopedReader - RAII acquisition of a writer lock
/// ScopedReader - RAII acquisition of a reader lock
struct ScopedReader {
RWMutex* mutex;

36
lib/VMCore/Function.cpp
View File

@ -18,6 +18,7 @@
#include "llvm/Support/LeakDetector.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/StringPool.h"
#include "llvm/Support/Threading.h"
#include "llvm/System/RWMutex.h"
#include "SymbolTableListTraitsImpl.h"
#include "llvm/ADT/DenseMap.h"
@ -230,21 +231,20 @@ void Function::removeAttribute(unsigned i, Attributes attr) {
// allocating an additional word in Function for programs which do not use GC
// (i.e., most programs) at the cost of increased overhead for clients which do
// use GC.
static ManagedStatic<DenseMap<const Function*,PooledStringPtr> > GCNames;
static ManagedStatic<StringPool> GCNamePool;
static DenseMap<const Function*,PooledStringPtr> *GCNames;
static StringPool *GCNamePool;
static ManagedStatic<sys::RWMutex> GCLock;
bool Function::hasGC() const {
if (llvm_is_multithreaded()) {
sys::ScopedReader Reader(&*GCLock);
return GCNames->count(this);
return GCNames && GCNames->count(this);
} else
return GCNames->count(this);
return GCNames && GCNames->count(this);
}
const char *Function::getGC() const {
assert(hasGC() && "Function has no collector");
if (llvm_is_multithreaded()) {
sys::ScopedReader Reader(&*GCLock);
return *(*GCNames)[this];
@ -253,19 +253,29 @@ const char *Function::getGC() const {
}
void Function::setGC(const char *Str) {
if (llvm_is_multithreaded()) {
sys::ScopedWriter Writer(&*GCLock);
(*GCNames)[this] = GCNamePool->intern(Str);
} else
if (llvm_is_multithreaded()) GCLock->writer_acquire();
if (!GCNamePool)
GCNamePool = new StringPool();
if (!GCNames)
GCNames = new DenseMap<const Function*,PooledStringPtr>();
(*GCNames)[this] = GCNamePool->intern(Str);
if (llvm_is_multithreaded()) GCLock->writer_release();
}
void Function::clearGC() {
if (llvm_is_multithreaded()) {
sys::ScopedWriter Writer(&*GCLock);
GCNames->erase(this);
} else
if (llvm_is_multithreaded()) GCLock->writer_acquire();
if (GCNames) {
GCNames->erase(this);
if (GCNames->empty()) {
delete GCNames;
GCNames = 0;
if (GCNamePool->empty()) {
delete GCNamePool;
GCNamePool = 0;
}
}
}
if (llvm_is_multithreaded()) GCLock->writer_release();
}
/// copyAttributesFrom - copy all additional attributes (those not needed to