MPR#7423: `void caml_{failwith,invalid_argument}_value(value msg)` by gasche · Pull Request #946 · ocaml/ocaml

gasche · 2016-12-03T15:45:18Z

caml_invalid_argument(str) is noreturn and does not free its
argument. So calling it with a string constructed dynamically means that it will never get freed.

gasche · 2016-12-03T15:47:52Z

asmrun/fail.c

  caml_raise_with_string((value) caml_exn_Failure, msg);
 }

+void caml_failwith_value (value msg)


It looks fishy to me that an OCaml-value-taking primitive would have no CAMLfoo ceremony, but I followed the style of the existing void caml_raise_sys_error(value msg) declaration a few lines below:

void caml_raise_end_of_file(void) { caml_raise_constant((value) caml_exn_End_of_file); }

I don't think any CAML* annotation is required. As far as I know, CAMLexport is now redundant, and CAMLprim is only used to mark primitive functions called from OCaml for bytecode compilation. The function here is just a "normal" function to be called from C.

mshinwell · 2016-12-27T09:11:20Z

asmrun/fail.c

  caml_raise_with_string((value) caml_exn_Failure, msg);
 }

+void caml_failwith_value (value msg)


I don't think any CAML* annotation is required. As far as I know, CAMLexport is now redundant, and CAMLprim is only used to mark primitive functions called from OCaml for bytecode compilation. The function here is just a "normal" function to be called from C.

mshinwell · 2016-12-27T09:15:02Z

byterun/fail.c

+CAMLexport void caml_failwith_value (value msg)
+{
+  CAMLparam1(msg);
+  caml_raise_with_arg(caml_get_failwith_tag(String_val(msg)), msg);


I recommend removing CAMLparam1 (and finding something else to say "no return"). It gives a false sense of security. At the moment the presence of this declaration implies that it's guarding against the risk of a GC, which would presumably happen inside caml_get_failwith_tag, if it were changed in the future. However if you expect a side effect from that function, then the code is implicitly relying on the order of evaluation of the arguments of caml_raise_with_arg, which I think is undefined behaviour. (If the second argument was evaluated first and that function did perform a GC then it's wrong.)

(Alternatively add a binding for the tag, then call caml_raise_with_arg.)

mshinwell · 2016-12-27T09:16:41Z

byterun/fail.c

+CAMLexport void caml_invalid_argument_value (value msg)
+{
+  CAMLparam1(msg);
+  caml_raise_with_arg(caml_get_invalid_argument_tag(String_val(msg)), msg);


Same comment as above.

mshinwell · 2016-12-27T09:17:40Z

testsuite/tests/runtime-C-exceptions/test.ml

@@ -0,0 +1,11 @@
+external failwith_from_ocaml : string -> 'a = "caml_failwith_value"


This is maybe a bit naughty, because I don't think that function is supposed to be called from OCaml. However I imagine it's probably ok in a test case.

Yeah, I think it is fine.

mshinwell · 2016-12-27T09:17:51Z

testsuite/tests/runtime-C-exceptions/stub_test.c

+    return strdup("bar");
+}
+
+CAMLprim value caml_dynamic_invalid_argument(value unit)


I would remove the "caml_" name, since this function isn't part of the runtime.

gasche · 2016-12-28T17:57:13Z

There was a non-trivial merge because of the conflicts with #947, but I did it -- and I split the change in two commits to make it easier to review (the one-commit diff was very confusing). @mshinwell, would you mind having a second look to check that it is as you expected?

mshinwell · 2016-12-29T08:31:09Z

All OK.

gasche · 2016-12-29T13:24:27Z

Thanks, merged.

MPR#7423: `void caml_{failwith,invalid_argument}_value(value msg)`

…caml#946)

@poll

b11eea1 flambda-backend: Introduce Import_info (ocaml#1036) bc5b135 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml#1029) c8babbd flambda-backend: Compilation_unit optimisations (ocaml#1035) e8d3e22 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml#1030) eb14a86 flambda-backend: Port PR81 from ocaml-jst (ocaml#1024) 131bc12 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml#1022) 06c189a flambda-backend: Make stack allocation the default (ocaml#1013) 98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml#946) deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml#938) d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml#967) 0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml#1012) 27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml#997) 724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml#871) 396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml#983) b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml#980) 7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml#970) 8fb75bd flambda-backend: Port ocaml#11727 and ocaml#11732 (ocaml#965) fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml#948) 9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml#943) 5f51f21 flambda-backend: Merge pull request ocaml#932 from mshinwell/4.14-upgrade 841687d flambda-backend: Run make alldepend in ocaml/ (ocaml#936) 72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff) 6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream c86bf6e flambda-backend: Remove duplicate tests for polling 971dbeb flambda-backend: Testsuite fixes 32f8356 flambda-backend: Topeval fix for symbols patch befea01 flambda-backend: Compilation fixes / rectify merge faults a84543f flambda-backend: Merge ocaml-jst 8e65056 flambda-backend: Merge ocaml-jst 4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml#920) 5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml#918) 6423d5e flambda-backend: Merge pull request ocaml#914 from mshinwell/merge-ocaml-jst-2022-10-24 ead605c flambda-backend: Add a missing Extract_exception (ocaml#916) c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes cf4d0d3 flambda-backend: Merge fixes (ocaml#21) c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml#881) 3d38d13 flambda-backend: Long frames in frametable (ocaml#797) 85aec7b flambda-backend: Add loop attribute to Builtin_attributes c0f16e3 flambda-backend: Compilation fixes 90dea23 flambda-backend: Merge flambda-backend/main 5acc6ea flambda-backend: Fixes after merge e501946 flambda-backend: Merge ocaml-jst 115083b flambda-backend: Merge ocaml-jst 9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)"" (ocaml#909) ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml#902) e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)" 853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml#893) 5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml#898) 7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml#889) 3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml#896) 7565915 flambda-backend: [@poll error] attribute (ocaml#745) 9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml#740) 689bdda flambda-backend: Add strict mode for ocamldep (ocaml#892) git-subtree-dir: ocaml git-subtree-split: b11eea1

gasche force-pushed the raise_value branch from c424969 to 5b55ea8 Compare December 3, 2016 15:46

gasche commented Dec 3, 2016

View reviewed changes

mshinwell requested changes Dec 27, 2016

View reviewed changes

gasche force-pushed the raise_value branch from 5b55ea8 to a99d6c9 Compare December 28, 2016 14:59

gasche added 2 commits December 28, 2016 10:56

minor refactoring in byterun/fail.c

f9ad119

PR#7423, GPR#946: void caml_{failwith,invalid_argument}_value(value msg)

d324c21

gasche force-pushed the raise_value branch from a99d6c9 to d324c21 Compare December 28, 2016 17:55

mshinwell approved these changes Dec 29, 2016

View reviewed changes

mshinwell added the approved label Dec 29, 2016

gasche merged commit bb0ed08 into ocaml:trunk Dec 29, 2016

camlspotter pushed a commit to camlspotter/ocaml that referenced this pull request Oct 17, 2017

Merge pull request ocaml#946 from gasche/raise_value

210aad1

MPR#7423: `void caml_{failwith,invalid_argument}_value(value msg)`

vicuna mentioned this pull request Mar 14, 2019

caml_invalid_argument can't be used with dynamically allocated strings #7423

Closed

sadiqj pushed a commit to sadiqj/ocaml that referenced this pull request Feb 21, 2023

flambda-backend: Initial support for value slots not of value kind (o…

98debd5

…caml#946)

stedolan pushed a commit to stedolan/ocaml that referenced this pull request Mar 21, 2023

Initial support for value slots not of value kind (ocaml#946)

61abb3f

stedolan pushed a commit to stedolan/ocaml that referenced this pull request Mar 21, 2023

Backport ocaml#946 to ocaml/ subfolder (ocaml#1061)

3dccb20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MPR#7423: `void caml_{failwith,invalid_argument}_value(value msg)`#946

MPR#7423: `void caml_{failwith,invalid_argument}_value(value msg)`#946
gasche merged 2 commits intoocaml:trunkfrom
gasche:raise_value

gasche commented Dec 3, 2016 •

edited

Loading

Uh oh!

gasche Dec 3, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

gasche Dec 28, 2016

Uh oh!

mshinwell Dec 27, 2016

Uh oh!

gasche commented Dec 28, 2016

Uh oh!

mshinwell commented Dec 29, 2016

Uh oh!

gasche commented Dec 29, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -0,0 +1,11 @@
		external failwith_from_ocaml : string -> 'a = "caml_failwith_value"

Conversation

gasche commented Dec 3, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gasche commented Dec 28, 2016

Uh oh!

mshinwell commented Dec 29, 2016

Uh oh!

gasche commented Dec 29, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

gasche commented Dec 3, 2016 •

edited

Loading