Merge pull request #228 from hewj03/ocl-open-90

[90] Extend llvm_shutdown to fix ManagedStatic memleak, Fix llvm clone directory

Author: wenju-he

CMakeLists.txt

@@ -132,9 +132,6 @@ if(NOT USE_PREBUILT_LLVM)
                   ${LLVM_BASE_REVISION}
                   ${TARGET_BRANCH}
                   ret)
-    if(${ret})
-        add_definitions(-DAPPLIED_LLVM_PATCHES)
-    endif()
     apply_patches(${SPIRV_SOURCE_DIR}
                   ${CMAKE_CURRENT_SOURCE_DIR}/patches/spirv
                   ${SPIRV_BASE_REVISION}

README.md

@@ -26,7 +26,7 @@ following:
 This can be done using the following commands:
 ```
 cd <workspace>
-git clone https://github.com/llvm/llvm-project.git -b release/9.x
+git clone https://github.com/llvm/llvm-project.git . -b release/9.x
 git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_90
 git clone https://github.com/intel/opencl-clang.git -b ocl-open-90
 ```

common_clang.cpp

@@ -89,9 +89,6 @@ static llvm::ManagedStatic<llvm::sys::SmartMutex<true> > compileMutex;
 
 void CommonClangTerminate() {
   llvm::llvm_shutdown();
-#ifdef APPLIED_LLVM_PATCHES
-  llvm::deleteManagedStaticMutex();
-#endif
 }
 
 // This function mustn't be invoked from a static object constructor,

patches/llvm/0001-Adding-llvm-deleteManagedStaticMutex.patch

@@ -0,0 +1,31 @@
+From 22377f4221d77c66cddf0df535609408317563b2 Mon Sep 17 00:00:00 2001
+From: juanrod2 <>
+Date: Tue, 22 Dec 2020 08:50:05 +0800
+Subject: [PATCH] Memory leak fix for Managed Static Mutex
+
+Cleaning a mutex inside ManagedStatic llvm class.
+---
+ llvm/lib/Support/ManagedStatic.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/llvm/lib/Support/ManagedStatic.cpp b/llvm/lib/Support/ManagedStatic.cpp
+index 28ceb1a70e4..9579000955e 100644
+--- a/llvm/lib/Support/ManagedStatic.cpp
++++ b/llvm/lib/Support/ManagedStatic.cpp
+@@ -77,8 +77,12 @@ void ManagedStaticBase::destroy() const {
+ 
+ /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
+ void llvm::llvm_shutdown() {
+-  MutexGuard Lock(*getManagedStaticMutex());
++  getManagedStaticMutex()->lock();
+ 
+   while (StaticList)
+     StaticList->destroy();
++
++  getManagedStaticMutex()->unlock();
++  delete ManagedStaticMutex;
++  ManagedStaticMutex = nullptr;
+ }
+-- 
+2.29.2
+