commit a9a92a5edb64fac48bc300bc257f1e75612b4cb6
author Nicolas Capens <capn@google.com> Tue Sep 06 12:59:58 2016 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Sep 09 14:14:31 2016 +0000
tree 35ae79d525165b4a5d8b63a2a0eccf586a037b66
parent 86e5d883047328790dd7e1931c3cd112765560d7

Fix initializing the allocator before creating empty vector.

MSVC's implementation of the STL allocates memory even for an empty
vector. Since we're using a custom thread-local allocator, it should
be initialized before any STL member containers get initialized.

BUG=swiftshader:7

Change-Id: I4bd977e7ee8eb87006fe08b051cbcfc9bc62342b
Reviewed-on: https://chromium-review.googlesource.com/381531
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Jim Stichnoth <stichnot@chromium.org>

src/IceMemory.cpp

diff --git a/src/IceMemory.cpp b/src/IceMemory.cpp
index 57c969e..0026661 100644
--- a/src/IceMemory.cpp
+++ b/src/IceMemory.cpp
@@ -31,9 +31,17 @@
 void CfgAllocatorTraits::set_current(const manager_type *Manager) {
   ArenaAllocator *Allocator =
       Manager == nullptr ? nullptr : Manager->Allocator.get();
+  set_current(Allocator);
+}
+
+void CfgAllocatorTraits::set_current(ArenaAllocator *Allocator) {
   ICE_TLS_SET_FIELD(CfgAllocator, Allocator);
 }
 
+void CfgAllocatorTraits::set_current(nullptr_t) {
+  ICE_TLS_SET_FIELD(CfgAllocator, nullptr);
+}
+
 ICE_TLS_DEFINE_FIELD(ArenaAllocator *, LivenessAllocatorTraits,
                      LivenessAllocator);