Skip to content

Commit 317460a

Browse files
authored
Refine some GC annotations (JuliaLang#35388)
1 parent 922891c commit 317460a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/julia.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,16 +1528,17 @@ JL_DLLEXPORT void JL_NORETURN jl_type_error_rt(const char *fname,
15281528
jl_value_t *ty JL_MAYBE_UNROOTED,
15291529
jl_value_t *got JL_MAYBE_UNROOTED);
15301530
JL_DLLEXPORT void JL_NORETURN jl_undefined_var_error(jl_sym_t *var);
1531-
JL_DLLEXPORT void JL_NORETURN jl_bounds_error(jl_value_t *v,
1531+
JL_DLLEXPORT void JL_NORETURN jl_bounds_error(jl_value_t *v JL_MAYBE_UNROOTED,
15321532
jl_value_t *t JL_MAYBE_UNROOTED);
1533-
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_v(jl_value_t *v,
1533+
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_v(jl_value_t *v JL_MAYBE_UNROOTED,
15341534
jl_value_t **idxs, size_t nidxs);
15351535
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_int(jl_value_t *v JL_MAYBE_UNROOTED,
15361536
size_t i);
15371537
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_tuple_int(jl_value_t **v,
15381538
size_t nv, size_t i);
15391539
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_unboxed_int(void *v, jl_value_t *vt, size_t i);
1540-
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_ints(jl_value_t *v, size_t *idxs, size_t nidxs);
1540+
JL_DLLEXPORT void JL_NORETURN jl_bounds_error_ints(jl_value_t *v JL_MAYBE_UNROOTED,
1541+
size_t *idxs, size_t nidxs);
15411542
JL_DLLEXPORT void JL_NORETURN jl_eof_error(void);
15421543

15431544
// Return the exception currently being handled, or `jl_nothing`.

src/support/ios.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ JL_DLLEXPORT size_t ios_read(ios_t *s, char *dest, size_t n) JL_NOTSAFEPOINT;
8686
JL_DLLEXPORT size_t ios_readall(ios_t *s, char *dest, size_t n) JL_NOTSAFEPOINT;
8787
JL_DLLEXPORT size_t ios_write(ios_t *s, const char *data, size_t n) JL_NOTSAFEPOINT;
8888
JL_DLLEXPORT int64_t ios_seek(ios_t *s, int64_t pos) JL_NOTSAFEPOINT; // absolute seek
89-
JL_DLLEXPORT int64_t ios_seek_end(ios_t *s);
89+
JL_DLLEXPORT int64_t ios_seek_end(ios_t *s) JL_NOTSAFEPOINT;
9090
JL_DLLEXPORT int64_t ios_skip(ios_t *s, int64_t offs); // relative seek
9191
JL_DLLEXPORT int64_t ios_pos(ios_t *s) JL_NOTSAFEPOINT; // get current position
9292
JL_DLLEXPORT int ios_trunc(ios_t *s, size_t size) JL_NOTSAFEPOINT;
9393
JL_DLLEXPORT int ios_eof(ios_t *s);
9494
JL_DLLEXPORT int ios_eof_blocking(ios_t *s);
9595
JL_DLLEXPORT int ios_flush(ios_t *s);
96-
JL_DLLEXPORT int ios_close(ios_t *s);
96+
JL_DLLEXPORT int ios_close(ios_t *s) JL_NOTSAFEPOINT;
9797
JL_DLLEXPORT int ios_isopen(ios_t *s);
9898
JL_DLLEXPORT char *ios_take_buffer(ios_t *s, size_t *psize); // release buffer to caller
9999
// set buffer space to use
100100
JL_DLLEXPORT int ios_setbuf(ios_t *s, char *buf, size_t size, int own) JL_NOTSAFEPOINT;
101-
JL_DLLEXPORT int ios_bufmode(ios_t *s, bufmode_t mode);
101+
JL_DLLEXPORT int ios_bufmode(ios_t *s, bufmode_t mode) JL_NOTSAFEPOINT;
102102
JL_DLLEXPORT int ios_get_readable(ios_t *s);
103103
JL_DLLEXPORT int ios_get_writable(ios_t *s);
104104
JL_DLLEXPORT void ios_set_readonly(ios_t *s);

0 commit comments

Comments
 (0)