From dddf66fd6577fd20302cf2e71b7fd78fbaed5c61 Mon Sep 17 00:00:00 2001 From: Alan Hu Date: Thu, 15 Jun 2023 20:56:39 -0400 Subject: [PATCH] [OCaml] Rename link_modules' to link_modules Commit 434e956 renamed link_modules to link_modules' for unclear reasons. Based on the commit's diff, the author possibly intended to have two functions, link_modules to bind to LLVMLinkModules and link_modules' to bind to LLVMLinkModules2. However, there is only one function. link_modules' appears in LLVM 3.8 onwards. Differential Revision: https://reviews.llvm.org/D153090 --- llvm/bindings/ocaml/linker/llvm_linker.ml | 4 ++-- llvm/bindings/ocaml/linker/llvm_linker.mli | 4 ++-- llvm/test/Bindings/OCaml/linker.ml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/llvm/bindings/ocaml/linker/llvm_linker.ml b/llvm/bindings/ocaml/linker/llvm_linker.ml index e61e8fc..0952d0e 100644 --- a/llvm/bindings/ocaml/linker/llvm_linker.ml +++ b/llvm/bindings/ocaml/linker/llvm_linker.ml @@ -10,5 +10,5 @@ exception Error of string let () = Callback.register_exception "Llvm_linker.Error" (Error "") -external link_modules' : Llvm.llmodule -> Llvm.llmodule -> unit - = "llvm_link_modules" +external link_modules : Llvm.llmodule -> Llvm.llmodule -> unit + = "llvm_link_modules" diff --git a/llvm/bindings/ocaml/linker/llvm_linker.mli b/llvm/bindings/ocaml/linker/llvm_linker.mli index ed8f0b3..4300b3b 100644 --- a/llvm/bindings/ocaml/linker/llvm_linker.mli +++ b/llvm/bindings/ocaml/linker/llvm_linker.mli @@ -13,6 +13,6 @@ exception Error of string -(** [link_modules' dst src] links [src] into [dst], raising [Error] +(** [link_modules dst src] links [src] into [dst], raising [Error] if the linking fails. The src module is destroyed. *) -val link_modules' : Llvm.llmodule -> Llvm.llmodule -> unit \ No newline at end of file +val link_modules : Llvm.llmodule -> Llvm.llmodule -> unit diff --git a/llvm/test/Bindings/OCaml/linker.ml b/llvm/test/Bindings/OCaml/linker.ml index 81d7e9b..6375be8 100644 --- a/llvm/test/Bindings/OCaml/linker.ml +++ b/llvm/test/Bindings/OCaml/linker.ml @@ -43,18 +43,18 @@ let test_linker () = let m1 = make_module "one" and m2 = make_module "two" in - link_modules' m1 m2; + link_modules m1 m2; dispose_module m1; let m1 = make_module "one" and m2 = make_module "two" in - link_modules' m1 m2; + link_modules m1 m2; dispose_module m1; let m1 = make_module "one" and m2 = make_module "one" in try - link_modules' m1 m2; + link_modules m1 m2; failwith "must raise" with Error _ -> dispose_module m1 -- 2.7.4