1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00

Make sys::ThreadLocal<> zero-initialized on non-thread builds (PR18205)

According to the docs, ThreadLocal<>::get() should return NULL
if no object has been set. This patch makes that the case also for non-thread
builds and adds a very basic unit test to check it.

(This was causing PR18205 because PrettyStackTraceHead didn't get zero-
initialized and we'd crash trying to read past the end of that list. We didn't
notice this so much on Linux since we'd crash after printing all the entries,
but on Mac we print into a SmallString, and would crash before printing that.)

llvm-svn: 197718
This commit is contained in:
Hans Wennborg 2013-12-19 20:32:44 +00:00
parent 86f36f1147
commit 79ff74b059
4 changed files with 41 additions and 2 deletions

View File

@ -23,7 +23,7 @@
// Define all methods as no-ops if threading is explicitly disabled
namespace llvm {
using namespace sys;
ThreadLocalImpl::ThreadLocalImpl() { }
ThreadLocalImpl::ThreadLocalImpl() : data() { }
ThreadLocalImpl::~ThreadLocalImpl() { }
void ThreadLocalImpl::setInstance(const void* d) {
typedef int SIZE_TOO_BIG[sizeof(d) <= sizeof(data) ? 1 : -1];

View File

@ -18,7 +18,7 @@
namespace llvm {
using namespace sys;
ThreadLocalImpl::ThreadLocalImpl() { }
ThreadLocalImpl::ThreadLocalImpl() : data() { }
ThreadLocalImpl::~ThreadLocalImpl() { }
void ThreadLocalImpl::setInstance(const void* d) { data = const_cast<void*>(d);}
const void* ThreadLocalImpl::getInstance() { return data; }

View File

@ -30,6 +30,7 @@ add_llvm_unittest(SupportTests
RegexTest.cpp
SourceMgrTest.cpp
SwapByteOrderTest.cpp
ThreadLocalTest.cpp
TimeValueTest.cpp
UnicodeTest.cpp
ValueHandleTest.cpp

View File

@ -0,0 +1,38 @@
//===- llvm/unittest/Support/ThreadLocalTest.cpp - Therad Local tests ---===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "llvm/Support/ThreadLocal.h"
#include "gtest/gtest.h"
using namespace llvm;
using namespace sys;
namespace {
class ThreadLocalTest : public ::testing::Test {
};
struct S {
int i;
};
TEST_F(ThreadLocalTest, Basics) {
ThreadLocal<const S> x;
EXPECT_EQ(0, x.get());
S s;
x.set(&s);
EXPECT_EQ(&s, x.get());
x.erase();
EXPECT_EQ(0, x.get());
}
}