From 63deaad18853e55097761e47a9eedd12eb0c1e58 Mon Sep 17 00:00:00 2001 From: Shih-wei Liao Date: Tue, 6 Mar 2012 17:26:37 -0800 Subject: Fix memory corruption due to premature llvm_shutdown(). Under LLVM, multiple compiler-related gtests randomly crashes from time to time, because common_test.h has code to new multiple compiler instances. Multiple CompilerLLVM instances may cause crash if one shuts down LLVM prematurely. This fix uses static class member. Destructor is where we shut down LLVM. Change-Id: Ied371794af7ca9eb2c9fe6b278fd779a61a4a753 --- src/compiler_llvm/compiler_llvm.cc | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/compiler_llvm/compiler_llvm.cc') diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index b2a6d28315..6646b196ca 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -41,11 +41,10 @@ extern llvm::cl::opt EnableARMLongCalls; // ARMISelLowering.cpp, however, it is not in the llvm namespace. -namespace { - -pthread_once_t llvm_initialized = PTHREAD_ONCE_INIT; +namespace art { +namespace compiler_llvm { -void InitializeLLVM() { +CompilerLLVM::LLVMInitializer::LLVMInitializer() { // NOTE: Uncomment following line to show the time consumption of LLVM passes //llvm::TimePassesIsEnabled = true; @@ -76,11 +75,13 @@ void InitializeLLVM() { llvm::llvm_start_multithreaded(); } -} // anonymous namespace - +CompilerLLVM::LLVMInitializer::~LLVMInitializer() { + llvm::llvm_shutdown(); +} -namespace art { -namespace compiler_llvm { +// Singleton. Otherwise, multiple CompilerLLVM instances may cause crashes if +// one shuts down prematurely. +CompilerLLVM::LLVMInitializer CompilerLLVM::llvm_initialize_guard; llvm::Module* makeLLVMModuleContents(llvm::Module* module); @@ -89,20 +90,15 @@ llvm::Module* makeLLVMModuleContents(llvm::Module* module); CompilerLLVM::CompilerLLVM(Compiler* compiler, InstructionSet insn_set) : compiler_(compiler), compiler_lock_("llvm_compiler_lock"), insn_set_(insn_set), curr_cunit_(NULL) { - - // Initialize LLVM libraries - pthread_once(&llvm_initialized, InitializeLLVM); } CompilerLLVM::~CompilerLLVM() { STLDeleteElements(&cunits_); - llvm::llvm_shutdown(); } void CompilerLLVM::EnsureCompilationUnit() { - DCHECK_NE(llvm_initialized, PTHREAD_ONCE_INIT); compiler_lock_.AssertHeld(); if (curr_cunit_ != NULL) { -- cgit v1.2.3-59-g8ed1b