1 files changed, 4 insertions, 17 deletions
diff --git a/llvm/bindings/ocaml/irreader/irreader_ocaml.c b/llvm/bindings/ocaml/irreader/irreader_ocaml.c
index 30c10c7b8b0..d9f7a50c52d 100644
--- a/llvm/bindings/ocaml/irreader/irreader_ocaml.c
+++ b/llvm/bindings/ocaml/irreader/irreader_ocaml.c
@@ -16,16 +16,7 @@
 #include "caml/alloc.h"
 #include "caml/fail.h"
 #include "caml/memory.h"
-
-/* Can't use the recommended caml_named_value mechanism for backwards
-   compatibility reasons. This is largely equivalent. */
-static value llvm_irreader_error_exn;
-
-CAMLprim value llvm_register_irreader_exns(value Error) {
-  llvm_irreader_error_exn = Field(Error, 0);
-  register_global_root(&llvm_irreader_error_exn);
-  return Val_unit;
-}
+#include "caml/callback.h"
 
 static void llvm_raise(value Prototype, char *Message) {
   CAMLparam1(Prototype);
@@ -35,14 +26,10 @@ static void llvm_raise(value Prototype, char *Message) {
   LLVMDisposeMessage(Message);
 
   raise_with_arg(Prototype, CamlMessage);
-  abort(); /* NOTREACHED */
-#ifdef CAMLnoreturn
-  CAMLnoreturn; /* Silences warnings, but is missing in some versions. */
-#endif
+  CAMLnoreturn;
 }
 
-
-/*===-- Modules -----------------------------------------------------------===*/
+/*===-- IRReader ----------------------------------------------------------===*/
 
 /* Llvm.llcontext -> Llvm.llmemorybuffer -> Llvm.llmodule */
 CAMLprim value llvm_parse_ir(LLVMContextRef C,
@@ -53,7 +40,7 @@ CAMLprim value llvm_parse_ir(LLVMContextRef C,
   char *Message;
 
   if (LLVMParseIRInContext(C, MemBuf, &M, &Message))
-    llvm_raise(llvm_irreader_error_exn, Message);
+    llvm_raise(*caml_named_value("Llvm_irreader.Error"), Message);
 
   CAMLreturn((value) M);
 }