Skip to content

Commit 01e3b54

Browse files
committed
Treat catch binders as bound in Lam_closure.free_variables
Answers the Codex finding that an `@inline(crossModule)` function whose `catch` handler inspects the exception was rejected as capturing a local value: the `Ltrywith` branch never added its exception binder to the local set, so the handler's uses of it counted as free variables. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Kbf3gGkPma9LAZimuQjnrP Signed-off-by: Christoph Knittel <ck@cca.io>
1 parent b2066b0 commit 01e3b54

5 files changed

Lines changed: 70 additions & 27 deletions

File tree

‎compiler/core/lam_closure.ml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ let free_variables (export_idents : Set_ident.t) (params : stats Map_ident.t)
117117
iter sink_pos e1;
118118
local_add_list vars;
119119
iter sink_pos e2
120-
| Ltrywith (e1, _, e2) | Ltryfinally (e1, e2) ->
120+
| Ltrywith (e1, exn, e2) ->
121+
iter top e1;
122+
local_add exn;
123+
iter sink_pos e2
124+
| Ltryfinally (e1, e2) ->
121125
iter top e1;
122126
iter sink_pos e2
123127
| Lifthenelse (e1, e2, e3) ->

‎tests/tests/src/cross_module_inline_export.mjs‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Generated by ReScript, PLEASE EDIT WITH CARE
22

3+
import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.mjs";
4+
import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
35

46
function apply(value, f) {
57
return f(value);
@@ -9,8 +11,22 @@ function ordinary(value, f) {
911
return f(value);
1012
}
1113

14+
function catchMessage(f) {
15+
try {
16+
return f();
17+
} catch (raw_e) {
18+
let e = Primitive_exceptions.internalToException(raw_e);
19+
if (e.RE_EXN_ID === "JsExn") {
20+
return Stdlib_JsExn.message(e._1);
21+
} else {
22+
return;
23+
}
24+
}
25+
}
26+
1227
export {
1328
apply,
1429
ordinary,
30+
catchMessage,
1531
}
16-
/* No side effect */
32+
/* Stdlib_JsExn Not a pure module */

‎tests/tests/src/cross_module_inline_export.res‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@
22
let apply = (value, f) => f(value)
33

44
let ordinary = (value, f) => f(value)
5+
6+
@inline(crossModule)
7+
let catchMessage = f =>
8+
try f() catch {
9+
| JsExn(e) => JsExn.message(e)
10+
| _ => None
11+
}

‎tests/tests/src/cross_module_inline_opt_in_test.mjs‎

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import * as Mocha from "mocha";
44
import * as Test_utils from "./test_utils.mjs";
5+
import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.mjs";
6+
import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.mjs";
57
import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.mjs";
8+
import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.mjs";
69
import * as Cross_module_inline_export from "./cross_module_inline_export.mjs";
710

811
let mapped = 3;
@@ -76,39 +79,49 @@ visited.push(4);
7679

7780
let fromOrdinary = Cross_module_inline_export.ordinary(3, x => x + 1 | 0);
7881

82+
let fromCatch;
83+
84+
try {
85+
fromCatch = Stdlib_JsError.throwWithMessage("boom");
86+
} catch (raw_e) {
87+
let e = Primitive_exceptions.internalToException(raw_e);
88+
fromCatch = e.RE_EXN_ID === "JsExn" ? Stdlib_JsExn.message(e._1) : undefined;
89+
}
90+
7991
Mocha.describe("cross-module inline opt-in", () => {
8092
Mocha.test("Option helpers", () => {
81-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 27, characters 7-14", mapped, 3);
82-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 28, characters 7-14", flatMapped, 4);
83-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 29, characters 7-14", mappedNested, Primitive_option.some(undefined));
84-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 30, characters 7-14", mapValue(2), 3);
85-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 31, characters 7-14", mapValue(undefined), undefined);
86-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 32, characters 7-14", flatMapValue(2), 4);
87-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 33, characters 7-14", flatMapValue(undefined), undefined);
93+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 28, characters 7-14", mapped, 3);
94+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 29, characters 7-14", flatMapped, 4);
95+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 30, characters 7-14", mappedNested, Primitive_option.some(undefined));
96+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 31, characters 7-14", mapValue(2), 3);
97+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 32, characters 7-14", mapValue(undefined), undefined);
98+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 33, characters 7-14", flatMapValue(2), 4);
99+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 34, characters 7-14", flatMapValue(undefined), undefined);
88100
visited.push(5);
89-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 35, characters 7-14", visited, [
101+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 36, characters 7-14", visited, [
90102
4,
91103
5
92104
]);
93105
});
94106
Mocha.test("only marked exports are inlined", () => {
95-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 38, characters 7-14", 4, 4);
96-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 39, characters 7-14", fromOrdinary, 4);
107+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 39, characters 7-14", 4, 4);
108+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 40, characters 7-14", fromOrdinary, 4);
109+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 41, characters 7-14", fromCatch, "boom");
97110
});
98111
Mocha.test("additional Option helpers", () => {
99-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 42, characters 7-14", 4, 4);
100-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 43, characters 7-14", undefined, undefined);
101-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 44, characters 7-14", undefined, undefined);
102-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 45, characters 7-14", 3, 3);
103-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 46, characters 7-14", 0, 0);
104-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 47, characters 7-14", 2, 2);
112+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 44, characters 7-14", 4, 4);
113+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 45, characters 7-14", undefined, undefined);
114+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 46, characters 7-14", undefined, undefined);
115+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 47, characters 7-14", 3, 3);
105116
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 48, characters 7-14", 0, 0);
106117
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 49, characters 7-14", 2, 2);
107-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 50, characters 7-14", 3, 3);
108-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 51, characters 7-14", true, true);
109-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 52, characters 7-14", false, false);
110-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 53, characters 7-14", false, false);
111-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 54, characters 7-14", true, true);
118+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 50, characters 7-14", 0, 0);
119+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 51, characters 7-14", 2, 2);
120+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 52, characters 7-14", 3, 3);
121+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 53, characters 7-14", true, true);
122+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 54, characters 7-14", false, false);
123+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 55, characters 7-14", false, false);
124+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 56, characters 7-14", true, true);
112125
});
113126
Mocha.test("eager fallback arguments", () => {
114127
let effects = [];
@@ -125,12 +138,12 @@ Mocha.describe("cross-module inline opt-in", () => {
125138
return 0;
126139
};
127140
getDefault();
128-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 70, characters 7-14", 2, 2);
141+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 72, characters 7-14", 2, 2);
129142
mapDefault();
130-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 71, characters 7-14", 2, 2);
143+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 73, characters 7-14", 2, 2);
131144
other();
132-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 72, characters 7-14", 2, 2);
133-
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 73, characters 7-14", effects, [
145+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 74, characters 7-14", 2, 2);
146+
Test_utils.eq("File \"cross_module_inline_opt_in_test.res\", line 75, characters 7-14", effects, [
134147
"getOr",
135148
"mapOr",
136149
"orElse"
@@ -157,5 +170,6 @@ export {
157170
visited,
158171
fromExport,
159172
fromOrdinary,
173+
fromCatch,
160174
}
161175
/* Not a pure module */

‎tests/tests/src/cross_module_inline_opt_in_test.res‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ let _ = None->Option.forEach(_ => visited->Array.push(0))
2121

2222
let fromExport = Cross_module_inline_export.apply(3, x => x + 1)
2323
let fromOrdinary = Cross_module_inline_export.ordinary(3, x => x + 1)
24+
let fromCatch = Cross_module_inline_export.catchMessage(() => JsError.throwWithMessage("boom"))
2425

2526
describe("cross-module inline opt-in", () => {
2627
test("Option helpers", () => {
@@ -37,6 +38,7 @@ describe("cross-module inline opt-in", () => {
3738
test("only marked exports are inlined", () => {
3839
eq(__LOC__, fromExport, 4)
3940
eq(__LOC__, fromOrdinary, 4)
41+
eq(__LOC__, fromCatch, Some("boom"))
4042
})
4143
test("additional Option helpers", () => {
4244
eq(__LOC__, filterValue(Some(4), x => x > 3), Some(4))

0 commit comments

Comments
 (0)