[PATCH] D53841: [OCaml] Fix incorrect use of CAMLlocal in nested blocks
Josh Berdine via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 29 15:32:23 PDT 2018
jberdine created this revision.
jberdine added a reviewer: whitequark.
Herald added a subscriber: llvm-commits.
The OCaml manual states:
> Local variables of type value must be declared with one of the
> CAMLlocal macros. [...] These macros must be used at the beginning
> of the function, not in a nested block.
This patch moves several instances of CAMLlocal macros from nested
blocks to the function beginning.
Repository:
rL LLVM
https://reviews.llvm.org/D53841
Files:
bindings/ocaml/llvm/llvm_ocaml.c
Index: bindings/ocaml/llvm/llvm_ocaml.c
===================================================================
--- bindings/ocaml/llvm/llvm_ocaml.c
+++ bindings/ocaml/llvm/llvm_ocaml.c
@@ -483,9 +483,9 @@
CAMLprim value llvm_struct_name(LLVMTypeRef Ty)
{
CAMLparam0();
+ CAMLlocal1(result);
const char *C = LLVMGetStructName(Ty);
if (C) {
- CAMLlocal1(result);
result = caml_alloc_small(1, 0);
Store_field(result, 0, caml_copy_string(C));
CAMLreturn(result);
@@ -636,6 +636,7 @@
CAMLprim value llvm_classify_value(LLVMValueRef Val) {
CAMLparam0();
+ CAMLlocal1(result);
if (!Val)
CAMLreturn(Val_int(NullValue));
if (LLVMIsAConstant(Val)) {
@@ -652,7 +653,6 @@
DEFINE_CASE(Val, ConstantVector);
}
if (LLVMIsAInstruction(Val)) {
- CAMLlocal1(result);
result = caml_alloc_small(1, 0);
Store_field(result, 0, Val_int(LLVMGetInstructionOpcode(Val)));
CAMLreturn(result);
@@ -822,12 +822,11 @@
/* llvalue -> string option */
CAMLprim value llvm_get_mdstring(LLVMValueRef V) {
CAMLparam0();
+ CAMLlocal2(Option, Str);
const char *S;
unsigned Len;
if ((S = LLVMGetMDString(V, &Len))) {
- CAMLlocal2(Option, Str);
-
Str = caml_alloc_string(Len);
memcpy(String_val(Str), S, Len);
Option = alloc(1,0);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53841.171593.patch
Type: text/x-patch
Size: 1300 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181029/fe3cce89/attachment.bin>
More information about the llvm-commits
mailing list