better fix for 5.0 removal of dump() in release builds

CMakeLists.txt

@@ -289,6 +289,9 @@ if (LLVM_JIT)
     if (${LLVM_PACKAGE_VERSION} VERSION_LESS "3.8")
         set(LLVM_EXTRA_LIBS ipa)
     endif()
+	if (NOT ${LLVM_PACKAGE_VERSION} VERSION_LESS "5.0.0")
+		set(LLVM_EXTRA_LIBS orcjit)
+	endif()
     message(STATUS "SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
     if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
 	set(LLVM_LIBS_PROCESSOR
@@ -312,11 +315,11 @@ if (LLVM_JIT)
     endif()
     llvm_map_components_to_libnames(LLVM_LIBS
             Analysis
-            Core
-            CodeGen
             AsmParser
             AsmPrinter
             BitReader
+            Core
+            CodeGen
             ExecutionEngine
             InstCombine
             ${LLVM_EXTRA_LIBS}
@@ -330,7 +333,7 @@ if (LLVM_JIT)
             Support
             Target
             TransformUtils
-	    ${LLVM_LIBS_PROCESSOR}
+            ${LLVM_LIBS_PROCESSOR}
             )
     message(STATUS "LLVM_LIBS ${LLVM_LIBS}")
 endif ()

src/ravi_llvmjit.cpp

@@ -195,7 +195,7 @@ std::shared_ptr<llvm::Module> RaviJITState::optimizeModule(
   using llvm::PassManager;
 #endif
   
-#if defined(LLVM_ENABLE_DUMP)
+#if !defined(NDEBUG)
   if (get_verbosity() >= 1)
     M->dump();
 #endif
@@ -632,7 +632,7 @@ llvm::Function *RaviJITModule::addExternFunction(llvm::FunctionType *type,
 }
 
 void RaviJITModule::dump() {
-#if defined(LLVM_ENABLE_DUMP)
+#if !defined(NDEBUG)
   if (module_) module_->dump();
 #endif
 }

src/ravi_llvmluaapi.cpp

@@ -552,7 +552,7 @@ static llvm::Value *get_value(lua_State *L, int idx) {
  Dump an LLVM object
 */
 static int dump_content(lua_State *L) {
-#if defined(LLVM_ENABLE_DUMP)
+#if !defined(NDEBUG)
   TypeHolder *th = nullptr;
   StructTypeHolder *sth = nullptr;
   PointerTypeHolder *ph = nullptr;

src/ravi_llvmtypes.cpp

@@ -1324,7 +1324,7 @@ LuaLLVMTypes::LuaLLVMTypes(llvm::LLVMContext &context) : mdbuilder(context) {
 }
 
 void LuaLLVMTypes::dump() {
-#if defined(LLVM_ENABLE_DUMP)
+#if !defined(NDEBUG)
   GCObjectT->dump();
   fputs("\n", stdout);
   TValueT->dump();