Commit 4ed3bde6 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r197718: 

------------------------------------------------------------------------
r197718 | hans | 2013-12-19 12:32:44 -0800 (Thu, 19 Dec 2013) | 10 lines

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: 197778
parent f3e44526

llvm/lib/Support/ThreadLocal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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];

llvm/lib/Support/Unix/ThreadLocal.inc

+1 −1
Original line number Diff line number Diff line
@@ -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; }

llvm/unittests/Support/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ add_llvm_unittest(SupportTests 
  RegexTest.cpp

  SourceMgrTest.cpp

  SwapByteOrderTest.cpp

  ThreadLocalTest.cpp

  TimeValueTest.cpp

  UnicodeTest.cpp

  ValueHandleTest.cpp

llvm/unittests/Support/ThreadLocalTest.cpp

0 → 100644
+38 −0
Original line number Diff line number Diff line 
//===- 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());

}



}