wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[OCaml] Handle nullptr in Llvm.global_initializer" 

This reverts commit r373299. It broke tests:
http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/18485

llvm-svn: 373311
This commit is contained in:
Dmitri Gribenko 2019-10-01 08:29:07 +00:00
parent 827a7fab78
commit f58d01930f
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/bindings/ocaml/llvm/llvm.ml
View File

@ -710,7 +710,7 @@ external define_qualified_global : string -> llvalue -> int -> llmodule ->
external lookup_global : string -> llmodule -> llvalue option external lookup_global : string -> llmodule -> llvalue option
= "llvm_lookup_global" = "llvm_lookup_global"
external delete_global : llvalue -> unit = "llvm_delete_global" external delete_global : llvalue -> unit = "llvm_delete_global"
external global_initializer : llvalue -> llvalue option = "llvm_global_initializer" external global_initializer : llvalue -> llvalue = "LLVMGetInitializer"
external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer" external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer"
external remove_initializer : llvalue -> unit = "llvm_remove_initializer" external remove_initializer : llvalue -> unit = "llvm_remove_initializer"
external is_thread_local : llvalue -> bool = "llvm_is_thread_local" external is_thread_local : llvalue -> bool = "llvm_is_thread_local"

6
llvm/bindings/ocaml/llvm/llvm.mli
View File

@ -1454,9 +1454,9 @@ val is_global_constant : llvalue -> bool
See the method [llvm::GlobalVariable::setConstant]. *) See the method [llvm::GlobalVariable::setConstant]. *)
val set_global_constant : bool -> llvalue -> unit val set_global_constant : bool -> llvalue -> unit
(** [global_initializer gv] If global variable [gv] has an initializer it is returned, (** [global_initializer gv] returns the initializer for the global variable
otherwise returns [None]. See the method [llvm::GlobalVariable::getInitializer]. *) [gv]. See the method [llvm::GlobalVariable::getInitializer]. *)
val global_initializer : llvalue -> llvalue option val global_initializer : llvalue -> llvalue
(** [set_initializer c gv] sets the initializer for the global variable (** [set_initializer c gv] sets the initializer for the global variable
[gv] to the constant [c]. [gv] to the constant [c].

12
llvm/bindings/ocaml/llvm/llvm_ocaml.c
View File

@ -1261,18 +1261,6 @@ CAMLprim value llvm_delete_global(LLVMValueRef GlobalVar) {
return Val_unit; return Val_unit;
} }
/* llvalue -> llvalue option */
CAMLprim value llvm_global_initializer(LLVMValueRef GlobalVar) {
CAMLparam0();
LLVMValueRef Init;
if ((Init = LLVMGetInitializer(GlobalVar))) {
value Option = alloc(1, 0);
Field(Option, 0) = (value) Init;
CAMLreturn(Option);
}
CAMLreturn(Val_int(0));
}
/* llvalue -> llvalue -> unit */ /* llvalue -> llvalue -> unit */
CAMLprim value llvm_set_initializer(LLVMValueRef ConstantVal, CAMLprim value llvm_set_initializer(LLVMValueRef ConstantVal,
LLVMValueRef GlobalVar) { LLVMValueRef GlobalVar) {