LLDB cmake fix: define LLDB_CONFIGURATION_xxx based on the build type

[lemo]

Summary

Neither LLDB_CONFIGURATION_DEBUG nor LLDB_CONFIGURATION_RELEASE were ever set in the CMake LLDB project.

Also cleaned up a questionable #ifdef in SharingPtr.h, removing all the references to LLDB_CONFIGURATION_BUILD_AND_INTEGRATION in the process.

Differential Revision: https://reviews.llvm.org/D38552

[zturner]

CMakeLists.txt

15 ↗

(On Diff #117697)

I'm pretty sure that if you run CMake without specifying anything for CMAKE_BUILD_TYPE then the default is debug, but it doesn't internally set CMAKE_BUILD_TYPE=Debug. Can you double check this handles the default case appropriately?

[lemo]

Good point, I wouldn't be surprised if that was the case at some point, but right now the main llvm CMakeLists.txt has this:

...
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)

message(STATUS "No build type selected, default to Debug")
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (default Debug)" FORCE)

endif()
...

I will double check though, thanks for pointing this out.

[lemo]

Changed how CMAKE_BUILD_TYPE is tested to ensure we default to LLDB_CONFIGURATION_DEBUG.

[zturner]

CMakeLists.txt

15 ↗

(On Diff #117704)

Isn't this identical to the code before?

lldb/trunk/CMakeLists.txt

 cmake_minimum_required(VERSION 3.4.3)
 
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
   )
 
 include(LLDBStandalone)
 include(LLDBConfig)
 include(AddLLDB)
 
+# Define the LLDB_CONFIGURATION_xxx matching the build type
+if( uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
+  add_definitions( -DLLDB_CONFIGURATION_DEBUG )
+else()
+  add_definitions( -DLLDB_CONFIGURATION_RELEASE )
+endif()
+
 if (CMAKE_SYSTEM_NAME MATCHES "Windows|Android")
   set(LLDB_DEFAULT_DISABLE_LIBEDIT 1)
 else()
   set(LLDB_DEFAULT_DISABLE_LIBEDIT 0)
 endif ()
 
 # We need libedit support to go down both the source and
 # the scripts directories.

lldb/trunk/include/lldb/Utility/SharingPtr.h

public:
 
   IntrusiveSharingPtr &operator=(T *ptr) {
     reset(ptr);
     return *this;
   }
 
   ~IntrusiveSharingPtr() {
     release_shared();
-#if defined(LLDB_CONFIGURATION_DEBUG) || defined(LLDB_CONFIGURATION_RELEASE)
-    // NULL out the pointer in objects which can help with leaks detection.
-    // We don't enable this for LLDB_CONFIGURATION_BUILD_AND_INTEGRATION or
-    // when none of the LLDB_CONFIGURATION_XXX macros are defined since
-    // those would be builds for release. But for debug and release builds
-    // that are for development, we NULL out the pointers to catch potential
-    // issues.
     ptr_ = nullptr;
-#endif // #if defined (LLDB_CONFIGURATION_DEBUG) || defined
-       // (LLDB_CONFIGURATION_RELEASE)
   }
 
   T &operator*() const { return *ptr_; }
 
   T *operator->() const { return ptr_; }
 
   T *get() const { return ptr_; }