* Annotate the presets for LLVM with @NoException to reduce unneed…

…ed C++ overhead (pull #1052)

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Annotate the presets for LLVM with `@NoException` to reduce unneeded C++ overhead ([pull #1052](https://github.com/bytedeco/javacpp-presets/pull/1052))
  * Update samples for LLVM 12 including new `samples/llvm/OrcJit.java` using libffi ([pull #1050](https://github.com/bytedeco/javacpp-presets/pull/1050))
  * Enable GTK support in presets for OpenCV when building on ARM as well
  * Correct `enum` classes in presets for Spinnaker ([pull #1048](https://github.com/bytedeco/javacpp-presets/pull/1048))

llvm/samples/polly/MatMulBenchmark.java

@@ -276,8 +276,17 @@ static LLVMModuleRef build() {
         return module;
     }
 
+    static void handleError(LLVMErrorRef e) {
+        if (e != null && !e.isNull()) {
+            BytePointer p = LLVMGetErrorMessage(e);
+            String s = p.getString();
+            LLVMDisposeErrorMessage(p);
+            throw new RuntimeException(s);
+        }
+    }
+
     static void optimize(LLVMModuleRef module) {
-        optimizeModule(module, cpu, 3, 0);
+        handleError(optimizeModule(module, cpu, 3, 0));
     }
 
     static void verify(LLVMModuleRef module, boolean dumpModule) {
@@ -295,7 +304,7 @@ static void verify(LLVMModuleRef module, boolean dumpModule) {
     }
 
     static void jitCompile(LLVMExecutionEngineRef engine, LLVMModuleRef module) {
-        createOptimizedJITCompilerForModule(engine, module, cpu, 3);
+        handleError(createOptimizedJITCompilerForModule(engine, module, cpu, 3));
     }
 
     static LLVMValueRef toConstInt(int v) {

llvm/src/gen/java/org/bytedeco/llvm/global/LLVM.java

@@ -11066,19 +11066,20 @@ public static native void LLVMAddScalarReplAggregatesPassWithThreshold(LLVMPassM
 // #include "llvm/Pass.h"
 // #include "llvm-c/Transforms/PassManagerBuilder.h"
 // #include "llvm-c/Types.h"
+// #include "llvm-c/Error.h"
 
 /**
  * This function does the standard LLVM optimization.
  * This function is based on main() of llvm/tools/opt/opt.cpp.
  * Use LLVMGetHostCPUName() for the cpu argument.
  */
-public static native void optimizeModule(
+public static native LLVMErrorRef optimizeModule(
     LLVMModuleRef moduleRef,
     @Cast("const char*") BytePointer cpu,
     @Cast("unsigned") int optLevel,
     @Cast("unsigned") int sizeLevel
 );
-public static native void optimizeModule(
+public static native LLVMErrorRef optimizeModule(
     LLVMModuleRef moduleRef,
     String cpu,
     @Cast("unsigned") int optLevel,
@@ -11089,13 +11090,13 @@ public static native void optimizeModule(
  * This function is similar to LLVMCreateJITCompilerForModule() but does CPU specific optimization.
  * Use LLVMGetHostCPUName() for the cpu argument.
  */
-public static native void createOptimizedJITCompilerForModule(
+public static native LLVMErrorRef createOptimizedJITCompilerForModule(
     @ByPtrPtr LLVMExecutionEngineRef outJIT,
     LLVMModuleRef moduleRef,
     @Cast("const char*") BytePointer cpu,
     @Cast("unsigned") int optLevel
 );
-public static native void createOptimizedJITCompilerForModule(
+public static native LLVMErrorRef createOptimizedJITCompilerForModule(
     @Cast("LLVMExecutionEngineRef*") PointerPointer outJIT,
     LLVMModuleRef moduleRef,
     String cpu,

llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java

@@ -41,6 +41,7 @@
     compiler = "cpp14", link = {"LLVM-12", "LTO@.12", "Remarks@.12"}, resource = {"include", "lib", "libexec", "share"}),
         @Platform(value = "macosx", link = {"LLVM", "LTO", "Remarks"}),
         @Platform(value = "windows", link = {"LLVM", "LTO", "Remarks"})})
+@NoException
 public class LLVM implements InfoMapper {
     static { Loader.checkVersion("org.bytedeco", "llvm"); }
 

llvm/src/main/java/org/bytedeco/llvm/presets/clang.java

@@ -30,6 +30,7 @@
     include = {"<clang-c/Platform.h>", "<clang-c/CXErrorCode.h>", "<clang-c/CXString.h>", "<clang-c/CXCompilationDatabase.h>",
                "<clang-c/BuildSystem.h>", "<clang-c/Index.h>", "<clang-c/Documentation.h>"},
     compiler = "cpp14", link = "clang@.12"), @Platform(value = "windows", link = "libclang") })
+@NoException
 public class clang implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("LLVM_CLANG_C_EXTERN_C_BEGIN").cppText("#define LLVM_CLANG_C_EXTERN_C_BEGIN").cppTypes())

llvm/src/main/resources/org/bytedeco/llvm/include/FullOptimization.h

@@ -37,6 +37,7 @@
 #include "llvm/Pass.h"
 #include "llvm-c/Transforms/PassManagerBuilder.h"
 #include "llvm-c/Types.h"
+#include "llvm-c/Error.h"
 
 using namespace llvm;
 
@@ -45,7 +46,7 @@ using namespace llvm;
  * This function is based on main() of llvm/tools/opt/opt.cpp.
  * Use LLVMGetHostCPUName() for the cpu argument.
  */
-void optimizeModule(
+LLVMErrorRef optimizeModule(
     LLVMModuleRef moduleRef,
     const char* cpu,
     unsigned optLevel,
@@ -60,7 +61,7 @@ void optimizeModule(
         .setErrorStr(&error)
         .selectTarget());
     if (!machine) {
-        throw std::runtime_error(error);
+        return wrap(make_error<StringError>(error, inconvertibleErrorCode()));
     }
 
     module->setTargetTriple(machine->getTargetTriple().str());
@@ -98,13 +99,14 @@ void optimizeModule(
 
     passes.add(createVerifierPass());
     passes.run(*module);
+    return LLVMErrorSuccess;
 }
 
 /**
  * This function is similar to LLVMCreateJITCompilerForModule() but does CPU specific optimization.
  * Use LLVMGetHostCPUName() for the cpu argument.
  */
-void createOptimizedJITCompilerForModule(
+LLVMErrorRef createOptimizedJITCompilerForModule(
     LLVMExecutionEngineRef *outJIT,
     LLVMModuleRef moduleRef,
     const char* cpu,
@@ -119,10 +121,11 @@ void createOptimizedJITCompilerForModule(
         .setErrorStr(&error)
         .create();
     if (ee == nullptr) {
-        throw std::runtime_error(error);
+        return wrap(make_error<StringError>(error, inconvertibleErrorCode()));
     }
     ee->finalizeObject();
     *outJIT = wrap(ee);
+    return LLVMErrorSuccess;
 }
 
 #endif